diff options
author | Evan Huus <eapache@gmail.com> | 2013-07-31 01:26:05 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-07-31 01:26:05 +0000 |
commit | 960a461c8a54460db372968854f6280f9c48a41d (patch) | |
tree | bc862dc785616b5966358090f61e8aaff71f0977 /epan/dissectors/packet-tcp.h | |
parent | bc7c14a2a17170db658046d4f2c7677907f44c02 (diff) |
Convert SSL and TCP dissectors to wmem (with the exception of UAT).
svn path=/trunk/; revision=51043
Diffstat (limited to 'epan/dissectors/packet-tcp.h')
-rw-r--r-- | epan/dissectors/packet-tcp.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h index 4070acc289..839eec6dd7 100644 --- a/epan/dissectors/packet-tcp.h +++ b/epan/dissectors/packet-tcp.h @@ -34,6 +34,8 @@ extern "C" { #include <epan/conversation.h> #endif +#include <epan/wmem/wmem.h> + /* TCP flags */ #define TH_FIN 0x0001 #define TH_SYN 0x0002 @@ -114,7 +116,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissector_t dissect_pdu); extern struct tcp_multisegment_pdu * -pdu_store_sequencenumber_of_next_pdu(packet_info *pinfo, guint32 seq, guint32 nxtpdu, emem_tree_t *multisegment_pdus); +pdu_store_sequencenumber_of_next_pdu(packet_info *pinfo, guint32 seq, guint32 nxtpdu, wmem_tree_t *multisegment_pdus); typedef struct _tcp_unacked_t { struct _tcp_unacked_t *next; @@ -189,7 +191,7 @@ typedef struct _tcp_flow_t { /* This tree is indexed by sequence number and keeps track of all * all pdus spanning multiple segments for this flow. */ - emem_tree_t *multisegment_pdus; + wmem_tree_t *multisegment_pdus; /* Process info, currently discovered via IPFIX */ guint32 process_uid; /* UID of local process */ @@ -231,7 +233,7 @@ struct tcp_analysis { /* This structure contains a tree containing all the various ta's * keyed by frame number. */ - emem_tree_t *acked_table; + wmem_tree_t *acked_table; /* Remember the timestamp of the first frame seen in this tcp * conversation to be able to calculate a relative time compared |