URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ddbc140f8025f43e7ddadbb2491373b2adc0ca79
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
ddbc140 by D. Ulis (daulis0@xxxxxxxxx):
Bugfixes for EtherNet/IP and CIP
EtherNet/IP
1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data.
2. Typos
CIP
1. Many Time Sync attribute responses were flagged incorrectly as malformed.
2. Create service response highlighted the instance number incorrectly, and showed warnings.
3. Set Attribute List Request should exit early if it doesn't know about a particular attribute.
4. Incorrect format for Safety Network Segment: Router Format.
5. Typos
Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897
Reviewed-on: https://code.wireshark.org/review/12321
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit 7a3dadf042acc5c6c4556ed2008fb02a2ae9bc23)
Reviewed-on: https://code.wireshark.org/review/12343
Actions performed:
from dd4d6ca Fix to avoid protection exception in cf_goto_frame
adds ddbc140 Bugfixes for EtherNet/IP and CIP
Summary of changes:
epan/dissectors/packet-cip.c | 45 ++++++++++++++++++++++++-----------------
epan/dissectors/packet-cip.h | 2 +-
epan/dissectors/packet-enip.c | 21 ++++++++++---------
epan/dissectors/packet-enip.h | 2 +-
4 files changed, 39 insertions(+), 31 deletions(-)