From 260b19e98d02b92afe9a1d361fa6f98b3a63efb4 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Fri, 16 Jan 2015 08:29:57 -0500 Subject: 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 Reviewed-by: Anders Broman --- epan/stream.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'epan/stream.c') diff --git a/epan/stream.c b/epan/stream.c index 7bf3e3fb48..eca4f917d1 100644 --- a/epan/stream.c +++ b/epan/stream.c @@ -155,7 +155,7 @@ static stream_t *new_stream( stream_key_t *key ) { stream_t *val; - val = se_new(stream_t); + val = wmem_new(wmem_file_scope(), stream_t); val -> key = key; val -> pdu_counter = 0; val -> current_pdu = NULL; @@ -172,7 +172,7 @@ static stream_t *stream_hash_insert_circ( const struct circuit *circuit, int p2p { stream_key_t *key; - key = se_new(stream_key_t); + key = wmem_new(wmem_file_scope(), stream_key_t); key->is_circuit = TRUE; key->circ.circuit = circuit; key->p2p_dir = p2p_dir; @@ -184,7 +184,7 @@ static stream_t *stream_hash_insert_conv( const struct conversation *conv, int p { stream_key_t *key; - key = se_new(stream_key_t); + key = wmem_new(wmem_file_scope(), stream_key_t); key->is_circuit = FALSE; key->circ.conv = conv; key->p2p_dir = p2p_dir; @@ -215,7 +215,7 @@ static void stream_init_pdu_data(void) static stream_pdu_t *stream_new_pdu(stream_t *stream) { stream_pdu_t *pdu; - pdu = se_new(stream_pdu_t); + pdu = wmem_new(wmem_file_scope(), stream_pdu_t); pdu -> fd_head = NULL; pdu -> pdu_number = stream -> pdu_counter++; pdu -> id = pdu_counter++; @@ -295,12 +295,12 @@ static stream_pdu_fragment_t *fragment_hash_insert( const stream_t *stream, guin fragment_key_t *key; stream_pdu_fragment_t *val; - key = se_new(fragment_key_t); + key = wmem_new(wmem_file_scope(), fragment_key_t); key->stream = stream; key->framenum = framenum; key->offset = offset; - val = se_new(stream_pdu_fragment_t); + val = wmem_new(wmem_file_scope(), stream_pdu_fragment_t); val->len = length; val->pdu = NULL; val->final_fragment = FALSE; @@ -360,7 +360,7 @@ stream_t *find_stream_conv ( const struct conversation *conv, int p2p_dir ) /* cleanup the stream routines */ /* Note: stream_cleanup must only be called when seasonal memory * is also freed since the hash tables countain pointers to - * se_alloc'd memory. + * wmem_file_scoped memory. */ void stream_cleanup( void ) { -- cgit v1.2.3