aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-3com-njack.c1
-rw-r--r--epan/dissectors/packet-aarp.c4
-rw-r--r--epan/dissectors/packet-actrace.c30
-rw-r--r--epan/dissectors/packet-adwin.c32
-rw-r--r--epan/dissectors/packet-ssl-utils.h1
5 files changed, 33 insertions, 35 deletions
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 37c25f3ba3..9cc06bbb97 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -56,7 +56,6 @@ Specs:
#include <glib.h>
#include <epan/packet.h>
-#include <epan/emem.h>
/* Forward declarations */
void proto_register_njack(void);
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index bdb98efefd..214e97a141 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -28,7 +28,7 @@
#include <epan/packet.h>
#include <epan/strutil.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#include <epan/etypes.h>
/* Forward declarations */
@@ -109,7 +109,7 @@ tvb_atalkid_to_str(tvbuff_t *tvb, gint offset)
gint node;
gchar *cur;
- cur=(gchar *)ep_alloc(16);
+ cur=(gchar *)wmem_alloc(wmem_packet_scope(), 16);
node=tvb_get_guint8(tvb, offset)<<8|tvb_get_guint8(tvb, offset+1);
g_snprintf(cur, 16, "%d.%d",node,tvb_get_guint8(tvb, offset+2));
return cur;
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index ec61715ab7..c3e68feb24 100644
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.c
@@ -30,7 +30,7 @@
#include <epan/prefs.h>
#include <epan/tap.h>
#include "packet-actrace.h"
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#define UDP_PORT_ACTRACE 2428
#define NOT_ACTRACE 0
@@ -602,42 +602,42 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a
if (source == ACTRACE_CAS_SOURCE_DSP) {
direction = 1;
if ( (event >= ACTRACE_CAS_EV_11) && (event <= ACTRACE_CAS_EV_00 ) ) {
- frame_label = ep_strdup_printf("AB: %s", val_to_str_const(event, actrace_cas_event_ab_vals, "ERROR") );
+ frame_label = wmem_strdup_printf(wmem_packet_scope(), "AB: %s", val_to_str_const(event, actrace_cas_event_ab_vals, "ERROR") );
} else if ( (event >= 32) && (event <= 46 ) ) { /* is an MF tone */
- frame_label = ep_strdup_printf("MF: %s", val_to_str_ext_const(event, &actrace_cas_mf_vals_ext, "ERROR") );
+ frame_label = wmem_strdup_printf(wmem_packet_scope(), "MF: %s", val_to_str_ext_const(event, &actrace_cas_mf_vals_ext, "ERROR") );
} else if ( (event == ACTRACE_CAS_EV_DTMF ) || (event == ACTRACE_CAS_EV_FIRST_DIGIT ) ) { /* DTMF digit */
- frame_label = ep_strdup_printf("DTMF: %u", par0 );
+ frame_label = wmem_strdup_printf(wmem_packet_scope(), "DTMF: %u", par0 );
}
} else if (source == ACTRACE_CAS_SOURCE_TABLE) {
direction = 0;
if (function == SEND_MF) {
if (par0 == SEND_TYPE_SPECIFIC ) {
- frame_label = ep_strdup_printf("MF: %u", par1);
+ frame_label = wmem_strdup_printf(wmem_packet_scope(), "MF: %u", par1);
} else if (par0 == SEND_TYPE_ADDRESS ) {
- frame_label = ep_strdup("MF: DNIS digit");
+ frame_label = wmem_strdup(wmem_packet_scope(), "MF: DNIS digit");
} else if (par0 == SEND_TYPE_ANI ) {
- frame_label = ep_strdup("MF: ANI digit");
+ frame_label = wmem_strdup(wmem_packet_scope(), "MF: ANI digit");
} else if (par0 == SEND_TYPE_SOURCE_CATEGORY ) {
- frame_label = ep_strdup("MF: src_category");
+ frame_label = wmem_strdup(wmem_packet_scope(), "MF: src_category");
} else if (par0 == SEND_TYPE_TRANSFER_CAPABILITY ) {
- frame_label = ep_strdup("MF: trf_capability");
+ frame_label = wmem_strdup(wmem_packet_scope(), "MF: trf_capability");
} else if (par0 == SEND_TYPE_INTER_EXCHANGE_SWITCH ) {
- frame_label = ep_strdup("MF: inter_exch_sw");
+ frame_label = wmem_strdup(wmem_packet_scope(), "MF: inter_exch_sw");
}
} else if (function == SEND_CAS) {
- frame_label = ep_strdup_printf("AB: %s", val_to_str_const(ACTRACE_CAS_EV_00-par0, actrace_cas_event_ab_vals, "ERROR"));
+ frame_label = wmem_strdup_printf(wmem_packet_scope(), "AB: %s", val_to_str_const(ACTRACE_CAS_EV_00-par0, actrace_cas_event_ab_vals, "ERROR"));
} else if (function == SEND_DEST_NUM) {
if (par0 == SEND_TYPE_ADDRESS ) {
- frame_label = ep_strdup("DTMF/MF: sending DNIS");
+ frame_label = wmem_strdup(wmem_packet_scope(), "DTMF/MF: sending DNIS");
} else if (par0 == SEND_TYPE_ANI ) {
- frame_label = ep_strdup("DTMF/MF: sending ANI");
+ frame_label = wmem_strdup(wmem_packet_scope(), "DTMF/MF: sending ANI");
}
}
}
if (frame_label != NULL) {
/* Initialise packet info for passing to tap */
- actrace_pi = ep_new(actrace_info_t);
+ actrace_pi = wmem_new(wmem_packet_scope(), actrace_info_t);
actrace_pi->type = ACTRACE_CAS;
actrace_pi->direction = direction;
@@ -675,7 +675,7 @@ static void dissect_actrace_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
/* if it is a q931 packet (we don't want LAPD packets for Voip Graph) add tap info */
if (len > 4) {
/* Initialise packet info for passing to tap */
- actrace_pi = ep_new(actrace_info_t);
+ actrace_pi = wmem_new(wmem_packet_scope(), actrace_info_t);
actrace_pi->type = ACTRACE_ISDN;
actrace_pi->direction = (value==PSTN_TO_BLADE?1:0);
diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index 3983890260..2618412ff3 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -30,7 +30,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/conversation.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
/* Forward declarations */
void proto_register_adwin(void);
@@ -575,7 +575,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
}
if (!adwin_trans) {
/* create a "fake" adwin_trans structure */
- adwin_trans = ep_new(adwin_transaction_t);
+ adwin_trans = wmem_new(wmem_packet_scope(), adwin_transaction_t);
adwin_trans->req_frame = 0;
adwin_trans->rep_frame = 0;
adwin_trans->req_time = pinfo->fd->abs_ts;
@@ -615,14 +615,14 @@ dissect_UDPH1_generic(tvbuff_t *tvb, packet_info *pinfo,
guint32 i3plus1code = 0, instructionID, seq_num;
instructionID = tvb_get_letohl(tvb, 0);
- *info_string = ep_strdup_printf("%s: %s", packet_name,
+ *info_string = wmem_strdup_printf(wmem_packet_scope(), "%s: %s", packet_name,
val_to_str_ext(instructionID, &instruction_mapping_ext, "unknown instruction: %d"));
if (instructionID == I_3PLUS1) {
gchar *tmp = *info_string;
i3plus1code = tvb_get_letohl(tvb, 20);
- *info_string = ep_strdup_printf("%s: %s", tmp, val_to_str_ext(i3plus1code, &instruction_3plus1_mapping_ext, "unknown 3+1 code: %d"));
+ *info_string = wmem_strdup_printf(wmem_packet_scope(), "%s: %s", tmp, val_to_str_ext(i3plus1code, &instruction_3plus1_mapping_ext, "unknown 3+1 code: %d"));
}
/* Get the transaction identifier */
@@ -795,7 +795,7 @@ dissect_UDPH1_new(tvbuff_t *tvb, packet_info *pinfo,
SET_PACKET_TYPE(adwin_tree, APT_UDPH1_new);
dll_i = tvb_get_letohl(tvb, 52);
- dll_version_s = ep_strdup_printf("%d.%d.%d",
+ dll_version_s = wmem_strdup_printf(wmem_packet_scope(), "%d.%d.%d",
dll_i / 1000000,
(dll_i - dll_i / 1000000 * 1000000) / 1000,
dll_i % 1000);
@@ -815,9 +815,9 @@ dissect_UDPR1(tvbuff_t *tvb, packet_info *pinfo,
status = tvb_get_letohl(tvb, 0);
status_string = try_val_to_str_ext(status, &error_code_mapping_ext);
if (status_string) {
- *info_string = ep_strdup_printf("UDPR1 Status: %s", status_string);
+ *info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR1 Status: %s", status_string);
} else {
- *info_string = ep_strdup_printf("UDPR1 Undefined error code %d", status);
+ *info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR1 Undefined error code %d", status);
}
/* Get the transaction identifier */
@@ -849,9 +849,9 @@ dissect_UDPR2(tvbuff_t *tvb, packet_info *pinfo,
status = tvb_get_letohl(tvb, 0);
status_string = try_val_to_str_ext(status, &error_code_mapping_ext);
if (status_string) {
- *info_string = ep_strdup_printf("UDPR2 Status: %s", status_string);
+ *info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR2 Status: %s", status_string);
} else {
- *info_string = ep_strdup_printf("UDPR2 Undefined error code %d", status);
+ *info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR2 Undefined error code %d", status);
}
/* Get the transaction identifier */
@@ -936,9 +936,9 @@ dissect_UDPR4(tvbuff_t *tvb, packet_info *pinfo,
status = tvb_get_letohl(tvb, 0);
status_string = try_val_to_str_ext(status, &error_code_mapping_ext);
if (status_string) {
- *info_string = ep_strdup_printf("UDPR4 Status: %s", status_string);
+ *info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR4 Status: %s", status_string);
} else {
- *info_string = ep_strdup_printf("UDPR4 Undefined error code %d", status);
+ *info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR4 Undefined error code %d", status);
}
/* Get the transaction identifier */
@@ -1138,28 +1138,28 @@ dissect_adwin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U
case UDPH2_LENGTH: /* to the best of my knowledge, this struct
* has never been used publically! */
/* dissect_UDPH2(tvb, pinfo, adwin_tree, adwin_debug_tree); */
- info_string = ep_strdup("UDPH2 - UNUSED");
+ info_string = wmem_strdup(wmem_packet_scope(), "UDPH2 - UNUSED");
break;
case UDPR2_LENGTH:
dissect_UDPR2(tvb, pinfo, adwin_tree, adwin_debug_tree, &info_string);
break;
case UDPR3_LENGTH:
dissect_UDPR3(tvb, pinfo, adwin_tree, adwin_debug_tree);
- info_string = ep_strdup("UDPR3");
+ info_string = wmem_strdup(wmem_packet_scope(), "UDPR3");
break;
case UDPR4_LENGTH:
dissect_UDPR4(tvb, pinfo, adwin_tree, adwin_debug_tree, &info_string);
break;
case GetDataSHPacket_LENGTH:
dissect_GDSHP(tvb, pinfo, adwin_tree, adwin_debug_tree);
- info_string = ep_strdup("GDSHP");
+ info_string = wmem_strdup(wmem_packet_scope(), "GDSHP");
break;
case GetDataSHRequest_LENGTH:
dissect_GDSHR(tvb, pinfo, adwin_tree, adwin_debug_tree);
- info_string = ep_strdup("GDSHR");
+ info_string = wmem_strdup(wmem_packet_scope(), "GDSHR");
break;
default:
- info_string = ep_strdup_printf("Unknown ADwin packet, length: %d", length);
+ info_string = wmem_strdup_printf(wmem_packet_scope(), "Unknown ADwin packet, length: %d", length);
break;
}
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index c0500c0755..c98e630b66 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -30,7 +30,6 @@
#include <glib.h>
#include <epan/packet.h>
-#include <epan/emem.h>
#ifdef HAVE_LIBGNUTLS
#include <wsutil/wsgcrypt.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 01:38:08 +0000