MIH: fix exists multiple times with NOT compatible types
authorAlexis La Goutte <alexis.lagoutte@gmail.com>
Sat, 20 Feb 2016 12:57:21 +0000 (13:57 +0100)
committerMichael Mann <mmann78@netscape.net>
Sat, 20 Feb 2016 16:40:22 +0000 (16:40 +0000)
'mih.tlv_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8
'mih.mihf_id' exists multiple times with NOT compatible types: FT_ETHER and FT_STRING
'mih.mihf_id' exists multiple times with NOT compatible types: FT_IPv4 and FT_ETHER
'mih.mihf_id' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4

Change-Id: Ib4be551920c7389100ece668e1af288a7d712725
Reviewed-on: https://code.wireshark.org/review/14027
Reviewed-by: Michael Mann <mmann78@netscape.net>
epan/dissectors/packet-mih.c

index dd0a894ef192631f6daf30e93482afbf5cd2d579..31c7a89e882e33d1b9bf91106a7033caf0f69e1a 100644 (file)
@@ -2415,7 +2415,7 @@ void proto_register_mih(void)
                         &hf_mih_type_length_ext,
                         {
                                 "MIH TLV length",
-                                "mih.tlv_length",
+                                "mih.tlv_length_ext",
                                 FT_UINT64,
                                 BASE_DEC,
                                 NULL,
@@ -2439,7 +2439,7 @@ void proto_register_mih(void)
                         &hf_mihf_id_mac,
                         {
                                 "MIHF_ID",
-                                "mih.mihf_id",
+                                "mih.mihf_id.mac",
                                 FT_ETHER,
                                 BASE_NONE,
                                 NULL,
@@ -2451,7 +2451,7 @@ void proto_register_mih(void)
                         &hf_mihf_id_ipv4,
                         {
                                 "MIHF_ID",
-                                "mih.mihf_id",
+                                "mih.mihf_id.ipv4",
                                 FT_IPv4,
                                 BASE_NONE,
                                 NULL,
@@ -2463,7 +2463,7 @@ void proto_register_mih(void)
                         &hf_mihf_id_ipv6,
                         {
                                 "MIHF_ID",
-                                "mih.mihf_id",
+                                "mih.mihf_id.ipv6",
                                 FT_IPv6,
                                 BASE_NONE,
                                 NULL,