diff options
| author | Evan Huus <eapache@gmail.com> | 2013-08-31 14:32:01 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-08-31 14:32:01 +0000 |
| commit | 58804a6f158ce39f1944b172486d6e8316ea0953 (patch) | |
| tree | 6fd7818cb055bb987d73853173d1b583fdaa4cef /epan/dissectors/packet-pana.c | |
| parent | dba0ceff0ea3de83bb333678f9568ba02cb07fe1 (diff) | |
Convert another 10 dissectors to wmem.
svn path=/trunk/; revision=51612
Diffstat (limited to 'epan/dissectors/packet-pana.c')
| -rw-r--r-- | epan/dissectors/packet-pana.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 0504c9043b..d759df60cb 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -34,7 +34,7 @@ #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #if 0 #define PANA_UDP_PORT 3001 @@ -207,7 +207,7 @@ typedef struct _pana_transaction_t { } pana_transaction_t; typedef struct _pana_conv_info_t { - emem_tree_t *pdus; + wmem_tree_t *pdus; } pana_conv_info_t; static void @@ -544,8 +544,8 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* No. Attach that information to the conversation, and add * it to the list of information structures. */ - pana_info = se_new(pana_conv_info_t); - pana_info->pdus=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "pana_pdus"); + pana_info = wmem_new(wmem_file_scope(), pana_conv_info_t); + pana_info->pdus=wmem_tree_new(wmem_file_scope()); conversation_add_proto_data(conversation, proto_pana, pana_info); } @@ -553,24 +553,24 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(!pinfo->fd->flags.visited){ if(flags&PANA_FLAG_R){ /* This is a request */ - pana_trans=se_new(pana_transaction_t); + pana_trans=wmem_new(wmem_file_scope(), pana_transaction_t); pana_trans->req_frame=pinfo->fd->num; pana_trans->rep_frame=0; pana_trans->req_time=pinfo->fd->abs_ts; - se_tree_insert32(pana_info->pdus, seq_num, (void *)pana_trans); + wmem_tree_insert32(pana_info->pdus, seq_num, (void *)pana_trans); } else { - pana_trans=(pana_transaction_t *)se_tree_lookup32(pana_info->pdus, seq_num); + pana_trans=(pana_transaction_t *)wmem_tree_lookup32(pana_info->pdus, seq_num); if(pana_trans){ pana_trans->rep_frame=pinfo->fd->num; } } } else { - pana_trans=(pana_transaction_t *)se_tree_lookup32(pana_info->pdus, seq_num); + pana_trans=(pana_transaction_t *)wmem_tree_lookup32(pana_info->pdus, seq_num); } if(!pana_trans){ /* create a "fake" pana_trans structure */ - pana_trans=ep_new(pana_transaction_t); + pana_trans=wmem_new(wmem_packet_scope(), pana_transaction_t); pana_trans->req_frame=0; pana_trans->rep_frame=0; pana_trans->req_time=pinfo->fd->abs_ts; |