Wireshark-commits: [Wireshark-commits] master 0246f2d: Don't let the existence of a protocol tree a

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 14 Mar 2016 02:36:01 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0246f2d8a0d1d4e7a7c35fc5b768af31b4041da1
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0246f2d by Guy Harris (guy@xxxxxxxxxxxx):

    Don't let the existence of a protocol tree affect what's in the Info column.
    
    A dissector must never assume that it will, or won't, be called with a
    protocol tree; it's up to the Wireshark/TShark/etc. core to decide
    whether to do it, and it can change its behavior over time or even
    change it from release to release.
    
    Have dissect_epath() take an argument that explicitly indicates whether
    to add the CIP class to the Info column, rather than assuming that you
    do so only if the tree pointer passed to it is null.
    
    Bug: 12257
    Change-Id: Ide8a6fc21252880f849a8d0aa4659a675bb3ae04
    Reviewed-on: https://code.wireshark.org/review/14456
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  8cb41a9   Handle RADIUS ident reuse better.
    adds  0246f2d   Don't let the existence of a protocol tree affect what's in the Info column.


Summary of changes:
 epan/dissectors/packet-cip.c       |   27 ++++++++++++++-------------
 epan/dissectors/packet-cip.h       |    3 ++-
 epan/dissectors/packet-cipsafety.c |    4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)