From David Wei:

Further additions and fixes to MBMS in M3AP dissector.

from me update to 11.1

svn path=/trunk/; revision=42290

7 files changed, 21 insertions, 19 deletions

diff --git a/asn1/m3ap/M3AP-CommonDataTypes.asn b/asn1/m3ap/M3AP-CommonDataTypes.asn
index 68afdad52f..5289e1965d 100644
--- a/asn1/m3ap/M3AP-CommonDataTypes.asn
+++ b/asn1/m3ap/M3AP-CommonDataTypes.asn
@@ -1,7 +1,7 @@
 -- M3AP-CommonDataTypes.asn
 --
--- 3GPP TS 36.444 V11.0.0 (2011-12)
--- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
+-- 3GPP TS 36.444 V11.1.0 (2012-03)
+-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip 
 --
 -- 9.3.6	Common Definitions
 --
@@ -56,3 +56,4 @@ ProtocolIE-ID		::= INTEGER (0..maxProtocolIEs)
 TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessful-outcome}
 
 END
+
diff --git a/asn1/m3ap/M3AP-Constants.asn b/asn1/m3ap/M3AP-Constants.asn
index d2c0ba9e63..c7cbfc3e43 100644
--- a/asn1/m3ap/M3AP-Constants.asn
+++ b/asn1/m3ap/M3AP-Constants.asn
@@ -1,7 +1,7 @@
 -- M3AP-Constants.asn
 --
--- 3GPP TS 36.444 V11.0.0 (2011-12)
--- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
+-- 3GPP TS 36.444 V11.1.0 (2012-03)
+-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip 
 --
 -- 9.3.7	Constant Definitions
 --
@@ -50,7 +50,7 @@ id-m3Setup														ProcedureCode ::= 7
 --
 -- **************************************************************
 
-maxnoofMBMSServiceAreasPerMCE				INTEGER ::= 65536
+maxnoofMBMSServiceAreaIdentitiesPerMCE		INTEGER ::= 65536
 maxnooferrors								INTEGER ::= 256
 maxNrOfIndividualM3ConnectionsToReset		INTEGER ::= 256
 
@@ -84,3 +84,4 @@ id-MBMSServiceAreaList														ProtocolIE-ID ::= 20
 id-Time-ofMBMS-DataTransfer													ProtocolIE-ID ::= 21
 id-Time-ofMBMS-DataStop														ProtocolIE-ID ::= 22
 END
+
diff --git a/asn1/m3ap/M3AP-Containers.asn b/asn1/m3ap/M3AP-Containers.asn
index a89eb9eed7..5fdb095083 100644
--- a/asn1/m3ap/M3AP-Containers.asn
+++ b/asn1/m3ap/M3AP-Containers.asn
@@ -1,7 +1,7 @@
 -- M3AP-Containers.asn
 --
--- 3GPP TS 36.444 V11.0.0 (2011-12)
--- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
+-- 3GPP TS 36.444 V11.1.0 (2012-03)
+-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip 
 --
 -- 9.3.8	Container Definitions
 --
@@ -202,3 +202,4 @@ PrivateIE-Field {M3AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 }
 
 END
+
diff --git a/asn1/m3ap/M3AP-IEs.asn b/asn1/m3ap/M3AP-IEs.asn
index 2f3348e0bf..5cdfb15be9 100644
--- a/asn1/m3ap/M3AP-IEs.asn
+++ b/asn1/m3ap/M3AP-IEs.asn
@@ -1,7 +1,7 @@
 -- M3AP-IEs.asn
 --
--- 3GPP TS 36.444 V11.0.0 (2011-12)
--- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
+-- 3GPP TS 36.444 V11.1.0 (2012-03)
+-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip 
 --
 -- 9.3.5	Information Element Definitions
 --
@@ -24,7 +24,6 @@ BEGIN
 
 IMPORTS
 	id-AllocationAndRetentionPriority,
