Wireshark-commits: [Wireshark-commits] master 103214a: CIP: Restore path information to Info column
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=103214abfe15da8c2d321255e90202e36ad17093
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
103214a by D. Ulis (daulis0@xxxxxxxxx):
CIP: Restore path information to Info column
When the "Display enhanced Info column data" preference is set, ensure that:
1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages
2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy)
This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct.
Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1
Reviewed-on: https://code.wireshark.org/review/14458
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from ec07578 Try to suppress a compiler feature that goes wrong.
adds 103214a CIP: Restore path information to Info column
Summary of changes:
epan/dissectors/packet-cip.c | 48 ++++++++++++++++++------------------
epan/dissectors/packet-cip.h | 2 +-
epan/dissectors/packet-cipsafety.c | 4 +--
3 files changed, 27 insertions(+), 27 deletions(-)