GSM MAP: Add Ericsson specific fields to MAP-OpenInfo

Bug: 11696
Change-Id: I0b6502b12e45949551e25eb3d337b7da0fac933e
Reviewed-on: https://code.wireshark.org/review/12015
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

5 files changed, 269 insertions, 265 deletions

diff --git a/asn1/gsm_map/MAP-CommonDataTypes.asn b/asn1/gsm_map/MAP-CommonDataTypes.asn
index 81102fe96a..24296681a3 100644
--- a/asn1/gsm_map/MAP-CommonDataTypes.asn
+++ b/asn1/gsm_map/MAP-CommonDataTypes.asn
@@ -21,8 +21,8 @@ EXPORTS
 	maxISDN-AddressLength,
 	FTN-AddressString,
 	ISDN-SubaddressString,
-	ExternalSignalInfo, 
-	Ext-ExternalSignalInfo, 
+	ExternalSignalInfo,
+	Ext-ExternalSignalInfo,
 AccessNetworkSignalInfo,
 	SignalInfo,
 	maxSignalInfoLength,
@@ -34,7 +34,7 @@ AccessNetworkSignalInfo,
 
 	-- data types for numbering and identification
 	IMSI,
-	TMSI, 
+	TMSI,
 	Identity,
 	SubscriberId,
 	IMEI,
@@ -43,8 +43,8 @@ AccessNetworkSignalInfo,
 	GlobalCellId,
 	NetworkResource,
 	AdditionalNetworkResource,
-	NAEA-PreferredCI, 
-	NAEA-CIC, 
+	NAEA-PreferredCI,
+	NAEA-CIC,
 	ASCI-CallReference,
 	SubscriberIdentity,
 	PLMN-Id,
@@ -54,7 +54,7 @@ AccessNetworkSignalInfo,
 	NetworkNodeDiameterAddress,
 
 	-- data types for CAMEL
-	CellGlobalIdOrServiceAreaIdOrLAI, 
+	CellGlobalIdOrServiceAreaIdOrLAI,
 	CellGlobalIdOrServiceAreaIdFixedLength,
 	LAIFixedLength,
 
@@ -62,7 +62,7 @@ AccessNetworkSignalInfo,
 	BasicServiceCode,
 	Ext-BasicServiceCode,
 	EMLPP-Info,
-	EMLPP-Priority, 
+	EMLPP-Priority,
 	MC-SS-Info,
 	MaxMC-Bearers,
 	MC-Bearers,
@@ -163,21 +163,21 @@ AddressString ::= OCTET STRING (SIZE (1..maxAddressLength))
 
 maxAddressLength  INTEGER ::= 20
 
-ISDN-AddressString ::= 
+ISDN-AddressString ::=
 			AddressString (SIZE (1..maxISDN-AddressLength))
 	-- This type is used to represent ISDN numbers.
 
 maxISDN-AddressLength  INTEGER ::= 9
 
-FTN-AddressString ::= 
+FTN-AddressString ::=
 			AddressString (SIZE (1..maxFTN-AddressLength))
-	-- This type is used to represent forwarded-to numbers. 
+	-- This type is used to represent forwarded-to numbers.
 	-- If NAI = international the first digits represent the country code (CC)
 	-- and the network destination code (NDC) as for E.164.
 
 maxFTN-AddressLength  INTEGER ::= 15
 
-ISDN-SubaddressString ::= 
+ISDN-SubaddressString ::=
 			OCTET STRING (SIZE (1..maxISDN-SubaddressLength))
 	-- This type is used to represent ISDN subaddresses.
 	-- It is composed of