-	maxnoofMBMSServiceAreasPerMCE,
 	maxnooferrors
 
 FROM M3AP-Constants
@@ -153,8 +152,7 @@ ExtendedMCE-ID ::= OCTET STRING (SIZE(1))
 Global-MCE-ID ::= SEQUENCE {
 	pLMN-Identity			PLMN-Identity,
 	mCE-ID					MCE-ID,
--- WS 3GPP Spec error fixed.
-	extendedMCE-ID			ExtendedMCE-ID OPTIONAL,
+	extendedMCE-ID			ExtendedMCE-ID,
 	iE-Extensions			ProtocolExtensionContainer { {GlobalMCE-ID-ExtIEs} } OPTIONAL,
 	...
 }
diff --git a/asn1/m3ap/M3AP-PDU-Contents.asn b/asn1/m3ap/M3AP-PDU-Contents.asn
index 4e5efa79d9..0b6d08577a 100644
--- a/asn1/m3ap/M3AP-PDU-Contents.asn
+++ b/asn1/m3ap/M3AP-PDU-Contents.asn
@@ -1,7 +1,7 @@
 -- M3AP-PDU-Contents.asn
 --
--- 3GPP TS 36.444 V11.0.0 (2011-12)
--- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip 
+-- 3GPP TS 36.444 V11.1.0 (2012-03)
+-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip 
 --
 -- 9.3.4	PDU Definitions
 --
@@ -85,7 +85,7 @@ FROM M3AP-Containers
 	id-Time-ofMBMS-DataTransfer,
 	id-Global-MCE-ID,
 	id-MCEname,
-	maxnoofMBMSServiceAreasPerMCE,
+	maxnoofMBMSServiceAreaIdentitiesPerMCE,
 	maxnooferrors,
 	maxNrOfIndividualM3ConnectionsToReset
 
@@ -374,7 +374,7 @@ M3SetupRequestIEs M3AP-PROTOCOL-IES ::= {
 }
 
 
-MBMSServiceAreaListItem ::= SEQUENCE (SIZE(1..maxnoofMBMSServiceAreasPerMCE)) OF MBMSServiceArea1
+MBMSServiceAreaListItem ::= SEQUENCE (SIZE(1..maxnoofMBMSServiceAreaIdentitiesPerMCE)) OF MBMSServiceArea1
 
 
 -- **************************************************************
diff --git a/asn1/m3ap/M3AP-PDU-Descriptions.asn b/asn1/m3ap/M3AP-PDU-Descriptions.asn
index 014674b9b3..fc55de654e 100644
--- a/asn1/m3ap/M3AP-PDU-Descriptions.asn
+++ b/asn1/m3ap/M3AP-PDU-Descriptions.asn
@@ -1,7 +1,7 @@
 -- M3AP-PDU-Descriptions.asn
 --
--- 3GPP TS 36.444 V11.0.0 (2011-12)
--- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip 
+-- 3GPP TS 36.444 V11.1.0 (2012-03)
+-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip 
 --
 -- 9.3.3	Elementary Procedure Definitions
 --
diff --git a/asn1/m3ap/packet-m3ap-template.c b/asn1/m3ap/packet-m3ap-template.c
index db89c66f09..e816739cb8 100644
--- a/asn1/m3ap/packet-m3ap-template.c
+++ b/asn1/m3ap/packet-m3ap-template.c
@@ -100,7 +100,7 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	return (dissector_try_uint(m3ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+	return (dissector_try_uint(m3ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -192,6 +192,7 @@ proto_reg_handoff_m3ap(void)
 		dissector_add_uint("sctp.ppi", PROTO_3GPP_M3AP_PROTOCOL_ID, m3ap_handle);
 		inited = TRUE;
 #include "packet-m3ap-dis-tab.c"
+		dissector_add_uint("m3ap.extension", 17, new_create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap));
 	}
 	else {
 		if (SctpPort != 0) {