diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-27 11:13:47 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-03-27 10:54:01 +0000 |
| commit | c5dd3a1fdf5469fa1dfb35cfcc948b3e2a858e7f (patch) | |
| tree | 7c6716b687d9c43fe1ea178d2210232e20bb26aa /epan/dissectors/packet-netflow.c | |
| parent | ff6058039a4e4e1b2d4277e88ff92ebcc70edfcc (diff) | |
netflow fix conflict for hf field
'cflow.transport_rtt' exists multiple times with NOT compatible types: FT_RELATIVE_TIME and FT_UINT32
'cflow.transport_jitter_mean' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
'cflow.transport_jitter_min' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
'cflow.transport_jitter_max' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
Change-Id: I3ee220646412235eb3bce58ce3a7bc0547a5a90d
Reviewed-on: https://code.wireshark.org/review/20735
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-netflow.c')
| -rw-r--r-- | epan/dissectors/packet-netflow.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 429b7ae1f9..77c03a1173 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -10032,7 +10032,7 @@ proto_register_netflow(void) }, {&hf_cflow_transport_round_trip_time_string, {"Transport Round-Trip-Time", - "cflow.transport_rtt", + "cflow.transport_rtt.string", FT_UINT32, BASE_HEX, VALS(performance_monitor_specials), 0x0, NULL, HFILL} }, @@ -10086,7 +10086,7 @@ proto_register_netflow(void) }, {&hf_cflow_transport_rtp_jitter_mean_string, {"RTP Mean Jitter", - "cflow.transport_jitter_mean", + "cflow.transport_jitter_mean.string", FT_UINT32, BASE_HEX, VALS(performance_monitor_specials), 0x0, NULL, HFILL} }, @@ -10098,7 +10098,7 @@ proto_register_netflow(void) }, {&hf_cflow_transport_rtp_jitter_min_string, {"RTP Min Jitter", - "cflow.transport_jitter_min", + "cflow.transport_jitter_min.string", FT_UINT32, BASE_HEX, VALS(performance_monitor_specials), 0x0, NULL, HFILL} }, @@ -10110,7 +10110,7 @@ proto_register_netflow(void) }, {&hf_cflow_transport_rtp_jitter_max_string, {"RTP Max Jitter", - "cflow.transport_jitter_max", + "cflow.transport_jitter_max.string", FT_UINT32, BASE_HEX, VALS(performance_monitor_specials), 0x0, NULL, HFILL} }, |