diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-09-30 16:35:35 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-10-01 00:38:21 +0000 |
| commit | ef76d65fc61d01c2ce5184140f4b1bba0019078b (patch) | |
| tree | b2a9df114b4d67ea00270c275b3d0fb8a1a3bc05 /epan/dissectors/packet-gre.c | |
| parent | ef671dd085bec687bcf06bc30c9c50576ee5e983 (diff) | |
Fix checks for "do we have an ERSPAN header?"
For a GRE protocol type of 0x008E, check the "sequence number present"
bit in the GRE header, if it's available, to see if the packet has an
ERSPAN header or not, rather than checking the entire header to see if
it's zero. (If the GRE header isn't available, assume no ERSPAN
header.)
For a GRE protocol type of 0x22EB, always treat the packet as having an
ERSPAN header.
That matches more closely what the most recent I-D for ERSPAN said.
Bug: 16089
Change-Id: I21119411e8485854fca85fa701b994bfa4e73941
Reviewed-on: https://code.wireshark.org/review/34664
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-gre.c')
| -rw-r--r-- | epan/dissectors/packet-gre.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index ae4ace19ba..44d4c91784 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -89,19 +89,6 @@ static expert_field ei_gre_checksum_incorrect = EI_INIT; static dissector_table_t gre_dissector_table; -/* bit positions for flags in header */ -#define GRE_CHECKSUM 0x8000 -#define GRE_ROUTING 0x4000 -#define GRE_KEY 0x2000 -#define GRE_SEQUENCE 0x1000 -#define GRE_STRICTSOURCE 0x0800 -#define GRE_RECURSION 0x0700 -#define GRE_ACK 0x0080 /* only in special PPTPized GRE header */ -#define GRE_RESERVED_PPP 0x0078 /* only in special PPTPized GRE header */ -#define GRE_RESERVED 0x00F8 -#define GRE_VERSION 0x0007 - - const value_string gre_version[] = { { 0, "GRE" }, /* [RFC2784] */ { 1, "Enhanced GRE" }, /* [RFC2637] */ |