diff options
| author | Uli Heilmeier <uh@heilmeier.eu> | 2017-11-04 19:13:07 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-11-04 23:43:59 +0000 |
| commit | 7e6f6562fa1cef1ad67c0839477767ba5c0e43ce (patch) | |
| tree | bf60d909e79af04e37c0c5f0540eb76127422e23 /epan/dissectors/packet-tcp.c | |
| parent | fc318e6a1f2da11e3429e58cd9d2893899f547af (diff) | |
TCP: cleanup Riverbed option
Remove duplicate length field to adjust to the other options.
tcp.options.rvbd.probe.len has already reported by tcp.option_len
Add missing space between "Transparency" and IP address.
Change-Id: I8b4260b34d760b73ee529a687418c4b6adcfaa0e
Reviewed-on: https://code.wireshark.org/review/24239
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index fc1deb7111..8951a0d269 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -224,7 +224,6 @@ static int hf_tcp_option_rvbd_probe_version1 = -1; static int hf_tcp_option_rvbd_probe_version2 = -1; static int hf_tcp_option_rvbd_probe_type1 = -1; static int hf_tcp_option_rvbd_probe_type2 = -1; -static int hf_tcp_option_rvbd_probe_optlen = -1; static int hf_tcp_option_rvbd_probe_prober = -1; static int hf_tcp_option_rvbd_probe_proxy = -1; static int hf_tcp_option_rvbd_probe_client = -1; @@ -5075,8 +5074,6 @@ dissect_tcpopt_rvbd_probe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_tcp_option_len, tvb, offset + PROBE_OPTLEN_OFFSET, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_optlen, tvb, - offset + PROBE_OPTLEN_OFFSET, 1, ENC_BIG_ENDIAN); if (ver == PROBE_VERSION_1) { guint16 port; @@ -5304,8 +5301,6 @@ dissect_tcpopt_rvbd_trpy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_tcp_option_len, tvb, offset + PROBE_OPTLEN_OFFSET, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_optlen, tvb, - offset + PROBE_OPTLEN_OFFSET, 1, ENC_BIG_ENDIAN); flags = tvb_get_ntohs(tvb, offset + TRPY_OPTIONS_OFFSET); proto_tree_add_bitmask_with_flags(field_tree, tvb, offset + TRPY_OPTIONS_OFFSET, hf_tcp_option_rvbd_trpy_flags, @@ -5325,7 +5320,7 @@ dissect_tcpopt_rvbd_trpy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo proto_tree_add_item(field_tree, hf_tcp_option_rvbd_trpy_dst_port, tvb, offset + TRPY_DST_PORT_OFFSET, 2, ENC_BIG_ENDIAN); - proto_item_append_text(pitem, "%s:%u -> %s:%u", + proto_item_append_text(pitem, " %s:%u -> %s:%u", tvb_ip_to_str(tvb, offset + TRPY_SRC_ADDR_OFFSET), sport, tvb_ip_to_str(tvb, offset + TRPY_DST_ADDR_OFFSET), dport); @@ -7060,10 +7055,6 @@ proto_register_tcp(void) { "Version", "tcp.options.rvbd.probe.version_raw", FT_UINT8, BASE_DEC, NULL, 0x01, "Version 2 Raw Value", HFILL }}, - { &hf_tcp_option_rvbd_probe_optlen, - { "Length", "tcp.options.rvbd.probe.len", - FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_tcp_option_rvbd_probe_prober, { "CSH IP", "tcp.options.rvbd.probe.prober", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, |