Merge branch 'master' into topic/jsiwek/983

This commit is contained in:
Jon Siwek 2013-05-30 11:43:02 -05:00
commit 3c0578d009
3 changed files with 7 additions and 3 deletions

View file

@ -1159,12 +1159,12 @@ Connection* NetSessions::NewConn(HashKey* k, double t, const ConnID* id,
if ( ! WantConnection(src_h, dst_h, tproto, flags, flip) )
return 0;
ConnID flip_id = *id;
if ( flip )
{
// Make a guess that we're seeing the tail half of
// an analyzable connection.
ConnID flip_id = *id;
const IPAddr ta = flip_id.src_addr;
flip_id.src_addr = flip_id.dst_addr;
flip_id.dst_addr = ta;