Do not use same name for filters with incompatible types

svn path=/trunk/; revision=43448

3 files changed, 59 insertions, 65 deletions

diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index 0f5e5b5110..bcddcc9828 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -1667,10 +1667,10 @@ proto_register_icmp(void)
       { "Address Family Identifier", "icmp.int_info.afi", FT_UINT16, BASE_DEC, NULL, 0x0, 
         "Address Family of the interface address", HFILL }},
     { &hf_icmp_int_info_ipv4,
-		{ "Source",		"icmp.int_info.ip", FT_IPv4, BASE_NONE, NULL, 0x0,
+		{ "Source",		"icmp.int_info.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
 			NULL, HFILL }},
     { &hf_icmp_int_info_ipv6,
-		{ "Source",		"icmp.int_info.ip", FT_IPv6, BASE_NONE, NULL, 0x0,
+		{ "Source",		"icmp.int_info.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0,
 			NULL, HFILL }}
   };
 
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index bd5984211b..6c7519071b 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -1284,6 +1284,10 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
                     proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr_eui64, tvb, opt_offset, 8, ENC_BIG_ENDIAN);
                     ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr_eui64, tvb, opt_offset, 8, ENC_BIG_ENDIAN);
                     PROTO_ITEM_SET_HIDDEN(ti_opt);
+                    ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr, tvb, opt_offset, 8, ENC_BIG_ENDIAN);
+                    PROTO_ITEM_SET_HIDDEN(ti_opt);
+                    ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr, tvb, opt_offset, 8, ENC_BIG_ENDIAN);
+                    PROTO_ITEM_SET_HIDDEN(ti_opt);
 
                     /* Padding: 6 bytes */
                     proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset + 8, 6, ENC_NA);
