osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

to_str: scope tvb_ip_to_str

This commit is contained in:
Evan Huus 2021-10-07 10:25:12 -04:00
parent 4a2b18a9c0
commit 07f5472aa7
88 changed files with 314 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/README.dissector
View File

@ -400,7 +400,7 @@ wrong answer on the PC on which you're doing development, and try
"tvb_get_letohl()" instead, as "tvb_get_letohl()" will give the wrong
answer on big-endian machines.
gchar *tvb_ip_to_str(tvbuff_t *tvb, const gint offset)
gchar *tvb_ip_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset)
gchar *tvb_ip6_to_str(tvbuff_t *tvb, const gint offset)
Returns a null-terminated buffer containing a string with IPv4 or IPv6 Address

2
epan/dissectors/asn1/kerberos/kerberos.cnf
View File

@ -284,7 +284,7 @@ KrbFastArmorTypes PROT_PREFIX UPPER_CASE
switch(private_data->addr_type){
case KERBEROS_ADDR_TYPE_IPV4:
it=proto_tree_add_item(tree, hf_krb_address_ip, tvb, offset, 4, ENC_BIG_ENDIAN);
address_str = tvb_ip_to_str(tvb, offset);
address_str = tvb_ip_to_str(actx->pinfo->pool, tvb, offset);
break;
case KERBEROS_ADDR_TYPE_NETBIOS:
{

32
epan/dissectors/packet-3g-a11.c
View File

@ -1563,8 +1563,8 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
registration_request_msg = 1;
col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Request: PDSN=%s PCF=%s",
tvb_ip_to_str(tvb, 8),
tvb_ip_to_str(tvb, 12));
tvb_ip_to_str(pinfo->pool, tvb, 8),
tvb_ip_to_str(pinfo->pool, tvb, 12));
if (tree) {
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1603,7 +1603,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case REGISTRATION_REPLY:
col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Reply: PDSN=%s, Code=%u",
tvb_ip_to_str(tvb, 8), tvb_get_guint8(tvb,1));
tvb_ip_to_str(pinfo->pool, tvb, 8), tvb_get_guint8(tvb,1));
if (tree) {
/* Add Subtree */
@ -1638,7 +1638,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case REGISTRATION_UPDATE:
col_add_fstr(pinfo->cinfo, COL_INFO,"Reg Update: PDSN=%s",
tvb_ip_to_str(tvb, 8));
tvb_ip_to_str(pinfo->pool, tvb, 8));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1667,7 +1667,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case REGISTRATION_ACK:
col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Ack: PCF=%s Status=%u",
tvb_ip_to_str(tvb, 8),
tvb_ip_to_str(pinfo->pool, tvb, 8),
tvb_get_guint8(tvb,3));
if (tree) {
/* Add Subtree */
@ -1701,7 +1701,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case SESSION_UPDATE: /* IOS4.3 */
col_add_fstr(pinfo->cinfo, COL_INFO,"Ses Update: PDSN=%s",
tvb_ip_to_str(tvb, 8));
tvb_ip_to_str(pinfo->pool, tvb, 8));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1730,7 +1730,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case SESSION_ACK: /* IOS4.3 */
col_add_fstr(pinfo->cinfo, COL_INFO, "Ses Upd Ack: PCF=%s, Status=%u",
tvb_ip_to_str(tvb, 8),
tvb_ip_to_str(pinfo->pool, tvb, 8),
tvb_get_guint8(tvb,3));
if (tree) {
/* Add Subtree */
@ -1764,8 +1764,8 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case CAPABILITIES_INFO: /* IOS5.1 */
col_add_fstr(pinfo->cinfo, COL_INFO, "Cap Info: PDSN=%s, PCF=%s",
tvb_ip_to_str(tvb, 8),
tvb_ip_to_str(tvb, 12));
tvb_ip_to_str(pinfo->pool, tvb, 8),
tvb_ip_to_str(pinfo->pool, tvb, 12));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1798,7 +1798,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case CAPABILITIES_INFO_ACK: /* IOS5.1 */
col_add_fstr(pinfo->cinfo, COL_INFO, "Cap Info Ack: PCF=%s",
tvb_ip_to_str(tvb, 8));
tvb_ip_to_str(pinfo->pool, tvb, 8));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1827,7 +1827,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case BC_SERVICE_REQUEST:
col_add_fstr(pinfo->cinfo, COL_INFO, "Service Request: PCF=%s ",
tvb_ip_to_str(tvb, offset + 8));
tvb_ip_to_str(pinfo->pool, tvb, offset + 8));
if (tree) {
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1854,7 +1854,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
case BC_SERVICE_REPLY:
col_add_fstr(pinfo->cinfo, COL_INFO, "Service Response: BSN=%s ",
tvb_ip_to_str(tvb, offset + 8));
tvb_ip_to_str(pinfo->pool, tvb, offset + 8));
if (tree) {
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1884,7 +1884,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case BC_REGISTRATION_REQUEST:
col_add_fstr(pinfo->cinfo, COL_INFO, "BC Reg Request: BSN=%s ",
tvb_ip_to_str(tvb, offset + 8));
tvb_ip_to_str(pinfo->pool, tvb, offset + 8));
if (tree) {
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1926,7 +1926,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
case BC_REGISTRATION_REPLY:
col_add_fstr(pinfo->cinfo, COL_INFO, "BC Reg Reply: BSN=%s, Code=%u",
tvb_ip_to_str(tvb, offset + 8),
tvb_ip_to_str(pinfo->pool, tvb, offset + 8),
tvb_get_guint8(tvb, offset + 1));
if (tree) {
@ -1963,7 +1963,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case BC_REGISTRATION_UPDATE:
col_add_fstr(pinfo->cinfo, COL_INFO,"BC Reg Update: BSN=%s",
tvb_ip_to_str(tvb, offset + 8));
tvb_ip_to_str(pinfo->pool, tvb, offset + 8));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA);
@ -1992,7 +1992,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
break;
case BC_REGISTRATION_ACK:
col_add_fstr(pinfo->cinfo, COL_INFO, "BC Reg Acknowledge: PCF=%s Status=%u",
tvb_ip_to_str(tvb, offset + 8),
tvb_ip_to_str(pinfo->pool, tvb, offset + 8),
tvb_get_guint8(tvb, offset + 3));
if (tree) {
/* Add Subtree */

4
epan/dissectors/packet-afp.c
View File

@ -4984,13 +4984,13 @@ dissect_afp_server_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
type = tvb_get_guint8(tvb, offset +1);
switch (type) {
case 1: /* IP */
sub_tree = proto_tree_add_subtree_format(adr_tree, tvb, offset, len, ett_afp_server_addr_line, NULL, "IP: %s", tvb_ip_to_str(tvb, offset+2));
sub_tree = proto_tree_add_subtree_format(adr_tree, tvb, offset, len, ett_afp_server_addr_line, NULL, "IP: %s", tvb_ip_to_str(pinfo->pool, tvb, offset+2));
break;
case 2: /* IP + port */
port = tvb_get_ntohs(tvb, offset+6);
sub_tree = proto_tree_add_subtree_format(adr_tree, tvb, offset, len,
ett_afp_server_addr_line, NULL,
"IP: %s:%d", tvb_ip_to_str(tvb, offset+2), port);
"IP: %s:%d", tvb_ip_to_str(pinfo->pool, tvb, offset+2), port);
break;
case 3: /* DDP, atalk_addr_to_str want host order not network */
net = tvb_get_ntohs(tvb, offset+2);

2
epan/dissectors/packet-aim.c
View File

@ -1235,7 +1235,7 @@ dissect_aim_tlv_value_uint16 (proto_item *ti, guint16 valueid _U_, tvbuff_t *tvb
static int
dissect_aim_tlv_value_ipv4 (proto_item *ti, guint16 valueid _U_, tvbuff_t *tvb, packet_info *pinfo _U_)
{
proto_item_set_text(ti, "Value: %s", tvb_ip_to_str(tvb, 0));
proto_item_set_text(ti, "Value: %s", tvb_ip_to_str(pinfo->pool, tvb, 0));
return 4;
}

8
epan/dissectors/packet-aodv.c
View File

@ -221,7 +221,7 @@ dissect_aodv_rreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s", dest_addr_v6);
offset += INET6_ADDRLEN;
} else {
dest_addr_v4 = tvb_ip_to_str(tvb, offset);
dest_addr_v4 = tvb_ip_to_str(pinfo->pool, tvb, offset);
if (aodv_tree) {
proto_tree_add_item(aodv_tree, hf_aodv_dest_ip, tvb, offset, 4,
ENC_BIG_ENDIAN);
@ -246,7 +246,7 @@ dissect_aodv_rreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s", orig_addr_v6);
offset += INET6_ADDRLEN;
} else {
orig_addr_v4 = tvb_ip_to_str(tvb, offset);
orig_addr_v4 = tvb_ip_to_str(pinfo->pool, tvb, offset);
if (aodv_tree) {
proto_tree_add_item(aodv_tree, hf_aodv_orig_ip, tvb, offset, 4,
ENC_BIG_ENDIAN);
@ -320,7 +320,7 @@ dissect_aodv_rrep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s", dest_addr_v6);
offset += INET6_ADDRLEN;
} else {
dest_addr_v4 = tvb_ip_to_str(tvb, offset);
dest_addr_v4 = tvb_ip_to_str(pinfo->pool, tvb, offset);
if (aodv_tree) {
proto_tree_add_item(aodv_tree, hf_aodv_dest_ip, tvb, offset, 4,
ENC_BIG_ENDIAN);
@ -346,7 +346,7 @@ dissect_aodv_rrep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s", orig_addr_v6);
offset += INET6_ADDRLEN;
} else {
orig_addr_v4 = tvb_ip_to_str(tvb, offset);
orig_addr_v4 = tvb_ip_to_str(pinfo->pool, tvb, offset);
if (aodv_tree) {
proto_tree_add_item(aodv_tree, hf_aodv_orig_ip, tvb, offset, 4,
ENC_BIG_ENDIAN);

2
epan/dissectors/packet-aruba-adp.c
View File

@ -79,7 +79,7 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
case ADP_RESPONSE:
proto_tree_add_item(aruba_adp_tree, hf_adp_switchip, tvb, 6, 4, ENC_BIG_ENDIAN);
switchip = tvb_ip_to_str(tvb, 6);
switchip = tvb_ip_to_str(pinfo->pool, tvb, 6);
col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Response Switch IP: %s", switchip);

2
epan/dissectors/packet-aruba-iap.c
View File

@ -119,7 +119,7 @@ dissect_aruba_iap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
offset += 4;
proto_tree_add_item(aruba_iap_tree, hf_iap_vc_ip, tvb, offset, 4, ENC_BIG_ENDIAN);
col_append_fstr(pinfo->cinfo, COL_INFO, " VC IP: %s", tvb_ip_to_str(tvb, offset));
col_append_fstr(pinfo->cinfo, COL_INFO, " VC IP: %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
proto_tree_add_item(aruba_iap_tree, hf_iap_model, tvb, offset, 1, ENC_BIG_ENDIAN);

2
epan/dissectors/packet-aruba-papi.c
View File

@ -446,7 +446,7 @@ dissect_papi_license_manager(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr
switch (type) {
case 1: /* IP Address */
proto_tree_add_item(licmgr_subtree, hf_papi_licmgr_ip, tvb, offset, 4, ENC_NA);
proto_item_append_text(tlv_item, ": %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(tlv_item, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
case 2: /* Serial Number */
proto_tree_add_item(licmgr_subtree, hf_papi_licmgr_serial_number, tvb, offset, 32, ENC_ASCII|ENC_NA);

2
epan/dissectors/packet-asap.c
View File

@ -201,7 +201,7 @@ static void
dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
proto_tree_add_item(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ENC_BIG_ENDIAN);
proto_item_append_text(parameter_item, " (%s)", tvb_ip_to_str(parameter_tvb, IPV4_ADDRESS_OFFSET));
proto_item_append_text(parameter_item, " (%s)", tvb_ip_to_str(wmem_packet_scope(), parameter_tvb, IPV4_ADDRESS_OFFSET));
}
static void

4
epan/dissectors/packet-ath.c
View File

@ -141,7 +141,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
*/
if (hlen == 4) {
proto_tree_add_item(ath_tree, hf_ath_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
info_srcaddr = tvb_ip_to_str(tvb, offset);
info_srcaddr = tvb_ip_to_str(pinfo->pool, tvb, offset);
} else if (hlen == 6) {
proto_tree_add_item(ath_tree, hf_ath_ipv6, tvb, offset, 6, ENC_NA);
info_srcaddr = tvb_ip6_to_str(tvb, offset);
@ -241,7 +241,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
*/
if (hlen == 4) {
proto_tree_add_item(ath_tree, hf_ath_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
info_srcaddr = tvb_ip_to_str(tvb, offset);
info_srcaddr = tvb_ip_to_str(pinfo->pool, tvb, offset);
} else if (hlen == 6) {
proto_tree_add_item(ath_tree, hf_ath_ipv6, tvb, offset, 6, ENC_NA);
info_srcaddr = tvb_ip6_to_str(tvb, offset);

4
epan/dissectors/packet-auto_rp.c
View File

@ -168,7 +168,7 @@ static int do_auto_rp_map(tvbuff_t *tvb, int offset, proto_tree *auto_rp_tree)
/* sizeof map header + n * sizeof encoded group addresses */
map_tree = proto_tree_add_subtree_format(auto_rp_tree, tvb, offset, 6 + group_count * 6,
ett_auto_rp_map, NULL,
"RP %s: %u group%s", tvb_ip_to_str(tvb, offset),
"RP %s: %u group%s", tvb_ip_to_str(wmem_packet_scope(), tvb, offset),
group_count, plurality(group_count, "", "s"));
proto_tree_add_item(map_tree, hf_auto_rp_rp_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
@ -186,7 +186,7 @@ static int do_auto_rp_map(tvbuff_t *tvb, int offset, proto_tree *auto_rp_tree)
mask_len = tvb_get_guint8(tvb, offset + 1);
grp_tree = proto_tree_add_subtree_format(map_tree, tvb, offset, 6,
ett_auto_rp_group, NULL, "Group %s/%u (%s)",
tvb_ip_to_str(tvb, offset + 2), mask_len,
tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 2), mask_len,
val_to_str_const(sign&AUTO_RP_SIGN_MASK, auto_rp_mask_sign_vals, ""));
proto_tree_add_uint(grp_tree, hf_auto_rp_prefix_sgn, tvb, offset, 1, sign);

2
epan/dissectors/packet-bat.c
View File

@ -315,7 +315,7 @@ static void dissect_bat_hna(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
if (PTREE_DATA(tree)->visible) {
ti = proto_tree_add_protocol_format(tree, proto_bat_plugin, tvb, 0, 5,
"B.A.T.M.A.N. HNA: %s/%d",
tvb_ip_to_str(tvb, 0), hna_netmask);
tvb_ip_to_str(pinfo->pool, tvb, 0), hna_netmask);
} else {
ti = proto_tree_add_item(tree, proto_bat_plugin, tvb, 0, 5, ENC_NA);
}

52
epan/dissectors/packet-bgp.c
View File

@ -3297,7 +3297,7 @@ decode_bgp_rd(wmem_allocator_t *pool, tvbuff_t *tvb, gint offset)
tvb_get_ntohl(tvb, offset + 4));
break;
case FORMAT_IP_LOC:
wmem_strbuf_append_printf(strbuf, "%s:%u", tvb_ip_to_str(tvb, offset + 2),
wmem_strbuf_append_printf(strbuf, "%s:%u", tvb_ip_to_str(pool, tvb, offset + 2),
tvb_get_ntohs(tvb, offset + 6));
break ;
case FORMAT_AS4_LOC:
@ -4125,7 +4125,7 @@ decode_mp_next_hop_ipv4(tvbuff_t *tvb, proto_tree *tree, gint offset, packet_inf
switch (nhlen) {
case (FT_IPv4_LEN):
proto_tree_add_item(tree, hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_ipv4, tvb, offset, FT_IPv4_LEN, ENC_BIG_ENDIAN);
wmem_strbuf_append(strbuf, tvb_ip_to_str(tvb, offset));
wmem_strbuf_append(strbuf, tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
default:
return 0;
@ -4156,7 +4156,7 @@ decode_mp_next_hop_vpn_ipv4(tvbuff_t *tvb, proto_tree *tree, gint offset, packet
wmem_strbuf_append_printf(strbuf, " RD=%s", rd_string);
offset += BGP_ROUTE_DISTINGUISHER_SIZE;
proto_tree_add_item(tree, hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_ipv4, tvb, offset, FT_IPv4_LEN, ENC_BIG_ENDIAN);
wmem_strbuf_append_printf(strbuf, " IPv4=%s", tvb_ip_to_str(tvb, offset));
wmem_strbuf_append_printf(strbuf, " IPv4=%s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
default:
return 0;
@ -6639,7 +6639,7 @@ decode_prefix_MP(proto_tree *tree, int hf_path_id, int hf_addr4, int hf_addr6,
break;
case BGP_EXT_COM_RT_IP4:
wmem_strbuf_append_printf(comm_strbuf, "%s:%u",
tvb_ip_to_str(tvb, offset + 1 + 6),
tvb_ip_to_str(pinfo->pool, tvb, offset + 1 + 6),
tvb_get_ntohs(tvb, offset + 1 + 10));
break;
case BGP_EXT_COM_RT_AS4:
@ -6967,7 +6967,7 @@ decode_prefix_MP(proto_tree *tree, int hf_path_id, int hf_addr4, int hf_addr6,
(offset + 8 + length) - start_offset,
wmem_strbuf_get_str(stack_strbuf), "Label Stack=%s RD=%s:%u, IPv6=%s/%u",
wmem_strbuf_get_str(stack_strbuf),
tvb_ip_to_str(tvb, offset + 2),
tvb_ip_to_str(pinfo->pool, tvb, offset + 2),
tvb_get_ntohs(tvb, offset + 6),
address_to_str(pinfo->pool, &addr), plen);
total_length = (1 + labnum * 3 + 8) + length;
@ -7878,7 +7878,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen,
proto_item_set_text(community_item, "%s: %s:%u",
val_to_str(com_stype_low_byte, bgpext_com_stype_tr_IP4, "Unknown subtype 0x%02x"),
tvb_ip_to_str(tvb, offset+2), tvb_get_ntohs(tvb,offset+6));
tvb_ip_to_str(pinfo->pool, tvb, offset+2), tvb_get_ntohs(tvb,offset+6));
switch(com_stype_low_byte) {
case BGP_EXT_COM_STYPE_IP4_OSPF_RID:
@ -7899,7 +7899,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen,
proto_item_set_text(community_item, "%s: %s:%u",
val_to_str(com_stype_low_byte, bgpext_com_stype_ntr_IP4, "Unknown subtype 0x%02x"),
tvb_ip_to_str(tvb, offset+2), tvb_get_ntohs(tvb,offset+6));
tvb_ip_to_str(pinfo->pool, tvb, offset+2), tvb_get_ntohs(tvb,offset+6));
break;
case BGP_EXT_COM_TYPE_HIGH_TR_AS4: /* Transitive Four-Octet AS-Specific Extended Community */
@ -7968,7 +7968,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen,
tfs_get_string(tvb_get_guint8(tvb,offset+7) & BGP_OSPF_RTYPE_METRIC_TYPE, &tfs_ospf_rt_mt));
proto_item_append_text(community_item, " Area: %s, Type: %s",
tvb_ip_to_str(tvb,offset+2),
tvb_ip_to_str(pinfo->pool, tvb,offset+2),
val_to_str_const(tvb_get_guint8(tvb,offset+6), bgpext_com_ospf_rtype, "Unknown"));
}
break;
@ -8224,7 +8224,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen,
tfs_get_string(tvb_get_guint8(tvb,offset+7) & BGP_OSPF_RTYPE_METRIC_TYPE, &tfs_ospf_rt_mt));
proto_item_append_text(community_item, " Area: %s, Type: %s",
tvb_ip_to_str(tvb,offset+2),
tvb_ip_to_str(pinfo->pool, tvb,offset+2),
val_to_str_const(tvb_get_guint8(tvb,offset+6), bgpext_com_ospf_rtype, "Unknown"));
}
break;
@ -8232,7 +8232,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen,
case BGP_EXT_COM_STYPE_EXP_OSPF_RID:
proto_tree_add_item(community_tree, hf_bgp_ext_com_value_ospf_rid, tvb, offset+2, 4, ENC_BIG_ENDIAN);
proto_item_append_text(community_item, " %s", tvb_ip_to_str(tvb, offset+2));
proto_item_append_text(community_item, " %s", tvb_ip_to_str(pinfo->pool, tvb, offset+2));
break;
case BGP_EXT_COM_STYPE_EXP_OSPF_DID:
@ -8473,7 +8473,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen,
proto_tree_add_item(community_tree, hf_bgp_ext_com_eigrp_e_rid, tvb, offset+4, 4, ENC_BIG_ENDIAN);
proto_item_append_text(community_tree, " ASN: %u, RID: %s",
tvb_get_ntohs(tvb, offset+2), tvb_ip_to_str(tvb, offset+4));
tvb_get_ntohs(tvb, offset+2), tvb_ip_to_str(pinfo->pool, tvb, offset+4));
break;
case BGP_EXT_COM_STYPE_EXP_EIGRP_EPM:
@ -8487,7 +8487,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen,
case BGP_EXT_COM_STYPE_EXP_EIGRP_RID:
proto_tree_add_item(community_tree, hf_bgp_ext_com_eigrp_rid, tvb, offset+4, 4, ENC_NA);
proto_item_append_text(community_tree, " %s", tvb_ip_to_str(tvb, offset+4));
proto_item_append_text(community_tree, " %s", tvb_ip_to_str(pinfo->pool, tvb, offset+4));
break;
}
break;
@ -8559,7 +8559,7 @@ dissect_bgp_update_pmsi_attr(packet_info *pinfo, proto_tree *parent_tree, tvbuff
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_rsvp_p2mp_tunnel_id, tvb, offset+11, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_rsvp_p2mp_ext_tunnel_idv4, tvb, offset+13, 4, ENC_NA);
proto_item_append_text(tunnel_id_item, ": Id %u, Ext Id %s",
tvb_get_ntohs(tvb, offset+11), tvb_ip_to_str(tvb, offset+13));
tvb_get_ntohs(tvb, offset+11), tvb_ip_to_str(pinfo->pool, tvb, offset+13));
break;
case PMSI_TUNNEL_MLDP_P2MP:
case PMSI_TUNNEL_MLDP_MP2MP:
@ -8581,7 +8581,7 @@ dissect_bgp_update_pmsi_attr(packet_info *pinfo, proto_tree *parent_tree, tvbuff
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_mldp_fec_el_opa_value_rn, tvb, offset+14+rn_addr_length, 4, ENC_BIG_ENDIAN);
proto_item_append_text(tunnel_id_item, ": Type: %s root node: %s Id: %u",
val_to_str_const(tvb_get_guint8(tvb, offset+5), fec_types_vals, "Unknown"),
tvb_ip_to_str(tvb, offset+9),
tvb_ip_to_str(pinfo->pool, tvb, offset+9),
tvb_get_ntohl(tvb, offset+14+rn_addr_length));
} else if (opaque_value_type == PMSI_MLDP_FEC_TYPE_EXT_TYPE) {
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_ext_type, tvb, offset+12+rn_addr_length, 2, ENC_BIG_ENDIAN);
@ -8600,27 +8600,27 @@ dissect_bgp_update_pmsi_attr(packet_info *pinfo, proto_tree *parent_tree, tvbuff
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_pimssm_root_node, tvb, offset+5, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_pimssm_pmc_group, tvb, offset+9, 4, ENC_BIG_ENDIAN);
proto_item_append_text(tunnel_id_item, ": < %s, %s >",
tvb_ip_to_str(tvb, offset+5),
tvb_ip_to_str(tvb, offset+9));
tvb_ip_to_str(pinfo->pool, tvb, offset+5),
tvb_ip_to_str(pinfo->pool, tvb, offset+9));
break;
case PMSI_TUNNEL_PIMSM:
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_pimsm_sender, tvb, offset+5, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_pimsm_pmc_group, tvb, offset+9, 4, ENC_BIG_ENDIAN);
proto_item_append_text(tunnel_id_item, ": < %s, %s >",
tvb_ip_to_str(tvb, offset+5),
tvb_ip_to_str(tvb, offset+9));
tvb_ip_to_str(pinfo->pool, tvb, offset+5),
tvb_ip_to_str(pinfo->pool, tvb, offset+9));
break;
case PMSI_TUNNEL_BIDIR_PIM:
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_pimbidir_sender, tvb, offset+5, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_pimbidir_pmc_group, tvb, offset+9, 4, ENC_BIG_ENDIAN);
proto_item_append_text(tunnel_id_item, ": < %s, %s >",
tvb_ip_to_str(tvb, offset+5),
tvb_ip_to_str(tvb, offset+9));
tvb_ip_to_str(pinfo->pool, tvb, offset+5),
tvb_ip_to_str(pinfo->pool, tvb, offset+9));
break;
case PMSI_TUNNEL_INGRESS:
proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_ingress_rep_addr, tvb, offset+5, 4, ENC_BIG_ENDIAN);
proto_item_append_text(tunnel_id_item, ": tunnel end point -> %s",
tvb_ip_to_str(tvb, offset+5));
tvb_ip_to_str(pinfo->pool, tvb, offset+5));
break;
default:
expert_add_info_format(pinfo, pmsi_tunnel_type_item, &ei_bgp_attr_pmsi_tunnel_type,
@ -8874,7 +8874,7 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len,
} else {
proto_tree_add_item(subtree2, hf_bgp_update_path_attribute_next_hop, tvb,
o + i + aoff, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti_pa, ": %s ", tvb_ip_to_str(tvb, o + i + aoff));
proto_item_append_text(ti_pa, ": %s ", tvb_ip_to_str(pinfo->pool, tvb, o + i + aoff));
}
break;
case BGPTYPE_MULTI_EXIT_DISC:
@ -8930,7 +8930,7 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len,
o + i + aoff + asn_len, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti_pa, ": AS: %u origin: %s", aggregator_as,
tvb_ip_to_str(tvb, o + i + aoff + asn_len));
tvb_ip_to_str(pinfo->pool, tvb, o + i + aoff + asn_len));
}
break;
case BGPTYPE_COMMUNITIES:
@ -8995,7 +8995,7 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len,
} else {
proto_tree_add_item(subtree2, hf_bgp_update_path_attribute_originator_id, tvb,
o + i + aoff, tlen, ENC_BIG_ENDIAN);
proto_item_append_text(ti_pa, ": %s ", tvb_ip_to_str(tvb, o + i + aoff));
proto_item_append_text(ti_pa, ": %s ", tvb_ip_to_str(pinfo->pool, tvb, o + i + aoff));
}
break;
case BGPTYPE_MP_REACH_NLRI:
@ -9117,8 +9117,8 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len,
while (q < end) {
proto_tree_add_item(cluster_list_tree, hf_bgp_update_path_attribute_cluster_id,
tvb, q - 3 + aoff, 4, ENC_NA);
proto_item_append_text(ti, " %s", tvb_ip_to_str(tvb, q-3+aoff));
proto_item_append_text(ti_pa, " %s", tvb_ip_to_str(tvb, q-3+aoff));
proto_item_append_text(ti, " %s", tvb_ip_to_str(pinfo->pool, tvb, q-3+aoff));
proto_item_append_text(ti_pa, " %s", tvb_ip_to_str(pinfo->pool, tvb, q-3+aoff));
q += 4;
}

