Merge pull request #1535 in SNORT/snort3 from ~SHRARANG/snort3:set_priv_ptr_for_pdu...

Squashed commit of the following:

commit e1328ce2b3775008806e4bc2a845c965c3633df4
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Tue Mar 5 09:29:10 2019 -0500

    stream_tcp: initialize priv_ptr for pdus

diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc
index 4695c38b9257097bfec4647988c49de223a23f76..b538fa2b9695da14438ad6e6a93e7b18e91b4f15 100644 (file)
--- a/src/stream/tcp/tcp_reassembler.cc
+++ b/src/stream/tcp/tcp_reassembler.cc
@@ -523,6 +523,8 @@ Packet* TcpReassembler::initialize_pdu(
     PacketManager::format_tcp(enc_flags, p, pdu, PSEUDO_PKT_TCP, &pkth, pkth.opaque);
     prep_pdu(trs, trs.sos.session->flow, p, pkt_flags, pdu);
     (const_cast<DAQ_PktHdr_t*>(pdu->pkth))->ts = tv;
+    // FIXIT-M: This hack will go away with daqng
+    (const_cast<DAQ_PktHdr_t*>(pdu->pkth))->priv_ptr = p->pkth->priv_ptr;
     pdu->dsize = 0;
     pdu->data = nullptr;
     return pdu;