diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-06-06 13:54:45 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-06 16:13:12 +0000 |
| commit | ba86dc303da0d62650c0136967c18eba62cc8eaa (patch) | |
| tree | e4a89fe6bd4d1a66bf684657e3caffeae2a15e4b /epan/dissectors/packet-netflow.c | |
| parent | 756d609947bcc0a7321f662f8201544f77f7366f (diff) | |
netflow/cflow: fix hf conflict
'cflow.pie.ntop.retransmitted_out_bytes' exists multiple times with NOT compatible types: FT_IPv6 and FT_UINT32
Change-Id: I9caed4c28a5e8322008b4cae4f625a681343a136
Reviewed-on: https://code.wireshark.org/review/21984
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-netflow.c')
| -rw-r--r-- | epan/dissectors/packet-netflow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index c791c6365d..ca764f8524 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -14607,7 +14607,7 @@ proto_register_netflow(void) }, /* ntop, 35632 / 397 */ {&hf_pie_ntop_untunneled_ipv6_dst_addr, - {"Untunneled IPv6 destination address", "cflow.pie.ntop.retransmitted_out_bytes", + {"Untunneled IPv6 destination address", "cflow.pie.ntop.untunneled_ipv6_dst_addr", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL} }, |