10
epan/dissectors/packet-bluecom.c
View File

@ -171,7 +171,7 @@ dissect_bcp_connect_data(proto_tree *bcp_tree, tvbuff_t *tvb, gint flags)
bcp_subtree = proto_tree_add_subtree_format(bcp_tree, tvb, offset, len, ett_bcp_data, NULL,
"BCP Connect Request: Name=%s IpAddr=%s",
tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 16, BCP_NAME_LEN, ENC_ASCII),
tvb_ip_to_str(tvb, offset + 12));
tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 12));
proto_tree_add_item(bcp_subtree, hf_bcp_connectreq_lenin, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
@ -231,8 +231,8 @@ dissect_bcp_search_data(proto_tree *bcp_tree, tvbuff_t *tvb, gint flags)
case BCP_SEARCH_IPADDR:
bcp_subtree = proto_tree_add_subtree_format(bcp_tree, tvb, offset, len, ett_bcp_data, NULL,
"BCP Search Request: IpAddrFirst=%s, IpAddrLast=%s",
tvb_ip_to_str(tvb, offset + 8),
tvb_ip_to_str(tvb, offset + 12)
tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 8),
tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 12)
);
break;
@ -278,7 +278,7 @@ dissect_bcp_search_data(proto_tree *bcp_tree, tvbuff_t *tvb, gint flags)
bcp_subtree = proto_tree_add_subtree_format(bcp_tree, tvb, offset, len, ett_bcp_data, NULL,
"BCP Search Response: Name=%s, IpAddr=%s Error=%d",
tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 16, BCP_NAME_LEN, ENC_ASCII),
tvb_ip_to_str(tvb, offset + 12),
tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 12),
tvb_get_letohl(tvb, offset)
);
@ -320,7 +320,7 @@ dissect_bcp_identify_data(proto_tree *bcp_tree, tvbuff_t *tvb)
bcp_subtree = proto_tree_add_subtree_format(bcp_tree, tvb, offset, len, ett_bcp_data, NULL,
"BCP Identify Request: Name=%s, IpAddr=%s",
tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 12, BCP_NAME_LEN, ENC_ASCII),
tvb_ip_to_str(tvb, offset + 8)
tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 8)
);
proto_tree_add_item(bcp_subtree, hf_bcp_identify_error, tvb, offset, 4, ENC_BIG_ENDIAN);

6
epan/dissectors/packet-bt-dht.c
View File

