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

nDPI2.x snabb compatibility #1368

Merged
merged 1 commit into from
Jun 6, 2019
Merged

nDPI2.x snabb compatibility #1368

merged 1 commit into from
Jun 6, 2019

Conversation

aouinizied
Copy link
Contributor

In this PR, nDPI 2.x versions are correctly handled.
Modifications summary:

  • lib/ljndpi/ndpi/c.lua: fix versions checks (major and minor values)
  • generate protocol_ids_2_x.lua (till the most recent version 2.3)

@lukego
Copy link
Member

lukego commented Jul 30, 2018

Thanks!

@dpino does this look good to you?

@aouinizied
Copy link
Contributor Author

@dpino @lukego
Note that ntop team starts to implement (experimental) hyperscan based algorithm. If you have hyperscan lib on your machine, nDPI compilation process will take this headers and compile with hyperscan enabled. Such new headers and functions are not handled with current ljndpi bindings.
I will take a look at it when I have free slots. At least, we have a trace here.

Best regards,
Zied

dpino
dpino approved these changes Aug 7, 2018
View reviewed changes
Copy link
Contributor

@dpino dpino left a comment

Choose a reason for hiding this comment

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

LGTM, probably worth another review by @takikawa

@aouinizied
Copy link
Contributor Author

UP. as it was merged on September release. Do you need any further checks?

Zied

@eugeneia
Copy link
Member

eugeneia commented Jan 7, 2019

@takikawa @dpino Unless you have any objections I would merge this onto max-next.

@dpino
Copy link
Contributor

dpino commented Jan 7, 2019

@eugeneia sgtm

eugeneia added a commit that referenced this pull request Jan 8, 2019
@eugeneia
Merge PR #1368 (nDPI2.x snabb compatibility) into max-next
8fe1abe
@eugeneia eugeneia added the merged label Jan 8, 2019
@eugeneia eugeneia mentioned this pull request Jan 8, 2019
Merged
@eugeneia eugeneia merged commit f2bd95d into snabbco:master Jun 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dpino dpino dpino approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@aouinizied @lukego @eugeneia @dpino