diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-11 19:30:59 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-11 19:30:59 +0000 |
| commit | 5470356154bec50b607e071606f49696429a0c7c (patch) | |
| tree | ddfa23049475fd87377ba1e4873764115aa2cf4d /epan | |
| parent | f738c184467a45fe25875eaf53461bf084d0b643 (diff) | |
| download | wireshark-5470356154bec50b607e071606f49696429a0c7c.tar.gz | |
Remove tcp_tree from packet_info structure.
All dissectors that call tcp_dissect_pdus() have the same relative tree position, so it doesn't need to be specifically saved in the packet_info.
svn path=/trunk/; revision=53253
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 5 | ||||
| -rw-r--r-- | epan/packet_info.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index bef56fb5e9..4455d32056 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2201,13 +2201,13 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* * Display the PDU length as a field */ - item=proto_tree_add_uint((proto_tree *)pinfo->tcp_tree, + item=proto_tree_add_uint(tree ? tree->last_child : NULL, hf_tcp_pdu_size, tvb, offset, plen, plen); PROTO_ITEM_SET_GENERATED(item); #if 0 } else { - item = proto_tree_add_text(pinfo->tcp_tree, tvb, offset, -1, + item = proto_tree_add_text(tree ? tree->last_child : NULL, tvb, offset, -1, "PDU Size: %u cut short at %u",plen,length_remaining); PROTO_ITEM_SET_GENERATED(item); } @@ -4063,7 +4063,6 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_tcp, tvb, 0, -1, ENC_NA); } tcp_tree = proto_item_add_subtree(ti, ett_tcp); - pinfo->tcp_tree=tcp_tree; proto_tree_add_uint_format_value(tcp_tree, hf_tcp_srcport, tvb, offset, 2, tcph->th_sport, "%s (%u)", get_tcp_port(tcph->th_sport), tcph->th_sport); diff --git a/epan/packet_info.h b/epan/packet_info.h index ce56ad4aff..0610bd6271 100644 --- a/epan/packet_info.h +++ b/epan/packet_info.h @@ -196,7 +196,6 @@ typedef struct _packet_info { */ guint16 profinet_type; /**< the type of PROFINET packet (0: not a PROFINET packet) */ void *usb_conv_info; - void *tcp_tree; /**< proto_tree for the tcp layer */ const char *dcerpc_procedure_name; /* Used by PIDL to store the name of the current dcerpc procedure */ |