diff options
| author | Evan Huus <eapache@gmail.com> | 2021-10-07 13:31:23 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2021-10-07 13:31:23 -0400 |
| commit | 0eda51a646eead9a3fe5c26067a3b0a1d34766c8 (patch) | |
| tree | 978d2ed066a117132db0ffdeab46615bfa57afde /epan/dissectors/packet-gtpv2.c | |
| parent | 086feb2f098903229a14fd25754cac06c625b647 (diff) | |
to_str: scope tvb_ip6_to_str
Diffstat (limited to 'epan/dissectors/packet-gtpv2.c')
| -rw-r--r-- | epan/dissectors/packet-gtpv2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 177a15a510..ce3916fb0d 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -2281,7 +2281,7 @@ dissect_gtpv2_ip_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree else if (length == 16) { proto_tree_add_item(tree, hf_gtpv2_ip_address_ipv6, tvb, offset, length, ENC_NA); - proto_item_append_text(item, "IPv6 %s", tvb_ip6_to_str(tvb, offset)); + proto_item_append_text(item, "IPv6 %s", tvb_ip6_to_str(pinfo->pool, tvb, offset)); } } /* @@ -2613,7 +2613,7 @@ dissect_gtpv2_paa(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6, tvb, offset, 16, ENC_NA); - proto_item_append_text(item, "IPv6 %s", tvb_ip6_to_str(tvb, offset)); + proto_item_append_text(item, "IPv6 %s", tvb_ip6_to_str(pinfo->pool, tvb, offset)); break; case 3: /* IPv4/IPv6 */ @@ -2633,7 +2633,7 @@ dissect_gtpv2_paa(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6, tvb, offset, 16, ENC_NA); - proto_item_append_text(item, "IPv6 %s, ", tvb_ip6_to_str(tvb, offset)); + proto_item_append_text(item, "IPv6 %s, ", tvb_ip6_to_str(pinfo->pool, tvb, offset)); offset += 16; proto_tree_add_item(tree, hf_gtpv2_pdn_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(item, "IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset)); @@ -3356,7 +3356,7 @@ dissect_gtpv2_f_teid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ { ipv6 = wmem_new0(pinfo->pool, address); proto_tree_add_item(tree, hf_gtpv2_f_teid_ipv6, tvb, offset, 16, ENC_NA); - proto_item_append_text(item, ", IPv6 %s", tvb_ip6_to_str(tvb, offset)); + proto_item_append_text(item, ", IPv6 %s", tvb_ip6_to_str(pinfo->pool, tvb, offset)); set_address_tvb(ipv6, AT_IPv6, 16, tvb, offset); } @@ -6238,7 +6238,7 @@ dissect_gtpv2_mbms_ip_mc_dist(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree } else if ((tvb_get_guint8(tvb, offset) & 0x3f) == 16) { offset += 1; proto_tree_add_item(tree, hf_gtpv2_mbms_ip_mc_dist_addrv6, tvb, offset, 16, ENC_NA); - proto_item_append_text(item, " IPv6 Dist %s", tvb_ip6_to_str(tvb, offset)); + proto_item_append_text(item, " IPv6 Dist %s", tvb_ip6_to_str(pinfo->pool, tvb, offset)); offset += 16; } @@ -6253,7 +6253,7 @@ dissect_gtpv2_mbms_ip_mc_dist(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree } else if ((tvb_get_guint8(tvb, offset) & 0x3f) == 16) { offset += 1; proto_tree_add_item(tree, hf_gtpv2_mbms_ip_mc_src_addrv6, tvb, offset, 16, ENC_NA); - proto_item_append_text(item, " IPv6 Src %s", tvb_ip6_to_str(tvb, offset)); + proto_item_append_text(item, " IPv6 Src %s", tvb_ip6_to_str(pinfo->pool, tvb, offset)); offset += 16; } |