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

gsm_ipa: Make sure the Osmo Extended IPA stream ID type is printed 

Currently, each tree item of the IPA sub-tree will only list the
IPA stream identifier.  However, for the osmocom-specific sub-streams,
this is always "OSMO EXT", which is not very informative.

Make sure the tree item states something like "OSMO EXT GSUP" or
"OSMO EXT MGCP" to indicate the actual payload type based on the
osmocom sub-type.

Change-Id: Ic1536574c8679de778d5b3cfc680b85284d1b503
Reviewed-on: https://code.wireshark.org/review/26795
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
This commit is contained in:
Harald Welte 2018-04-07 23:29:34 +02:00 committed by Martin Kaiser
parent e8441d5bf9
commit 31aece5d75
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-gsm_ipa.c
View File

@ -221,17 +221,17 @@ dissect_ipaccess(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Dissect the osmocom extension header */
static gint
dissect_osmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ipatree, proto_tree *tree)
dissect_osmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ipatree, proto_tree *tree, proto_item *ipa_ti)
{
tvbuff_t *next_tvb;
guint8 osmo_proto;
const gchar *name;
osmo_proto = tvb_get_guint8(tvb, 0);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
val_to_str(osmo_proto, ipa_osmo_proto_vals,
"unknown 0x%02x"));
name = val_to_str(osmo_proto, ipa_osmo_proto_vals, "unknown 0x%02x");
col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", name);
if (ipatree) {
proto_item_append_text(ipa_ti, " %s", name);
proto_tree_add_item(ipatree, hf_ipa_osmo_proto,
tvb, 0, 1, ENC_BIG_ENDIAN);
}
@ -329,7 +329,7 @@ dissect_ipa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_udp
call_dissector(sub_handles[SUB_MGCP], next_tvb, pinfo, tree);
break;
case OSMO_EXT:
dissect_osmo(next_tvb, pinfo, ipa_tree, tree);
dissect_osmo(next_tvb, pinfo, ipa_tree, tree, ti);
break;
case HSL_DEBUG:
if (tree) {