@ -274,7 +274,7 @@ dissect_bt_dht_values(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
value_tree = proto_item_add_subtree( value_ti, ett_bt_dht_peers);
proto_tree_add_item( value_tree, hf_ip, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(value_ti, " (IP/Port: %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(value_ti, " (IP/Port: %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
proto_tree_add_item( value_tree, hf_port, tvb, offset+4, 2, ENC_BIG_ENDIAN);
proto_item_append_text(value_ti, ":%u)", tvb_get_ntohs( tvb, offset+4 ));
}
@ -362,7 +362,7 @@ dissect_bt_dht_nodes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
else
{
proto_tree_add_item( node_tree, hf_ip, tvb, offset+20, 4, ENC_BIG_ENDIAN);
proto_item_append_text(node_ti, ", IPv4/Port: %s", tvb_ip_to_str(tvb, offset+20));
proto_item_append_text(node_ti, ", IPv4/Port: %s", tvb_ip_to_str(pinfo->pool, tvb, offset+20));
proto_tree_add_item( node_tree, hf_port, tvb, offset+24, 2, ENC_BIG_ENDIAN);
proto_item_append_text(node_ti, ":%u)", tvb_get_ntohs( tvb, offset+24 ));
@ -451,7 +451,7 @@ dissect_bencoded_dict_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if(len == 4) {
proto_tree_add_item(sub_tree, hf_ip, tvb, offset, len, ENC_BIG_ENDIAN);
val = tvb_ip_to_str(tvb, offset);
val = tvb_ip_to_str(pinfo->pool, tvb, offset);
offset += len;
}
else {

2
epan/dissectors/packet-btsdp.c
View File

@ -2551,7 +2551,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
switch (attribute) {
case 0x306:
proto_tree_add_item(next_tree, hf_wap_network_address, tvb, offset, 4, ENC_BIG_ENDIAN);
wmem_strbuf_append(info_buf, tvb_ip_to_str(tvb, offset));
wmem_strbuf_append(info_buf, tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
case 0x307:
proto_tree_add_item(next_tree, hf_wap_gateway, tvb, offset, 1, ENC_BIG_ENDIAN);

8
epan/dissectors/packet-cdp.c
View File

@ -475,7 +475,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
if (tree) {
tlv_tree = proto_tree_add_subtree_format(cdp_tree, tvb, offset,
length, ett_cdp_tlv, NULL, "ODR Default gateway: %s",
tvb_ip_to_str(tvb, offset+4));
tvb_ip_to_str(pinfo->pool, tvb, offset+4));
proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_odr_default_gateway, tvb, offset+4, 4, ENC_BIG_ENDIAN);
@ -497,7 +497,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
length -= 4;
while (length > 0) {
proto_tree_add_ipv4_format_value(tlv_tree, hf_cdp_ip_prefix, tvb, offset, 5, tvb_get_ntohl(tvb, offset),
"%s/%u", tvb_ip_to_str(tvb, offset), tvb_get_guint8(tvb,offset+4));
"%s/%u", tvb_ip_to_str(pinfo->pool, tvb, offset), tvb_get_guint8(tvb,offset+4));
offset += 5;
length -= 5;
}
@ -1118,7 +1118,7 @@ dissect_address_tlv(tvbuff_t *tvb, packet_info* pinfo, int offset, int length, p
case NLPID_IP:
if (address_length == 4) {
/* The address is an IP address. */
proto_item_set_text(ti, "IP address: %s", tvb_ip_to_str(tvb, offset));
proto_item_set_text(ti, "IP address: %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
hf_addr = hf_cdp_nrgyz_ip_address;
proto_tree_add_item(address_tree, hf_cdp_nrgyz_ip_address, tvb, offset, address_length, ENC_BIG_ENDIAN);
}
@ -1214,7 +1214,7 @@ dissect_nrgyz_tlv(tvbuff_t *tvb, packet_info* pinfo, int offset, guint16 length,
etree = proto_tree_add_subtree_format(tree, tvb, offset,
tlvl, ett_cdp_nrgyz_tlv, NULL, "EnergyWise %s: %s port %u",
ttext,
tvb_ip_to_str(tvb, offset + 12),
tvb_ip_to_str(pinfo->pool, tvb, offset + 12),
tvb_get_ntohs(tvb, offset + 10)
);
break;

2
epan/dissectors/packet-ceph.c
View File

@ -1906,7 +1906,7 @@ guint c_dissect_sockaddr(proto_tree *root, c_sockaddr *out,
switch (d.af) {
case C_IPv4:
d.port = tvb_get_ntohs(tvb, off+2);
d.addr_str = tvb_ip_to_str(tvb, off+4);
d.addr_str = tvb_ip_to_str(wmem_packet_scope(), tvb, off+4);
proto_tree_add_item(tree, hf_port, tvb, off+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_addr_ipv4, tvb, off+4, 4, ENC_BIG_ENDIAN);

2
epan/dissectors/packet-chdlc.c
View File

@ -302,7 +302,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
addr = tvb_get_ipv4(tvb, 4);
col_add_fstr(pinfo->cinfo, COL_INFO, "%s, from %s, mask %s",
val_to_str(code, slarp_ptype_vals, "Unknown (%d)"),
get_hostname(addr), tvb_ip_to_str(tvb, 8));
get_hostname(addr), tvb_ip_to_str(pinfo->pool, tvb, 8));
if (tree) {
proto_tree_add_uint(slarp_tree, hf_slarp_ptype, tvb, 0, 4, code);
proto_tree_add_item(slarp_tree, hf_slarp_address, tvb, 4, 4, ENC_BIG_ENDIAN);

4
epan/dissectors/packet-cops.c
View File

@ -1349,7 +1349,7 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32
ifindex = tvb_get_ntohl(tvb, offset + 4);
itf_tree = proto_tree_add_subtree_format(tree, tvb, offset, 8, ett_cops_itf, NULL,
"Contents: IPv4 address %s, ifIndex: %u",
tvb_ip_to_str(tvb, offset), ifindex);
tvb_ip_to_str(pinfo->pool, tvb, offset), ifindex);
proto_tree_add_item(itf_tree,
(c_num == COPS_OBJ_IN_INT) ? hf_cops_in_int_ipv4 : hf_cops_out_int_ipv4,
tvb, offset, 4, ENC_BIG_ENDIAN);
@ -1484,7 +1484,7 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32
tcp_port = tvb_get_ntohs(tvb, offset + 4 + 2);
pdp_tree = proto_tree_add_subtree_format(tree, tvb, offset, 8, ett_cops_pdp, NULL,
"Contents: IPv4 address %s, TCP Port Number: %u",
tvb_ip_to_str(tvb, offset), tcp_port);
tvb_ip_to_str(pinfo->pool, tvb, offset), tcp_port);
proto_tree_add_item(pdp_tree,
(c_num == COPS_OBJ_PDPREDIRADDR) ? hf_cops_pdprediraddr_ipv4 : hf_cops_lastpdpaddr_ipv4,
tvb, offset, 4, ENC_BIG_ENDIAN);

2
epan/dissectors/packet-dcerpc-epm.c
View File

@ -399,7 +399,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset,
case PROTO_ID_IP: /* this one is always big endian */
proto_tree_add_item(tr, hf_epm_proto_ip, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(tr, "IP:%s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(tr, "IP:%s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
case PROTO_ID_RPC_CO:

2
epan/dissectors/packet-dcerpc-witness.c
View File

@ -362,7 +362,7 @@ PIDL_dissect_ipv4address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
}
proto_tree_add_item(tree, hfindex, tvb, offset, 4, ENC_BIG_ENDIAN);
if (param & PIDL_SET_COL_INFO) {
const char *ip = tvb_ip_to_str(tvb, offset);
const char *ip = tvb_ip_to_str(pinfo->pool, tvb, offset);
header_field_info *hf_info = proto_registrar_get_nth(hfindex);
proto_item_append_text(proto_tree_get_parent(tree), " %s:%s", hf_info->name, ip);
col_append_fstr(pinfo->cinfo, COL_INFO," %s:%s", hf_info->name, ip);

2
epan/dissectors/packet-dhcp-failover.c
View File

@ -458,7 +458,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
expert_add_info_format(pinfo, oi, &ei_dhcpfo_bad_length, "assigned ip address is not 4 bytes long");
break;
}
proto_item_append_text(oi, ", %s ", tvb_ip_to_str(tvb, offset));
proto_item_append_text(oi, ", %s ", tvb_ip_to_str(pinfo->pool, tvb, offset));
proto_tree_add_item(option_tree,
hf_dhcpfo_assigned_ip_address, tvb, offset,

8
epan/dissectors/packet-dhcp.c
View File

@ -1744,7 +1744,7 @@ dhcp_handle_basic_types(packet_info *pinfo, proto_tree *tree, proto_item *item,
proto_tree_add_item(tree, *hf_default->ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
/* Show IP address in root of option */
proto_item_append_text(tree, " (%s)", tvb_ip_to_str(tvb, offset));
proto_item_append_text(tree, " (%s)", tvb_ip_to_str(pinfo->pool, tvb, offset));
consumed = 4;
break;
@ -2991,7 +2991,7 @@ dissect_dhcpopt_classless_static_route(tvbuff_t *tvb, packet_info *pinfo, proto_
proto_item_append_text(route_item, ".0");
proto_item_append_text(route_item, "/%d", mask_width);
}
proto_item_append_text(route_item, "-%s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(route_item, "-%s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}
@ -6771,7 +6771,7 @@ dissect_packetcable_ietf_ccc(packet_info *pinfo, proto_item *v_ti, proto_tree *v
return (optend);
}
proto_item_append_text(vti, "%s (%u byte%s%s)",
tvb_ip_to_str(tvb, suboptoff),
tvb_ip_to_str(pinfo->pool, tvb, suboptoff),
subopt_len,
plurality(subopt_len, "", "s"),
subopt_len != 4 ? " [Invalid]" : "");
@ -6799,7 +6799,7 @@ dissect_packetcable_ietf_ccc(packet_info *pinfo, proto_item *v_ti, proto_tree *v
return (optend);
}
proto_item_append_text(vti, "%s (%u byte%s%s)",
tvb_ip_to_str(tvb, suboptoff),
tvb_ip_to_str(pinfo->pool, tvb, suboptoff),
subopt_len,
plurality(subopt_len, "", "s"),
subopt_len != 5 ? " [Invalid]" : "");

6
epan/dissectors/packet-dlep.c
View File

@ -417,7 +417,7 @@ decode_dataitem_v4conn(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt
offset+=DLEP_DIT_V4CONN_FLAGS_LEN;
proto_tree_add_item(pt, hf_dlep_dataitem_v4conn_addr, tvb, offset, FT_IPv4_LEN, ENC_BIG_ENDIAN);
proto_item_append_text(pi, ", Addr: %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(pi, ", Addr: %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset+=FT_IPv4_LEN;
if (len == DLEP_DIT_V4CONN_WPORT_LEN) {
@ -567,7 +567,7 @@ decode_dataitem_v4addr(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt
offset+=DLEP_DIT_V4ADDR_FLAGS_LEN;
proto_tree_add_item(pt, hf_dlep_dataitem_v4addr_addr, tvb, offset, FT_IPv4_LEN, ENC_BIG_ENDIAN);
proto_item_append_text(pi, " %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(pi, " %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset+=FT_IPv4_LEN;
if (len != DLEP_DIT_V4ADDR_LEN)
@ -620,7 +620,7 @@ decode_dataitem_v4subnet(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *
offset+=DLEP_DIT_V4SUBNET_FLAGS_LEN;
proto_tree_add_item(pt, hf_dlep_dataitem_v4subnet_subnet, tvb, offset, FT_IPv4_LEN, ENC_BIG_ENDIAN);
proto_item_append_text(pi, " %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(pi, " %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset+=FT_IPv4_LEN;
proto_tree_add_item_ret_uint(pt, hf_dlep_dataitem_v4subnet_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN, &prefixlen);

6
epan/dissectors/packet-dns.c
View File

@ -2089,7 +2089,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
{
const char *addr;
addr = tvb_ip_to_str(tvb, cur_offset);
addr = tvb_ip_to_str(pinfo->pool, tvb, cur_offset);
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", addr);
proto_item_append_text(trr, ", addr %s", addr);
@ -2256,7 +2256,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
proto_item *ti_wks;
wmem_strbuf_t *bitnames = wmem_strbuf_new_label(wmem_packet_scope());
wks_addr = tvb_ip_to_str(tvb, cur_offset);
wks_addr = tvb_ip_to_str(pinfo->pool, tvb, cur_offset);
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", wks_addr);
proto_item_append_text(trr, ", addr %s", wks_addr);
proto_tree_add_item(rr_tree, hf_dns_wks_address, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
@ -3565,7 +3565,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case DNS_SVCB_KEY_IPV4HINT:
for (svc_param_offset = 0; svc_param_offset < svc_param_length; svc_param_offset += 4) {
proto_tree_add_item(svcb_param_tree, hf_dns_svcb_param_ipv4hint_ip, tvb, cur_offset, 4, ENC_NA);
proto_item_append_text(svcb_param_ti, "%c%s", (svc_param_offset == 0 ? '=' : ','), tvb_ip_to_str(tvb, cur_offset));
proto_item_append_text(svcb_param_ti, "%c%s", (svc_param_offset == 0 ? '=' : ','), tvb_ip_to_str(pinfo->pool, tvb, cur_offset));
cur_offset += 4;
}
break;

6
epan/dissectors/packet-dsr.c
View File

@ -223,7 +223,7 @@ dissect_dsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_item_append_text(ti_hoplist, " :");
for(i=0;i<(opt_len-4)/4;i++) {
proto_tree_add_item(opt_hoplist_tree, hf_dsr_opt_rreq_address, tvb, offset_in_option, 4, ENC_NA); /* Opt rreq address */
proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(tvb, offset_in_option));
proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(pinfo->pool, tvb, offset_in_option));
offset_in_option += 4;
}
}
@ -249,7 +249,7 @@ dissect_dsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_item_append_text(ti_hoplist, " :");
for(i=0;i<(opt_len-1)/4;i++) {
proto_tree_add_item(opt_hoplist_tree, hf_dsr_opt_rrep_address, tvb, offset_in_option, 4, ENC_NA); /*Opt rrep address */
proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(tvb, offset_in_option));
proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(pinfo->pool, tvb, offset_in_option));
offset_in_option += 4;
}
}
@ -376,7 +376,7 @@ dissect_dsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_item_append_text(ti_hoplist, " :");
for(i=0;i<(opt_len-2)/4;i++) {
proto_tree_add_item(opt_hoplist_tree, hf_dsr_opt_srcrt_address, tvb, offset_in_option , 4, ENC_NA); /* Opt srcrt addresses */
proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(tvb, offset_in_option));
proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(pinfo->pool, tvb, offset_in_option));
offset_in_option += 4;
}
}

4
epan/dissectors/packet-dtpt.c
View File

@ -350,7 +350,7 @@ dissect_dtpt_sockaddr(tvbuff_t *tvb, guint offset, proto_tree *tree, int hfindex
proto_tree_add_item(sockaddr_tree, hf_dtpt_sockaddr_address,
tvb, offset+4,4,ENC_BIG_ENDIAN);
proto_tree_add_item(sockaddr_tree, hf_dtpt_padding, tvb, offset+8, 8, ENC_NA);
proto_item_append_text(sockaddr_item, ": %s:%d", tvb_ip_to_str(tvb,offset+4), port);
proto_item_append_text(sockaddr_item, ": %s:%d", tvb_ip_to_str(wmem_packet_scope(), tvb,offset+4), port);
}
break;
}
@ -373,7 +373,7 @@ dissect_dtpt_sockaddr(tvbuff_t *tvb, guint offset, proto_tree *tree, int hfindex
proto_tree_add_item(sockaddr_tree, hf_dtpt_sockaddr_address,
tvb, offset+10,4,ENC_BIG_ENDIAN);
proto_tree_add_item(sockaddr_tree, hf_dtpt_padding, tvb, offset+14, 16, ENC_NA);
proto_item_append_text(sockaddr_item, ": %s:%d", tvb_ip_to_str(tvb,offset+10), port);
proto_item_append_text(sockaddr_item, ": %s:%d", tvb_ip_to_str(wmem_packet_scope(), tvb,offset+10), port);
}
break;
}

2
epan/dissectors/packet-enrp.c
View File

@ -207,7 +207,7 @@ static void
dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
proto_tree_add_item(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ENC_BIG_ENDIAN);
proto_item_append_text(parameter_item, " (%s)", tvb_ip_to_str(parameter_tvb, IPV4_ADDRESS_OFFSET));
proto_item_append_text(parameter_item, " (%s)", tvb_ip_to_str(wmem_packet_scope(), parameter_tvb, IPV4_ADDRESS_OFFSET));
}
static void

14
epan/dissectors/packet-gtp.c
View File

@ -4897,7 +4897,7 @@ decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_
switch (pdp_typ) {
case 0x21:
proto_tree_add_item(ext_tree_user, hf_gtp_user_ipv4, tvb, offset + 5, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, " : %s", tvb_ip_to_str(tvb, offset + 5));
proto_item_append_text(te, " : %s", tvb_ip_to_str(pinfo->pool, tvb, offset + 5));
break;
case 0x57:
proto_tree_add_item(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 5, 16, ENC_NA);
@ -4909,7 +4909,7 @@ decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_
memset(&ipv6, 0, sizeof(ws_in6_addr));
proto_tree_add_item(ext_tree_user, hf_gtp_user_ipv4, tvb, offset + 5, 4, ENC_BIG_ENDIAN);
proto_tree_add_ipv6_format_value(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 9, 0, &ipv6, "dynamic");
proto_item_append_text(te, " : %s / dynamic", tvb_ip_to_str(tvb, offset + 5));
proto_item_append_text(te, " : %s / dynamic", tvb_ip_to_str(pinfo->pool, tvb, offset + 5));
} else if (length == 18) {
proto_tree_add_ipv4_format_value(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 5, 0, 0, "dynamic");
proto_tree_add_item(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 5, 16, ENC_NA);
@ -4917,7 +4917,7 @@ decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_
} else if (length == 22) {
proto_tree_add_item(ext_tree_user, hf_gtp_user_ipv4, tvb, offset + 5, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 9, 16, ENC_NA);
proto_item_append_text(te, " : %s / %s", tvb_ip_to_str(tvb, offset + 5),
proto_item_append_text(te, " : %s / %s", tvb_ip_to_str(pinfo->pool, tvb, offset + 5),
tvb_ip6_to_str(tvb, offset + 9));
} else {
proto_tree_add_expert_format(ext_tree_user, pinfo, &ei_gtp_ext_length_mal, tvb, offset + 3, length, "Wrong length indicated. Expected 6, 18 or 22, got %u", length);
@ -6026,7 +6026,7 @@ decode_gtp_gsn_addr_common(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
proto_tree_add_item(ext_tree_gsn_addr, hf_ipv4, tvb, offset + 3, 4, ENC_BIG_ENDIAN);
if (hf_ipv4 != hf_gtp_gsn_ipv4)
proto_item_set_hidden(proto_tree_add_item(ext_tree_gsn_addr, hf_gtp_gsn_ipv4, tvb, offset + 3, 4, ENC_BIG_ENDIAN));
proto_item_append_text(te, "%s", tvb_ip_to_str(tvb, offset + 3));
proto_item_append_text(te, "%s", tvb_ip_to_str(pinfo->pool, tvb, offset + 3));
set_address_tvb(gsn_address, AT_IPv4, 4, tvb, offset + 3);
break;
case 5:
@ -6038,7 +6038,7 @@ decode_gtp_gsn_addr_common(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
proto_tree_add_item(ext_tree_gsn_addr, hf_ipv4, tvb, offset + 4, 4, ENC_BIG_ENDIAN);
if (hf_ipv4 != hf_gtp_gsn_ipv4)
proto_item_set_hidden(proto_tree_add_item(ext_tree_gsn_addr, hf_gtp_gsn_ipv4, tvb, offset + 4, 4, ENC_BIG_ENDIAN));
proto_item_append_text(te, "%s", tvb_ip_to_str(tvb, offset + 4));
proto_item_append_text(te, "%s", tvb_ip_to_str(pinfo->pool, tvb, offset + 4));
set_address_tvb(gsn_address, AT_IPv6, 16, tvb, offset + 4);
break;
case 16:
@ -6447,7 +6447,7 @@ decode_gtp_chrg_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_
switch (length) {
case 4:
proto_tree_add_item(ext_tree_chrg_addr, hf_gtp_chrg_ipv4, tvb, offset + 3, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, "%s", tvb_ip_to_str(tvb, offset + 3));
proto_item_append_text(te, "%s", tvb_ip_to_str(pinfo->pool, tvb, offset + 3));
break;
case 16:
proto_tree_add_item(ext_tree_chrg_addr, hf_gtp_chrg_ipv6, tvb, offset + 3, 16, ENC_NA);
@ -8945,7 +8945,7 @@ decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_
switch (length) {
case 4:
proto_tree_add_item(ext_tree_node_addr, hf_gtp_node_ipv4, tvb, offset + 3, 4, ENC_BIG_ENDIAN);
proto_item_append_text(te, "%s", tvb_ip_to_str(tvb, offset + 3));
proto_item_append_text(te, "%s", tvb_ip_to_str(pinfo->pool, tvb, offset + 3));
break;
case 16:
proto_tree_add_item(ext_tree_node_addr, hf_gtp_node_ipv6, tvb, offset + 3, 16, ENC_NA);

12
epan/dissectors/packet-gtpv2.c
View File

@ -2276,7 +2276,7 @@ dissect_gtpv2_ip_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
if (length == 4)
{
proto_tree_add_item(tree, hf_gtpv2_ip_address_ipv4, tvb, offset, length, ENC_BIG_ENDIAN);
proto_item_append_text(item, "IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, "IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
}
else if (length == 16)
{
@ -2596,7 +2596,7 @@ dissect_gtpv2_paa(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
return;
}
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(tvb, offset));
proto_item_append_text(item, "IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
case 2:
/* IPv6*/
@ -2636,7 +2636,7 @@ dissect_gtpv2_paa(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
proto_item_append_text(item, "IPv6 %s, ", tvb_ip6_to_str(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(tvb, offset));
proto_item_append_text(item, "IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
case 4: /* Non IP */
case 5: /* Ethernet */
@ -3348,7 +3348,7 @@ dissect_gtpv2_f_teid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_
{
ipv4 = wmem_new0(pinfo->pool, address);
proto_tree_add_item(tree, hf_gtpv2_f_teid_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
set_address_tvb(ipv4, AT_IPv4, 4, tvb, offset);
offset += 4;
}
@ -6233,7 +6233,7 @@ dissect_gtpv2_mbms_ip_mc_dist(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
if ((tvb_get_guint8(tvb, offset) & 0x3f) == 4) {
offset += 1;
proto_tree_add_item(tree, hf_gtpv2_mbms_ip_mc_dist_addrv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, " IPv4 Dist %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, " IPv4 Dist %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
} else if ((tvb_get_guint8(tvb, offset) & 0x3f) == 16) {
offset += 1;
@ -6248,7 +6248,7 @@ dissect_gtpv2_mbms_ip_mc_dist(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
if ((tvb_get_guint8(tvb, offset) & 0x3f) == 4) {
offset += 1;
proto_tree_add_item(tree, hf_gtpv2_mbms_ip_mc_src_addrv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, " IPv4 Src %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, " IPv4 Src %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
} else if ((tvb_get_guint8(tvb, offset) & 0x3f) == 16) {
offset += 1;

20
epan/dissectors/packet-igmp.c
View File

@ -423,7 +423,7 @@ dissect_v3_group_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
tree = proto_tree_add_subtree_format(parent_tree, tvb, offset, -1,
ett_group_record, &item, "Group Record : %s %s",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pinfo->pool, tvb, offset+4),
val_to_str_const(tvb_get_guint8(tvb, offset), vs_record_type,"")
);
@ -444,7 +444,7 @@ dissect_v3_group_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
/* multicast address */
proto_tree_add_item(tree, hf_maddr, tvb, offset, 4, ENC_BIG_ENDIAN);
maddr_str = tvb_ip_to_str(tvb, offset);
maddr_str = tvb_ip_to_str(pinfo->pool, tvb, offset);
offset += 4;
if (num == 0) {
@ -508,7 +508,7 @@ dissect_v3_group_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
/* source addresses */
while(num--){
col_append_fstr(pinfo->cinfo, COL_INFO, "%s%s",
tvb_ip_to_str(tvb, offset), (num?", ":"}"));
tvb_ip_to_str(pinfo->pool, tvb, offset), (num?", ":"}"));
proto_tree_add_item(tree, hf_saddr, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
@ -584,7 +584,7 @@ dissect_igmp_v3_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
col_append_str(pinfo->cinfo, COL_INFO, ", general");
} else {
col_append_fstr(pinfo->cinfo, COL_INFO, ", specific for group %s",
tvb_ip_to_str(tvb, offset));
tvb_ip_to_str(pinfo->pool, tvb, offset));
}
offset +=4;
@ -603,7 +603,7 @@ dissect_igmp_v3_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
offset += 2;
while(num--){
col_append_fstr(pinfo->cinfo, COL_INFO, "%s%s", tvb_ip_to_str(tvb, offset), (num?", ":"}"));
col_append_fstr(pinfo->cinfo, COL_INFO, "%s%s", tvb_ip_to_str(pinfo->pool, tvb, offset), (num?", ":"}"));
proto_tree_add_item(tree, hf_saddr, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
}
@ -641,13 +641,13 @@ dissect_igmp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void
switch(type)
{
case IGMP_V2_LEAVE_GROUP:
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_ip_to_str(tvb, offset));
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
case IGMP_V1_HOST_MEMBERSHIP_QUERY:
col_append_fstr(pinfo->cinfo, COL_INFO, ", specific for group %s", tvb_ip_to_str(tvb, offset));
col_append_fstr(pinfo->cinfo, COL_INFO, ", specific for group %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
default: /* IGMP_V2_MEMBERSHIP_REPORT is the only case left */
col_append_fstr(pinfo->cinfo, COL_INFO, " group %s", tvb_ip_to_str(tvb, offset));
col_append_fstr(pinfo->cinfo, COL_INFO, " group %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
}
}
@ -826,8 +826,8 @@ dissect_igmp_mtrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
block_tree = proto_tree_add_subtree_format(tree, tvb, offset, IGMP_TRACEROUTE_RSP_LEN,
ett_mtrace_block, NULL, "Response data block: %s -> %s, Proto: %s, Forwarding Code: %s",
tvb_ip_to_str(tvb, offset + 4),
tvb_ip_to_str(tvb, offset + 8),
tvb_ip_to_str(pinfo->pool, tvb, offset + 4),
tvb_ip_to_str(pinfo->pool, tvb, offset + 8),
val_to_str_const(tvb_get_guint8(tvb, offset + 28), mtrace_rtg_vals, "Unknown"),
val_to_str_const(tvb_get_guint8(tvb, offset + 31), mtrace_fwd_code_vals, "Unknown"));

2
epan/dissectors/packet-ip.c
View File

@ -1136,7 +1136,7 @@ dissect_option_route(proto_tree *tree, tvbuff_t *tvb, int offset, int hf,
if (next)
proto_tree_add_ipv4_format_value(tree, hf, tvb, offset, 4, route,
"%s <- (next)",
tvb_ip_to_str(tvb, offset));
tvb_ip_to_str(wmem_packet_scope(), tvb, offset));
else
proto_tree_add_ipv4(tree, hf, tvb, offset, 4, route);
ti = proto_tree_add_string(tree, hf_host, tvb, offset, 4, get_hostname(route));

4
epan/dissectors/packet-ipdc.c
View File

@ -852,13 +852,13 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
proto_tree_add_ipv4_format(tag_tree, hf_ipdc_ipv4, tvb,
offset, len + 2, tvb_get_ntohl(tvb, offset + 2),
"%s (0x%2.2x): %s",
des, tag, tvb_ip_to_str(tvb, offset + 2));
des, tag, tvb_ip_to_str(pinfo->pool, tvb, offset + 2));
break;
case 6:
proto_tree_add_ipv4_format(tag_tree, hf_ipdc_ipv4, tvb,
offset, len + 2, tvb_get_ntohl(tvb, offset + 2),
"%s (0x%2.2x): %s:%u",
des, tag, tvb_ip_to_str(tvb, offset + 2), tvb_get_ntohs(tvb, offset + 6));
des, tag, tvb_ip_to_str(pinfo->pool, tvb, offset + 2), tvb_get_ntohs(tvb, offset + 6));
break;
default:
proto_tree_add_expert_format(tag_tree, pinfo, &ei_ipdc_ipv4, tvb, offset, len + 2, "%s (0x%2.2x): Invalid IP address length %u",

6
epan/dissectors/packet-isakmp.c
View File

@ -4256,7 +4256,7 @@ dissect_id_type(tvbuff_t *tvb, int offset, int length, guint8 id_type, proto_tre
switch (id_type) {
case IKE_ID_IPV4_ADDR:
proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(idit, "%s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(idit, "%s", tvb_ip_to_str(pinfo->pool, tvb, offset));
break;
case IKE_ID_FQDN:
proto_tree_add_item_ret_string(idtree, hf_isakmp_id_data_fqdn, tvb, offset, length, ENC_ASCII|ENC_NA, pinfo->pool, &str);
@ -4269,12 +4269,12 @@ dissect_id_type(tvbuff_t *tvb, int offset, int length, guint8 id_type, proto_tre
case IKE_ID_IPV4_ADDR_SUBNET:
proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_subnet, tvb, offset+4, 4, ENC_BIG_ENDIAN);
proto_item_append_text(idit, "%s/%s", tvb_ip_to_str(tvb, offset), tvb_ip_to_str(tvb, offset+4));
proto_item_append_text(idit, "%s/%s", tvb_ip_to_str(pinfo->pool, tvb, offset), tvb_ip_to_str(pinfo->pool, tvb, offset+4));
break;
case IKE_ID_IPV4_ADDR_RANGE:
proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_range_start, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_range_end, tvb, offset+4, 4, ENC_BIG_ENDIAN);
proto_item_append_text(idit, "%s/%s", tvb_ip_to_str(tvb, offset), tvb_ip_to_str(tvb, offset+4));
proto_item_append_text(idit, "%s/%s", tvb_ip_to_str(pinfo->pool, tvb, offset), tvb_ip_to_str(pinfo->pool, tvb, offset+4));
break;
case IKE_ID_IPV6_ADDR:
proto_tree_add_item(idtree, hf_isakmp_id_data_ipv6_addr, tvb, offset, 16, ENC_NA);

4
epan/dissectors/packet-isis-lsp.c
View File

@ -990,10 +990,10 @@ dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *t
if(found_mask) {
ti = proto_tree_add_ipv4_format_value( tree, hf_isis_lsp_ip_reachability_ipv4_prefix, tvb, offset, 12,
src, "%s/%d", tvb_ip_to_str(tvb, offset+4), prefix_len );
src, "%s/%d", tvb_ip_to_str(pinfo->pool, tvb, offset+4), prefix_len );
} else {
ti = proto_tree_add_ipv4_format_value( tree, hf_isis_lsp_ip_reachability_ipv4_prefix, tvb, offset, 12,
src, "%s mask %s", tvb_ip_to_str(tvb, offset+4), tvb_ip_to_str(tvb, offset+8));
src, "%s mask %s", tvb_ip_to_str(pinfo->pool, tvb, offset+4), tvb_ip_to_str(pinfo->pool, tvb, offset+8));
};
ntree = proto_item_add_subtree(ti, ett_isis_lsp_clv_ip_reachability);

2
epan/dissectors/packet-ismp.c
View File

@ -262,7 +262,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp
edp_tree = proto_item_add_subtree(edp_ti, ett_ismp_edp);
col_add_fstr(pinfo->cinfo, COL_INFO, "MIP %s, MMAC %s, ifIdx %d",
tvb_ip_to_str(tvb, offset+2),
tvb_ip_to_str(pinfo->pool, tvb, offset+2),
tvb_ether_to_str(pinfo->pool, tvb, offset+6),
tvb_get_ntohl(tvb, offset+12));

2
epan/dissectors/packet-kerberos.c
View File

@ -5342,7 +5342,7 @@ dissect_kerberos_T_address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
switch(private_data->addr_type){
case KERBEROS_ADDR_TYPE_IPV4:
it=proto_tree_add_item(tree, hf_krb_address_ip, tvb, offset, 4, ENC_BIG_ENDIAN);
address_str = tvb_ip_to_str(tvb, offset);
address_str = tvb_ip_to_str(actx->pinfo->pool, tvb, offset);
break;
case KERBEROS_ADDR_TYPE_NETBIOS:
{

2
epan/dissectors/packet-ldp.c
View File

@ -1714,7 +1714,7 @@ dissect_tlv_path_vector(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_t
proto_tree_add_ipv4_format(val_tree,
hf_ldp_tlv_pv_lsrid, tvb, offset, 4,
addr, "LSR Id %u: %s", ix,
tvb_ip_to_str(tvb, offset));
tvb_ip_to_str(pinfo->pool, tvb, offset));
}
if (rem)
proto_tree_add_expert_format(tree, pinfo, &ei_ldp_tlv_fec_len, tvb, offset, rem, "Error processing TLV: Extra data at end of path vector");

4
epan/dissectors/packet-lisp-tcp.c
View File

@ -412,8 +412,8 @@ dissect_lisp_tcp_membership_message(tvbuff_t *tvb, packet_info *pinfo, proto_tre
switch (afi) {
case AFNUM_INET:
proto_tree_add_item(message_tree, hf_lisp_tcp_message_rloc_ipv4, tvb, offset, INET_ADDRLEN, ENC_NA);
proto_item_append_text(tim, ", RLOC: %s", tvb_ip_to_str(tvb, offset));
col_append_fstr(pinfo->cinfo, COL_INFO, " [%u] %s", iid, tvb_ip_to_str(tvb, offset));
proto_item_append_text(tim, ", RLOC: %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
col_append_fstr(pinfo->cinfo, COL_INFO, " [%u] %s", iid, tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += INET_ADDRLEN;
data_len -= INET_ADDRLEN;
break;

6
epan/dissectors/packet-lisp.c
View File

@ -529,7 +529,7 @@ get_addr_str(tvbuff_t *tvb, gint offset, guint16 afi, guint16 *addr_len)
return notset_str;
case AFNUM_INET:
*addr_len = INET_ADDRLEN;
addr_str = tvb_ip_to_str(tvb, offset);
addr_str = tvb_ip_to_str(wmem_packet_scope(), tvb, offset);
return addr_str;
case AFNUM_INET6:
*addr_len = INET6_ADDRLEN;
@ -781,7 +781,7 @@ dissect_lcaf_afi_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
switch (afi) {
case AFNUM_INET:
proto_tree_add_item(lisp_afi_list_tree, hf_lisp_lcaf_afi_list_ipv4, tvb, offset, INET_ADDRLEN, ENC_BIG_ENDIAN);
proto_item_append_text(tir, " %d. IPv4 Address: %s", i, tvb_ip_to_str(tvb, offset));
proto_item_append_text(tir, " %d. IPv4 Address: %s", i, tvb_ip_to_str(pinfo->pool, tvb, offset));
proto_item_set_len(tir, 2 + INET_ADDRLEN);
offset += INET_ADDRLEN;
remaining -= INET_ADDRLEN;
@ -2320,7 +2320,7 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
switch (itr_afi) {
case AFNUM_INET:
proto_tree_add_item(lisp_itr_tree, hf_lisp_mreq_itr_rloc_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(tir, " %d: %s", i + 1, tvb_ip_to_str(tvb, offset));
proto_item_append_text(tir, " %d: %s", i + 1, tvb_ip_to_str(pinfo->pool, tvb, offset));
proto_item_set_len(tir, 2 + INET_ADDRLEN);
offset += INET_ADDRLEN;
break;

4
epan/dissectors/packet-lldp.c
View File

@ -1473,7 +1473,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
switch(addr_family){
case AFNUM_INET:
if (dataLen == 6){
strPtr = tvb_ip_to_str(tvb, offset);
strPtr = tvb_ip_to_str(pinfo->pool, tvb, offset);
}else{
expert_add_info_format(pinfo, lf, &ei_lldp_bad_length,
"Invalid Chassis ID Length (%u) for Type (%s, %s), expected (6)", dataLen, val_to_str_const(tlvsubType, chassis_id_subtypes, ""), val_to_str_const(addr_family, afn_vals, ""));
@ -1646,7 +1646,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3
switch(addr_family){
case AFNUM_INET:
if (dataLen == 6){
strPtr = tvb_ip_to_str(tvb, offset);
strPtr = tvb_ip_to_str(pinfo->pool, tvb, offset);
}else{
expert_add_info_format(pinfo, lf, &ei_lldp_bad_length,
"Invalid Port ID Length (%u) for Type (%s, %s), expected (6)", dataLen, val_to_str_const(tlvsubType, port_id_subtypes, ""), val_to_str_const(addr_family, afn_vals, ""));

38
epan/dissectors/packet-lmp.c
View File

@ -835,14 +835,14 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
case 1:
l = LMPF_VAL_LOCAL_NODE_ID;
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset2));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset2));
proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, ENC_BIG_ENDIAN);
break;
case 2:
l = LMPF_VAL_REMOTE_NODE_ID;
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset2));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset2));
proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, ENC_BIG_ENDIAN);
break;
@ -861,7 +861,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
case 2:
l = (type == 1)? LMPF_VAL_LOCAL_LINK_ID_IPV4:
LMPF_VAL_REMOTE_LINK_ID_IPV4;
proto_item_append_text(ti, ": IPv4 %s", tvb_ip_to_str(tvb, offset2));
proto_item_append_text(ti, ": IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset2));
proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, ENC_BIG_ENDIAN);
break;
@ -898,7 +898,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
case 2:
l = (type == 1)? LMPF_VAL_LOCAL_INTERFACE_ID_IPV4:
LMPF_VAL_REMOTE_INTERFACE_ID_IPV4;
proto_item_append_text(ti, ": IPv4 %s", tvb_ip_to_str(tvb, offset2));
proto_item_append_text(ti, ": IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset2));
proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, ENC_BIG_ENDIAN);
break;
@ -1085,8 +1085,8 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
case 1:
proto_item_append_text(ti, ": IPv4: Local %s, Remote %s",
tvb_ip_to_str(tvb, offset2+4),
tvb_ip_to_str(tvb, offset2+8));
tvb_ip_to_str(pinfo->pool, tvb, offset2+4),
tvb_ip_to_str(pinfo->pool, tvb, offset2+8));
proto_tree_add_item(lmp_object_tree,
hf_lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
tvb, offset2+4, 4, ENC_BIG_ENDIAN);
@ -1144,8 +1144,8 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
case 1:
proto_item_append_text(ti, ": IPv4: Local %s, Remote %s",
tvb_ip_to_str(tvb, offset2+4),
tvb_ip_to_str(tvb, offset2+8));
tvb_ip_to_str(pinfo->pool, tvb, offset2+4),
tvb_ip_to_str(pinfo->pool, tvb, offset2+8));
proto_tree_add_item(lmp_object_tree,
hf_lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
@ -1267,9 +1267,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
case 1:
if (j < 4)
proto_item_append_text(ti, ": [IPv4-%s",
tvb_ip_to_str(tvb, offset2+l));
tvb_ip_to_str(pinfo->pool, tvb, offset2+l));
proto_item_append_text(ti2, ": IPv4 %s",
tvb_ip_to_str(tvb, offset2+l));
tvb_ip_to_str(pinfo->pool, tvb, offset2+l));
proto_tree_add_item(lmp_subobj_tree, hf_lmp_interface_id_ipv4, tvb, offset2+l, 4, ENC_BIG_ENDIAN);
l += 4;
break;
@ -1628,7 +1628,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
/* Local interface ID */
proto_item_append_text(ti, ": Local Interface ID %s",
tvb_ip_to_str(tvb, offset2+12));
tvb_ip_to_str(pinfo->pool, tvb, offset2+12));
proto_tree_add_item(lmp_object_tree,
hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID],
@ -1697,13 +1697,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
switch(type) {
case 1:
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset2));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset2));
proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_LOCAL_DA_DCN_ADDR], tvb,
offset2, 4, ENC_BIG_ENDIAN);
break;
case 2:
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset2));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset2));
proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_REMOTE_DA_DCN_ADDR], tvb,
offset2, 4, ENC_BIG_ENDIAN);
break;
@ -1761,9 +1761,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
proto_item_set_text(ti2, "Primary Routing Controller: "
"Area ID: %s, RC PC ID: %s, "
"RC PC Addr: %s",
tvb_ip_to_str(tvb, offset2+l+4),
tvb_ip_to_str(tvb, offset2+l+8),
tvb_ip_to_str(tvb, offset2+l+12));
tvb_ip_to_str(pinfo->pool, tvb, offset2+l+4),
tvb_ip_to_str(pinfo->pool, tvb, offset2+l+8),
tvb_ip_to_str(pinfo->pool, tvb, offset2+l+12));
proto_tree_add_item(lmp_subobj_tree,
hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_AREA_ID],
tvb, offset2+l+4, 4, ENC_BIG_ENDIAN);
@ -1779,9 +1779,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
proto_item_set_text(ti2, "Secondary Routing Controller: "
"Area ID: %s, RC PC ID: %s, "
"RC PC Addr: %s",
tvb_ip_to_str(tvb, offset2+l+4),
tvb_ip_to_str(tvb, offset2+l+8),
tvb_ip_to_str(tvb, offset2+l+12));
tvb_ip_to_str(pinfo->pool, tvb, offset2+l+4),
tvb_ip_to_str(pinfo->pool, tvb, offset2+l+8),
tvb_ip_to_str(pinfo->pool, tvb, offset2+l+12));
proto_tree_add_item(lmp_subobj_tree,
hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_AREA_ID],
tvb, offset2+l+4, 4, ENC_BIG_ENDIAN);

6
epan/dissectors/packet-lwres.c
View File

@ -194,7 +194,7 @@ static void dissect_getnamebyaddr_request(tvbuff_t* tvb, proto_tree* lwres_tree)
flags = tvb_get_ntohl(tvb, LWRES_LWPACKET_LENGTH);
family = tvb_get_ntohl(tvb, LWRES_LWPACKET_LENGTH + 4);
addrlen = tvb_get_ntohs(tvb, LWRES_LWPACKET_LENGTH + 8);
addrs = tvb_ip_to_str(tvb, LWRES_LWPACKET_LENGTH + 10);
addrs = tvb_ip_to_str(wmem_packet_scope(), tvb, LWRES_LWPACKET_LENGTH + 10);
slen = (int)strlen(addrs);
if (lwres_tree == NULL)
@ -407,7 +407,7 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, packet_info *pinfo, p
{
family = tvb_get_ntohl(tvb, offset);
length = tvb_get_ntohs(tvb, offset + 4);
addrs = tvb_ip_to_str(tvb, offset + 6);
addrs = tvb_ip_to_str(pinfo->pool, tvb, offset + 6);
slen = (int)strlen(addrs);
addr_tree = proto_tree_add_subtree_format(adn_resp_tree,tvb, offset, 4+2+4, ett_adn_addr, NULL, "Address %s", addrs);
@ -447,7 +447,7 @@ static void dissect_a_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int o
curr = offset + (int)((sizeof(guint32)+sizeof(guint16)) * i);
addrs = tvb_ip_to_str(tvb, curr+2);
addrs = tvb_ip_to_str(wmem_packet_scope(), tvb, curr+2);
addr_tree = proto_tree_add_subtree_format(a_rec_tree, tvb, curr,
6, ett_a_rec_addr, NULL, "Address %s", addrs);

18
epan/dissectors/packet-mip.c
View File

@ -851,9 +851,9 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
case MIP_REGISTRATION_REQUEST:
col_add_fstr(pinfo->cinfo, COL_INFO,
"Reg Request: HoA=%s HA=%s CoA=%s",
tvb_ip_to_str(tvb, 4),
tvb_ip_to_str(tvb, 8),
tvb_ip_to_str(tvb, 12));
tvb_ip_to_str(pinfo->pool, tvb, 4),
tvb_ip_to_str(pinfo->pool, tvb, 8),
tvb_ip_to_str(pinfo->pool, tvb, 12));
if (tree) {
static int * const flags[] = {
@ -906,8 +906,8 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
case MIP_REGISTRATION_REPLY:
col_add_fstr(pinfo->cinfo, COL_INFO,
"Reg Reply: HoA=%s HA=%s, Code=%u",
tvb_ip_to_str(tvb, 4),
tvb_ip_to_str(tvb, 8),
tvb_ip_to_str(pinfo->pool, tvb, 4),
tvb_ip_to_str(pinfo->pool, tvb, 8),
tvb_get_guint8(tvb,1));
if (tree) {
@ -973,9 +973,9 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
case MIP_REGISTRATION_REVOCATION:
col_add_fstr(pinfo->cinfo, COL_INFO,
"Reg Revocation: HoA=%s HDA=%s FDA=%s",
tvb_ip_to_str(tvb, 4),
tvb_ip_to_str(tvb, 8),
tvb_ip_to_str(tvb, 12));
tvb_ip_to_str(pinfo->pool, tvb, 4),
tvb_ip_to_str(pinfo->pool, tvb, 8),
tvb_ip_to_str(pinfo->pool, tvb, 12));
if (tree) {
static int * const mip_flags[] = {
@ -1021,7 +1021,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
break;
case MIP_REGISTRATION_REVOCATION_ACK:
col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Revocation Ack: HoA=%s",
tvb_ip_to_str(tvb, 4));
tvb_ip_to_str(pinfo->pool, tvb, 4));
if (tree) {
static int * const mip_flags[] = {

10
epan/dissectors/packet-mip6.c
View File

@ -3043,7 +3043,7 @@ dissect_pmip6_opt_ipv4hareq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (dword == 0) {
proto_item_append_text(item, " - Request that the local mobility anchor perform the address allocation");
}
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb,offset));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb,offset));
return tvb_captured_length(tvb);
}
@ -3082,7 +3082,7 @@ dissect_pmip6_opt_ipv4harep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_item(opt_tree, hf_mip6_ipv4ha_ha, tvb,
offset, MIP6_IPV4HAREP_HA_LEN, ENC_BIG_ENDIAN);
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb,offset));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb,offset));
return tvb_captured_length(tvb);
}
@ -3115,7 +3115,7 @@ dissect_pmip6_opt_ipv4dra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
proto_tree_add_item(opt_tree, hf_mip6_ipv4dra_dra, tvb,
offset, MIP6_IPV4DRA_DRA_LEN, ENC_BIG_ENDIAN);
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb,offset));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb,offset));
return tvb_captured_length(tvb);
}
@ -3243,7 +3243,7 @@ dissect_pmip6_opt_lmaa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
}else if (opt_code == 2) {
/* IPv4 addr */
proto_tree_add_item(opt_tree, hf_mip6_lmaa_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb,offset));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb,offset));
}
@ -3665,7 +3665,7 @@ dissect_mip6_opt_dmnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
proto_tree_add_item(opt_tree, hf_mip6_opt_dmnp_dmnp_ipv4, tvb,
offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, ": %s/%u",
tvb_ip_to_str(tvb, offset), prefix_len);
tvb_ip_to_str(pinfo->pool, tvb, offset), prefix_len);
break;
case 18:

