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

Have GTPv2 pass its "instance ID" to "private extension" subdissectors rather than use pinfo->private_data. There are no "private extension" subdissectors in the Wireshark source, so I assume it's all done by third-party plugins. They must now update their dissectors to get the "instance ID" from the dissector data parameter. 

svn path=/trunk/; revision=52938
This commit is contained in:
Michael Mann 2013-10-29 00:25:57 +00:00
parent 4e94bdcb85
commit e15afadb11
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4444,9 +4444,7 @@ dissect_gtpv2_private_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
int offset = 0;
tvbuff_t *next_tvb;
guint16 ext_id;
void *save_private_data = pinfo->private_data;
pinfo->private_data = GUINT_TO_POINTER((guint32)instance);
/* oct 5 -7 Enterprise ID */
ext_id = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(tree, hf_gtpv2_enterprise_id, tvb, offset, 2, ENC_BIG_ENDIAN);
@ -4455,11 +4453,9 @@ dissect_gtpv2_private_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
proto_item_append_text(item, "%s (%u)", val_to_str_ext_const(ext_id, &sminmpec_values_ext, "Unknown"), ext_id);
next_tvb = tvb_new_subset(tvb, offset, length-2, length-2);
if (dissector_try_uint(gtpv2_priv_ext_dissector_table, ext_id, next_tvb, pinfo, tree)){
pinfo->private_data = save_private_data;
if (dissector_try_uint_new(gtpv2_priv_ext_dissector_table, ext_id, next_tvb, pinfo, tree, FALSE, GUINT_TO_POINTER((guint32)instance))){
return;
}
pinfo->private_data = save_private_data;
proto_tree_add_text(tree, tvb, offset, length-2, "Proprietary value");
}