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-lisp.c | |
parent | b68fb9b659b0debd7286195f9ad194be998cc3ff (diff) | |
download | wireshark-3d3f97320b90296bdb3649929bcc73a55823dee9.tar.gz |
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-lisp.c')
-rw-r--r-- | epan/dissectors/packet-lisp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index 189dc7aaa7..7f68a35b3e 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -515,7 +515,6 @@ get_addr_str(tvbuff_t *tvb, gint offset, guint16 afi, guint16 *addr_len) { const gchar *notset_str = "not set"; const gchar *addr_str; - guint32 locator_v4; struct e_in6_addr locator_v6; guint8 lcaf_type; guint32 iid, asn; @@ -526,9 +525,8 @@ get_addr_str(tvbuff_t *tvb, gint offset, guint16 afi, guint16 *addr_len) *addr_len = 0; return notset_str; case AFNUM_INET: - locator_v4 = tvb_get_ipv4(tvb, offset); *addr_len = INET_ADDRLEN; - addr_str = ip_to_str((guint8 *)&locator_v4); + addr_str = tvb_ip_to_str(tvb, offset); return addr_str; case AFNUM_INET6: tvb_get_ipv6(tvb, offset, &locator_v6); |