4
epan/dissectors/packet-msdp.c
View File

@ -317,9 +317,9 @@ static void dissect_msdp_sa(tvbuff_t *tvb, packet_info *pinfo,
}
entry_tree = proto_tree_add_subtree_format(tree, tvb, *offset, 12, ett_msdp_sa_entry, NULL,
"(S,G) block: %s/%u -> %s",
tvb_ip_to_str(tvb, *offset + 8),
tvb_ip_to_str(pinfo->pool, tvb, *offset + 8),
tvb_get_guint8(tvb, *offset + 3),
tvb_ip_to_str(tvb, *offset + 4));
tvb_ip_to_str(pinfo->pool, tvb, *offset + 4));
proto_tree_add_item(entry_tree, hf_msdp_sa_reserved, tvb, *offset, 3, ENC_BIG_ENDIAN);
*offset += 3;

4
epan/dissectors/packet-msnip.c
View File

@ -107,7 +107,7 @@ dissect_msnip_rmr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in
if (item) {
proto_item_set_text(item,"Group: %s %s",
tvb_ip_to_str(tvb, offset-4),
tvb_ip_to_str(pinfo->pool, tvb, offset-4),
val_to_str(rec_type, msnip_rec_types,
"Unknown Type:0x%02x"));
@ -184,7 +184,7 @@ dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
if (item) {
proto_item_set_text(item,"Group: %s/%d",
tvb_ip_to_str(tvb, offset - 8), masklen);
tvb_ip_to_str(pinfo->pool, tvb, offset - 8), masklen);
proto_item_set_len(item, offset-old_offset);
}

