diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-11-20 10:13:18 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-11-20 16:48:39 +0000 |
| commit | cbbaf1d9343d0e063e9b46ca3c69706e9ee32075 (patch) | |
| tree | 25cd99ca5b93df7cf647c833fa9903f28ebe0152 /epan | |
| parent | 88f65ca0756ea1252e180dd69aa0c690c3f8c9f3 (diff) | |
uftp4: Fix conflict for hf fields
'uftp4.announce.publicmcast' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'uftp4.announce.privatemcast' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'uftp4.fileinfo.tstamp' exists multiple times with NOT compatible types: FT_ABSOLUTE_TIME and FT_UINT32
Change-Id: I94b235e9ba8ebe8a036620f9537eb674f418f1e5
Reviewed-on: https://code.wireshark.org/review/18882
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-uftp4.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-uftp4.c b/epan/dissectors/packet-uftp4.c index 1d45b9fd46..8482a77667 100644 --- a/epan/dissectors/packet-uftp4.c +++ b/epan/dissectors/packet-uftp4.c @@ -2396,19 +2396,19 @@ void proto_register_uftp4(void) FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0x0, NULL, HFILL } }, { &hf_uftp_announce_publicmcast_ipv4, - { "Public Multicast Address", "uftp4.announce.publicmcast", + { "Public Multicast Address", "uftp4.announce.publicmcast.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_uftp_announce_publicmcast_ipv6, - { "Public Multicast Address", "uftp4.announce.publicmcast", + { "Public Multicast Address", "uftp4.announce.publicmcast.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_uftp_announce_privatemcast_ipv4, - { "Private Multicast Address", "uftp4.announce.privatemcast", + { "Private Multicast Address", "uftp4.announce.privatemcast.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_uftp_announce_privatemcast_ipv6, - { "Private Multicast Address", "uftp4.announce.privatemcast", + { "Private Multicast Address", "uftp4.announce.privatemcast.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_uftp_encinfo, @@ -2680,7 +2680,7 @@ void proto_register_uftp4(void) FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_uftp_fileinfo_ftstamp, - { "File Timestamp", "uftp4.fileinfo.tstamp", + { "File Timestamp", "uftp4.fileinfo.ftstamp", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_uftp_fileinfo_tstamp, |