Update Camel to TS 29.078 9.2.0 (2010-06)

svn path=/trunk/; revision=34849

asn1/camel/CAP-GPRS-ReferenceNumber.asn

@@ -1,9 +1,9 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 29.078 9.2.0 (2010-06)
 -- 8.1.1	GPRS Reference Number
 CAP-GPRS-ReferenceNumber {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-dialogueInformation(111) version5(4)}
+umts-network(1) modules(3) cap-dialogueInformation(111) version8(7)}
--- Module CAP-GPRS-ReferenceNumber is updated to version5(4) for Rel-6. The definitions
+-- Module CAP-GPRS-ReferenceNumber is updated to version8(7) for Rel-6. The definitions
 -- in this module are not modified, compared to Rel-5.
 
 DEFINITIONS ::= BEGIN

asn1/camel/CAP-SMS-ops-args.asn

@@ -1,15 +1,15 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 7	SMS Control
 -- 7.1	SMS operations and arguments
-CAP-SMS-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-SMS-ops-args(105) version5(4)}
+CAP-SMS-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-SMS-ops-args(105) version8(7)}
--- The module CAP-SMS-ops-args is updated to version5(4) for Rel-6. The OPERATION definitions
+-- The module CAP-SMS-ops-args is updated to version8(7) for Rel-6. The OPERATION definitions
 -- are not modified.
 
 DEFINITIONS IMPLICIT TAGS::= BEGIN
 
 -- This module contains the operations and operation arguments used for the
--- smsSSF- gsmSCF interface, for the control of MO-SMS and MT-SMS.
+-- smsSSF– gsmSCF interface, for the control of MO-SMS and MT-SMS.
 
 -- The table in subclause 2.1 lists the specifications that contain the modules
 -- that are used by CAP.
@@ -23,7 +23,7 @@ IMPORTS
 	ros-InformationObjects,
 	tc-Messages
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 	OPERATION
 FROM Remote-Operations-Information-Objects ros-InformationObjects
@@ -40,13 +40,13 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)}
 	IMSI,
 	ISDN-AddressString
 FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)}
+gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)}
 
 	GPRSMSClass,
 	LocationInformation,
 	MS-Classmark2
 FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)}
+gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)}
 
 	PARAMETERS-BOUND
 FROM CAP-classes classes
@@ -79,8 +79,8 @@ FROM CAP-operationcodes operationcodes
 	TPShortMessageSpecificInfo,
 	TPValidityPeriod
 FROM CAP-datatypes datatypes
--- For Rel-6, the CAP-datatypes module is updated to version5(4); Object Identifier 'datatypes'
+-- For Rel-6, the CAP-datatypes module is updated to version8(7); Object Identifier 'datatypes'
--- is also updated to version5(4). As a result, the present module uses Rel-6 data type definitions.
+-- is also updated to version8(7). As a result, the present module uses Rel-6 data type definitions.
 
 	missingCustomerRecord,
 	missingParameter,
@@ -91,13 +91,13 @@ FROM CAP-datatypes datatypes
 	unexpectedDataValue,
 	unexpectedParameter
 FROM CAP-errortypes errortypes
--- For Rel-6, the CAP-errortypes module is updated to version5(4); Object Identifier
+-- For Rel-6, the CAP-errortypes module is updated to version8(7); Object Identifier
--- 'errortypes' is also updated to version5(4). As a result, the present module uses Rel-6
+-- 'errortypes' is also updated to version8(7). As a result, the present module uses Rel-6
 -- error type definitions.
 
 	CallReferenceNumber
 FROM MAP-CH-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-CH-DataTypes(13) version9(9)}
+gsm-Network(1) modules(3) map-CH-DataTypes(13) version12(12)}
 
 ;
 
@@ -210,6 +210,9 @@ InitialDPSMSArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	calledPartyNumber					[20] ISDN-AddressString						OPTIONAL
 	}
 
+--  The UserCSGInformation is conveyed in the LocationInformation for CS and LocationInformationGPRS
+--  for GPRS. The encoding of the parameter is as defined in 3GPP TS 29.002 [11].
+
 releaseSMS OPERATION ::= {
 	ARGUMENT		ReleaseSMSArg
 	RETURN RESULT	FALSE

asn1/camel/CAP-U-ABORT-Data.asn

@@ -1,7 +1,7 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 5.7	User Abort Data
-CAP-U-ABORT-Data {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-u-abort-data(110) version5(4)}
+CAP-U-ABORT-Data {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-u-abort-data(110) version8(7)}
 
 DEFINITIONS ::= BEGIN
 
@@ -39,10 +39,11 @@ CAP-U-ABORT-REASON ::= ENUMERATED {
 --								originationReference is absent in the received message but is
 --								required to be present according to the procedures in
 --								subclause 14.1.7.
---								This abort reason is used for CAP defined GPRS-ReferenceNumber.
+--								This abort reason is used for CAP defined GPRS ReferenceNumber.
 -- overlapping-dialogue			shall be used by the gprsSSF to indicate to the gsmSCF that a
 --								specific instance already has a TC dialogue open. This error
 --								cause is typically obtained when both the gsmSCF and gprsSSF
 --								open a new dialogue at the same time.
 -- no-reason-given				shall be set when any other reasons above do not apply
 END -- of CAP-U-ABORT-Data
+

asn1/camel/CAP-classes.asn

@@ -1,8 +1,8 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 5.5	Classes
 CAP-classes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1)
-modules(3) cap-classes(54) version5(4)}
+modules(3) cap-classes(54) version8(7)}
 
 DEFINITIONS ::= BEGIN
 