@@ -3864,13 +3868,13 @@ proto_register_icmpv6(void)
           { "Target Link-layer address", "icmpv6.opt.target_linkaddr", FT_ETHER, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_opt_linkaddr_eui64,
-          { "Link-layer address", "icmpv6.opt.linkaddr", FT_EUI64, BASE_NONE, NULL, 0x0,
+          { "Link-layer address", "icmpv6.opt.linkaddr_eui64", FT_EUI64, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
        { &hf_icmpv6_opt_src_linkaddr_eui64,
-          { "Source Link-layer address", "icmpv6.opt.src_linkaddr", FT_EUI64, BASE_NONE, NULL, 0x0,
+          { "Source Link-layer address", "icmpv6.opt.src_linkaddr_eui64", FT_EUI64, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
        { &hf_icmpv6_opt_target_linkaddr_eui64,
-          { "Target Link-layer address", "icmpv6.opt.target_linkaddr", FT_EUI64, BASE_NONE, NULL, 0x0,
+          { "Target Link-layer address", "icmpv6.opt.target_linkaddr_eui64", FT_EUI64, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_opt_prefix_len,
           { "Prefix Length", "icmpv6.opt.prefix.length", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -3921,7 +3925,7 @@ proto_register_icmpv6(void)
           { "Ext Length", "icmpv6.opt.cga.ext_length", FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_opt_cga_ext_data,
-          { "Ext Data", "icmpv6.opt.cga.ext_length", FT_BYTES, BASE_NONE, NULL, 0x0,
+          { "Ext Data", "icmpv6.opt.cga.ext_data", FT_BYTES, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_opt_rsa_key_hash,
           { "Key Hash", "icmpv6.opt.rsa.key_hash", FT_BYTES, BASE_NONE, NULL, 0x0,
@@ -4450,16 +4454,16 @@ proto_register_icmpv6(void)
            { "IPv4 subject address", "icmpv6.ni.query.subject_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
              NULL, HFILL }},
         { &hf_icmpv6_ni_reply_node_ttl,
-           { "TTL", "icmpv6.ni.query.subject_ipv4", FT_UINT32, BASE_DEC, NULL, 0x0,
+           { "TTL", "icmpv6.ni.reply.node_ttl", FT_UINT32, BASE_DEC, NULL, 0x0,
              NULL, HFILL }},
         { &hf_icmpv6_ni_reply_node_name,
-           { "Name Node", "icmpv6.ni.query.node_name", FT_STRING, BASE_NONE, NULL, 0x0,
+           { "Name Node", "icmpv6.ni.reply.node_name", FT_STRING, BASE_NONE, NULL, 0x0,
              NULL, HFILL }},
         { &hf_icmpv6_ni_reply_node_address,
-           { "IPv6 Node address", "icmpv6.ni.query.node_address", FT_IPv6, BASE_NONE, NULL, 0x0,
+           { "IPv6 Node address", "icmpv6.ni.reply.node_address", FT_IPv6, BASE_NONE, NULL, 0x0,
              NULL, HFILL }},
         { &hf_icmpv6_ni_reply_ipv4_address,
-           { "IPv4 Node address", "icmpv6.ni.query.ipv4_address", FT_IPv4, BASE_NONE, NULL, 0x0,
+           { "IPv4 Node address", "icmpv6.ni.reply.ipv4_address", FT_IPv4, BASE_NONE, NULL, 0x0,
              NULL, HFILL }},
 
         /* RPL: RFC 6550 : Routing over Low-Power and Lossy Networks. */
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 4b214a5c50..ffea620213 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -205,10 +205,8 @@ static int hf_tcp_option_mptcp_recv_key = -1;
 static int hf_tcp_option_mptcp_sender_rand = -1;
 static int hf_tcp_option_mptcp_sender_trunc_mac = -1;
 static int hf_tcp_option_mptcp_sender_mac = -1;
-static int hf_tcp_option_mptcp_data_ack4 = -1;
-static int hf_tcp_option_mptcp_data_ack8 = -1;
-static int hf_tcp_option_mptcp_data_seq_no4 = -1;
-static int hf_tcp_option_mptcp_data_seq_no8 = -1;
+static int hf_tcp_option_mptcp_data_ack = -1;
+static int hf_tcp_option_mptcp_data_seq_no = -1;
 static int hf_tcp_option_mptcp_subflow_seq_no = -1;
 static int hf_tcp_option_mptcp_data_lvl_len = -1;
 static int hf_tcp_option_mptcp_checksum = -1;
@@ -2567,21 +2565,21 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
     ti = proto_tree_add_text(opt_tree, tvb, offset, optlen, "Multipath TCP");
     mptcp_tree = proto_item_add_subtree(ti, ett_tcp_option_mptcp);
 
-    proto_tree_add_item(mptcp_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_NA);
+    proto_tree_add_item(mptcp_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
-    proto_tree_add_item(mptcp_tree, hf_tcp_option_len, tvb, offset, 1, ENC_NA);
+    proto_tree_add_item(mptcp_tree, hf_tcp_option_len, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
     proto_tree_add_item(mptcp_tree, hf_tcp_option_mptcp_subtype, tvb,
-                        offset, 1, ENC_NA);
+                        offset, 1, ENC_BIG_ENDIAN);
 
     subtype = tvb_get_guint8(tvb, offset) >> 4;
     proto_item_append_text(ti, ": %s", val_to_str(subtype, mptcp_subtype_vs, "Unknown (%d)"));
     switch (subtype) {
         case TCPOPT_MPTCP_MP_CAPABLE:
             proto_tree_add_item(mptcp_tree, hf_tcp_option_mptcp_version, tvb,
-                        offset, 1, ENC_NA);
+                        offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
 
             flags = tvb_get_guint8(tvb, offset);
@@ -2590,20 +2588,20 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
             mptcp_flags_tree = proto_item_add_subtree(ti, ett_tcp_option_mptcp);
 
             proto_tree_add_item(mptcp_flags_tree, hf_tcp_option_mptcp_C_flag,
-                        tvb, offset, 1, ENC_NA);
+                        tvb, offset, 1, ENC_BIG_ENDIAN);
             proto_tree_add_item(mptcp_flags_tree, hf_tcp_option_mptcp_S_flag,
-                        tvb, offset, 1, ENC_NA);
+                        tvb, offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
 
             if (optlen == 12 || optlen == 20) {
                 proto_tree_add_item(mptcp_tree,
-                        hf_tcp_option_mptcp_sender_key, tvb, offset, 8, ENC_NA);
+                        hf_tcp_option_mptcp_sender_key, tvb, offset, 8, ENC_BIG_ENDIAN);
                 offset += 8;
             }
 
             if (optlen == 20) {
                 proto_tree_add_item(mptcp_tree,
-                        hf_tcp_option_mptcp_recv_key, tvb, offset, 8, ENC_NA);
+                        hf_tcp_option_mptcp_recv_key, tvb, offset, 8, ENC_BIG_ENDIAN);
             }
             break;
 
@@ -2619,22 +2617,22 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
 
                     proto_tree_add_item(mptcp_flags_tree,
                             hf_tcp_option_mptcp_B_flag, tvb, offset,
-                            1, ENC_NA);
+                            1, ENC_BIG_ENDIAN);
                     offset += 1;
 
                     proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_address_id, tvb, offset,
-                            1, ENC_NA);
+                            1, ENC_BIG_ENDIAN);
                     offset += 1;
 
                     proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_recv_token, tvb, offset,
-                            4, ENC_NA);
+                            4, ENC_BIG_ENDIAN);
                     offset += 4;
 
                     proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_sender_rand, tvb, offset,
-                            4, ENC_NA);
+                            4, ENC_BIG_ENDIAN);
                     break;
 
                 case 16:
@@ -2647,22 +2645,22 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
 
                     proto_tree_add_item(mptcp_flags_tree,
                             hf_tcp_option_mptcp_B_flag, tvb, offset,
-                            1, ENC_NA);
+                            1, ENC_BIG_ENDIAN);
                     offset += 1;
 
                     proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_address_id, tvb, offset,
-                            1, ENC_NA);
+                            1, ENC_BIG_ENDIAN);
                     offset += 1;
 
                     proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_sender_trunc_mac, tvb, offset,
-                            8, ENC_NA);
+                            8, ENC_BIG_ENDIAN);
                     offset += 8;
 
                     proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_sender_rand, tvb, offset,
-                            4, ENC_NA);
+                            4, ENC_BIG_ENDIAN);
                     break;
 
                 case 24:
@@ -2670,7 +2668,7 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
                     for (index = 0; index < 5; index++) {
                         proto_tree_add_item(mptcp_tree,
                                 hf_tcp_option_mptcp_sender_mac, tvb, offset,
-                                4, ENC_NA);
+                                4, ENC_BIG_ENDIAN);
                         offset += 4;
                     }
                     break;
@@ -2688,27 +2686,27 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
             mptcp_flags_tree = proto_item_add_subtree(ti, ett_tcp_option_mptcp);
 
             proto_tree_add_item(mptcp_flags_tree, hf_tcp_option_mptcp_F_flag,
-                            tvb, offset, 1, ENC_NA);
+                            tvb, offset, 1, ENC_BIG_ENDIAN);
             proto_tree_add_item(mptcp_flags_tree, hf_tcp_option_mptcp_m_flag,
-                            tvb, offset, 1, ENC_NA);
+                            tvb, offset, 1, ENC_BIG_ENDIAN);
             proto_tree_add_item(mptcp_flags_tree, hf_tcp_option_mptcp_M_flag,
-                            tvb, offset, 1, ENC_NA);
+                            tvb, offset, 1, ENC_BIG_ENDIAN);
             proto_tree_add_item(mptcp_flags_tree, hf_tcp_option_mptcp_a_flag,
-                            tvb, offset, 1, ENC_NA);
+                            tvb, offset, 1, ENC_BIG_ENDIAN);
             proto_tree_add_item(mptcp_flags_tree, hf_tcp_option_mptcp_A_flag,
-                            tvb, offset, 1, ENC_NA);
+                            tvb, offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
 
             if (flags & 1) {
                 if (flags & 2) {
                     proto_tree_add_item(mptcp_tree,
-                            hf_tcp_option_mptcp_data_ack8, tvb, offset,
-                            8, ENC_NA);
+                            hf_tcp_option_mptcp_data_ack, tvb, offset,
+                            8, ENC_BIG_ENDIAN);
                     offset += 8;
                 } else {
                     proto_tree_add_item(mptcp_tree,
-                            hf_tcp_option_mptcp_data_ack4, tvb, offset,
-                            4, ENC_NA);
+                            hf_tcp_option_mptcp_data_ack, tvb, offset,
+                            4, ENC_BIG_ENDIAN);
                     offset += 4;
                 }
             }
