diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-11-25 21:31:55 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-11-25 21:31:55 +0000 |
| commit | 6966220a7c738f4cb00d944681b79015803e2f31 (patch) | |
| tree | 23a693e4f035a3c57edf2f260dc0ffbc604e8201 /asn1/rrc | |
| parent | e1afd4d4f718d530e3df893f4952d1744baa074d (diff) | |
Dissect more containers etc.
svn path=/trunk/; revision=31076
Diffstat (limited to 'asn1/rrc')
| -rw-r--r-- | asn1/rrc/packet-rrc-template.c | 7 | ||||
| -rw-r--r-- | asn1/rrc/rrc.cnf | 30 |
2 files changed, 36 insertions, 1 deletions
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index e59231bebf..ab8a927974 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -24,7 +24,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Ref: 3GPP TS 25.423 version 6.7.0 Release 6 + * Ref: 3GPP TS 25.331 V8.8.0 (2009-09) */ #ifdef HAVE_CONFIG_H @@ -40,6 +40,8 @@ #include "packet-ber.h" #include "packet-per.h" +#include "packet-rrc.h" +#include "packet-gsm_a_common.h" #ifdef _MSC_VER /* disable: "warning C4049: compiler limit : terminating line number emission" */ @@ -60,6 +62,9 @@ static dissector_handle_t rrc_dl_ccch_handle=NULL; static dissector_handle_t rrc_ul_dcch_handle=NULL; static dissector_handle_t rrc_dl_dcch_handle=NULL; +/* Forward declarations */ +static void dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); + /* Include constants */ #include "packet-rrc-val.h" diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 33a4f04445..805d127d21 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -464,5 +464,35 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me if (gsm_message_tvb) call_dissector(gsm_a_dtap_handle,gsm_message_tvb,actx->pinfo, tree); +#.FN_BODY GSM-Classmark2 VAL_PTR = ¶meter_tvb +tvbuff_t *parameter_tvb=NULL; + +%(DEFAULT_BODY)s + if (parameter_tvb){ + de_ms_cm_2(parameter_tvb, tree, 2, tvb_get_guint8(parameter_tvb,1), NULL, 0); + } + +#.FN_BODY GSM-Classmark3 VAL_PTR = ¶meter_tvb +tvbuff_t *parameter_tvb=NULL; + +%(DEFAULT_BODY)s + if (parameter_tvb){ + de_ms_cm_3(parameter_tvb, tree, 0, tvb_length(parameter_tvb), NULL, 0); + } +#.FN_BODY InterRATHandoverInfoWithInterRATCapabilities-r3-IEs/interRATHandoverInfo VAL_PTR = ¶meter_tvb +tvbuff_t *parameter_tvb=NULL; + +%(DEFAULT_BODY)s + if (parameter_tvb){ + dissect_rrc_InterRATHandoverInfo_PDU(parameter_tvb, actx->pinfo, tree); + } + +#.FN_BODY ue-CapabilityContainer/present VAL_PTR = ¶meter_tvb +tvbuff_t *parameter_tvb=NULL; + +%(DEFAULT_BODY)s + if (parameter_tvb){ + dissect_UE_RadioAccessCapabilityInfo_PDU(parameter_tvb, actx->pinfo, tree); + } #.END |