diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-21 12:38:13 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-28 14:09:27 +0000 |
| commit | 1d598bbff76f915ec961d301f5eb0eef03d46d0a (patch) | |
| tree | 2908958a3f78d53a8f10036e7f8ac01ed1b390d1 /epan/dissectors/packet-lisp.c | |
| parent | 9fce4dd4cb47965870d870b77983f8d2c501c810 (diff) | |
Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
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 7f68a35b3e..30ae2055e7 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; - struct e_in6_addr locator_v6; guint8 lcaf_type; guint32 iid, asn; guint16 cur_len; @@ -529,9 +528,8 @@ get_addr_str(tvbuff_t *tvb, gint offset, guint16 afi, guint16 *addr_len) addr_str = tvb_ip_to_str(tvb, offset); return addr_str; case AFNUM_INET6: - tvb_get_ipv6(tvb, offset, &locator_v6); *addr_len = INET6_ADDRLEN; - addr_str = ip6_to_str(&locator_v6); + addr_str = tvb_ip6_to_str(tvb, offset); return addr_str; case AFNUM_LCAF: get_lcaf_data(tvb, offset, &lcaf_type, addr_len); |