@@ -253,18 +253,18 @@ Ext-ExternalSignalInfo ::= SEQUENCE {
 
 Ext-ProtocolId ::= ENUMERATED {
 	ets-300356  (1),
-	... 
+	...
 	 }
 -- exception handling:
 -- For Ext-ExternalSignalInfo sequences containing this parameter with any
--- other value than the ones listed the receiver shall ignore the whole 
+-- other value than the ones listed the receiver shall ignore the whole
 -- Ext-ExternalSignalInfo sequence.
 
 AccessNetworkSignalInfo ::= SEQUENCE {
 	accessNetworkProtocolId	AccessNetworkProtocolId,
 	signalInfo	LongSignalInfo,
 	-- Information about the internal structure is given in clause 7.6.9.1
-	
+
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...}
 
@@ -283,7 +283,7 @@ AccessNetworkProtocolId ::= ENUMERATED {
 	...}
 	-- exception handling:
 	-- For AccessNetworkSignalInfo sequences containing this parameter with any
-	-- other value than the ones listed the receiver shall ignore the whole 
+	-- other value than the ones listed the receiver shall ignore the whole
 	-- AccessNetworkSignalInfo sequence.
 
 AlertingPattern ::= OCTET STRING (SIZE (1) )
@@ -304,7 +304,7 @@ alertingLevel-1   AlertingPattern ::= '00000001'B
 alertingLevel-2   AlertingPattern ::= '00000010'B
 	-- all other values of Alerting level are reserved
 	-- Alerting Levels are defined in GSM 02.07
-	
+
 alertingCategory-1   AlertingPattern ::= '00000100'B
 alertingCategory-2   AlertingPattern ::= '00000101'B
 alertingCategory-3   AlertingPattern ::= '00000110'B
@@ -407,9 +407,9 @@ NAEA-PreferredCI ::= SEQUENCE {
 
 NAEA-CIC ::= OCTET STRING (SIZE (3))
 	-- The internal structure is defined by the Carrier Identification
-	-- parameter in ANSI T1.113.3. Carrier codes between “000” and “999” may
-	-- be encoded as 3 digits using “000” to “999” or as 4 digits using 
-	-- “0000” to “0999”. Carrier codes between “1000” and “9999” are encoded
+	-- parameter in ANSI T1.113.3. Carrier codes between "000" and "999" may
+	-- be encoded as 3 digits using "000" to "999" or as 4 digits using
+	-- "0000" to "0999". Carrier codes between "1000" and "9999" are encoded
 	-- using 4 digits.
 
 SubscriberIdentity ::= CHOICE {
@@ -448,7 +448,7 @@ navigation			LCSServiceTypeID ::= 8
 	--this service type is reserved for use in previous releases
 citySightseeing		LCSServiceTypeID ::= 9
 localizedAdvertising		LCSServiceTypeID ::= 10
-mobileYellowPages		LCSServiceTypeID ::= 11 
+mobileYellowPages		LCSServiceTypeID ::= 11
 trafficAndPublicTransportationInfo		LCSServiceTypeID ::= 12
 weather				LCSServiceTypeID ::= 13
 assetAndServiceFinding		LCSServiceTypeID ::= 14
@@ -570,8 +570,8 @@ CellGlobalIdOrServiceAreaIdFixedLength ::= OCTET STRING (SIZE (7))
 	-- octet 3 bits 4321	Mobile Network Code 1st digit
 	--         bits 8765	Mobile Network Code 2nd digit
 	-- octets 4 and 5	Location Area Code according to 3GPP TS 24.008
-	-- octets 6 and 7	Cell Identity (CI) value or 
-	-- 			Service Area Code (SAC) value 
+	-- octets 6 and 7	Cell Identity (CI) value or
+	-- 			Service Area Code (SAC) value
 	--			according to 3GPP TS 23.003
 
 LAIFixedLength ::= OCTET STRING (SIZE (5))
@@ -657,9 +657,9 @@ AgeOfLocationInformation ::= INTEGER (0..32767)
 -- the value represents the elapsed time in minutes since the last
 -- network contact of the mobile station (i.e. the actuality of the
 -- location information).
--- value “0” indicates that the MS is currently in contact with the
+-- value "0" indicates that the MS is currently in contact with the
 --           network
--- value “32767” indicates that the location information is at least
+-- value "32767" indicates that the location information is at least
 --               32767 minutes old
 
 END
diff --git a/asn1/gsm_map/MAP-DialogueInformation.asn b/asn1/gsm_map/MAP-DialogueInformation.asn
index ca1c8b0612..0ef5a6e631 100644
--- a/asn1/gsm_map/MAP-DialogueInformation.asn
+++ b/asn1/gsm_map/MAP-DialogueInformation.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 29.002 V12.3.0 (2013-12) 
+-- 3GPP TS 29.002 V12.3.0 (2013-12)
 -- 17.4	MAP Dialogue Information
 MAP-DialogueInformation {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -55,6 +55,10 @@ MAP-DialoguePDU ::= CHOICE {
 MAP-OpenInfo ::= SEQUENCE {
 	destinationReference	[0] AddressString	OPTIONAL,
 	originationReference	[1] AddressString	OPTIONAL,
+-- WS modification: Ericsson proprietary fields
+	callingMsisdn			[2] AddressString OPTIONAL,
+	callingVlrAddress		[3] AddressString OPTIONAL,
+-- WS modification: Ericsson proprietary fields
 	...,
 	extensionContainer	ExtensionContainer	OPTIONAL
 	-- extensionContainer must not be used in version 2
diff --git a/asn1/gsm_map/MAP-LCS-DataTypes.asn b/asn1/gsm_map/MAP-LCS-DataTypes.asn
index f632daea43..f3048267f0 100644
--- a/asn1/gsm_map/MAP-LCS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-LCS-DataTypes.asn
@@ -1,6 +1,6 @@
 -- MAP-LCS-DataTypes.asn
 --
--- Taken from 3GPP TS 29.002  V12.3.0 (2013-12) 
+-- Taken from 3GPP TS 29.002  V12.3.0 (2013-12)
 --
 -- 17.7.13 Location service data types
 --
@@ -21,17 +21,17 @@ EXPORTS
 	ProvideSubscriberLocation-Res,
 	SubscriberLocationReport-Arg,
 	SubscriberLocationReport-Res,
-LocationType, 
+LocationType,
 DeferredLocationEventType,
 LCSClientName,
 LCS-QoS,
 Horizontal-Accuracy,
 ResponseTime,
-Ext-GeographicalInformation, 
+Ext-GeographicalInformation,
 VelocityEstimate,
 SupportedGADShapes,
 Add-GeographicalInformation,
-LCSRequestorID, 
+LCSRequestorID,
 LCS-ReferenceNumber,
 LCSCodeword,
 AreaEventInfo,
@@ -144,7 +144,7 @@ ProvideSubscriberLocation-Arg ::= SEQUENCE {
 	reportingPLMNList	[18] ReportingPLMNList	OPTIONAL }
 
 	-- one of imsi or msisdn is mandatory
-	-- If a location estimate type indicates activate deferred location or cancel deferred 
+	-- If a location estimate type indicates activate deferred location or cancel deferred
 	-- location, a lcs-Reference number shall be included.
 
 LocationType ::= SEQUENCE {
@@ -169,12 +169,12 @@ DeferredLocationEventType ::= BIT STRING {
 	enteringIntoArea	(1),
 	leavingFromArea	(2),
 	beingInsideArea	(3) ,
-	periodicLDR	(4)  } (SIZE (1..16)) 
+	periodicLDR	(4)  } (SIZE (1..16))
 -- beingInsideArea is always treated as oneTimeEvent regardless of the possible value
 -- of occurrenceInfo inside areaEventInfo.
 -- exception handling:
--- a ProvideSubscriberLocation-Arg containing other values than listed above in 
--- DeferredLocationEventType shall be rejected by the receiver with a return error cause of 
+-- a ProvideSubscriberLocation-Arg containing other values than listed above in
+-- DeferredLocationEventType shall be rejected by the receiver with a return error cause of
 -- unexpected data value.
 
 LCS-ClientID ::= SEQUENCE {
@@ -196,7 +196,7 @@ LCSClientType ::= ENUMERATED {
 	--	exception handling:
 	--	unrecognized values may be ignored if the LCS client uses the privacy override
 	--	otherwise, an unrecognized value shall be treated as unexpected data by a receiver
-	--	a return error shall then be returned if received in a MAP invoke 
+	--	a return error shall then be returned if received in a MAP invoke
 
 LCSClientName ::= SEQUENCE {
 	dataCodingScheme	[0] USSD-DataCodingScheme,
@@ -234,7 +234,7 @@ LCS-FormatIndicator ::= ENUMERATED {
 LCS-Priority ::= OCTET STRING (SIZE (1))
 	-- 0 = highest priority
 	-- 1 = normal priority
-	-- all other values treated as 1 
+	-- all other values treated as 1
 
 LCS-QoS ::= SEQUENCE {
 	horizontal-accuracy	[0] Horizontal-Accuracy	OPTIONAL,
@@ -247,14 +247,14 @@ LCS-QoS ::= SEQUENCE {
 
 Horizontal-Accuracy ::= OCTET STRING (SIZE (1))
 	-- bit 8 = 0
-	-- bits 7-1 = 7 bit Uncertainty Code defined in 3GPP TS 23.032. The horizontal location 
+	-- bits 7-1 = 7 bit Uncertainty Code defined in 3GPP TS 23.032. The horizontal location
 	-- error should be less than the error indicated by the uncertainty code with 67%
 	-- confidence.
 
 Vertical-Accuracy ::= OCTET STRING (SIZE (1))
 	-- bit 8 = 0
-	-- bits 7-1 = 7 bit Vertical Uncertainty Code defined in 3GPP TS 23.032. 
-	-- The vertical location error should be less than the error indicated 
+	-- bits 7-1 = 7 bit Vertical Uncertainty Code defined in 3GPP TS 23.032.
+	-- The vertical location error should be less than the error indicated
 	-- by the uncertainty code with 67% confidence.
 
 ResponseTime ::= SEQUENCE {
@@ -440,18 +440,18 @@ Ext-GeographicalInformation ::= OCTET STRING (SIZE (1..maxExt-GeographicalInform
 	--		(d) Ellipsoid Arc
 	--		(e) Ellipsoid Point
 	-- Any other value in octet 1 shall be treated as invalid
-	-- Octets 2 to 8 for case (a) – Ellipsoid point with uncertainty circle
+	-- Octets 2 to 8 for case (a) - Ellipsoid point with uncertainty circle
 	--		Degrees of Latitude				3 octets
 	--		Degrees of Longitude				3 octets
 	--		Uncertainty code				1 octet
-	-- Octets 2 to 11 for case (b) – Ellipsoid point with uncertainty ellipse:
+	-- Octets 2 to 11 for case (b) - Ellipsoid point with uncertainty ellipse:
 	--		Degrees of Latitude				3 octets
 	--		Degrees of Longitude				3 octets
 	--		Uncertainty semi-major axis				1 octet
 	--		Uncertainty semi-minor axis				1 octet
 	--		Angle of major axis				1 octet
 	--		Confidence				1 octet
-	-- Octets 2 to 14 for case (c) – Ellipsoid point with altitude and uncertainty ellipsoid
+	-- Octets 2 to 14 for case (c) - Ellipsoid point with altitude and uncertainty ellipsoid
 	--		Degrees of Latitude				3 octets
 	--		Degrees of Longitude				3 octets
 	--		Altitude				2 octets
@@ -460,7 +460,7 @@ Ext-GeographicalInformation ::= OCTET STRING (SIZE (1..maxExt-GeographicalInform
 	--		Angle of major axis				1 octet
 	--		Uncertainty altitude				1 octet
 	--		Confidence				1 octet
-	-- Octets 2 to 13 for case (d) – Ellipsoid Arc
+	-- Octets 2 to 13 for case (d) - Ellipsoid Arc
 	--		Degrees of Latitude				3 octets
 	--		Degrees of Longitude				3 octets
 	--		Inner radius				2 octets
@@ -468,7 +468,7 @@ Ext-GeographicalInformation ::= OCTET STRING (SIZE (1..maxExt-GeographicalInform
 	--		Offset angle				1 octet
 	--		Included angle				1 octet
 	--		Confidence				1 octet
-	-- Octets 2 to 7 for case (e) – Ellipsoid Point
+	-- Octets 2 to 7 for case (e) - Ellipsoid Point
 	--		Degrees of Latitude				3 octets
 	--		Degrees of Longitude				3 octets
 
@@ -478,7 +478,7 @@ Ext-GeographicalInformation ::= OCTET STRING (SIZE (1..maxExt-GeographicalInform
 	-- to 3GPP TS 23.032 shall be treated as invalid data by a receiver.
 	--
 	-- An Ext-GeographicalInformation parameter comprising one octet shall be discarded
-	-- by the receiver if an Add-GeographicalInformation parameter is received 
+	-- by the receiver if an Add-GeographicalInformation parameter is received
 	-- in the same message.
 	--
 	-- An Ext-GeographicalInformation parameter comprising one octet shall be treated as
@@ -486,7 +486,7 @@ Ext-GeographicalInformation ::= OCTET STRING (SIZE (1..maxExt-GeographicalInform
 	-- received in the same message.
 
 maxExt-GeographicalInformation  INTEGER ::= 20
-	-- the maximum length allows for further shapes in 3GPP TS 23.032 to be included in later 
+	-- the maximum length allows for further shapes in 3GPP TS 23.032 to be included in later
 	-- versions of 3GPP TS 29.002
 
 VelocityEstimate ::= OCTET STRING (SIZE (4..7))
@@ -504,15 +504,15 @@ VelocityEstimate ::= OCTET STRING (SIZE (4..7))
 	-- Octets 2 to 4 for case (a) Horizontal velocity:
 	--		Bearing				1 octet
 	--		Horizontal Speed				2 octets
-	-- Octets 2 to 5 for case (b) – Horizontal with Vertical Velocity:
+	-- Octets 2 to 5 for case (b) - Horizontal with Vertical Velocity:
 	--		Bearing				1 octet
 	--		Horizontal Speed				2 octets
 	--		Vertical Speed				1 octet
-	-- Octets 2 to 5 for case (c) – Horizontal velocity with Uncertainty:
+	-- Octets 2 to 5 for case (c) - Horizontal velocity with Uncertainty:
 	--		Bearing				1 octet
 	--		Horizontal Speed				2 octets
 	--		Uncertainty Speed				1 octet
-	-- Octets 2 to 7 for case (d) – Horizontal with Vertical Velocity and Uncertainty:
+	-- Octets 2 to 7 for case (d) - Horizontal with Vertical Velocity and Uncertainty:
 	--		Bearing				1 octet
 	--		Horizontal Speed				2 octets
 	--		Vertical Speed				1 octet
@@ -522,10 +522,10 @@ VelocityEstimate ::= OCTET STRING (SIZE (4..7))
 PositioningDataInformation ::= OCTET STRING (SIZE (2..maxPositioningDataInformation))
 	-- Refers to the Positioning Data defined in 3GPP TS 49.031.
 	-- This is composed of 2 or more octets with an internal structure according to
-	-- 3GPP TS 49.031. 
+	-- 3GPP TS 49.031.
 
 maxPositioningDataInformation INTEGER ::= 10
-	-- 
+	--
 
 UtranPositioningDataInfo ::= OCTET STRING (SIZE (3..maxUtranPositioningDataInfo))
 	-- Refers to the Position Data defined in 3GPP TS 25.413.
@@ -533,15 +533,15 @@ UtranPositioningDataInfo ::= OCTET STRING (SIZE (3..maxUtranPositioningDataInfo)
 	-- included in positionData as defined in 3GPP TS 25.413.
 
 maxUtranPositioningDataInfo INTEGER ::= 11
-	-- 
+	--
 
 GeranGANSSpositioningData ::= OCTET STRING (SIZE (2..maxGeranGANSSpositioningData))
 	-- Refers to the GANSS Positioning Data defined in 3GPP TS 49.031.
 	-- This is composed of 2 or more octets with an internal structure according to
-	-- 3GPP TS 49.031. 
+	-- 3GPP TS 49.031.
 
 maxGeranGANSSpositioningData INTEGER ::= 10
-	-- 
+	--
 
 UtranGANSSpositioningData ::= OCTET STRING (SIZE (1..maxUtranGANSSpositioningData))
 	-- Refers to the Position Data defined in 3GPP TS 25.413.
@@ -549,24 +549,24 @@ UtranGANSSpositioningData ::= OCTET STRING (SIZE (1..maxUtranGANSSpositioningDat
      -- as defined in 3GPP TS 25.413.
 
 maxUtranGANSSpositioningData INTEGER ::= 9
-	-- 
+	--
 
 Add-GeographicalInformation ::= OCTET STRING (SIZE (1..maxAdd-GeographicalInformation))
 	-- Refers to geographical Information defined in 3GPP TS 23.032.
-	-- This is composed of 1 or more octets with an internal structure according to 
+	-- This is composed of 1 or more octets with an internal structure according to
 	-- 3GPP TS 23.032
 	-- Octet 1: Type of shape, all the shapes defined in 3GPP TS 23.032 are allowed:
 	-- Octets 2 to n (where n is the total number of octets necessary to encode the shape
 	-- according to 3GPP TS 23.032) are used to encode the shape itself in accordance with the
 	-- encoding defined in 3GPP TS 23.032
 	--
-	-- An Add-GeographicalInformation parameter, whether valid or invalid, received 
-	-- together with a valid Ext-GeographicalInformation parameter in the same message 
+	-- An Add-GeographicalInformation parameter, whether valid or invalid, received
+	-- together with a valid Ext-GeographicalInformation parameter in the same message
 	-- shall be discarded.
 	--
-	-- An Add-GeographicalInformation parameter containing any shape not defined in 
-	-- 3GPP TS 23.032 or an incorrect number of octets or coding according to 
-	-- 3GPP TS 23.032 shall be treated as invalid data by a receiver if not received 
+	-- An Add-GeographicalInformation parameter containing any shape not defined in
+	-- 3GPP TS 23.032 or an incorrect number of octets or coding according to
+	-- 3GPP TS 23.032 shall be treated as invalid data by a receiver if not received
 	-- together with a valid Ext-GeographicalInformation parameter in the same message.
 
 maxAdd-GeographicalInformation  INTEGER ::= 91
@@ -574,7 +574,7 @@ maxAdd-GeographicalInformation  INTEGER ::= 91
 
 SubscriberLocationReport-Arg ::= SEQUENCE {
 	lcs-Event		LCS-Event,
-	lcs-ClientID	LCS-ClientID, 
+	lcs-ClientID	LCS-ClientID,
 	lcsLocationInfo	LCSLocationInfo,
 	msisdn		[0] ISDN-AddressString	OPTIONAL,
 	imsi			[1] IMSI		OPTIONAL,
@@ -586,7 +586,7 @@ SubscriberLocationReport-Arg ::= SEQUENCE {
 	slr-ArgExtensionContainer	[7] SLR-ArgExtensionContainer	OPTIONAL,
 	... ,
 	add-LocationEstimate	[8] Add-GeographicalInformation	OPTIONAL,
-	deferredmt-lrData	[9] Deferredmt-lrData	OPTIONAL, 
+	deferredmt-lrData	[9] Deferredmt-lrData	OPTIONAL,
 	lcs-ReferenceNumber	[10] LCS-ReferenceNumber	OPTIONAL,
 	geranPositioningData	[11] PositioningDataInformation	OPTIONAL,
 	utranPositioningData	[12] UtranPositioningDataInfo	OPTIONAL,
@@ -605,19 +605,19 @@ SubscriberLocationReport-Arg ::= SEQUENCE {
 	targetServingNodeForHandover	[26] ServingNodeAddress	OPTIONAL }
 
 	-- one of msisdn or imsi is mandatory
-	-- a location estimate that is valid for the locationEstimate parameter should 
+	-- a location estimate that is valid for the locationEstimate parameter should
 	-- be transferred in this parameter in preference to the add-LocationEstimate.
 	-- the deferredmt-lrData parameter shall be included if and only if the lcs-Event
 	-- indicates a deferredmt-lrResponse.
-	-- if the lcs-Event indicates a deferredmt-lrResponse then the locationEstimate 
-	-- and the add-locationEstimate parameters shall not be sent if the 
+	-- if the lcs-Event indicates a deferredmt-lrResponse then the locationEstimate
+	-- and the add-locationEstimate parameters shall not be sent if the
 	-- supportedGADShapes parameter had been received in ProvideSubscriberLocation-Arg
 	-- and the shape encoded in locationEstimate or add-LocationEstimate was not marked
-	-- as supported in supportedGADShapes. In such a case terminationCause 
-	-- in deferredmt-lrData shall be present with value 
-	-- shapeOfLocationEstimateNotSupported. 
-	-- If a lcs event indicates deferred mt-lr response, the lcs-Reference number shall be 
-	-- included. 
+	-- as supported in supportedGADShapes. In such a case terminationCause
+	-- in deferredmt-lrData shall be present with value
+	-- shapeOfLocationEstimateNotSupported.
+	-- If a lcs event indicates deferred mt-lr response, the lcs-Reference number shall be
+	-- included.
 	-- sai-Present indicates that the cellIdOrSai parameter contains a Service Area Identity.
 
 Deferredmt-lrData ::= SEQUENCE {
@@ -625,19 +625,19 @@ Deferredmt-lrData ::= SEQUENCE {
 	terminationCause	[0] TerminationCause	OPTIONAL,
 	lcsLocationInfo	[1] LCSLocationInfo	OPTIONAL,
 	...}
-	-- lcsLocationInfo may be included only if a terminationCause is present 
+	-- lcsLocationInfo may be included only if a terminationCause is present
 	-- indicating mt-lrRestart.
 
 LCS-Event ::= ENUMERATED {
 	emergencyCallOrigination  (0),
-	emergencyCallRelease  (1), 
+	emergencyCallRelease  (1),
 	mo-lr  (2),
 	...,
 	deferredmt-lrResponse  (3) ,
 	deferredmo-lrTTTPInitiation  (4),
 	emergencyCallHandover (5)  }
-	--	deferredmt-lrResponse is applicable to the delivery of a location estimate 
-	--	for an LDR initiated earlier by either the network (via an MT-LR activate deferred 
+	--	deferredmt-lrResponse is applicable to the delivery of a location estimate
+	--	for an LDR initiated earlier by either the network (via an MT-LR activate deferred
 	--	location) or the UE (via a deferred MO-LR TTTP initiation)
 	--	exception handling:
 	--	a SubscriberLocationReport-Arg containing an unrecognized LCS-Event
@@ -654,14 +654,14 @@ TerminationCause ::= ENUMERATED {
 	shapeOfLocationEstimateNotSupported (6) ,
 	subscriberTermination (7),
 	uETermination (8),
-	networkTermination (9)  } 
--- mt-lrRestart shall be used to trigger the GMLC to restart the location procedure, 
--- either because the sending node knows that the terminal has moved under coverage 
+	networkTermination (9)  }
+-- mt-lrRestart shall be used to trigger the GMLC to restart the location procedure,
+-- either because the sending node knows that the terminal has moved under coverage
 -- of another MSC or SGSN (e.g. Send Identification received), or because the subscriber
 -- has been deregistered due to a Cancel Location received from HLR.
 --
 -- exception handling
--- an unrecognized value shall be treated the same as value 1 (errorundefined) 
+-- an unrecognized value shall be treated the same as value 1 (errorundefined)
 
 SequenceNumber ::= INTEGER (1..maxReportingAmount)
 
@@ -671,8 +671,8 @@ ServingNodeAddress ::= CHOICE {
 	mme-Number	[2] DiameterIdentity }
 
 SubscriberLocationReport-Res ::= SEQUENCE {
-	extensionContainer	ExtensionContainer	OPTIONAL, 
-	..., 
+	extensionContainer	ExtensionContainer	OPTIONAL,
+	...,
 	na-ESRK		[0] ISDN-AddressString	OPTIONAL,
 	na-ESRD		[1] ISDN-AddressString	OPTIONAL,
 	h-gmlc-Address	[2]	GSN-Address	OPTIONAL,
diff --git a/asn1/gsm_map/MAP-MS-DataTypes.asn b/asn1/gsm_map/MAP-MS-DataTypes.asn
index 60b439b30c..883a1a639c 100644
--- a/asn1/gsm_map/MAP-MS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-MS-DataTypes.asn
@@ -21,14 +21,14 @@ EXPORTS
 	UpdateLocationArg,
 	UpdateLocationRes,
 	CancelLocationArg,
-	CancelLocationRes, 
-	PurgeMS-Arg, 
+	CancelLocationRes,
+	PurgeMS-Arg,
 	PurgeMS-Res,
 	SendIdentificationArg,
-	SendIdentificationRes, 
+	SendIdentificationRes,
 	UpdateGprsLocationArg,
 	UpdateGprsLocationRes,
-	IST-SupportIndicator, 
+	IST-SupportIndicator,
 	SupportedLCS-CapabilitySets,
 	UpdateVcsgLocationArg,
 	UpdateVcsgLocationRes,
@@ -40,7 +40,7 @@ EXPORTS
 	ForwardAccessSignalling-Arg,
 	PrepareHO-Arg,
 	PrepareHO-Res,
-	PrepareSubsequentHO-Arg, 
+	PrepareSubsequentHO-Arg,
 	PrepareSubsequentHO-Res,
 	ProcessAccessSignalling-Arg,
 	SendEndSignal-Arg,
@@ -48,12 +48,12 @@ EXPORTS
 
 	-- authentication management types
 	SendAuthenticationInfoArg,
-	SendAuthenticationInfoRes, 
+	SendAuthenticationInfoRes,
 	AuthenticationFailureReportArg,
 AuthenticationFailureReportRes,
 
 	-- security management types
-	Kc, 
+	Kc,
 	Cksn,
 
 	-- equipment management types
@@ -62,22 +62,22 @@ AuthenticationFailureReportRes,
 
 	-- subscriber management types
 	InsertSubscriberDataArg,
-	InsertSubscriberDataRes, 
+	InsertSubscriberDataRes,
 	LSAIdentity,
 	DeleteSubscriberDataArg,
 	DeleteSubscriberDataRes,
 	Ext-QoS-Subscribed,
-	Ext2-QoS-Subscribed, 
-	Ext3-QoS-Subscribed, 
+	Ext2-QoS-Subscribed,
+	Ext3-QoS-Subscribed,
 	Ext4-QoS-Subscribed,
 	SubscriberData,
 	ODB-Data,
 	SubscriberStatus,
 	ZoneCodeList,
-	maxNumOfZoneCodes, 
-	O-CSI, 
+	maxNumOfZoneCodes,
+	O-CSI,
 D-CSI,
-	O-BcsmCamelTDPCriteriaList, 
+	O-BcsmCamelTDPCriteriaList,
 	T-BCSM-CAMEL-TDP-CriteriaList,
 	SS-CSI,
 	ServiceKey,
@@ -90,12 +90,12 @@ D-CSI,
 	OfferedCamel4CSIs,
 	OfferedCamel4Functionalities,
 	maxNumOfCamelTDPData,
-	CUG-Index, 
+	CUG-Index,
 	CUG-Info,
 	CUG-Interlock,
 	InterCUG-Restrictions,
 	IntraCUG-Options,
-	NotificationToMSUser, 
+	NotificationToMSUser,
 	QoS-Subscribed,
 IST-AlertTimerValue,
 	T-CSI,
@@ -108,8 +108,8 @@ AdditionalInfo,
 	RestoreDataArg,
 	RestoreDataRes,
 
--- provide subscriber info types 
-GeographicalInformation, 
+-- provide subscriber info types
+GeographicalInformation,
 MS-Classmark2,
 GPRSMSClass,
 
@@ -120,7 +120,7 @@ GPRSMSClass,
 	LocationInformation,
 	LocationInformationGPRS,
 	SubscriberState,
-	GPRSChargingID, 
+	GPRSChargingID,
 MNPInfoRes,
 	RouteingNumber,
 
@@ -157,7 +157,7 @@ NoteMM-EventArg,
 	PagingArea,
 
 	-- VGCS / VBS types types
-GroupId, 
+GroupId,
 Long-GroupId,
 AdditionalSubscriptions,
 -- WS adittion
@@ -192,11 +192,11 @@ FROM MAP-TS-Code {
    gsm-Network (1) modules (3) map-TS-Code (19) version15 (15)}
 
 	AddressString,
-ISDN-AddressString, 
-	ISDN-SubaddressString, 
+ISDN-AddressString,
+	ISDN-SubaddressString,
 	FTN-AddressString,
 	AccessNetworkSignalInfo,
-	IMSI, 
+	IMSI,
 	IMEI,
 	TMSI,
 	HLR-List,
@@ -206,7 +206,7 @@ ISDN-AddressString,
 	CellGlobalIdOrServiceAreaIdOrLAI,
 	Ext-BasicServiceCode,
 	NAEA-PreferredCI,
-	EMLPP-Info, 
+	EMLPP-Info,
 	MC-SS-Info,
 	SubscriberIdentity,
 	AgeOfLocationInformation,
@@ -262,7 +262,7 @@ UpdateLocationArg ::= SEQUENCE {
 	v-gmlc-Address	[2]	GSN-Address	OPTIONAL,
 	add-info		[13] ADD-Info	OPTIONAL,
 	pagingArea	[14] PagingArea	OPTIONAL,
-	skipSubscriberDataUpdate	[15] NULL		OPTIONAL, 
+	skipSubscriberDataUpdate	[15] NULL		OPTIONAL,
 	-- The skipSubscriberDataUpdate parameter in the UpdateLocationArg and the ADD-Info
 	-- structures carry the same semantic.
 	restorationIndicator	[16]	NULL		OPTIONAL,
@@ -292,7 +292,7 @@ SupportedRAT-Types::= BIT STRING {
 	i-hspa-evolution (3),
 	e-utran	(4)} (SIZE (2..8))
 	-- exception handling: bits 5 to 7 shall be ignored if received and not understood
-	 
+
 
 
 SuperChargerInfo ::= CHOICE {
@@ -314,13 +314,13 @@ SupportedLCS-CapabilitySets ::= BIT STRING {
 	lcsCapabilitySet2 (1),
 	lcsCapabilitySet3 (2),
 	lcsCapabilitySet4 (3) ,
-	lcsCapabilitySet5 (4) } (SIZE (2..16)) 
+	lcsCapabilitySet5 (4) } (SIZE (2..16))
 -- Core network signalling capability set1 indicates LCS Release98 or Release99 version.
 -- Core network signalling capability set2 indicates LCS Release4.
 -- Core network signalling capability set3 indicates LCS Release5.
 -- Core network signalling capability set4 indicates LCS Release6.
 -- Core network signalling capability set5 indicates LCS Release7 or later version.
--- A node shall mark in the BIT STRING all LCS capability sets it supports. 
+-- A node shall mark in the BIT STRING all LCS capability sets it supports.
 -- If no bit is set then the sending node does not support LCS.
 -- If the parameter is not sent by an VLR then the VLR may support at most capability set1.
 -- If the parameter is not sent by an SGSN then no support for LCS is assumed.
@@ -342,7 +342,7 @@ ADD-Info ::= SEQUENCE {
 	...}
 
 
-PagingArea ::= SEQUENCE SIZE (1..5) OF LocationArea 
+PagingArea ::= SEQUENCE SIZE (1..5) OF LocationArea
 
 
 LocationArea ::= CHOICE {
@@ -351,7 +351,7 @@ LocationArea ::= CHOICE {
 
 
 LAC ::= OCTET STRING (SIZE (2))
-	-- Refers to Location Area Code of the Location Area Identification defined in 
+	-- Refers to Location Area Code of the Location Area Identification defined in
      -- 3GPP TS 23.003 [17].
 	-- Location Area Code according to 3GPP TS 24.008 [35]
 
@@ -409,9 +409,9 @@ PurgeMS-Res ::= SEQUENCE {
 SendIdentificationArg ::= SEQUENCE {
 	tmsi			TMSI,
 	numberOfRequestedVectors	NumberOfRequestedVectors 	OPTIONAL,
-	-- within a dialogue numberOfRequestedVectors shall be present in 
-	-- the first service request and shall not be present in subsequent service requests. 
-	-- If received in a subsequent service request it shall be discarded. 
+	-- within a dialogue numberOfRequestedVectors shall be present in
+	-- the first service request and shall not be present in subsequent service requests.
+	-- If received in a subsequent service request it shall be discarded.
 	segmentationProhibited	NULL			OPTIONAL,
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...,
@@ -538,7 +538,7 @@ FailureCause ::= ENUMERATED {
 
 UpdateGprsLocationArg ::= SEQUENCE {
 	imsi			IMSI,
-	sgsn-Number	ISDN-AddressString,	
+	sgsn-Number	ISDN-AddressString,
 	sgsn-Address	GSN-Address,
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	... ,
@@ -554,7 +554,7 @@ UpdateGprsLocationArg ::= SEQUENCE {
 	gprsSubscriptionDataNotNeeded	[9] NULL		OPTIONAL,
 	nodeTypeIndicator	[10] NULL		OPTIONAL,
 	areaRestricted	[11] NULL		OPTIONAL,
-	ue-reachableIndicator	[12]	NULL		OPTIONAL, 
+	ue-reachableIndicator	[12]	NULL		OPTIONAL,
 	epsSubscriptionDataNotNeeded	[13] NULL		OPTIONAL,
 	ue-srvcc-Capability	[14] UE-SRVCC-Capability	OPTIONAL,
 	eplmn-List	[15] EPLMN-List	OPTIONAL,
@@ -590,10 +590,10 @@ PDN-GW-Update ::= SEQUENCE{
 	contextId		[2] ContextId                     OPTIONAL,
 	extensionContainer	[3] ExtensionContainer	OPTIONAL,
 	... }
---	The pdn-gw-update IE shall include the pdn-gw-Identity, and the apn or/and the contextID. 
---	The HSS shall ignore the eps-info IE if it includes a pdn-gw-update IE which does not 
+--	The pdn-gw-update IE shall include the pdn-gw-Identity, and the apn or/and the contextID.
+--	The HSS shall ignore the eps-info IE if it includes a pdn-gw-update IE which does not
 --	include pdn-gw-Identity.
---	The pdn-gw-Identity is defined as OPTIONAL for backward compatility reason with  
+--	The pdn-gw-Identity is defined as OPTIONAL for backward compatility reason with
 --	outdated earlier versions of this specification.
 
 
@@ -602,7 +602,7 @@ ISR-Information::= BIT STRING {
 	cancelSGSN  (1),
 	initialAttachIndicator  (2)} (SIZE (3..8))
 	-- exception handling: reception of unknown bit assignments in the
-	-- ISR-Information data type shall be discarded by the receiver 
+	-- ISR-Information data type shall be discarded by the receiver
 
 SGSN-Capability ::= SEQUENCE{
 	solsaSupportIndicator	NULL			OPTIONAL,
@@ -623,7 +623,7 @@ SGSN-Capability ::= SEQUENCE{
 	msisdn-lessOperation-Supported	[14]	NULL		OPTIONAL,
 	updateofHomogeneousSupportOfIMSVoiceOverPSSessions [15] NULL	OPTIONAL
 	}
-		  --	the supportedFeatures , t-adsDataRetrieval and 
+		  --	the supportedFeatures , t-adsDataRetrieval and
 	  --	homogeneousSupportOfIMSVoiceOverPSSessions
 	  --	/updateofHomogeneousSupportOfIMSVoiceOverPSSessions arealso applied to the MME/IWF
 
@@ -719,22 +719,22 @@ AllowedUMTS-Algorithms ::= SEQUENCE {
 
 PermittedIntegrityProtectionAlgorithms ::=
 		OCTET STRING (SIZE (1..maxPermittedIntegrityProtectionAlgorithmsLength))
-	-- Octets contain a complete PermittedIntegrityProtectionAlgorithms data type 
-	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme 
-	-- mandated by 3GPP TS 25.413. 
-	-- Padding bits are included, if needed, in the least significant bits of the 
-	-- last octet of the octet string. 
+	-- Octets contain a complete PermittedIntegrityProtectionAlgorithms data type
+	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme
+	-- mandated by 3GPP TS 25.413.
+	-- Padding bits are included, if needed, in the least significant bits of the
+	-- last octet of the octet string.
 
 
 maxPermittedIntegrityProtectionAlgorithmsLength INTEGER ::= 9
 
 PermittedEncryptionAlgorithms ::=
 		OCTET STRING (SIZE (1..maxPermittedEncryptionAlgorithmsLength))
-	-- Octets contain a complete PermittedEncryptionAlgorithms data type 
-	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme 
+	-- Octets contain a complete PermittedEncryptionAlgorithms data type
+	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme
 	-- mandated by 3GPP TS 25.413
-	-- Padding bits are included, if needed, in the least significant bits of the 
-	-- last octet of the octet string. 
+	-- Padding bits are included, if needed, in the least significant bits of the
+	-- last octet of the octet string.
 
 
 maxPermittedEncryptionAlgorithmsLength INTEGER ::= 9
@@ -749,7 +749,7 @@ KeyStatus ::= ENUMERATED {
 
 PrepareHO-Arg ::= [3] SEQUENCE {
 	targetCellId	[0] GlobalCellId	OPTIONAL,
-	ho-NumberNotRequired	NULL			OPTIONAL, 
+	ho-NumberNotRequired	NULL			OPTIONAL,
 	targetRNCId	[1] RNCId		OPTIONAL,
 	an-APDU		[2] AccessNetworkSignalInfo	OPTIONAL,
 	multipleBearerRequested	[3] NULL		OPTIONAL,
@@ -764,7 +764,7 @@ PrepareHO-Arg ::= [3] SEQUENCE {
 	... ,
 	rab-Id		[12] RAB-Id	OPTIONAL,
 	bssmap-ServiceHandover	[13]	BSSMAP-ServiceHandover	OPTIONAL,
-	ranap-ServiceHandover	[14]	RANAP-ServiceHandover	OPTIONAL, 
+	ranap-ServiceHandover	[14]	RANAP-ServiceHandover	OPTIONAL,
 	bssmap-ServiceHandoverList	[15]	BSSMAP-ServiceHandoverList	OPTIONAL,
 	asciCallReference	[20]	ASCI-CallReference	OPTIONAL,
 	geran-classmark	[16] GERAN-Classmark	OPTIONAL,
@@ -792,7 +792,7 @@ LCLS-Negotiation::= BIT STRING {
 	permission-indicator-spare-bit	(1)} (SIZE (2..8))
 	--for definition and allowed combination of bits 0 and 1 see 3GPP TS 29.205
 	-- exception handling: bits 2 to 7 shall be ignored if received and not understood
-	 
+
 
 LCLS-ConfigurationPreference::= BIT STRING {
 	forward-data-sending-indicator	(0),
@@ -800,7 +800,7 @@ LCLS-ConfigurationPreference::= BIT STRING {
 	forward-data-reception-indicator	(2),
 	backward-data-reception-indicator	(3)} (SIZE (4..8))
 	-- exception handling: bits 4 to 7 shall be ignored if received and not understood
-	 
+
 
 BSSMAP-ServiceHandoverList ::= SEQUENCE SIZE (1.. maxNumOfServiceHandovers) OF
 				BSSMAP-ServiceHandoverInfo
@@ -808,7 +808,7 @@ BSSMAP-ServiceHandoverList ::= SEQUENCE SIZE (1.. maxNumOfServiceHandovers) OF
 BSSMAP-ServiceHandoverInfo ::= SEQUENCE {
 	bssmap-ServiceHandover	BSSMAP-ServiceHandover,
 	rab-Id		RAB-Id,
-	-- RAB Identity is needed to relate the service handovers with the radio access bearers. 
+	-- RAB Identity is needed to relate the service handovers with the radio access bearers.
 	...}
 
 maxNumOfServiceHandovers  INTEGER ::= 7
@@ -818,10 +818,10 @@ BSSMAP-ServiceHandover ::= OCTET STRING (SIZE (1))
 	-- 3GPP TS 48.008.
 
 RANAP-ServiceHandover ::= OCTET STRING (SIZE (1))
-	-- Octet contains a complete Service-Handover data type 
-	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme 
+	-- Octet contains a complete Service-Handover data type
+	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme
 	-- mandated by 3GPP TS 25.413
-	-- Padding bits are included in the least significant bits. 
+	-- Padding bits are included in the least significant bits.
 
 
 RadioResourceList ::= SEQUENCE SIZE (1.. maxNumOfRadioResources) OF
@@ -830,7 +830,7 @@ RadioResourceList ::= SEQUENCE SIZE (1.. maxNumOfRadioResources) OF
 RadioResource ::= SEQUENCE {
 	radioResourceInformation	RadioResourceInformation,
 	rab-Id		RAB-Id,
-	-- RAB Identity is needed to relate the radio resources with the radio access bearers. 
+	-- RAB Identity is needed to relate the radio resources with the radio access bearers.
 	...}
 
 maxNumOfRadioResources  INTEGER ::= 7
@@ -857,16 +857,16 @@ SelectedUMTS-Algorithms ::= SEQUENCE {
 	...}
 
 ChosenIntegrityProtectionAlgorithm ::= OCTET STRING (SIZE (1))
-	-- Octet contains a complete IntegrityProtectionAlgorithm data type 
-	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme 
+	-- Octet contains a complete IntegrityProtectionAlgorithm data type
+	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme
 	-- mandated by 3GPP TS 25.413
-	-- Padding bits are included in the least significant bits. 
+	-- Padding bits are included in the least significant bits.
 
 ChosenEncryptionAlgorithm ::= OCTET STRING (SIZE (1))
-	-- Octet contains a complete EncryptionAlgorithm data type 
-	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme 
+	-- Octet contains a complete EncryptionAlgorithm data type
+	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme
 	-- mandated by 3GPP TS 25.413
-	-- Padding bits are included in the least significant bits. 
+	-- Padding bits are included in the least significant bits.
 
 ChosenRadioResourceInformation ::= SEQUENCE {
 	chosenChannelInfo	[0] ChosenChannelInfo	OPTIONAL,
@@ -878,7 +878,7 @@ ChosenChannelInfo ::= OCTET STRING (SIZE (1))
 
 ChosenSpeechVersion ::= OCTET STRING (SIZE (1))
 	-- Octets are coded according the Speech Version (chosen) information element in 3GPP TS
-	-- 48.008 
+	-- 48.008
 
 PrepareSubsequentHO-Arg ::= [3] SEQUENCE {
 	targetCellId	[0] GlobalCellId	OPTIONAL,
@@ -996,7 +996,7 @@ MulticallBearerInfo ::= INTEGER (1..maxNumOfRelocationNumber)
 RelocationNumber ::= SEQUENCE {
 	handoverNumber	ISDN-AddressString,
 	rab-Id		RAB-Id,
-	-- RAB Identity is needed to relate the calls with the radio access bearers. 
+	-- RAB Identity is needed to relate the calls with the radio access bearers.
 	...}
 
 RAB-Id ::= INTEGER (1..maxNrOfRABs)
@@ -1009,20 +1009,20 @@ RadioResourceInformation ::= OCTET STRING (SIZE (3..13))
 	-- Octets are coded according the Channel Type information element in 3GPP TS 48.008
 
 IntegrityProtectionInformation ::= OCTET STRING (SIZE (18..maxNumOfIntegrityInfo))
-	-- Octets contain a complete IntegrityProtectionInformation data type 
-	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme 
+	-- Octets contain a complete IntegrityProtectionInformation data type
+	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme
 	-- mandated by 3GPP TS 25.413
-	-- Padding bits are included, if needed, in the least significant bits of the 
-	-- last octet of the octet string. 
+	-- Padding bits are included, if needed, in the least significant bits of the
+	-- last octet of the octet string.
 
 maxNumOfIntegrityInfo INTEGER ::= 100
 
 EncryptionInformation ::= OCTET STRING (SIZE (18..maxNumOfEncryptionInfo))
-	-- Octets contain a complete EncryptionInformation data type 
-	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme 
+	-- Octets contain a complete EncryptionInformation data type
+	-- as defined in 3GPP TS 25.413, encoded according to the encoding scheme
 	-- mandated by 3GPP TS 25.413
-	-- Padding bits are included, if needed, in the least significant bits of the 
-	-- last octet of the octet string. 
+	-- Padding bits are included, if needed, in the least significant bits of the
+	-- last octet of the octet string.
 
 maxNumOfEncryptionInfo INTEGER ::= 100
 
@@ -1039,7 +1039,7 @@ SendAuthenticationInfoArg ::= SEQUENCE {
 	requestingNodeType	[3] RequestingNodeType	OPTIONAL,
 	requestingPLMN-Id	[4] PLMN-Id	OPTIONAL,
 	numberOfRequestedAdditional-Vectors	[5] NumberOfRequestedVectors	OPTIONAL,
-	additionalVectorsAreForEPS	[6] NULL		OPTIONAL }	
+	additionalVectorsAreForEPS	[6] NULL		OPTIONAL }
 
 
 NumberOfRequestedVectors ::= INTEGER (1..5)
@@ -1102,7 +1102,7 @@ RequestedEquipmentInfo::= BIT STRING {
 	equipmentStatus  (0),
 	bmuef  (1)} (SIZE (2..8))
 	-- exception handling: reception of unknown bit assignments in the
-	-- RequestedEquipmentInfo data type shall be discarded by the receiver 
+	-- RequestedEquipmentInfo data type shall be discarded by the receiver
 
 UESBI-Iu ::= SEQUENCE {
 	uesbi-IuA	[0] UESBI-IuA				OPTIONAL,
@@ -1126,12 +1126,12 @@ InsertSubscriberDataArg ::= SEQUENCE {
 	imsi			[0] IMSI		OPTIONAL,
 	COMPONENTS OF	SubscriberData,
 	extensionContainer	[14] ExtensionContainer	OPTIONAL,
-	... ,	
+	... ,
 	naea-PreferredCI	[15] NAEA-PreferredCI	OPTIONAL,
 	-- naea-PreferredCI is included at the discretion of the HLR operator.
 	gprsSubscriptionData	[16] GPRSSubscriptionData	OPTIONAL,
-	roamingRestrictedInSgsnDueToUnsupportedFeature [23] 	NULL	
-							OPTIONAL, 
+	roamingRestrictedInSgsnDueToUnsupportedFeature [23] 	NULL
+							OPTIONAL,
 	networkAccessMode	[24] NetworkAccessMode	OPTIONAL,
 	lsaInformation	[25] LSAInformation	OPTIONAL,
 	lmu-Indicator	[21]	NULL		OPTIONAL,
@@ -1157,7 +1157,7 @@ InsertSubscriberDataArg ::= SEQUENCE {
 	additionalMSISDN	[41]	ISDN-AddressString	OPTIONAL,
 	psAndSMS-OnlyServiceProvision	[42]	NULL		OPTIONAL,
 	smsInSGSNAllowed	[43]	NULL		OPTIONAL }
-	-- If the Network Access Mode parameter is sent, it shall be present only in 
+	-- If the Network Access Mode parameter is sent, it shall be present only in
 	-- the first sequence if seqmentation is used
 
 SubscribedPeriodicRAUTAUtimer ::= INTEGER (0..4294967295)
@@ -1165,7 +1165,7 @@ SubscribedPeriodicRAUTAUtimer ::= INTEGER (0..4294967295)
 	-- specified in 3GPP TS 24.008 [35].
 
 SubscribedPeriodicLAUtimer ::= INTEGER (0..4294967295)
-	-- This parameter carries the subscribed periodic LAU timer value in seconds as 
+	-- This parameter carries the subscribed periodic LAU timer value in seconds as
 	-- specified in 3GPP TS 24.008 [35].
 
 CSG-SubscriptionDataList ::= SEQUENCE SIZE (1..50) OF
@@ -1204,16 +1204,16 @@ EPS-SubscriptionData ::= SEQUENCE {
 	mps-CSPriority	[7]	NULL		OPTIONAL,
 	mps-EPSPriority	[8]	NULL		OPTIONAL,
 	subscribed-vsrvcc	[9]	NULL		OPTIONAL }
-	-- mps-CSPriority by its presence indicates that the UE is subscribed to the eMLPP in 
+	-- mps-CSPriority by its presence indicates that the UE is subscribed to the eMLPP in
 	-- the CS domain, referring to the 3GPP TS 29.272 [144] for details.
-	-- mps-EPSPriority by its presence indicates that the UE is subscribed to the MPS in 
-	-- the EPS domain, referring to the 3GPP TS 29.272 [144] for details. 
-	--  
-	-- subscribed-vsrvcc by its presence indicates that the UE is subscribed to the vSRVCC in 
+	-- mps-EPSPriority by its presence indicates that the UE is subscribed to the MPS in
+	-- the EPS domain, referring to the 3GPP TS 29.272 [144] for details.
+	--
+	-- subscribed-vsrvcc by its presence indicates that the UE is subscribed to the vSRVCC in
 	-- the EPS domain, referring to the 3GPP TS 29.272 [144] for details.
 
 APN-OI-Replacement ::=  OCTET STRING (SIZE (9..100))
-	-- Octets are coded as APN Operator Identifier according to TS 3GPP TS 23.003 [17] 
+	-- Octets are coded as APN Operator Identifier according to TS 3GPP TS 23.003 [17]
 
 RFSP-ID ::=  INTEGER (1..256)
 
@@ -1244,7 +1244,7 @@ APN-Configuration ::= SEQUENCE {
 	vplmnAddressAllowed	[7] NULL		OPTIONAL,
 	chargingCharacteristics	[8] ChargingCharacteristics	OPTIONAL,
 	ambr			[9] AMBR		OPTIONAL,
-	specificAPNInfoList	[10] SpecificAPNInfoList	OPTIONAL,	extensionContainer	[11] ExtensionContainer	OPTIONAL, 
+	specificAPNInfoList	[10] SpecificAPNInfoList	OPTIONAL,	extensionContainer	[11] ExtensionContainer	OPTIONAL,
 	servedPartyIP-IPv6-Address	[12] PDP-Address	OPTIONAL,
 	...,
 	apn-oi-Replacement	[13] APN-OI-Replacement	OPTIONAL,
@@ -1290,7 +1290,7 @@ SpecificAPNInfo ::= SEQUENCE {
 	extensionContainer	[2] ExtensionContainer	OPTIONAL,
 	... }
 
-Bandwidth ::= INTEGER 
+Bandwidth ::= INTEGER
 	-- bits per second
 
 QoS-Class-Identifier ::= INTEGER (1..9)
@@ -1327,13 +1327,13 @@ AccessRestrictionData ::= BIT STRING {
 	i-hspa-evolutionNotAllowed (3),
 	e-utranNotAllowed (4),
 	ho-toNon3GPP-AccessNotAllowed (5) } (SIZE (2..8))
-	-- exception handling: 
-	-- The VLR shall ignore the access restriction data related to an access type not 
+	-- exception handling:
+	-- The VLR shall ignore the access restriction data related to an access type not
 	-- supported by the node.
-	-- The handling of the access restriction data by the SGSN is described in subclause 
+	-- The handling of the access restriction data by the SGSN is described in subclause
 	-- 5.3.19 of TS 23.060, in subclause 7.5.3 of TS 29.060 and subclause 7.3.6 of TS 29.274.
 	-- bits 6 to 7 shall be ignored if received and not understood
-	
+
 
 CS-AllocationRetentionPriority ::= OCTET STRING (SIZE (1))
 	-- This data type encodes each priority level defined in TS 23.107 as the binary value
@@ -1351,7 +1351,7 @@ LCSInformation ::= SEQUENCE {
 	-- present and contains four instances of LCS-PrivacyClass. If the mentioned condition
 	-- is not satisfied the receiving node shall discard add-lcs-PrivacyExceptionList.
 	-- If an LCS-PrivacyClass is received both in lcs-PrivacyExceptionList and in
-	-- add-lcs-PrivacyExceptionList with the same SS-Code, then the error unexpected 
+	-- add-lcs-PrivacyExceptionList with the same SS-Code, then the error unexpected
 	-- data value shall be returned.
 
 GMLC-List ::= SEQUENCE SIZE (1..maxNumOfGMLC) OF
@@ -1382,14 +1382,14 @@ PDP-Context ::= SEQUENCE {
 	apn			[20] APN,
 	extensionContainer	[21] ExtensionContainer	OPTIONAL,
 	... ,
-	ext-QoS-Subscribed	[0] Ext-QoS-Subscribed	OPTIONAL, 
+	ext-QoS-Subscribed	[0] Ext-QoS-Subscribed	OPTIONAL,
 	pdp-ChargingCharacteristics	[1] ChargingCharacteristics	OPTIONAL,
 	ext2-QoS-Subscribed	[2] Ext2-QoS-Subscribed	OPTIONAL,
 	-- ext2-QoS-Subscribed may be present only if ext-QoS-Subscribed is present.
 	ext3-QoS-Subscribed	[3] Ext3-QoS-Subscribed	OPTIONAL,
 	-- ext3-QoS-Subscribed may be present only if ext2-QoS-Subscribed is present.
 	ext4-QoS-Subscribed	[4] Ext4-QoS-Subscribed	OPTIONAL,
-	-- ext4-QoS-Subscribed may be present only if ext3-QoS-Subscribed is present. 
+	-- ext4-QoS-Subscribed may be present only if ext3-QoS-Subscribed is present.
 	apn-oi-Replacement	[5]	APN-OI-Replacement	OPTIONAL,
 	-- this apn-oi-Replacement refers to the APN level apn-oi-Replacement and has
 	-- higher priority than UE level apn-oi-Replacement.
@@ -1403,7 +1403,7 @@ PDP-Context ::= SEQUENCE {
 	-- only if pdp-Address is present; if both are present, each parameter shall
 	-- contain a different type of address (IPv4 or IPv6).
 	ambr			[10] AMBR		OPTIONAL,
-	-- this ambr contains the AMBR associated to the APN included in the 
+	-- this ambr contains the AMBR associated to the APN included in the
 	-- PDP-Context (APN-AMBR).
 	sipto-Permission	[8] SIPTO-Permission	OPTIONAL,
 	lipa-Permission	[9] LIPA-Permission	OPTIONAL,
@@ -1463,10 +1463,10 @@ GPRS-CSI ::= SEQUENCE {
 	csi-Active	[4]	NULL		OPTIONAL,
 	...}
 --	notificationToCSE and csi-Active shall not be present when GPRS-CSI is sent to SGSN.
---	They may only be included in ATSI/ATM ack/NSDC message. 
---	GPRS-CamelTDPData and  camelCapabilityHandling shall be present in 
+--	They may only be included in ATSI/ATM ack/NSDC message.
+--	GPRS-CamelTDPData and  camelCapabilityHandling shall be present in
 --	the GPRS-CSI sequence.
---	If GPRS-CSI is segmented, gprs-CamelTDPDataList and camelCapabilityHandling shall be 
+--	If GPRS-CSI is segmented, gprs-CamelTDPDataList and camelCapabilityHandling shall be
 --	present in the first segment
 
 GPRS-CamelTDPDataList ::= SEQUENCE SIZE (1..maxNumOfCamelTDPData) OF
@@ -1500,11 +1500,11 @@ GPRS-TriggerDetectionPoint ::= ENUMERATED {
 	... }
 -- exception handling:
 -- For GPRS-CamelTDPData sequences containing this parameter with any
--- other value than the ones listed the receiver shall ignore the whole 
+-- other value than the ones listed the receiver shall ignore the whole
 -- GPRS-CamelTDPDatasequence.
 
 APN ::=  OCTET STRING (SIZE (2..63))
-	-- Octets are coded according to TS 3GPP TS 23.003 [17] 
+	-- Octets are coded according to TS 3GPP TS 23.003 [17]
 
 PDP-Type ::= OCTET STRING (SIZE (2))
 	-- Octets are coded according to TS 3GPP TS 29.060 [105]
@@ -1523,14 +1523,14 @@ PDP-Address ::= OCTET STRING (SIZE (1..16))
 	-- 16  octets  Ipv6 address type
 
 QoS-Subscribed ::= OCTET STRING (SIZE (3))
-	-- Octets are coded according to TS 3GPP TS 24.008 [35] Quality of Service Octets 
+	-- Octets are coded according to TS 3GPP TS 24.008 [35] Quality of Service Octets
 	-- 3-5.
 
 Ext-QoS-Subscribed ::= OCTET STRING (SIZE (1..9))
-	-- OCTET 1: 
+	-- OCTET 1:
 	--  Allocation/Retention Priority (This octet encodes each priority level defined in
 	--     23.107 as the binary value of the priority level, declaration in 29.060)
-	-- Octets 2-9 are coded according to 3GPP TS 24.008 [35] Quality of Service Octets 
+	-- Octets 2-9 are coded according to 3GPP TS 24.008 [35] Quality of Service Octets
 	-- 6-13.
 
 Ext2-QoS-Subscribed ::= OCTET STRING (SIZE (1..3))
@@ -1656,9 +1656,9 @@ ODB-GeneralData ::= BIT STRING {
 	registrationInternationalCF-Barred  (28)} (SIZE (15..32))
 	-- exception handling: reception of unknown bit assignments in the
 	-- ODB-GeneralData type shall be treated like unsupported ODB-GeneralData
-	-- When the ODB-GeneralData type is removed from the HLR for a given subscriber, 
-	-- in NoteSubscriberDataModified operation sent toward the gsmSCF 
-	-- all bits shall be set to “O“.
+	-- When the ODB-GeneralData type is removed from the HLR for a given subscriber,
+	-- in NoteSubscriberDataModified operation sent toward the gsmSCF
+	-- all bits shall be set to "O".
 
 ODB-HPLMN-Data ::= BIT STRING {
 	plmn-SpecificBarringType1  (0),
@@ -1666,10 +1666,10 @@ ODB-HPLMN-Data ::= BIT STRING {
 	plmn-SpecificBarringType3  (2),
 	plmn-SpecificBarringType4  (3)} (SIZE (4..32))
 	-- exception handling: reception of unknown bit assignments in the
-	-- ODB-HPLMN-Data type shall be treated like unsupported ODB-HPLMN-Data 
-	-- When the ODB-HPLMN-Data type is removed from the HLR for a given subscriber, 
+	-- ODB-HPLMN-Data type shall be treated like unsupported ODB-HPLMN-Data
+	-- When the ODB-HPLMN-Data type is removed from the HLR for a given subscriber,
 	-- in NoteSubscriberDataModified operation sent toward the gsmSCF
-	-- all bits shall be set to “O“.
+	-- all bits shall be set to "O".
 
 Ext-SS-InfoList ::= SEQUENCE SIZE (1..maxNumOfSS) OF
 				Ext-SS-Info
@@ -1713,7 +1713,7 @@ Ext-ForwOptions ::= OCTET STRING (SIZE (1..5))
 	--	1  notification
 
 	--  bit 7: redirecting presentation
-	--	0 no presentation  
+	--	0 no presentation
 	--	1  presentation
 
 	--  bit 6: notification to calling party
@@ -1847,7 +1847,7 @@ LCS-PrivacyClass ::= SEQUENCE {
 	serviceTypeList	[5]	ServiceTypeList	OPTIONAL
 	-- serviceTypeList may be sent only for SS-code serviceType and if the visited node
 	-- supports LCS Release 5 or later versions.
-	-- 
+	--
 	-- if segmentation is used, the complete LCS-PrivacyClass shall be sent in one segment
 }
 
@@ -1870,7 +1870,7 @@ ExternalClient ::= SEQUENCE {
 	clientIdentity	LCSClientExternalID,
 	gmlc-Restriction	[0] GMLC-Restriction	OPTIONAL,
 	notificationToMSUser	[1] NotificationToMSUser	OPTIONAL,
-	-- If notificationToMSUser is not received, the default value according to 
+	-- If notificationToMSUser is not received, the default value according to
 	-- 3GPP TS 23.271 shall be assumed.
 	extensionContainer	[2] ExtensionContainer	OPTIONAL,
 	... }
@@ -1902,7 +1902,7 @@ ServiceType ::= SEQUENCE {
 	serviceTypeIdentity	LCSServiceTypeID,
 	gmlc-Restriction	[0] GMLC-Restriction	OPTIONAL,
 	notificationToMSUser	[1] NotificationToMSUser	OPTIONAL,
-	-- If notificationToMSUser is not received, the default value according to 
+	-- If notificationToMSUser is not received, the default value according to
 	-- 3GPP TS 23.271 shall be assumed.
 	extensionContainer	[2] ExtensionContainer	OPTIONAL,
 	... }
@@ -1986,9 +1986,9 @@ SpecificCSI-Withdraw ::= BIT STRING {
 	t-csi (8),
 	mt-sms-csi (9),
 	mg-csi (10),
-	o-IM-CSI (11), 
+	o-IM-CSI (11),
 	d-IM-CSI (12),
-	vt-IM-CSI (13) } (SIZE(8..32)) 
+	vt-IM-CSI (13) } (SIZE(8..32))
 -- exception handling:
 -- bits 11 to 31 shall be ignored if received by a non-IP Multimedia Core Network entity.
 -- bits 0-10 and 14-31 shall be ignored if received by an IP Multimedia Core Network entity.
@@ -2061,7 +2061,7 @@ MT-SMS-TPDU-Type ::= ENUMERATED {
 
 --	exception handling:
 --	For TPDU-TypeCriterion sequences containing this parameter with any
---	other value than the ones listed above the receiver shall ignore 
+--	other value than the ones listed above the receiver shall ignore
 --	the whole TPDU-TypeCriterion sequence.
 --	In CAMEL phase 4, sms-SUBMIT-REPORT shall not be used and a received TPDU-TypeCriterion
 --	sequence containing sms-SUBMIT-REPORT shall be wholly ignored.
@@ -2072,10 +2072,10 @@ D-CSI ::= SEQUENCE {
 	extensionContainer	[2] ExtensionContainer	OPTIONAL,
 	notificationToCSE	[3]	NULL		OPTIONAL,
 	csi-Active	[4]	NULL		OPTIONAL,
-	...} 
+	...}
 --	notificationToCSE and csi-Active shall not be present when D-CSI is sent to VLR/GMSC.
 --	They may only be included in ATSI/ATM ack/NSDC message.
---	DP-AnalysedInfoCriteria and  camelCapabilityHandling shall be present in 
+--	DP-AnalysedInfoCriteria and  camelCapabilityHandling shall be present in
 --	the D-CSI sequence.
 --	If D-CSI is segmented, then the first segment shall contain dp-AnalysedInfoCriteriaList
 --	and camelCapabilityHandling. Subsequent segments shall not contain
@@ -2107,7 +2107,7 @@ SS-CSI ::= SEQUENCE {
 SS-CamelData  ::= SEQUENCE {
 	ss-EventList	SS-EventList,
 	gsmSCF-Address	ISDN-AddressString,
-	extensionContainer	[0] ExtensionContainer	OPTIONAL, 
+	extensionContainer	[0] ExtensionContainer	OPTIONAL,
 	...}
 
 SS-EventList  ::= SEQUENCE SIZE (1..maxNumOfCamelSSEvents) OF SS-Code
@@ -2160,20 +2160,20 @@ O-BcsmTriggerDetectionPoint ::= ENUMERATED {
 	routeSelectFailure (4) }
 	-- exception handling:
 	-- For O-BcsmCamelTDPData sequences containing this parameter with any
-	-- other value than the ones listed the receiver shall ignore the whole 
-	-- O-BcsmCamelTDPDatasequence. 
+	-- other value than the ones listed the receiver shall ignore the whole
+	-- O-BcsmCamelTDPDatasequence.
 	-- For O-BcsmCamelTDP-Criteria sequences containing this parameter with any
 	-- other value than the ones listed the receiver shall ignore the whole
 	-- O-BcsmCamelTDP-Criteria sequence.
 
 O-BcsmCamelTDPCriteriaList ::= SEQUENCE SIZE (1..maxNumOfCamelTDPData) OF
-	O-BcsmCamelTDP-Criteria 
+	O-BcsmCamelTDP-Criteria
 
 T-BCSM-CAMEL-TDP-CriteriaList ::= SEQUENCE SIZE (1..maxNumOfCamelTDPData) OF
-	T-BCSM-CAMEL-TDP-Criteria 
+	T-BCSM-CAMEL-TDP-Criteria
 
 O-BcsmCamelTDP-Criteria ::= SEQUENCE {
-	o-BcsmTriggerDetectionPoint	O-BcsmTriggerDetectionPoint,	
+	o-BcsmTriggerDetectionPoint	O-BcsmTriggerDetectionPoint,
 	destinationNumberCriteria 	[0] DestinationNumberCriteria	OPTIONAL,
 	basicServiceCriteria	[1] BasicServiceCriteria	OPTIONAL,
 	callTypeCriteria	[2] CallTypeCriteria	OPTIONAL,
@@ -2182,7 +2182,7 @@ O-BcsmCamelTDP-Criteria ::= SEQUENCE {
 	extensionContainer	[4] ExtensionContainer	OPTIONAL }
 
 T-BCSM-CAMEL-TDP-Criteria ::= SEQUENCE {
-	t-BCSM-TriggerDetectionPoint	T-BcsmTriggerDetectionPoint,	
+	t-BCSM-TriggerDetectionPoint	T-BcsmTriggerDetectionPoint,
 	basicServiceCriteria	[0] BasicServiceCriteria	OPTIONAL,
 	t-CauseValueCriteria	[1] T-CauseValueCriteria	OPTIONAL,
 	... }
@@ -2191,7 +2191,7 @@ DestinationNumberCriteria  ::= SEQUENCE {
 	matchType		[0] MatchType,
 	destinationNumberList 	[1] DestinationNumberList	OPTIONAL,
 	destinationNumberLengthList	[2] DestinationNumberLengthList	OPTIONAL,
-	-- one or both of destinationNumberList and destinationNumberLengthList 
+	-- one or both of destinationNumberList and destinationNumberLengthList
 	-- shall be present
 	...}
 
@@ -2200,7 +2200,7 @@ DestinationNumberList  ::= SEQUENCE SIZE	(1..maxNumOfCamelDestinationNumbers) OF
 	-- The receiving entity shall not check the format of a number in
 	-- the dialled number list
 
-DestinationNumberLengthList  ::= SEQUENCE SIZE (1..maxNumOfCamelDestinationNumberLengths) OF 
+DestinationNumberLengthList  ::= SEQUENCE SIZE (1..maxNumOfCamelDestinationNumberLengths) OF
 					INTEGER(1..maxNumOfISDN-AddressDigits)
 
 BasicServiceCriteria   ::= SEQUENCE SIZE(1..maxNumOfCamelBasicServiceCriteria) OF
@@ -2244,7 +2244,7 @@ DefaultCallHandling ::= ENUMERATED {
 	-- reception of values in range 2-31 shall be treated as "continueCall"
 	-- reception of values greater than 31 shall be treated as "releaseCall"
 
-CamelCapabilityHandling ::= INTEGER(1..16) 
+CamelCapabilityHandling ::= INTEGER(1..16)
 	-- value 1 = CAMEL phase 1,
 	-- value 2 = CAMEL phase 2,
 	-- value 3 = CAMEL Phase 3,
@@ -2255,24 +2255,24 @@ SupportedCamelPhases ::= BIT STRING {
 	phase1 (0),
 	phase2 (1),
 	phase3 (2),
-	phase4 (3)} (SIZE (1..16)) 
+	phase4 (3)} (SIZE (1..16))
 -- A node shall mark in the BIT STRING all CAMEL Phases it supports.
 -- Other values than listed above shall be discarded.
 
-OfferedCamel4CSIs ::= BIT STRING { 	
+OfferedCamel4CSIs ::= BIT STRING {
 	o-csi		(0),
 	d-csi		(1),
 	vt-csi		(2),
 	t-csi		(3),
 	mt-sms-csi	(4),
 	mg-csi		(5),
-	psi-enhancements	(6) 
+	psi-enhancements	(6)
 } (SIZE (7..16))
--- A node supporting Camel phase 4 shall mark in the BIT STRING all Camel4 CSIs 
+-- A node supporting Camel phase 4 shall mark in the BIT STRING all Camel4 CSIs
 -- it offers.
 -- Other values than listed above shall be discarded.
 
-OfferedCamel4Functionalities ::= BIT STRING { 	
+OfferedCamel4Functionalities ::= BIT STRING {
 	initiateCallAttempt	(0),
 	splitLeg		(1),
 	moveLeg		(2),
@@ -2294,7 +2294,7 @@ OfferedCamel4Functionalities ::= BIT STRING {
 	serviceChangeDP	(18),
 	collectInformation	(19)
 } (SIZE (15..64))
--- A node supporting Camel phase 4 shall mark in the BIT STRING all CAMEL4 
+-- A node supporting Camel phase 4 shall mark in the BIT STRING all CAMEL4
 -- functionalities it offers.
 -- Other values than listed above shall be discarded.
 
@@ -2308,9 +2308,9 @@ SMS-CSI ::= SEQUENCE {
 --	notificationToCSE and csi-Active shall not be present
 --	when MO-SMS-CSI or MT-SMS-CSI is sent to VLR or SGSN.
 --	They may only be included in ATSI/ATM ack/NSDC message.
---	SMS-CAMEL-TDP-Data and  camelCapabilityHandling shall be present in 
+--	SMS-CAMEL-TDP-Data and  camelCapabilityHandling shall be present in
 --	the SMS-CSI sequence.
---	If SMS-CSI is segmented, sms-CAMEL-TDP-DataList and camelCapabilityHandling shall be 
+--	If SMS-CSI is segmented, sms-CAMEL-TDP-DataList and camelCapabilityHandling shall be
 --	present in the first segment
 
 SMS-CAMEL-TDP-DataList ::= SEQUENCE SIZE (1..maxNumOfCamelTDPData) OF
@@ -2333,7 +2333,7 @@ SMS-TriggerDetectionPoint ::= ENUMERATED {
 	sms-DeliveryRequest (2)
 	}
 --	exception handling:
---	For SMS-CAMEL-TDP-Data and MT-smsCAMELTDP-Criteria sequences containing this 
+--	For SMS-CAMEL-TDP-Data and MT-smsCAMELTDP-Criteria sequences containing this
 --	parameter with any other value than the ones listed the receiver shall ignore
 --	the whole sequence.
 --
@@ -2403,7 +2403,7 @@ MM-Code ::= OCTET STRING (SIZE (1))
 --				MM-Code ::= '10000010'B
 --	GPRS-Attach	MM-Code ::= '10000011'B
 --	MS-initiated-GPRS-Detach	MM-Code ::= '10000100'B
---	Network-initiated-GPRS-Detach	MM-Code ::= '10000101'B 
+--	Network-initiated-GPRS-Detach	MM-Code ::= '10000101'B
 --	Network-initiated-transfer-to-MS-not-reachable-for-paging
 --				MM-Code ::= '10000110'B
 --
@@ -2429,8 +2429,8 @@ T-BcsmCamelTDPDataList ::= SEQUENCE SIZE (1..maxNumOfCamelTDPData) OF
 	--- T-BcsmCamelTDPDataList shall not contain more than one instance of
 	--- T-BcsmCamelTDPData containing the same value for t-BcsmTriggerDetectionPoint.
 	--- For CAMEL Phase 2, this means that only one instance of T-BcsmCamelTDPData is allowed
-	--- with t-BcsmTriggerDetectionPoint being equal to DP12. 
-	--- For CAMEL Phase 3, more TDP’s are allowed.
+	--- with t-BcsmTriggerDetectionPoint being equal to DP12.
+	--- For CAMEL Phase 3, more TDP's are allowed.
 
 T-BcsmCamelTDPData ::= SEQUENCE {
 	t-BcsmTriggerDetectionPoint	T-BcsmTriggerDetectionPoint,
@@ -2454,7 +2454,7 @@ T-BcsmTriggerDetectionPoint ::= ENUMERATED {
 
 SendRoutingInfoForGprsArg ::= SEQUENCE {
 	imsi				[0] IMSI,
-	ggsn-Address		[1] GSN-Address	OPTIONAL, 
+	ggsn-Address		[1] GSN-Address	OPTIONAL,
 	ggsn-Number		[2]	ISDN-AddressString,
 	extensionContainer		[3] ExtensionContainer	OPTIONAL,
 	...}
@@ -2512,7 +2512,7 @@ RestoreDataArg ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	... ,
 	vlr-Capability	[6] VLR-Capability	OPTIONAL,
-	restorationIndicator	[7]	NULL		OPTIONAL 
+	restorationIndicator	[7]	NULL		OPTIONAL
  }
 
 RestoreDataRes ::= SEQUENCE {
@@ -2533,8 +2533,8 @@ maxNumOfVBSGroupIds  INTEGER ::= 50
 maxNumOfVGCSGroupIds  INTEGER ::= 50
 
 VoiceGroupCallData  ::= SEQUENCE {
-	groupId		GroupId, 
-	-- groupId shall be filled with six TBCD fillers (1111)if the longGroupId is present  
+	groupId		GroupId,
+	-- groupId shall be filled with six TBCD fillers (1111)if the longGroupId is present
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...,
 	additionalSubscriptions	AdditionalSubscriptions	OPTIONAL,
@@ -2542,11 +2542,11 @@ VoiceGroupCallData  ::= SEQUENCE {
 	longGroupId	[1] Long-GroupId	OPTIONAL }
 
 	-- VoiceGroupCallData containing a longGroupId shall not be sent to VLRs that did not
-	-- indicate support of long Group IDs within the Update Location or Restore Data 
+	-- indicate support of long Group IDs within the Update Location or Restore Data
 	-- request message
 
 AdditionalInfo ::= BIT STRING (SIZE (1..136))
---	 Refers to Additional Info as specified in 3GPP TS 43.068 
+--	 Refers to Additional Info as specified in 3GPP TS 43.068
 
 AdditionalSubscriptions ::= BIT STRING {
 	privilegedUplinkRequest (0),
@@ -2555,27 +2555,27 @@ AdditionalSubscriptions ::= BIT STRING {
 -- Other bits than listed above shall be discarded.
 
 VoiceBroadcastData ::= SEQUENCE {
-	groupid		GroupId, 
+	groupid		GroupId,
 	-- groupId shall be filled with six TBCD fillers (1111)if the longGroupId is present
 	broadcastInitEntitlement	NULL			OPTIONAL,
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...,
 	longGroupId	[0] Long-GroupId	OPTIONAL }
-	
+
 -- VoiceBroadcastData containing a longGroupId shall not be sent to VLRs that did not
--- indicate support of long Group IDs within the Update Location or Restore Data 
+-- indicate support of long Group IDs within the Update Location or Restore Data
 	-- request message
 
 GroupId  ::= TBCD-STRING (SIZE (3))
 	-- When Group-Id is less than six characters in length, the TBCD filler (1111)
 	-- is used to fill unused half octets.
-	-- Refers to the Group Identification as specified in 3GPP TS 23.003 
+	-- Refers to the Group Identification as specified in 3GPP TS 23.003
 	-- and 3GPP TS 43.068/ 43.069
 
 Long-GroupId  ::= TBCD-STRING (SIZE (4))
 	-- When Long-Group-Id is less than eight characters in length, the TBCD filler (1111)
 	-- is used to fill unused half octets.
-	-- Refers to the Group Identification as specified in 3GPP TS 23.003 
+	-- Refers to the Group Identification as specified in 3GPP TS 23.003
 	-- and 3GPP TS 43.068/ 43.069
 
 
@@ -2645,8 +2645,8 @@ MNPInfoRes ::= SEQUENCE {
 	numberPortabilityStatus	[3] NumberPortabilityStatus	OPTIONAL,
 	extensionContainer	[4] ExtensionContainer	OPTIONAL,
 	... }
---	The IMSI parameter contains a generic IMSI, i.e. it is not tied necessarily to the 
---	Subscriber. MCC and MNC values in this IMSI shall point to the Subscription Network of 
+--	The IMSI parameter contains a generic IMSI, i.e. it is not tied necessarily to the
+--	Subscriber. MCC and MNC values in this IMSI shall point to the Subscription Network of
 --	the Subscriber. See 3GPP TS 23.066 [108].
 
 RouteingNumber ::= TBCD-STRING (SIZE (1..5))
@@ -2660,14 +2660,14 @@ NumberPortabilityStatus ::= ENUMERATED {
 	ownNumberNotPortedOut	(4),
 	foreignNumberPortedIn	(5)
 	}
-	--	exception handling: 
-	--  reception of other values than the ones listed the receiver shall ignore the 
+	--	exception handling:
+	--  reception of other values than the ones listed the receiver shall ignore the
 	--  whole NumberPortabilityStatus;
-	--  ownNumberNotPortedOut or foreignNumberPortedIn may only be included in Any Time 
+	--  ownNumberNotPortedOut or foreignNumberPortedIn may only be included in Any Time
 	--  Interrogation message.
 
 MS-Classmark2 ::= OCTET STRING (SIZE (3))
-	-- This parameter carries the value part of the MS Classmark 2 IE defined in 
+	-- This parameter carries the value part of the MS Classmark 2 IE defined in
 	-- 3GPP TS 24.008 [35].
 
 GPRSMSClass ::= SEQUENCE {
@@ -2676,9 +2676,9 @@ GPRSMSClass ::= SEQUENCE {
 	}
 
 MSNetworkCapability ::= OCTET STRING (SIZE (1..8))
-	-- This parameter carries the value part of the MS Network Capability IE defined in 
+	-- This parameter carries the value part of the MS Network Capability IE defined in
 	-- 3GPP TS 24.008 [35].
-	
+
 MSRadioAccessCapability ::= OCTET STRING (SIZE (1..50))
 	-- This parameter carries the value part of the MS Radio Access Capability IE defined in
 	-- 3GPP TS 24.008 [35].
@@ -2687,7 +2687,7 @@ RequestedInfo ::= SEQUENCE {
 	locationInformation	[0] NULL		OPTIONAL,
 	subscriberState	[1] NULL		OPTIONAL,
 	extensionContainer	[2] ExtensionContainer	OPTIONAL,
-	..., 
+	...,
 	currentLocation	[3] NULL		OPTIONAL,
 	requestedDomain	[4] DomainType	OPTIONAL,
 	imei			[6] NULL		OPTIONAL,
@@ -2700,7 +2700,7 @@ RequestedInfo ::= SEQUENCE {
 	localTimeZoneRequest	[12] NULL		OPTIONAL
  }
 
---	currentLocation and locationInformationEPS-Supported shall be absent if 
+--	currentLocation and locationInformationEPS-Supported shall be absent if
 --	locationInformation is absent
 --	t-adsData shall be absent in messages sent to the VLR
 --	requestedNodes shall be absent if requestedDomain is "cs-Domain"
@@ -2731,19 +2731,19 @@ LocationInformation ::= SEQUENCE {
 	... ,
 	selectedLSA-Id	[5] LSAIdentity	OPTIONAL,
 	msc-Number	[6] ISDN-AddressString	OPTIONAL,
-	geodeticInformation	[7] GeodeticInformation	OPTIONAL, 
+	geodeticInformation	[7] GeodeticInformation	OPTIONAL,
 	currentLocationRetrieved	[8] NULL		OPTIONAL,
 	sai-Present	[9] NULL		OPTIONAL,
 	locationInformationEPS	[10] LocationInformationEPS	OPTIONAL,
 	userCSGInformation	[11] UserCSGInformation	OPTIONAL }
 -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains
 -- a Service Area Identity.
--- currentLocationRetrieved shall be present 
+-- currentLocationRetrieved shall be present
 -- if the location information were retrieved after a successfull paging.
 -- if the locationinformationEPS IE is present then the cellGlobalIdOrServiceAreaIdOrLAI IE,
 -- the ageOfLocationInformation IE, the geographicalInformation IE, the geodeticInformation IE
 -- and the currentLocationRetrieved IE (outside the locationInformationEPS IE) shall be
--- absent. As an exception, both the cellGlobalIdOrServiceAreaIdOrLAI IE including an LAI and 
+-- absent. As an exception, both the cellGlobalIdOrServiceAreaIdOrLAI IE including an LAI and
 -- the locationinformationEPS IE may be present in a MAP-NOTE-MM-EVENT.
 -- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in
 -- the case the Access mode is Hybrid Mode.
@@ -2782,7 +2782,7 @@ LocationInformationGPRS ::= SEQUENCE {
 -- currentLocationRetrieved shall be present if the location information
 -- was retrieved after successful paging.
 -- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in
--- the case the Access mode is Hybrid Mode. 
+-- the case the Access mode is Hybrid Mode.
 
 
 UserCSGInformation ::= SEQUENCE {
@@ -2873,7 +2873,7 @@ PDP-ContextInfo ::= SEQUENCE {
 	qos4-Requested	[26] Ext4-QoS-Subscribed	OPTIONAL,
 	-- qos4-Requested may be present only if qos3-Requested is present.
 	qos4-Negotiated	[27] Ext4-QoS-Subscribed	OPTIONAL,
-	-- qos4-Negotiated may be present only if qos3-Negotiated is present. 
+	-- qos4-Negotiated may be present only if qos3-Negotiated is present.
 	ext-pdp-Type	[28] Ext-PDP-Type	OPTIONAL,
 	-- contains the value IPv4v6 defined in 3GPP TS 29.060 [105], if the PDP can be
 	-- accessed by dual-stack UEs.
@@ -2890,17 +2890,17 @@ NSAPI ::= INTEGER (0..15)
 --	This type is used to indicate the Network layer Service Access Point
 
 TransactionId ::= OCTET STRING (SIZE (1..2))
---	This type carries the value part of the transaction identifier which is used in the 
---	session management messages on the access interface. The encoding is defined in 
+--	This type carries the value part of the transaction identifier which is used in the
+--	session management messages on the access interface. The encoding is defined in
 --	3GPP TS 24.008
 
 TEID ::= OCTET STRING (SIZE (4))
---	This type carries the value part of the Tunnel Endpoint Identifier which is used to 
---	distinguish between different tunnels between the same pair of entities which communicate 
+--	This type carries the value part of the Tunnel Endpoint Identifier which is used to
+--	distinguish between different tunnels between the same pair of entities which communicate
 --	using the GPRS Tunnelling Protocol The encoding is defined in 3GPP TS 29.060.
 
 GPRSChargingID ::= OCTET STRING (SIZE (4))
---	The Charging ID is a unique four octet value generated by the GGSN when 
+--	The Charging ID is a unique four octet value generated by the GGSN when
 --	a PDP Context is activated. A Charging ID is generated for each activated context.
 --	The encoding is defined in 3GPP TS 29.060.
 
@@ -2946,7 +2946,7 @@ AnyTimeSubscriptionInterrogationRes ::= SEQUENCE {
 	offeredCamel4CSIsInVLR	[8] OfferedCamel4CSIs	OPTIONAL,
 	offeredCamel4CSIsInSGSN	[9] OfferedCamel4CSIs	OPTIONAL,
 	msisdn-BS-List	[10] MSISDN-BS-List	OPTIONAL,
-	csg-SubscriptionDataList	[11] CSG-SubscriptionDataList	OPTIONAL, 
+	csg-SubscriptionDataList	[11] CSG-SubscriptionDataList	OPTIONAL,
 	cw-Data		[12]	CallWaitingData	OPTIONAL,
 	ch-Data		[13]	CallHoldData	OPTIONAL,
 	clip-Data 	[14] ClipData	OPTIONAL,
@@ -2962,7 +2962,7 @@ Ext-CwFeatureList ::= SEQUENCE SIZE (1..maxNumOfExt-BasicServiceGroups) OF
 				Ext-CwFeature
 
 Ext-CwFeature ::= SEQUENCE {
-	basicService	[1] Ext-BasicServiceCode, 
+	basicService	[1] Ext-BasicServiceCode,
 	ss-Status		[2] Ext-SS-Status,
 	... }
 
@@ -2970,7 +2970,7 @@ ClipData ::= SEQUENCE {
 	ss-Status		[1] Ext-SS-Status,
 	overrideCategory	[2] OverrideCategory,
 	notificationToCSE	[3] NULL		OPTIONAL,
-	... }		
+	... }
 
 ClirData ::= SEQUENCE {
 	ss-Status		[1] Ext-SS-Status,
@@ -3014,7 +3014,7 @@ maxNumOfMSISDN  INTEGER ::= 50
 
 
 MSISDN-BS ::= SEQUENCE {
-	msisdn			ISDN-AddressString,	
+	msisdn			ISDN-AddressString,
 	basicServiceList	[0]	BasicServiceList	OPTIONAL,
 	extensionContainer	[1]	ExtensionContainer	OPTIONAL,
 	...}
@@ -3063,7 +3063,7 @@ ODB-Info ::= SEQUENCE {
 
 CAMEL-SubscriptionInfo ::= SEQUENCE {
 	o-CSI		[0]	O-CSI	OPTIONAL,
-	o-BcsmCamelTDP-CriteriaList	[1]	O-BcsmCamelTDPCriteriaList	OPTIONAL, 
+	o-BcsmCamelTDP-CriteriaList	[1]	O-BcsmCamelTDPCriteriaList	OPTIONAL,
 	d-CSI		[2]	D-CSI	OPTIONAL,
 	t-CSI		[3]	T-CSI	OPTIONAL,
 	t-BCSM-CAMEL-TDP-CriteriaList	[4]	T-BCSM-CAMEL-TDP-CriteriaList	OPTIONAL,
diff --git a/asn1/gsm_map/Nokia.asn b/asn1/gsm_map/Nokia.asn
index a83fedf27a..75536232ab 100644
--- a/asn1/gsm_map/Nokia.asn
+++ b/asn1/gsm_map/Nokia.asn
@@ -45,14 +45,14 @@ FROM MAP-OM-DataTypes {
 FROM MAP-SS-Code {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-SS-Code (15) version10 (10)}
-   
+
        SS-Status, USSD-DataCodingScheme, USSD-String, CCBS-Feature
 -- USSD-DataCodingScheme, USSD-String were introduced because of CNAP.
 FROM MAP-SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-SS-DataTypes (14) version10 (10)}
 
- 
+
 ;
 
 
@@ -395,7 +395,7 @@ MKey::= SEQUENCE{
     -- mmScfAddress, mmTtdpId and serviceKey parameters must be
     -- present on version 1.
     --
-    -- Feature 742 : “IN Mobility Management”
+    -- Feature 742 : "IN Mobility Management"
 
 SmsTdpName ::= OCTET STRING (SIZE (1..8))
     -- bits 87654: 00000 (unused)
@@ -562,8 +562,8 @@ PrnArgData ::= SEQUENCE {
     privateFeatureCode [1] PrivateFeatureCode OPTIONAL,
     ...,
     extraNetworkInfo   [2] ExtraSignalInfo OPTIONAL }
- 
- 
+
+
 UlArgType ::= SEQUENCE (SIZE(1..50)) OF
     UlArgData
 
@@ -668,13 +668,13 @@ Version ::= INTEGER (1..20)
 
 AccessSubscriptionListExt ::= SEQUENCE SIZE (1..10) OF
     Access
- 
+
 AllowedServiceData ::= BIT STRING {
     amr-wb-allowed (0)} (SIZE(1..16))
 
 AnyTimePO-BarringArg ::= SEQUENCE {
   subscriberIdentity [0] SubscriberIdentity,
-  gsmSCF-Address     [3] ISDN-AddressString, 
+  gsmSCF-Address     [3] ISDN-AddressString,
   gprs-Barring           GprsBarring,
   ...}
 
@@ -682,7 +682,7 @@ AnyTimePO-BarringRes ::= SEQUENCE {
   ...}
 
 GprsBarring ::= ENUMERATED {
-    gprsServiceBarring (0), 
+    gprsServiceBarring (0),
     grantGPRS-Service (1),
     ...}