From Pascal Quantin:

3GPP 25.331: Dissect UE Radio Access Capability Info message embedded in InterRAT Handover Info message.

svn path=/trunk/; revision=26705

2 files changed, 63 insertions, 54 deletions

diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c
index 95bc0db05a..36feaa0260 100644
--- a/asn1/rrc/packet-rrc-template.c
+++ b/asn1/rrc/packet-rrc-template.c
@@ -54,6 +54,7 @@
 #define PFNAME "rrc"
 
 static dissector_handle_t gsm_a_dtap_handle;
+static dissector_handle_t rrc_ue_radio_access_cap_info_handle=NULL;
 
 /* Include constants */
 #include "packet-rrc-val.h"
@@ -87,7 +88,6 @@ dissect_rrc_dymmy_remove_unused_code_warnings(tvbuff_t *tvb _U_, int offset _U_,
 	/* Dummy code to keep GCC happy */
 	switch(hf_index){
 		case 0:
-			dissect_rrc_UE_RadioAccessCapabilityInfo( tvb, offset, actx , tree, hf_index);
 			dissect_rrc_UL_PhysChCapabilityFDD_r6( tvb, offset, actx , tree, hf_index);
 			dissect_rrc_UE_Positioning_GANSS_Data( tvb, offset, actx , tree, hf_index);
 			dissect_rrc_ToTargetRNC_Container( tvb, offset, actx , tree, hf_index);
@@ -153,7 +153,7 @@ proto_reg_handoff_rrc(void)
 {
 
 	gsm_a_dtap_handle = find_dissector("gsm_a_dtap");
-
+	rrc_ue_radio_access_cap_info_handle = find_dissector("rrc.ue_radio_access_cap_info");
 }
 
 
diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf
index 5cf0e40442..5882e16ad8 100644
--- a/asn1/rrc/rrc.cnf
+++ b/asn1/rrc/rrc.cnf
@@ -13,58 +13,59 @@ UNALIGNED
 
 #.PDU
 
-DL-DCCH-Message        @dl.dcch
-UL-DCCH-Message        @ul.dcch
-DL-CCCH-Message        @dl.ccch
-UL-CCCH-Message        @ul.ccch
-PCCH-Message           @pcch
-DL-SHCCH-Message       @dl.shcch
-UL-SHCCH-Message       @ul.shcch
-BCCH-FACH-Message      @bcch.fach
-BCCH-BCH-Message       @bcch.bch
-MCCH-Message           @mcch
-MSCH-Message           @msch
-MasterInformationBlock @si.mib
-SysInfoType1           @si.sib1
-SysInfoType2           @si.sib2
-SysInfoType3           @si.sib3
-SysInfoType4           @si.sib4
-SysInfoType5           @si.sib5
-SysInfoType5bis        @si.sib5bis
-SysInfoType6           @si.sib6
-SysInfoType7           @si.sib7
-SysInfoType8           @si.sib8
-SysInfoType9           @si.sib9
-SysInfoType10          @si.sib10
-SysInfoType11          @si.sib11
-SysInfoType11bis       @si.sib11bis
-SysInfoType12          @si.sib12
-SysInfoType13          @si.sib13
-SysInfoType13-1        @si.sib13-1
-SysInfoType13-2        @si.sib13-2
-SysInfoType13-3        @si.sib13-3
-SysInfoType13-4        @si.sib13-4
-SysInfoType14          @si.sib14
-SysInfoType15          @si.sib15
-SysInfoType15bis       @si.sib15bis
-SysInfoType15-1        @si.sib15-1
-SysInfoType15-1bis     @si.sib15-1bis
-SysInfoType15-2        @si.sib15-2
-SysInfoType15-2bis     @si.sib15-2bis
-SysInfoType15-3        @si.sib15-3
-SysInfoType15-3bis     @si.sib15-3bis
-SysInfoType15-4        @si.sib15-4
-SysInfoType15-5        @si.sib15-5
-SysInfoType15-6        @si.sib15-6
-SysInfoType15-7        @si.sib15-7
-SysInfoType15-8        @si.sib15-8
-SysInfoType16          @si.sib16
-SysInfoType17          @si.sib17
-SysInfoType18          @si.sib18
-SysInfoTypeSB1         @si.sb1
-SysInfoTypeSB2         @si.sb2
-HandoverToUTRANCommand @irat.ho_to_utran_cmd
-InterRATHandoverInfo   @irat.irat_ho_info
+DL-DCCH-Message              @dl.dcch
+UL-DCCH-Message              @ul.dcch
+DL-CCCH-Message              @dl.ccch
+UL-CCCH-Message              @ul.ccch
+PCCH-Message                 @pcch
+DL-SHCCH-Message             @dl.shcch
+UL-SHCCH-Message             @ul.shcch
+BCCH-FACH-Message            @bcch.fach
+BCCH-BCH-Message             @bcch.bch
+MCCH-Message                 @mcch
+MSCH-Message                 @msch
+MasterInformationBlock       @si.mib
+SysInfoType1                 @si.sib1
+SysInfoType2                 @si.sib2
+SysInfoType3                 @si.sib3
+SysInfoType4                 @si.sib4
+SysInfoType5                 @si.sib5
+SysInfoType5bis              @si.sib5bis
+SysInfoType6                 @si.sib6
+SysInfoType7                 @si.sib7
+SysInfoType8                 @si.sib8
+SysInfoType9                 @si.sib9
+SysInfoType10                @si.sib10
+SysInfoType11                @si.sib11
+SysInfoType11bis             @si.sib11bis
+SysInfoType12                @si.sib12
+SysInfoType13                @si.sib13
+SysInfoType13-1              @si.sib13-1
+SysInfoType13-2              @si.sib13-2
+SysInfoType13-3              @si.sib13-3
+SysInfoType13-4              @si.sib13-4
+SysInfoType14                @si.sib14
+SysInfoType15                @si.sib15
+SysInfoType15bis             @si.sib15bis
+SysInfoType15-1              @si.sib15-1
+SysInfoType15-1bis           @si.sib15-1bis
+SysInfoType15-2              @si.sib15-2
+SysInfoType15-2bis           @si.sib15-2bis
+SysInfoType15-3              @si.sib15-3
+SysInfoType15-3bis           @si.sib15-3bis
+SysInfoType15-4              @si.sib15-4
+SysInfoType15-5              @si.sib15-5
+SysInfoType15-6              @si.sib15-6
+SysInfoType15-7              @si.sib15-7
+SysInfoType15-8              @si.sib15-8
+SysInfoType16                @si.sib16
+SysInfoType17                @si.sib17
+SysInfoType18                @si.sib18
+SysInfoTypeSB1               @si.sb1
+SysInfoTypeSB2               @si.sb2
+HandoverToUTRANCommand       @irat.ho_to_utran_cmd
+InterRATHandoverInfo         @irat.irat_ho_info
+UE-RadioAccessCapabilityInfo @ue_radio_access_cap_info
 
 #.END
 #.FN_PARS UTRAN-GANSSReferenceTime/ue-GANSSTimingOfCellFrames FN_VARIANT = _64b
@@ -77,5 +78,13 @@ InterRATHandoverInfo   @irat.irat_ho_info
 	if (nas_message_tvb)
 		call_dissector(gsm_a_dtap_handle,nas_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
 
+#.FN_BODY InterRATHandoverInfo/ue-CapabilityContainer/present VAL_PTR = &ue_radio_access_cap_info_tvb
+  tvbuff_t *ue_radio_access_cap_info_tvb=NULL;
+
+%(DEFAULT_BODY)s
+
+	if (ue_radio_access_cap_info_tvb)
+		call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
+
 #.END