diff options
| author | Evan Huus <eapache@gmail.com> | 2013-09-01 01:00:11 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-09-01 01:00:11 +0000 |
| commit | 7dbc052d782ae6e186262e7db68e2e90b5a3cc9b (patch) | |
| tree | 9fee92c6698baa398909c4abc553691474ffcea6 /epan/dissectors/packet-stun.c | |
| parent | 74b205bc84bd77d94be8f5cade866298f493fb0b (diff) | |
More dissectors to wmem. There are no more dissectors using se_tree now, just a
few other places.
svn path=/trunk/; revision=51622
Diffstat (limited to 'epan/dissectors/packet-stun.c')
| -rw-r--r-- | epan/dissectors/packet-stun.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index a78b830081..29d65698f8 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -42,6 +42,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/ipproto.h> +#include <epan/wmem/wmem.h> #include <packet-tcp.h> #include <packet-udp.h> @@ -119,7 +120,7 @@ typedef struct _stun_transaction_t { /* Structure containing conversation specific information */ typedef struct _stun_conv_info_t { - emem_tree_t *transaction_pdus; + wmem_tree_t *transaction_pdus; } stun_conv_info_t; @@ -410,7 +411,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole conversation_t *conversation=NULL; stun_conv_info_t *stun_info; stun_transaction_t *stun_trans; - emem_tree_key_t transaction_id_key[2]; + wmem_tree_key_t transaction_id_key[2]; guint32 transaction_id[3]; /* @@ -481,14 +482,14 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole /* No. Attach that information to the conversation, and add * it to the list of information structures. */ - stun_info = se_new(stun_conv_info_t); - stun_info->transaction_pdus=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "stun_transaction_pdus"); + stun_info = wmem_new(wmem_file_scope(), stun_conv_info_t); + stun_info->transaction_pdus=wmem_tree_new(wmem_file_scope()); conversation_add_proto_data(conversation, proto_stun, stun_info); } if (!pinfo->fd->flags.visited) { if ((stun_trans = (stun_transaction_t *) - se_tree_lookup32_array(stun_info->transaction_pdus, + wmem_tree_lookup32_array(stun_info->transaction_pdus, transaction_id_key)) == NULL) { transaction_id_key[0].length = 3; @@ -496,11 +497,11 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole transaction_id_key[1].length = 0; transaction_id_key[1].key = NULL; - stun_trans=se_new(stun_transaction_t); + stun_trans=wmem_new(wmem_file_scope(), stun_transaction_t); stun_trans->req_frame=0; stun_trans->rep_frame=0; stun_trans->req_time=pinfo->fd->abs_ts; - se_tree_insert32_array(stun_info->transaction_pdus, + wmem_tree_insert32_array(stun_info->transaction_pdus, transaction_id_key, (void *)stun_trans); } @@ -519,13 +520,13 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole } } else { - stun_trans=(stun_transaction_t *)se_tree_lookup32_array(stun_info->transaction_pdus, + stun_trans=(stun_transaction_t *)wmem_tree_lookup32_array(stun_info->transaction_pdus, transaction_id_key); } if (!stun_trans) { /* create a "fake" pana_trans structure */ - stun_trans=ep_new(stun_transaction_t); + stun_trans=wmem_new(wmem_packet_scope(), stun_transaction_t); stun_trans->req_frame=0; stun_trans->rep_frame=0; stun_trans->req_time=pinfo->fd->abs_ts; |