osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Evan Huus 2012-12-08 21:22:46 +00:00
parent dc530fd2c2
commit 7b979a26bb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-smtp.c
View File

@ -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;

4
epan/frame_data.c
View File

@ -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;