From Pascal Quantin:

Add dissection for 3GPP 25.331 System information Blocks messages and IRAT related messages.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3016

svn path=/trunk/; revision=26624

2 files changed, 52 insertions, 51 deletions

diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c
index 4a285f8bec..40cdc9b32e 100644
--- a/asn1/rrc/packet-rrc-template.c
+++ b/asn1/rrc/packet-rrc-template.c
@@ -88,49 +88,9 @@ 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_HandoverToUTRANCommand( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_InterRATHandoverInfo( tvb, offset, actx , tree, hf_index);
 			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_MasterInformationBlock( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType1( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType2( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType3( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType4( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType5bis( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType6( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType7( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType8( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType9( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType10( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType11( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType11bis( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType12( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType13( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType13_1( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType13_2( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType13_3( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType13_4( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType14( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15bis( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_1( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_1bis( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_2( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_2bis( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_3( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_3bis( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_4( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_5( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_6( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_7( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType15_8( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType16( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType17( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoType18( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoTypeSB1( tvb, offset, actx , tree, hf_index);
-			dissect_rrc_SysInfoTypeSB2( tvb, offset, actx , tree, hf_index);
 			dissect_rrc_ToTargetRNC_Container( tvb, offset, actx , tree, hf_index);
 			dissect_rrc_TargetRNC_ToSourceRNC_Container( tvb, offset, actx , tree, hf_index);
 			break;
diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf
index 8bfb5bb994..5cf0e40442 100644
--- a/asn1/rrc/rrc.cnf
+++ b/asn1/rrc/rrc.cnf
@@ -13,17 +13,58 @@ 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
+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
 
 #.END
 #.FN_PARS UTRAN-GANSSReferenceTime/ue-GANSSTimingOfCellFrames FN_VARIANT = _64b