Wireshark · Wireshark-commits: [Wireshark-commits] master-2.6 0db7ec7: Fix checks for "do we have an ERSPAN header?"

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0db7ec792abce61ea9f3bb777543d4c4f36b6c91
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

0db7ec7 by Guy Harris (guy@xxxxxxxxxxxx):

    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@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit ef76d65fc61d01c2ce5184140f4b1bba0019078b)
    Reviewed-on: https://code.wireshark.org/review/34666
    

Actions performed:

    from  5b15970   Fix interpretation of BSO field in Type III headers.
     add  0db7ec7   Fix checks for "do we have an ERSPAN header?"


Summary of changes:
 epan/dissectors/packet-cisco-erspan.c | 139 +++++++++++++++++++++++++---------
 epan/dissectors/packet-gre.c          |  13 ----
 epan/dissectors/packet-gre.h          |  13 ++++
 3 files changed, 116 insertions(+), 49 deletions(-)