diff options
| author | Evan Huus <eapache@gmail.com> | 2012-12-08 21:22:46 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-12-08 21:22:46 +0000 |
| commit | 7b979a26bb90543e1be1f4814d61d0f412ab90ba (patch) | |
| tree | b16df04c3c7c972bc2a8ff5dedcdd53120ab82ac /epan | |
| parent | dc530fd2c2b614457f23a55a9e46642bef8774be (diff) | |
Convert the SMTP dissector and the frame_data manager from emem to wmem.
Canaries in the coal mine, since I have a capture handy that I know excercises
both code paths.
svn path=/trunk/; revision=46470
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-smtp.c | 6 | ||||
| -rw-r--r-- | epan/frame_data.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index a9c0181e83..125b972ccf 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -38,7 +38,7 @@ #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/strutil.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include <epan/base64.h> #include <epan/dissectors/packet-ssl.h> @@ -336,7 +336,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * No - create one and attach it. */ - session_state = se_alloc(sizeof(struct smtp_session_state)); + session_state = wmem_alloc(wmem_file_scope(), sizeof(struct smtp_session_state)); session_state->smtp_state = SMTP_STATE_READING_CMDS; session_state->auth_state = SMTP_AUTH_STATE_NONE; session_state->first_auth_frame = 0; @@ -394,7 +394,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Create a frame data structure and attach it to the packet. */ - spd_frame_data = se_alloc0(sizeof(struct smtp_proto_data)); + spd_frame_data = wmem_alloc0(wmem_file_scope(), sizeof(struct smtp_proto_data)); spd_frame_data->conversation_id = conversation->index; spd_frame_data->more_frags = TRUE; diff --git a/epan/frame_data.c b/epan/frame_data.c index 077ff810be..66e8effe50 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -30,7 +30,7 @@ #include <wiretap/wtap.h> #include <epan/frame_data.h> #include <epan/packet.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/timestamp.h> @@ -62,7 +62,7 @@ p_compare(gconstpointer a, gconstpointer b) void p_add_proto_data(frame_data *fd, int proto, void *proto_data) { - frame_proto_data *p1 = se_alloc(sizeof(frame_proto_data)); + frame_proto_data *p1 = wmem_alloc(wmem_file_scope(), sizeof(frame_proto_data)); p1->proto = proto; p1->proto_data = proto_data; |