Wireshark-commits: [Wireshark-commits] master e4c5efa: CIP: Highlight correct bytes in Req/Rsp proc
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: Thu, 08 Feb 2018 23:41:22 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e4c5efafb7da2d25b7d47fe2dac3b1556c0b67b0
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

e4c5efa by Dylan Ulis (daulis0@xxxxxxxxx):

    CIP: Highlight correct bytes in Req/Rsp processing
    
    Previously, dissect_cip_generic_service_req and dissect_cip_generic_service_rsp
    set lengths at different levels of the packet. In some cases, this would
    cause a malformed packet when the data length was zero. This fixes the
    malformed error by explicitly setting the length, instead of using -1.
    
    The length of the service data set is not the data paylod for both
    cases. Previously, for requests, it attempted to highlight the whole CIP
    layer, but this was already covered by the full CIP protocol layer
    length.
    
    Change-Id: I4b4a99d30b9e04872fcf7ffb127c496e6062856c
    Reviewed-on: https://code.wireshark.org/review/25672
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  60c5ec6   CIP Safety: Add decode options for I/O Payloads
    adds  e4c5efa   CIP: Highlight correct bytes in Req/Rsp processing


Summary of changes:
 epan/dissectors/packet-cip.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)