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>
This commit is contained in:
Pascal Quantin
Anders Broman
parent
2c74679a75
commit
59ffbc3eee
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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),
|
||||
...}
|
||||
|
||||
|
|
|
|||
|
|
@ -1580,6 +1580,8 @@ static int hf_gsm_map_dialogue_map_userAbort = -1; /* MAP_UserAbortInfo */
|
|||
static int hf_gsm_map_dialogue_map_providerAbort = -1; /* MAP_ProviderAbortInfo */
|
||||
static int hf_gsm_map_dialogue_destinationReference = -1; /* AddressString */
|
||||
static int hf_gsm_map_dialogue_originationReference = -1; /* AddressString */
|
||||
static int hf_gsm_map_dialogue_callingMsisdn = -1; /* AddressString */
|
||||
static int hf_gsm_map_dialogue_callingVlrAddress = -1; /* AddressString */
|
||||
static int hf_gsm_map_dialogue_extensionContainer = -1; /* ExtensionContainer */
|
||||
static int hf_gsm_map_dialogue_reason = -1; /* Reason */
|
||||
static int hf_gsm_map_dialogue_alternativeApplicationContext = -1; /* OBJECT_IDENTIFIER */
|
||||
|
|
@ -16224,6 +16226,8 @@ dissect_gsm_map_gr_SendGroupCallInfoRes(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
static const ber_sequence_t gsm_map_dialogue_MAP_OpenInfo_sequence[] = {
|
||||
{ &hf_gsm_map_dialogue_destinationReference, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AddressString },
|
||||
{ &hf_gsm_map_dialogue_originationReference, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AddressString },
|
||||
{ &hf_gsm_map_dialogue_callingMsisdn, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AddressString },
|
||||
{ &hf_gsm_map_dialogue_callingVlrAddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AddressString },
|
||||
{ &hf_gsm_map_dialogue_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
|
@ -28622,6 +28626,14 @@ void proto_register_gsm_map(void) {
|
|||
{ "originationReference", "gsm_map.dialogue.originationReference",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"AddressString", HFILL }},
|
||||
{ &hf_gsm_map_dialogue_callingMsisdn,
|
||||
{ "callingMsisdn", "gsm_map.dialogue.callingMsisdn",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"AddressString", HFILL }},
|
||||
{ &hf_gsm_map_dialogue_callingVlrAddress,
|
||||
{ "callingVlrAddress", "gsm_map.dialogue.callingVlrAddress",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"AddressString", HFILL }},
|
||||
{ &hf_gsm_map_dialogue_extensionContainer,
|
||||
{ "extensionContainer", "gsm_map.dialogue.extensionContainer_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
|
|
|
|||
Loading…
Reference in New Issue