From 5beb48b843e7e8194539f795688cf47c5c7aea28 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 21 Feb 2016 20:19:02 -0500 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-dnp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'epan/dissectors/packet-dnp.c') diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index dec40482a3..956b523833 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -3987,49 +3987,49 @@ proto_register_dnp3(void) }, { &hf_dnp3_al_ana16, - { "Value (16 bit)", "dnp3.al.ana", + { "Value (16 bit)", "dnp3.al.ana.int", FT_INT16, BASE_DEC, NULL, 0x0, "Analog Value (16 bit)", HFILL } }, { &hf_dnp3_al_ana32, - { "Value (32 bit)", "dnp3.al.ana", + { "Value (32 bit)", "dnp3.al.ana.int", FT_INT32, BASE_DEC, NULL, 0x0, "Analog Value (32 bit)", HFILL } }, { &hf_dnp3_al_anaflt, - { "Value (float)", "dnp3.al.ana", + { "Value (float)", "dnp3.al.ana.float", FT_FLOAT, BASE_NONE, NULL, 0x0, "Analog Value (float)", HFILL } }, { &hf_dnp3_al_anadbl, - { "Value (double)", "dnp3.al.ana", + { "Value (double)", "dnp3.al.ana.double", FT_DOUBLE, BASE_NONE, NULL, 0x0, "Analog Value (double)", HFILL } }, { &hf_dnp3_al_anaout16, - { "Output Value (16 bit)", "dnp3.al.anaout", + { "Output Value (16 bit)", "dnp3.al.anaout.int", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_dnp3_al_anaout32, - { "Output Value (32 bit)", "dnp3.al.anaout", + { "Output Value (32 bit)", "dnp3.al.anaout.int", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_dnp3_al_anaoutflt, - { "Output Value (float)", "dnp3.al.anaout", + { "Output Value (float)", "dnp3.al.anaout.float", FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_dnp3_al_anaoutdbl, - { "Output (double)", "dnp3.al.anaout", + { "Output (double)", "dnp3.al.anaout.double", FT_DOUBLE, BASE_NONE, NULL, 0x0, "Output Value (double)", HFILL } }, -- cgit v1.2.3