defrag: clean up

Rename PacketDefragPktFinishSetup to PacketDefragPktSetupParent to
better refect it's function.
pull/658/merge
Victor Julien 12 years ago
parent 3fdf52239d
commit 277fb61c1d

@ -308,13 +308,17 @@ Packet *PacketDefragPktSetup(Packet *parent, uint8_t *pkt, uint16_t len, uint8_t
SCReturnPtr(p, "Packet"); 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 */ /* tell parent packet it's part of a tunnel */
SET_TUNNEL_PKT(parent); SET_TUNNEL_PKT(parent);
/* increment tunnel packet refcnt in the root packet */ /* 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 /* disable payload (not packet) inspection on the parent, as the payload
* is the packet we will now run through the system separately. We do * is the packet we will now run through the system separately. We do

@ -815,7 +815,7 @@ void DecodeRegisterPerfCounters(DecodeThreadVars *, ThreadVars *);
Packet *PacketTunnelPktSetup(ThreadVars *tv, DecodeThreadVars *dtv, Packet *parent, Packet *PacketTunnelPktSetup(ThreadVars *tv, DecodeThreadVars *dtv, Packet *parent,
uint8_t *pkt, uint16_t len, uint8_t proto, PacketQueue *pq); uint8_t *pkt, uint16_t len, uint8_t proto, PacketQueue *pq);
Packet *PacketDefragPktSetup(Packet *parent, uint8_t *pkt, uint16_t len, uint8_t proto); 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 *PacketGetFromQueueOrAlloc(void);
Packet *PacketGetFromAlloc(void); Packet *PacketGetFromAlloc(void);
void PacketFree(Packet *p); void PacketFree(Packet *p);

@ -721,7 +721,7 @@ insert:
IPV4_GET_IPLEN(r), pq) != TM_ECODE_OK) { IPV4_GET_IPLEN(r), pq) != TM_ECODE_OK) {
TmqhOutputPacketpool(tv, r); TmqhOutputPacketpool(tv, r);
} else { } else {
PacketDefragPktFinishSetup(r, p); PacketDefragPktSetupParent(p);
} }
} }
} }
@ -735,7 +735,7 @@ insert:
pq) != TM_ECODE_OK) { pq) != TM_ECODE_OK) {
TmqhOutputPacketpool(tv, r); TmqhOutputPacketpool(tv, r);
} else { } else {
PacketDefragPktFinishSetup(r, p); PacketDefragPktSetupParent(p);
} }
} }
} }

Loading…
Cancel
Save