Wireshark-commits: [Wireshark-commits] master 42d410b: CIP: Log more errors when expected data is m
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, 14 Mar 2017 23:38:35 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=42d410b8e37a5be47979758ae69dc33327e6369c
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

42d410b by D. Ulis (daulis0@xxxxxxxxx):

    CIP: Log more errors when expected data is missing
    
    1. CIP: Instead of exiting early in dissect_cip_generic_service_req/rsp when there is no data, keep processing so that a malformed packet warning will be displayed when there should be data.
    2. CIP Safety: Remove copy-paste. Use load_cip_request_data
    3. CIP Safety: Use more constants.
    
    Change-Id: Ic364201f1e587b43cf2bda407fb77b50032974ae
    Reviewed-on: https://code.wireshark.org/review/20549
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  17953ce   Lua: Check for no table in ProtoField unit string
    adds  42d410b   CIP: Log more errors when expected data is missing


Summary of changes:
 epan/dissectors/packet-cip.c       |   53 ++++++++++++++++++++------------
 epan/dissectors/packet-cip.h       |    1 +
 epan/dissectors/packet-cipsafety.c |   58 ++++++++++--------------------------
 3 files changed, 51 insertions(+), 61 deletions(-)