summaryrefslogtreecommitdiff
path: root/epan/circuit.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-16 08:29:57 -0500
committerAnders Broman <a.broman58@gmail.com>2015-01-16 15:22:27 +0000
commit260b19e98d02b92afe9a1d361fa6f98b3a63efb4 (patch)
tree07571c9701e4184636283454e15cb50a97a9e092 /epan/circuit.c
parentb2c45864f9c517f1776240792ee05f5ecc80f984 (diff)
downloadwireshark-260b19e98d02b92afe9a1d361fa6f98b3a63efb4.tar.gz
Remove seasonal memory from everything except address resolutions
This includes circuits, conversations and streams as well as camel and h225 dissectors. Change-Id: Ia5ee70a5e5c6bcb420f0f19df126595246a3c042 Reviewed-on: https://code.wireshark.org/review/6566 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/circuit.c')
-rw-r--r--epan/circuit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/circuit.c b/epan/circuit.c
index 0991c8ea98..80b73f791c 100644
--- a/epan/circuit.c
+++ b/epan/circuit.c
@@ -113,11 +113,11 @@ circuit_new(circuit_type ctype, guint32 circuit_id, guint32 first_frame)
circuit_t *circuit, *old_circuit;
circuit_key *new_key;
- new_key = se_new(struct circuit_key);
+ new_key = wmem_new(wmem_file_scope(), struct circuit_key);
new_key->ctype = ctype;
new_key->circuit_id = circuit_id;
- circuit = se_new(circuit_t);
+ circuit = wmem_new(wmem_file_scope(), circuit_t);
circuit->next = NULL;
circuit->first_frame = first_frame;
circuit->last_frame = 0; /* not known yet */
@@ -225,7 +225,7 @@ p_compare(gconstpointer a, gconstpointer b)
void
circuit_add_proto_data(circuit_t *conv, int proto, void *proto_data)
{
- circuit_proto_data *p1 = se_new(circuit_proto_data);
+ circuit_proto_data *p1 = wmem_new(wmem_file_scope(), circuit_proto_data);
p1->proto = proto;
p1->proto_data = proto_data;