@@ -23,7 +23,7 @@ FROM Remote-Operations-Information-Objects ros-InformationObjects
 	smsSSF-gsmSCF-Protocol,
 	gprsSSF-gsmSCF-Protocol
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 	capSsfToScfGeneric,
 	capAssistHandoffssfToScf,
@@ -123,7 +123,7 @@ firstExtension EXTENSION ::= {
 -- firstExtension is just an example.
 
 SupportedExtensions EXTENSION ::= {firstExtension, ...
--- full set of network operator extensions --
+-- full set of network operator extensions –-
 }
 -- SupportedExtension is the full set of the network operator extensions.
 

asn1/camel/CAP-datatypes.asn

@@ -1,8 +1,8 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 5	Common CAP Types
 -- 5.1	Data types
-CAP-datatypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-datatypes(52) version5(4)}
+CAP-datatypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-datatypes(52) version8(7)}
 
 DEFINITIONS IMPLICIT TAGS ::= BEGIN
 
@@ -31,12 +31,13 @@ cs2(20) modules(0) in-cs2-datatypes(0) version1(0)}
 	GSN-Address, -- WS moved to common datatypes in rel 9.0.0	
 	NAEA-CIC
 FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)}
+gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)}
 
 	Ext-QoS-Subscribed,
 	Ext2-QoS-Subscribed, 
 	Ext3-QoS-Subscribed,
 	GeographicalInformation,
+--	GSN-Address,  WS moved to common datatypes in rel 9.0.0
 	LocationInformation,
 	LSAIdentity,
 	QoS-Subscribed,
@@ -44,17 +45,17 @@ gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)}
 	SubscriberState,
 	GPRSChargingID
 FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)}
+gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)}
 
 	CallReferenceNumber,
 	SuppressionOfAnnouncement
 FROM MAP-CH-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-CH-DataTypes(13) version9(9)}
+gsm-Network(1) modules(3) map-CH-DataTypes(13) version12(12)}
 
 	tc-Messages,
 	classes
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 	EXTENSION,
 	PARAMETERS-BOUND,
@@ -63,7 +64,7 @@ FROM CAP-classes classes
 
 	ExtensionContainer
 FROM MAP-ExtensionDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-ExtensionDataTypes(21) version9(9)}
+gsm-Network(1) modules(3) map-ExtensionDataTypes(21) version12(12)}
 
 ;
 
@@ -230,12 +231,12 @@ CalledPartyBCDNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 -- InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric 
 -- character string. In this case, type-of-number '101'B is used, in accordance 
 -- with 3GPP TS 23.040 [6]. The address is coded in accordance with the 
--- GSM 7-bit default alphabet definition and the SMS packing rules 
+-- GSM 7 bit default alphabet definition and the SMS packing rules 
 -- as specified in 3GPP TS 23.038 [15] in this case.
 
 CalledPartyNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 	bound.&minCalledPartyNumberLength .. bound.&maxCalledPartyNumberLength))
--- Indicates the Called Party Number. Refer to ETS EN 300 356-1 [23] for encoding.
+-- Indicates the Called Party Number. Refer to ETS EN 300 356 1 [23] for encoding.
 
 -- A CalledPartyNumber may contain national-specific values of the Nature Of Address
 -- indicator. The filling-in of the national-specific Nature Of Address indicator
@@ -249,7 +250,7 @@ CalledPartyNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 
 CallingPartyNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 	bound.&minCallingPartyNumberLength .. bound.&maxCallingPartyNumberLength))
--- Indicates the Calling Party Number. Refer to ETSI EN 300 356-1 [23] for encoding.
+-- Indicates the Calling Party Number. Refer to ETSI EN 300 356 1 [23] for encoding.
 
 CallResult {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 	bound.&minCallResultLength .. bound.&maxCallResultLength))
@@ -372,8 +373,8 @@ Carrier {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 Cause {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 	bound.&minCauseLength .. bound.&maxCauseLength))
 -- Indicates the cause for interface related information.
--- Refer to ETSI EN 300 356-1 [23] Cause parameter for encoding.
+-- Refer to ETSI EN 300 356 1 [23] Cause parameter for encoding.
--- For the use of cause and location values refer to ITU-T Recommendation Q.850 [47]
+-- For the use of cause and location values refer to ITU T Recommendation Q.850 [47]
 -- Shall always include the cause value and shall also include the diagnostics field,
 -- if available.
 
@@ -528,7 +529,7 @@ DestinationRoutingAddress {PARAMETERS-BOUND : bound} ::= SEQUENCE SIZE(1) OF
 Digits {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 	bound.&minDigitsLength .. bound.&maxDigitsLength))
 -- Indicates the address signalling digits.
--- Refer to ETSI EN 300 356-1 [23] Generic Number & Generic Digits parameters for encoding.
+-- Refer to ETSI EN 300 356 1 [23] Generic Number & Generic Digits parameters for encoding.
 -- The coding of the subfields 'NumberQualifier' in Generic Number and 'TypeOfDigits' in
 -- Generic Digits are irrelevant to the CAP;
 -- the ASN.1 tags are sufficient to identify the parameter.
