diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-06-19 01:16:29 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-06-19 01:16:29 +0000 |
commit | 2acc2ecde8c5ece263cba2e1d0070268c0ba1142 (patch) | |
tree | 03802b57a9d8f0bb257ec91d3eea4dc6c13eb275 /epan | |
parent | cda84b397dfc7692482f8eee1854d6621630ebcc (diff) |
Use top level tree when using dissectors from "eth.trailer" heuristics.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33255 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-eth.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-eth.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ethertype.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee8023.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-isl.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 4ebd848d7b..8b48559609 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -432,7 +432,7 @@ static gboolean check_is_802_2(tvbuff_t *tvb, int fcs_len) * it does, maybe it doesn't"), we try to infer whether it has an FCS. */ void -add_ethernet_trailer(packet_info *pinfo, proto_tree *fh_tree, int trailer_id, +add_ethernet_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, tvbuff_t *trailer_tvb, int fcs_len) { /* If there're some bytes left over, show those bytes as a trailer. @@ -446,7 +446,7 @@ add_ethernet_trailer(packet_info *pinfo, proto_tree *fh_tree, int trailer_id, gboolean has_fcs = FALSE; if (dissector_try_heuristic(eth_trailer_subdissector_list, trailer_tvb, - pinfo, fh_tree)) { + pinfo, tree)) { return; } diff --git a/epan/dissectors/packet-eth.h b/epan/dissectors/packet-eth.h index 58471d6592..d3cfb9a9d9 100644 --- a/epan/dissectors/packet-eth.h +++ b/epan/dissectors/packet-eth.h @@ -32,7 +32,7 @@ typedef struct _eth_hdr { void capture_eth(const guchar *, int, int, packet_counts *); -void add_ethernet_trailer(packet_info *pinfo, proto_tree *fh_tree, +void add_ethernet_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, tvbuff_t *trailer_tvb, int fcs_len); diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 5b534acf95..033898ba86 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -160,7 +160,7 @@ const value_string etype_vals[] = { { 0, NULL } }; -static void add_dix_trailer(packet_info *pinfo, proto_tree *fh_tree, +static void add_dix_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, tvbuff_t *next_tvb, int offset_after_etype, guint length_before, gint fcs_len); @@ -307,12 +307,12 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype, } } - add_dix_trailer(pinfo, fh_tree, trailer_id, tvb, next_tvb, offset_after_etype, + add_dix_trailer(pinfo, tree, fh_tree, trailer_id, tvb, next_tvb, offset_after_etype, length_before, fcs_len); } static void -add_dix_trailer(packet_info *pinfo, proto_tree *fh_tree, int trailer_id, +add_dix_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, tvbuff_t *next_tvb, int offset_after_etype, guint length_before, gint fcs_len) { @@ -347,7 +347,7 @@ add_dix_trailer(packet_info *pinfo, proto_tree *fh_tree, int trailer_id, } else trailer_tvb = NULL; /* no trailer */ - add_ethernet_trailer(pinfo, fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); + add_ethernet_trailer(pinfo, tree, fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); } void diff --git a/epan/dissectors/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c index 142dcf18f2..fd98547218 100644 --- a/epan/dissectors/packet-ieee8023.c +++ b/epan/dissectors/packet-ieee8023.c @@ -127,7 +127,7 @@ dissect_802_3(volatile int length, gboolean is_802_2, tvbuff_t *tvb, } ENDTRY; - add_ethernet_trailer(pinfo, fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); + add_ethernet_trailer(pinfo, tree, fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); } void diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index ee7e229c00..779f2776b3 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -296,7 +296,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) /* Now add the Ethernet trailer and FCS. XXX - do this only if we're encapsulated in Ethernet? */ - add_ethernet_trailer(pinfo, fh_tree, hf_isl_trailer, tvb, trailer_tvb, fcs_len); + add_ethernet_trailer(pinfo, tree, fh_tree, hf_isl_trailer, tvb, trailer_tvb, fcs_len); } break; |