Adapt stream code to packet memory allocation changes.

remotes/origin/master-1.1.x
Victor Julien 14 years ago
parent 44e678b86b
commit c955254b4e

@ -3310,8 +3310,7 @@ Packet *StreamTcpPseudoSetup(Packet *parent, uint8_t *pkt, uint32_t len)
/* copy packet and set lenght, proto */ /* copy packet and set lenght, proto */
p->tunnel_proto = parent->proto; p->tunnel_proto = parent->proto;
p->proto = parent->proto; p->proto = parent->proto;
p->pktlen = len; PacketCopyData(p, pkt, len);
memcpy(&p->pkt, pkt, (len - parent->payload_len));
p->recursion_level = parent->recursion_level + 1; p->recursion_level = parent->recursion_level + 1;
p->ts.tv_sec = parent->ts.tv_sec; p->ts.tv_sec = parent->ts.tv_sec;
p->ts.tv_usec = parent->ts.tv_usec; p->ts.tv_usec = parent->ts.tv_usec;
@ -3402,7 +3401,7 @@ void StreamTcpPseudoPacketCreateStreamEndPacket(Packet *p, TcpSession *ssn, Pack
} }
} }
Packet *np = StreamTcpPseudoSetup(p, p->pkt, p->pktlen); Packet *np = StreamTcpPseudoSetup(p, GET_PKT_DATA(p), GET_PKT_LEN(p));
if (np == NULL) { if (np == NULL) {
SCLogDebug("The packet received from packet allocation is NULL"); SCLogDebug("The packet received from packet allocation is NULL");
SCReturn; SCReturn;

Loading…
Cancel
Save