osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Alexis La Goutte 2017-06-06 13:54:45 +00:00 committed by Michael Mann
parent 756d609947
commit ba86dc303d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-netflow.c
View File

@ -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}
},