aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sflow.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-sflow.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-sflow.c')
-rw-r--r--epan/dissectors/packet-sflow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 65ad71bcba..e878cad70f 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -2474,7 +2474,7 @@ proto_register_sflow(void) {
FT_IPv4, BASE_NONE, NULL, 0x0,
"Destination IPv4 address", HFILL}},
{ &hf_sflow_245_nexthop_v6,
- { "Next hop", "sflow_245.nexthop",
+ { "Next hop", "sflow_245.nexthop.v6",
FT_IPv6, BASE_NONE, NULL, 0x0,
"Next hop address", HFILL}},
{ &hf_sflow_245_ipv6_src,