From: Michael Altizer Date: Sat, 16 Mar 2019 23:31:44 +0000 (-0400) Subject: Revert "Merge pull request #1535 in SNORT/snort3 from ~SHRARANG/snort3:set_priv_ptr_f... X-Git-Tag: 3.0.0-256~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7769fc50eca17b63f33150bb9680fd476d67827b;p=thirdparty%2Fsnort3.git Revert "Merge pull request #1535 in SNORT/snort3 from ~SHRARANG/snort3:set_priv_ptr_for_pdu to master" This reverts commit cdae58b2fde31057795c04185d22d2b7e9e916ef. --- diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc index 63f557605..f97fde5e9 100644 --- a/src/stream/tcp/tcp_reassembler.cc +++ b/src/stream/tcp/tcp_reassembler.cc @@ -526,8 +526,6 @@ Packet* TcpReassembler::initialize_pdu( prep_pdu(trs, trs.sos.session->flow, p, pkt_flags, pdu); assert(pdu->pkth == pdu->context->pkth); pdu->context->pkth->ts = tv; - // FIXIT-M: This hack will go away with daqng - pdu->context->pkth->priv_ptr = p->pkth->priv_ptr; pdu->dsize = 0; pdu->data = nullptr; return pdu;