diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-15 13:46:13 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-15 13:46:13 +0000 |
| commit | 9486a3d9747ad9426913dd3302e19c5884cc2bff (patch) | |
| tree | f245f85039bfb7c41c76a68588c9e9ebe383e940 /epan/dissectors/packet-ipv6.c | |
| parent | 888650324b6c2fc7f8c9d29f66d862f25b7e9a9f (diff) | |
More wmem conversion (leaving uat related functions aside)
svn path=/trunk/; revision=52055
Diffstat (limited to 'epan/dissectors/packet-ipv6.c')
| -rw-r--r-- | epan/dissectors/packet-ipv6.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 9a492d9b01..7ab61a22ab 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -45,7 +45,7 @@ #include <epan/arcnet_pids.h> #include <epan/in_cksum.h> #include <epan/expert.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/tap.h> #include "packet-ipsec.h" #include "packet-ipv6.h" @@ -1394,7 +1394,8 @@ dissect_shim6_ct(proto_tree * shim_tree, gint hf_item, tvbuff_t * tvb, gint offs tmp[4] = tvb_get_guint8(tvb, offset++); tmp[5] = tvb_get_guint8(tvb, offset++); - ct_str = ep_strdup_printf("%s: %02X %02X %02X %02X %02X %02X", label, + ct_str = wmem_strdup_printf(wmem_packet_scope(), + "%s: %02X %02X %02X %02X %02X %02X", label, tmp[0] & SHIM6_BITMASK_CT, tmp[1], tmp[2], tmp[3], tmp[4], tmp[5] ); @@ -1839,7 +1840,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_get_guint8(tvb, offset + IP6H_SRC + 8) & 0x02 && tvb_get_ntohs(tvb, offset + IP6H_SRC + 11) == 0xfffe) { /* RFC 4291 appendix A */ - mac_addr = (guint8 *)ep_alloc(6); + mac_addr = (guint8 *)wmem_alloc(wmem_packet_scope(), 6); tvb_memcpy(tvb, mac_addr, offset + IP6H_SRC + 8, 3); tvb_memcpy(tvb, mac_addr+3, offset+ IP6H_SRC + 13, 3); mac_addr[0] &= ~0x02; @@ -1926,7 +1927,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_get_guint8(tvb, offset + IP6H_DST + 8) & 0x02 && tvb_get_ntohs(tvb, offset + IP6H_DST + 11) == 0xfffe) { /* RFC 4291 appendix A */ - mac_addr = (guint8 *)ep_alloc(6); + mac_addr = (guint8 *)wmem_alloc(wmem_packet_scope(), 6); tvb_memcpy(tvb, mac_addr, offset + IP6H_DST + 8, 3); tvb_memcpy(tvb, mac_addr+3, offset+ IP6H_DST + 13, 3); mac_addr[0] &= ~0x02; |