Wireshark-commits: [Wireshark-commits] master ef76d65: Fix checks for "do we have an ERSPAN header?
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 01 Oct 2019 00:38:27 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ef76d65fc61d01c2ce5184140f4b1bba0019078b
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

ef76d65 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>
    

Actions performed:

    from  ef671dd   NR RRC: upgrade dissector to v15.7.0
     add  ef76d65   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(-)