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

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

Commits:

5beb48b by Michael Mann (mmann78@xxxxxxxxxxxx):

    Fix some hf_ field datatype conflicts.
    
    'ieee17221.clock_source_id' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64
    'ieee17221.stream_format' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64
    'afp.unknown' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES
    'afp.toc_offset' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64
    'bootp.client_id.iaid' exists multiple times with NOT compatible types: FT_UINT32 and FT_STRING
    'bthfp.chld.mode' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
    'canopen.pdo.data' exists multiple times with NOT compatible types: FT_STRINGZ and FT_BYTES
    'canopen.sdo.data' exists multiple times with NOT compatible types: FT_UINT32 and FT_BYTES
    'ceph.msg.' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'ceph.version' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64
    'cip.linkaddress' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
    'dnp3.al.ana' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32
    'dnp3.al.anaout' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32
    'dtls.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16
    'ssl.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16
    'dvb-s2_gse.label' exists multiple times with NOT compatible types: FT_UINT24 and FT_ETHER
    'fcdns.rply.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8
    'fcdns.req.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8
    'icmp.int_info.name' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN
    'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8
    'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'mausb.clear_transfers.status' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE
    'mikey.v' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE
    'mswsp.rangeboundry.ultype' exists multiple times with NOT compatible types: FT_STRING and FT_UINT32
    'mswsp.arrayvector.address64' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'nlm.lock.l_offset' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'nlm.lock.l_len' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'pflog.saddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'pflog.daddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'pflog.saddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6
    'pflog.daddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6
    'pgm.spm.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'pgm.nak.src' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'pgm.nak.grp' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'pgm.poll.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6
    'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'pgm.opts.redirect.dlr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    
    Change-Id: Iaf694699d108a12db172da8dd9fbab211adb329d
    Reviewed-on: https://code.wireshark.org/review/14070
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  1ac725f   packet-cigi.c: Fix conflicting datatypes for hf_ fields.
    adds  5beb48b   Fix some hf_ field datatype conflicts.


Summary of changes:
 epan/dissectors/packet-afp.c       |    4 ++--
 epan/dissectors/packet-bootp.c     |    2 +-
 epan/dissectors/packet-bthfp.c     |    2 +-
 epan/dissectors/packet-canopen.c   |    8 ++++----
 epan/dissectors/packet-ceph.c      |    6 +++---
 epan/dissectors/packet-cip.c       |    4 ++--
 epan/dissectors/packet-dnp.c       |   16 +++++++--------
 epan/dissectors/packet-dtn.c       |   40 ++++++++++++++++++------------------
 epan/dissectors/packet-dvb-s2-bb.c |    2 +-
 epan/dissectors/packet-fcdns.c     |    4 ++--
 epan/dissectors/packet-icmp.c      |   15 +++++++-------
 epan/dissectors/packet-icmpv6.c    |    6 +++---
 epan/dissectors/packet-ieee17221.c |    4 ++--
 epan/dissectors/packet-isi.c       |    2 +-
 epan/dissectors/packet-mausb.c     |    2 +-
 epan/dissectors/packet-mikey.c     |    2 +-
 epan/dissectors/packet-mswsp.c     |    6 +++---
 epan/dissectors/packet-nlm.c       |    4 ++--
 epan/dissectors/packet-pflog.c     |   12 +++++------
 epan/dissectors/packet-pgm.c       |   28 ++++++++++++-------------
 epan/dissectors/packet-ssl-utils.h |    2 +-
 21 files changed, 85 insertions(+), 86 deletions(-)