diff --git a/src/decode.c b/src/decode.c index 8989f4f917..4a0f80aebc 100644 --- a/src/decode.c +++ b/src/decode.c @@ -308,13 +308,17 @@ Packet *PacketDefragPktSetup(Packet *parent, uint8_t *pkt, uint16_t len, uint8_t SCReturnPtr(p, "Packet"); } -void PacketDefragPktFinishSetup(Packet *p, Packet *parent) +/** + * \brief inform defrag "parent" that a pseudo packet is + * now assosiated to it. + */ +void PacketDefragPktSetupParent(Packet *parent) { /* tell parent packet it's part of a tunnel */ SET_TUNNEL_PKT(parent); /* increment tunnel packet refcnt in the root packet */ - TUNNEL_INCR_PKT_TPR(p); + TUNNEL_INCR_PKT_TPR(parent); /* disable payload (not packet) inspection on the parent, as the payload * is the packet we will now run through the system separately. We do diff --git a/src/decode.h b/src/decode.h index fe98764f4e..90846886f5 100644 --- a/src/decode.h +++ b/src/decode.h @@ -815,7 +815,7 @@ void DecodeRegisterPerfCounters(DecodeThreadVars *, ThreadVars *); Packet *PacketTunnelPktSetup(ThreadVars *tv, DecodeThreadVars *dtv, Packet *parent, uint8_t *pkt, uint16_t len, uint8_t proto, PacketQueue *pq); Packet *PacketDefragPktSetup(Packet *parent, uint8_t *pkt, uint16_t len, uint8_t proto); -void PacketDefragPktFinishSetup(Packet *p, Packet *parent); +void PacketDefragPktSetupParent(Packet *parent); Packet *PacketGetFromQueueOrAlloc(void); Packet *PacketGetFromAlloc(void); void PacketFree(Packet *p); diff --git a/src/defrag.c b/src/defrag.c index f0dccc5fa7..01d8c6c907 100644 --- a/src/defrag.c +++ b/src/defrag.c @@ -721,7 +721,7 @@ insert: IPV4_GET_IPLEN(r), pq) != TM_ECODE_OK) { TmqhOutputPacketpool(tv, r); } else { - PacketDefragPktFinishSetup(r, p); + PacketDefragPktSetupParent(p); } } } @@ -735,7 +735,7 @@ insert: pq) != TM_ECODE_OK) { TmqhOutputPacketpool(tv, r); } else { - PacketDefragPktFinishSetup(r, p); + PacketDefragPktSetupParent(p); } } }