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

Have RPC program hash table use native gtk hash functions. 

Change-Id: Ie3c6daf69a1ac155ac09794a5ec87c89bbf0607d
Reviewed-on: https://code.wireshark.org/review/9454
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Michael Mann 2015-07-01 09:12:09 -04:00 committed by Anders Broman
parent b68a0ed42e
commit 987cf4cd16
3 changed files with 22 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,7 +468,6 @@ void
rpc_init_proc_table(guint prog, guint vers, const vsff *proc_table,
int procedure_hf)
{
rpc_prog_info_key rpc_prog_key;
rpc_prog_info_value *rpc_prog;
const vsff *proc;
@ -476,8 +475,7 @@ rpc_init_proc_table(guint prog, guint vers, const vsff *proc_table,
* Add the operation number hfinfo value for this version of the
* program.
*/
rpc_prog_key.prog = prog;
rpc_prog = (rpc_prog_info_value *)g_hash_table_lookup(rpc_progs, &rpc_prog_key);
rpc_prog = (rpc_prog_info_value *)g_hash_table_lookup(rpc_progs, &prog);
DISSECTOR_ASSERT(rpc_prog != NULL);
rpc_prog->procedure_hfs = g_array_set_size(rpc_prog->procedure_hfs,
vers);
@ -533,27 +531,6 @@ rpc_proc_name(guint32 prog, guint32 vers, guint32 proc)
/* Hash array with program names */
/*********************************/
/* compare 2 keys */
static gint
rpc_prog_equal(gconstpointer k1, gconstpointer k2)
{
const rpc_prog_info_key* key1 = (const rpc_prog_info_key*) k1;
const rpc_prog_info_key* key2 = (const rpc_prog_info_key*) k2;
return ((key1->prog == key2->prog) ?
TRUE : FALSE);
}
/* calculate a hash key */
static guint
rpc_prog_hash(gconstpointer k)
{
const rpc_prog_info_key* key = (const rpc_prog_info_key*) k;
return (key->prog);
}
static void
rpc_prog_free_val(gpointer v)
{
@ -566,11 +543,11 @@ rpc_prog_free_val(gpointer v)
void
rpc_init_prog(int proto, guint32 prog, int ett)
{
rpc_prog_info_key *key;
guint32 *key;
rpc_prog_info_value *value;
key = (rpc_prog_info_key *) g_malloc(sizeof(rpc_prog_info_key));
key->prog = prog;
key = g_new(guint32, 1);
*key = prog;
value = (rpc_prog_info_value *) g_malloc(sizeof(rpc_prog_info_value));
value->proto = find_protocol_by_id(proto);
@ -589,11 +566,9 @@ rpc_init_prog(int proto, guint32 prog, int ett)
int
rpc_prog_hf(guint32 prog, guint32 vers)
{
rpc_prog_info_key rpc_prog_key;
rpc_prog_info_value *rpc_prog;
rpc_prog_key.prog = prog;
if ((rpc_prog = (rpc_prog_info_value *)g_hash_table_lookup(rpc_progs,&rpc_prog_key))) {
if ((rpc_prog = (rpc_prog_info_value *)g_hash_table_lookup(rpc_progs,&prog))) {
return g_array_index(rpc_prog->procedure_hfs, int, vers);
}
return -1;
@ -606,11 +581,9 @@ const char *
rpc_prog_name(guint32 prog)
{
const char *progname = NULL;
rpc_prog_info_key rpc_prog_key;
rpc_prog_info_value *rpc_prog;
rpc_prog_key.prog = prog;
if ((rpc_prog = (rpc_prog_info_value *)g_hash_table_lookup(rpc_progs,&rpc_prog_key)) == NULL) {
if ((rpc_prog = (rpc_prog_info_value *)g_hash_table_lookup(rpc_progs,&prog)) == NULL) {
progname = "Unknown";
}
else {
@ -1941,7 +1914,7 @@ dissect_rpc_continuation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*/
static void
make_fake_rpc_prog_if_needed (rpc_prog_info_key *prpc_prog_key, guint prog_ver)
make_fake_rpc_prog_if_needed (guint32 *prpc_prog_key, guint prog_ver)
{
/* sanity check: no one uses versions > 10 */
if(prog_ver>10){
@ -1959,13 +1932,13 @@ make_fake_rpc_prog_if_needed (rpc_prog_info_key *prpc_prog_key, guint prog_ver)
{ 0,NULL,NULL,NULL }
};
NAME = g_strdup_printf("Unknown RPC Program:%d",prpc_prog_key->prog);
Name = g_strdup_printf("RPC:%d",prpc_prog_key->prog);
name = g_strdup_printf("rpc%d",prpc_prog_key->prog);
NAME = g_strdup_printf("Unknown RPC Program:%d", *prpc_prog_key);
Name = g_strdup_printf("RPC:%d", *prpc_prog_key);
name = g_strdup_printf("rpc%d", *prpc_prog_key);
proto_rpc_unknown_program = proto_register_protocol(NAME, Name, name);
rpc_init_prog(proto_rpc_unknown_program, prpc_prog_key->prog, ett_rpc_unknown_program);
rpc_init_proc_table(prpc_prog_key->prog, prog_ver, unknown_proc, hf_rpc_procedure);
rpc_init_prog(proto_rpc_unknown_program, *prpc_prog_key, ett_rpc_unknown_program);
rpc_init_proc_table(*prpc_prog_key, prog_ver, unknown_proc, hf_rpc_procedure);
}
}
@ -1978,7 +1951,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint32 msg_type;
rpc_call_info_value *rpc_call = NULL;
rpc_prog_info_value *rpc_prog = NULL;
rpc_prog_info_key rpc_prog_key;
guint32 rpc_prog_key;
unsigned int xid;
unsigned int rpcvers;
@ -2065,7 +2038,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
and report it as RPC (but not dissect the payload if
we don't have a subdissector) if it matches. */
rpc_prog_key.prog = tvb_get_ntohl(tvb, offset + 12);
rpc_prog_key = tvb_get_ntohl(tvb, offset + 12);
/* we only dissect version 2 */
if (tvb_get_ntohl(tvb, offset + 8) != 2 ){
@ -2084,7 +2057,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* In this case we only check that the program number
* is neither 0 nor -1 which is better than nothing.
*/
if(rpc_prog_key.prog==0 || rpc_prog_key.prog==0xffffffff){
if(rpc_prog_key==0 || rpc_prog_key==0xffffffff){
return FALSE;
}
version=tvb_get_ntohl(tvb, offset+16);
@ -2175,7 +2148,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
wmem_tree_insert32(rpc_conv_info->xids, xid, (void *)rpc_call);
/* and fake up a matching program */
rpc_prog_key.prog = rpc_call->prog;
rpc_prog_key = rpc_call->prog;
}
/* pass rpc_info to subdissectors */
@ -2530,7 +2503,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
procname = val_to_str_const(gss_proc, rpc_authgssapi_proc, "(null)");
}
rpc_prog_key.prog = prog;
rpc_prog_key = prog;
if ((rpc_prog = (rpc_prog_info_value *)g_hash_table_lookup(rpc_progs,&rpc_prog_key)) == NULL) {
proto = NULL;
proto_id = 0;
@ -4168,7 +4141,7 @@ proto_register_rpc(void)
* will be called before any handoff registration routines
* are called.
*/
rpc_progs = g_hash_table_new_full(rpc_prog_hash, rpc_prog_equal,
rpc_progs = g_hash_table_new_full(g_int_hash, g_int_equal,
g_free, rpc_prog_free_val);
rpc_procs = g_hash_table_new_full(rpc_proc_hash, rpc_proc_equal,
g_free, g_free);

5
epan/dissectors/packet-rpc.h
View File

@ -187,11 +187,6 @@ WS_DLL_PUBLIC int dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo,
WS_DLL_PUBLIC int dissect_rpc_opaque_auth(tvbuff_t* tvb, proto_tree* tree,
int offset, packet_info *pinfo);
typedef struct _rpc_prog_info_key {
guint32 prog;
} rpc_prog_info_key;
typedef struct _rpc_prog_info_value {
protocol_t *proto;
int proto_id;

8
ui/gtk/rpc_stat.c
View File

@ -324,7 +324,7 @@ rpcstat_version_select(GtkWidget *vers_combo_box, gpointer user_data _U_)
static void
rpcstat_program_select(GtkWidget *prog_combo_box, gpointer user_data)
{
rpc_prog_info_key *k;
guint32 *k;
GtkWidget *vers_combo_box;
int i;
@ -333,7 +333,7 @@ rpcstat_program_select(GtkWidget *prog_combo_box, gpointer user_data)
if (! ws_combo_box_get_active_pointer(GTK_COMBO_BOX(prog_combo_box), (gpointer *)&k)) {
g_assert_not_reached(); /* Programming error: somehow no active item */
}
rpc_program=k->prog;
rpc_program=*k;
/* re-create version menu */
rpc_version=0;
@ -357,14 +357,14 @@ rpcstat_program_select(GtkWidget *prog_combo_box, gpointer user_data)
static void
rpcstat_list_programs(gpointer *key, gpointer *value, gpointer user_data)
{
rpc_prog_info_key *k=(rpc_prog_info_key *)key;
guint32 *k=(guint32*)key;
rpc_prog_info_value *v=(rpc_prog_info_value *)value;
GtkComboBox *prog_combo_box = (GtkComboBox *)user_data;
ws_combo_box_append_text_and_pointer(prog_combo_box, v->progname, k);
if(!rpc_program){
rpc_program=k->prog;
rpc_program=*k;
}
}