Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add support for gre decapsulation (#1442) #1921

Merged
merged 2 commits into from
Apr 4, 2023
Merged

add support for gre decapsulation (#1442) #1921

merged 2 commits into from
Apr 4, 2023

Conversation

mmaatuq
Copy link
Contributor

@mmaatuq mmaatuq commented Mar 28, 2023

  • support gre (v0 & v1) decapsulation.
  • add respective tests.

IvanNardi
IvanNardi requested changes Mar 29, 2023
View reviewed changes
Copy link
Collaborator

@IvanNardi IvanNardi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall it seems good. Just some minor issues below.
Other than them:

  1. take a look at the CI failures
  2. try merging (via mergecap) all the 3 (existing and new) gre traces into one called gre.pcap

example/reader_util.c Outdated Show resolved Hide resolved
example/reader_util.c Outdated Show resolved Hide resolved
example/reader_util.c Outdated Show resolved Hide resolved
src/include/ndpi_typedefs.h Outdated Show resolved Hide resolved
src/include/ndpi_typedefs.h Outdated Show resolved Hide resolved
@sonarcloud
Copy link

sonarcloud bot commented Mar 29, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@IvanNardi
Copy link
Collaborator

Thanks for the follow-up.
Something seems wrong with the pcap: in the prevoius version of this PR, there were 3 pcaps (1 already existing, 2 new) but now there are only 2 flows in gre.pcap... Any chances you missed a file (gre_v0.pcapng?) during the merging?

@mmaatuq
Copy link
Contributor Author

mmaatuq commented Mar 29, 2023

Thanks for the follow-up. Something seems wrong with the pcap: in the prevoius version of this PR, there were 3 pcaps (1 already existing, 2 new) but now there are only 2 flows in gre.pcap... Any chances you missed a file (gre_v0.pcapng?) during the merging?

No I didn't miss it, I wanted sample captures that cover gre v0 && v1 and gre_v0.pcang has v0 same as gre_no_options.pcang

@IvanNardi
Copy link
Collaborator

Thanks for the follow-up. Something seems wrong with the pcap: in the prevoius version of this PR, there were 3 pcaps (1 already existing, 2 new) but now there are only 2 flows in gre.pcap... Any chances you missed a file (gre_v0.pcapng?) during the merging?

No I didn't miss it, I wanted sample captures that cover gre v0 && v1 and gre_v0.pcang has v0 same as gre_no_options.pcang

ok, fair enough

@IvanNardi IvanNardi merged commit f1193d5 into ntop:dev Apr 4, 2023
@IvanNardi
Copy link
Collaborator

Thanks for the feature

@mmaatuq mmaatuq deleted the add_support_for_gre_decapsulation branch April 16, 2023 03:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IvanNardi IvanNardi IvanNardi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mmaatuq @IvanNardi