Convert a few dissectors from emem to wmem API

svn path=/trunk/; revision=51983

15 files changed, 97 insertions, 93 deletions

diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index f70ef1f38f..72fd32695c 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -45,6 +45,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/wmem/wmem.h>
 /* Include vendor id translation */
 #include <epan/sminmpec.h>
 
@@ -605,7 +606,7 @@ decode_sse(proto_tree *ext_tree, tvbuff_t *tvb, int offset, guint ext_len)
         return;
     }
 
-    msid_digits = (char *)ep_alloc(A11_MSG_MSID_LEN_MAX+2);
+    msid_digits = (char *)wmem_alloc(wmem_packet_scope(), A11_MSG_MSID_LEN_MAX+2);
     msid_start_offset = offset;
 
     if (msid_len > A11_MSG_MSID_ELEM_LEN_MAX)
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index 020cdbdf73..90b3f752ae 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -635,11 +635,11 @@ lowpan_context_insert(guint8 cid, guint16 pan, guint8 plen, struct e_in6_addr *p
         }
     }
     else {
-        pkey = se_memdup(&key, sizeof(key));
+        pkey = wmem_memdup(wmem_file_scope(), &key, sizeof(key));
     }
 
     /* Create a new context */
-    data = se_new(lowpan_context_data);
+    data = wmem_new(wmem_file_scope(), lowpan_context_data);
     data->frame = frame;
     data->plen = plen;
     memset(&data->prefix, 0, sizeof(struct e_in6_addr)); /* Ensure zero paddeding */
@@ -1283,7 +1283,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg
         /* Construct the next header for the UDP datagram. */
         offset = BITS_TO_BYTE_LEN(0, bit_offset);
         length = (gint)tvb_ensure_length_remaining(tvb, offset);
-        nhdr_list = (struct lowpan_nhdr *)ep_alloc(sizeof(struct lowpan_nhdr) + sizeof(struct udp_hdr) + length);
+        nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + sizeof(struct udp_hdr) + length);
         nhdr_list->next = NULL;
         nhdr_list->proto = IP_PROTO_UDP;
         nhdr_list->length = length + (int)sizeof(struct udp_hdr);
@@ -1301,7 +1301,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg
         gint length;
         offset = BITS_TO_BYTE_LEN(0, bit_offset);
         length = (gint)tvb_ensure_length_remaining(tvb, offset);
-        nhdr_list = (struct lowpan_nhdr *)ep_alloc(sizeof(struct lowpan_nhdr) + length);
+        nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length);
         nhdr_list->next = NULL;
         nhdr_list->proto = ipv6.ip6_nxt;
         nhdr_list->length = length;
@@ -1718,7 +1718,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d
     /* Create an extension header for the remaining payload. */
     else {
         length = (gint)tvb_ensure_length_remaining(tvb, offset);
-        nhdr_list = (struct lowpan_nhdr *)ep_alloc(sizeof(struct lowpan_nhdr) + length);
+        nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length);
         nhdr_list->next = NULL;
         nhdr_list->proto = ipv6.ip6_nxt;
         nhdr_list->length = length;
@@ -1758,7 +1758,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d
  *      siid            ; Source Interface ID.
  *      diid            ; Destination Interface ID.
  *  RETURNS
- *      lowpan_nhdr *   ; List of ep_alloc'd next header structures.
+ *      lowpan_nhdr *   ; List of wmem_alloc'd next header structures.
  *---------------------------------------------------------------
  */
 static struct lowpan_nhdr *
@@ -1801,7 +1801,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi
         if (!iphc_tvb) return NULL;
 
         /* Create the next header structure for the tunneled IPv6 header. */
-        nhdr = (struct lowpan_nhdr *)ep_alloc0(sizeof(struct lowpan_nhdr) + tvb_length(iphc_tvb));
+        nhdr = (struct lowpan_nhdr *)wmem_alloc0(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + tvb_length(iphc_tvb));
         nhdr->next = NULL;
         nhdr->proto = IP_PROTO_IPV6;
         nhdr->length = tvb_length(iphc_tvb);
@@ -1861,7 +1861,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi
         length = (length + 7) & ~0x7;
 
         /* Create the next header structure for the IPv6 extension header. */
