diff options
| author | Evan Huus <eapache@gmail.com> | 2021-10-03 16:19:56 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2021-10-04 17:10:17 +0000 |
| commit | e578c6caee4ae6cccf24849adf95b4273d66ba11 (patch) | |
| tree | a50d6d8677caa701cd5fb9427854018a6e753e11 /epan/dissectors/packet-lldp.c | |
| parent | eb9ae2ffd5c8fbf500ae074eae05a0bd2bc4f951 (diff) | |
to_str: pull scope arg up into tvb_ether_to_str
There are a bunch of near-identical macros here, but I'm gonna change
one at a time or else the builder times out at the number of files
changed in one merge.
Diffstat (limited to 'epan/dissectors/packet-lldp.c')
| -rw-r--r-- | epan/dissectors/packet-lldp.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |