diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2018-03-16 21:12:08 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2018-03-18 10:14:03 +0000 |
| commit | aeca321f36935204e0ffb901c7252805d954b18d (patch) | |
| tree | 911df4f35611f21ab00c977ec0e0e9698c4efe27 /epan/dissectors/packet-gre.c | |
| parent | d9541236a31434b4f02b5d5a7b329d2fa13c7290 (diff) | |
ERSPAN: Various small cleanups and enhancements
Pass Type I vs. II/III via dissector data instead of pinfo
Append type to protocol name
Put vlan number into pinfo when appropriate
Put version 1 and version 2 dissection into separate blocks
Rename priority into cos (as per draft-rfc)
Add new subheader from draft-3
Change-Id: I6eb7fe7073a6cc92e2028b0491de5e0f3f036b4e
Reviewed-on: https://code.wireshark.org/review/26512
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan/dissectors/packet-gre.c')
| -rw-r--r-- | epan/dissectors/packet-gre.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 9b9faea8b6..25db1e9271 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -482,9 +482,6 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (type == ETHERTYPE_3GPP2) { offset = dissect_gre_3gpp2_attribs(tvb, offset, gre_tree); } - if (type == GRE_ERSPAN_88BE && !(flags_and_ver & GRE_SEQUENCE)) { - pinfo->flags.in_erspan_i = TRUE; - } proto_item_set_len(ti, offset); @@ -501,7 +498,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) } next_tvb = tvb_new_subset_remaining(tvb, offset); pinfo->flags.in_gre_pkt = TRUE; - if (!dissector_try_uint(gre_dissector_table, type, next_tvb, pinfo, tree)) + if (!dissector_try_uint_new(gre_dissector_table, type, next_tvb, pinfo, tree, TRUE, &flags_and_ver)) call_data_dissector(next_tvb, pinfo, gre_tree); } return tvb_captured_length(tvb); |