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-dtpt.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-dtpt.c')
| -rw-r--r-- | epan/dissectors/packet-dtpt.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index 45406f0180..2e245fb8a2 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -352,16 +352,14 @@ dissect_dtpt_sockaddr(tvbuff_t *tvb, guint offset, proto_tree *tree, int hfindex switch (family) { case WINSOCK_AF_INET: { guint16 port; - guint32 addr; port = tvb_get_ntohs(tvb,offset+2); proto_tree_add_uint(sockaddr_tree, hf_dtpt_sockaddr_port, - tvb, offset+2,2,port); - addr = tvb_get_ipv4(tvb,offset+4); - proto_tree_add_ipv4(sockaddr_tree, hf_dtpt_sockaddr_address, - tvb, offset+4,4,addr); + tvb, offset+2,2,port); + proto_tree_add_item(sockaddr_tree, hf_dtpt_sockaddr_address, + tvb, offset+4,4,ENC_BIG_ENDIAN); proto_tree_add_item(sockaddr_tree, hf_dtpt_padding, tvb, offset+8, 8, ENC_NA); - proto_item_append_text(sockaddr_item, ": %s:%d", ip_to_str((guint8*)&addr), port); + proto_item_append_text(sockaddr_item, ": %s:%d", tvb_ip_to_str(tvb,offset+4), port); } break; } @@ -376,17 +374,15 @@ dissect_dtpt_sockaddr(tvbuff_t *tvb, guint offset, proto_tree *tree, int hfindex switch (family) { case WINSOCK_AF_INET: { guint16 port; - guint32 addr; proto_tree_add_item(sockaddr_tree, hf_dtpt_padding, tvb, offset+4, 4, ENC_NA); port = tvb_get_ntohs(tvb,offset+8); proto_tree_add_uint(sockaddr_tree, hf_dtpt_sockaddr_port, tvb, offset+8,2,port); - addr = tvb_get_ipv4(tvb,offset+10); - proto_tree_add_ipv4(sockaddr_tree, hf_dtpt_sockaddr_address, - tvb, offset+10,4,addr); + proto_tree_add_item(sockaddr_tree, hf_dtpt_sockaddr_address, + tvb, offset+10,4,ENC_BIG_ENDIAN); proto_tree_add_item(sockaddr_tree, hf_dtpt_padding, tvb, offset+14, 16, ENC_NA); - proto_item_append_text(sockaddr_item, ": %s:%d", ip_to_str((guint8*)&addr), port); + proto_item_append_text(sockaddr_item, ": %s:%d", tvb_ip_to_str(tvb,offset+10), port); } break; } |