@@ -588,6 +589,7 @@ DpSpecificInfoAlt {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 		...,
 		initiatorOfServiceChange			[1] InitiatorOfServiceChange			OPTIONAL,
 		natureOfServiceChange				[2] NatureOfServiceChange				OPTIONAL
+	
 		},
 	tServiceChangeSpecificInfo			[1] SEQUENCE {
 		ext-basicServiceCode				[0] Ext-BasicServiceCode				OPTIONAL,
@@ -595,6 +597,7 @@ DpSpecificInfoAlt {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 		initiatorOfServiceChange			[1] InitiatorOfServiceChange			OPTIONAL,
 		natureOfServiceChange				[2] NatureOfServiceChange				OPTIONAL
 		},
+		
 	collectedInfoSpecificInfo			[2]	SEQUENCE {
 		calledPartyNumber					[0]	CalledPartyNumber					OPTIONAL,
 		...
@@ -739,7 +742,7 @@ EventSpecificInformationSMS ::= CHOICE {
 		...
 		},
 	o-smsSubmissionSpecificInfo			[1] SEQUENCE {
-		-- no specific info defined-
+		-- no specific info defined—
 		...
 		},
 	t-smsFailureSpecificInfo			[2] SEQUENCE {
@@ -747,7 +750,7 @@ EventSpecificInformationSMS ::= CHOICE {
 		...
 		},
 	t-smsDeliverySpecificInfo			[3] SEQUENCE {
-		-- no specific info defined-
+		-- no specific info defined—
 		...
 		}
 	}
@@ -870,7 +873,7 @@ GapTreatment {PARAMETERS-BOUND : bound} ::= CHOICE {
 
 GenericNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 	bound.&minGenericNumberLength .. bound.&maxGenericNumberLength))
--- Indicates a generic number. Refer to ETSI EN 300 356-1 [23] Generic number for encoding.
+-- Indicates a generic number. Refer to ETSI EN 300 356 1 [23] Generic number for encoding.
 
 GenericNumbers {PARAMETERS-BOUND : bound} ::= SET SIZE(1..bound.&numOfGenericNumbers) OF GenericNumber {bound}
 
@@ -889,7 +892,6 @@ GPRS-QoS-Extension ::= SEQUENCE {
 	supplement-to-long-QoS-format		[0] Ext2-QoS-Subscribed,
 	... ,
 	additionalSupplement					[1] Ext3-QoS-Subscribed		OPTIONAL
-
 	}
 
 GPRSCause {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE
@@ -1058,18 +1060,24 @@ LocationInformationGPRS		::= SEQUENCE {
 	selectedLSAIdentity					[4] LSAIdentity								OPTIONAL,
 	extensionContainer					[5] ExtensionContainer						OPTIONAL,
 	...,
-	sai-Present							[6] NULL									OPTIONAL
+	sai-Present							[6] NULL									OPTIONAL,
+	userCSGInformation                  [7] UserCSGInformation                      OPTIONAL
 }
 -- cellGlobalIdOrServiceAreaIdOrLAI shall contain the value part of the
 -- CellGlobalIdOrServiceAreaIdFixedLength type or the LAIFixedLength type (i.e. excluding tags
 -- and lengths) as defined in 3GPP TS 29.002 [13].
 -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains
 -- a Service Area Identity. 
+-- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in the
+-- case the Access mode is Hybrid Mode, as defined in 3GPP TS 23.060 [93].
+
+-- WS define UserCSGInformation
+UserCSGInformation ::= OCTET STRING
 
 LocationNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE (
 	bound.&minLocationNumberLength .. bound.&maxLocationNumberLength))
 -- Indicates the Location Number for the calling party.
--- Refer to ETSI EN 300 356-1 [23] for encoding.
+-- Refer to ETSI EN 300 356 1 [23] for encoding.
 
 LowLayerCompatibility {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE (
 	bound.&minLowLayerCompatibilityLength .. bound.&maxLowLayerCompatibilityLength))
@@ -1179,9 +1187,9 @@ MT-SMSCause ::= OCTET STRING (SIZE (1))
 
 NAOliInfo ::= OCTET STRING (SIZE (1))
 --  NA Oli information takes the same value as defined in ANSI T1.113-1995 [92]
---  e.g.	'3D'H  - Decimal value 61 - Cellular Service (Type 1)
+--  e.g.	'3D'H  – Decimal value 61 - Cellular Service (Type 1)
---			'3E'H  - Decimal value 62 - Cellular Service (Type 2)
+--			'3E'H  – Decimal value 62 - Cellular Service (Type 2)
---			'3F'H  - Decimal value 63 - Cellular Service (roaming)
+--			'3F'H  – Decimal value 63 - Cellular Service (roaming)
 
 NatureOfServiceChange ::= ENUMERATED {
 	userInitiated						(0),
@@ -1198,7 +1206,7 @@ OCSIApplicable ::= NULL
 
 OriginalCalledPartyID {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 	bound.&minOriginalCalledPartyIDLength .. bound.&maxOriginalCalledPartyIDLength))
---  Indicates the original called number. Refer to ETSI EN 300 356-1 [23] Original Called Number
+--  Indicates the original called number. Refer to ETSI EN 300 356 1 [23] Original Called Number
 --  for encoding.
 
 PDPID ::= OCTET STRING (SIZE (1))
@@ -1228,7 +1236,7 @@ ReceivingSideID ::= CHOICE {
 RedirectingPartyID {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE (
 	bound.&minRedirectingPartyIDLength .. bound.&maxRedirectingPartyIDLength))
 -- Indicates redirecting number.
--- Refer to ETSI EN 300 356-1 [23] Redirecting number for encoding.
+-- Refer to ETSI EN 300 356 1 [23] Redirecting number for encoding.
 
 RequestedInformationList {PARAMETERS-BOUND : bound} ::= SEQUENCE SIZE (1.. numOfInfoItems) OF RequestedInformation {bound}
 
@@ -1271,14 +1279,14 @@ ScfID {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 
 SCIBillingChargingCharacteristics {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE (
 	bound.&minSCIBillingChargingLength .. bound.&maxSCIBillingChargingLength))
-	(CONSTRAINED BY {-- shall be the result of the BER-encoded value of type --
+	(CONSTRAINED BY {-- shall be the result of the BER-encoded value of type –-
 	CAMEL-SCIBillingChargingCharacteristics})
 -- Indicates AOC information to be sent to a Mobile Station
 -- The violation of the UserDefinedConstraint shall be handled as an ASN.1 syntax error.
 
 SCIGPRSBillingChargingCharacteristics {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE (
 	bound.&minSCIBillingChargingLength .. bound.&maxSCIBillingChargingLength))
-	(CONSTRAINED BY {-- shall be the result of the BER-encoded value of type -
+	(CONSTRAINED BY {-- shall be the result of the BER-encoded value of type –
 	CAMEL-SCIGPRSBillingChargingCharacteristics})
 -- Indicates AOC information to be sent to a Mobile Station
 -- The violation of the UserDefinedConstraint shall be handled as an ASN.1 syntax error.
@@ -1345,7 +1353,7 @@ SMS-AddressString ::= AddressString (SIZE (1 .. maxSMS-AddressStringLength))
 -- If this data type is used for MO-SMS, then the maximum number of digits shall be 16.
 -- An SMS-AddressString may contain an alphanumeric character string. In this 
 -- case, a nature of address indicator '101'B is used, in accordance with 
--- 3GPP TS 23.040 [6]. The address is coded in accordance with the GSM 7-bit 
+-- 3GPP TS 23.040 [6]. The address is coded in accordance with the GSM 7 bit 
 -- default alphabet definition and the SMS packing rules as specified in 
 -- 3GPP TS 23.038 [15] in this case.
 

asn1/camel/CAP-errorcodes.asn

@@ -1,7 +1,7 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 5.4	Error codes
-CAP-errorcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errorcodes(57) version5(4)}
+CAP-errorcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errorcodes(57) version8(7)}
 
 DEFINITIONS ::= BEGIN
 
@@ -9,7 +9,7 @@ IMPORTS
 
 	ros-InformationObjects
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 	Code
 FROM Remote-Operations-Information-Objects ros-InformationObjects

asn1/camel/CAP-errortypes.asn

@@ -1,7 +1,7 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 5.2	Error types
-CAP-errortypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errortypes(51) version5(4)}
+CAP-errortypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errortypes(51) version8(7)}
 
 -- This module contains the type definitions for the CAP Error Types.
 -- Where a parameter of type CHOICE is tagged with a specific tag value, the tag is automatically
@@ -15,7 +15,7 @@ IMPORTS
 	datatypes,
 	errorcodes
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 	ERROR
 FROM Remote-Operations-Information-Objects ros-InformationObjects

asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn

@@ -1,16 +1,16 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 8	GPRS Control
 -- 8.1	gsmSCF/gprsSSF operations and arguments
 CAP-gprsSSF-gsmSCF-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-GPRS-ops-args(107) version5(4)}
+umts-network(1) modules(3) cap-GPRS-ops-args(107) version8(7)}
--- Module CAP-gprsSSF-gsmSCF-ops-args is updated to version5(4) for Rel-6. The OPERATION
+-- Module CAP-gprsSSF-gsmSCF-ops-args is updated to version8(7) for Rel-6. The OPERATION
 -- definitions in this module are not modified, compared to Rel-5.
 
 DEFINITIONS IMPLICIT TAGS ::= BEGIN
 
 -- This module contains the operations and operation arguments used for the
--- gprsSSF - gsmSCF interface, for the control of GPRS.
+-- gprsSSF – gsmSCF interface, for the control of GPRS.
 
 -- The table in subclause 2.1 lists the specifications that contain the modules
 -- that are used by CAP.
@@ -23,7 +23,7 @@ IMPORTS
 	classes,
 	ros-InformationObjects
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 	OPERATION
 FROM Remote-Operations-Information-Objects ros-InformationObjects
@@ -41,13 +41,14 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)}
 	GSN-Address, -- WS moved to common datatypes in rel 9.0.0
 	ISDN-AddressString
 FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)}
+gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)}
 
 	GPRSChargingID,
 	GPRSMSClass,
+--	GSN-Address,  WS moved to common datatypes in rel 9.0.0
 	RAIdentity
 FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)}
+gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)}
 
 	PARAMETERS-BOUND
 FROM CAP-classes classes
@@ -91,8 +92,8 @@ FROM CAP-operationcodes operationcodes
 	TimerID,
 	TimerValue
 FROM CAP-datatypes datatypes
--- For Rel-6, the CAP-datatypes module is updated to version5(4); Object Identifier 'datatypes'
+-- For Rel-6, the CAP-datatypes module is updated to version8(7); Object Identifier 'datatypes'
--- is also updated to version5(4). As a result, the present module uses Rel-6 data type definitions.
+-- is also updated to version8(7). As a result, the present module uses Rel-6 data type definitions.
 
 	missingCustomerRecord,
 	missingParameter,
@@ -104,8 +105,8 @@ FROM CAP-datatypes datatypes
 	unexpectedParameter,
 	unknownPDPID
 FROM CAP-errortypes errortypes
--- For Rel-6, the CAP-errortypes module is updated to version5(4); Object Identifier
+-- For Rel-6, the CAP-errortypes module is updated to version8(7); Object Identifier
--- 'errortypes' is also updated to version5(4). As a result, the present module uses Rel-6
+-- 'errortypes' is also updated to version8(7). As a result, the present module uses Rel-6
 -- error type definitions.
 
 ;