-        nhdr = (struct lowpan_nhdr *)ep_alloc0(sizeof(struct lowpan_nhdr) + length);
+        nhdr = (struct lowpan_nhdr *)wmem_alloc0(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length);
         nhdr->next = NULL;
         nhdr->proto = ext_proto;
         nhdr->length = length;
@@ -1908,7 +1908,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi
         else {
             /* Create another next header structure for the remaining payload. */
             length = (gint)tvb_ensure_length_remaining(tvb, offset);
-            nhdr->next = (struct lowpan_nhdr *)ep_alloc(sizeof(struct lowpan_nhdr) + length);
+            nhdr->next = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length);
             nhdr->next->next = NULL;
             nhdr->next->proto = ipv6_ext.ip6e_nxt;
             nhdr->next->length = length;
@@ -2061,7 +2061,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi
 
         /* Create the next header structure for the UDP datagram. */
         length = (gint)tvb_ensure_length_remaining(tvb, offset);
-        nhdr = (struct lowpan_nhdr *)ep_alloc(sizeof(struct lowpan_nhdr) + sizeof(struct udp_hdr) + length);
+        nhdr = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + sizeof(struct udp_hdr) + length);
         nhdr->next = NULL;
         nhdr->proto = IP_PROTO_UDP;
         nhdr->length = length + (int)sizeof(struct udp_hdr);
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index cf6801f2eb..6dbf52a27b 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -30,7 +30,7 @@
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 #include "packet-tcp.h"
 #include "packet-aim.h"
