-
Notifications
You must be signed in to change notification settings - Fork 35
[WIP] libntoh: switch from broken htable to uthash #17
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
Open
megahall
wants to merge
47
commits into
sch3m4:master
Choose a base branch
from
megahall:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
Note: Travis-CI fails presently due to new |
|
all count_flows functions are not returning the count from uthash @megahall. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem Statement
When using
libntohon almost any nontrivial PCAP it fails to work pretty much at all, with tons ofNTOH_IP_ADDRESSES_MISMATCHand/orNTOH_TCP_PORTS_MISMATCHerrors or other similar errors.Root Cause
From extensive debugging over many hours, it appears that the simplistic
htableimplementation included inlibntohis causing the problem:Detailed Steps
unsigned intkey generation code and modulo-to-hash-chain code causes many collisions.tuplekey fields inside of eachntoh_tcp_stream_t,ntoh_ipv4_flow_t, andntoh_ipv4_flow_tobject, to be sure if the records were true duplicates of each other. Instead it just keeps returning semi-random, usually incorrectflowandstreamrecords at the beginning of the hash chains.add_fragmentandadd_segmentoperations fail with theMISMATCHerrors from operating on the wrong socket objects.History
Some previous attempts to fix the issues with
htableare present in the commit history, but they were inconsistently written, not fully implemented, commented out, and/or not actually used in the code performing thefindoperations forflowsandstreamsand thus ineffective.Solution
This code appears to fix most of the issues by completely replacing the
htableimplementation with a known good C hash table nameduthash. It passes some basic and medium complex testing but more testing from the community will be required to be 100% sure everything works.Testing
It should cause little to no change for real applications because it just fixed internal implementation bugs. However some minor unimportant features are temporarily broken, like some of the code which limits the hash table size, as it needs some modifications before it will work with
uthash.uthash information
Detailed information on
uthash:https://github.com/troydhanson/uthash
https://troydhanson.github.io/uthash/
https://troydhanson.github.io/uthash/userguide.html