@@ -320,6 +321,8 @@ InitialDPGPRSArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
 --	The RouteingAreaIdentity parameter is not used. 
 --	The receiving entity shall ignore RouteingAreaIdentity if received.
 --  The RouteingAreaIdentity is conveyed in the LocationInformationGPRS parameter. 
+--  The CSGInformation is conveyed in the LocationInformationGPRS parameter. The encoding of the
+--  parameter is as defined in 3GPP TS 29.002 [11].
 
 releaseGPRS {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ReleaseGPRSArg {bound}
@@ -372,7 +375,7 @@ resetTimerGPRS OPERATION ::= {
 					unexpectedParameter |
 					unknownPDPID}
 	CODE			opcode-resetTimerGPRS}
---  Direction: gsmSCF -? gprsSSF, Timer: Trtg
+--  Direction: gsmSCF –? gprsSSF, Timer: Trtg
 --  This operation is used to request the gprsSSF to refresh an application timer in the gprsSSF.
 
 ResetTimerGPRSArg ::= SEQUENCE {

asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn

@@ -1,14 +1,14 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 6.2	gsmSCF/gsmSRF interface
 -- 6.2.1	gsmSCF/gsmSRF operations and arguments
 CAP-gsmSCF-gsmSRF-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-gsmSCF-gsmSRF-ops-args(103) version5(4)}
+umts-network(1) modules(3) cap-gsmSCF-gsmSRF-ops-args(103) version8(7)}
 
 DEFINITIONS IMPLICIT TAGS ::= BEGIN
 
 -- This module contains the operations and operation arguments used for the
--- gsmSRF - gsmSCF interface, for the control of circuit switched calls.
+-- gsmSRF – gsmSCF interface, for the control of circuit switched calls.
 
 -- The table in subclause 2.1 lists the specifications that contain the modules
 -- that are used by CAP.
@@ -31,8 +31,8 @@ FROM CAP-operationcodes operationcodes
 	Extensions {},
 	InformationToSend {}
 FROM CAP-datatypes datatypes
--- For Rel-6, the CAP-datatypes module is updated to version5(4); Object Identifier 'datatypes'
+-- For Rel-6, the CAP-datatypes module is updated to version8(7); Object Identifier 'datatypes'
--- is also updated to version5(4). As a result, the present module uses Rel-6 data type definitions.
+-- is also updated to version8(7). As a result, the present module uses Rel-6 data type definitions.
 
 	canceled,
 	improperCallerResponse,
@@ -46,8 +46,8 @@ FROM CAP-datatypes datatypes
 	unexpectedParameter,
 	unknownCSID
 FROM CAP-errortypes errortypes
--- For Rel-6, the CAP-errortypes module is updated to version5(4); Object Identifier
+-- For Rel-6, the CAP-errortypes module is updated to version8(7); Object Identifier
--- 'errortypes' is also updated to version5(4). As a result, the present module uses Rel-6
+-- 'errortypes' is also updated to version8(7). As a result, the present module uses Rel-6
 -- error type definitions.
 
 	PARAMETERS-BOUND
@@ -59,7 +59,7 @@ FROM CAP-classes classes
 	errortypes,
 	classes
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 ;
 

asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn

@@ -1,15 +1,15 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 6	Circuit Switched Call Control
 -- 6.1	gsmSSF/CCF - gsmSCF Interface
 -- 6.1.1	Operations and arguments
 CAP-gsmSSF-gsmSCF-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-gsmSSF-gsmSCF-ops-args(101) version5(4)}
+umts-network(1) modules(3) cap-gsmSSF-gsmSCF-ops-args(101) version8(7)}
 
 DEFINITIONS IMPLICIT TAGS ::= BEGIN
 
 -- This module contains the operations and operation arguments used for the
--- gsmSSF - gsmSCF interface, for the control of circuit switched calls.
+-- gsmSSF – gsmSCF interface, for the control of circuit switched calls.
 
 -- The table in subclause 2.1 lists the specifications that contain the modules
 -- that are used by CAP.
@@ -23,7 +23,7 @@ IMPORTS
 	tc-Messages,
 	ros-InformationObjects
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 	OPERATION
 FROM Remote-Operations-Information-Objects ros-InformationObjects
@@ -45,7 +45,7 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)}
 	IMSI,
 	ISDN-AddressString
 FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)}
+gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)}
 
 	CUG-Index,
 	CUG-Interlock,
@@ -56,13 +56,13 @@ gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)}
 	SupportedCamelPhases,
 	OfferedCamel4Functionalities
 FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)}
+gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)}
 
 	CallReferenceNumber,
 	SuppressionOfAnnouncement,
 	UU-Data
 FROM MAP-CH-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-gsm-Network(1) modules(3) map-CH-DataTypes(13) version9(9)}
+gsm-Network(1) modules(3) map-CH-DataTypes(13) version12(12)}
 
 	PARAMETERS-BOUND
 FROM CAP-classes classes
@@ -155,8 +155,8 @@ FROM CAP-operationcodes operationcodes
 	TimerID,
 	TimerValue
 FROM CAP-datatypes datatypes
--- For Rel-6, the CAP-datatypes module is updated to version5(4); Object Identifier 'datatypes'
+-- For Rel-6, the CAP-datatypes module is updated to version8(7); Object Identifier 'datatypes'
--- is also updated to version5(4). As a result, the present module uses Rel-6 data type definitions.
+-- is also updated to version8(7). As a result, the present module uses Rel-6 data type definitions.
 
 	cancelFailed,
 	eTCFailed,
