osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

gmemchunk -> se_alloc() improvements 

svn path=/trunk/; revision=15327
This commit is contained in:
Ronnie Sahlberg 2005-08-13 00:03:12 +00:00
parent 05dbe84db8
commit 00f05d8892
2 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
epan/dissectors/packet-afp.c
View File

@ -38,6 +38,7 @@
#include <epan/packet.h>
/* #include <epan/strutil.h> */
#include <epan/conversation.h>
#include <epan/emem.h>
#include "packet-afp.h"
@ -950,8 +951,6 @@ static int hf_afp_acl_access_bitmap_generic_read = -1;
static gint afp_equal (gconstpointer v, gconstpointer v2);
static guint afp_hash (gconstpointer v);
static guint afp_packet_init_count = 200;
typedef struct {
guint32 conversation;
guint16 seq;
@ -962,8 +961,6 @@ typedef struct {
} afp_request_val;
static GHashTable *afp_request_hash = NULL;
static GMemChunk *afp_request_keys = NULL;
static GMemChunk *afp_request_vals = NULL;
static guint Vol; /* volume */
static guint Did; /* parent directory ID */
@ -4036,10 +4033,10 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (!request_val && !aspinfo->reply) {
afp_command = tvb_get_guint8(tvb, offset);
new_request_key = g_mem_chunk_alloc(afp_request_keys);
new_request_key = se_alloc(sizeof(afp_request_key));
*new_request_key = request_key;
request_val = g_mem_chunk_alloc(afp_request_vals);
request_val = se_alloc(sizeof(afp_request_val));
request_val->command = tvb_get_guint8(tvb, offset);
g_hash_table_insert(afp_request_hash, new_request_key,
@ -4300,22 +4297,9 @@ static void afp_reinit( void)
if (afp_request_hash)
g_hash_table_destroy(afp_request_hash);
if (afp_request_keys)
g_mem_chunk_destroy(afp_request_keys);
if (afp_request_vals)
g_mem_chunk_destroy(afp_request_vals);
afp_request_hash = g_hash_table_new(afp_hash, afp_equal);
afp_request_keys = g_mem_chunk_new("afp_request_keys",
sizeof(afp_request_key),
afp_packet_init_count * sizeof(afp_request_key),
G_ALLOC_AND_FREE);
afp_request_vals = g_mem_chunk_new("afp_request_vals",
sizeof(afp_request_val),
afp_packet_init_count * sizeof(afp_request_val),
G_ALLOC_AND_FREE);
}
void

22
epan/dissectors/packet-afs.c
View File

@ -42,6 +42,7 @@
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/addr_resolv.h>
#include <epan/emem.h>
#include "packet-rx.h"
#include "packet-afs.h"
@ -54,8 +55,6 @@
(opcode >= VOTE_LOW && opcode <= VOTE_HIGH) || \
(opcode >= DISK_LOW && opcode <= DISK_HIGH))
static int afs_packet_init_count = 100;
struct afs_request_key {
guint32 conversation, callnumber;
guint16 service;
@ -69,9 +68,6 @@ struct afs_request_val {
};
static GHashTable *afs_request_hash = NULL;
static GMemChunk *afs_request_keys = NULL;
static GMemChunk *afs_request_vals = NULL;
/*
@ -154,20 +150,8 @@ afs_init_protocol(void)
{
if (afs_request_hash)
g_hash_table_destroy(afs_request_hash);
if (afs_request_keys)
g_mem_chunk_destroy(afs_request_keys);
if (afs_request_vals)
g_mem_chunk_destroy(afs_request_vals);
afs_request_hash = g_hash_table_new(afs_hash, afs_equal);
afs_request_keys = g_mem_chunk_new("afs_request_keys",
sizeof(struct afs_request_key),
afs_packet_init_count * sizeof(struct afs_request_key),
G_ALLOC_AND_FREE);
afs_request_vals = g_mem_chunk_new("afs_request_vals",
sizeof(struct afs_request_val),
afs_packet_init_count * sizeof(struct afs_request_val),
G_ALLOC_AND_FREE);
}
@ -235,10 +219,10 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
opcode = 0;
if(!pinfo->fd->flags.visited){
if ( !request_val && !reply) {
new_request_key = g_mem_chunk_alloc(afs_request_keys);
new_request_key = se_alloc(sizeof(struct afs_request_key));
*new_request_key = request_key;
request_val = g_mem_chunk_alloc(afs_request_vals);
request_val = se_alloc(sizeof(struct afs_request_val));
request_val -> opcode = tvb_get_ntohl(tvb, offset);
request_val -> req_num = pinfo->fd->num;
request_val -> rep_num = 0;