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

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

Commits:

622983d 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 cea892f6f03ac0455bde8150a31cb5bcf8d34431)
    Reviewed-on: https://code.wireshark.org/review/34665
    

Actions performed:

    from  76758d3   Fix interpretation of BSO field in Type III headers.
     add  622983d   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(-)