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.

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

nDPI2.x snabb compatibility #1368

Merged
merged 1 commit into from Jun 6, 2019

Conversation

4 participants
@aouinizied
Copy link
Contributor

commented Jul 5, 2018

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

This comment has been minimized.

Copy link
Member

commented Jul 30, 2018

Thanks!

@dpino does this look good to you?

@aouinizied

This comment has been minimized.

Copy link
Contributor Author

commented Jul 30, 2018

@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

@lukego lukego added this to Review needed in Pull Request upstreaming Aug 1, 2018

@dpino

dpino approved these changes Aug 7, 2018

Copy link
Contributor

left a comment

LGTM, probably worth another review by @takikawa

@aouinizied

This comment has been minimized.

Copy link
Contributor Author

commented Oct 1, 2018

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

Zied

@eugeneia

This comment has been minimized.

Copy link
Member

commented Jan 7, 2019

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

@dpino

This comment has been minimized.

Copy link
Contributor

commented Jan 7, 2019

@eugeneia sgtm

eugeneia added a commit that referenced this pull request Jan 8, 2019

@eugeneia eugeneia added the merged label Jan 8, 2019

@eugeneia eugeneia merged commit f2bd95d into snabbco:master Jun 6, 2019

1 of 2 checks passed

davos-eugeneia/snabb-nfv-test-vanilla Linux davos 4.4.31 x86_64 Intel(R) Xeon(R) CPU E5-2603 v2 @ 1.80GHz / eugeneia/snabb-nfv-test-vanilla
Details
SnabbDoc Documentation as single HTML file
Details

Pull Request upstreaming automation moved this from Review needed to Merged but not yet released Jun 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.