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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=95c7d2d98d003cb9081dbefe45e441e0a5a4ea08
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

95c7d2d by William Tu (u9012063@xxxxxxxxx):

    Fix ERSPAN type II and type III offset.
    
    For ERSPAN type II (version == 1), the offset is shifted by 4 at the
    end. As a result, the 'offset+=2' at the end of ERSPAN type III should
    be in its own 'else' scope.
    
    Change-Id: I64a55d5722e3f4f5672ca2a4228583b3b51559e1
    Reviewed-on: https://code.wireshark.org/review/16568
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit e3a15cfbb24b79c0225d391dc44362ac9cdcb077)
    Reviewed-on: https://code.wireshark.org/review/16580
    

Actions performed:

    from  65d74aa   Initialize master-2.2.
    adds  95c7d2d   Fix ERSPAN type II and type III offset.


Summary of changes:
 epan/dissectors/packet-cisco-erspan.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)