2
epan/dissectors/packet-msnlb.c
View File

@ -289,7 +289,7 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
switch(address_family){
case 0x2: /* IPv4 */
proto_tree_add_item(hb_tree, hf_msnlb_host_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
break;
case 0x17: /* IPv6 */

2
epan/dissectors/packet-nbt.c
View File

@ -645,7 +645,7 @@ dissect_nbns_answer(tvbuff_t *tvb, packet_info *pinfo, int offset, int nbns_data
if (opcode != OPCODE_WACK) {
col_append_fstr(cinfo, COL_INFO, " %s %s",
type_name,
tvb_ip_to_str(tvb, cur_offset+2));
tvb_ip_to_str(pinfo->pool, tvb, cur_offset+2));
}
}

2
epan/dissectors/packet-netlink-route.c
View File

@ -1079,7 +1079,7 @@ dissect_netlink_route_ifa_attrs(tvbuff_t *tvb, void *data _U_, struct packet_net
case WS_IFA_LOCAL:
case WS_IFA_BROADCAST:
if (len == 4) {
proto_item_append_text(tree, ": %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(tree, ": %s", tvb_ip_to_str(wmem_packet_scope(), tvb, offset));
proto_tree_add_item(tree, &hfi_netlink_route_ifa_addr4, tvb, offset, len, ENC_BIG_ENDIAN);
} else {
proto_item_append_text(tree, ": %s", tvb_ip6_to_str(tvb, offset));

4
epan/dissectors/packet-netmon.c
View File

@ -1009,7 +1009,7 @@ dissect_netmon_system_config(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_item(system_tree, hf_netmon_system_config_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
proto_tree_add_item(system_tree, hf_netmon_system_config_ip_address, tvb, offset, 4, ENC_BIG_ENDIAN);
col_add_fstr(pinfo->cinfo, COL_INFO, "NIC: %s, Address: %s", str_field1, tvb_ip_to_str(tvb, offset));
col_add_fstr(pinfo->cinfo, COL_INFO, "NIC: %s, Address: %s", str_field1, tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
proto_tree_add_item(system_tree, hf_netmon_system_config_subnet_mask, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
@ -1221,7 +1221,7 @@ dissect_netmon_system_config(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_item(system_tree, hf_netmon_system_config_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
proto_tree_add_item(system_tree, hf_netmon_system_config_ip_address, tvb, offset, 4, ENC_BIG_ENDIAN);
col_add_fstr(pinfo->cinfo, COL_INFO, "NIC: %s, Address: %s", str_field1, tvb_ip_to_str(tvb, offset));
col_add_fstr(pinfo->cinfo, COL_INFO, "NIC: %s, Address: %s", str_field1, tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
proto_tree_add_item(system_tree, hf_netmon_system_config_subnet_mask, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;

2
epan/dissectors/packet-nsip.c
View File

@ -387,7 +387,7 @@ decode_ip_element(nsip_ip_element_info_t *element, build_info_t *bi, proto_tree
bi->tvb, bi->offset, element->address_length,
ENC_BIG_ENDIAN);
proto_item_append_text(tf, ": IP address: %s",
tvb_ip_to_str(bi->tvb, bi->offset));
tvb_ip_to_str(wmem_packet_scope(), bi->tvb, bi->offset));
break;
case NSIP_IP_VERSION_6:

4
epan/dissectors/packet-nt-tpcp.c
View File

@ -144,8 +144,8 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
val_to_str_const(type, type_vals, "Unknown"),
id,
udp_port_to_display(pinfo->pool, cport),
tvb_ip_to_str(tvb, 8),
tvb_ip_to_str(tvb, 12));
tvb_ip_to_str(pinfo->pool, tvb, 8),
tvb_ip_to_str(pinfo->pool, tvb, 12));
if (version == TPCP_VER_1)
return TPCP_VER_1_LENGTH;

2
epan/dissectors/packet-ntp.c
View File

@ -1777,7 +1777,7 @@ dissect_ntp_priv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt
mode7_item = proto_tree_add_string_format(ntp_tree, hf_ntppriv_mode7_item, tvb, offset,
(gint)itemsize, "Monlist Item", "Monlist item: address: %s:%u",
tvb_ip_to_str(tvb, offset + 16), tvb_get_ntohs(tvb, offset + ((reqcode == PRIV_RC_MON_GETLIST_1) ? 28 : 20)));
tvb_ip_to_str(pinfo->pool, tvb, offset + 16), tvb_get_ntohs(tvb, offset + ((reqcode == PRIV_RC_MON_GETLIST_1) ? 28 : 20)));
mode7_item_tree = proto_item_add_subtree(mode7_item, ett_mode7_item);
proto_tree_add_item(mode7_item_tree, hf_ntppriv_avgint, tvb, offset, 4, ENC_BIG_ENDIAN);

4
epan/dissectors/packet-olsr.c
View File

@ -204,7 +204,7 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
nlq = tvb_get_guint8(tvb, offset + 5);
address_group = proto_tree_add_bytes_format_value(olsr_tree, hf_olsr_neighbor, tvb, offset, 8,
NULL, "%s (%d/%d)", tvb_ip_to_str(tvb, offset), lq, nlq);
NULL, "%s (%d/%d)", tvb_ip_to_str(pinfo->pool, tvb, offset), lq, nlq);
address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh);
@ -365,7 +365,7 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr
nlq = tvb_get_guint8(tvb, offset + 5);
address_group = proto_tree_add_bytes_format_value(olsr_tree, hf_olsr_neighbor, tvb, offset, 8,
NULL, "%s (%d/%d)", tvb_ip_to_str(tvb, offset), lq, nlq);
NULL, "%s (%d/%d)", tvb_ip_to_str(pinfo->pool, tvb, offset), lq, nlq);
address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh);

32
epan/dissectors/packet-ospf.c
View File

@ -2246,7 +2246,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree
case MPLS_TLV_ROUTER:
tlv_tree = proto_tree_add_subtree_format(mpls_tree, tvb, offset, tlv_length+4,
ett_ospf_lsa_mpls_router, NULL, "Router Address: %s",
tvb_ip_to_str(tvb, offset+4));
tvb_ip_to_str(pinfo->pool, tvb, offset+4));
proto_tree_add_uint_format_value(tlv_tree, hf_ospf_tlv_type, tvb, offset, 2, tlv_type, "1 - Router Address");
proto_tree_add_item(tlv_tree, hf_ospf_tlv_length, tvb, offset+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_ospf_ls_mpls_routerid,
@ -2283,7 +2283,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree
case MPLS_LINK_ID:
stlv_tree = proto_tree_add_subtree_format(tlv_tree, tvb, stlv_offset, stlv_len+4,
ett_ospf_lsa_mpls_link_stlv, NULL, "%s: %s", stlv_name,
tvb_ip_to_str(tvb, stlv_offset + 4));
tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 4));
proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2,
stlv_type, "%u: %s", stlv_type, stlv_name);
proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN);
@ -2295,7 +2295,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree
case MPLS_LINK_REMOTE_IF:
stlv_tree = proto_tree_add_subtree_format(tlv_tree, tvb, stlv_offset, stlv_len+4,
ett_ospf_lsa_mpls_link_stlv, NULL, "%s: %s", stlv_name,
tvb_ip_to_str(tvb, stlv_offset + 4));
tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 4));
proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2,
stlv_type, "%u: %s", stlv_type, stlv_name);
proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN);
@ -2682,7 +2682,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree
case OIF_LOCAL_NODE_ID:
stlv_tree = proto_tree_add_subtree_format(tlv_tree, tvb, stlv_offset, stlv_len+4,
ett_ospf_lsa_mpls_link_stlv, NULL, "%s: %s", stlv_name,
tvb_ip_to_str(tvb, stlv_offset + 4));
tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 4));
proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2,
stlv_type, "%u: %s", stlv_type, stlv_name);
proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN);
@ -2694,7 +2694,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree
case OIF_REMOTE_NODE_ID:
stlv_tree = proto_tree_add_subtree_format(tlv_tree, tvb, stlv_offset, stlv_len+4,
ett_ospf_lsa_mpls_link_stlv, NULL, "%s: %s", stlv_name,
tvb_ip_to_str(tvb, stlv_offset + 4));
tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 4));
proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2,
stlv_type, "%u: %s", stlv_type, stlv_name);
proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN);
@ -2760,19 +2760,19 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree
case OIF_NODE_ID:
stlv_tree = proto_tree_add_subtree_format(tlv_tree, tvb, stlv_offset, stlv_len+4,
ett_ospf_lsa_oif_tna_stlv, NULL, "%s: %s", stlv_name,
tvb_ip_to_str(tvb, stlv_offset + 4));
tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 4));
proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2,
stlv_type, "%u: %s", stlv_type, stlv_name);
proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_ipv4_format(stlv_tree, hf_ospf_oif_node_id, tvb, stlv_offset+4, 4,
tvb_get_ntohl(tvb, stlv_offset + 4), "%s: %s", stlv_name,
tvb_ip_to_str(tvb, stlv_offset + 4));
tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 4));
break;
case OIF_TNA_IPv4_ADDRESS:
stlv_tree = proto_tree_add_subtree_format(tlv_tree, tvb, stlv_offset, stlv_len+4,
ett_ospf_lsa_oif_tna_stlv, NULL, "%s (IPv4): %s", stlv_name,
tvb_ip_to_str(tvb, stlv_offset + 8));
tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 8));
proto_tree_add_uint_format_value(stlv_tree, hf_ospf_tlv_type, tvb, stlv_offset, 2,
stlv_type, "%u: %s (IPv4)", stlv_type, stlv_name);
proto_tree_add_item(stlv_tree, hf_ospf_tlv_length, tvb, stlv_offset+2, 2, ENC_BIG_ENDIAN);
@ -3178,7 +3178,7 @@ dissect_ospf_lsa_ext_prefix(tvbuff_t *tvb, packet_info *pinfo, int offset, proto
}
proto_item_append_text(ti_tree, " (Type: %-13s Prefix: %s/%u)",
val_to_str_const(route_type, ext_pfx_tlv_route_vals, "Unknown"),
prefix_length == 0 ? "0.0.0.0" : tvb_ip_to_str(tvb, offset + 8),
prefix_length == 0 ? "0.0.0.0" : tvb_ip_to_str(pinfo->pool, tvb, offset + 8),
prefix_length);
stlv_offset = offset + 8 + (prefix_length != 0 ? 4 : 0);
break;
@ -3202,7 +3202,7 @@ dissect_ospf_lsa_ext_prefix(tvbuff_t *tvb, packet_info *pinfo, int offset, proto
}
proto_item_append_text(ti_tree, " (Range Size: %u, Prefix: %s/%u)",
range_size,
prefix_length == 0 ? "0.0.0.0" : tvb_ip_to_str(tvb, offset + 12),
prefix_length == 0 ? "0.0.0.0" : tvb_ip_to_str(pinfo->pool, tvb, offset + 12),
prefix_length);
stlv_offset = offset + 12 + (prefix_length != 0 ? 4 : 0);
break;
@ -3453,8 +3453,8 @@ dissect_ospf_lsa_ext_link(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_t
val_to_str_const(link_type, ospf_v3_lsa_type_vals, "Unknown link type"));
proto_item_append_text(ti_tree, " (Type: %-8s ID: %-15s Data: %s)",
val_to_str_const(link_type, ospf_v3_lsa_type_short_vals, "Unknown"),
tvb_ip_to_str(tvb, offset + 8),
tvb_ip_to_str(tvb, offset + 12));
tvb_ip_to_str(pinfo->pool, tvb, offset + 8),
tvb_ip_to_str(pinfo->pool, tvb, offset + 12));
reserved = tvb_get_ntoh24(tvb, offset + 5);
ti = proto_tree_add_item(tlv_tree, hf_ospf_header_reserved, tvb, offset + 5, 3, ENC_NA);
if (reserved != 0) {
@ -3521,7 +3521,7 @@ dissect_ospf_lsa_ext_link(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_t
proto_tree_add_item(stlv_tree, hf_ospf_ls_elink_nbr, tvb, stlv_offset + 8, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(stlv_tree, hf_ospf_ls_sid_label, tvb, stlv_offset + 12, (stlv_length - 8), ENC_BIG_ENDIAN);
proto_item_append_text(ti_tree, " (SID/Label: %u, Neighbor: %s)",
sid_label, tvb_ip_to_str(tvb, stlv_offset + 8));
sid_label, tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 8));
break;
case SR_STLV_LINK_MSD:
@ -3539,7 +3539,7 @@ dissect_ospf_lsa_ext_link(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_t
case SR_STLV_REMOTE_IPV4_ADDRESS:
/* Remote IPv4 Address Sub-TLV (rfc8379) */
proto_tree_add_item(stlv_tree, hf_ospf_ls_remote_ipv4_addr, tvb, stlv_offset + 4, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti_tree, " (%s)", tvb_ip_to_str(tvb, stlv_offset + 4));
proto_item_append_text(ti_tree, " (%s)", tvb_ip_to_str(pinfo->pool, tvb, stlv_offset + 4));
break;
case SR_STLV_LOCAL_REMOTE_INTERFACE_ID:
@ -3787,8 +3787,8 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t
ospf_lsa_router_link_tree = proto_tree_add_subtree_format(ospf_lsa_tree, tvb, offset, 12 + 4 * nr_metric,
ett_ospf_lsa_router_link, NULL, "Type: %-8s ID: %-15s Data: %-15s Metric: %d",
val_to_str_const(link_type, ospf_v3_lsa_type_short_vals, "Unknown"),
tvb_ip_to_str(tvb, offset),
tvb_ip_to_str(tvb, offset + 4),
tvb_ip_to_str(pinfo->pool, tvb, offset),
tvb_ip_to_str(pinfo->pool, tvb, offset + 4),
tvb_get_ntohs(tvb, offset + 10));
ti_item = proto_tree_add_item(ospf_lsa_router_link_tree, hf_ospf_ls_router_linkid,

2
epan/dissectors/packet-pathport.c
View File

@ -572,7 +572,7 @@ static int dissect_pathport_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree
if((type == PP_ARP_REPLY) && (len >= 36))
{
guint32 id = tvb_get_ntohl(tvb, 24);
col_add_fstr(pinfo->cinfo, COL_INFO, "%s is at %s", resolve_pp_id(id), tvb_ip_to_str(tvb, 28));
col_add_fstr(pinfo->cinfo, COL_INFO, "%s is at %s", resolve_pp_id(id), tvb_ip_to_str(pinfo->pool, tvb, 28));
}
else if((type == PP_DATA) && (len >= 32))
{

6
epan/dissectors/packet-pcep.c
View File

@ -1800,7 +1800,7 @@ dissect_subobj_ipv4(proto_tree *pcep_subobj_tree, packet_info *pinfo, tvbuff_t *
}
prefix_length = tvb_get_guint8(tvb, offset+6);
proto_item_append_text(ti, ": %s/%u", tvb_ip_to_str(tvb, offset+2),
proto_item_append_text(ti, ": %s/%u", tvb_ip_to_str(pinfo->pool, tvb, offset+2),
prefix_length);
switch (obj_class) {
@ -2100,7 +2100,7 @@ dissect_subobj_unnumb_interfaceID(proto_tree *pcep_subobj_tree, packet_info *pin
}
interface_ID = tvb_get_ntohl(tvb, offset+8);
proto_item_append_text(ti, ": %s:%u", tvb_ip_to_str (tvb, offset+4),
proto_item_append_text(ti, ": %s:%u", tvb_ip_to_str(pinfo->pool, tvb, offset+4),
interface_ID);
switch (obj_class) {
@ -2308,7 +2308,7 @@ dissect_subobj_pksv4(proto_tree *pcep_subobj_tree, packet_info *pinfo, tvbuff_t
}
path_key = tvb_get_ntohs(tvb, offset+2);
proto_item_append_text(ti, ": %s, Path Key %u", tvb_ip_to_str(tvb, offset+4), path_key);
proto_item_append_text(ti, ": %s, Path Key %u", tvb_ip_to_str(pinfo->pool, tvb, offset+4), path_key);
proto_tree_add_item(pcep_subobj_pksv4, hf_pcep_subobj_pksv4_l, tvb, offset, 1, ENC_NA);
proto_tree_add_item(pcep_subobj_pksv4, hf_PCEPF_SUBOBJ_7F, tvb, offset, 1, ENC_NA);
proto_tree_add_item(pcep_subobj_pksv4, hf_pcep_subobj_pksv4_length, tvb, offset+1, 1, ENC_NA);

18
epan/dissectors/packet-pfcp.c
View File

@ -2162,7 +2162,7 @@ dissect_pfcp_f_teid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i
if ((fteid_flags_val & 0x1) == 1) {
/* m to (m+3) IPv4 address */
proto_tree_add_item(tree, hf_pfcp_f_teid_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}
if ((fteid_flags_val & 0x2) == 2) {
@ -3425,7 +3425,7 @@ dissect_pfcp_f_seid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i
if ((f_seid_flags & 0x2) == 2) {
ipv4 = wmem_new0(pinfo->pool, address);
proto_tree_add_item(tree, hf_pfcp_f_seid_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
set_address_tvb(ipv4, AT_IPv4, 4, tvb, offset);
offset += 4;
}
@ -3526,7 +3526,7 @@ decode_pfcp_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i
case 0:
/* IPv4 address */
proto_tree_add_item(tree, hf_pfcp_node_id_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, "%s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, "%s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
break;
case 1:
@ -4933,7 +4933,7 @@ dissect_pfcp_remote_gtp_u_peer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
/* IPv4 address (if present)*/
if (flags & 0x2) {
proto_tree_add_item(tree, hf_pfcp_remote_gtp_u_peer_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, "IPv4 %s ", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, "IPv4 %s ", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}
/* IPv6 address (if present)*/
@ -6661,7 +6661,7 @@ dissect_pfcp_alternative_smf_ip_address(tvbuff_t *tvb, packet_info *pinfo, proto
/* IPv4 address (if present) */
if (alternative_smf_ip_address_flags & 0x2) {
proto_tree_add_item(tree, hf_pfcp_alternative_smf_ip_address_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}
/* IPv6 address (if present) */
@ -6802,7 +6802,7 @@ dissect_pfcp_cp_pfcp_entity_ip_address(tvbuff_t *tvb, packet_info *pinfo, proto_
/* IPv4 address (if present) */
if ((cp_pfcp_entity_ip_address_flags & 0x2)) {
proto_tree_add_item(tree, hf_pfcp_cp_pfcp_entity_ip_address_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}
/* IPv6 address (if present) */
@ -6919,7 +6919,7 @@ dissect_pfcp_source_ip_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
/* IPv4 address (if present) */
if ((source_ip_address_flags & 0x2)) {
proto_tree_add_item(tree, hf_pfcp_source_ip_address_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}
/* IPv6 address (if present) */
@ -7386,7 +7386,7 @@ dissect_pfcp_mptcp_address_information(tvbuff_t *tvb, packet_info *pinfo, proto_
/* MPTCP Proxy IPv4 address (if present) */
if ((mptcp_address_flags & 0x1)) {
proto_tree_add_item(tree, hf_pfcp_mptcp_proxy_ip_address_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}
/* MPTCP Proxy IPv6 address (if present) */
@ -8413,7 +8413,7 @@ dissect_pfcp_cp_ip_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* IPv4 address (if present) */
if (cp_ip_address_flags & 0x2) {
proto_tree_add_item(tree, hf_pfcp_cp_ip_address_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(item, ", IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}
/* IPv6 address (if present) */

20
epan/dissectors/packet-pim.c
View File

@ -660,12 +660,12 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
* and the group mask the length "mask_len"?
*/
tigroup = proto_tree_add_ipv4_format(pimopt_tree, hf_pim_group_ip4, tvb, offset, 4,
tvb_get_ipv4(tvb, offset), "Group %d: %s", i, tvb_ip_to_str(tvb, offset));
tvb_get_ipv4(tvb, offset), "Group %d: %s", i, tvb_ip_to_str(pinfo->pool, tvb, offset));
grouptree = proto_item_add_subtree(tigroup, ett_pim);
offset += 4;
proto_tree_add_ipv4_format(grouptree, hf_pim_group_mask_ip4, tvb, offset, 4,
tvb_get_ipv4(tvb, offset), "Group %d Mask: %s", i, tvb_ip_to_str(tvb, offset));
tvb_get_ipv4(tvb, offset), "Group %d Mask: %s", i, tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
njoin = tvb_get_ntohs(tvb, offset);
@ -784,7 +784,7 @@ dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtyp
if (label)
{
ti = proto_tree_add_ipv4_format(tree, hf_ip4, tvb, offset, 2 + len,
ipv4, "%s: %s", label, tvb_ip_to_str(tvb, offset + 2));
ipv4, "%s: %s", label, tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 2));
}
else
{
@ -839,14 +839,14 @@ dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtyp
switch(ja_af) {
case AFNUM_INET:
rloc_tree = proto_tree_add_ipv4_format(ja_tree, hf_ip4, tvb, ja_offset, ja_length,
ipv4, "RLOC: %s", tvb_ip_to_str(tvb, ja_offset+ 1));
ipv4, "RLOC: %s", tvb_ip_to_str(wmem_packet_scope(), tvb, ja_offset+ 1));
rloc_sub_tree = proto_item_add_subtree(rloc_tree, ett_pim);
proto_tree_add_item(rloc_sub_tree, hf_pim_addr_af, tvb, ja_offset, 1, ENC_NA);
proto_tree_add_item(rloc_sub_tree, hf_pim_rloc_addr_ipv4, tvb, ja_offset + 1, 4, ENC_BIG_ENDIAN);
break;
case AFNUM_INET6:
rloc_tree = proto_tree_add_ipv6_format(ja_tree, hf_ip6, tvb, ja_offset, ja_length,
&ipv6, "RLOC: %s", tvb_ip_to_str(tvb, ja_offset+ 1));
&ipv6, "RLOC: %s", tvb_ip_to_str(wmem_packet_scope(), tvb, ja_offset+ 1));
rloc_sub_tree = proto_item_add_subtree(rloc_tree, ett_pim);
proto_tree_add_item(rloc_sub_tree, hf_pim_addr_af, tvb, ja_offset, 1, ENC_NA);
proto_tree_add_item(rloc_sub_tree, hf_pim_rloc_addr_ipv6, tvb, ja_offset + 1, 16, ENC_NA);
@ -874,7 +874,7 @@ dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtyp
if (label)
{
ti = proto_tree_add_ipv4_format(tree, hf_ip4, tvb, offset, 4 + len,
ipv4, "%s: %s", label, tvb_ip_to_str(tvb, offset + 4));
ipv4, "%s: %s", label, tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 4));
}
else
{
@ -926,12 +926,12 @@ dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtyp
if (label)
{
ti = proto_tree_add_ipv4_format(tree, hf_ip4, tvb, offset, 4 + len,
ipv4, "%s: %s", label, tvb_ip_to_str(tvb, offset + 4));
ipv4, "%s: %s", label, tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 4));
}
else
{
ti = proto_tree_add_ipv4_format_value(tree, hf_ip4, tvb, offset, 4 + len, ipv4,
"%s", tvb_ip_to_str(tvb, offset + 4));
"%s", tvb_ip_to_str(wmem_packet_scope(), tvb, offset + 4));
}
proto_item_append_text(ti, "/%u", mask_len);
break;
@ -1002,14 +1002,14 @@ dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtyp
switch(ja_af) {
case AFNUM_INET:
rloc_tree = proto_tree_add_ipv4_format(ja_tree, hf_ip4, tvb, ja_offset, ja_length,
ipv4, "RLOC: %s", tvb_ip_to_str(tvb, ja_offset+ 1));
ipv4, "RLOC: %s", tvb_ip_to_str(wmem_packet_scope(), tvb, ja_offset+ 1));
rloc_sub_tree = proto_item_add_subtree(rloc_tree, ett_pim);
proto_tree_add_item(rloc_sub_tree, hf_pim_addr_af, tvb, ja_offset, 1, ENC_NA);
proto_tree_add_item(rloc_sub_tree, hf_pim_rloc_addr_ipv4, tvb, ja_offset + 1, 4, ENC_BIG_ENDIAN);
break;
case AFNUM_INET6:
rloc_tree = proto_tree_add_ipv6_format(ja_tree, hf_ip6, tvb, ja_offset, ja_length,
&ipv6, "RLOC: %s", tvb_ip_to_str(tvb, ja_offset+ 1));
&ipv6, "RLOC: %s", tvb_ip_to_str(wmem_packet_scope(), tvb, ja_offset+ 1));
rloc_sub_tree = proto_item_add_subtree(rloc_tree, ett_pim);
proto_tree_add_item(rloc_sub_tree, hf_pim_addr_af, tvb, ja_offset, 1, ENC_NA);
proto_tree_add_item(rloc_sub_tree, hf_pim_rloc_addr_ipv6, tvb, ja_offset + 1, 16, ENC_NA);

4
epan/dissectors/packet-ppp.c
View File

@ -4398,7 +4398,7 @@ dissect_vsncp_pdnaddress_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_ipv4_format(field_tree, hf_vsncp_pdn_ipv4, tvb, offset + 3, 4,
tvb_get_ntohl(tvb, offset + 3), "%s: %s",
val_to_str_const(pdnaddtype, vsncp_pdntype_vals, "Unknown"),
tvb_ip_to_str(tvb, offset + 3));
tvb_ip_to_str(pinfo->pool, tvb, offset + 3));
break;
case 2:
@ -4426,7 +4426,7 @@ dissect_vsncp_pdnaddress_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
address_to_str(pinfo->pool, &addr));
proto_tree_add_ipv4_format(field_tree, hf_vsncp_pdn_ipv4, tvb, offset + 11, length - 11,
tvb_get_ntohl(tvb, offset + 11), "%s: %s", val_to_str_const(pdnaddtype, vsncp_pdntype_vals, "Unknown"),
tvb_ip_to_str(tvb, offset + 11));
tvb_ip_to_str(pinfo->pool, tvb, offset + 11));
break;
}

8
epan/dissectors/packet-radius.c
View File

@ -615,7 +615,7 @@ dissect_framed_ip_address(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U
proto_tree_add_ipv4_format_value(tree, hf_radius_framed_ip_address,
tvb, 0, len, ip, "%s", str);
} else {
str = tvb_ip_to_str(tvb, 0);
str = tvb_ip_to_str(pinfo->pool, tvb, 0);
proto_tree_add_item(tree, hf_radius_framed_ip_address,
tvb, 0, len, ENC_BIG_ENDIAN);
}
@ -647,7 +647,7 @@ dissect_login_ip_host(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_)
proto_tree_add_ipv4_format_value(tree, hf_radius_login_ip_host,
tvb, 0, len, ip, "%s", str);
} else {
str = tvb_ip_to_str(tvb, 0);
str = tvb_ip_to_str(pinfo->pool, tvb, 0);
proto_tree_add_item(tree, hf_radius_login_ip_host,
tvb, 0, len, ENC_BIG_ENDIAN);
}
@ -1107,7 +1107,7 @@ radius_ipaddr(radius_attr_info_t *a, proto_tree *tree, packet_info *pinfo _U_, t
proto_tree_add_item(tree, a->hf, tvb, offset, len, ENC_BIG_ENDIAN);
proto_item_append_text(avp_item, "%s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(avp_item, "%s", tvb_ip_to_str(pinfo->pool, tvb, offset));
}
void
@ -1165,7 +1165,7 @@ radius_combo_ip(radius_attr_info_t *a, proto_tree *tree, packet_info *pinfo _U_,
if (len == 4) {
proto_tree_add_item(tree, a->hf, tvb, offset, len, ENC_BIG_ENDIAN);
proto_item_append_text(avp_item, "%s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(avp_item, "%s", tvb_ip_to_str(pinfo->pool, tvb, offset));
} else if (len == 16) {
proto_tree_add_item(tree, a->hf_alt, tvb, offset, len, ENC_NA);
proto_item_append_text(avp_item, "%s", tvb_ip6_to_str(tvb, offset));

4
epan/dissectors/packet-reload.c
View File

@ -1361,7 +1361,7 @@ dissect_ipaddressport(int anchor, tvbuff_t *tvb, proto_tree *tree, guint16 offse
ipaddressport_type = tvb_get_guint8(tvb, offset);
proto_item_append_text(ti_ipaddressport, ": %s", val_to_str_const(ipaddressport_type, ipaddressporttypes,"Unknown Type"));
if (ipaddressport_type == IPADDRESSPORTTYPE_IPV4) {
proto_item_append_text(ti_ipaddressport, " (%s:%d)", tvb_ip_to_str(tvb, offset+2),tvb_get_ntohs(tvb,offset+2+4));
proto_item_append_text(ti_ipaddressport, " (%s:%d)", tvb_ip_to_str(wmem_packet_scope(), tvb, offset+2),tvb_get_ntohs(tvb,offset+2+4));
}
else if (ipaddressport_type == IPADDRESSPORTTYPE_IPV6) {
proto_item_append_text(ti_ipaddressport, " (%s:%d)", tvb_ip6_to_str(tvb, offset+2),tvb_get_ntohs(tvb,offset+2+16));
@ -1377,7 +1377,7 @@ dissect_ipaddressport(int anchor, tvbuff_t *tvb, proto_tree *tree, guint16 offse
proto_item *ti_ipv4;
proto_tree *ipv4_tree;
ti_ipv4 = proto_tree_add_item(ipaddressport_tree, hf_reload_ipv4addrport, tvb, offset, 6, ENC_NA);
proto_item_append_text(ti_ipv4, ": %s:%d", tvb_ip_to_str(tvb, offset),tvb_get_ntohs(tvb,offset+4));
proto_item_append_text(ti_ipv4, ": %s:%d", tvb_ip_to_str(wmem_packet_scope(), tvb, offset),tvb_get_ntohs(tvb,offset+4));
ipv4_tree = proto_item_add_subtree(ti_ipv4, ett_reload_ipv4addrport);
proto_tree_add_item(ipv4_tree, hf_reload_ipv4addr, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(ipv4_tree, hf_reload_port, tvb, offset + 4, 2, ENC_BIG_ENDIAN);

2
epan/dissectors/packet-rip.c
View File

@ -262,7 +262,7 @@ dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
metric = tvb_get_ntohl(tvb, offset+16);
rip_vektor_tree = proto_tree_add_subtree_format(tree, tvb, offset,
RIP_ENTRY_LENGTH, ett_rip_vec, NULL, "IP Address: %s, Metric: %u",
tvb_ip_to_str(tvb, offset+4), metric);
tvb_ip_to_str(wmem_packet_scope(), tvb, offset+4), metric);
proto_tree_add_item(rip_vektor_tree, &hfi_rip_family, tvb, offset, 2, ENC_BIG_ENDIAN);
if (version == RIPv2) {

4
epan/dissectors/packet-rsip.c
View File

@ -285,7 +285,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff)
hf_rsip_parameter_address_ipv4, tvb,
off + 4, paramlen - 1, ENC_BIG_ENDIAN);
proto_item_append_text(pti, ": %s",
tvb_ip_to_str(tvb, off + 4));
tvb_ip_to_str(wmem_packet_scope(), tvb, off + 4));
} else
proto_item_append_text(pti,
": Any IPv4 Address");
@ -296,7 +296,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff)
hf_rsip_parameter_address_ipv4_netmask,
tvb, off + 4, paramlen - 1, ENC_BIG_ENDIAN);
proto_item_append_text(pti, "(netmask): %s",
tvb_ip_to_str(tvb, off + 4));
tvb_ip_to_str(wmem_packet_scope(), tvb, off + 4));
} else
proto_item_append_text(pti,
": Any IPv4 Netmask");

84
epan/dissectors/packet-rsvp.c
View File

@ -2533,14 +2533,14 @@ summary_session(wmem_allocator_t *pool, tvbuff_t *tvb, int offset)
case RSVP_SESSION_TYPE_IPV4:
return wmem_strdup_printf(pool,
"SESSION: IPv4, Destination %s, Protocol %d, Port %d. ",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_guint8(tvb, offset+8),
tvb_get_ntohs(tvb, offset+10));
break;
case RSVP_SESSION_TYPE_IPV4_LSP:
return wmem_strdup_printf(pool,
"SESSION: IPv4-LSP, Destination %s, Short Call ID %d, Tunnel ID %d, Ext ID %0x. ",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_ntohs(tvb, offset+8),
tvb_get_ntohs(tvb, offset+10),
tvb_get_ntohl(tvb, offset+12));
@ -2558,22 +2558,22 @@ summary_session(wmem_allocator_t *pool, tvbuff_t *tvb, int offset)
case RSVP_SESSION_TYPE_AGGREGATE_IPV4:
return wmem_strdup_printf(pool,
"SESSION: IPv4-Aggregate, Destination %s, DSCP %d. ",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_guint8(tvb, offset+11));
break;
case RSVP_SESSION_TYPE_IPV4_UNI:
return wmem_strdup_printf(pool,
"SESSION: IPv4-UNI, Destination %s, Tunnel ID %d, Ext Address %s. ",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_ntohs(tvb, offset+10),
tvb_ip_to_str(tvb, offset+12));
tvb_ip_to_str(pool, tvb, offset+12));
break;
case RSVP_SESSION_TYPE_P2MP_LSP_TUNNEL_IPV4:
return wmem_strdup_printf(pool,
"SESSION: IPv4-P2MP LSP TUNNEL, PSMP ID %d, Tunnel ID %d, Ext Tunnel %s. ",
tvb_get_ntohl(tvb, offset+4),
tvb_get_ntohs(tvb, offset+10),
tvb_ip_to_str(tvb, offset+12));
tvb_ip_to_str(pool, tvb, offset+12));
break;
case RSVP_SESSION_TYPE_P2MP_LSP_TUNNEL_IPV6:
return wmem_strdup_printf(pool,
@ -2585,9 +2585,9 @@ summary_session(wmem_allocator_t *pool, tvbuff_t *tvb, int offset)
case RSVP_SESSION_TYPE_IPV4_E_NNI:
return wmem_strdup_printf(pool,
"SESSION: IPv4-E-NNI, Destination %s, Tunnel ID %d, Ext Address %s. ",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_ntohs(tvb, offset+10),
tvb_ip_to_str(tvb, offset+12));
tvb_ip_to_str(pool, tvb, offset+12));
break;
default:
return wmem_strdup_printf(pool,
@ -2611,13 +2611,13 @@ summary_template(wmem_allocator_t *pool, tvbuff_t *tvb, int offset)
case 1:
return wmem_strdup_printf(pool,
"%s: IPv4, Sender %s, Port %d. ", objtype,
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_ntohs(tvb, offset+10));
break;
case 7:
return wmem_strdup_printf(pool,
"%s: IPv4-LSP, Tunnel Source: %s, Short Call ID: %d, LSP ID: %d. ", objtype,
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_ntohs(tvb, offset+8),
tvb_get_ntohs(tvb, offset+10));
break;
@ -2631,19 +2631,19 @@ summary_template(wmem_allocator_t *pool, tvbuff_t *tvb, int offset)
case 9:
return wmem_strdup_printf(pool,
"%s: IPv4-Aggregate, Aggregator %s. ", objtype,
tvb_ip_to_str(tvb, offset+4));
tvb_ip_to_str(pool, tvb, offset+4));
break;
case 12:
return wmem_strdup_printf(pool,
"%s: P2MP_LSP_TUNNEL_IPv4, IPv4 tunnel sender address %s, LSP ID: %d, Sub-Group ID %d. ", objtype,
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_ntohs(tvb, offset+10),
tvb_get_ntohs(tvb, offset+18));
break;
case 13:
return wmem_strdup_printf(pool,
"%s: P2MP_LSP_TUNNEL_IPv6, IPv6 tunnel sender address %s, LSP ID: %d, Sub-Group ID %d. ", objtype,
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pool, tvb, offset+4),
tvb_get_ntohs(tvb, offset+22),
tvb_get_ntohs(tvb, offset+40));
break;
@ -2732,7 +2732,7 @@ dissect_rsvp_session(packet_info *pinfo, proto_item *ti, proto_tree *rsvp_object
proto_tree_add_uint_format_value(rsvp_object_tree, hf_rsvp_extended_tunnel_id, tvb, offset2+8, 4,
tvb_get_ntohl(tvb, offset2+8), "%u (%s)",
tvb_get_ntohl(tvb, offset2+8),
tvb_ip_to_str(tvb, offset2+8));
tvb_ip_to_str(pinfo->pool, tvb, offset2+8));
hidden_item = proto_tree_add_item(rsvp_object_tree,
hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
tvb, offset2+8, 4, ENC_BIG_ENDIAN);
@ -2950,7 +2950,7 @@ dissect_rsvp_ifid_tlv(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_objec
case 16: /* INCOMING_IPV4 */
tlv_name = "Incoming ";
ifid_ipv4:
ip_str = tvb_ip_to_str(tvb, offset+tlv_off+4);
ip_str = tvb_ip_to_str(pinfo->pool, tvb, offset+tlv_off+4);
rsvp_ifid_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb,
offset+tlv_off, tlv_len,
subtree_type, NULL, "%sIPv4 TLV - %s", tlv_name,
@ -2996,7 +2996,7 @@ dissect_rsvp_ifid_tlv(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_objec
case 18: /* INCOMING_IF_INDEX */
tlv_name = " Incoming";
ifid_ifindex:
ip_str = tvb_ip_to_str(tvb, offset+tlv_off+4);
ip_str = tvb_ip_to_str(pinfo->pool, tvb, offset+tlv_off+4);
rsvp_ifid_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb,
offset+tlv_off, tlv_len,
subtree_type, NULL, "Interface-Index%s TLV - %s, %d",
@ -3043,7 +3043,7 @@ dissect_rsvp_ifid_tlv(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_objec
case 21: /* REPORTING_NODE_ID */
tlv_name = "Reporting-";
ifid_nodeid:
ip_str = tvb_ip_to_str(tvb, offset+tlv_off+4);
ip_str = tvb_ip_to_str(pinfo->pool, tvb, offset+tlv_off+4);
rsvp_ifid_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb,
offset+tlv_off, tlv_len,
subtree_type, NULL, "%sNode-ID TLV - %s", tlv_name,
@ -3186,7 +3186,7 @@ dissect_rsvp_hop(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_tre
proto_tree_add_item(rsvp_object_tree, hf_rsvp_hop_neighbor_address_ipv4, tvb, offset2, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(rsvp_object_tree, hf_rsvp_hop_logical_interface, tvb, offset2+4, 4, ENC_BIG_ENDIAN);
proto_item_set_text(ti, "HOP: IPv4, %s",
tvb_ip_to_str(tvb, offset2));
tvb_ip_to_str(pinfo->pool, tvb, offset2));
break;
case 2:
@ -3201,7 +3201,7 @@ dissect_rsvp_hop(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_tre
proto_tree_add_item(rsvp_object_tree, hf_rsvp_hop_logical_interface, tvb, offset2+4, 4, ENC_BIG_ENDIAN);
proto_item_set_text(ti, "HOP: IPv4 IF-ID. Control IPv4: %s. ",
tvb_ip_to_str(tvb, offset2));
tvb_ip_to_str(pinfo->pool, tvb, offset2));
dissect_rsvp_ifid_tlv(ti, pinfo, rsvp_object_tree, tvb, offset+12, obj_length-12,
TREE(TT_HOP_SUBOBJ));
@ -3437,12 +3437,12 @@ dissect_rsvp_error(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t
case 1:
proto_item_set_text(ti, "ERROR: IPv4, Error code: %s, Value: %d, Error Node: %s",
val_to_str_ext(error_code, &rsvp_error_codes_ext, "Unknown (%d)"),
error_val, tvb_ip_to_str(tvb, offset2));
error_val, tvb_ip_to_str(pinfo->pool, tvb, offset2));
break;
case 3:
proto_item_set_text(ti, "ERROR: IPv4 IF-ID, Error code: %s, Value: %d, Control Node: %s. ",
val_to_str_ext(error_code, &rsvp_error_codes_ext, "Unknown (%d)"),
error_val, tvb_ip_to_str(tvb, offset2));
error_val, tvb_ip_to_str(pinfo->pool, tvb, offset2));
dissect_rsvp_ifid_tlv(ti, pinfo, rsvp_object_tree, tvb, offset+12, obj_length-12,
TREE(TT_ERROR_SUBOBJ));
break;
@ -3551,7 +3551,7 @@ dissect_rsvp_confirm(proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_confirm, tvb, offset+3, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(rsvp_object_tree, hf_rsvp_confirm_receiver_address_ipv4, tvb, offset2, 4, ENC_BIG_ENDIAN);
proto_item_set_text(ti, "CONFIRM: Receiver %s",
tvb_ip_to_str(tvb, offset2));
tvb_ip_to_str(wmem_packet_scope(), tvb, offset2));
break;
}
@ -4982,7 +4982,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_
rsvp_ro_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb,
offset+l, 8,
tree_type, &ti2, "IPv4 Subobject - %s%s",
tvb_ip_to_str(tvb, offset+l+2),
tvb_ip_to_str(pinfo->pool, tvb, offset+l+2),
rsvp_class == RSVP_CLASS_EXPLICIT_ROUTE ?
(lbit ? ", Loose" : ", Strict") : "");
@ -5004,7 +5004,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_
}
if (i < 4) {
proto_item_append_text(ti, "IPv4 %s%s",
tvb_ip_to_str(tvb, offset+l+2),
tvb_ip_to_str(pinfo->pool, tvb, offset+l+2),
lbit ? " [L]" : "");
}
if (rsvp_class == RSVP_CLASS_RECORD_ROUTE) {
@ -5124,7 +5124,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_
rsvp_ro_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb,
offset+l, 8, tree_type, &ti2,
"Unnumbered Interface-ID - %s, %d, %s",
tvb_ip_to_str(tvb, offset+l+4),
tvb_ip_to_str(pinfo->pool, tvb, offset+l+4),
tvb_get_ntohl(tvb, offset+l+8),
rsvp_class == RSVP_CLASS_EXPLICIT_ROUTE ?
(lbit ? "Loose" : "Strict") : "");
@ -5150,7 +5150,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_
proto_tree_add_item(rsvp_ro_subtree, hf_rsvp_ero_rro_subobjects_interface_id, tvb, offset+l+8, 4, ENC_BIG_ENDIAN);
if (i < 4) {
proto_item_append_text(ti, "Unnum %s/%d%s",
tvb_ip_to_str(tvb, offset+l+4),
tvb_ip_to_str(pinfo->pool, tvb, offset+l+4),
tvb_get_ntohl(tvb, offset+l+8),
lbit ? " [L]":"");
}
@ -5230,7 +5230,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_
rsvp_ro_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb,
offset+l, 8, tree_type, &ti2,
"Path Key subobject - %s, %u",
tvb_ip_to_str(tvb, offset+l+4),
tvb_ip_to_str(pinfo->pool, tvb, offset+l+4),
path_key);
proto_tree_add_uint_format_value(rsvp_ro_subtree, hf_rsvp_type, tvb, offset+l, 1,
type, "64 (Path Key with IPv4 PCE-ID)");
@ -5793,7 +5793,7 @@ dissect_rsvp_association(proto_tree *ti, proto_tree *rsvp_object_tree,
proto_tree_add_item(rsvp_object_tree, hf_rsvp_association_id, tvb, offset+6, 2, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "ID: %u. ", association_id);
proto_tree_add_item(rsvp_object_tree, hf_rsvp_association_source_ipv4, tvb, offset+8, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "Src: %s", tvb_ip_to_str(tvb, offset+8));
proto_item_append_text(ti, "Src: %s", tvb_ip_to_str(wmem_packet_scope(), tvb, offset+8));
break;
case 2:
@ -5819,7 +5819,7 @@ dissect_rsvp_association(proto_tree *ti, proto_tree *rsvp_object_tree,
proto_tree_add_item(rsvp_object_tree, hf_rsvp_association_routing_area_id, tvb, offset+8, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "Routing Area ID: %u, ", tvb_get_ntohl (tvb, offset+8));
proto_tree_add_item(rsvp_object_tree, hf_rsvp_association_node_id, tvb, offset+12, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "Node ID: %s", tvb_ip_to_str(tvb, offset+12));
proto_item_append_text(ti, "Node ID: %s", tvb_ip_to_str(wmem_packet_scope(), tvb, offset+12));
proto_tree_add_item(rsvp_object_tree, hf_rsvp_association_padding, tvb, offset+8, 16, ENC_NA);
break;
@ -5867,7 +5867,7 @@ dissect_rsvp_lsp_tunnel_if_id_tlv(proto_tree *rsvp_object_tree, packet_info* pin
rsvp_lsp_tunnel_if_id_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb,
offset+tlv_off, tlv_len, subtree_type, NULL,
"IPv4 component link identifier: %s",
tvb_ip_to_str(tvb, offset+tlv_off+4));
tvb_ip_to_str(pinfo->pool, tvb, offset+tlv_off+4));
proto_tree_add_uint_format_value(rsvp_lsp_tunnel_if_id_subtree, hf_rsvp_type, tvb, offset+tlv_off, 2,
tlv_type, "2 (IPv4 component link identifier)");
proto_tree_add_item(rsvp_lsp_tunnel_if_id_subtree, hf_rsvp_lsp_tunnel_if_id_length, tvb, offset+tlv_off+2, 2, ENC_BIG_ENDIAN);
@ -5934,7 +5934,7 @@ dissect_rsvp_lsp_tunnel_if_id(proto_tree *ti, packet_info* pinfo, proto_tree *rs
proto_tree_add_item(rsvp_object_tree, hf_rsvp_lsp_tunnel_if_id_router_id, tvb, offset+4, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(rsvp_object_tree, hf_rsvp_lsp_tunnel_if_id_interface_id, tvb, offset+8, 4, ENC_BIG_ENDIAN);
proto_item_set_text(ti, "LSP INTERFACE-ID: Unnumbered, Router-ID %s, Interface-ID %d",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pinfo->pool, tvb, offset+4),
tvb_get_ntohl(tvb, offset+8));
break;
@ -5944,8 +5944,8 @@ dissect_rsvp_lsp_tunnel_if_id(proto_tree *ti, packet_info* pinfo, proto_tree *rs
proto_tree_add_item(rsvp_object_tree, hf_rsvp_lsp_tunnel_if_id_target_igp_instance, tvb, offset+8, 4, ENC_BIG_ENDIAN);
proto_item_set_text(ti, "LSP INTERFACE-ID: IPv4, interface address %s,"
"IGP instance %s",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(tvb, offset+8));
tvb_ip_to_str(pinfo->pool, tvb, offset+4),
tvb_ip_to_str(pinfo->pool, tvb, offset+8));
proto_tree_add_item(rsvp_object_tree, hf_rsvp_lsp_tunnel_if_id_action, tvb, offset+12, 1, ENC_BIG_ENDIAN);
dissect_rsvp_lsp_tunnel_if_id_tlv(rsvp_object_tree, pinfo, tvb, offset+16, obj_length-16,
TREE(TT_LSP_TUNNEL_IF_ID_SUBTREE));
@ -5958,7 +5958,7 @@ dissect_rsvp_lsp_tunnel_if_id(proto_tree *ti, packet_info* pinfo, proto_tree *rs
proto_item_set_text(ti, "LSP INTERFACE-ID: IPv6, interface address %s,"
"IGP instance %s",
tvb_ip6_to_str(tvb, offset+4),
tvb_ip_to_str(tvb, offset+20));
tvb_ip_to_str(pinfo->pool, tvb, offset+20));
proto_tree_add_item(rsvp_object_tree, hf_rsvp_lsp_tunnel_if_id_action, tvb, offset+24, 1, ENC_BIG_ENDIAN);
dissect_rsvp_lsp_tunnel_if_id_tlv(rsvp_object_tree, pinfo, tvb, offset+28, obj_length-28,
TREE(TT_LSP_TUNNEL_IF_ID_SUBTREE));
@ -5971,9 +5971,9 @@ dissect_rsvp_lsp_tunnel_if_id(proto_tree *ti, packet_info* pinfo, proto_tree *rs
proto_tree_add_item(rsvp_object_tree, hf_rsvp_lsp_tunnel_if_id_target_igp_instance, tvb, offset+12, 4, ENC_BIG_ENDIAN);
proto_item_set_text(ti, "LSP INTERFACE-ID: Unnumbered with target, Router-ID %s,"
" Interface-ID %d, IGP instance %s",
tvb_ip_to_str(tvb, offset+4),
tvb_ip_to_str(pinfo->pool, tvb, offset+4),
tvb_get_ntohl(tvb, offset+8),
tvb_ip_to_str(tvb, offset+12));
tvb_ip_to_str(pinfo->pool, tvb, offset+12));
proto_tree_add_item(rsvp_object_tree, hf_rsvp_lsp_tunnel_if_id_action, tvb, offset+16, 1, ENC_BIG_ENDIAN);
dissect_rsvp_lsp_tunnel_if_id_tlv(rsvp_object_tree, pinfo, tvb, offset+20, obj_length-20,
TREE(TT_LSP_TUNNEL_IF_ID_SUBTREE));
@ -6006,7 +6006,7 @@ dissect_rsvp_notify_request(proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_notify_request, tvb, offset+3, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(rsvp_object_tree, hf_rsvp_notify_request_notify_node_address_ipv4, tvb, offset2, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, ": Notify node: %s",
tvb_ip_to_str(tvb, offset2));
tvb_ip_to_str(wmem_packet_scope(), tvb, offset2));
break;
}
@ -6066,7 +6066,7 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object
rsvp_gen_uni_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb,
offset2+l, 8, TREE(TT_GEN_UNI_SUBOBJ), NULL,
"%s IPv4 TNA: %s", c,
tvb_ip_to_str(tvb, offset2+l+4));
tvb_ip_to_str(pinfo->pool, tvb, offset2+l+4));
proto_tree_add_uint_format_value(rsvp_gen_uni_subtree, hf_rsvp_class, tvb, offset2+l+2, 1,
j, "%d (%s)", j, c);
proto_tree_add_uint_format_value(rsvp_gen_uni_subtree, hf_rsvp_type, tvb, offset2+l+3, 1,
@ -6080,7 +6080,7 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object
tvb, offset2+l+4, 4, ENC_BIG_ENDIAN);
if (i < 4) {
proto_item_append_text(ti, "%s IPv4 TNA: %s", c,
tvb_ip_to_str(tvb, offset2+l+4));
tvb_ip_to_str(pinfo->pool, tvb, offset2+l+4));
}
break;
@ -6352,7 +6352,7 @@ dissect_rsvp_call_id(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object
switch(type) {
case 1:
offset4 = offset3 + 4;
str = tvb_ip_to_str(tvb, offset3);
str = tvb_ip_to_str(pinfo->pool, tvb, offset3);
proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV4],
tvb, offset3, 4, ENC_BIG_ENDIAN);
break;
@ -7185,11 +7185,11 @@ dissect_rsvp_detour(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object_
iter++;
proto_tree_add_ipv4_format(rsvp_object_tree, hf_rsvp_detour_plr_id, tvb, offset+(4*iter), 4,
tvb_get_ntohl(tvb, offset+(4*iter)), "PLR ID %d: %s", count,
tvb_ip_to_str(tvb, offset+(4*iter)));
tvb_ip_to_str(pinfo->pool, tvb, offset+(4*iter)));
iter++;
proto_tree_add_ipv4_format(rsvp_object_tree, hf_rsvp_detour_avoid_node_id, tvb, offset+(4*iter), 4,
tvb_get_ntohl(tvb, offset+(4*iter)), "Avoid Node ID %d: %s", count,
tvb_ip_to_str(tvb, offset+(4*iter)));
tvb_ip_to_str(pinfo->pool, tvb, offset+(4*iter)));
}
break;

4
epan/dissectors/packet-rtitcp.c
View File

@ -289,9 +289,9 @@ static void rtitcp_util_add_locator_t(proto_tree *tree, packet_info *pinfo _U_,
col_append_str(pinfo->cinfo, COL_INFO, " (");
}
proto_item_append_text(rtitcp_message, "%s%s:%u",
*first_attribute ? "" : ", ", tvb_ip_to_str(tvb, offset + 12), port);
*first_attribute ? "" : ", ", tvb_ip_to_str(pinfo->pool, tvb, offset + 12), port);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s%s:%u",
*first_attribute ? "" : ", ", tvb_ip_to_str(tvb, offset + 12), port);
*first_attribute ? "" : ", ", tvb_ip_to_str(pinfo->pool, tvb, offset + 12), port);
} else {
proto_tree_add_item(tree, hf_rtitcp_locator_ipv6, tvb, offset, 16, ENC_NA);
if (*first_attribute) {

4
epan/dissectors/packet-rtps-virtual-transport.c
View File

@ -621,7 +621,7 @@ static gint dissect_parameter_transport_rtps_type(
addr,
sizeof(addr),
"%s",
tvb_ip_to_str(tvb, OFFSET_TO_VAL + sizeof(bytes_zeroed)));
tvb_ip_to_str(pinfo->pool, tvb, OFFSET_TO_VAL + sizeof(bytes_zeroed)));
} else {
g_snprintf(
addr,
@ -774,7 +774,7 @@ static gint dissect_parameter_transport_rtps_type(
addr,
sizeof(addr),
"%s",
tvb_ip_to_str(tvb, OFFSET_TO_VAL + sizeof(bytes_zeroed)));
tvb_ip_to_str(pinfo->pool, tvb, OFFSET_TO_VAL + sizeof(bytes_zeroed)));
} else {
g_snprintf(
addr,

8
epan/dissectors/packet-rtps.c
View File

@ -3381,7 +3381,7 @@ static gint rtps_util_add_locator_t(proto_tree *tree, packet_info *pinfo, tvbuff
expert_add_info(pinfo, ti, &ei_rtps_locator_port);
proto_item_append_text(tree, " (%s, %s:%u)",
val_to_str(kind, rtps_locator_kind_vals, "%02x"),
tvb_ip_to_str(tvb, offset + 20), port);
tvb_ip_to_str(pinfo->pool, tvb, offset + 20), port);
break;
}
case LOCATOR_KIND_TCPV4_LAN:
@ -3408,7 +3408,7 @@ static gint rtps_util_add_locator_t(proto_tree *tree, packet_info *pinfo, tvbuff
4, ENC_BIG_ENDIAN);
proto_item_append_text(tree, " (%s, %s:%d, Logical Port = %u)",
val_to_str(kind, rtps_locator_kind_vals, "%02x"),
tvb_ip_to_str(tvb, offset + 20), public_address_port, port);
tvb_ip_to_str(pinfo->pool, tvb, offset + 20), public_address_port, port);
} else { /* IPv6 format */
proto_tree_add_item(locator_tree, hf_rtps_locator_ipv6, tvb, offset+8,
16, ENC_NA);
@ -3532,7 +3532,7 @@ static gint rtps_util_add_locator_t(proto_tree *tree, packet_info *pinfo, tvbuff
}
/* Port & IP */
ip_str = tvb_ip_to_str(tvb, ip_offset);
ip_str = tvb_ip_to_str(pinfo->pool, tvb, ip_offset);
locator_ip = tvb_get_ipv4(tvb, ip_offset);
if (locator_ip != 0) {
proto_tree_add_item_ret_uint(
@ -3681,7 +3681,7 @@ static int rtps_util_add_multichannel_locator_list(proto_tree *tree, packet_info
case LOCATOR_KIND_TUDPV4: {
proto_tree_add_item(locator_item_tree, hf_rtps_locator_ipv4, tvb, offset + 16, 4,
ENC_BIG_ENDIAN);
channel_address = tvb_ip_to_str(tvb, offset + 16);
channel_address = tvb_ip_to_str(pinfo->pool, tvb, offset + 16);
break;
}
case LOCATOR_KIND_UDPV6: {

4
epan/dissectors/packet-sctp.c
View File

@ -1352,9 +1352,9 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot
{
if (parameter_tree) {
proto_tree_add_item(parameter_tree, hf_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ENC_BIG_ENDIAN);
proto_item_append_text(parameter_item, " (Address: %s)", tvb_ip_to_str(parameter_tvb, IPV4_ADDRESS_OFFSET));
proto_item_append_text(parameter_item, " (Address: %s)", tvb_ip_to_str(wmem_packet_scope(), parameter_tvb, IPV4_ADDRESS_OFFSET));
if (additional_item)
proto_item_append_text(additional_item, "%s", tvb_ip_to_str(parameter_tvb, IPV4_ADDRESS_OFFSET));
proto_item_append_text(additional_item, "%s", tvb_ip_to_str(wmem_packet_scope(), parameter_tvb, IPV4_ADDRESS_OFFSET));
}
if (dissecting_init_init_ack_chunk) {
if (sctp_info.number_of_tvbs < MAXIMUM_NUMBER_OF_TVBS)

2
epan/dissectors/packet-slimp3.c
View File

@ -529,7 +529,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
}
col_append_fstr(pinfo->cinfo, COL_INFO, ", Server Address: %s. Server Port: %u",
tvb_ip_to_str(tvb, offset+2),
tvb_ip_to_str(pinfo->pool, tvb, offset+2),
tvb_get_ntohs(tvb, offset + 6));
break;

4
epan/dissectors/packet-smb2.c
View File

@ -7068,8 +7068,8 @@ dissect_windows_sockaddr_in(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p
/* IPv4 address */
proto_tree_add_item(sub_tree, hf_windows_sockaddr_in_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(sub_item, ", IPv4: %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(parent_item, ", IPv4: %s", tvb_ip_to_str(tvb, offset));
proto_item_append_text(sub_item, ", IPv4: %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
proto_item_append_text(parent_item, ", IPv4: %s", tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
return offset;
}

2
epan/dissectors/packet-someip-sd.c
View File

@ -313,7 +313,7 @@ dissect_someip_sd_pdu_option_ipv4(tvbuff_t *tvb, packet_info *pinfo, proto_tree
offset += 1;
proto_tree_add_item(tree, hf_someip_sd_option_ipv4, tvb, offset, 4, ENC_NA);
ipstring = tvb_ip_to_str(tvb, offset);
ipstring = tvb_ip_to_str(pinfo->pool, tvb, offset);
offset += 4;
proto_tree_add_item(tree, hf_someip_sd_option_reserved2, tvb, offset, 1, ENC_NA);

4
epan/dissectors/packet-stun.c
View File

@ -1133,7 +1133,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
if (att_length < 8)
break;
proto_tree_add_item(att_tree, hf_stun_att_ipv4, tvb, offset+4, 4, ENC_BIG_ENDIAN);
proto_item_append_text(att_tree, " (Deprecated): %s:%d", tvb_ip_to_str(tvb, offset+4),tvb_get_ntohs(tvb,offset+2));
proto_item_append_text(att_tree, " (Deprecated): %s:%d", tvb_ip_to_str(pinfo->pool, tvb, offset+4),tvb_get_ntohs(tvb,offset+2));
break;
@ -1177,7 +1177,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
case 1:
if (att_length < 8)
break;
addr_str = tvb_ip_to_str(tvb, offset + 4);
addr_str = tvb_ip_to_str(pinfo->pool, tvb, offset + 4);
proto_tree_add_item(att_tree, hf_stun_att_ipv4, tvb, offset+4, 4, ENC_BIG_ENDIAN);
break;

2
epan/dissectors/packet-sua.c
View File

@ -1483,7 +1483,7 @@ static void
dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item, gboolean source)
{
proto_tree_add_item(parameter_tree, source ? hf_sua_source_ipv4 : hf_sua_dest_ipv4, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ENC_BIG_ENDIAN);
proto_item_append_text(parameter_item, " (%s)", tvb_ip_to_str(parameter_tvb, IPV4_ADDRESS_OFFSET));
proto_item_append_text(parameter_item, " (%s)", tvb_ip_to_str(wmem_packet_scope(), parameter_tvb, IPV4_ADDRESS_OFFSET));
}
#define HOSTNAME_OFFSET PARAMETER_VALUE_OFFSET

2
epan/dissectors/packet-tapa.c
View File

@ -150,7 +150,7 @@ dissect_tapa_discover_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tapa_
ENC_BIG_ENDIAN);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Switch: %s",
tvb_ip_to_str(tvb, offset));
tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;

8
epan/dissectors/packet-tcp.c
View File

@ -5715,7 +5715,7 @@ rvbd_probe_decode_version_type(const guint8 vt, guint8 *ver, guint8 *type)
static void
rvbd_probe_resp_add_info(proto_item *pitem, packet_info *pinfo, tvbuff_t *tvb, int ip_offset, guint16 port)
{
proto_item_append_text(pitem, ", Server Steelhead: %s:%u", tvb_ip_to_str(tvb, ip_offset), port);
proto_item_append_text(pitem, ", Server Steelhead: %s:%u", tvb_ip_to_str(pinfo->pool, tvb, ip_offset), port);
col_prepend_fstr(pinfo->cinfo, COL_INFO, "SA+, ");
}
@ -5784,7 +5784,7 @@ dissect_tcpopt_rvbd_probe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
offset + PROBE_V1_APPLI_VERSION_OFFSET, 2,
ENC_BIG_ENDIAN);
proto_item_append_text(pitem, ", CSH IP: %s", tvb_ip_to_str(tvb, offset + PROBE_V1_PROBER_OFFSET));
proto_item_append_text(pitem, ", CSH IP: %s", tvb_ip_to_str(pinfo->pool, tvb, offset + PROBE_V1_PROBER_OFFSET));
option_data = (rvbd_option_data*)p_get_proto_data(pinfo->pool, pinfo, proto_tcp_option_rvbd_probe, pinfo->curr_layer_num);
if (option_data == NULL)
@ -6004,8 +6004,8 @@ dissect_tcpopt_rvbd_trpy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
tvb, offset + TRPY_DST_PORT_OFFSET, 2, ENC_BIG_ENDIAN);
proto_item_append_text(pitem, " %s:%u -> %s:%u",
tvb_ip_to_str(tvb, offset + TRPY_SRC_ADDR_OFFSET), sport,
tvb_ip_to_str(tvb, offset + TRPY_DST_ADDR_OFFSET), dport);
tvb_ip_to_str(pinfo->pool, tvb, offset + TRPY_SRC_ADDR_OFFSET), sport,
tvb_ip_to_str(pinfo->pool, tvb, offset + TRPY_DST_ADDR_OFFSET), dport);
/* Client port only set on SYN: optlen == 18 */
if ((flags & RVBD_FLAGS_TRPY_OOB) && (optlen > TCPOLEN_RVBD_TRPY_MIN))

2
epan/dissectors/packet-vxi11.c
View File

@ -562,7 +562,7 @@ dissect_device_remote_func(tvbuff_t *tvb,
const gchar *addrstr;
int offset = 0;
addrstr = tvb_ip_to_str(tvb, offset);
addrstr = tvb_ip_to_str(pinfo->pool, tvb, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_vxi11_core_host_addr, offset);
port = tvb_get_ntohl(tvb, offset);

4
epan/dissectors/packet-wccp.c
View File

@ -1507,7 +1507,7 @@ dissect_wccp2r1_address_table_info(tvbuff_t *tvb, int offset, int length,
switch (family) {
case 1:
/* IPv4 */
addr = tvb_ip_to_str(tvb, offset);
addr = tvb_ip_to_str(pinfo->pool, tvb, offset);
if ((wccp_wccp_address_table->in_use == FALSE) &&
(wccp_wccp_address_table->table_ipv4 != NULL) &&
(i < wccp_wccp_address_table->table_length))
@ -2732,7 +2732,7 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
hf_cache_ip, tvb, offset, 4,
ipaddr,
"Web Cache %d IP Address: %s", i,
tvb_ip_to_str(tvb, offset));
tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
}

4
epan/dissectors/packet-winsrepl.c
View File

@ -309,7 +309,7 @@ dissect_winsrepl_wins_ip(tvbuff_t *winsrepl_tvb, _U_ packet_info *pinfo,
/* IP */
*addr = tvb_get_ipv4(winsrepl_tvb, winsrepl_offset);
proto_tree_add_ipv4(ip_tree, hf_winsrepl_ip_ip, winsrepl_tvb, winsrepl_offset, 4, *addr);
proto_item_append_text(ip_item, ": %s", tvb_ip_to_str(winsrepl_tvb, winsrepl_offset));
proto_item_append_text(ip_item, ": %s", tvb_ip_to_str(pinfo->pool, winsrepl_tvb, winsrepl_offset));
winsrepl_offset += 4;
return winsrepl_offset;
@ -442,7 +442,7 @@ dissect_winsrepl_wins_name(tvbuff_t *winsrepl_tvb, packet_info *pinfo,
case WREPL_NAME_TYPE_NORMAL_GROUP:
/* Single address */
proto_tree_add_item(name_tree, hf_winsrepl_ip_ip, winsrepl_tvb, winsrepl_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(name_item, ": %s", tvb_ip_to_str(winsrepl_tvb, winsrepl_offset));
proto_item_append_text(name_item, ": %s", tvb_ip_to_str(pinfo->pool, winsrepl_tvb, winsrepl_offset));
winsrepl_offset += 4;
break;

2
epan/dissectors/packet-wol.c
View File

@ -113,7 +113,7 @@ dissect_wol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if ( len >= 106 && len < 108 )
{
len = 106;
passwd = tvb_ip_to_str(tvb, 102);
passwd = tvb_ip_to_str(pinfo->pool, tvb, 102);
}
else if ( len >= 108 )
{

2
epan/dissectors/packet-xdmcp.c
View File

@ -320,7 +320,7 @@ static int dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
if ((ctype == 0) && (alen == 4)) {
proto_tree_add_item(connection_tree, hf_xdmcp_connection_address_ipv4, tvb, caddrs_offset, alen, ENC_BIG_ENDIAN);
proto_item_append_text(connection_ti, ": %s", tvb_ip_to_str(tvb, caddrs_offset));
proto_item_append_text(connection_ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, caddrs_offset));
} else if ((ctype == 6) && (alen == 16)) {
proto_tree_add_item(connection_tree, hf_xdmcp_connection_address_ipv6, tvb, caddrs_offset, alen, ENC_NA);
proto_item_append_text(connection_ti, ": %s", tvb_ip6_to_str(tvb, caddrs_offset));

2
epan/dissectors/packet-xmcp.c
View File

@ -622,7 +622,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type,
} else {
proto_tree_add_item(attr_tree, xmcp_attr_servtrans_ipv4, tvb,
(offset+4), 4, ENC_BIG_ENDIAN);
proto_item_append_text(attr_tree, ": %s:%u", tvb_ip_to_str(tvb, offset+4),
proto_item_append_text(attr_tree, ": %s:%u", tvb_ip_to_str(pinfo->pool, tvb, offset+4),
tvb_get_ntohs(tvb, (offset+2)));
}
break;

2
epan/dissectors/pidl/witness/witness.cnf
View File

@ -200,7 +200,7 @@ PIDL_dissect_ipv4address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
proto_tree_add_item(tree, hfindex, tvb, offset, 4, ENC_BIG_ENDIAN);
if (param & PIDL_SET_COL_INFO) {
const char *ip = tvb_ip_to_str(tvb, offset);
const char *ip = tvb_ip_to_str(pinfo->pool, tvb, offset);
header_field_info *hf_info = proto_registrar_get_nth(hfindex);
proto_item_append_text(proto_tree_get_parent(tree), " %s:%s", hf_info->name, ip);

2
epan/to_str.h
View File

@ -84,7 +84,7 @@ WS_DLL_PUBLIC gchar* tvb_address_with_resolution_to_str(wmem_allocator_t *scope,
#define tvb_ether_to_str(scope, tvb, offset) tvb_address_to_str(scope, tvb, AT_ETHER, offset)
#define tvb_ip_to_str(tvb, offset) tvb_address_to_str(wmem_packet_scope(), tvb, AT_IPv4, offset)
#define tvb_ip_to_str(scope, tvb, offset) tvb_address_to_str(scope, tvb, AT_IPv4, offset)
#define tvb_ip6_to_str(tvb, offset) tvb_address_to_str(wmem_packet_scope(), tvb, AT_IPv6, offset)

4
plugins/epan/wimaxasncp/packet-wimaxasncp.c
View File

@ -1537,7 +1537,7 @@ static void wimaxasncp_dissect_tlv_value(
proto_item_append_text(
item, " - %s (%s)",
get_hostname(ip), tvb_ip_to_str(tvb, offset));
get_hostname(ip), tvb_ip_to_str(pinfo->pool, tvb, offset));
offset += 4;
@ -1546,7 +1546,7 @@ static void wimaxasncp_dissect_tlv_value(
* --------------------------------------------------------
*/
s = tvb_ip_to_str(tvb, offset);
s = tvb_ip_to_str(pinfo->pool, tvb, offset);
proto_tree_add_item(
ip_address_mask_tree,