diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-04-28 19:59:14 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-04-28 19:59:14 +0000 |
| commit | e0c80c4138c05caae303f49f45770f42aa314ab1 (patch) | |
| tree | 22f5316cc49a378315b9bf431502b6106afc9090 /asn1 | |
| parent | 94afa45fbf8acafd1ce8d2fe0973cad164005fbb (diff) | |
| download | wireshark-e0c80c4138c05caae303f49f45770f42aa314ab1.tar.gz wireshark-e0c80c4138c05caae303f49f45770f42aa314ab1.tar.bz2 wireshark-e0c80c4138c05caae303f49f45770f42aa314ab1.zip | |
From Pascal Quantin:
the dissection of the UE capabilities when the RAT
type is set to geran-cs (the value part of Classmark 2 starts at the third byte).
Moreover it adds a subtree to enhance the display of Mobile Station Classmark 2 and 3 and MS Radio Access Capability IEs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5867
svn path=/trunk/; revision=36943
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/lte-rrc/lte-rrc.cnf | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index 94607d2992..9c0b20c85d 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -96,6 +96,9 @@ VarMeasReport %(DEFAULT_BODY)s if(ue_eutra_cap_tvb){ + guint32 length; + proto_item *item; + proto_tree *subtree; switch(lte_rrc_rat_type_value){ case 0: /* eutra */ @@ -107,12 +110,23 @@ if(ue_eutra_cap_tvb){ break; case 2: /* geran-cs */ - de_ms_cm_2(ue_eutra_cap_tvb, tree, actx->pinfo, 0, 5, NULL, 0); - de_ms_cm_3(ue_eutra_cap_tvb, tree, actx->pinfo, 5, tvb_length(ue_eutra_cap_tvb)-5, NULL, 0); + /* Mobile Station Classmark 2 is formatted as TLV with the two first bytes set to 0x33 0x03 */ + item = proto_tree_add_text(tree, ue_eutra_cap_tvb, 0, 5, "Mobile Station Classmark 2"); + subtree = proto_item_add_subtree(item, ett_lte_rrc_UE_CapabilityRAT_Container); + de_ms_cm_2(ue_eutra_cap_tvb, subtree, actx->pinfo, 2, 3, NULL, 0); + /* Mobile Station Classmark 3 is formatted as V */ + length = tvb_length(ue_eutra_cap_tvb)-5; + item = proto_tree_add_text(tree, ue_eutra_cap_tvb, 5, length, "Mobile Station Classmark 3"); + subtree = proto_item_add_subtree(item, ett_lte_rrc_UE_CapabilityRAT_Container); + de_ms_cm_3(ue_eutra_cap_tvb, subtree, actx->pinfo, 5, length, NULL, 0); break; case 3: /* geran-ps */ - de_gmm_ms_radio_acc_cap(ue_eutra_cap_tvb, tree, actx->pinfo, 0, tvb_length(ue_eutra_cap_tvb), NULL, 0); + /* MS Radio Access Capability is formatted as V */ + length = tvb_length(ue_eutra_cap_tvb); + item = proto_tree_add_text(tree, ue_eutra_cap_tvb, 0, length, "MS Radio Access Capability"); + subtree = proto_item_add_subtree(item, ett_lte_rrc_UE_CapabilityRAT_Container); + de_gmm_ms_radio_acc_cap(ue_eutra_cap_tvb, subtree, actx->pinfo, 0, length, NULL, 0); break; case 4: /* cdma2000-1XRTT */ |