[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=fb033d0f39eda3f3937ae265c422ad907b179f42
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

fb033d0 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Add CIP Security objects
    
    These objects are defined in Volume 8, but it doesn't make sense to create a new dissector file for them, so just distribute them where it makes the most sense in the existing CIP dissectors.
    
    Also do some conversions to proto_tree_add_bitmask while in the neighborhood.
    
    Add support for EtherNet/IP over DTLS/TLS.
    
    Change-Id: I4e658e8871eebb222816229de7594ff766264308
    Reviewed-on: https://code.wireshark.org/review/13710
    Reviewed-by: D. Ulis <daulis0@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  b1aa1be   couchbase: Use some unused hf (and remove unused hf...)
    adds  fb033d0   Add CIP Security objects


Summary of changes:
 epan/dissectors/packet-cip.c  |   17 +
 epan/dissectors/packet-enip.c |  715 ++++++++++++++++++++++++++++++++++++-----
 epan/dissectors/packet-enip.h |    2 +-
 3 files changed, 654 insertions(+), 80 deletions(-)