diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-04-03 02:29:52 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-04-03 16:03:26 +0000 |
| commit | 764b4d3bb3891f9edb57b09d4c7ab51b095b0730 (patch) | |
| tree | d6849b2b7346f198d08087d855c708b8794aff88 | |
| parent | c0186ba7f14a6ed9f337ad678e6297e244922a39 (diff) | |
netflow: decode RTT
From
commit 07eade8124fd1d5386161591b52e177ee6ea849f
Author: Brent Cook <brent@boundary.com>
Date: Fri Apr 19 12:59:45 2013 -0500
decode RTT
in https://github.com/boundary/wireshark, with some fixes made.
Change-Id: Ib0393fc201f59cfec566d4fe5309a1e06b641e8a
Reviewed-on: https://code.wireshark.org/review/36682
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
| -rw-r--r-- | epan/dissectors/packet-netflow.c | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 52ffd3373e..dab146d3ad 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -2020,7 +2020,7 @@ static const value_string v10_template_types_fastip[] = { { 3, "METER_OS_RELEASE"}, { 4, "METER_OS_VERSION"}, { 5, "METER_OS_MACHINE"}, - { 6, "TCP_IN_OUT_FLAGS"}, + { 6, "TCP_FLAGS"}, { 13, "EPOCH_SECOND"}, { 14, "NIC_NAME"}, { 15, "NIC_ID"}, @@ -3584,10 +3584,10 @@ static int hf_pie_fastip_meter_os_distribution = -1; static int hf_pie_fastip_bond_interface_mode = -1; static int hf_pie_fastip_bond_interface_physical_nic_count = -1; static int hf_pie_fastip_bond_interface_id = -1; -static int hf_pie_fastip_tcp_in_out_flags = -1; +*/ +static int hf_pie_fastip_tcp_flags = -1; static int hf_pie_fastip_tcp_handshake_rtt_usec = -1; static int hf_pie_fastip_app_rtt_usec = -1; -*/ static int hf_string_len_short = -1; static int hf_string_len_long = -1; @@ -7791,6 +7791,10 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_os_machine, tvb, offset, length, ENC_ASCII|ENC_NA); break; + case ((VENDOR_FASTIP << 16) | 6) : /* TCP_FLAGS */ + ti = proto_tree_add_item(pdutree, hf_pie_fastip_tcp_flags, + tvb, offset, length, ENC_NA); + break; case ((VENDOR_FASTIP << 16) | 23) : /* METER_OS_DISTRIBUTION */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_os_distribution, tvb, offset, length, ENC_ASCII|ENC_NA); @@ -7815,9 +7819,15 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, ti = proto_tree_add_item(pdutree, hf_pie_fastip_nic_ip, tvb, offset, length, ENC_NA); break; - + case ((VENDOR_FASTIP << 16) | 200) : /* TCP_HANDSHAKE_RTT_USEC */ + ti = proto_tree_add_item(pdutree, hf_pie_fastip_tcp_handshake_rtt_usec, + tvb, offset, length, ENC_BIG_ENDIAN); + break; + case ((VENDOR_FASTIP << 16) | 201) : /* APP_RTT_USEC */ + ti = proto_tree_add_item(pdutree, hf_pie_fastip_app_rtt_usec, + tvb, offset, length, ENC_BIG_ENDIAN); + break; /* - { 6, "TCP_IN_OUT_FLAGS"}, { 18, "COLLISIONS"}, { 19, "ERRORS"}, */ @@ -15100,10 +15110,22 @@ proto_register_netflow(void) {&hf_pie_fastip_bond_interface_mode {&hf_pie_fastip_bond_interface_physical_nic_count {&hf_pie_fastip_bond_interface_id - {&hf_pie_fastip_tcp_in_out_flags - {&hf_pie_fastip_tcp_handshake_rtt_usec - {&hf_pie_fastip_app_rtt_usec */ + {&hf_pie_fastip_tcp_handshake_rtt_usec, + {"TCP Handshake RTT uSec", "cflow.pie.fastip.tcp_handshake_rtt_usec", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL} + }, + {&hf_pie_fastip_app_rtt_usec, + {"App RTT uSec", "cflow.pie.fastip.app_rtt_usec", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL} + }, + {&hf_pie_fastip_tcp_flags, + {"TCP Flags", "cflow.pie.fastip.tcp_flags", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL} + }, /* ntop, 35632 / 80 */ {&hf_pie_ntop_src_fragments, {"Num fragmented packets src->dst", "cflow.pie.ntop.src_fragments", |