@@ -172,8 +172,8 @@ FROM CAP-datatypes datatypes
 	unknownLegID,
 	unknownCSID
 FROM CAP-errortypes errortypes
--- For Rel-6, the CAP-errortypes module is updated to version5(4); Object Identifier
+-- For Rel-6, the CAP-errortypes module is updated to version8(7); Object Identifier
--- 'errortypes' is also updated to version5(4). As a result, the present module uses Rel-6
+-- 'errortypes' is also updated to version8(7). As a result, the present module uses Rel-6
 -- error type definitions.
 
 ;
@@ -345,13 +345,25 @@ CancelArg {PARAMETERS-BOUND : bound} ::= CHOICE {
 	}
 -- The InvokeID has the same value as that which was used for the operation to be cancelled.
 
-collectInformation OPERATION::= {
+collectInformation {PARAMETERS-BOUND : bound} OPERATION::= {
+	ARGUMENT			CollectInformationArg {bound}
 	RETURN RESULT		FALSE
-ALWAYS RESPONDS		FALSE
+	ERRORS		{missingParameter |
+					parameterOutOfRange | 
+					SystemFailure	|
+					TaskRefused	|
+					UnexpectedComponentSequence	|
+					UnexpectedDataValue	|
+					UnexpectedParameter}
 	CODE				opcode-collectInformation}
 -- Direction: gsmSCF-> gsmSSF, Timer: Tci 
 -- This operation is used to request the gsmSSF to perform the call
--- processing actions to prompt a calling party for additional destination informationdigits.
+-- processing actions to prompt a calling party for additional digits.
+
+CollectInformationArg {PARAMETERS-BOUND : bound} ::= SEQUENCE{
+	extensions										[0]	Extensions {bound}	OPTIONAL,
+	...
+	}
 
 connect {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ConnectArg {bound}
@@ -390,7 +402,6 @@ ConnectArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	bor-InterrogationRequested			[58] NULL									OPTIONAL,
 	... ,
 	suppress-N-CSI						[59] NULL									OPTIONAL
-
 	}
 -- na-Info is included at the discretion of the gsmSCF operator.
 
@@ -683,6 +694,8 @@ InitialDPArgExtension {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 -- tones and the collection of DTMF digits. Other supported capabilities are explicitly 
 -- detailed in the IPSSPCapabilities parameter itself.
 -- Carrier is included at the discretion of the gsmSSF operator. 
+-- The UserCSGInformation is conveyed in the LocationInformation. The encoding of the parameter is
+-- as defined in 3GPP TS 29.002 [11].
 
 initiateCallAttempt {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		InitiateCallAttemptArg {bound}

asn1/camel/CAP-object-identifiers.asn

@@ -1,8 +1,8 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 5.6	Object IDentifiers (IDs)
 CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 DEFINITIONS ::= BEGIN
 
@@ -23,71 +23,71 @@ ros-InformationObjects							OBJECT IDENTIFIER ::=
 -- For CAP Modules
 datatypes										OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-datatypes(52) version5(4)}
+	cap-datatypes(52) version8(7)}
 
 errortypes										OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-errortypes(51) version5(4)}
+	cap-errortypes(51) version8(7)}
 
 operationcodes									OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-operationcodes(53) version5(4)}
+	cap-operationcodes(53) version8(7)}
 
 errorcodes										OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-errorcodes(57) version5(4)}
+	cap-errorcodes(57) version8(7)}
 
 classes											OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-classes(54) version5(4)}
+	cap-classes(54) version8(7)}
 
 
 gsmSSF-gsmSCF-Operations						OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-gsmSSF-gsmSCF-ops-args(101) version5(4)}
+	cap-gsmSSF-gsmSCF-ops-args(101) version8(7)}
--- The Object Identifier 'gsmSSF-gsmSCF-Operations' is updated to version5(4) in Rel-6, so
+-- The Object Identifier 'gsmSSF-gsmSCF-Operations’ is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Operation definitions related to call control.
 
 gsmSSF-gsmSCF-Protocol							OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-gsmSSF-gsmSCF-pkgs-contracts-acs(102) version5(4)}
+	cap-gsmSSF-gsmSCF-pkgs-contracts-acs(102) version8(7)}
--- The Object Identifier 'gsmSSF-gsmSCF-Protocol' is updated to version5(4) in Rel-6, so
+-- The Object Identifier 'gsmSSF-gsmSCF-Protocol' is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Protocol definitions related to call control.
 
 gsmSCF-gsmSRF-Operations						OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-gsmSCF-gsmSRF-ops-args(103) version5(4)}
+	cap-gsmSCF-gsmSRF-ops-args(103) version8(7)}
--- The Object Identifier 'gsmSCF-gsmSRF-Operations' is updated to version5(4) in Rel-6, so
+-- The Object Identifier 'gsmSCF-gsmSRF-Operations' is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Operation definitions related to gsmSRF control.
 
 gsmSCF-gsmSRF-Protocol							OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-gsmSCF-gsmSRF-pkgs-contracts-acs(104) version5(4)}
+	cap-gsmSCF-gsmSRF-pkgs-contracts-acs(104) version8(7)}
--- The Object Identifier 'gsmSCF-gsmSRF-Protocol' is updated to version5(4) in Rel-6, so
+-- The Object Identifier 'gsmSCF-gsmSRF-Protocol' is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Protocol definitions related to gsmSRF control.
 
 sms-Operations									OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-SMS-ops-args(105) version5(4)}
