diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-04-07 23:29:34 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2018-04-09 09:51:11 +0000 |
| commit | 31aece5d75aac59396ed194cdd94f654cb0c0f7e (patch) | |
| tree | dabd5a26a9e81989c5a3f1a48b93cf644e77d986 /epan/dissectors | |
| parent | e8441d5bf921e5e09871ae14e5980dbed146454f (diff) | |
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>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-gsm_ipa.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index dd4841cc9f..67d254db9c 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -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) { |