diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-19 01:16:29 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-19 01:16:29 +0000 |
| commit | 286aaddb05c5e5b6fcdc7e2b7dd27c382332cd45 (patch) | |
| tree | 03802b57a9d8f0bb257ec91d3eea4dc6c13eb275 /epan/dissectors/packet-eth.c | |
| parent | eb232c39545d94d90c8d0110e751d6a204c4e92f (diff) | |
Use top level tree when using dissectors from "eth.trailer" heuristics.
svn path=/trunk/; revision=33255
Diffstat (limited to 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 4 |
1 files changed, 2 insertions, 2 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; } |