@@ -2716,46 +2714,46 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
             if (flags & 4) {
                 if (flags & 8) {
                     proto_tree_add_item(mptcp_tree,
-                            hf_tcp_option_mptcp_data_seq_no8, tvb, offset,
-                            8, ENC_NA);
+                            hf_tcp_option_mptcp_data_seq_no, tvb, offset,
+                            8, ENC_BIG_ENDIAN);
                     offset += 8;
                 } else {
                     proto_tree_add_item(mptcp_tree,
-                            hf_tcp_option_mptcp_data_seq_no4, tvb, offset,
-                            4, ENC_NA);
+                            hf_tcp_option_mptcp_data_seq_no, tvb, offset,
+                            4, ENC_BIG_ENDIAN);
                     offset += 4;
                 }
 
                 proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_subflow_seq_no, tvb, offset,
-                            4, ENC_NA);
+                            4, ENC_BIG_ENDIAN);
                 offset += 4;
 
                 proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_data_lvl_len, tvb, offset,
-                            2, ENC_NA);
+                            2, ENC_BIG_ENDIAN);
                 offset += 2;
 
                 proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_checksum, tvb, offset,
-                            2, ENC_NA);
+                            2, ENC_BIG_ENDIAN);
             }
             break;
 
         case TCPOPT_MPTCP_ADD_ADDR:
             proto_tree_add_item(mptcp_tree,
-                            hf_tcp_option_mptcp_ipver, tvb, offset, 1, ENC_NA);
+                            hf_tcp_option_mptcp_ipver, tvb, offset, 1, ENC_BIG_ENDIAN);
             ipver = tvb_get_guint8(tvb, offset) & 0x0F;
             offset += 1;
 
             proto_tree_add_item(mptcp_tree,
-                    hf_tcp_option_mptcp_address_id, tvb, offset, 1, ENC_NA);
+                    hf_tcp_option_mptcp_address_id, tvb, offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
 
             switch (ipver) {
                 case 4:
                     proto_tree_add_item(mptcp_tree,
-                            hf_tcp_option_mptcp_ipv4, tvb, offset, 4, ENC_NA);
+                            hf_tcp_option_mptcp_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
                     offset += 4;
                     break;
 
@@ -2771,7 +2769,7 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
 
             if (optlen % 4 == 2) {
                 proto_tree_add_item(mptcp_tree,
-                            hf_tcp_option_mptcp_port, tvb, offset, 2, ENC_NA);
+                            hf_tcp_option_mptcp_port, tvb, offset, 2, ENC_BIG_ENDIAN);
             }
             break;
 
