Hope fully this will be the correct set of files - finally.

svn path=/trunk/; revision=35781

3 files changed, 774 insertions, 642 deletions

diff --git a/asn1/gprscdr/GPRSChargingDataTypes.asn b/asn1/gprscdr/GPRSChargingDataTypes.asn
new file mode 100644
index 0000000000..807670b7e1
--- /dev/null
+++ b/asn1/gprscdr/GPRSChargingDataTypes.asn
@@ -0,0 +1,773 @@
+-- $Id$
+-- 3GPP TS 32.298 V6.1.0 (2005-09)
+--GPRSChargingDataTypes {itu-t identified-organization (4) etsi (0) mobileDomain (0) gsmUmtsNetwork (x) charging (5) asn1Module (z) gprsChargingDataTypes (2) version1 (1)}
+GPRSChargingDataTypes {itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) charging (5) gprsChargingDataTypes (2) asn1Module (0) version1 (0)}
+
+DEFINITIONS IMPLICIT TAGS	::=
+
+BEGIN
+
+-- EXPORTS everything 
+
+IMPORTS	
+
+--CallDuration, CalledNumber, CallEventRecordType, CallingNumber, CallReferenceNumber, CellId, DefaultSMS-Handling, Diagnostics, Ext-GeographicalInformation, IMSI, IMEI, IPAddress, ISDN-AddressString, LCSCause, LCSClientExternalID, LCSClientIdentity, LCSClientInternalID, LCSClientType, LCS-Priority, LCSQoSInfo, LevelOfCAMELService, LocalSequenceNumber, LocationAreaAndCell, LocationAreaCode, LocationType, ManagementExtensions, MessageReference, MSISDN, NotificationToMSUser, PositioningData, RecordingEntity, ServiceKey, SMSResult, SmsTpDestinationNumber, TimeStamp
+--
+--FROM 3GPPGenericChargingDataTypes {itu-t identified-organization (4) etsi(0) mobileDomain (0) gsmUmtsNetwork (x) charging (y) asn1Module (z) genericChargingDataTypes (0) version1 (1)}
+
+
+DefaultGPRS-Handling
+FROM MAP-MS-DataTypes    { itu-t identified-organization (4) etsi (0) mobileDomain (0)
+gsm-Network (1) modules (3) map-MS-DataTypes (11) version6 (6)  }
+-- from TS 29.002 [60]
+
+
+LocationMethod
+FROM SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) ss-DataTypes (2) version7 (7)}
+
+-- from TS 24.080 [61] (editor’s note: correct reference?)
+
+--MBMS2G3GIndicator, FileRepairSupported, MBMSServiceType, MBMSUserServiceType, RequiredMBMSBearerCapabilities, MBMSSessionIdentity, TMGI, MBMSInformation
+
+
+--FROM MBMSChargingDataTypes {itu-t identified-organization (4) etsi(0) mobileDomain (0) gsm-Network (1) charging (y)  asn1Module (z) mbmsChargingDataTypes (6) version1 (1)}
+--FROM MBMSChargingDataTypes {itu-t (0) identified-organization (4) etsi(0) mobileDomain (0) charging (5) mbmsChargingDataTypes (8) asn1Module (0) version1 (0)}
+
+-- Editor’s note:  consider moving the above 2 items also into the generic module in order to avoid again copying from external sources.
+;
+
+------------------------------------------------------------------------------
+--
+--  GPRS CALL AND EVENT RECORDS
+--
+------------------------------------------------------------------------------
+
+GPRSCallEventRecord	::= CHOICE 
+--
+-- Record values 20..27 are GPRS specific
+-- Record values 29..30 are GPRS and MBMS specific
+{
+	sgsnPDPRecord			[20] SGSNPDPRecord,
+	ggsnPDPRecord			[21] GGSNPDPRecord,
+	sgsnMMRecord			[22] SGSNMMRecord,
+	sgsnSMORecord			[23] SGSNSMORecord,
+	sgsnSMTRecord			[24] SGSNSMTRecord,
+--	sgsnLCTRecord			[25] SGSNLCTRecord,
+--	sgsnLCORecord			[26] SGSNLCORecord,
+--	sgsnLCNRecord			[27] SGSNLCNRecord,
+	egsnPDPRecord			[28] EGSNPDPRecord,
+	sgsnMBMSRecord			[29] SGSNMBMSRecord,
+	ggsnMBMSRecord			[30] GGSNMBMSRecord
+}
+-- Editor’s note:  the acronyms for the LCS record types are not consistent with CS and the “call event record type” notation.  They also contradict to the record type definitons below, so alignment is needed.
+
+GGSNPDPRecord 	::= SET
+{
+	recordType					 [0] CallEventRecordType,
+	networkInitiation			 [1] NetworkInitiatedPDPContext OPTIONAL,
+	servedIMSI					 [3] IMSI,
+	ggsnAddress					 [4] GSNAddress,
+	chargingID					 [5] ChargingID,
+	sgsnAddress					 [6] SEQUENCE OF GSNAddress,
+	accessPointNameNI			 [7] AccessPointNameNI OPTIONAL,
+	pdpType						 [8] PDPType OPTIONAL,
+	servedPDPAddress			 [9] PDPAddress OPTIONAL,
+	dynamicAddressFlag			 [11] DynamicAddressFlag OPTIONAL,
+	listOfTrafficVolumes		 [12] SEQUENCE OF ChangeOfCharCondition OPTIONAL,
+	recordOpeningTime			 [13] TimeStamp,
+	duration					 [14] CallDuration,
+	causeForRecClosing			 [15] CauseForRecClosing,
+	diagnostics					 [16] Diagnostics OPTIONAL,
+	recordSequenceNumber		 [17] INTEGER OPTIONAL,
+	nodeID						 [18] NodeID OPTIONAL,
+	recordExtensions			 [19] ManagementExtensions OPTIONAL,
+	localSequenceNumber			 [20] LocalSequenceNumber OPTIONAL,
+	apnSelectionMode			 [21] APNSelectionMode OPTIONAL,
+	servedMSISDN				 [22] MSISDN OPTIONAL,
+	chargingCharacteristics		 [23] ChargingCharacteristics,
+	chChSelectionMode			 [24] ChChSelectionMode OPTIONAL,
+	iMSsignalingContext			 [25] NULL OPTIONAL,
+	externalChargingID			 [26] OCTET STRING OPTIONAL,
+	sgsnPLMNIdentifier			 [27] PLMN-Id OPTIONAL,
+	pSFurnishChargingInformation [28] PSFurnishChargingInformation OPTIONAL,
+	servedIMEISV				 [29] IMEI OPTIONAL,
+	rATType						 [30] RATType OPTIONAL,
+	mSTimeZone 					 [31] MSTimeZone OPTIONAL,
+	userLocationInformation		 [32] OCTET STRING OPTIONAL,
+	cAMELChargingInformation	 [33] OCTET STRING OPTIONAL
+	
+}
+
+EGSNPDPRecord 	::= SET
+{
+	recordType					 [0] CallEventRecordType,
+	networkInitiation			 [1] NetworkInitiatedPDPContext OPTIONAL,
+	servedIMSI					 [3] IMSI,
+	ggsnAddress					 [4] GSNAddress,
+	chargingID					 [5] ChargingID,
+	sgsnAddress					 [6] SEQUENCE OF GSNAddress,
+	accessPointNameNI			 [7] AccessPointNameNI OPTIONAL,
+	pdpType						 [8] PDPType OPTIONAL,
+	servedPDPAddress			 [9] PDPAddress OPTIONAL,
+	dynamicAddressFlag			 [11] DynamicAddressFlag OPTIONAL,
+	listOfTrafficVolumes		 [12] SEQUENCE OF ChangeOfCharCondition OPTIONAL,
+	recordOpeningTime			 [13] TimeStamp,
+	duration					 [14] CallDuration,
+	causeForRecClosing			 [15] CauseForRecClosing,
+	diagnostics					 [16] Diagnostics OPTIONAL,
+	recordSequenceNumber		 [17] INTEGER OPTIONAL,
+	nodeID						 [18] NodeID OPTIONAL,
+	recordExtensions			 [19] ManagementExtensions OPTIONAL,
+	localSequenceNumber			 [20] LocalSequenceNumber OPTIONAL,
+	apnSelectionMode			 [21] APNSelectionMode OPTIONAL,
+	servedMSISDN				 [22] MSISDN OPTIONAL,
+	chargingCharacteristics		 [23] ChargingCharacteristics,
+	chChSelectionMode			 [24] ChChSelectionMode OPTIONAL,
+	iMSsignalingContext			 [25] NULL OPTIONAL,
+	externalChargingID			 [26] OCTET STRING OPTIONAL,
+	sgsnPLMNIdentifier			 [27] PLMN-Id OPTIONAL,
+	pSFurnishChargingInformation [28] PSFurnishChargingInformation OPTIONAL,
+	servedIMEISV				 [29] IMEI OPTIONAL,
+	rATType						 [30] RATType OPTIONAL,
+	mSTimeZone 					 [31] MSTimeZone OPTIONAL,
+	userLocationInformation		 [32] OCTET STRING OPTIONAL,
+	cAMELChargingInformation	 [33] OCTET STRING OPTIONAL,
+	listOfServiceData			 [34] SEQUENCE OF ChangeOfServiceCondition OPTIONAL
+}
+
+
+SGSNMMRecord	::= SET
+{
+	recordType					[0] CallEventRecordType,
+	servedIMSI					[1] IMSI,
+	servedIMEI					[2] IMEI OPTIONAL,
+	sgsnAddress				    [3] GSNAddress OPTIONAL,
+	msNetworkCapability		    [4] MSNetworkCapability OPTIONAL,
+	routingArea				    [5] RoutingAreaCode OPTIONAL,
+	locationAreaCode			[6] LocationAreaCode OPTIONAL,
+	cellIdentifier				[7] CellId OPTIONAL,
+	changeLocation				[8] SEQUENCE OF ChangeLocation OPTIONAL,
+	recordOpeningTime			[9] TimeStamp,
+	duration					[10] CallDuration OPTIONAL, 
+	sgsnChange					[11] SGSNChange OPTIONAL,
+	causeForRecClosing			[12] CauseForRecClosing,
+	diagnostics				    [13] Diagnostics OPTIONAL,
+	recordSequenceNumber		[14] INTEGER OPTIONAL,
+	nodeID						[15] NodeID OPTIONAL,
+	recordExtensions			[16] ManagementExtensions OPTIONAL,
+	localSequenceNumber		    [17] LocalSequenceNumber OPTIONAL,
+	servedMSISDN				[18] MSISDN OPTIONAL,
+	chargingCharacteristics	    [19] ChargingCharacteristics,	
+	cAMELInformationMM 		    [20] CAMELInformationMM OPTIONAL,
+	rATType						[21] RATType OPTIONAL,
+	chChSelectionMode			[22] ChChSelectionMode OPTIONAL
+}
+
+SGSNPDPRecord 	::= SET
+{
+	recordType					[0] CallEventRecordType,
+	networkInitiation			[1] NetworkInitiatedPDPContext OPTIONAL,
+	servedIMSI					[3] IMSI,
+	servedIMEI					[4] IMEI OPTIONAL,
+	sgsnAddress				    [5] GSNAddress OPTIONAL,
+	msNetworkCapability		    [6] MSNetworkCapability OPTIONAL,
+	routingArea				    [7] RoutingAreaCode OPTIONAL,
+	locationAreaCode			[8] LocationAreaCode OPTIONAL,
+	cellIdentifier				[9] CellId OPTIONAL,
+	chargingID					[10] ChargingID,
+	ggsnAddressUsed			    [11] GSNAddress,
+	accessPointNameNI			[12] AccessPointNameNI OPTIONAL,
+	pdpType						[13] PDPType OPTIONAL,
+	servedPDPAddress			[14] PDPAddress OPTIONAL,
+	listOfTrafficVolumes		[15] SEQUENCE OF ChangeOfCharCondition OPTIONAL,
+	recordOpeningTime			[16] TimeStamp,
+	duration					[17] CallDuration,
+	sgsnChange					[18] SGSNChange OPTIONAL,
+	causeForRecClosing			[19] CauseForRecClosing,
+	diagnostics				    [20] Diagnostics OPTIONAL,
+	recordSequenceNumber		[21] INTEGER OPTIONAL,
+	nodeID						[22] NodeID OPTIONAL,
+	recordExtensions			[23] ManagementExtensions OPTIONAL,
+	localSequenceNumber		    [24] LocalSequenceNumber OPTIONAL,
+	apnSelectionMode			[25] APNSelectionMode OPTIONAL,
+	accessPointNameOI			[26] AccessPointNameOI OPTIONAL,
+	servedMSISDN				[27] MSISDN OPTIONAL,
+	chargingCharacteristics	    [28] ChargingCharacteristics,
+	rATType						[29] RATType OPTIONAL,
+	cAMELInformationPDP  		[30] CAMELInformationPDP OPTIONAL,
+	rNCUnsentDownlinkVolume	    [31] DataVolumeGPRS OPTIONAL,
+	chChSelectionMode			[32] ChChSelectionMode OPTIONAL,
+	dynamicAddressFlag			[33] DynamicAddressFlag OPTIONAL
+}
+
+SGSNSMORecord	::= SET
+{
+	recordType					[0] CallEventRecordType,
+	servedIMSI					[1] IMSI,
+	servedIMEI					[2] IMEI OPTIONAL,
+	servedMSISDN				[3] MSISDN OPTIONAL,
+	msNetworkCapability		    [4] MSNetworkCapability OPTIONAL,
+	serviceCentre				[5] AddressString OPTIONAL,
+	recordingEntity			    [6] RecordingEntity OPTIONAL,
+	locationArea				[7] LocationAreaCode OPTIONAL,
+	routingArea				    [8] RoutingAreaCode OPTIONAL,
+	cellIdentifier				[9] CellId OPTIONAL,
+	messageReference			[10] MessageReference,
+	eventTimeStamp		    	[11] TimeStamp,	
+	smsResult					[12] SMSResult OPTIONAL,
+	recordExtensions			[13] ManagementExtensions OPTIONAL, 
+	nodeID						[14] NodeID OPTIONAL,
+	localSequenceNumber		    [15] LocalSequenceNumber OPTIONAL,
+	chargingCharacteristics	    [16] ChargingCharacteristics,
+	rATType						[17] RATType OPTIONAL,
+	destinationNumber			[18] SmsTpDestinationNumber OPTIONAL,
+	cAMELInformationSMS		    [19] CAMELInformationSMS OPTIONAL,
+	chChSelectionMode			[20] ChChSelectionMode OPTIONAL
+}
+
+SGSNSMTRecord	::= SET
+{
+	recordType				[0] CallEventRecordType,
+	servedIMSI				[1] IMSI,
+	servedIMEI				[2] IMEI OPTIONAL,
+	servedMSISDN			[3] MSISDN OPTIONAL,
+	msNetworkCapability	    [4] MSNetworkCapability OPTIONAL,
+	serviceCentre			[5] AddressString OPTIONAL,
+	recordingEntity		    [6] RecordingEntity OPTIONAL,
+	locationArea			[7] LocationAreaCode OPTIONAL,
+	routingArea			    [8] RoutingAreaCode OPTIONAL,
+	cellIdentifier			[9] CellId OPTIONAL,
+	eventTimeStamp		    [10] TimeStamp,	
+	smsResult				[11] SMSResult OPTIONAL,
+	recordExtensions		[12] ManagementExtensions OPTIONAL,
+	nodeID					[13] NodeID OPTIONAL,
+	localSequenceNumber	    [14] LocalSequenceNumber OPTIONAL,
+	chargingCharacteristics	[15] ChargingCharacteristics,
+	rATType					[16] RATType OPTIONAL,
+	chChSelectionMode		[17] ChChSelectionMode OPTIONAL,
+	cAMELInformationSMS		[18] CAMELInformationSMS OPTIONAL
+}
+
+SGSNMTLCSRecord			::= SET
+{
+	recordType				[0] CallEventRecordType,
+	recordingEntity			[1] RecordingEntity,
+	lcsClientType			[2] LCSClientType,
+	lcsClientIdentity		[3] LCSClientIdentity,
+	servedIMSI				[4] IMSI,
+	servedMSISDN			[5] MSISDN OPTIONAL,
+	sgsnAddress				[6] GSNAddress OPTIONAL,
+	locationType			[7] LocationType,
+	lcsQos					[8] LCSQoSInfo OPTIONAL,
+	lcsPriority				[9] LCS-Priority OPTIONAL,
+	mlcNumber				[10] ISDN-AddressString,
+	eventTimeStamp			[11] TimeStamp,
+	measurementDuration		[12] CallDuration OPTIONAL,
+	notificationToMSUser	[13] NotificationToMSUser OPTIONAL,
+	privacyOverride			[14] NULL OPTIONAL,
+	location				[15] LocationAreaAndCell OPTIONAL,
+	routingArea			    [16] RoutingAreaCode OPTIONAL,
+	locationEstimate		[17] Ext-GeographicalInformation OPTIONAL,
+	positioningData			[18] PositioningData OPTIONAL,
+	lcsCause				[19] LCSCause OPTIONAL,
+	diagnostics				[20] Diagnostics OPTIONAL,
+	nodeID					[21] NodeID OPTIONAL,
+	localSequenceNumber	    [22] LocalSequenceNumber OPTIONAL,
+	chargingCharacteristics	[23] ChargingCharacteristics,
+	chChSelectionMode		[24] ChChSelectionMode OPTIONAL,
+	rATType					[25] RATType OPTIONAL,
+	recordExtensions		[26] ManagementExtensions OPTIONAL,
+	causeForRecClosing		[27] CauseForRecClosing
+}
+
+SGSNMOLCSRecord			::= SET
+{
+	recordType				[0] CallEventRecordType,
+	recordingEntity			[1] RecordingEntity,
+	lcsClientType			[2] LCSClientType OPTIONAL,
+	lcsClientIdentity		[3] LCSClientIdentity OPTIONAL,
+	servedIMSI				[4] IMSI,
+	servedMSISDN			[5] MSISDN OPTIONAL,
+	sgsnAddress				[6] GSNAddress OPTIONAL,
+	locationMethod			[7] LocationMethod,
+	lcsQos					[8] LCSQoSInfo OPTIONAL,
+	lcsPriority				[9] LCS-Priority OPTIONAL,
+	mlcNumber				[10] ISDN-AddressString OPTIONAL,
+	eventTimeStamp			[11] TimeStamp,
+	measurementDuration		[12] CallDuration OPTIONAL,
+	location				[13] LocationAreaAndCell OPTIONAL,
+	routingArea			    [14] RoutingAreaCode OPTIONAL,
+	locationEstimate		[15] Ext-GeographicalInformation OPTIONAL,
+	positioningData			[16] PositioningData OPTIONAL,
+	lcsCause				[17] LCSCause OPTIONAL,
+	diagnostics				[18] Diagnostics OPTIONAL,
+	nodeID					[19] NodeID OPTIONAL,
+	localSequenceNumber	    [20] LocalSequenceNumber OPTIONAL,
+	chargingCharacteristics	[21] ChargingCharacteristics,
+	chChSelectionMode		[22] ChChSelectionMode OPTIONAL,
+	rATType					[23] RATType OPTIONAL,
+	recordExtensions		[24] ManagementExtensions OPTIONAL,
+	causeForRecClosing		[25] CauseForRecClosing
+}
+
+SGSNNILCSRecord			::= SET
+{
+	recordType				[0] CallEventRecordType,
+	recordingEntity			[1] RecordingEntity,
+	lcsClientType			[2] LCSClientType OPTIONAL,
+	lcsClientIdentity		[3] LCSClientIdentity OPTIONAL,
+	servedIMSI				[4] IMSI OPTIONAL,
+	servedMSISDN			[5] MSISDN OPTIONAL,
+	sgsnAddress				[6] GSNAddress OPTIONAL,
+	servedIMEI				[7] IMEI OPTIONAL,
+	lcsQos					[8] LCSQoSInfo OPTIONAL,
+	lcsPriority				[9] LCS-Priority OPTIONAL,
+	mlcNumber				[10] ISDN-AddressString OPTIONAL,
+	eventTimeStamp			[11] TimeStamp,
+	measurementDuration		[12] CallDuration OPTIONAL,
+	location				[13] LocationAreaAndCell OPTIONAL,
+	routingArea			    [14] RoutingAreaCode OPTIONAL,
+	locationEstimate		[15] Ext-GeographicalInformation OPTIONAL,
+	positioningData			[16] PositioningData OPTIONAL,
+	lcsCause				[17] LCSCause OPTIONAL,
+	diagnostics				[18] Diagnostics OPTIONAL,
+	nodeID					[19] NodeID OPTIONAL,
+	localSequenceNumber	    [20] LocalSequenceNumber OPTIONAL,
+	chargingCharacteristics	[21] ChargingCharacteristics,
+	chChSelectionMode		[22] ChChSelectionMode OPTIONAL,
+	rATType					[23] RATType OPTIONAL,
+	recordExtensions		[24] ManagementExtensions OPTIONAL,
+	causeForRecClosing		[25] CauseForRecClosing 
+}
+
+SGSNMBMSRecord 	::= SET
+{
+	recordType					 [0] CallEventRecordType,
+	ggsnAddress					 [1] GSNAddress,
+	chargingID					 [2] ChargingID,
+	listofDownstreamNodes		 [3] SEQUENCE OF RouteingAreaCode,
+	accessPointNameNI			 [4] AccessPointNameNI OPTIONAL,
+	servedPDPAddress			 [5] PDPAddress OPTIONAL,
+	listOfTrafficVolumes		 [6] SEQUENCE OF ChangeOfCharCondition OPTIONAL,
+	recordOpeningTime			 [7] TimeStamp,
+	duration					 [8] CallDuration,
+	causeForRecClosing			 [9] CauseForRecClosing,
+	diagnostics					 [10] Diagnostics OPTIONAL,
+	recordSequenceNumber		 [11] INTEGER OPTIONAL,
+	nodeID						 [12] NodeID OPTIONAL,
+	recordExtensions			 [13] ManagementExtensions OPTIONAL,
+	localSequenceNumber			 [14] LocalSequenceNumber OPTIONAL,
+	sgsnPLMNIdentifier			 [15] PLMN-Id OPTIONAL,
+	numberofReceivingUE			 [16] INTEGER OPTIONAL,
+	mbmsInformation				 [17] MBMSInformation OPTIONAL
+
+}
+-- WS no def found
+RouteingAreaCode ::= OCTET STRING
+
+GGSNMBMSRecord 	::= SET
+{
+	recordType					 [0] CallEventRecordType,
+	ggsnAddress					 [1] GSNAddress,
+	chargingID					 [2] ChargingID,
+	listofDownstreamNodes		 [3] SEQUENCE OF GSNAddress,
+	accessPointNameNI			 [4] AccessPointNameNI OPTIONAL,
+	servedPDPAddress			 [5] PDPAddress OPTIONAL,
+	listOfTrafficVolumes		 [6] SEQUENCE OF ChangeOfCharCondition OPTIONAL,
+	recordOpeningTime			 [7] TimeStamp,
+	duration					 [8] CallDuration,
+	causeForRecClosing			 [9] CauseForRecClosing,
+	diagnostics					 [10] Diagnostics OPTIONAL,
+	recordSequenceNumber		 [11] INTEGER OPTIONAL,
+	nodeID						 [12] NodeID OPTIONAL,
+	recordExtensions			 [13] ManagementExtensions OPTIONAL,
+	localSequenceNumber			 [14] LocalSequenceNumber OPTIONAL,
+	mbmsInformation				 [15] MBMSInformation OPTIONAL
+}
+
+------------------------------------------------------------------------------
+--
+--  COMMON DATA TYPES
+--
+------------------------------------------------------------------------------
+
+AccessPointNameNI	::= IA5String (SIZE(1..63))
+	--
+	-- Network Identifier part of APN in  dot representation.
+	-- For example, if the complete APN is 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs'
+	-- NI is 'apn1a.apn1b.apn1c' and is presented in this form in the CDR..
+	--
+
+AccessPointNameOI	::= IA5String (SIZE(1..37))
+	--
+	-- Operator Identifier part of APN in dot representation.
+	-- In the 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs' example, the OI portion is 'mnc022.mcc111.gprs'
+	-- and is presented in this form in the CDR.
+	--
+
+APNSelectionMode::= ENUMERATED
+{
+	--
+	-- See Information Elements TS 29.060 [75]
+	--
+	mSorNetworkProvidedSubscriptionVerified				(0),
+	mSProvidedSubscriptionNotVerified					(1),
+	networkProvidedSubscriptionNotVerified				(2)
+}
+
+CAMELAccessPointNameNI	::= AccessPointNameNI
+
+CAMELAccessPointNameOI	::= AccessPointNameOI
+
+CAMELInformationMM		::= SET 
+{
+	sCFAddress						[1] SCFAddress OPTIONAL,
+	serviceKey						[2]	ServiceKey OPTIONAL,
+	defaultTransactionHandling	    [3]	DefaultGPRS-Handling OPTIONAL,
+	numberOfDPEncountered  		    [4] NumberOfDPEncountered OPTIONAL,
+	levelOfCAMELService			    [5] LevelOfCAMELService OPTIONAL,
+	freeFormatData					[6] FreeFormatData OPTIONAL,
+	fFDAppendIndicator	     		[7]	FFDAppendIndicator OPTIONAL
+}
+
+CAMELInformationPDP	::= SET
+{
+	sCFAddress						[1] SCFAddress OPTIONAL,
+	serviceKey						[2]	ServiceKey OPTIONAL,
+	defaultTransactionHandling	    [3]	DefaultGPRS-Handling OPTIONAL,
+	cAMELAccessPointNameNI		    [4] CAMELAccessPointNameNI OPTIONAL,
+	cAMELAccessPointNameOI		    [5] CAMELAccessPointNameOI OPTIONAL,
+	numberOfDPEncountered  		    [6] NumberOfDPEncountered OPTIONAL,
+	levelOfCAMELService			    [7] LevelOfCAMELService OPTIONAL,
+	freeFormatData					[8]	FreeFormatData OPTIONAL,
+	fFDAppendIndicator	     		[9]	FFDAppendIndicator OPTIONAL
+}
+
+CAMELInformationSMS		::= SET 
+{
+	sCFAddress								[1] SCFAddress OPTIONAL,
+	serviceKey								[2]	ServiceKey OPTIONAL,
+	defaultSMSHandling						[3]	DefaultSMS-Handling OPTIONAL,
+	cAMELCallingPartyNumber				    [4] CallingNumber OPTIONAL,
+	cAMELDestinationSubscriberNumber		[5] SmsTpDestinationNumber OPTIONAL,
+	cAMELSMSCAddress						[6] AddressString OPTIONAL,
+	freeFormatData							[7]	FreeFormatData OPTIONAL,
+	smsReferenceNumber						[8] CallReferenceNumber	OPTIONAL
+}
+
+CategoryId ::= INTEGER
+-- IP service flow identity (DCCA)
+-- range of 4 byte (0..4294967259)
+
+CauseForRecClosing	::= INTEGER
+{
+	--
+	-- In GGSN the value sGSNChange should be used for partial record
+	-- generation due to SGSN Address List Overflow
+	-- 
+	-- LCS related causes belong to the MAP error causes acc. TS 29.002
+	--
+	-- cause codes 0 to 15 are defined in TS 32.205 as 'CauseForTerm' (cause for termination)
+	--
+	normalRelease					(0),
+	abnormalRelease			    	(4),
+	cAMELInitCallRelease			(5),
+	volumeLimit				    	(16),
+	timeLimit						(17),
+	sGSNChange						(18),
+	maxChangeCond					(19),
+	managementIntervention	    	(20),
+    intraSGSNIntersystemChange		(21),
+	rATChange						(22),
+	unauthorizedRequestingNetwork	(52),
+	unauthorizedLCSClient			(53),
+	positionMethodFailure			(54),
+	unknownOrUnreachableLCSClient	(58),
+	listofDownstreamNodeChange		(59)
+}
+
+ChangeCondition	::= ENUMERATED
+{
+	qoSChange				(0),
+	tariffTime				(1),
+	recordClosure			(2)
+}
+
+ChangeOfCharCondition	::= SEQUENCE
+{
+	--
+	-- Used in PDP context record only
+	--
+	qosRequested				[1] QoSInformation OPTIONAL,
+	qosNegotiated				[2] QoSInformation OPTIONAL,
+	dataVolumeGPRSUplink		[3] DataVolumeGPRS,
+	dataVolumeGPRSDownlink	    [4] DataVolumeGPRS,
+	changeCondition			    [5] ChangeCondition,
+	changeTime					[6] TimeStamp
+}
+
+ChangeOfServiceCondition	::= SEQUENCE
+{
+	--
+	-- Used for Flow based Charging service data container
+	--
+	categoryId                  [1] CategoryId,
+	ratingGroupId               [2] RatingGroupId,
+	localSequenceNumber			[3] LocalSequenceNumber OPTIONAL,
+	timeOfFirstUsage            [4] TimeStamp,
+	timeOfLastUsage             [5] TimeStamp,
+	timeUsage                   [6] CallDuration,
+	serviceChangeCause      	[7] ServiceChangeCause,
+	qoSInformationNeg           [8] QoSInformation OPTIONAL,
+	sgsn-Address                [9] GSNAddress OPTIONAL,
+	sGSNPLMNIdentifier          [10] SGSNPLMNIdentifier OPTIONAL,
+	datavolumeFBCUplink         [11] DataVolumeGPRS,
+	datavolumeFBCDownlink       [12] DataVolumeGPRS,
+	timeOfReport				[13] TimeStamp,
+	rATType						[14] RATType OPTIONAL
+}
+
+-- WS No def. found
+SGSNPLMNIdentifier ::= OCTET STRING
+ChangeLocation	::= SEQUENCE
+{
+	--
+	-- used in SGSNMMRecord only
+	--
+	locationAreaCode		[0] LocationAreaCode,
+	routingAreaCode		    [1] RoutingAreaCode,
+	cellId					[2] CellId OPTIONAL,
+	changeTime				[3] TimeStamp
+}
+
+ChargingCharacteristics	::= OCTET STRING (SIZE(2))
+    --
+	--	Bit 0-3: Profile Index
+	--	Bit 4-15: For Behavior
+	--
+
+ChargingID	::= INTEGER (0..4294967295)
+	--
+	-- Generated in GGSN, part of PDP context, see TS 23.060
+	-- 0..4294967295 is equivalent to 0..2**32-1
+	--
+
+ChChSelectionMode		::= ENUMERATED
+{
+	sGSNSupplied				(0),	-- For GGSN only
+	subscriptionSpecific		(1),	-- For SGSN only
+	aPNSpecific					(2),	-- For SGSN only
+	homeDefault					(3),	-- For SGSN and GGSN
+	roamingDefault				(4),	-- For SGSN and GGSN
+	visitingDefault				(5)		-- For SGSN and GGSN
+}
+
+
+DataVolumeGPRS	::= INTEGER
+	--
+	-- The volume of data transferred in octets.
+	--
+
+DynamicAddressFlag	::= BOOLEAN
+
+ETSIAddress	::= AddressString
+	--
+	-- First octet for nature of address, and numbering plan indicator (3 for X.121)
+	-- Other octets TBCD
+	-- See TS 29.002
+	--
+
+FFDAppendIndicator	::= BOOLEAN
+
+FreeFormatData	::=	OCTET STRING (SIZE(1..160))
+	--
+	-- Free formated data as sent in the FurnishChargingInformationGPRS 
+	-- see TS 29.078
+	--
+
+GSNAddress	::= IPAddress
+
+MSNetworkCapability	::= OCTET STRING (SIZE(1..8))
+	-- see 3G TS 24.008
+
+NetworkInitiatedPDPContext	::= BOOLEAN
+	--
+	-- Set to true if PDP context was initiated from network side
+	--
+
+NodeID	::= IA5String (SIZE(1..20))
+
+NumberOfDPEncountered  ::= INTEGER
+
+PDPAddress	::= CHOICE
+{
+	iPAddress				[0] IPAddress,
+	eTSIAddress			    [1] ETSIAddress
+}
+
+PDPType		::= OCTET STRING (SIZE(2))
+	--
+	-- OCTET 1: PDP Type Organization
+	-- OCTET 2: PDP Type Number
+	-- See TS 29.060 [75]
+	--
+
+PLMN-Id		::= OCTET STRING (SIZE (3))
+	--	This is a 1:1 copy from the Routing Area Identity (RAI) IE specified in TS 29.060 [75]
+	--  as follows:
+	--	OCTET 1 of PLMN-Id = OCTET 2 of RAI  
+	--	OCTET 2 of PLMN-Id = OCTET 3 of RAI  
+	--	OCTET 3 of PLMN-Id = OCTET 4 of RAI  
+
+
+
+
+PSFurnishChargingInformation  ::= SEQUENCE
+
+{
+	pSFreeFormatData			[1] FreeFormatData,
+	pSFFDAppendIndicator  	    [2] FFDAppendIndicator OPTIONAL
+}
+
+
+QoSInformation	::= OCTET STRING (SIZE (4..12))
+
+	--
+	-- This  octet string 
+	-- is a 1:1 copy of the contents (i.e. starting with octet 4) of the "Quality of 
+	-- service Profile" information element specified in 3GPP TS 29.060 [75].
+
+--RATType	::= INTEGER (0..255)
+RATType	::= INTEGER 
+	--
+	-- Ihis integer is 1:1 copy of the RAT type value as defined in 3GPP TS 29.060 [75].
+	--
+-- WS Extension
+{
+	reserved			(0),
+	utran				(1),
+	geran				(2),
+	wlan				(3),
+	gan					(4),
+	hspa-evolution		(5)
+}(0..255)
+
+RoutingAreaCode	::= OCTET STRING (SIZE(1))
+	--
+	-- See TS 24.008	--
+	--
+
+RatingGroupId ::= IA5String (SIZE(1..16))
+-- DCC rule base identifier
+
+ServiceChangeCause	::= OCTET STRING (SIZE(4))
+	--
+-- service container closure reason
+-- (some of the values are non-exclusive)
+--
+-- cause values for Gn update/release and TTS 
+--  H'00000001 (Bit  1): QoS change
+--  H'00000002 (Bit  2): SGSN change
+--  H'00000004 (Bit  3): SGSN PLMN ID change
+--  H'00000008 (Bit  4): tariff time switch 
+--  H'00000010 (Bit  5): PDP context release
+--  H'00000020 (Bit  6): RAT change
+--
+-- cause values for service stop: 
+--  H'00000040 (Bit  7): service idled out (= service release by QHT)
+--  H'00000080 (Bit  8): not used
+--  H'00000100 (Bit  9): configuration change
+--  H'00000200 (Bit 10): service stop
+--
+-- cause values for service reauthorization request:
+--  H'00000400 (Bit 11): time threshold reached
+--  H'00000800 (Bit 12): volume threshold reached
+--  H'00001000 (Bit 13): time exhausted
+--  H'00002000 (Bit 14): volume exhausted
+--
+-- cause values for quota return:
+--  H'00004000 (Bit 15): timeout 
+--  H'00008000 (Bit 16): return requested 
+--  H'00010000 (Bit 17): reauthorisation request
+--  			Bit 18-32: are unused and will always be zero
+
+SCFAddress	::= AddressString
+	--
+	-- See TS 29.002	--
+	--
+
+SGSNChange	::= BOOLEAN
+	--
+	-- present if first record after inter SGSN routing area update
+	-- in new SGSN
+	--
+
+-- WS Loacly imported MBMS structs
+
+MBMSInformation			::= SET
+{
+	tMGI						[1] TMGI OPTIONAL,
+	mBMSSessionIdentity			[2] MBMSSessionIdentity OPTIONAL,
+	mBMSServiceType				[3] MBMSServiceType OPTIONAL,
+	mBMSUserServiceType			[4] MBMSUserServiceType OPTIONAL, -- only supported in the BM-SC
+	mBMS2G3GIndicator			[5] MBMS2G3GIndicator OPTIONAL,
+	fileRepairSupported			[6] BOOLEAN OPTIONAL,			  -- only supported in the BM-SC
+	rAI							[7] RoutingAreaCode OPTIONAL,	  -- only supported in the BM-SC
+	mBMSServiceArea				[8] MBMSServiceArea OPTIONAL,
+	requiredMBMSBearerCaps		[9] RequiredMBMSBearerCapabilities OPTIONAL,
+	mBMSGWAddress				[10] GSNAddress OPTIONAL,
+	cNIPMulticastDistribution	[11] CNIPMulticastDistribution OPTIONAL
+}
+
+MBMS2G3GIndicator		::= ENUMERATED
+{
+	t2G				(0),	-- For GERAN access only
+	t3G				(1),	-- For UTRAN access only
+	t2G-AND-3G		(2) 	-- For both UTRAN and GERAN access
+}
+
+
+MBMSServiceType		::= ENUMERATED
+{
+	mULTICAST		(0),
+	bROADCAST		(1)
+}
+
+MBMSUserServiceType		::= ENUMERATED
+{
+	dOWNLOAD		(0),
+	sTREAMING		(1)
+}
+
+RequiredMBMSBearerCapabilities		::= OCTET STRING (SIZE (3..14))
+
+--
+-- This  octet string 
+-- is a 1:1 copy of the contents (i.e. starting with octet 5) of the "Quality of 
+-- service Profile" information element specified in 3GPP TS 29.060 [75].
+--
+
+
+MBMSSessionIdentity		::= OCTET STRING (SIZE (1))
+
+--
+-- This octet string is a 1:1 copy of the contents of the MBMS-Session-Identity
+-- AVP specified in 3GPP TS 29.061 [82]
+--
+
+TMGI		::= OCTET STRING
+--
+-- This  octet string 
+-- is a 1:1 copy of the contents (i.e. starting with octet 4) of the "TMGI" 
+-- information element specified in 3GPP TS 29.060 [75].
+--
+
+MBMSServiceArea		::= OCTET STRING
+
+CNIPMulticastDistribution		::= ENUMERATED
+{
+	nO-IP-MULTICAST				(0),	
+	iP-MULTICAST				(1)
+}
+
+END
diff --git a/asn1/gprscdr/IMSChargingDataTypes.asn b/asn1/gprscdr/IMSChargingDataTypes.asn
deleted file mode 100644
index 6bd21818b6..0000000000
--- a/asn1/gprscdr/IMSChargingDataTypes.asn
+++ /dev/null
@@ -1,601 +0,0 @@
--- $Id$
--- 3GPP TS 32.298 V9.6.0 (2010-12)
-IMSChargingDataTypes {itu-t (0) identified-organization (4) etsi(0) mobileDomain (0) charging (5) imsChargingDataTypes (4) asn1Module (0) version1 (0)}  
-DEFINITIONS IMPLICIT TAGS ::=
-
-BEGIN
-
--- EXPORTS everything
-
-IMPORTS
-
---RecordType, IPAddress, ManagementExtensions, NodeAddress, LocalSequenceNumber, SubscriptionID, TimeStamp, ServiceContextID, ServiceSpecificInfo
---FROM GenericChargingDataTypes {itu-t (0) identified-organization (4) etsi(0) mobileDomain (0) charging (5) genericChargingDataTypes (0) asn1Module (0) version1 (0)}  
-
-;
-
-------------------------------------------------------------------------------
---
---  IMS RECORDS
---
-------------------------------------------------------------------------------
-
-IMSRecord ::= CHOICE 
---
--- Record values 63-69, 82 are IMS specific
---
-{
-	sCSCFRecord			[63] SCSCFRecord,
-	pCSCFRecord			[64] PCSCFRecord,
-	iCSCFRecord			[65] ICSCFRecord,
-	mRFCRecord			[66] MRFCRecord,
-	mGCFRecord			[67] MGCFRecord,
-	bGCFRecord			[68] BGCFRecord,
-	aSRecord			[69] ASRecord,
-	eCSCFRecord			[70] ECSCFRecord,
-	iBCFRecord			[82] IBCFRecord
-}
-
-
-SCSCFRecord 	::= SET
-{
-	recordType							[0] RecordType,
-	retransmission						[1] NULL OPTIONAL,
-	sIP-Method							[2] SIP-Method OPTIONAL,
-	role-of-Node						[3] Role-of-Node OPTIONAL,
-	nodeAddress							[4] NodeAddress OPTIONAL,
-	session-Id							[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address		[6] ListOfInvolvedParties OPTIONAL,
-	called-Party-Address				[7] InvolvedParty OPTIONAL,
-	privateUserID						[8] GraphicString OPTIONAL,
-	serviceRequestTimeStamp				[9] TimeStamp OPTIONAL,
-	serviceDeliveryStartTimeStamp		[10] TimeStamp OPTIONAL,
-	serviceDeliveryEndTimeStamp			[11] TimeStamp OPTIONAL,
-	recordOpeningTime					[12] TimeStamp OPTIONAL,
-	recordClosureTime					[13] TimeStamp OPTIONAL,
-	interOperatorIdentifiers			[14] InterOperatorIdentifierlist OPTIONAL,
-	localRecordSequenceNumber			[15] LocalSequenceNumber OPTIONAL,
-	recordSequenceNumber				[16] INTEGER OPTIONAL,
-	causeForRecordClosing				[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication			[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier				[19] IMS-Charging-Identifier OPTIONAL,
-	list-Of-SDP-Media-Components		[21] SEQUENCE OF Media-Components-List OPTIONAL,
-	gGSNaddress							[22] NodeAddress OPTIONAL,
-	serviceReasonReturnCode				[23] UTF8String OPTIONAL,
-	list-Of-Message-Bodies				[24] SEQUENCE OF MessageBody OPTIONAL,
-	recordExtensions					[25] ManagementExtensions OPTIONAL,
-	expiresInformation					[26] INTEGER OPTIONAL,
-	list-Of-Associated-URI				[27] ListOfInvolvedParties OPTIONAL,
-	event								[28] UTF8String OPTIONAL,
-	accessNetworkInformation			[29] OCTET STRING OPTIONAL,
-	serviceContextID					[30] ServiceContextID OPTIONAL,
-	list-of-subscription-ID				[31] SEQUENCE OF SubscriptionID OPTIONAL,
-	list-Of-Early-SDP-Media-Components 	[32] SEQUENCE OF Early-Media-Components-List OPTIONAL,
-	iMSCommunicationServiceIdentifier	[33] IMSCommunicationServiceIdentifier OPTIONAL,
-	numberPortabilityRouting			[34] NumberPortabilityRouting OPTIONAL,
-	carrierSelectRouting				[35] CarrierSelectRouting OPTIONAL,
-	sessionPriority						[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction		[37] Milliseconds OPTIONAL,
-	serviceDeliveryStartTimeStampFraction [38] Milliseconds OPTIONAL,
-	serviceDeliveryEndTimeStampFraction	[39] Milliseconds OPTIONAL,
-	applicationServersInformation		[40] SEQUENCE OF ApplicationServersInformation OPTIONAL,
-	requested-Party-Address				[41] InvolvedParty OPTIONAL,
-	list-Of-Called-Asserted-Identity 	[42] ListOfInvolvedParties OPTIONAL,
-	online-charging-flag                [43] NULL OPTIONAL,
-	realTimeTariffInformation			[44] SEQUENCE OF RealTimeTariffInformation OPTIONAL
-}
-
-PCSCFRecord 	::= SET
-{
-	recordType							[0] RecordType,
-	retransmission						[1] NULL OPTIONAL,
-	sIP-Method							[2] SIP-Method OPTIONAL,
-	role-of-Node						[3] Role-of-Node OPTIONAL,
-	nodeAddress							[4] NodeAddress OPTIONAL,
-	session-Id							[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address		[6] ListOfInvolvedParties OPTIONAL,
-	called-Party-Address				[7] InvolvedParty OPTIONAL,
-	serviceRequestTimeStamp				[9] TimeStamp OPTIONAL,
-	serviceDeliveryStartTimeStamp		[10] TimeStamp OPTIONAL,
-	serviceDeliveryEndTimeStamp			[11] TimeStamp OPTIONAL,
-	recordOpeningTime					[12] TimeStamp OPTIONAL,
-	recordClosureTime					[13] TimeStamp OPTIONAL,
-	interOperatorIdentifiers			[14] InterOperatorIdentifiers OPTIONAL,
-	localRecordSequenceNumber			[15] LocalSequenceNumber OPTIONAL,
-	recordSequenceNumber				[16] INTEGER OPTIONAL,
-	causeForRecordClosing				[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication			[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier				[19] IMS-Charging-Identifier OPTIONAL,
-	list-Of-SDP-Media-Components		[21] SEQUENCE OF Media-Components-List OPTIONAL,
-	gGSNaddress							[22] NodeAddress OPTIONAL,
-	serviceReasonReturnCode				[23] UTF8String OPTIONAL,
-	list-Of-Message-Bodies				[24] SEQUENCE OF MessageBody OPTIONAL,
-	recordExtensions					[25] ManagementExtensions OPTIONAL,
-	expiresInformation					[26] INTEGER OPTIONAL,
-	list-Of-Associated-URI				[27] ListOfInvolvedParties OPTIONAL,
-	event								[28] UTF8String OPTIONAL,
-	accessNetworkInformation			[29] OCTET STRING OPTIONAL,
-	serviceContextID					[30] ServiceContextID OPTIONAL,
-	list-of-subscription-ID				[31] SEQUENCE OF SubscriptionID OPTIONAL,
-	list-Of-Early-SDP-Media-Components 	[32] SEQUENCE OF Early-Media-Components-List OPTIONAL,
-	sessionPriority						[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction		[37] Milliseconds OPTIONAL,
-	serviceDeliveryStartTimeStampFraction [38] Milliseconds OPTIONAL,
-	serviceDeliveryEndTimeStampFraction	[39] Milliseconds OPTIONAL,
-	servedPartyIPAddress				[50] ServedPartyIPAddress OPTIONAL
-}
-	
-ICSCFRecord 	::= SET
-{
-	recordType						[0] RecordType,
-	retransmission					[1] NULL OPTIONAL,
-	sIP-Method						[2] SIP-Method OPTIONAL,
-	role-of-Node					[3] Role-of-Node OPTIONAL,
-	nodeAddress						[4] NodeAddress OPTIONAL,
-	session-Id						[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address	[6] ListOfInvolvedParties OPTIONAL,
-	called-Party-Address			[7] InvolvedParty OPTIONAL,
-	serviceRequestTimeStamp			[9] TimeStamp OPTIONAL,
-	interOperatorIdentifiers		[14] InterOperatorIdentifiers OPTIONAL,
-	localRecordSequenceNumber		[15] LocalSequenceNumber OPTIONAL,
-	causeForRecordClosing			[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication		[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier			[19] IMS-Charging-Identifier OPTIONAL,
-	serviceReasonReturnCode			[23] UTF8String OPTIONAL,
-	recordExtensions				[25] ManagementExtensions OPTIONAL,
-	expiresInformation				[26] INTEGER OPTIONAL,
-	list-Of-Associated-URI			[27] ListOfInvolvedParties OPTIONAL,
-	event							[28] UTF8String OPTIONAL,
-	accessNetworkInformation		[29] OCTET STRING OPTIONAL, 
-	serviceContextID				[30] ServiceContextID OPTIONAL,
-	numberPortabilityRouting		[34] NumberPortabilityRouting OPTIONAL,
-	carrierSelectRouting			[35] CarrierSelectRouting OPTIONAL,
-	sessionPriority					[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction	[37] Milliseconds OPTIONAL,
-	s-CSCF-Information				[61] S-CSCF-Information OPTIONAL
-}
-
-MRFCRecord 	::= SET
-{
-	recordType							[0] RecordType,
-	retransmission						[1] NULL OPTIONAL,
-	sIP-Method							[2] SIP-Method OPTIONAL,
-	nodeAddress							[4] NodeAddress OPTIONAL,
-	session-Id							[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address		[6] ListOfInvolvedParties OPTIONAL,
-	called-Party-Address				[7] InvolvedParty OPTIONAL,
-	serviceRequestTimeStamp				[9] TimeStamp OPTIONAL,
-	serviceDeliveryStartTimeStamp		[10] TimeStamp OPTIONAL,
-	serviceDeliveryEndTimeStamp			[11] TimeStamp OPTIONAL,
-	recordOpeningTime					[12] TimeStamp OPTIONAL,
-	recordClosureTime					[13] TimeStamp OPTIONAL,
-	interOperatorIdentifiers			[14] InterOperatorIdentifiers OPTIONAL,
-	localRecordSequenceNumber			[15] LocalSequenceNumber OPTIONAL,
-	recordSequenceNumber				[16] INTEGER OPTIONAL,
-	causeForRecordClosing				[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication			[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier				[19] IMS-Charging-Identifier OPTIONAL,
-	list-Of-SDP-Media-Components		[21] SEQUENCE OF Media-Components-List OPTIONAL,
-	gGSNaddress							[22] NodeAddress OPTIONAL,
-	serviceReasonReturnCode				[23] UTF8String OPTIONAL,
-	recordExtensions					[25] ManagementExtensions OPTIONAL,
-	expiresInformation					[26] INTEGER OPTIONAL,
-	event								[28] UTF8String OPTIONAL,
-	accessNetworkInformation			[29] OCTET STRING OPTIONAL, 
-	serviceContextID					[30] ServiceContextID OPTIONAL,
-	list-of-subscription-ID				[31] SEQUENCE OF SubscriptionID OPTIONAL,
-	list-Of-Early-SDP-Media-Components 	[32] SEQUENCE OF Early-Media-Components-List OPTIONAL,
-	sessionPriority						[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction		[37] Milliseconds OPTIONAL,
-	serviceDeliveryStartTimeStampFraction [38] Milliseconds OPTIONAL,
-	serviceDeliveryEndTimeStampFraction	[39] Milliseconds OPTIONAL,
-	applicationServersInformation		[40] SEQUENCE OF ApplicationServersInformation OPTIONAL,
-	online-charging-flag				[43] NULL OPTIONAL,
-	service-Id							[70] Service-Id OPTIONAL,
-	requested-Party-Address				[71] InvolvedParty OPTIONAL,
-	list-Of-Called-Asserted-Identity 	[72] ListOfInvolvedParties OPTIONAL
-}
-
-MGCFRecord 	::= SET
-{
-	recordType							[0] RecordType,
-	retransmission						[1] NULL OPTIONAL,
-	sIP-Method							[2] SIP-Method OPTIONAL,
-	role-of-Node						[3] Role-of-Node OPTIONAL,
-	nodeAddress							[4] NodeAddress OPTIONAL,
-	session-Id							[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address		[6] ListOfInvolvedParties OPTIONAL,
-	called-Party-Address				[7] InvolvedParty OPTIONAL,
-	serviceRequestTimeStamp				[9] TimeStamp OPTIONAL,
-	serviceDeliveryStartTimeStamp		[10] TimeStamp OPTIONAL,
-	serviceDeliveryEndTimeStamp			[11] TimeStamp OPTIONAL,
-	recordOpeningTime					[12] TimeStamp OPTIONAL,
-	recordClosureTime					[13] TimeStamp OPTIONAL,
-	interOperatorIdentifiers			[14] InterOperatorIdentifiers OPTIONAL,
-	localRecordSequenceNumber			[15] LocalSequenceNumber OPTIONAL,
-	recordSequenceNumber				[16] INTEGER OPTIONAL,
-	causeForRecordClosing				[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication			[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier				[19] IMS-Charging-Identifier OPTIONAL,
-	list-Of-SDP-Media-Components		[21] SEQUENCE OF Media-Components-List OPTIONAL,
-	serviceReasonReturnCode				[23] UTF8String OPTIONAL,
-	recordExtensions					[25] ManagementExtensions OPTIONAL,
-	expiresInformation					[26] INTEGER OPTIONAL,
-	event								[28] UTF8String OPTIONAL,
-	accessNetworkInformation			[29] OCTET STRING OPTIONAL, 
-	serviceContextID					[30] ServiceContextID OPTIONAL,
-	list-Of-Early-SDP-Media-Components 	[32] SEQUENCE OF Early-Media-Components-List OPTIONAL,
-	numberPortabilityRouting			[34] NumberPortabilityRouting OPTIONAL,
-	carrierSelectRouting				[35] CarrierSelectRouting OPTIONAL, 
-	sessionPriority						[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction		[37] Milliseconds OPTIONAL,
-	serviceDeliveryStartTimeStampFraction [38] Milliseconds OPTIONAL,
-	serviceDeliveryEndTimeStampFraction	[39] Milliseconds OPTIONAL,
-	realTimeTariffInformation			[44] SEQUENCE OF RealTimeTariffInformation OPTIONAL,
-	trunkGroupID						[80] TrunkGroupID OPTIONAL,
-	bearerService						[81] TransmissionMedium OPTIONAL
-}
-
-BGCFRecord 	::= SET
-{
-	recordType							[0] RecordType,
-	retransmission						[1] NULL OPTIONAL,
-	sIP-Method							[2] SIP-Method OPTIONAL,
-	role-of-Node						[3] Role-of-Node OPTIONAL,
-	nodeAddress							[4] NodeAddress OPTIONAL,
-	session-Id							[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address		[6] ListOfInvolvedParties OPTIONAL,	
-	called-Party-Address				[7] InvolvedParty OPTIONAL,
-	serviceRequestTimeStamp				[9] TimeStamp OPTIONAL,
-	serviceDeliveryStartTimeStamp		[10] TimeStamp OPTIONAL,
-	serviceDeliveryEndTimeStamp			[11] TimeStamp OPTIONAL,
-	recordOpeningTime					[12] TimeStamp OPTIONAL,
-	recordClosureTime					[13] TimeStamp OPTIONAL,
-	interOperatorIdentifiers			[14] InterOperatorIdentifiers OPTIONAL,
-	localRecordSequenceNumber			[15] LocalSequenceNumber OPTIONAL,
-	recordSequenceNumber				[16] INTEGER OPTIONAL,
-	causeForRecordClosing				[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication			[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier				[19] IMS-Charging-Identifier OPTIONAL,
-	list-Of-SDP-Media-Components		[21] SEQUENCE OF Media-Components-List OPTIONAL,
-	serviceReasonReturnCode				[23] UTF8String OPTIONAL,
-	recordExtensions					[25] ManagementExtensions OPTIONAL,
-	expiresInformation					[26] INTEGER OPTIONAL,
-	event								[28] UTF8String OPTIONAL,
-	serviceContextID					[30] ServiceContextID OPTIONAL,
-	list-Of-Early-SDP-Media-Components 	[32] SEQUENCE OF Early-Media-Components-List OPTIONAL,
-	numberPortabilityRouting			[34] NumberPortabilityRouting OPTIONAL,
-	carrierSelectRouting				[35] CarrierSelectRouting OPTIONAL,
-	sessionPriority						[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction		[37] Milliseconds OPTIONAL,
-	serviceDeliveryStartTimeStampFraction [38] Milliseconds OPTIONAL,
-	serviceDeliveryEndTimeStampFraction	[39] Milliseconds OPTIONAL 
-}
-
-ASRecord 	::= SET
-{
-	recordType							[0] RecordType,
-	retransmission						[1] NULL OPTIONAL,
-	sIP-Method							[2] SIP-Method OPTIONAL,
-	role-of-Node						[3] Role-of-Node OPTIONAL,
-	nodeAddress							[4] NodeAddress OPTIONAL,
-	session-Id							[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address		[6] ListOfInvolvedParties OPTIONAL,	
-	called-Party-Address				[7] InvolvedParty OPTIONAL,
-	serviceRequestTimeStamp				[9] TimeStamp OPTIONAL,
-	serviceDeliveryStartTimeStamp		[10] TimeStamp OPTIONAL,
-	serviceDeliveryEndTimeStamp			[11] TimeStamp OPTIONAL,
-	recordOpeningTime					[12] TimeStamp OPTIONAL,
-	recordClosureTime					[13] TimeStamp OPTIONAL,
-	interOperatorIdentifiers			[14] InterOperatorIdentifiers OPTIONAL,
-	localRecordSequenceNumber			[15] LocalSequenceNumber OPTIONAL,
-	recordSequenceNumber				[16] INTEGER OPTIONAL,
-	causeForRecordClosing				[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication			[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier				[19] IMS-Charging-Identifier OPTIONAL,
-	list-Of-SDP-Media-Components		[21] SEQUENCE OF Media-Components-List OPTIONAL,
-	gGSNaddress							[22] NodeAddress OPTIONAL,
-	serviceReasonReturnCode				[23] UTF8String OPTIONAL,
-	list-Of-Message-Bodies				[24] SEQUENCE OF MessageBody OPTIONAL,
-	recordExtensions					[25] ManagementExtensions OPTIONAL,
-	expiresInformation					[26] INTEGER OPTIONAL,
-	event								[28] UTF8String OPTIONAL,
-	accessNetworkInformation			[29] OCTET STRING OPTIONAL,
-	serviceContextID					[30] ServiceContextID OPTIONAL,
-	list-of-subscription-ID				[31] SEQUENCE OF SubscriptionID OPTIONAL,
-	list-Of-Early-SDP-Media-Components 	[32] SEQUENCE OF Early-Media-Components-List OPTIONAL,
-	iMSCommunicationServiceIdentifier	[33] IMSCommunicationServiceIdentifier OPTIONAL,
-	numberPortabilityRouting			[34] NumberPortabilityRouting OPTIONAL,
-	carrierSelectRouting				[35] CarrierSelectRouting OPTIONAL, 
-	sessionPriority						[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction		[37] Milliseconds OPTIONAL,
-	serviceDeliveryStartTimeStampFraction [38] Milliseconds OPTIONAL,
-	serviceDeliveryEndTimeStampFraction	[39] Milliseconds OPTIONAL,
-	online-charging-flag				[43] NULL OPTIONAL,
-	realTimeTariffInformation			[44] SEQUENCE OF RealTimeTariffInformation OPTIONAL,
-	serviceSpecificInfo					[100] SEQUENCE OF ServiceSpecificInfo OPTIONAL,
-	requested-Party-Address				[101] InvolvedParty OPTIONAL,
-	list-Of-Called-Asserted-Identity 	[102] ListOfInvolvedParties OPTIONAL,
-	alternateChargedPartyAddress		[103] UTF8string OPTIONAL,
-	outgoingSessionId 					[104] Session-Id OPTIONAL
-}
-
-
-ECSCFRecord 	::= SET
-{
-	recordType							[0] RecordType,
-	retransmission						[1] NULL OPTIONAL,
-	sIP-Method							[2] SIP-Method OPTIONAL,
-	role-of-Node						[3] Role-of-Node OPTIONAL,
-	nodeAddress							[4] NodeAddress OPTIONAL,
-	session-Id							[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address		[6] ListOfInvolvedParties OPTIONAL,
-	called-Party-Address				[7] InvolvedParty OPTIONAL,
-	privateUserID						[8] GraphicString OPTIONAL,
-	serviceRequestTimeStamp				[9] TimeStamp OPTIONAL,
-	serviceDeliveryStartTimeStamp		[10] TimeStamp OPTIONAL,
-	serviceDeliveryEndTimeStamp			[11] TimeStamp OPTIONAL,
-	recordOpeningTime					[12] TimeStamp OPTIONAL,
-	recordClosureTime					[13] TimeStamp OPTIONAL,
-	interOperatorIdentifiers			[14] InterOperatorIdentifierlist OPTIONAL,
-	localRecordSequenceNumber			[15] LocalSequenceNumber OPTIONAL,
-	recordSequenceNumber				[16] INTEGER OPTIONAL,
-	causeForRecordClosing				[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication			[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier				[19] IMS-Charging-Identifier OPTIONAL,
-	list-Of-SDP-Media-Components		[21] SEQUENCE OF Media-Components-List OPTIONAL,
-	gGSNaddress							[22] NodeAddress OPTIONAL,
-	serviceReasonReturnCode				[23] UTF8String OPTIONAL,
-	list-Of-Message-Bodies				[24] SEQUENCE OF MessageBody OPTIONAL,
-	recordExtensions					[25] ManagementExtensions OPTIONAL,
-	expiresInformation					[26] INTEGER OPTIONAL,
-	list-Of-Associated-URI				[27] ListOfInvolvedParties OPTIONAL,
-	event								[28] UTF8String OPTIONAL,
-	accessNetworkInformation			[29] OCTET STRING OPTIONAL,
-	serviceContextID					[30] ServiceContextID OPTIONAL,
-	list-of-subscription-ID				[31] SEQUENCE OF SubscriptionID OPTIONAL,
-	list-Of-Early-SDP-Media-Components 	[32] SEQUENCE OF Early-Media-Components-List OPTIONAL,
-	iMSCommunicationServiceIdentifier	[33] IMSCommunicationServiceIdentifier OPTIONAL,
-	numberPortabilityRouting			[34] NumberPortabilityRouting OPTIONAL,
-	carrierSelectRouting				[35] CarrierSelectRouting OPTIONAL,
-	sessionPriority						[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction		[37] Milliseconds OPTIONAL,
-	serviceDeliveryStartTimeStampFraction [38] Milliseconds OPTIONAL,
-	serviceDeliveryEndTimeStampFraction	[39] Milliseconds OPTIONAL,
-	applicationServersInformation		[40] SEQUENCE OF ApplicationServersInformation OPTIONAL,
-	requested-Party-Address				[41] InvolvedParty OPTIONAL,
-	list-Of-Called-Asserted-Identity 	[42] ListOfInvolvedParties OPTIONAL
-}
-
---
--- Editor’s note: The completeness of all parameters for the E-CSCF CDR is ffs.
---
-
-IBCFRecord 	::= SET
-{
-	recordType							[0] RecordType,
-	retransmission						[1] NULL OPTIONAL,
-	sIP-Method							[2] SIP-Method OPTIONAL,
-	role-of-Node						[3] Role-of-Node OPTIONAL,
-	nodeAddress							[4] NodeAddress OPTIONAL,
-	session-Id							[5] Session-Id OPTIONAL,
-	list-Of-Calling-Party-Address		[6] ListOfInvolvedParties OPTIONAL,	
-	called-Party-Address				[7] InvolvedParty OPTIONAL,
-	serviceRequestTimeStamp				[9] TimeStamp OPTIONAL,
-	serviceDeliveryStartTimeStamp		[10] TimeStamp OPTIONAL,
-	serviceDeliveryEndTimeStamp			[11] TimeStamp OPTIONAL,
-	recordOpeningTime					[12] TimeStamp OPTIONAL,
-	recordClosureTime					[13] TimeStamp OPTIONAL,
-	interOperatorIdentifiers			[14] InterOperatorIdentifiers OPTIONAL,
-	localRecordSequenceNumber			[15] LocalSequenceNumber OPTIONAL,
-	recordSequenceNumber				[16] INTEGER OPTIONAL,
-	causeForRecordClosing				[17] CauseForRecordClosing OPTIONAL,
-	incomplete-CDR-Indication			[18] Incomplete-CDR-Indication OPTIONAL,
-	iMS-Charging-Identifier				[19] IMS-Charging-Identifier OPTIONAL,
-	list-Of-SDP-Media-Components		[21] SEQUENCE OF Media-Components-List OPTIONAL,
-	serviceReasonReturnCode				[23] UTF8String OPTIONAL,
-	recordExtensions					[25] ManagementExtensions OPTIONAL,
-	expiresInformation					[26] INTEGER OPTIONAL,
-	event								[28] UTF8String OPTIONAL,
-	serviceContextID					[30] ServiceContextID OPTIONAL,
-	list-Of-Early-SDP-Media-Components 	[32] SEQUENCE OF Early-Media-Components-List OPTIONAL,
-	iMSCommunicationServiceIdentifier	[33] IMSCommunicationServiceIdentifier OPTIONAL,
-	sessionPriority						[36] SessionPriority OPTIONAL,
-	serviceRequestTimeStampFraction		[37] Milliseconds OPTIONAL,
-	serviceDeliveryStartTimeStampFraction [38] Milliseconds OPTIONAL,
-	serviceDeliveryEndTimeStampFraction	[39] Milliseconds OPTIONAL,
-	realTimeTariffInformation			[44] SEQUENCE OF RealTimeTariffInformation OPTIONAL
-}
-
-------------------------------------------------------------------------------
---
---  IMS DATA TYPES
---
-------------------------------------------------------------------------------
-AccessCorrelationID ::= CHOICE
-{
-	gPRS-Charging-Id				[2] INTEGER,
-	accessNetworkChargingIdentifier	[4] GraphicString 
-}
-
-ACRInterimLost ::= ENUMERATED 
-{
-	no 		(0),
-	yes 	(1),
-	unknown (2)
-}
-
-ApplicationServersInformation ::= SEQUENCE 
-{	
-	applicationServersInvolved 			[0] NodeAddress OPTIONAL,
-	applicationProvidedCalledParties	[1] SEQUENCE OF InvolvedParty OPTIONAL
-}
-
-CarrierSelectRouting ::= GraphicString
-
-CauseForRecordClosing ::= ENUMERATED 
-{
-	serviceDeliveryEndSuccessfully	(0),
-	unSuccessfulServiceDelivery		(1),
-	timeLimit						(3),
-	serviceChange					(4), -- e.g. change in media due to Re-Invite
-	managementIntervention			(5)  -- partial record generation reasons to be added
-										 --  Additional codes are for further study
-}
-
-Early-Media-Components-List ::= SEQUENCE 
-{
-	sDP-Offer-Timestamp 	[0] TimeStamp OPTIONAL,
-	sDP-Answer-Timestamp	[1] TimeStamp OPTIONAL,
-	sDP-Media-Components	[2] SEQUENCE OF SDP-Media-Component OPTIONAL,
-	mediaInitiatorFlag		[3] NULL OPTIONAL,
-	sDP-Session-Description	[4] SEQUENCE OF GraphicString OPTIONAL,
-	sDP-Type				[5] SDP-Type OPTIONAL 
-}
-
-IMS-Charging-Identifier ::= OCTET STRING
-
-IMSCommunicationServiceIdentifier	::= OCTET STRING
-
-Incomplete-CDR-Indication ::= SET 
-{
-	aCRStartLost	[0] BOOLEAN, -- TRUE if ACR[Start] was lost, FALSE otherwise
-	aCRInterimLost	[1] ACRInterimLost, 
-	aCRStopLost		[2] BOOLEAN -- TRUE if ACR[Stop] was lost, FALSE otherwise
-} 
-
-InterOperatorIdentifierlist ::= SEQUENCE OF InterOperatorIdentifiers
-
-InterOperatorIdentifiers ::= SEQUENCE 
-{ 
-	originatingIOI[0] GraphicString OPTIONAL,
-	terminatingIOI[1] GraphicString OPTIONAL
-}
-
-InvolvedParty ::= CHOICE 
-{
-	sIP-URI[0] GraphicString, -- refer to rfc3261 [401]
-	tEL-URI[1] GraphicString  -- refer to rfc3966 [402]
-}
-
--- Editor’s note:  the constructs below are imported from the generic module
-
-ListOfInvolvedParties ::= SEQUENCE OF InvolvedParty
-
-Media-Components-List ::= SEQUENCE 
---
--- MediaInitiatorParty is used to identify the initiator of the media 
--- multi-participants session e.g. in AS PoC Server
---
-{
-	sIP-Request-Timestamp 			 [0] TimeStamp OPTIONAL,
-	sIP-Response-Timestamp			 [1] TimeStamp OPTIONAL,
-	sDP-Media-Components			 [2] SEQUENCE OF SDP-Media-Component OPTIONAL,
-	mediaInitiatorFlag				 [3] NULL OPTIONAL,
-	sDP-Session-Description			 [4] SEQUENCE OF GraphicString OPTIONAL,
-	mediaInitiatorParty				 [5] InvolvedParty OPTIONAL,
-	sIP-Request-Timestamp-Fraction	 [6] Milliseconds OPTIONAL,
-	sIP-Response-Timestamp-Fraction	 [7] Milliseconds OPTIONAL,
-	sDP-Type						 [8] SDP-Type OPTIONAL
-}
-
-MessageBody ::= SEQUENCE 
-{
-	content-Type			[0] GraphicString,
-	content-Disposition		[1] GraphicString OPTIONAL,
-	content-Length			[2] INTEGER,
-	originator				[3] InvolvedParty OPTIONAL
-}
-
-Milliseconds ::= INTEGER (0..999)
-
-NumberPortabilityRouting ::= GraphicString
-
-RateElement ::= SEQUENCE
-{
-	unitType				[0] INTEGER,
-	unitValue				[1] REAL,
-	unitCost				[2] REAL,
-	unitQuotaThreshold		[3] REAL
-}
-
-RealTimeTariffInformation ::= CHOICE
-{
-	tariffInformation		[0] TariffInformation --OPTIONAL--,
-	tariffXml				[1] UTF8string -- OPTIONAL
-}
-
-Role-of-Node ::= ENUMERATED 
-{
-	originating (0),
-	terminating (1)
-}
-
-S-CSCF-Information ::=  SEQUENCE
-{
-mandatoryCapabilities [0] SEQUENCE OF GraphicString OPTIONAL,
-optionalCapabilities	 [1] SEQUENCE OF GraphicString OPTIONAL,
-serverName 				 [2] GraphicString OPTIONAL
-}
-
-SDP-Media-Component ::=  SEQUENCE
-{
-	sDP-Media-Name        	[0] GraphicString OPTIONAL,
-	sDP-Media-Descriptions	[1] SDP-Media-Description OPTIONAL,
-	accessCorrelationID			AccessCorrelationID OPTIONAL, 		-- not used in MGCF and BGCF
-									-- [2] is used by gPRS-Charging-Id
-									-- [4] is used by accessNetworkChargingIdentifier
-	authorized-QoS        	[3] GraphicString OPTIONAL
-}
-
-SDP-Media-Description ::= SEQUENCE OF GraphicString
-
-ServedPartyIPAddress  ::=  IPAddress 
-
-Service-Id ::= GraphicString
-
-Session-Id ::= GraphicString
---
--- rfc3261 [401]: example for SIP Call-ID: f81d4fae-7dec-11d0-a765-00a0c91e6bf6@foo.bar.com 
---
-
-SessionPriority ::= ENUMERATED
-{
-	pRIORITY-0 (0),
-	pRIORITY-1 (1),
-	pRIORITY-2 (2),
-	pRIORITY-3 (3),
-	pRIORITY-4 (4)
-}
---
--- PRIORITY-4 is the highest priority and Priority-0 is the lowest priority.
---
-
-SIP-Method ::= GraphicString
-
-SDP-Type ::= ENUMERATED 
-{
-	sDP-offer (0),
-	sDP-answer (1)
-}
-
-TariffInformation ::= SEQUENCE
-{
-	currencyCode 			[0] INTEGER,
-	scaleFactor				[1] REAL,
-	rateElements			[2] SEQUENCE OF RateElement OPTIONAL
-}
-
-TransmissionMedium ::= SEQUENCE 
-{
-	tMR	[0] OCTET STRING (SIZE (1)) OPTIONAL, -- required TM, refer to Q.763
-	tMU	[1] OCTET STRING (SIZE (1)) OPTIONAL  -- used TM, refer to Q.763
-}
-
-TrunkGroupID ::= CHOICE 
-{
-	incoming	[0] GraphicString,
-	outgoing	[1] GraphicString
-}
-
-END
diff --git a/asn1/gprscdr/gprscdr.cnf b/asn1/gprscdr/gprscdr.cnf
index 9ec29803f6..5126a9c2f3 100644
--- a/asn1/gprscdr/gprscdr.cnf
+++ b/asn1/gprscdr/gprscdr.cnf
@@ -26,47 +26,7 @@ GPRSCallEventRecord
 
    proto_tree_add_text(tree, tvb, offset, -1, "Not dissected");
    
-#.FN_BODY Timestamp VAL_PTR = &parameter_tvb
-
-/*
-	TimeStamp					::= OCTET STRING (SIZE(9))
-	-- The contents of this field are a compact form of the UTCTime format
-	-- containing local time plus an offset to universal time. Binary coded
-	-- decimal encoding is employed for the digits to reduce the storage and
-	-- transmission overhead
-	-- e.g. YYMMDDhhmmssShhmm
-	-- where
-	-- YY 	= 	Year 00 to 99		BCD encoded
-	-- MM 	= 	Month 01 to 12 		BCD encoded
-	-- DD	=	Day 01 to 31		BCD encoded
-	-- hh	=	hour 00 to 23		BCD encoded
-	-- mm	=	minute 00 to 59		BCD encoded
-	-- ss	=	second 00 to 59		BCD encoded
-	-- S	=	Sign 0 = "+", "-"	ASCII encoded
-	-- hh	=	hour 00 to 23		BCD encoded
-	-- mm	=	minute 00 to 59		BCD encoded
-	--
-*/
- tvbuff_t	*parameter_tvb;
- proto_tree *subtree;
- guint8 YY,MM,DD,hh,mm,S,hh2,mm2;
-
-%(DEFAULT_BODY)s
-
- if (!parameter_tvb)
-	return offset;
-
- subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_timestamp);
- yy = tvb_get_guint8(tvb,0);
- MM = tvb_get_guint8(tvb,1);
- DD = tvb_get_guint8(tvb,2);
- hh = tvb_get_guint8(tvb,3);
- mm = tvb_get_guint8(tvb,4);
- ss = tvb_get_guint8(tvb,5);
- S = tvb_get_guint8(tvb,6);
- hh2 = tvb_get_guint8(tvb,7);
- mm2 = tvb_get_guint8(tvb,9);
- proto_tree_add_text(subtree, tvb, offset, -1, "UTCTime %u%u%u %u:%u.%u",YY,MM,DD,hh,mm,ss);
+##### FN_BODY TimeStamp VAL_PTR = &parameter_tvb
 
    
 #.TYPE_ATTR