aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sap.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-02-23 14:05:28 +0100
committerAnders Broman <a.broman58@gmail.com>2016-02-23 20:33:26 +0000
commitfa20bbb677e7adfdf2761025fc16c5abff077ed4 (patch)
treeac1edc1a511ff4ffad040896821ed768e4c06661 /epan/dissectors/packet-sap.c
parent5635f494978796d3add5e3195bf74d7b71a9cd36 (diff)
fix exists multiple times with NOT compatible types: IPv4/IPv6/Bytes
'rsip.parameter.address' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'sap.originating_source' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'sflow_245.nexthop' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: Idabe9adafac2e11f2e90a494e5fac1a341edca33 Reviewed-on: https://code.wireshark.org/review/14091 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-sap.c')
-rw-r--r--epan/dissectors/packet-sap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c
index 6adefd088c..60ee0e3c55 100644
--- a/epan/dissectors/packet-sap.c
+++ b/epan/dissectors/packet-sap.c
@@ -344,7 +344,7 @@ void proto_register_sap(void)
{ &hf_sap_auth_len, { "Authentication Length", "sap.auth.len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_sap_message_identifier_hash, { "Message Identifier Hash", "sap.message_identifier_hash", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_sap_originating_source_ipv4, { "Originating Source", "sap.originating_source", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- { &hf_sap_originating_source_ipv6, { "Originating Source", "sap.originating_source", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_sap_originating_source_ipv6, { "Originating Source", "sap.originating_source.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_sap_auth_subheader, { "Authentication subheader", "sap.auth.subheader", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_sap_auth_data_padding, { "Authentication data padding", "sap.auth.data_padding", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_sap_auth_data_padding_len, { "Authentication data pad count (bytes)", "sap.auth.data_padding.len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},