Use connection directions from conntrack where possible #967
Conversation
This file contains 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
| toAddr, toPort = f.Original.Layer3.DstIP, uint16(f.Original.Layer4.DstPort) | ||
| tuple = []string{ | ||
| fmt.Sprintf("%s:%d", fromAddr, fromPort), | ||
| fmt.Sprintf("%s:%d", toAddr, toPort), |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
| seenTuples[strings.Join(tuple, " ")] = fourTuple{fromAddr, toAddr, fromPort, toPort} | ||
| // TODO(paulbellamy): Won't adding this from conntrack, and adding the | ||
| // edge again here result in double-counting? Also, if we've seen the | ||
| // same conn twice from proc (if both ends are on the same host). |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
Also, the TestSpyNoProcesses and 340_process_edge_across_host_2_test are probably related. |
paulbellamy
force-pushed
the
539-connection-directions
branch
from
1d9e3ac to
9b280e3
Compare
| remotePort = conn.RemotePort | ||
| localAddr = conn.LocalAddress.String() | ||
| remoteAddr = conn.RemoteAddress.String() | ||
| tuple = fourTuple{conn.LocalAddress.String(), conn.RemoteAddress.String(), conn.LocalPort, conn.RemotePort} |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
A bit nit picky (sorry!) but otherwise LGTM. Please squash. |
paulbellamy
force-pushed
the
539-connection-directions
branch
4 times, most recently
from
c72fe08 to
c217acb
Compare
* Remove report.EdgeMetadata.MaxConnCountTCP, as we don't display it anywhere * Remove hostname metadata from local end of connection. We should be using the hostnodeid
tomwilkie
force-pushed
the
539-connection-directions
branch
from
c217acb to
6cef1b1
Compare
|
LGTM, assuming tests now pass. |
tomwilkie
added a commit
that referenced
this pull request
Feb 23, 2016
Use connection directions from conntrack where possible
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.
Fixes #539
Needs in-depth review from @tomwilkie and/or @peterbourgon