diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-21 08:02:26 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-26 21:17:10 +0000 |
| commit | 3d3f97320b90296bdb3649929bcc73a55823dee9 (patch) | |
| tree | 4b906cf0a1e6e25371fc6eecbef89461d90c0cff /epan/dissectors/packet-nt-tpcp.c | |
| parent | b68fb9b659b0debd7286195f9ad194be998cc3ff (diff) | |
Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-nt-tpcp.c')
| -rw-r--r-- | epan/dissectors/packet-nt-tpcp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index 9fbbd1a293..a3b9af761c 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -106,7 +106,6 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_item *ti; guint8 version, type; guint16 id, cport; - guint32 caddr, saddr; static const int * tpcp_flags[] = { &hf_tpcp_flags_tcp, @@ -144,10 +143,7 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_uint_format_value(tpcp_tree, hf_tpcp_cport, tvb, 6, 2, cport, "%s", ep_udp_port_to_display(cport)); - caddr = tvb_get_ntohl(tvb, 8); proto_tree_add_item(tpcp_tree, hf_tpcp_caddr, tvb, 8, 4, ENC_BIG_ENDIAN); - - saddr = tvb_get_ntohl(tvb, 12); proto_tree_add_item(tpcp_tree, hf_tpcp_saddr, tvb, 12, 4, ENC_BIG_ENDIAN); if (version == TPCP_VER_2) { @@ -160,8 +156,8 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ val_to_str_const(type, type_vals, "Unknown"), id, ep_udp_port_to_display(cport), - ip_to_str((guint8 *)&caddr), - ip_to_str((guint8 *)&saddr)); + tvb_ip_to_str(tvb, 8), + tvb_ip_to_str(tvb, 12)); if (version == TPCP_VER_1) return TPCP_VER_1_LENGTH; |