aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cdp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-12-21 08:02:26 -0500
committerMichael Mann <mmann78@netscape.net>2014-12-26 21:17:10 +0000
commit3d3f97320b90296bdb3649929bcc73a55823dee9 (patch)
tree4b906cf0a1e6e25371fc6eecbef89461d90c0cff /epan/dissectors/packet-cdp.c
parentb68fb9b659b0debd7286195f9ad194be998cc3ff (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-cdp.c')
-rw-r--r--epan/dissectors/packet-cdp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index 3b6bd1249e..36d47daefe 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -1167,7 +1167,7 @@ static void
dissect_nrgyz_tlv(tvbuff_t *tvb, packet_info* pinfo, int offset, guint16 length, guint16 num,
proto_tree *tree)
{
- guint32 tlvt, tlvl, ip_addr;
+ guint32 tlvt, tlvl;
proto_tree *etree = NULL;
char const *ttext = NULL;
@@ -1196,11 +1196,10 @@ dissect_nrgyz_tlv(tvbuff_t *tvb, packet_info* pinfo, int offset, guint16 length,
);
break;
case TYPE_NRGYZ_REPLYTO:
- ip_addr = tvb_get_ipv4(tvb, offset + 12);
etree = proto_tree_add_subtree_format(tree, tvb, offset,
tlvl, ett_cdp_nrgyz_tlv, NULL, "EnergyWise %s: %s port %u",
ttext,
- ip_to_str((guint8 *)&ip_addr),
+ tvb_ip_to_str(tvb, offset + 12),
tvb_get_ntohs(tvb, offset + 10)
);
break;