Merging in 'topic/robin/cleanup-rewriter'.

Removing everything related to trace rewriting.

(I wasn't too careful in ensuring that I catch everything in the
scripts; Seth is working on those anyway.)

(Merging by cherry-picking the corresponding commit, as the branch was
accidentally made off of the logging stuff).
This commit is contained in:
Robin Sommer 2011-04-01 15:23:50 -07:00
parent ec1b2b4d2a
commit a3a075174b
70 changed files with 20 additions and 5922 deletions

View file

@ -4,7 +4,6 @@
#include "TCP_Reassembler.h"
#include "TCP.h"
#include "TCP_Endpoint.h"
#include "TCP_Rewriter.h"
// Only needed for gap_report events.
#include "Event.h"
@ -185,10 +184,6 @@ void TCP_Reassembler::Undelivered(int up_to_seq)
// one for filtered traces, and may fail, for example, when
// the SYN packet carries data.
//
// Note, this check will confuse the EOF checker (and cause a
// missing FIN in the rewritten trace) when the content gap
// in the middle is discovered only after the FIN packet.
// Skip the undelivered part without reporting to the endpoint.
skip_deliveries = 1;
}
@ -235,11 +230,6 @@ void TCP_Reassembler::Undelivered(int up_to_seq)
dst_analyzer->ConnectionEvent(content_gap, vl);
}
TCP_Rewriter* r = (TCP_Rewriter*)
dst_analyzer->Conn()->TraceRewriter();
if ( r )
r->ContentGap(is_orig, len);
if ( type == Direct )
dst_analyzer->NextUndelivered(last_reassem_seq,
len, is_orig);