+	cap-SMS-ops-args(105) version8(7)}
--- The Object Identifier 'sms-Operations' is updated to version5(4) in Rel-6, so other
+-- The Object Identifier 'sms-Operations' is updated to version8(7) in Rel-6, so other
 -- modules can IMPORT Rel-6 Operation definitions related to SMS control.
 
 smsSSF-gsmSCF-Protocol							OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-smsSSF-gsmSCF-pkgs-contracts-acs(106) version5(4)}
+	cap-smsSSF-gsmSCF-pkgs-contracts-acs(106) version8(7)}
--- The Object Identifier 'smsSSF-gsmSCF-Protocol' is updated to version5(4) in Rel-6, so
+-- The Object Identifier 'smsSSF-gsmSCF-Protocol' is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Protocol definitions related to SMS control.
 
 gprsSSF-gsmSCF-Operations						OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-GPRS-ops-args(107) version5(4)}
+	cap-GPRS-ops-args(107) version8(7)}
--- The Object Identifier 'gprsSSF-gsmSCF-Operations' is updated to version5(4) in Rel-6, so
+-- The Object Identifier 'gprsSSF-gsmSCF-Operations' is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Operation definitions related to GPRS control.
 
 gprsSSF-gsmSCF-Protocol							OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
-	cap-gprsSSF-gsmSCF-pkgs-contracts-acs(108) version5(4)}
+	cap-gprsSSF-gsmSCF-pkgs-contracts-acs(108) version8(7)}
--- The Object Identifier 'gprsSSF-gsmSCF-Protocol' is updated to version5(4) in Rel-6, so
+-- The Object Identifier 'gprsSSF-gsmSCF-Protocol' is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Protocol definitions related to GPRS control.
 
 id-CAP											OBJECT IDENTIFIER ::=

asn1/camel/CAP-operationcodes.asn

@@ -1,7 +1,7 @@
 -- $Id$
--- 3GPP TS 29.078 9.0.0 (2009-12)
+-- 3GPP TS 29.078 9.2.0 (2010-06)
 -- 5.3	Operation codes
-CAP-operationcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-operationcodes(53) version5(4)}
+CAP-operationcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-operationcodes(53) version8(7)}
 
 DEFINITIONS ::= BEGIN
 
@@ -9,7 +9,7 @@ IMPORTS
 
 	ros-InformationObjects
 FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
-umts-network(1) modules(3) cap-object-identifiers(100) version5(4)}
+umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 	Code
 FROM Remote-Operations-Information-Objects ros-InformationObjects
@@ -118,3 +118,4 @@ FROM Remote-Operations-Information-Objects ros-InformationObjects
 	opcode-sendChargingInformationGPRS			Code ::= local: 83
 
 END
+

epan/dissectors/packet-camel.c

@@ -133,6 +133,7 @@ static int hf_camel_CallGapArg_PDU = -1;          /* CallGapArg */
 static int hf_camel_CallInformationReportArg_PDU = -1;  /* CallInformationReportArg */
 static int hf_camel_CallInformationRequestArg_PDU = -1;  /* CallInformationRequestArg */
 static int hf_camel_CancelArg_PDU = -1;           /* CancelArg */
+static int hf_camel_CollectInformationArg_PDU = -1;  /* CollectInformationArg */
 static int hf_camel_ConnectArg_PDU = -1;          /* ConnectArg */
 static int hf_camel_ConnectToResourceArg_PDU = -1;  /* ConnectToResourceArg */
 static int hf_camel_ContinueWithArgumentArg_PDU = -1;  /* ContinueWithArgumentArg */
@@ -373,6 +374,7 @@ static int hf_camel_sgsn_Number = -1;             /* ISDN_AddressString */
 static int hf_camel_selectedLSAIdentity = -1;     /* LSAIdentity */
 static int hf_camel_extensionContainer = -1;      /* ExtensionContainer */
 static int hf_camel_sai_Present = -1;             /* NULL */
+static int hf_camel_userCSGInformation = -1;      /* UserCSGInformation */
 static int hf_camel_elementaryMessageID = -1;     /* Integer4 */
 static int hf_camel_text = -1;                    /* T_text */
 static int hf_camel_messageContent = -1;          /* IA5String_SIZE_bound__minMessageContentLength_bound__maxMessageContentLength */
@@ -750,6 +752,7 @@ static gint ett_camel_CallGapArg = -1;
 static gint ett_camel_CallInformationReportArg = -1;
 static gint ett_camel_CallInformationRequestArg = -1;
 static gint ett_camel_CancelArg = -1;
+static gint ett_camel_CollectInformationArg = -1;
 static gint ett_camel_ConnectArg = -1;
 static gint ett_camel_ConnectToResourceArg = -1;
 static gint ett_camel_T_resourceAddress = -1;