@@ -87,8 +87,8 @@ static int dissect_aim_chat_outgoing_msg(tvbuff_t *tvb, packet_info *pinfo, prot
 	guchar *msg;
 	int buddyname_length;
 
-	buddyname=(guchar *)ep_alloc(MAX_BUDDYNAME_LENGTH+1);
-	msg=(guchar *)ep_alloc(1000);
+	buddyname=(guchar *)wmem_alloc(wmem_packet_scope(), MAX_BUDDYNAME_LENGTH+1);
+	msg=(guchar *)wmem_alloc(wmem_packet_scope(), 1000);
 	buddyname_length = aim_get_buddyname( buddyname, tvb, 30, 31 );
 
 	/* channel message from client */
@@ -108,8 +108,8 @@ static int dissect_aim_chat_incoming_msg(tvbuff_t *tvb, packet_info *pinfo, prot
 	/* channel message to client */
 	int buddyname_length;
 
-	buddyname=(guchar *)ep_alloc(MAX_BUDDYNAME_LENGTH+1);
-	msg=(guchar *)ep_alloc(1000);
+	buddyname=(guchar *)wmem_alloc(wmem_packet_scope(), MAX_BUDDYNAME_LENGTH+1);
+	msg=(guchar *)wmem_alloc(wmem_packet_scope(), 1000);
 	buddyname_length = aim_get_buddyname( buddyname, tvb, 30, 31 );
 
 	aim_get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb)
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index f6c1e00ea0..2af29042e1 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -41,7 +41,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 #include "packet-tcp.h"
 
 /*  Generic data  */
@@ -1837,7 +1837,7 @@ dissect_amqp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     conv = find_or_create_conversation(pinfo);
     conn = (amqp_conv *)conversation_get_proto_data(conv, proto_amqp);
     if (conn == NULL) {
-        conn = se_new0(amqp_conv);
+        conn = wmem_new0(wmem_file_scope(), amqp_conv);
         conversation_add_proto_data(conv, proto_amqp, conn);
     }
     check_amqp_version(tvb, conn);
@@ -1986,7 +1986,7 @@ dissect_amqp_0_9_field_table(tvbuff_t *tvb, packet_info *pinfo, int offset, guin
             amqp_typename = "integer";
             if (length < 4)
                 goto too_short;
-            value  = ep_strdup_printf("%d", tvb_get_ntohl(tvb, offset));
+            value  = wmem_strdup_printf(wmem_packet_scope(), "%d", tvb_get_ntohl(tvb, offset));
             offset += 4;
             length -= 4;
             break;
@@ -5583,16 +5583,16 @@ dissect_amqp_0_10_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (tvb_memeql(tvb, 0, "AMQP", 4) == 0) {
         guint8         proto_major;
         guint8         proto_minor;
-        emem_strbuf_t *strbuf;
+        wmem_strbuf_t *strbuf;
 
         proto_major = tvb_get_guint8(tvb, 6);
         proto_minor = tvb_get_guint8(tvb, 7);
-        strbuf      = ep_strbuf_new_label("");
-        ep_strbuf_append_printf(strbuf,
-                                "Protocol-Header %d-%d ",
-                                proto_major,
-                                proto_minor);
-        col_append_str(pinfo->cinfo, COL_INFO, strbuf->str);
+        strbuf      = wmem_strbuf_new_label(wmem_packet_scope());
+        wmem_strbuf_append_printf(strbuf,
+                                  "Protocol-Header %d-%d ",
+                                  proto_major,
+                                  proto_minor);
+        col_append_str(pinfo->cinfo, COL_INFO, wmem_strbuf_get_str(strbuf));
         col_set_fence(pinfo->cinfo, COL_INFO);
 
         if (tree) {
@@ -5725,16 +5725,16 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (tvb_memeql(tvb, 0, "AMQP", 4) == 0) {
         guint8         proto_major;
         guint8         proto_minor;
-        emem_strbuf_t *strbuf;
+        wmem_strbuf_t *strbuf;
 
         proto_major = tvb_get_guint8(tvb, 6);
         proto_minor = tvb_get_guint8(tvb, 7);
-        strbuf = ep_strbuf_new_label("");
-        ep_strbuf_append_printf(strbuf,
-                                "Protocol-Header %u-%u",
-                                proto_major,
-                                proto_minor);
-        col_append_str(pinfo->cinfo, COL_INFO, strbuf->str);
+        strbuf = wmem_strbuf_new_label(wmem_packet_scope());
+        wmem_strbuf_append_printf(strbuf,
+                                  "Protocol-Header %u-%u",
+                                  proto_major,
+                                  proto_minor);
+        col_append_str(pinfo->cinfo, COL_INFO, wmem_strbuf_get_str(strbuf));
         col_set_fence(pinfo->cinfo, COL_INFO);
 
         if (tree) {
@@ -8505,7 +8505,7 @@ get_amqp_0_10_type_formatter(guint8 code,
         table = amqp_0_10_fixed_types;
     for (i = 0; table[i].typecode != 0xff; ++i) {
         if (table[i].typecode == code) {
-            *name        = ep_strdup(table[i].amqp_typename);
+            *name        = wmem_strdup(wmem_packet_scope(), table[i].amqp_typename);
             *formatter   = table[i].formatter;
             *length_size = table[i].known_size;
             return TRUE;
@@ -8537,10 +8537,10 @@ format_amqp_0_10_int(tvbuff_t *tvb,
     else if (length == 4)
         val = (gint32)tvb_get_ntohl(tvb, offset);
     else {
-        *value = ep_strdup_printf("Invalid int length %d!", length);
+        *value = wmem_strdup_printf(wmem_packet_scope(), "Invalid int length %d!", length);
         return length;
     }
-    *value = ep_strdup_printf("%d", val);
+    *value = wmem_strdup_printf(wmem_packet_scope(), "%d", val);
     return length;
 }
 
@@ -8558,10 +8558,10 @@ format_amqp_0_10_uint(tvbuff_t *tvb,
     else if (length == 4)
         val = tvb_get_ntohl(tvb, offset);
     else {
-        *value = ep_strdup_printf("Invalid uint length %d!", length);
+        *value = wmem_strdup_printf(wmem_packet_scope(), "Invalid uint length %d!", length);
         return length;
     }
-    *value = ep_strdup_printf("%u", val);
+    *value = wmem_strdup_printf(wmem_packet_scope(), "%u", val);
     return length;
 }
 
@@ -8582,7 +8582,7 @@ format_amqp_0_10_boolean(tvbuff_t *tvb,
     guint8 val;
 
     val = tvb_get_guint8(tvb, offset);
-    *value = ep_strdup(val ? "true" : "false");
+    *value = wmem_strdup(wmem_packet_scope(), val ? "true" : "false");
     return 1;
 }
 
@@ -8600,7 +8600,7 @@ format_amqp_0_10_vbin(tvbuff_t *tvb,
     else if (length == 4)
         bin_length = tvb_get_ntohl(tvb, offset);
     else {
-        *value = ep_strdup_printf("Invalid vbin length size %d!", length);
+        *value = wmem_strdup_printf(wmem_packet_scope(), "Invalid vbin length size %d!", length);
         return length;
     }
     AMQP_INCREMENT(offset, length, bound);
@@ -8623,7 +8623,7 @@ format_amqp_0_10_str(tvbuff_t *tvb,
     else if (length == 4)
         string_length = tvb_get_ntohl(tvb, offset);
     else {
-        *value = ep_strdup_printf("Invalid string length size %d!", length);
+        *value = wmem_strdup_printf(wmem_packet_scope(), "Invalid string length size %d!", length);
         return length;
     }
     AMQP_INCREMENT(offset, length, bound);
diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c
index 6e2f9a3036..a0b9ae1d34 100644
--- a/epan/dissectors/packet-ancp.c
+++ b/epan/dissectors/packet-ancp.c
@@ -32,6 +32,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/wmem/wmem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/tap.h>
 #include <epan/stats_tree.h>
@@ -560,7 +561,7 @@ dissect_ancp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANCP");
     col_clear(pinfo->cinfo, COL_INFO);
 
-    ancp_info = ep_new(struct ancp_tap_t);
+    ancp_info = wmem_new(wmem_packet_scope(), struct ancp_tap_t);
     ancp_info->ancp_mtype   = 0;
     ancp_info->ancp_adjcode = 0;
 
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 7a42cb8ead..060141eba6 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -41,6 +41,7 @@
 #include <math.h>
 
 #include <epan/packet.h>
+#include <epan/wmem/wmem.h>
 
 void proto_register_ansi_801(void);
 void proto_reg_handoff_ansi_801(void);
@@ -784,7 +785,7 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 		fl_value = (float)(0.5 * (1 << (value >> 1)));
 		if (value & 0x01)
 			fl_value *= 1.5f;
-		str = ep_strdup_printf("%.2f meters", fl_value);
+		str = wmem_strdup_printf(wmem_packet_scope(), "%.2f meters", fl_value);
 	}
 	proto_tree_add_uint_bits_format_value(tree, hf_ansi_801_loc_uncrtnty_a, tvb, bit_offset, 5, value,
 					      "%s (0x%02x)", str, value);
@@ -800,7 +801,7 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 		fl_value = (float)(0.5 * (1 << (value >> 1)));
 		if (value & 0x01)
 			fl_value *= 1.5f;
-		str = ep_strdup_printf("%.2f meters", fl_value);
+		str = wmem_strdup_printf(wmem_packet_scope(), "%.2f meters", fl_value);
 	}
 	proto_tree_add_uint_bits_format_value(tree, hf_ansi_801_loc_uncrtnty_p, tvb, bit_offset, 5, value,
 					      "%s (0x%02x)", str, value);
@@ -879,7 +880,7 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 			fl_value = (float)(0.5 * (1 << (value >> 1)));
 			if (value & 0x01)
 				fl_value *= 1.5f;
-			str = ep_strdup_printf("%.2f meters", fl_value);
+			str = wmem_strdup_printf(wmem_packet_scope(), "%.2f meters", fl_value);
 		}
 		proto_tree_add_uint_bits_format_value(tree, hf_ansi_801_loc_uncrtnty_v, tvb, bit_offset, 5, value,
 						      "%s (0x%02x)", str, value);
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 84b0449108..f50ec20957 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -1223,12 +1223,12 @@ update_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb
             if(ansi_map_saved_invokedata)
                 return;
 
-            ansi_map_saved_invokedata = se_new(struct ansi_map_invokedata_t);
+            ansi_map_saved_invokedata = wmem_new(wmem_file_scope(), struct ansi_map_invokedata_t);
             ansi_map_saved_invokedata->opcode = p_private_tcap->d.OperationCode_private;
             ansi_map_saved_invokedata->ServiceIndicator = ServiceIndicator;
 
             g_hash_table_insert(TransactionId_table,
-                                se_strdup(buf),
+                                wmem_strdup(wmem_file_scope(), buf),
                                 ansi_map_saved_invokedata);
 
             /*g_warning("Invoke Hash string %s pkt: %u",buf,pinfo->fd->num);*/
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index cb8738c13c..32e9ab361b 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <etypes.h>
 
@@ -227,7 +227,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset,
       ata_info_t *tmp_ata_info;
       /* first time we see this request so add a struct for request/response
          matching */
-      ata_info=se_new(ata_info_t);
+      ata_info=wmem_new(wmem_file_scope(), ata_info_t);
       ata_info->tag=tag;
       ata_info->conversation=conversation;
       ata_info->request_frame=pinfo->fd->num;
diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c
index 2603d89e6b..084916545d 100644
--- a/epan/dissectors/packet-applemidi.c
+++ b/epan/dissectors/packet-applemidi.c
@@ -52,6 +52,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 
 #include "packet-rtp.h"
@@ -303,11 +304,11 @@ dissect_applemidi_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
 	/* set dynamic payload-type 97 which is used by Apple for their RTP-MIDI implementation for this
 	   address/port-tuple to cause RTP-dissector to call the RTP-MIDI-dissector for payload-decoding */
 
-	encoding_name_and_rate = se_new(encoding_name_and_rate_t);
+	encoding_name_and_rate = wmem_new(wmem_file_scope(), encoding_name_and_rate_t);
 	rtp_dyn_payload = g_hash_table_new( g_int_hash, g_int_equal );
-	encoding_name_and_rate->encoding_name = se_strdup( "rtp-midi" );
+	encoding_name_and_rate->encoding_name = wmem_strdup( wmem_file_scope(), "rtp-midi" );
 	encoding_name_and_rate->sample_rate = 10000;
-	key = se_new(gint);
+	key = wmem_new(wmem_file_scope(), gint);
 	*key = 97;
 	g_hash_table_insert( rtp_dyn_payload, key, encoding_name_and_rate );
         rtp_add_address( pinfo, &pinfo->src, pinfo->srcport, 0, APPLEMIDI_DISSECTOR_SHORTNAME,
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c
index 085ab45068..ad36513527 100644
--- a/epan/dissectors/packet-aprs.c
+++ b/epan/dissectors/packet-aprs.c
@@ -49,7 +49,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 #define AX25_ADDR_LEN		7  /* length of an AX.25 address */
 #define STRLEN	100
@@ -617,20 +617,20 @@ dissect_aprs_compressed_msg(	tvbuff_t *tvb,
 				offset += 1;
 				ch = tvb_get_guint8( tvb, offset );
 				range = exp( log( 1.08 ) * (ch - 33) );
-				info_buffer = ep_strdup_printf( "%7.2f", range );
+				info_buffer = wmem_strdup_printf( wmem_packet_scope(), "%7.2f", range );
 				proto_tree_add_string( msg_tree, *msg_items->hf_msg_rng, tvb, offset, 1, info_buffer );
 				}
 			else
 				if ( ch >= '!' && ch <= 'z' )
 					{ /* Course/Speed */
 					course = (ch - 33) * 4;
-					info_buffer = ep_strdup_printf( "%d", course );
+					info_buffer = wmem_strdup_printf( wmem_packet_scope(), "%d", course );
 					proto_tree_add_string( msg_tree, *msg_items->hf_msg_cse,
 							       tvb, offset, 1, info_buffer );
 					offset += 1;
 					ch = tvb_get_guint8( tvb, offset );
 					speed = exp( log( 1.08 ) * (ch - 33) );
-					info_buffer = ep_strdup_printf( "%7.2f", speed );
+					info_buffer = wmem_strdup_printf( wmem_packet_scope(), "%7.2f", speed );
 					proto_tree_add_string( msg_tree, *msg_items->hf_msg_spd,
 							       tvb, offset, 1, info_buffer );
 					}
@@ -710,7 +710,7 @@ dissect_mic_e(	tvbuff_t    *tvb,
 	data_len    = tvb_length_remaining( tvb, offset );
 	new_offset  = offset + data_len;
 
-	info_buffer = (char *)ep_alloc( STRLEN );
+	info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN );
 
 	msg_a = 0;
 	msg_b = 0;
@@ -857,7 +857,7 @@ dissect_aprs_storm(	tvbuff_t   *tvb,
 		static const char *storm_format = " (%*.*s)";
 
 		data_len = tvb_length_remaining( tvb, offset );
-		info_buffer = (char *)ep_alloc( STRLEN );
+		info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN );
 		g_snprintf( info_buffer, STRLEN, storm_format, data_len, data_len, tvb_get_ptr( tvb, offset, data_len ) );
 		tc = proto_tree_add_string( parent_tree, hf_aprs_storm_idx, tvb, offset, data_len, info_buffer );
 		storm_tree = proto_item_add_subtree( tc, ett_aprs_storm_idx );
@@ -906,7 +906,7 @@ dissect_aprs_weather(	tvbuff_t   *tvb,
 	data_len    = tvb_length_remaining( tvb, offset );
 	new_offset  = offset + data_len;
 
-	info_buffer = (char *)ep_alloc( STRLEN );
+	info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN );
 	g_snprintf( info_buffer, STRLEN, weather_format, data_len, data_len, tvb_get_ptr( tvb, offset, data_len ) );
 
 	tc = proto_tree_add_string( parent_tree, hf_aprs_weather_idx, tvb, offset, data_len, info_buffer );
@@ -1065,7 +1065,7 @@ aprs_latitude_compressed( proto_tree *aprs_tree, tvbuff_t *tvb, int offset )
 		char *info_buffer;
 		int   temp;
 
-		info_buffer = (char *)ep_alloc( STRLEN );
+		info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN );
 
 		temp = ( tvb_get_guint8( tvb, offset + 0 ) - 33 );
 		temp = ( tvb_get_guint8( tvb, offset + 1 ) - 33 ) + ( temp * 91 );
@@ -1086,7 +1086,7 @@ aprs_longitude_compressed( proto_tree *aprs_tree, tvbuff_t *tvb, int offset )
 		char *info_buffer;
 		int   temp;
 
-		info_buffer = (char *)ep_alloc( STRLEN );
+		info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN );
 
 		temp = ( tvb_get_guint8( tvb, offset + 0 ) - 33 );
 		temp = ( tvb_get_guint8( tvb, offset + 1 ) - 33 ) + ( temp * 91 );
@@ -1299,7 +1299,7 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *
 	int	       offset;
 	guint8	       dti;
 	const guint8  *bufp;
-	emem_strbuf_t *sb;
+	wmem_strbuf_t *sb;
 
 	col_set_str( pinfo->cinfo, COL_PROTOCOL, "APRS" );
 	col_clear( pinfo->cinfo, COL_INFO );
@@ -1308,10 +1308,10 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *
 
 	dti	 = tvb_get_guint8( tvb, offset );
 
-	sb = ep_strbuf_new_label(NULL);
+	sb = wmem_strbuf_new_label(wmem_packet_scope());
 
 	if (dti != '!')
-		ep_strbuf_append(sb, val_to_str_ext_const(dti, &aprs_description_ext, ""));;
+		wmem_strbuf_append(sb, val_to_str_ext_const(dti, &aprs_description_ext, ""));;
 
 	switch ( dti )
 		{
@@ -1319,14 +1319,14 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *
 			/* Position or Ultimeter 2000 WX Station */
 			if ( tvb_get_guint8( tvb, offset + 1 ) == '!' )
 				{
-				ep_strbuf_append( sb, "Ultimeter 2000 WX Station");
+				wmem_strbuf_append(sb, "Ultimeter 2000 WX Station");
 				}
 			else
 				{
 				/* Position "without APRS messaging" */
-				ep_strbuf_append( sb, "Position");
+				wmem_strbuf_append(sb, "Position");
 				bufp = tvb_get_ptr(tvb, offset + 1, 8 + 9 + 1 + 1);
-				ep_strbuf_append_printf(sb, " (%8.8s %9.9s %1.1s%1.1s)",
+				wmem_strbuf_append_printf(sb, " (%8.8s %9.9s %1.1s%1.1s)",
 						bufp,			/* Lat */
 						bufp + 8 + 1,		/* Long */
 						bufp + 8,		/* Symbol table id */
@@ -1338,7 +1338,7 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *
 		case '=':
 			/* Position "with APRS messaging" + Ext APRS message */
 			bufp = tvb_get_ptr(tvb, offset + 1, 8 + 9 + 1 + 1);
-			ep_strbuf_append_printf(sb, " (%8.8s %9.9s %1.1s%1.1s)",
+			wmem_strbuf_append_printf(sb, " (%8.8s %9.9s %1.1s%1.1s)",
 				bufp,			/* Lat */
 				bufp + 8 + 1,		/* Long */
 				bufp + 8 ,		/* Symbol table id */
@@ -1349,7 +1349,7 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *
 		case '/':
 			/* Position + timestamp "without APRS messaging" */
 			bufp = tvb_get_ptr(tvb, offset + 1, 7 + 8 + 9 + 1 + 1);
-			ep_strbuf_append_printf(sb, " (%7.7s %8.8s %9.9s %1.1s%1.1s)",
+			wmem_strbuf_append_printf(sb, " (%7.7s %8.8s %9.9s %1.1s%1.1s)",
 				bufp,			/* Timestamp */
 				bufp + 7 + 1,	/*??*/	/* Lat */
 				bufp + 7 + 8 + 1,	/* Long */
@@ -1361,7 +1361,7 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *
 		case '@':
 			/* Position + timestamp "with APRS messaging" + Ext APRS message */
 			bufp = tvb_get_ptr(tvb, offset + 1, 7 + 8 + 9 + 1 + 1);
-			ep_strbuf_append_printf(sb, " (%7.7s %8.8s %9.9s %1.1s%1.1s)",
+			wmem_strbuf_append_printf(sb, " (%7.7s %8.8s %9.9s %1.1s%1.1s)",
 				bufp,			/* Timestamp */
 				bufp + 7 + 1,	/*??*/	/* Lat */
 				bufp + 7 + 8 + 1,	/* Long */
@@ -1371,10 +1371,10 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *
 			break;
 		}
 
-	col_add_str( pinfo->cinfo, COL_INFO, sb->str );
+	col_add_str( pinfo->cinfo, COL_INFO, wmem_strbuf_get_str(sb) );
 
 	/* create display subtree for the protocol */
-	ti = proto_tree_add_protocol_format( parent_tree , proto_aprs, tvb, 0, -1, "%s", sb->str );
+	ti = proto_tree_add_protocol_format( parent_tree , proto_aprs, tvb, 0, -1, "%s", wmem_strbuf_get_str(sb) );
 	aprs_tree = proto_item_add_subtree( ti, ett_aprs );
 
 	proto_tree_add_item( aprs_tree, hf_aprs_dti, tvb, offset, 1, ENC_ASCII|ENC_NA );
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index 74c887a546..c445beaa62 100644
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.c
@@ -28,7 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 void proto_register_armagetronad(void);
 void proto_reg_handoff_armagetronad(void);
@@ -153,7 +153,7 @@ add_message_data(tvbuff_t * tvb, gint offset, gint data_len, proto_tree * tree)
 	if (!tree)
 		return;
 
-	data = (gchar *)tvb_memcpy(tvb, ep_alloc(data_len + 1), offset, data_len);
+	data = (gchar *)tvb_memcpy(tvb, wmem_alloc(wmem_packet_scope(), data_len + 1), offset, data_len);
 	data[data_len] = '\0';
 
 	for (i = 0; i < data_len; i += 2) {
@@ -179,7 +179,7 @@ add_message_data(tvbuff_t * tvb, gint offset, gint data_len, proto_tree * tree)
 }
 
 static gint
-add_message(tvbuff_t * tvb, gint offset, proto_tree * tree, emem_strbuf_t * info)
+add_message(tvbuff_t * tvb, gint offset, proto_tree * tree, wmem_strbuf_t * info)
 {
 	guint16 descriptor_id, message_id;
 	gint data_len;
@@ -212,7 +212,7 @@ add_message(tvbuff_t * tvb, gint offset, proto_tree * tree, emem_strbuf_t * info
 	proto_tree_add_item(msg_tree, hf_armagetronad_descriptor_id, tvb,
 			    offset, 2, ENC_BIG_ENDIAN);
 	if (info)
-		ep_strbuf_append_printf(info, "%s, ", descriptor);
+		wmem_strbuf_append_printf(info, "%s, ", descriptor);
 
 	/* MessageID field */
 	proto_tree_add_item(msg_tree, hf_armagetronad_message_id, tvb,
@@ -236,13 +236,13 @@ dissect_armagetronad(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, voi
 	proto_tree *armagetronad_tree;
 	guint16 sender;
 	gint offset = 0;
-	emem_strbuf_t *info;
+	wmem_strbuf_t *info;
 	gsize new_len;
 
 	if (!is_armagetronad_packet(tvb))
 		return 0;
 
-	info = ep_strbuf_new("");
+	info = wmem_strbuf_new(wmem_packet_scope(), "");
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "Armagetronad");
 
@@ -260,14 +260,14 @@ dissect_armagetronad(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, voi
 	proto_tree_add_item(ti, hf_armagetronad_sender_id, tvb, offset, 2,
 			    ENC_BIG_ENDIAN);
 
-	new_len = info->len - 2;	/* Remove the trailing ", " */
+	new_len = wmem_strbuf_get_len(info) - 2;	/* Remove the trailing ", " */
 	if (new_len > 0)
-		info = ep_strbuf_truncate(info, new_len);
+		wmem_strbuf_truncate(info, new_len);
 	else
-		info = ep_strbuf_new("No message");
+		info = wmem_strbuf_new(wmem_packet_scope(), "No message");
 
 	col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] from 0x%04x",
-		     info->str, sender);
+		     wmem_strbuf_get_str(info), sender);
 
 	return offset + 2;
 }
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 9b03cd67c5..5dd9a0b5a1 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -40,7 +40,7 @@
 
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 #include "packet-atalk.h"
 #include "packet-afp.h"
@@ -820,10 +820,10 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
          we have both a request for 1 packet and a request for n packets,
          hopefully most of the time ATP_EOM will be set in the last packet.
       */
-      new_request_key = se_new(asp_request_key);
+      new_request_key = wmem_new(wmem_file_scope(), asp_request_key);
       *new_request_key = request_key;
 
-      request_val = se_new(asp_request_val);
+      request_val = wmem_new(wmem_file_scope(), asp_request_val);
       request_val->value = nbe;
 
       g_hash_table_insert(atp_request_hash, new_request_key,request_val);
@@ -1293,10 +1293,10 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo)
   request_val = (asp_request_val *) g_hash_table_lookup(asp_request_hash, &request_key);
   if (!request_val && !aspinfo->reply )  {
     fn = tvb_get_guint8(tvb, 0);
-    new_request_key = se_new(asp_request_key);
+    new_request_key = wmem_new(wmem_file_scope(), asp_request_key);
     *new_request_key = request_key;
 
-    request_val = se_new(asp_request_val);
+    request_val = wmem_new(wmem_file_scope(), asp_request_val);
     request_val->value = fn;
 
     g_hash_table_insert(asp_request_hash, new_request_key, request_val);
diff --git a/epan/dissectors/packet-ax25-kiss.c b/epan/dissectors/packet-ax25-kiss.c
index 50b97fcce5..98d95f19f5 100644
--- a/epan/dissectors/packet-ax25-kiss.c
+++ b/epan/dissectors/packet-ax25-kiss.c
@@ -106,7 +106,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 #include "packet-ax25-kiss.h"
 #include "packet-ax25.h"
@@ -209,7 +209,7 @@ dissect_ax25_kiss( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
 	void       *saved_private_data;
 	tvbuff_t   *next_tvb = NULL;
 
-	info_buffer    = (char *)ep_alloc( STRLEN );
+	info_buffer    = (char *)wmem_alloc( wmem_packet_scope(), STRLEN );
 	info_buffer[0] = '\0';
 
 	col_set_str( pinfo->cinfo, COL_PROTOCOL, "AX.25 KISS" );
diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c
index e7351be53a..68f277d1dc 100644
--- a/epan/dissectors/packet-ax25-nol3.c
+++ b/epan/dissectors/packet-ax25-nol3.c
@@ -52,7 +52,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 #include <epan/ax25_pids.h>
 
 #define STRLEN	80
@@ -163,7 +163,7 @@ dissect_ax25_nol3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
 	guint8      dti      = 0;
 	gboolean    dissected;
 
-	info_buffer = (char *)ep_alloc( STRLEN );
+	info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN );
 	info_buffer[0] = '\0';
 
 	col_set_str( pinfo->cinfo, COL_PROTOCOL, "AX.25-NoL3");
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c
index 25f1867eaf..b1e41ee302 100644
--- a/epan/dissectors/packet-ax25.c
+++ b/epan/dissectors/packet-ax25.c
@@ -49,7 +49,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 #include <epan/xdlc.h>
 #include <epan/ax25_pids.h>
 #include <epan/ipproto.h>
@@ -152,7 +152,7 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
 	tvbuff_t *next_tvb = NULL;
 
 
-	info_buffer = (char *)ep_alloc( STRLEN );
+	info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN );
 	info_buffer[0] = '\0';
 
 	col_set_str( pinfo->cinfo, COL_PROTOCOL, "AX.25" );