From b6ac433a00bfabf9568560ce0537f2aaf30447f6 Mon Sep 17 00:00:00 2001 From: lovieno Date: Thu, 22 Jun 2023 20:25:25 +0000 Subject: [PATCH 1/5] Update 33108/r17/UmtsHI2Operations.asn --- 33108/r17/UmtsHI2Operations.asn | 121 ++++++++++++++++---------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/33108/r17/UmtsHI2Operations.asn b/33108/r17/UmtsHI2Operations.asn index 0156434d..b96c5687 100644 --- a/33108/r17/UmtsHI2Operations.asn +++ b/33108/r17/UmtsHI2Operations.asn @@ -1,4 +1,4 @@ -UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r16 (16) version-1 (1)} +UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r17 (17) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -20,7 +20,7 @@ IMPORTS FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671 v3.14.1 - + -- Object Identifier Definitions @@ -30,7 +30,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r16 (16) version-1 (1)} +hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r17 (17) version-0 (0)} UmtsIRIsContent ::= CHOICE { @@ -149,7 +149,7 @@ IRI-Parameters ::= SEQUENCE -- information extracted from P-Access-Network-Info headers of SIP message; -- described in TS 24.229 7.2A.4 [76] imsVoIP [46] IMS-VoIP-Correlation OPTIONAL, - xCAPmessage [47] OCTET STRING OPTIONAL, + xCAPmessage [47] OCTET STRING OPTIONAL, -- The entire HTTP contents of any of the target's IMS supplementary service setting -- management or manipulation XCAP messages, mainly made through the Ut -- interface defined in the 3GPP TS 24 623 [77]. @@ -230,7 +230,7 @@ PartyInformation ::= SEQUENCE ..., tel-uri [9] OCTET STRING OPTIONAL, -- See [67] - x-3GPP-Asserted-Identity [10] OCTET STRING OPTIONAL, + x-3GPP-Asserted-Identity [10] OCTET STRING OPTIONAL, -- X-3GPP-Asserted-Identity header (3GPP TS 24.109 [79]) of the target, used in -- some XCAP transactions. This information complement SIP URI or Tel URI of the target. xUI [11] OCTET STRING OPTIONAL @@ -249,9 +249,9 @@ Location ::= SEQUENCE { e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, -- Coded in the same format as the ISUP location number (parameter - -- field) of the ISUP (see EN 300 356 [30]). + -- field) of the ISUP (see EN 300 356 [30]). globalCellID [2] GlobalCellID OPTIONAL, - --see MAP format (see [4]) + --see MAP format (see [4]) rAI [4] Rai OPTIONAL, -- the Routeing Area Identifier in the current SGSN is coded in accordance with the -- 10.5.5.15 of document [9] without the Routing Area Identification IEI @@ -301,7 +301,7 @@ Sai ::= OCTET STRING (SIZE (7)) GSMLocation ::= CHOICE { - geoCoordinates [1] SEQUENCE + geoCoordinates [1] SEQUENCE { latitude [1] PrintableString (SIZE(7..10)), -- format : XDDMMSS.SS @@ -321,10 +321,10 @@ GSMLocation ::= CHOICE -- latitude short form N502312 -- longitude long form E1122312.18 - utmCoordinates [2] SEQUENCE + utmCoordinates [2] SEQUENCE { - utm-East [1] PrintableString (SIZE(10)), - utm-North [2] PrintableString (SIZE(7)), + utm-East [1] PrintableString (SIZE(10)), + utm-North [2] PrintableString (SIZE(7)), -- example utm-East 32U0439955 -- utm-North 5540736 mapDatum [3] MapDatum DEFAULT wGS84, @@ -339,14 +339,14 @@ GSMLocation ::= CHOICE mapDatum MapDatum DEFAULT wGS84, ... }, - -- example 32UPU91294045 + -- example 32UPU91294045 wGS84Coordinates [4] OCTET STRING -- format is as defined in [37]. } MapDatum ::= ENUMERATED -{ +{ wGS84, wGS72, eD50, -- European Datum 50 @@ -490,13 +490,14 @@ SMS-report ::= SEQUENCE } OPTIONAL, content [4] OCTET STRING (SIZE (1 .. 270)) OPTIONAL, -- Encoded in the format defined for the SMS mobile - ... - } + ..., + sMSContentRemovedIndicator [5] BOOLEAN OPTIONAL + } } GPRSCorrelationNumber ::= OCTET STRING (SIZE(8..20)) CorrelationValues ::= CHOICE { - + iri-to-CC [0] IRI-to-CC-Correlation, -- correlates IRI to Content(s) iri-to-iri [1] IRI-to-IRI-Correlation, -- correlates IRI to IRI both-IRI-CC [2] SEQUENCE { -- correlates IRI to IRI and IRI to Content(s) @@ -544,8 +545,8 @@ GPRSEvent ::= ENUMERATED -- see [19] CSREvent ::= ENUMERATED -{ - cSREventMessage (1), +{ + cSREventMessage (1), ... } @@ -625,7 +626,7 @@ Change-Of-Target-Identity ::= SEQUENCE new-TEL-URI [11] PartyInformation OPTIONAL, old-TEL-URI [12] PartyInformation OPTIONAL } - + Requesting-Node-Type ::= ENUMERATED { mSC (1), @@ -694,7 +695,7 @@ MediaDecryption-info ::= SEQUENCE OF CCKeyInfo CCKeyInfo ::= SEQUENCE { - cCCSID [1] OCTET STRING, + cCCSID [1] OCTET STRING, -- the parameter uniquely mapping the key to the encrypted stream. cCDecKey [2] OCTET STRING, cCSalt [3] OCTET STRING OPTIONAL, @@ -728,7 +729,7 @@ PacketDataHeaderReport ::= CHOICE PacketDataHeaderMapped ::= SEQUENCE { sourceIPAddress [1] IPAddress, - sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, + sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, destinationIPAddress [3] IPAddress, destinationPortNumber [4] INTEGER (0..65535) OPTIONAL, transportProtocol [5] INTEGER, @@ -765,7 +766,7 @@ PacketFlowSummary ::= SEQUENCE { sourceIPAddress [1] IPAddress, - sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, + sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, destinationIPAddress [3] IPAddress, destinationPortNumber [4] INTEGER (0..65535) OPTIONAL, transportProtocol [5] INTEGER, @@ -782,7 +783,7 @@ PacketFlowSummary ::= SEQUENCE ReportReason ::= ENUMERATED { - timerExpired (0), + timerExpired (0), countThresholdHit (1), pDPComtextDeactivated (2), pDPContextModification (3), @@ -797,8 +798,8 @@ ReportInterval ::= SEQUENCE ... } --- LALS extended location parameters are mapped from the MLP pos element parameters --- and attributes defined in [88]. For details see specific [88] clauses refered below. +-- LALS extended location parameters are mapped from the MLP pos element parameters +-- and attributes defined in [88]. For details see specific [88] clauses refered below. ExtendedLocParameters ::= SEQUENCE { posMethod [0] PrintableString OPTIONAL, -- clause 5.3.93.1 @@ -806,7 +807,7 @@ ExtendedLocParameters ::= SEQUENCE CHOICE {base64Map [0] PrintableString, -- clause 5.3.12 url [1] PrintableString -- clause 5.3.138 } OPTIONAL, - altitude [2] + altitude [2] SEQUENCE {alt PrintableString, -- clause 5.3.5 alt-uncertainty PrintableString OPTIONAL -- clause 5.3.7 } OPTIONAL, @@ -819,11 +820,11 @@ ExtendedLocParameters ::= SEQUENCE secondaryMotionState [1] SEQUENCE OF PrintableString OPTIONAL, confidence [2] PrintableString -- clause 5.3.24 } OPTIONAL, - floor [8] + floor [8] SEQUENCE {floor-number PrintableString, -- clause 5.3.39 floor-number-uncertainty PrintableString OPTIONAL -- clause 5.3.40 - } OPTIONAL, + } OPTIONAL, additional-info [9] PrintableString OPTIONAL, -- clause 5.3.1 -- The following parameter contains a copy of the unparsed XML code of @@ -832,14 +833,14 @@ ExtendedLocParameters ::= SEQUENCE -- a (described in [88], clause 5.2.3.2.3) MLP message. -- This parameter is present when the LI-LCS client cannot fully map -- the MLP response message into an ASN.1 Location object. - - lALS-rawMLPPosData [10] UTF8String OPTIONAL, + + lALS-rawMLPPosData [10] UTF8String OPTIONAL, ... } LocationErrorCode ::= INTEGER (1..699) --- LALS location error codes are the OMA MLP result identifiers defined in [88], Clause 5.4 +-- LALS location error codes are the OMA MLP result identifiers defined in [88], Clause 5.4 PTCEncryptionInfo ::= SEQUENCE { @@ -853,7 +854,7 @@ PTCEncryptionInfo ::= SEQUENCE { } PTC ::= SEQUENCE { - abandonCause [1] UTF8String OPTIONAL, + abandonCause [1] UTF8String OPTIONAL, accessPolicyFailure [2] UTF8String OPTIONAL, accessPolicyType [3] AccessPolicyType OPTIONAL, alertIndicator [5] AlertIndicator OPTIONAL, @@ -871,11 +872,11 @@ PTC ::= SEQUENCE { floorActivity [15] FloorActivity OPTIONAL, floorSpeakerID [16] PTCAddress OPTIONAL, groupAdSender [17] UTF8String OPTIONAL, - -- Identifies the group administrator who was the originator of the group call. + -- Identifies the group administrator who was the originator of the group call. -- tag [18] was used in r15 (15) version-4 (4) groupAuthRule [19] GroupAuthRule OPTIONAL, groupCharacteristics [20] UTF8String OPTIONAL, - holdRetrieveInd [21] BOOLEAN OPTIONAL, + holdRetrieveInd [21] BOOLEAN OPTIONAL, -- true indicates target is placed on hold, false indicates target was retrived from hold. -- tag [22] was used in r15 (15) version-4 (4) imminentPerilInd [23] ImminentPerilInd OPTIONAL, @@ -888,13 +889,13 @@ PTC ::= SEQUENCE { listManagementFailure [30] UTF8String OPTIONAL, listManagementType [31] ListManagementType OPTIONAL, maxTBTime [32] UTF8String OPTIONAL, -- defined in seconds. - mCPTTGroupID [33] UTF8String OPTIONAL, + mCPTTGroupID [33] UTF8String OPTIONAL, mCPTTID [34] UTF8String OPTIONAL, mCPTTInd [35] BOOLEAN OPTIONAL, -- default False indicates to associate from target, true indicates to the target. location [36] Location OPTIONAL, mCPTTOrganizationName [37] UTF8String OPTIONAL, - mediaStreamAvail [38] BOOLEAN OPTIONAL, + mediaStreamAvail [38] BOOLEAN OPTIONAL, -- True indicates available for media, false indicates not able to accept media. priority-Level [40] Priority-Level OPTIONAL, preEstSessionID [41] UTF8String OPTIONAL, @@ -906,19 +907,19 @@ PTC ::= SEQUENCE { pTCOther [47] UTF8String OPTIONAL, pTCParticipants [48] UTF8String OPTIONAL, pTCParty [49] UTF8String OPTIONAL, - pTCPartyDrop [50] UTF8String OPTIONAL, + pTCPartyDrop [50] UTF8String OPTIONAL, pTCSessionInfo [51] UTF8String OPTIONAL, pTCServerURI [52] UTF8String OPTIONAL, pTCUserAccessPolicy [53] UTF8String OPTIONAL, pTCAddress [54] PTCAddress OPTIONAL, - queuedFloorControl [55] BOOLEAN OPTIONAL, + queuedFloorControl [55] BOOLEAN OPTIONAL, --Default FALSE,send TRUE if Queued floor control is used. queuedPosition [56] UTF8String OPTIONAL, - -- indicates the queued position of the Speaker (Target or associate) who has the + -- indicates the queued position of the Speaker (Target or associate) who has the -- right to speak. registrationRequest [57] RegistrationRequest OPTIONAL, registrationOutcome [58] RegistrationOutcome OPTIONAL, - retrieveID [59] UTF8String OPTIONAL, + retrieveID [59] UTF8String OPTIONAL, rTPSetting [60] RTPSetting OPTIONAL, talkBurstPriority [61] Priority-Level OPTIONAL, talkBurstReason [62] Talk-burst-reason-code OPTIONAL, @@ -957,9 +958,9 @@ AlertIndicator ::= ENUMERATED AssociatePresenceStatus ::= SEQUENCE { presenceID [1] UTF8String, - -- identity of PTC Client(s)or the PTC group + -- identity of PTC Client(s)or the PTC group presenceType [2] PresenceType, - presenceStatus [3] BOOLEAN, + presenceStatus [3] BOOLEAN, -- default false, true indicates connected. ... } @@ -974,7 +975,7 @@ PresenceType ::= ENUMERATED Emergency ::= ENUMERATED { - -- MCPTT services indication of peril condition. + -- MCPTT services indication of peril condition. imminent (1), peril (2), cancel (3), @@ -983,7 +984,7 @@ Emergency ::= ENUMERATED EmergencyGroupState ::= SEQUENCE { - -- indicates the state of the call, at least one of these information + -- indicates the state of the call, at least one of these information -- elements shall be present. clientEmergencyState [1] ENUMERATED { @@ -994,9 +995,9 @@ EmergencyGroupState ::= SEQUENCE cancelResponse (4), ... } OPTIONAL, - groupEmergencyState [2] ENUMERATED + groupEmergencyState [2] ENUMERATED { - -- in case of MCPTT group call, indicates if there is a group emergency or + -- in case of MCPTT group call, indicates if there is a group emergency or -- a response from the Target to indicate current Client state of emergency. inForm (1), reSponse (2), @@ -1045,19 +1046,19 @@ FloorActivity ::= SEQUENCE tBCP-Request [1] BOOLEAN, -- default False, true indicates Granted. tBCP-Granted [2] BOOLEAN, - -- default False, true indicates Granted permission to talk. + -- default False, true indicates Granted permission to talk. tBCP-Deny [3] BOOLEAN, - -- default True, False indicates permission granted. + -- default True, False indicates permission granted. tBCP-Queued [4] BOOLEAN, - -- default False, true indicates the request to talk is in queue. + -- default False, true indicates the request to talk is in queue. tBCP-Release [5] BOOLEAN, - -- default True, true indicates the Request to talk is completed, + -- default True, true indicates the Request to talk is completed, -- False indicates PTC Client has the request to talk. tBCP-Revoke [6] BOOLEAN, - -- default False, true indicates the privilege to talk is canceld from the - -- PTC server. + -- default False, true indicates the privilege to talk is canceld from the + -- PTC server. tBCP-Taken [7] BOOLEAN, - -- default True, false indicates another PTC Client has the permission to talk. + -- default True, false indicates another PTC Client has the permission to talk. tBCP-Idle [8] BOOLEAN, -- default True, False indicates the Talk Burst Protocol is taken. ... @@ -1101,7 +1102,7 @@ InitiationCause ::= ENUMERATED requests (1), received (2), pTCOriginatingId (3), - -- requests or receives a session initiation from the network or another + -- requests or receives a session initiation from the network or another -- party to initiate a PTC session. Identify the originating PTC party, if known. ... } @@ -1155,7 +1156,7 @@ PTCAddress ::= SEQUENCE { uri [0] UTF8String, -- The set of URIs defined in [RFC3261] and related SIP RFCs. - privacy-setting [1] BOOLEAN, + privacy-setting [1] BOOLEAN, -- Default FALSE, send TRUE if privacy is used. privacy-alias [2] VisibleString OPTIONAL, -- if privacy is used, the PTC Server creates an anonymous PTC Address of the form @@ -1163,7 +1164,7 @@ PTCAddress ::= SEQUENCE -- Addresses SHALL be unique within a PTC Session. In case more than one anonymous -- PTC Addresses are used in the same PTC Session, for the second Anonymous PTC -- Session and thereafter, the PTC Server SHOULD use the form - -- sip:anonymous-n@anonymous.invalid where n is an integer number. + -- sip:anonymous-n@anonymous.invalid where n is an integer number. nickname [3] UTF8String OPTIONAL, ... } @@ -1196,17 +1197,17 @@ Port-Number ::= INTEGER (0..65535) TalkburstControlSetting ::= SEQUENCE -{ +{ talk-BurstControlProtocol [1] UTF8String, talk-Burst-parameters [2] SET OF VisibleString, - -- selected by the PTC Server from those contained in the original SDP offer in the + -- selected by the PTC Server from those contained in the original SDP offer in the -- incoming SIP INVITE request from the PTC Client tBCP-PortNumber [3] INTEGER (0..65535), - -- PTC Server's port number to be used for the Talk Burst Control Protocol + -- PTC Server's port number to be used for the Talk Burst Control Protocol ... } Talk-burst-reason-code ::= VisibleString -END \ No newline at end of file +END -- GitLab From ea8ffee2e88fd0ed0476723a5f5a2fbe791cf6ac Mon Sep 17 00:00:00 2001 From: lovieno Date: Thu, 22 Jun 2023 20:26:52 +0000 Subject: [PATCH 2/5] Update 33108/r17/UmtsCS-HI2Operations.asn --- 33108/r17/UmtsCS-HI2Operations.asn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/33108/r17/UmtsCS-HI2Operations.asn b/33108/r17/UmtsCS-HI2Operations.asn index 71f100b5..9f9b425a 100644 --- a/33108/r17/UmtsCS-HI2Operations.asn +++ b/33108/r17/UmtsCS-HI2Operations.asn @@ -1,5 +1,5 @@ UmtsCS-HI2Operations -{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3) r16 (16) version-0 (0)} +{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3) r17 (17) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -29,7 +29,7 @@ IMPORTS FROM UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) - lawfulintercept(2) threeGPP(4) hi2(1) r16 (16) version-0(0)}; + lawfulintercept(2) threeGPP(4) hi2(1) r17 (17) version-0(0)}; -- Object Identifier Definitions @@ -40,7 +40,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3) r16 (16) version-0 (0)} +hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3) r17 (17) version-0 (0)} UmtsCS-IRIsContent ::= CHOICE @@ -56,7 +56,7 @@ UmtsCS-IRISequence ::= SEQUENCE OF UmtsCS-IRIContent -- As a general rule, records created at any event shall be sent immediately and shall -- not held in the DF or MF in order to apply aggregation. -- When aggregation is not to be applied, UmtsCS-IRIContent needs to be chosen. - + UmtsCS-IRIContent ::= CHOICE { iRI-Begin-record [1] IRI-Parameters, @@ -166,7 +166,7 @@ IRI-Parameters ::= SEQUENCE -- ETSI TS 101 671 or Annex B.3 of this document (PS HI2). serving-System-Identifier [34] OCTET STRING OPTIONAL, -- the serving network identifier PLMN id (MNC, Mobile Country Code and MNC, Mobile Network - + -- Country, defined in E212 [87]) and 3GPP TR 21.905 [38]. carrierSpecificData [35] OCTET STRING OPTIONAL, -- Copy of raw data specified by the CSP or his vendor related to HLR. @@ -252,4 +252,4 @@ Current-Previous-Systems ::= SEQUENCE } -END \ No newline at end of file +END -- GitLab From 03ad435b44ba3676e635b6cb38311373c01a1967 Mon Sep 17 00:00:00 2001 From: lovieno Date: Thu, 22 Jun 2023 20:30:39 +0000 Subject: [PATCH 3/5] Update 33108/r17/EpsHI2Operations.asn --- 33108/r17/EpsHI2Operations.asn | 117 +++++++++++++++++---------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/33108/r17/EpsHI2Operations.asn b/33108/r17/EpsHI2Operations.asn index 65c739f9..8fb543c7 100644 --- a/33108/r17/EpsHI2Operations.asn +++ b/33108/r17/EpsHI2Operations.asn @@ -1,4 +1,4 @@ -EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r16 (16) version-1 (1)} +EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r17 (17) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -20,7 +20,7 @@ IMPORTS FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- Imported from TS 101 671 v3.14.1 - + CivicAddress, ExtendedLocParameters, LocationErrorCode @@ -29,7 +29,7 @@ IMPORTS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r16 (16) version-0 (0)}; -- Imported from 3GPP TS 33.108, UMTS PS HI2 - + -- Object Identifier Definitions @@ -39,7 +39,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r16(16) version-1 (1)} +hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r17(17) version-0 (0)} EpsIRIsContent ::= CHOICE { @@ -174,7 +174,7 @@ IRI-Parameters ::= SEQUENCE -- information extracted from P-Access-Network-Info headers of SIP message; -- described in TS 24.229 7.2A.4 [76] imsVoIP [57] IMS-VoIP-Correlation OPTIONAL, - xCAPmessage [58] OCTET STRING OPTIONAL, + xCAPmessage [58] OCTET STRING OPTIONAL, -- The HTTP message (HTPP header and any XCAP body) of any of the target's IMS supplementary -- service setting management or manipulation XCAP messages occuring through the Ut interface -- defined in the 3GPP TS 24 623 [77]. @@ -189,7 +189,7 @@ IRI-Parameters ::= SEQUENCE -- defined in E212 [87]). requesting-Node-Type [65] Requesting-Node-Type OPTIONAL, serving-System-Identifier [66] OCTET STRING OPTIONAL, - -- the serving network identifier PLMN id (MNC, Mobile Country Code and MNC,Mobile Network + -- the serving network identifier PLMN id (MNC, Mobile Country Code and MNC,Mobile Network -- Country, defined in E212 [87]) and 3GPP TR 21.905 [38], that may be included in the Diameter -- AVP to and from the HSS. @@ -201,7 +201,7 @@ IRI-Parameters ::= SEQUENCE -- coded according to 3GPP TS 29.274 [46] proSeRelayIMEI [70] OCTET STRING (SIZE (8)) OPTIONAL, - -- coded according to 3GPP TS 29.274 [46] + -- coded according to 3GPP TS 29.274 [46] extendedLocParameters [71] ExtendedLocParameters OPTIONAL, -- LALS extended parameters locationErrorCode [72] LocationErrorCode OPTIONAL, -- LALS error code @@ -209,14 +209,14 @@ IRI-Parameters ::= SEQUENCE otherIdentities [73] SEQUENCE OF PartyInformation OPTIONAL, deregistrationReason [74] DeregistrationReason OPTIONAL, requesting-Node-Identifier [75] OCTET STRING OPTIONAL, - roamingIndication [76] VoIPRoamingIndication OPTIONAL, + roamingIndication [76] VoIPRoamingIndication OPTIONAL, -- used for IMS events in the VPLMN. cSREvent [77] CSREvent OPTIONAL, ptc [78] PTC OPTIONAL, -- PTC Events ptcEncryption [79] PTCEncryptionInfo OPTIONAL, -- PTC Encryption Information additionalCellIDs [80] SEQUENCE OF AdditionalCellID OPTIONAL, - scefID [81] UTF8String OPTIONAL, + scefID [81] UTF8String OPTIONAL, -- SCEF-ID FQDN as defined by TS 29.336 [101], clause 8.4.5 and RFC 3588 [102] section 4.3 national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL } @@ -296,7 +296,7 @@ PartyInformation ::= SEQUENCE -- See [67] nai [10] OCTET STRING OPTIONAL, -- NAI of the target, encoded in the same format as defined by [EPS stage 3 specs] - x-3GPP-Asserted-Identity [11] OCTET STRING OPTIONAL, + x-3GPP-Asserted-Identity [11] OCTET STRING OPTIONAL, -- X-3GPP-Asserted-Identity header (3GPP TS 24.109 [79]) of the target, used in -- some XCAP transactions as a complement information to SIP URI or Tel URI. xUI [12] OCTET STRING OPTIONAL, @@ -320,9 +320,9 @@ Location ::= SEQUENCE { e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, -- Coded in the same format as the ISUP location number (parameter - -- field) of the ISUP (see EN 300 356 [30]). + -- field) of the ISUP (see EN 300 356 [30]). globalCellID [2] GlobalCellID OPTIONAL, - --see MAP format (see [4]) + --see MAP format (see [4]) rAI [4] Rai OPTIONAL, -- the Routeing Area Identifier in the current SGSN is coded in accordance with the -- 10.5.5.15 of document [9] without the Routing Area Identification IEI @@ -361,7 +361,7 @@ AdditionalCellID ::= SEQUENCE nCGI [1] NCGI, gsmLocation [2] GSMLocation OPTIONAL, umtsLocation [3] UMTSLocation OPTIONAL, - timeOfLocation [4] GeneralizedTime OPTIONAL, + timeOfLocation [4] GeneralizedTime OPTIONAL, ... } @@ -388,7 +388,7 @@ NCGI ::= SEQUENCE GSMLocation ::= CHOICE { - geoCoordinates [1] SEQUENCE + geoCoordinates [1] SEQUENCE { latitude [1] PrintableString (SIZE(7..10)), -- format : XDDMMSS.SS @@ -408,10 +408,10 @@ GSMLocation ::= CHOICE -- latitude short form N502312 -- longitude long form E1122312.18 - utmCoordinates [2] SEQUENCE + utmCoordinates [2] SEQUENCE { - utm-East [1] PrintableString (SIZE(10)), - utm-North [2] PrintableString (SIZE(7)), + utm-East [1] PrintableString (SIZE(10)), + utm-North [2] PrintableString (SIZE(7)), -- example utm-East 32U0439955 -- utm-North 5540736 mapDatum [3] MapDatum DEFAULT wGS84, @@ -426,14 +426,14 @@ GSMLocation ::= CHOICE mapDatum MapDatum DEFAULT wGS84, ... }, - -- example 32UPU91294045 + -- example 32UPU91294045 wGS84Coordinates [4] OCTET STRING -- format is as defined in [37]. } MapDatum ::= ENUMERATED -{ +{ wGS84, wGS72, eD50, -- European Datum 50 @@ -499,14 +499,15 @@ SMS-report ::= SEQUENCE } OPTIONAL, content [4] OCTET STRING (SIZE (1 .. 270)) OPTIONAL, -- Encoded in the format defined for the SMS mobile - ... - } + ..., + sMSContentRemovedIndicator [5] BOOLEAN OPTIONAL + } } EPSCorrelationNumber ::= OCTET STRING -- In case of PS interception, the size will be in the range (8..20) CorrelationValues ::= CHOICE { - + iri-to-CC [0] IRI-to-CC-Correlation, -- correlates IRI to Content(s) iri-to-iri [1] IRI-to-IRI-Correlation, -- correlates IRI to IRI both-IRI-CC [2] SEQUENCE { -- correlates IRI to IRI and IRI to Content(s) @@ -587,7 +588,7 @@ EPSEvent ::= ENUMERATED -- see [19] CSREvent ::= ENUMERATED -{ +{ cSREventMessage (1), ... } @@ -619,7 +620,7 @@ IMSevent ::= ENUMERATED -- orders that require media interception. sMSOverIMS (8), -- This value indicates to LEMF that the SMS utilized by SMS over IP (using IMS) is - -- being reported. + -- being reported. servingSystem(9), -- Applicable to HSS interception subscriberRecordChange(10), @@ -769,7 +770,7 @@ TypeOfBearer ::= ENUMERATED EPSLocation ::= SEQUENCE { - + userLocationInfo [1] OCTET STRING (SIZE (1..39)) OPTIONAL, -- see 3GPP TS 29.274 [46] parameters coding rules defined for EPS-GTPV2-SpecificParameters. gsmLocation [2] GSMLocation OPTIONAL, @@ -883,7 +884,7 @@ MediaDecryption-info ::= SEQUENCE OF CCKeyInfo CCKeyInfo ::= SEQUENCE { - cCCSID [1] OCTET STRING, + cCCSID [1] OCTET STRING, -- the parameter uniquely mapping the key to the encrypted stream. cCDecKey [2] OCTET STRING, cCSalt [3] OCTET STRING OPTIONAL, @@ -918,7 +919,7 @@ PacketDataHeaderReport ::= CHOICE PacketDataHeaderMapped ::= SEQUENCE { sourceIPAddress [1] IPAddress, - sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, + sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, destinationIPAddress [3] IPAddress, destinationPortNumber [4] INTEGER (0..65535) OPTIONAL, transportProtocol [5] INTEGER, @@ -954,7 +955,7 @@ PacketFlowSummary ::= SEQUENCE { sourceIPAddress [1] IPAddress, - sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, + sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, destinationIPAddress [3] IPAddress, destinationPortNumber [4] INTEGER (0..65535) OPTIONAL, transportProtocol [5] INTEGER, @@ -972,7 +973,7 @@ PacketFlowSummary ::= SEQUENCE ReportReason ::= ENUMERATED { - timerExpired (0), + timerExpired (0), countThresholdHit (1), pDPComtextDeactivated (2), pDPContextModification (3), @@ -1038,7 +1039,7 @@ Change-Of-Target-Identity ::= SEQUENCE old-IMEI [8] PartyInformation OPTIONAL, -- See MAP format [4] International Mobile -- Equipement Identity defined in MAP format document TS 29.002 [4] - + ..., new-IMPI [9] PartyInformation OPTIONAL, old-IMPI [10] PartyInformation OPTIONAL, @@ -1047,7 +1048,7 @@ Change-Of-Target-Identity ::= SEQUENCE new-TEL-URI [13] PartyInformation OPTIONAL, old-TEL-URI [14] PartyInformation OPTIONAL } - + Current-Previous-Systems ::= SEQUENCE { serving-System-Identifier [1] OCTET STRING OPTIONAL, @@ -1115,7 +1116,7 @@ PTC ::= SEQUENCE { -- tag [18] was used in r15 (15) version-4 (4) groupAuthRule [19] GroupAuthRule OPTIONAL, groupCharacteristics [20] UTF8String OPTIONAL, - holdRetrieveInd [21] BOOLEAN OPTIONAL, + holdRetrieveInd [21] BOOLEAN OPTIONAL, -- true indicates target is placed on hold, false indicates target was retrived from hold. -- tag [22] was used in r15 (15) version-4 (4) imminentPerilInd [23] ImminentPerilInd OPTIONAL, @@ -1128,13 +1129,13 @@ PTC ::= SEQUENCE { listManagementFailure [30] UTF8String OPTIONAL, listManagementType [31] ListManagementType OPTIONAL, maxTBTime [32] UTF8String OPTIONAL, -- defined in seconds. - mCPTTGroupID [33] UTF8String OPTIONAL, + mCPTTGroupID [33] UTF8String OPTIONAL, mCPTTID [34] UTF8String OPTIONAL, mCPTTInd [35] BOOLEAN OPTIONAL, -- default False indicates to associate from target, true indicates to the target. location [36] Location OPTIONAL, mCPTTOrganizationName [37] UTF8String OPTIONAL, - mediaStreamAvail [38] BOOLEAN OPTIONAL, + mediaStreamAvail [38] BOOLEAN OPTIONAL, -- True indicates available for media, false indicates not able to accept media. priority-Level [40] Priority-Level OPTIONAL, preEstSessionID [41] UTF8String OPTIONAL, @@ -1146,19 +1147,19 @@ PTC ::= SEQUENCE { pTCOther [47] UTF8String OPTIONAL, pTCParticipants [48] UTF8String OPTIONAL, pTCParty [49] UTF8String OPTIONAL, - pTCPartyDrop [50] UTF8String OPTIONAL, + pTCPartyDrop [50] UTF8String OPTIONAL, pTCSessionInfo [51] UTF8String OPTIONAL, pTCServerURI [52] UTF8String OPTIONAL, pTCUserAccessPolicy [53] UTF8String OPTIONAL, pTCAddress [54] PTCAddress OPTIONAL, - queuedFloorControl [55] BOOLEAN OPTIONAL, + queuedFloorControl [55] BOOLEAN OPTIONAL, --Default FALSE,send TRUE if Queued floor control is used. queuedPosition [56] UTF8String OPTIONAL, - -- indicates the queued position of the Speaker (Target or associate) who has the + -- indicates the queued position of the Speaker (Target or associate) who has the -- right to speak. registrationRequest [57] RegistrationRequest OPTIONAL, registrationOutcome [58] RegistrationOutcome OPTIONAL, - retrieveID [59] UTF8String OPTIONAL, + retrieveID [59] UTF8String OPTIONAL, rTPSetting [60] RTPSetting OPTIONAL, talkBurstPriority [61] Priority-Level OPTIONAL, talkBurstReason [62] Talk-burst-reason-code OPTIONAL, @@ -1197,9 +1198,9 @@ AlertIndicator ::= ENUMERATED AssociatePresenceStatus ::= SEQUENCE { presenceID [1] UTF8String, - -- identity of PTC Client(s)or the PTC group + -- identity of PTC Client(s)or the PTC group presenceType [2] PresenceType, - presenceStatus [3] BOOLEAN, + presenceStatus [3] BOOLEAN, -- default false, true indicates connected. ... } @@ -1214,7 +1215,7 @@ PresenceType ::= ENUMERATED Emergency ::= ENUMERATED { - -- MCPTT services indication of peril condition. + -- MCPTT services indication of peril condition. imminent (1), peril (2), cancel (3), @@ -1223,7 +1224,7 @@ Emergency ::= ENUMERATED EmergencyGroupState ::= SEQUENCE { - -- indicates the state of the call, at least one of these information + -- indicates the state of the call, at least one of these information -- elements shall be present. clientEmergencyState [1] ENUMERATED { @@ -1234,9 +1235,9 @@ EmergencyGroupState ::= SEQUENCE cancelResponse (4), ... } OPTIONAL, - groupEmergencyState [2] ENUMERATED + groupEmergencyState [2] ENUMERATED { - -- in case of MCPTT group call, indicates if there is a group emergency or + -- in case of MCPTT group call, indicates if there is a group emergency or -- a response from the Target to indicate current Client state of emergency. inForm (1), reSponse (2), @@ -1285,19 +1286,19 @@ FloorActivity ::= SEQUENCE tBCP-Request [1] BOOLEAN, -- default False, true indicates Granted. tBCP-Granted [2] BOOLEAN, - -- default False, true indicates Granted permission to talk. + -- default False, true indicates Granted permission to talk. tBCP-Deny [3] BOOLEAN, - -- default True, False indicates permission granted. + -- default True, False indicates permission granted. tBCP-Queued [4] BOOLEAN, - -- default False, true indicates the request to talk is in queue. + -- default False, true indicates the request to talk is in queue. tBCP-Release [5] BOOLEAN, - -- default True, true indicates the Request to talk is completed, + -- default True, true indicates the Request to talk is completed, -- False indicates PTC Client has the request to talk. tBCP-Revoke [6] BOOLEAN, - -- default False, true indicates the privilege to talk is canceld from the - -- PTC server. + -- default False, true indicates the privilege to talk is canceld from the + -- PTC server. tBCP-Taken [7] BOOLEAN, - -- default True, false indicates another PTC Client has the permission to talk. + -- default True, false indicates another PTC Client has the permission to talk. tBCP-Idle [8] BOOLEAN, -- default True, False indicates the Talk Burst Protocol is taken. ... @@ -1341,7 +1342,7 @@ InitiationCause ::= ENUMERATED requests (1), received (2), pTCOriginatingId (3), - -- requests or receives a session initiation from the network or another + -- requests or receives a session initiation from the network or another -- party to initiate a PTC session. Identify the originating PTC party, if known. ... } @@ -1395,7 +1396,7 @@ PTCAddress ::= SEQUENCE { uri [0] UTF8String, -- The set of URIs defined in [RFC3261] and related SIP RFCs. - privacy-setting [1] BOOLEAN, + privacy-setting [1] BOOLEAN, -- Default FALSE, send TRUE if privacy is used. privacy-alias [2] VisibleString OPTIONAL, -- if privacy is used, the PTC Server creates an anonymous PTC Address of the form @@ -1403,7 +1404,7 @@ PTCAddress ::= SEQUENCE -- Addresses SHALL be unique within a PTC Session. In case more than one anonymous -- PTC Addresses are used in the same PTC Session, for the second Anonymous PTC -- Session and thereafter, the PTC Server SHOULD use the form - -- sip:anonymous-n@anonymous.invalid where n is an integer number. + -- sip:anonymous-n@anonymous.invalid where n is an integer number. nickname [3] UTF8String OPTIONAL, ... } @@ -1436,17 +1437,17 @@ Port-Number ::= INTEGER (0..65535) TalkburstControlSetting ::= SEQUENCE -{ +{ talk-BurstControlProtocol [1] UTF8String, talk-Burst-parameters [2] SET OF VisibleString, - -- selected by the PTC Server from those contained in the original SDP offer in the + -- selected by the PTC Server from those contained in the original SDP offer in the -- incoming SIP INVITE request from the PTC Client tBCP-PortNumber [3] INTEGER (0..65535), - -- PTC Server's port number to be used for the Talk Burst Control Protocol + -- PTC Server's port number to be used for the Talk Burst Control Protocol ... } Talk-burst-reason-code ::= VisibleString -END \ No newline at end of file +END -- GitLab From 0b3ecfb805142c3e22d53dc2a46a805003592f79 Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Wed, 28 Jun 2023 12:20:53 +0000 Subject: [PATCH 4/5] Comment accepted --- 33108/r17/EpsHI2Operations.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33108/r17/EpsHI2Operations.asn b/33108/r17/EpsHI2Operations.asn index 8fb543c7..1447a9e8 100644 --- a/33108/r17/EpsHI2Operations.asn +++ b/33108/r17/EpsHI2Operations.asn @@ -500,7 +500,7 @@ SMS-report ::= SEQUENCE content [4] OCTET STRING (SIZE (1 .. 270)) OPTIONAL, -- Encoded in the format defined for the SMS mobile ..., - sMSContentRemovedIndicator [5] BOOLEAN OPTIONAL + sMSContentRemovedIndicator [5] BOOLEAN OPTIONAL } } -- GitLab From ee409808d6c379acc07d031470962fccd6083649 Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Wed, 28 Jun 2023 12:21:16 +0000 Subject: [PATCH 5/5] Comment accepted --- 33108/r17/UmtsHI2Operations.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33108/r17/UmtsHI2Operations.asn b/33108/r17/UmtsHI2Operations.asn index b96c5687..648615e7 100644 --- a/33108/r17/UmtsHI2Operations.asn +++ b/33108/r17/UmtsHI2Operations.asn @@ -491,7 +491,7 @@ SMS-report ::= SEQUENCE content [4] OCTET STRING (SIZE (1 .. 270)) OPTIONAL, -- Encoded in the format defined for the SMS mobile ..., - sMSContentRemovedIndicator [5] BOOLEAN OPTIONAL + sMSContentRemovedIndicator [5] BOOLEAN OPTIONAL } } -- GitLab