diff options
33 files changed, 64 insertions, 64 deletions
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c index 37c8c3db33..0206ba5e3e 100644 --- a/epan/dissectors/packet-aarp.c +++ b/epan/dissectors/packet-aarp.c @@ -109,7 +109,7 @@ tvb_aarphrdaddr_to_str(tvbuff_t *tvb, gint offset, int ad_len, guint16 type) if (AARP_HW_IS_ETHER(type, ad_len)) { /* Ethernet address (or Token Ring address, which is the same type of address). */ - return tvb_ether_to_str(tvb, offset); + return tvb_ether_to_str(wmem_packet_scope(), tvb, offset); } return tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, ad_len); } diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index 62383651f6..12dbf801e2 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -65,7 +65,7 @@ dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) sender_id = tvb_get_ntohs(tvb, 8); col_add_fstr(pinfo->cinfo, COL_INFO, "Sequence: %u, Sender ID %u, Team ID %s", - seq_num, sender_id, tvb_ether_to_str(tvb, 10)); + seq_num, sender_id, tvb_ether_to_str(pinfo->pool, tvb, 10)); ti = proto_tree_add_item(tree, proto_ans, tvb, 0, -1, ENC_NA); ans_tree = proto_item_add_subtree(ti, ett_ans); diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index c1465cb398..26781272d6 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -368,7 +368,7 @@ tvb_arphrdaddr_to_str(tvbuff_t *tvb, gint offset, int ad_len, guint16 type) if (ARP_HW_IS_ETHER(type, ad_len)) { /* Ethernet address (or IEEE 802.x address, which is the same type of address). */ - return tvb_ether_to_str(tvb, offset); + return tvb_ether_to_str(wmem_packet_scope(), tvb, offset); } return tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, ad_len); } diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index 516003b23d..71c8b5bd4d 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -69,7 +69,7 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat case ADP_REQUEST: proto_tree_add_item(aruba_adp_tree, hf_adp_mac, tvb, 6, 6, ENC_NA); - mac_str = tvb_ether_to_str(tvb, 6); + mac_str = tvb_ether_to_str(pinfo->pool, tvb, 6); col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Request Src MAC: %s", mac_str); diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index c15d879312..1a88d70389 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -2149,7 +2149,7 @@ dissect_batadv_icmp_rr(proto_tree *batadv_icmp_tree, tvbuff_t *tvb, int offset) offset++; for (i = 0; i < BAT_RR_LEN; i++) { proto_tree_add_ether_format(field_tree, hf_batadv_icmp_rr_ether, tvb, offset, 6, tvb_get_ptr(tvb, offset, 6), - "%s%s", (i > ptr) ? "-" : tvb_ether_to_str(tvb, offset), + "%s%s", (i > ptr) ? "-" : tvb_ether_to_str(wmem_packet_scope(), tvb, offset), (i == ptr) ? " <- (current)" : ""); offset += 6; @@ -2174,7 +2174,7 @@ dissect_batadv_icmp_rr_v15(proto_tree *batadv_icmp_tree, tvbuff_t *tvb, tvb, offset, 6, tvb_get_ptr(tvb, offset, 6), "%s%s", - (i > ptr) ? "-" : tvb_ether_to_str(tvb, offset), + (i > ptr) ? "-" : tvb_ether_to_str(wmem_packet_scope(), tvb, offset), (i == ptr) ? " <- (current)" : ""); offset += 6; diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 413b7b996c..f786774d26 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -8136,13 +8136,13 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, case BGP_EXT_COM_STYPE_EVPN_IMP: proto_tree_add_item(community_tree, hf_bgp_ext_com_evpn_esirt, tvb, offset+2, 6, ENC_NA); - proto_item_append_text(community_item, " RT: %s", tvb_ether_to_str(tvb, offset+2)); + proto_item_append_text(community_item, " RT: %s", tvb_ether_to_str(pinfo->pool, tvb, offset+2)); break; case BGP_EXT_COM_STYPE_EVPN_ROUTERMAC: proto_tree_add_item(community_tree, hf_bgp_ext_com_evpn_routermac, tvb, offset+2, 6, ENC_NA); - proto_item_append_text(community_item, " Router MAC: %s", tvb_ether_to_str(tvb, offset+2)); + proto_item_append_text(community_item, " Router MAC: %s", tvb_ether_to_str(pinfo->pool, tvb, offset+2)); break; case BGP_EXT_COM_STYPE_EVPN_L2ATTR: diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 9b25118bad..a49acf264d 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -417,7 +417,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp root_identifier_system_id_extension = root_identifier_bridge_priority & 0x0fff; root_identifier_bridge_priority &= 0xf000; } - root_identifier_mac_str = tvb_ether_to_str(tvb, BPDU_ROOT_IDENTIFIER + 2); + root_identifier_mac_str = tvb_ether_to_str(pinfo->pool, tvb, BPDU_ROOT_IDENTIFIER + 2); root_path_cost = tvb_get_ntohl(tvb, BPDU_ROOT_PATH_COST); port_identifier = tvb_get_ntohs(tvb, BPDU_PORT_IDENTIFIER); break; @@ -526,7 +526,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp bridge_identifier_system_id_extension = bridge_identifier_bridge_priority & 0x0fff; bridge_identifier_bridge_priority &= 0xf000; } - bridge_identifier_mac_str = tvb_ether_to_str(tvb, BPDU_BRIDGE_IDENTIFIER + 2); + bridge_identifier_mac_str = tvb_ether_to_str(pinfo->pool, tvb, BPDU_BRIDGE_IDENTIFIER + 2); if (bpdu_type == BPDU_TYPE_RST) { proto_tree_add_bitmask_value_with_flags(bpdu_tree, tvb, BPDU_FLAGS, hf_bpdu_flags, ett_bpdu_flags, rst_flags, flags, BMT_NO_FALSE|BMT_NO_TFS); @@ -723,7 +723,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp BPDU_CIST_INTERNAL_ROOT_PATH_COST, 4, ENC_BIG_ENDIAN); cist_bridge_identifier_bridge_priority = tvb_get_ntohs(tvb,BPDU_CIST_BRIDGE_IDENTIFIER); - cist_bridge_identifier_mac_str = tvb_ether_to_str(tvb, BPDU_CIST_BRIDGE_IDENTIFIER + 2); + cist_bridge_identifier_mac_str = tvb_ether_to_str(pinfo->pool, tvb, BPDU_CIST_BRIDGE_IDENTIFIER + 2); /* add Identifier with format based on preference value * bpdu_use_system_id_extensions @@ -767,7 +767,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp case MSTI_FORMAT_ALTERNATIVE: cist_bridge_identifier_bridge_priority = tvb_get_ntohs(tvb,ALT_BPDU_CIST_BRIDGE_IDENTIFIER); - cist_bridge_identifier_mac_str = tvb_ether_to_str(tvb, ALT_BPDU_CIST_BRIDGE_IDENTIFIER + 2); + cist_bridge_identifier_mac_str = tvb_ether_to_str(pinfo->pool, tvb, ALT_BPDU_CIST_BRIDGE_IDENTIFIER + 2); /* add Identifier with format based on preference value * bpdu_use_system_id_extensions @@ -826,7 +826,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp msti_regional_root_priority = (msti_regional_root_mstid &0xf0) << 8; msti_regional_root_mstid = ((msti_regional_root_mstid & 0x0f) << 8) + tvb_get_guint8(tvb, offset+ MSTI_REGIONAL_ROOT+1); - msti_regional_root_mac_str = tvb_ether_to_str(tvb, offset + MSTI_REGIONAL_ROOT + 2); + msti_regional_root_mac_str = tvb_ether_to_str(pinfo->pool, tvb, offset + MSTI_REGIONAL_ROOT + 2); msti_tree = proto_tree_add_subtree_format(mstp_tree, tvb, offset, 16, ett_msti, NULL, "MSTID %d, Regional Root Identifier %d / %s", @@ -868,7 +868,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp msti_regional_root_priority = (msti_regional_root_mstid &0xf0) << 8; msti_regional_root_mstid = ((msti_regional_root_mstid & 0x0f) << 8) + tvb_get_guint8(tvb, offset+ ALT_MSTI_REGIONAL_ROOT+1); - msti_regional_root_mac_str = tvb_ether_to_str(tvb, offset+ ALT_MSTI_REGIONAL_ROOT + 2); + msti_regional_root_mac_str = tvb_ether_to_str(pinfo->pool, tvb, offset+ ALT_MSTI_REGIONAL_ROOT + 2); msti_tree = proto_tree_add_subtree_format(mstp_tree, tvb, offset, 16, ett_msti, NULL, "MSTID %d, Regional Root Identifier %d / %s", diff --git a/epan/dissectors/packet-dlep.c b/epan/dissectors/packet-dlep.c index d12f848518..914eecba16 100644 --- a/epan/dissectors/packet-dlep.c +++ b/epan/dissectors/packet-dlep.c @@ -535,7 +535,7 @@ decode_dataitem_macaddr(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *p switch(len) { case FT_ETHER_LEN: proto_tree_add_item(pt, hf_dlep_dataitem_macaddr_eui48, tvb, offset, len, ENC_NA); - proto_item_append_text(pi, ": %s", tvb_ether_to_str(tvb, offset)); + proto_item_append_text(pi, ": %s", tvb_ether_to_str(wmem_packet_scope(), tvb, offset)); break; case FT_EUI64_LEN: proto_tree_add_item(pt, hf_dlep_dataitem_macaddr_eui64, tvb, offset, len, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index 77e03ab568..b1bc248df7 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -259,7 +259,7 @@ dissect_dtp_tlv(packet_info *pinfo, tvbuff_t *tvb, int offset, int length, case DTP_TLV_SENDERID: if (length == 6) { /* Value length must be 6 bytes for a MAC address */ proto_item_append_text(ti, ": %s", - tvb_ether_to_str(tvb, offset)); /* XXX - resolve? */ + tvb_ether_to_str(pinfo->pool, tvb, offset)); /* XXX - resolve? */ proto_tree_add_item(tree, hf_dtp_senderid, tvb, offset, length, ENC_NA); } else diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 494135f505..e4c7a565a2 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -693,7 +693,7 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot const gchar *sysmac_str; ctrlvlanid = tvb_get_ntohs(tvb, offset + 1 + 1 + 4); - sysmac_str = tvb_ether_to_str(tvb, offset + 12); + sysmac_str = tvb_ether_to_str(pinfo->pool, tvb, offset + 12); eaps_item = proto_tree_add_protocol_format(tree, hf_edp_eaps, tvb, offset, length, "EAPS: Ctrlvlan %d, Sysmac %s", @@ -765,7 +765,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto const gchar *sysmac_str; ctrlvlanid = tvb_get_ntohs(tvb, offset + 2 + 4); - sysmac_str = tvb_ether_to_str(tvb, offset + 12); + sysmac_str = tvb_ether_to_str(pinfo->pool, tvb, offset + 12); esl_item = proto_tree_add_protocol_format(tree, hf_edp_esl, tvb, offset, length, "ESL: Ctrlvlan %d, Sysmac %s", diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 184ca53fcb..0076fa13d7 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1689,7 +1689,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); proto_item_set_hidden(ti_opt); - link_str = tvb_ether_to_str(tvb, opt_offset); + link_str = tvb_ether_to_str(pinfo->pool, tvb, opt_offset); col_append_fstr(pinfo->cinfo, COL_INFO, " from %s", link_str); proto_item_append_text(ti, " : %s", link_str); /* if the opt len is 16 and the 6 last bytes is 0n the Link Addr is EUI64 Address */ @@ -1726,7 +1726,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_target_linkaddr_mac, tvb, opt_offset, 6, ENC_NA); proto_item_set_hidden(ti_opt); - link_str = tvb_ether_to_str(tvb, opt_offset); + link_str = tvb_ether_to_str(pinfo->pool, tvb, opt_offset); col_append_fstr(pinfo->cinfo, COL_INFO, " is at %s", link_str); proto_item_append_text(ti, " : %s", link_str); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index c38c7a6124..4506314961 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -26812,7 +26812,7 @@ ieee80211_tag_ibss_dfs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } proto_tree_add_item(tree, hf_ieee80211_tag_dfs_owner, tvb, offset, 6, ENC_NA); - proto_item_append_text(field_data->item_tag, " Owner: %s", tvb_ether_to_str(tvb, offset)); + proto_item_append_text(field_data->item_tag, " Owner: %s", tvb_ether_to_str(pinfo->pool, tvb, offset)); offset += 6; proto_tree_add_item(tree, hf_ieee80211_tag_dfs_recovery_interval, tvb, offset, 1, ENC_NA); diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 7cd34fadf0..ceffe6a59f 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -263,7 +263,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp col_add_fstr(pinfo->cinfo, COL_INFO, "MIP %s, MMAC %s, ifIdx %d", tvb_ip_to_str(tvb, offset+2), - tvb_ether_to_str(tvb, offset+6), + tvb_ether_to_str(pinfo->pool, tvb, offset+6), tvb_get_ntohl(tvb, offset+12)); proto_tree_add_item(edp_tree, hf_ismp_edp_version, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-lacp.c b/epan/dissectors/packet-lacp.c index 66bb3f15f0..2beb93dd1b 100644 --- a/epan/dissectors/packet-lacp.c +++ b/epan/dissectors/packet-lacp.c @@ -249,7 +249,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ offset += 2; proto_tree_add_item(lacp_tree, hf_lacp_actor_sysid, tvb, offset, 6, ENC_NA); - sysidstr = tvb_ether_to_str(tvb, offset); + sysidstr = tvb_ether_to_str(pinfo->pool, tvb, offset); offset += 6; proto_tree_add_item_ret_uint(lacp_tree, hf_lacp_actor_key, tvb, offset, 2, ENC_BIG_ENDIAN, &key); @@ -292,7 +292,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ offset += 2; proto_tree_add_item(lacp_tree, hf_lacp_partner_sysid, tvb, offset, 6, ENC_NA); - sysidstr = tvb_ether_to_str(tvb, offset); + sysidstr = tvb_ether_to_str(pinfo->pool, tvb, offset); offset += 6; proto_tree_add_item_ret_uint(lacp_tree, hf_lacp_partner_key, tvb, offset, 2, ENC_BIG_ENDIAN, &key); diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index 39273bd624..00e0f9b0c7 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -554,7 +554,7 @@ get_addr_str(tvbuff_t *tvb, gint offset, guint16 afi, guint16 *addr_len) case AFNUM_802: case AFNUM_EUI48: *addr_len = EUI48_ADDRLEN; - addr_str = tvb_ether_to_str(tvb, offset); + addr_str = tvb_ether_to_str(wmem_packet_scope(), tvb, offset); return addr_str; case AFNUM_DISTNAME: *addr_len = tvb_strsize(tvb, offset); @@ -804,7 +804,7 @@ dissect_lcaf_afi_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case AFNUM_802: case AFNUM_EUI48: proto_tree_add_item(lisp_afi_list_tree, hf_lisp_lcaf_afi_list_mac, tvb, offset, EUI48_ADDRLEN, ENC_NA); - proto_item_append_text(tir, " %d. MAC Address: %s", i, tvb_ether_to_str(tvb, offset)); + proto_item_append_text(tir, " %d. MAC Address: %s", i, tvb_ether_to_str(pinfo->pool, tvb, offset)); proto_item_set_len(tir, 2 + EUI48_ADDRLEN); offset += EUI48_ADDRLEN; remaining -= EUI48_ADDRLEN; diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 29d0308aff..66af2c54dc 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -1453,7 +1453,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui } idType="MA"; - strPtr = tvb_ether_to_str(tvb, offset); + strPtr = tvb_ether_to_str(pinfo->pool, tvb, offset); proto_tree_add_item(chassis_tree, hf_chassis_id_mac, tvb, offset, 6, ENC_NA); pn_lldp_column_info->chassis_id_mac = wmem_strdup(pinfo->pool, strPtr); offset += (dataLen - 1); @@ -1628,7 +1628,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3 } idType = "MA"; - strPtr = tvb_ether_to_str(tvb, offset); + strPtr = tvb_ether_to_str(pinfo->pool, tvb, offset); proto_tree_add_item(port_tree, hf_port_id_mac, tvb, offset, 6, ENC_NA); offset += (dataLen - 1); diff --git a/epan/dissectors/packet-maap.c b/epan/dissectors/packet-maap.c index 2269f2015e..ff1fab77b2 100644 --- a/epan/dissectors/packet-maap.c +++ b/epan/dissectors/packet-maap.c @@ -94,13 +94,13 @@ dissect_maap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ case MAAP_MSG_TYPE_PROBE: case MAAP_MSG_TYPE_ANNOUNCE: col_append_fstr(pinfo->cinfo, COL_INFO, " req_start=%s, cnt=%d", - tvb_ether_to_str(tvb, MAAP_REQ_START_ADDR_OFFSET), + tvb_ether_to_str(pinfo->pool, tvb, MAAP_REQ_START_ADDR_OFFSET), tvb_get_ntohs(tvb, MAAP_REQ_COUNT_OFFSET)); break; case MAAP_MSG_TYPE_DEFEND: col_append_fstr(pinfo->cinfo, COL_INFO, " conflict_start=%s, cnt=%d", - tvb_ether_to_str(tvb, MAAP_CONFLICT_START_ADDR_OFFSET), + tvb_ether_to_str(pinfo->pool, tvb, MAAP_CONFLICT_START_ADDR_OFFSET), tvb_get_ntohs(tvb, MAAP_CONFLICT_COUNT_OFFSET)); break; default: diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c index 6b00acbe70..581fae08f0 100644 --- a/epan/dissectors/packet-mactelnet.c +++ b/epan/dissectors/packet-mactelnet.c @@ -130,8 +130,8 @@ dissect_mactelnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_MACTELNET); col_add_fstr(pinfo->cinfo, COL_INFO, "%s > %s Direction: %s Type: %s", - tvb_ether_to_str(tvb, 2), - tvb_ether_to_str(tvb, 8), + tvb_ether_to_str(pinfo->pool, tvb, 2), + tvb_ether_to_str(pinfo->pool, tvb, 8), ((foundclient >= 0) || (type == 4) ? "Client->Server" : "Server->Client" ), val_to_str(type, packettypenames, "Unknown Type:0x%02x") ); diff --git a/epan/dissectors/packet-marker.c b/epan/dissectors/packet-marker.c index 42569bd1e6..7a5eb95900 100644 --- a/epan/dissectors/packet-marker.c +++ b/epan/dissectors/packet-marker.c @@ -101,7 +101,7 @@ dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree_add_item(marker_tree, hf_marker_req_system, tvb, offset, 6, ENC_NA); - sysidstr = tvb_ether_to_str(tvb, offset); + sysidstr = tvb_ether_to_str(pinfo->pool, tvb, offset); offset += 6; proto_tree_add_item_ret_uint(marker_tree, hf_marker_req_trans_id, tvb, diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 527c749ba7..d2ac7dc795 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -445,7 +445,7 @@ nlsp_dissect_nlsp_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_nlsp_hello_sending_router_system_id, tvb, offset, 6, ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, ", System ID: %s", - tvb_ether_to_str(tvb, offset)); + tvb_ether_to_str(pinfo->pool, tvb, offset)); offset += 6; @@ -898,7 +898,7 @@ nlsp_dissect_nlsp_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; col_append_fstr(pinfo->cinfo, COL_INFO, ", LSP ID: %s", - tvb_ether_to_str(tvb, offset)); + tvb_ether_to_str(pinfo->pool, tvb, offset)); proto_tree_add_item(tree, hf_nlsp_lsp_id_system_id, tvb, offset, 6, ENC_NA); @@ -986,7 +986,7 @@ dissect_csnp_lsp_entries(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, in subtree = proto_tree_add_subtree_format(tree, tvb, offset, 16, ett_nlsp_csnp_lsp_entry, NULL, "LSP-ID: %s, Sequence: 0x%08x, Lifetime: %5us, Checksum: 0x%04x", - tvb_ether_to_str(tvb, offset+2), /* XXX - rest of system ID */ + tvb_ether_to_str(pinfo->pool, tvb, offset+2), /* XXX - rest of system ID */ tvb_get_ntohl(tvb, offset+10), tvb_get_ntohs(tvb, offset), tvb_get_ntohs(tvb, offset+14)); @@ -1021,7 +1021,7 @@ dissect_psnp_lsp_entries(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, in subtree = proto_tree_add_subtree_format(tree, tvb, offset, 16, ett_nlsp_psnp_lsp_entry, NULL, "LSP-ID: %s, Sequence: 0x%08x, Lifetime: %5us, Checksum: 0x%04x", - tvb_ether_to_str(tvb, offset+2), /* XXX - rest of system ID */ + tvb_ether_to_str(pinfo->pool, tvb, offset+2), /* XXX - rest of system ID */ tvb_get_ntohl(tvb, offset+10), tvb_get_ntohs(tvb, offset), tvb_get_ntohs(tvb, offset+14)); @@ -1085,14 +1085,14 @@ nlsp_dissect_nlsp_csnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; col_append_fstr(pinfo->cinfo, COL_INFO, ", Source ID: %s", - tvb_ether_to_str(tvb, offset)); + tvb_ether_to_str(pinfo->pool, tvb, offset)); proto_tree_add_item(tree, hf_nlsp_csnp_source_id_system_id, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item(tree, hf_nlsp_csnp_source_id_pseudonode_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; col_append_fstr(pinfo->cinfo, COL_INFO, ", Start LSP ID: %s", - tvb_ether_to_str(tvb, offset)); + tvb_ether_to_str(pinfo->pool, tvb, offset)); proto_tree_add_item(tree, hf_nlsp_csnp_start_lsp_id_source_id, tvb, offset, 6, ENC_NA); offset += 6; /* XXX - append the pseudonode ID */ @@ -1103,7 +1103,7 @@ nlsp_dissect_nlsp_csnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; col_append_fstr(pinfo->cinfo, COL_INFO, ", End LSP ID: %s", - tvb_ether_to_str(tvb, offset)); + tvb_ether_to_str(pinfo->pool, tvb, offset)); proto_tree_add_item(tree, hf_nlsp_csnp_end_lsp_id_source_id, tvb, offset, 6, ENC_NA); offset += 6; /* XXX - append the pseudonode ID */ @@ -1166,7 +1166,7 @@ nlsp_dissect_nlsp_psnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; col_append_fstr(pinfo->cinfo, COL_INFO, ", Source ID: %s", - tvb_ether_to_str(tvb, offset)); + tvb_ether_to_str(pinfo->pool, tvb, offset)); proto_tree_add_item(tree, hf_nlsp_psnp_source_id_system_id, tvb, offset, 6, ENC_NA); offset += 6; /* XXX - add the pseudonode ID */ diff --git a/epan/dissectors/packet-openflow_v6.c b/epan/dissectors/packet-openflow_v6.c index 460751e654..f381e46a7c 100644 --- a/epan/dissectors/packet-openflow_v6.c +++ b/epan/dissectors/packet-openflow_v6.c @@ -2948,7 +2948,7 @@ dissect_openflow_port_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree /* uint8_t hw_addr[OFP_ETH_ALEN]; */ proto_tree_add_item(port_tree, hf_openflow_v6_port_hw_addr, tvb, offset, OFP_ETH_ALEN, ENC_NA); - proto_item_append_text(port_tree, ": %s", tvb_ether_to_str(tvb, offset)); + proto_item_append_text(port_tree, ": %s", tvb_ether_to_str(pinfo->pool, tvb, offset)); offset+=OFP_ETH_ALEN; /* uint8_t pad2[2]; */ diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index fec7fca08e..c46b8c7535 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -178,13 +178,13 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (raw_octet == PAGP_FLUSH_PDU) { col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s", - tvb_ether_to_str(tvb, PAGP_FLUSH_LOCAL_DEVICE_ID)); + tvb_ether_to_str(pinfo->pool, tvb, PAGP_FLUSH_LOCAL_DEVICE_ID)); proto_tree_add_item(pagp_tree, hf_pagp_flush_local_device_id, tvb, PAGP_FLUSH_LOCAL_DEVICE_ID, 6, ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s", - tvb_ether_to_str(tvb, PAGP_FLUSH_PARTNER_DEVICE_ID)); + tvb_ether_to_str(pinfo->pool, tvb, PAGP_FLUSH_PARTNER_DEVICE_ID)); proto_tree_add_item(pagp_tree, hf_pagp_flush_partner_device_id, tvb, PAGP_FLUSH_PARTNER_DEVICE_ID, 6, ENC_NA); @@ -205,7 +205,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_bitmask(pagp_tree, tvb, PAGP_FLAGS, hf_pagp_flags, ett_pagp_flags, pagp_flags, ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s", - tvb_ether_to_str(tvb, PAGP_LOCAL_DEVICE_ID)); + tvb_ether_to_str(pinfo->pool, tvb, PAGP_LOCAL_DEVICE_ID)); proto_tree_add_item(pagp_tree, hf_pagp_local_device_id, tvb, PAGP_LOCAL_DEVICE_ID, 6, ENC_NA); @@ -228,7 +228,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s", - tvb_ether_to_str(tvb, PAGP_PARTNER_DEVICE_ID)); + tvb_ether_to_str(pinfo->pool, tvb, PAGP_PARTNER_DEVICE_ID)); proto_tree_add_item(pagp_tree, hf_pagp_partner_device_id, tvb, PAGP_PARTNER_DEVICE_ID, 6, ENC_NA); diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c index 4c211345b0..8406f2e482 100644 --- a/epan/dissectors/packet-qnet6.c +++ b/epan/dissectors/packet-qnet6.c @@ -1589,7 +1589,7 @@ dissect_qnet6_lr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint * { if (tvb_get_guint8(tvb, addr_data_offset + 1) == QNET_LR_SA_FAMILY_MAC && len >= 2 + 6) { - name[i] = tvb_ether_to_str(tvb, addr_data_offset + 2); + name[i] = tvb_ether_to_str(pinfo->pool, tvb, addr_data_offset + 2); ti = proto_tree_add_item(sstree, hf_index, tvb, addr_data_offset + 2, 6, ENC_NA); proto_item_set_generated(ti); } diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 0a422de759..2bea429388 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1232,7 +1232,7 @@ radius_ether(radius_attr_info_t *a, proto_tree *tree, packet_info *pinfo _U_, tv } proto_tree_add_item(tree, a->hf, tvb, offset, len, ENC_NA); - proto_item_append_text(avp_item, "%s", tvb_ether_to_str(tvb, offset)); + proto_item_append_text(avp_item, "%s", tvb_ether_to_str(pinfo->pool, tvb, offset)); } void diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index 22c88e9be1..81a21c3c07 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -55,7 +55,7 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_root_mac, tvb, 0, 6, ENC_NA); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_bridge_mac, tvb, 10, 6, ENC_NA); - col_add_fstr(pinfo->cinfo, COL_INFO, "Bridge MAC %s", tvb_ether_to_str(tvb, 10)); + col_add_fstr(pinfo->cinfo, COL_INFO, "Bridge MAC %s", tvb_ether_to_str(pinfo->pool, tvb, 10)); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_max_age, tvb, 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_hello_time, tvb, 22, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 653bdd0e66..aee857b446 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -6372,7 +6372,7 @@ dissect_rsvp_call_id(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object case 4: offset4 = offset3 + 6; - str = tvb_ether_to_str(tvb, offset3); + str = tvb_ether_to_str(pinfo->pool, tvb, offset3); proto_tree_add_item(rsvp_object_tree, hf_rsvp_callid_srcaddr_ether, tvb, offset3, 6, ENC_NA); break; diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index bc575983ac..411ac88fbe 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -860,7 +860,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U case AT_ETHER: proto_tree_add_bytes_format_value( rtcfg_tree, hf_rtcfg_client_hw_address, tvb, offset, 32, NULL, "%s", - tvb_ether_to_str(tvb, offset)); + tvb_ether_to_str(pinfo->pool, tvb, offset)); break; default: diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 5e391cd33c..29f7d11df9 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -199,7 +199,7 @@ sv_text(tvbuff_t *tvb, int svoff, packet_info *pinfo, proto_tree *tree) } proto_tree_add_item(sv_tree, hf_trmac_naun, tvb, svoff+2, sv_length-2, ENC_NA); proto_item_append_text(sv_item, ": %s", - tvb_ether_to_str(tvb, svoff+2)); + tvb_ether_to_str(pinfo->pool, tvb, svoff+2)); break; case 0x03: /* Local Ring Number */ @@ -280,7 +280,7 @@ sv_text(tvbuff_t *tvb, int svoff, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sv_tree, hf_trmac_sa_of_last_amp_or_smp_frame, tvb, svoff+2, sv_length-2, ENC_NA); proto_item_append_text(sv_item, ": %s", - tvb_ether_to_str(tvb, svoff+2)); + tvb_ether_to_str(pinfo->pool, tvb, svoff+2)); break; case 0x0B: /* Physical Drop Number */ @@ -359,7 +359,7 @@ sv_text(tvbuff_t *tvb, int svoff, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sv_tree, hf_trmac_station_identifier, tvb, svoff+2, sv_length-2, ENC_NA); proto_item_append_text(sv_item, ": %s", - tvb_ether_to_str(tvb, svoff+2)); + tvb_ether_to_str(pinfo->pool, tvb, svoff+2)); break; case 0x29: /* Ring Station Status */ @@ -391,7 +391,7 @@ sv_text(tvbuff_t *tvb, int svoff, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sv_tree, hf_trmac_group_address_ether, tvb, svoff+2, sv_length-2, ENC_NA); proto_item_append_text(sv_item, ": %s", - tvb_ether_to_str(tvb, svoff+2)); + tvb_ether_to_str(pinfo->pool, tvb, svoff+2)); } break; diff --git a/epan/dissectors/packet-wifi-display.c b/epan/dissectors/packet-wifi-display.c index 7cc0de9b11..d642a005bd 100644 --- a/epan/dissectors/packet-wifi-display.c +++ b/epan/dissectors/packet-wifi-display.c @@ -241,7 +241,7 @@ dissect_wfd_subelem_session_info(packet_info *pinfo, proto_tree *tree, proto_tree_add_item(descr, hf_wfd_subelem_session_dev_addr, tvb, offset, 6, ENC_NA); - proto_item_append_text(descr, ": %s", tvb_ether_to_str(tvb, offset)); + proto_item_append_text(descr, ": %s", tvb_ether_to_str(pinfo->pool, tvb, offset)); offset += 6; proto_tree_add_item(descr, hf_wfd_subelem_session_assoc_bssid, diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 5623c98f32..617701efbe 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -475,7 +475,7 @@ static void dissect_device_id(proto_item *tlv_root, proto_item *tlv_item, { proto_tree_add_item(tlv_root, hf_p2p_attr_device_id, tvb, offset + 3, 6, ENC_NA); - proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(tvb, offset+3)); + proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(wmem_packet_scope(), tvb, offset+3)); } static void dissect_group_owner_intent(proto_item *tlv_root, @@ -674,7 +674,7 @@ static void dissect_intended_interface_addr(proto_item *tlv_root, { proto_tree_add_item(tlv_root, hf_p2p_attr_intended_interface_addr, tvb, offset + 3, 6, ENC_NA); - proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(tvb, offset + 3)); + proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(wmem_packet_scope(), tvb, offset + 3)); } static void dissect_extended_listen_timing(proto_item *tlv_root, @@ -701,7 +701,7 @@ static void dissect_wifi_p2p_group_id(proto_item *tlv_root, s_offset = offset + 3; proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_id_dev_addr, tvb, s_offset, 6, ENC_NA); - proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(tvb, offset + 3)); + proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(wmem_packet_scope(), tvb, offset + 3)); s_offset += 6; proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_id_ssid, tvb, s_offset, offset + 3 + slen - s_offset, ENC_ASCII|ENC_NA); @@ -722,7 +722,7 @@ static void dissect_wifi_p2p_group_bssid(packet_info *pinfo, s_offset = offset + 3; proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_bssid, tvb, s_offset, 6, ENC_NA); - proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(tvb, offset + 3)); + proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(pinfo->pool, tvb, offset + 3)); } static void dissect_notice_of_absence(packet_info *pinfo, proto_item *tlv_root, @@ -795,7 +795,7 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, proto_tree_add_item(tree, hf_p2p_attr_gi_p2p_dev_addr, tvb, s_offset, 6, ENC_NA); - proto_item_append_text(tree, ": %s", tvb_ether_to_str(tvb, s_offset)); + proto_item_append_text(tree, ": %s", tvb_ether_to_str(pinfo->pool, tvb, s_offset)); s_offset += 6; proto_tree_add_item(tree, hf_p2p_attr_gi_p2p_iface_addr, tvb, s_offset, diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index 9bf8405b39..390889a905 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -118,7 +118,7 @@ dissect_wol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data else if ( len >= 108 ) { len = 108; - passwd = tvb_ether_to_str(tvb, 102); + passwd = tvb_ether_to_str(pinfo->pool, tvb, 102); } else { diff --git a/epan/to_str.h b/epan/to_str.h index bb1de6b23f..d902e26c1f 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -82,7 +82,7 @@ WS_DLL_PUBLIC const gchar *port_type_to_str (port_type type); WS_DLL_PUBLIC gchar* tvb_address_with_resolution_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, int type, const gint offset); -#define tvb_ether_to_str(tvb, offset) tvb_address_to_str(wmem_packet_scope(), tvb, AT_ETHER, offset) +#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) diff --git a/plugins/epan/wimaxasncp/packet-wimaxasncp.c b/plugins/epan/wimaxasncp/packet-wimaxasncp.c index b720e09619..830bfb1491 100644 --- a/plugins/epan/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/epan/wimaxasncp/packet-wimaxasncp.c @@ -1939,7 +1939,7 @@ static guint dissect_wimaxasncp_backend( tree, hf_wimaxasncp_msid, tvb, offset, 6, ENC_NA); } - pmsid = tvb_ether_to_str(tvb, offset); + pmsid = tvb_ether_to_str(pinfo->pool, tvb, offset); offset += 6; |