aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rsip.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-12-21 12:38:13 -0500
committerMichael Mann <mmann78@netscape.net>2014-12-28 14:09:27 +0000
commit1d598bbff76f915ec961d301f5eb0eef03d46d0a (patch)
tree2908958a3f78d53a8f10036e7f8ac01ed1b390d1 /epan/dissectors/packet-rsip.c
parent9fce4dd4cb47965870d870b77983f8d2c501c810 (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-rsip.c')
-rw-r--r--epan/dissectors/packet-rsip.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c
index 138d9fb485..3dd9479d7c 100644
--- a/epan/dissectors/packet-rsip.c
+++ b/epan/dissectors/packet-rsip.c
@@ -256,7 +256,6 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff)
guint32 bid, cid, leasetm, msgc;
proto_tree *p_tree, *v_tree;
proto_item *pti, *vti;
- struct e_in6_addr in6;
/* XXX */
if (off >= eoff)
@@ -316,12 +315,11 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff)
break;
case 3: /* IPv6 */
if (paramlen - 1 > 0) {
- tvb_get_ipv6(tvb, off + 4, &in6);
proto_tree_add_item(v_tree,
hf_rsip_parameter_address_ipv6, tvb,
off + 4, paramlen - 1, ENC_NA);
proto_item_append_text(pti, ": %s",
- ip6_to_str(&in6));
+ tvb_ip6_to_str(tvb, off + 4));
} else
proto_item_append_text(pti,
": Any IPv6 Address");