diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index ea717ef2e6ce2597ff23706154f64f6eb0996d64..f3d98ebaea2cc85514b8e80bbd2693710513d61a 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version26(26)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version26(26)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -837,9 +837,11 @@ TelephonyServiceUsage ::= SEQUENCE nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - operatorSpecificCallDetails [11] UTF8String OPTIONAL + operatorSpecificCallDetails [11] UTF8String OPTIONAL, -- CSP specific value which indicates the nature of a call -- (e.g. "CallIndicator: GPR, CallActionCode: 2") + trunkGroupIDs [12] TrunkGroupIDs OPTIONAL, + interOperatorIDs [13] InterOperatorIDs OPTIONAL } NationalTelephonyServiceUsage ::= SEQUENCE @@ -1157,6 +1159,26 @@ TelephonyPartyRole ::= ENUMERATED mmsRecipientTrn(17) } +TrunkGroupIDs ::= SEQUENCE +{ + incomingTrunkGroupID [1] UTF8String OPTIONAL, + -- identifies the incoming PSTN leg. Format as defined by the CSP. + outgoingTrunkGroupID [2] UTF8String OPTIONAL, + -- identifies the outgoing PSTN leg. Format as defined by the CSP. + ... +} + +InterOperatorIDs ::= SEQUENCE +{ + originatingInterOperatorID [1] UTF8String OPTIONAL, + -- orig-ioi formated as defined in IETF RFC 7315 [55]. + terminatingInterOperatorID [2] UTF8String OPTIONAL, + -- term-ioi, formated as defined in IETF RFC 7315 [55]. + transitInterOperatorIDList [3] UTF8String OPTIONAL, + -- transit-ioi-list, formated as defined in IETF RFC 7315 [55]. + ... +} + -- ======================= -- Device Data definitions -- ======================= @@ -1678,7 +1700,9 @@ MsgTransmission ::= SEQUENCE ..., messageID [10] MessageID OPTIONAL, sourceServerName [11] UTF8String OPTIONAL, - destinationServerName [12] UTF8String OPTIONAL + destinationServerName [12] UTF8String OPTIONAL, + clientPort [13] PortNumber OPTIONAL, + serverPort [14] PortNumber OPTIONAL } MsgStoreOperation ::= SEQUENCE @@ -1700,7 +1724,11 @@ MsgStoreOperation ::= SEQUENCE addMsg(5), -- E.g. the APPEND command in IMAP ..., - editMsg(6) + editMsg(6), + sendMsg(7), + -- Only applicable to webmail solutions + forwardMsg(8) + -- Only applicable to webmail solutions } OPTIONAL, senderAddress [5] MsgAddress OPTIONAL, -- For Internet email, use the From address in the mail headers @@ -1716,7 +1744,9 @@ MsgStoreOperation ::= SEQUENCE clientID [8] IPAddress OPTIONAL, serverID [9] IPAddress OPTIONAL, ..., - messageID [10] MessageID OPTIONAL + messageID [10] MessageID OPTIONAL, + clientPort [11] PortNumber OPTIONAL, + serverPort [12] PortNumber OPTIONAL } MessageID ::= UTF8String @@ -1928,8 +1958,10 @@ MultimediaServiceUsage ::= SEQUENCE relayIP [20] IPAddress OPTIONAL, vmLength [21] INTEGER OPTIONAL, -- number of seconds reason [22] UTF8String OPTIONAL, - smsInformation [23] SmsInformation OPTIONAL, - mmsInformation [24] MmsInformation OPTIONAL + smsInformation [23] SmsInformation OPTIONAL, + mmsInformation [24] MmsInformation OPTIONAL, + trunkGroupIDs [25] TrunkGroupIDs OPTIONAL, + interOperatorIDs [26] InterOperatorIDs OPTIONAL } MultimediaPartyInformation ::= SEQUENCE @@ -2403,9 +2435,13 @@ WifiInformation ::= SEQUENCE accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL, -- Informal description of location, category or type of access point, -- or a name of the network to which the access point belongs. - accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL, -- For WiFi, there may be other parties involved in hosting or owning the -- Access Points, e.g. access point provider or partner providers + cSPDefinedName [10] UTF8String OPTIONAL + -- CSP-defined label or name assigned to the access point. + -- The access points of a CSP within a venue or geographical location + -- typically share this name. } AuthenticationType ::= ENUMERATED @@ -2787,6 +2823,17 @@ IPAddress ::= CHOICE ... } +PortNumber ::= CHOICE +{ + tCPPort [0] TCPPort, + uDPPort [1] UDPPort, + ... +} + +TCPPort ::= INTEGER (1..65535) + +UDPPort ::= INTEGER (0..65535) + NAAssignedAddress ::= SEQUENCE { addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index e74c0c29138a10a164309b81a1aafd1ad5ae741e..39e55512ac79b1e3e6ae8250d6f66738ab25ca8a 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.28.1 @@ -223,6 +223,21 @@ + + + + + + + + + + + + + + + @@ -349,6 +364,24 @@ + + + + + + + + + + + + + + + + + + @@ -1089,6 +1122,8 @@ + + @@ -1755,6 +1790,8 @@ + + @@ -1773,6 +1810,8 @@ + + @@ -1796,6 +1835,8 @@ + + @@ -2157,6 +2198,7 @@ + @@ -2868,6 +2910,8 @@ + +