@@ -2779,7 +2777,7 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
             offset += 1;
             proto_tree_add_item(mptcp_tree,
                             hf_tcp_option_mptcp_address_id, tvb, offset,
-                            1, ENC_NA);
+                            1, ENC_BIG_ENDIAN);
             break;
 
         case TCPOPT_MPTCP_MP_PRIO:
@@ -2789,12 +2787,12 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
             mptcp_flags_tree = proto_item_add_subtree(ti, ett_tcp_option_mptcp);
 
             proto_tree_add_item(mptcp_flags_tree, hf_tcp_option_mptcp_B_flag,
-                            tvb, offset, 1, ENC_NA);
+                            tvb, offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
 
             if (optlen == 4) {
                 proto_tree_add_item(mptcp_tree,
-                        hf_tcp_option_mptcp_address_id, tvb, offset, 1, ENC_NA);
+                        hf_tcp_option_mptcp_address_id, tvb, offset, 1, ENC_BIG_ENDIAN);
             }
             break;
 
@@ -2802,7 +2800,7 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
             offset += 1;
             offset += 1;
             proto_tree_add_item(mptcp_tree,
-                    hf_tcp_option_mptcp_data_seq_no8, tvb, offset, 8, ENC_NA);
+                    hf_tcp_option_mptcp_data_seq_no, tvb, offset, 8, ENC_BIG_ENDIAN);
             break;
 
         default:
@@ -5152,19 +5150,11 @@ proto_register_tcp(void)
           { "Multipath TCP Sender's MAC", "tcp.options.mptcp.sendmac", FT_UINT32,
             BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
-        { &hf_tcp_option_mptcp_data_ack4,
-          { "Multipath TCP Data ACK", "tcp.options.mptcp.dataack", FT_UINT32,
-            BASE_DEC, NULL, 0x0, NULL, HFILL}},
-
-        { &hf_tcp_option_mptcp_data_ack8,
+        { &hf_tcp_option_mptcp_data_ack,
           { "Multipath TCP Data ACK", "tcp.options.mptcp.dataack", FT_UINT64,
             BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
-        { &hf_tcp_option_mptcp_data_seq_no4,
-          { "Multipath TCP Data Sequence Number", "tcp.options.mptcp.dataseqno", FT_UINT32,
-            BASE_DEC, NULL, 0x0, NULL, HFILL}},
-
-        { &hf_tcp_option_mptcp_data_seq_no8,
+        { &hf_tcp_option_mptcp_data_seq_no,
           { "Multipath TCP Data Sequence Number", "tcp.options.mptcp.dataseqno", FT_UINT64,
             BASE_DEC, NULL, 0x0, NULL, HFILL}},