@@ -942,19 +945,19 @@ static const value_string camel_ectTreatmentIndicator_values[] = {
 #define tc_Messages                    "0.0.17.773.2.1.3"
 #define tc_NotationExtensions          "0.0.17.775.2.4.1"
 #define ros_InformationObjects         "2.4.5.0"
-#define datatypes                      "0.4.0.0.1.3.52.4"
+#define datatypes                      "0.4.0.0.1.3.52.7"
-#define errortypes                     "0.4.0.0.1.3.51.4"
+#define errortypes                     "0.4.0.0.1.3.51.7"
-#define operationcodes                 "0.4.0.0.1.3.53.4"
+#define operationcodes                 "0.4.0.0.1.3.53.7"
-#define errorcodes                     "0.4.0.0.1.3.57.4"
+#define errorcodes                     "0.4.0.0.1.3.57.7"
-#define classes                        "0.4.0.0.1.3.54.4"
+#define classes                        "0.4.0.0.1.3.54.7"
-#define gsmSSF_gsmSCF_Operations       "0.4.0.0.1.3.101.4"
+#define gsmSSF_gsmSCF_Operations       "0.4.0.0.1.3.101.7"
-#define gsmSSF_gsmSCF_Protocol         "0.4.0.0.1.3.102.4"
+#define gsmSSF_gsmSCF_Protocol         "0.4.0.0.1.3.102.7"
-#define gsmSCF_gsmSRF_Operations       "0.4.0.0.1.3.103.4"
+#define gsmSCF_gsmSRF_Operations       "0.4.0.0.1.3.103.7"
-#define gsmSCF_gsmSRF_Protocol         "0.4.0.0.1.3.104.4"
+#define gsmSCF_gsmSRF_Protocol         "0.4.0.0.1.3.104.7"
-#define sms_Operations                 "0.4.0.0.1.3.105.4"
+#define sms_Operations                 "0.4.0.0.1.3.105.7"
-#define smsSSF_gsmSCF_Protocol         "0.4.0.0.1.3.106.4"
+#define smsSSF_gsmSCF_Protocol         "0.4.0.0.1.3.106.7"
-#define gprsSSF_gsmSCF_Operations      "0.4.0.0.1.3.107.4"
+#define gprsSSF_gsmSCF_Operations      "0.4.0.0.1.3.107.7"
-#define gprsSSF_gsmSCF_Protocol        "0.4.0.0.1.3.108.4"
+#define gprsSSF_gsmSCF_Protocol        "0.4.0.0.1.3.108.7"
 #define id_CAP                         "0.4.0.0.1.22"
 #define id_CAP3                        "0.4.0.0.1.20"
 #define id_CAPOE                       "0.4.0.0.1.23"
@@ -4336,6 +4339,16 @@ dissect_camel_T_cellGlobalIdOrServiceAreaIdOrLAI(gboolean implicit_tag _U_, tvbu
 }
 
 
+
+static int
+dissect_camel_UserCSGInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                       NULL);
+
+  return offset;
+}
+
+
 static const ber_sequence_t LocationInformationGPRS_sequence[] = {
   { &hf_camel_cellGlobalIdOrServiceAreaIdOrLAI, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_T_cellGlobalIdOrServiceAreaIdOrLAI },
   { &hf_camel_routeingAreaIdentity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_RAIdentity },
@@ -4344,6 +4357,7 @@ static const ber_sequence_t LocationInformationGPRS_sequence[] = {
   { &hf_camel_selectedLSAIdentity, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LSAIdentity },
   { &hf_camel_extensionContainer, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer },
   { &hf_camel_sai_Present   , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_NULL },
+  { &hf_camel_userCSGInformation, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_UserCSGInformation },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -5218,6 +5232,20 @@ dissect_camel_CancelArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
+static const ber_sequence_t CollectInformationArg_sequence[] = {
+  { &hf_camel_extensions    , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_Extensions },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_camel_CollectInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+                                   CollectInformationArg_sequence, hf_index, ett_camel_CollectInformationArg);
+
+  return offset;
+}
+
+
 static const ber_sequence_t ConnectArg_sequence[] = {
   { &hf_camel_destinationRoutingAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_camel_DestinationRoutingAddress },
   { &hf_camel_alertingPattern, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_AlertingPattern },
@@ -6464,6 +6492,13 @@ static int dissect_CancelArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
   offset = dissect_camel_CancelArg(FALSE, tvb, offset, &asn1_ctx, tree, hf_camel_CancelArg_PDU);
   return offset;
 }
+static int dissect_CollectInformationArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_camel_CollectInformationArg(FALSE, tvb, offset, &asn1_ctx, tree, hf_camel_CollectInformationArg_PDU);
+  return offset;
+}
 static int dissect_ConnectArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -6785,6 +6820,9 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
     case opcode_cancel:  /* cancel */
       offset= dissect_CancelArg_PDU(tvb, actx->pinfo , tree);
       break;
+    case opcode_collectInformation:  /* collectInformation */
+      offset= dissect_CollectInformationArg_PDU(tvb, actx->pinfo , tree);
+      break;
     case opcode_connect:  /* connect */
       offset= dissect_ConnectArg_PDU(tvb, actx->pinfo , tree);
       break;
@@ -7316,6 +7354,10 @@ void proto_register_camel(void) {
       { "CancelArg", "camel.CancelArg",
         FT_UINT32, BASE_DEC, VALS(camel_CancelArg_vals), 0,
         NULL, HFILL }},
+    { &hf_camel_CollectInformationArg_PDU,
+      { "CollectInformationArg", "camel.CollectInformationArg",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_camel_ConnectArg_PDU,
       { "ConnectArg", "camel.ConnectArg",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -8276,6 +8318,10 @@ void proto_register_camel(void) {
       { "sai-Present", "camel.sai_Present",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_camel_userCSGInformation,
+      { "userCSGInformation", "camel.userCSGInformation",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_camel_elementaryMessageID,
       { "elementaryMessageID", "camel.elementaryMessageID",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -9281,6 +9327,7 @@ void proto_register_camel(void) {
     &ett_camel_CallInformationReportArg,
     &ett_camel_CallInformationRequestArg,
     &ett_camel_CancelArg,
+    &ett_camel_CollectInformationArg,
     &ett_camel_ConnectArg,
     &ett_camel_ConnectToResourceArg,
     &ett_camel_T_resourceAddress,