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

get rid of another slow hashtable and one global variable and 

replace it with a better and memleak free se_tree



svn path=/trunk/; revision=17480
This commit is contained in:
Ronnie Sahlberg 2006-03-06 14:30:34 +00:00
parent 51f8a228f6
commit 07c2845fe7
4 changed files with 16 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
epan/dissectors/packet-nfs.c
View File

@ -414,39 +414,7 @@ static gint ett_nfs_acemask4 = -1;
/* fhandle displayfilters to match also corresponding request/response
packet in addition to the one containing the actual filehandle */
gboolean nfs_fhandle_reqrep_matching = FALSE;
GHashTable *nfs_fhandle_frame_table = NULL;
static gint
nfs_fhandle_frame_equal(gconstpointer k1, gconstpointer k2)
{
guint32 key1 = GPOINTER_TO_UINT(k1);
guint32 key2 = GPOINTER_TO_UINT(k2);
return key1==key2;
}
static guint
nfs_fhandle_frame_hash(gconstpointer k)
{
guint32 key = GPOINTER_TO_UINT(k);
return key;
}
static gboolean
nfs_fhandle_frame_free_all(gpointer key_arg _U_, gpointer value _U_, gpointer user_data _U_)
{
return TRUE;
}
static void
nfs_fhandle_reqrep_matching_init(void)
{
if (nfs_fhandle_frame_table != NULL) {
g_hash_table_foreach_remove(nfs_fhandle_frame_table,
nfs_fhandle_frame_free_all, NULL);
} else {
nfs_fhandle_frame_table=g_hash_table_new(nfs_fhandle_frame_hash,
nfs_fhandle_frame_equal);
}
}
static se_tree_t *nfs_fhandle_frame_table = NULL;
/* file name snooping */
@ -1450,9 +1418,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
nfs calls. For now, we dont handle this and those calls will
not work properly with this feature
*/
g_hash_table_insert(nfs_fhandle_frame_table,
GINT_TO_POINTER(pinfo->fd->num),
(gpointer)old_fhd);
se_tree_insert32(nfs_fhandle_frame_table, pinfo->fd->num, old_fhd);
}
}
@ -1591,8 +1557,11 @@ type_ready:
}
void
dissect_fhandle_hidden(packet_info *pinfo, proto_tree *tree, nfs_fhandle_data_t *nfd)
dissect_fhandle_hidden(packet_info *pinfo, proto_tree *tree, int frame)
{
nfs_fhandle_data_t *nfd;
nfd=se_tree_lookup32(nfs_fhandle_frame_table, frame);
if(nfd && nfd->len){
dissect_fhandle_data(nfd->tvb, 0, pinfo, tree, nfd->len, TRUE, NULL);
}
@ -8817,8 +8786,8 @@ proto_register_nfs(void)
&nfs_fhandle_reqrep_matching);
nfs_name_snoop_known=se_tree_create(SE_TREE_TYPE_RED_BLACK);
nfs_file_handles=se_tree_create(SE_TREE_TYPE_RED_BLACK);
nfs_fhandle_frame_table=se_tree_create(SE_TREE_TYPE_RED_BLACK);
register_init_routine(nfs_name_snoop_init);
register_init_routine(nfs_fhandle_reqrep_matching_init);
}
void

3
epan/dissectors/packet-nfs.h
View File

@ -111,13 +111,12 @@ void nfs_name_snoop_add_name(int xid, tvbuff_t *tvb, int name_offset, int name_l
extern gboolean nfs_fhandle_reqrep_matching;
extern GHashTable *nfs_fhandle_frame_table;
typedef struct nfs_fhandle_data {
int len;
const unsigned char *fh;
tvbuff_t *tvb;
} nfs_fhandle_data_t;
void dissect_fhandle_hidden(packet_info *pinfo, proto_tree *tree, nfs_fhandle_data_t *nfd);
void dissect_fhandle_hidden(packet_info *pinfo, proto_tree *tree, int frame);
typedef int (diss_p)(tvbuff_t *tvb, int offset, proto_tree *tree, int hf);

20
epan/dissectors/packet-nlm.c
View File

@ -230,14 +230,8 @@ nlm_match_fhandle_reply(packet_info *pinfo, proto_tree *tree)
md=g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->fd->num));
if(md && md->rep_frame){
nfs_fhandle_data_t *fhd;
fhd=(nfs_fhandle_data_t *)g_hash_table_lookup(
nfs_fhandle_frame_table,
GINT_TO_POINTER(md->req_frame));
if(fhd){
dissect_fhandle_hidden(pinfo,
tree, fhd);
}
dissect_fhandle_hidden(pinfo,
tree, md->req_frame);
}
}
static void
@ -247,14 +241,8 @@ nlm_match_fhandle_request(packet_info *pinfo, proto_tree *tree)
md=g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->fd->num));
if(md && md->rep_frame){
nfs_fhandle_data_t *fhd;
fhd=(nfs_fhandle_data_t *)g_hash_table_lookup(
nfs_fhandle_frame_table,
GINT_TO_POINTER(md->rep_frame));
if(fhd){
dissect_fhandle_hidden(pinfo,
tree, fhd);
}
dissect_fhandle_hidden(pinfo,
tree, md->rep_frame);
}
}

19
epan/dissectors/packet-rpc.c
View File

@ -2649,28 +2649,17 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* XXX this should really loop over all fhandles registred for the frame */
if(nfs_fhandle_reqrep_matching){
nfs_fhandle_data_t *fhd;
switch (msg_type) {
case RPC_CALL:
if(rpc_call && rpc_call->rep_num){
fhd=(nfs_fhandle_data_t *)g_hash_table_lookup(
nfs_fhandle_frame_table,
GINT_TO_POINTER(rpc_call->rep_num));
if(fhd){
dissect_fhandle_hidden(pinfo,
ptree, fhd);
}
dissect_fhandle_hidden(pinfo,
ptree, rpc_call->rep_num);
}
break;
case RPC_REPLY:
if(rpc_call && rpc_call->req_num){
fhd=(nfs_fhandle_data_t *)g_hash_table_lookup(
nfs_fhandle_frame_table,
GINT_TO_POINTER(rpc_call->req_num));
if(fhd){
dissect_fhandle_hidden(pinfo,
ptree, fhd);
}
dissect_fhandle_hidden(pinfo,
ptree, rpc_call->req_num);
}
break;
}