aboutsummaryrefslogtreecommitdiffstats
path: root/epan/stream.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/stream.c
parentb2c45864f9c517f1776240792ee05f5ecc80f984 (diff)
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/stream.c')
-rw-r--r--epan/stream.c14
1 files changed, 7 insertions, 7 deletions
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 )
{