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

Don't call val_to_str() only to then compare the result with "Uknown": use 

match_strval() instead.

Also, don't retrieve the application ID 3 more times; we've already got it
in a variable...

Point out a bug regarding how we're storing the application ID for use by
subdissectors (from r34570).

svn path=/trunk/; revision=43162
This commit is contained in:
Jeff Morriss 2012-06-08 19:59:33 +00:00
parent ffa2839747
commit c75657ad14
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
epan/dissectors/packet-diameter.c
View File

@ -837,11 +837,11 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree)
guint32 flags_bits = (tvb_get_ntohl(tvb,4) & 0xff000000) >> 24;
int packet_len = first_word & 0x00ffffff;
proto_item *pi, *cmd_item, *app_item, *version_item;
proto_tree* diam_tree;
diam_ctx_t* c = ep_alloc0(sizeof(diam_ctx_t));
proto_tree *diam_tree;
diam_ctx_t *c = ep_alloc0(sizeof(diam_ctx_t));
int offset;
value_string* cmd_vs;
const char* cmd_str;
value_string *cmd_vs;
const char *cmd_str;
guint32 cmd = tvb_get_ntoh24(tvb,5);
guint32 fourth = tvb_get_ntohl(tvb,8);
guint32 hop_by_hop_id = 0;
@ -850,7 +850,7 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree)
diameter_req_ans_pair_t *diameter_pair;
proto_item *it;
nstime_t ns;
void* pd_save;
void *pd_save;
pd_save = pinfo->private_data;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DIAMETER");
@ -899,24 +899,21 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree)
break;
}
case DIAMETER_RFC: {
guint32 application_id;
application_id = tvb_get_ntohl(tvb,8);
cmd_vs = (value_string*)(void*)all_cmds->data;
/* Store the application id to be used by subdissectors */
pinfo->private_data = &application_id;
app_item = proto_tree_add_item(diam_tree, hf_diameter_application_id,tvb,8,4,ENC_BIG_ENDIAN);
if (strcmp(val_to_str(tvb_get_ntohl(tvb, 8), dictionary.applications,
"Unknown"), "Unknown") == 0) {
proto_tree* tu = proto_item_add_subtree(app_item,ett_unknown);
proto_item* iu = proto_tree_add_text(tu,tvb, 8 ,4,"Unknown Application Id, "
pinfo->private_data = &fourth; /* XXX - bug: pointer to a function-local variable?!? */
cmd_vs = (value_string*)(void*)all_cmds->data;
app_item = proto_tree_add_item(diam_tree, hf_diameter_application_id, tvb, 8, 4, ENC_BIG_ENDIAN);
if (match_strval(fourth, dictionary.applications) == NULL) {
proto_tree *tu = proto_item_add_subtree(app_item,ett_unknown);
proto_item *iu = proto_tree_add_text(tu, tvb, 8, 4, "Unknown Application Id, "
"if you know what this is you can add it to dictionary.xml");
expert_add_info_format(c->pinfo, iu, PI_UNDECODED, PI_WARN,
"Unknown Application Id (%u)",
tvb_get_ntohl(tvb, 8));
"Unknown Application Id (%u)", fourth);
PROTO_ITEM_SET_GENERATED(iu);
}
c->version_rfc = TRUE;
break;
}