From ca7f3fe12df6b1799d5ca476e2e1d15c17144cad Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Fri, 15 Oct 2021 15:17:05 +0200
Subject: [PATCH 01/10] Update RDMessage.asn for CRs 137, 138, 139 and 140

---
 102657/RDMessage.asn | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index ea717ef..1ac46fc 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -837,9 +837,12 @@ 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,
+	transitIOIList					[14] UTF8String OPTIONAL
 }
 
 NationalTelephonyServiceUsage ::= SEQUENCE
@@ -1157,6 +1160,20 @@ TelephonyPartyRole ::= ENUMERATED
 	mmsRecipientTrn(17)
 }
 
+TrunkGroupIDs ::= SEQUENCE
+{
+	incomingTrunkGroupID	[1] UTF8String OPTIONAL,
+	outgoingTrunkGroupID	[2] UTF8String OPTIONAL,
+	...
+}
+
+InterOperatorIDs ::= SEQUENCE
+{
+	originatingIOI		[1] UTF8String OPTIONAL,
+	terminatingIOI		[2] UTF8String OPTIONAL,
+	...
+}
+
 -- =======================
 -- Device Data definitions
 -- =======================
@@ -1678,7 +1695,9 @@ MsgTransmission ::= SEQUENCE
 	...,
 	messageID				[10] MessageID OPTIONAL,
 	sourceServerName		[11] UTF8String OPTIONAL,
-	destinationServerName	[12] UTF8String OPTIONAL
+	destinationServerName	[12] UTF8String OPTIONAL,
+	clientPort				[13] INTEGER (0..65535) OPTIONAL,
+	serverPort				[14] INTEGER (0..65535) OPTIONAL
 }
 
 MsgStoreOperation ::= SEQUENCE
@@ -1700,7 +1719,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 +1739,9 @@ MsgStoreOperation ::= SEQUENCE
 	clientID		[8] IPAddress OPTIONAL,
 	serverID		[9] IPAddress OPTIONAL,
 	...,
-	messageID		[10] MessageID OPTIONAL
+	messageID		[10] MessageID OPTIONAL,
+	clientPort		[11] INTEGER (0..65535) OPTIONAL,
+	serverPort		[12] INTEGER (0..65535) OPTIONAL
 }
 
 MessageID ::= UTF8String
@@ -2403,9 +2428,10 @@ 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
+	hotspotName							[10] UTF8String OPTIONAL
 }
 
 AuthenticationType ::= ENUMERATED
-- 
GitLab


From 5bc1a647180a74d1f0ee65dedf0a4fd5cbd8227d Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Fri, 15 Oct 2021 16:10:55 +0200
Subject: [PATCH 02/10] Update RDMessage.asn

---
 102657/RDMessage.asn | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index 1ac46fc..ef43546 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -1953,8 +1953,11 @@ 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,
+	transitIOIList				[27] UTF8String OPTIONAL
 }
 
 MultimediaPartyInformation ::= SEQUENCE
-- 
GitLab


From 2fffa85715ffea74d0c5ea08f6fba03e32cab211 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Fri, 15 Oct 2021 16:16:32 +0200
Subject: [PATCH 03/10] Update RDMessage.xsd

---
 102657/RDMessage.xsd | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index e74c0c2..0b6784d 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -223,6 +223,20 @@
 			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:choice>
 	</xsd:complexType>
+	<xsd:complexType name="TrunkGroupIDs">
+		<xsd:sequence>
+			<xsd:element name="incomingTrunkGroupID" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="outgoingTrunkGroupID" type="xsd:string" minOccurs="0"/>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="InterOperatorIDs">
+		<xsd:sequence>
+			<xsd:element name="originatingIOI" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="terminatingIOI" type="xsd:string" minOccurs="0"/>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
 	<xsd:simpleType name="TelephonyDeviceID">
 		<xsd:restriction base="xsd:hexBinary"/>
 	</xsd:simpleType>
@@ -1089,6 +1103,9 @@
 			<xsd:element name="mmsInformation" type="MmsInformation" minOccurs="0"/>
 			<xsd:element name="nationalTelephonyServiceUsage" type="NationalTelephonyServiceUsage" minOccurs="0"/>
 			<xsd:element name="operatorSpecificCallDetails" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="trunkGroupIDs" type="TrunkGroupIDs" minOccurs="0"/>
+			<xsd:element name="interOperatorIDs" type="InterOperatorIDs" minOccurs="0"/>
+			<xsd:element name="transitIOIList" type="xsd:string" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -1755,6 +1772,8 @@
 			<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
 			<xsd:element name="sourceServerName" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="destinationServerName" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="clientPort" type="xsd:integer" minOccurs="0"/>
+			<xsd:element name="serverPort" type="xsd:integer" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -1773,6 +1792,8 @@
 						<xsd:element name="deleteMsg" type="NULL"/>
 						<xsd:element name="addMsg" type="NULL"/>
 						<xsd:element name="editMsg" type="NULL"/>
+						<xsd:element name="sendMsg" type="NULL"/>
+						<xsd:element name="forwardMsg" type="NULL"/>
 					</xsd:choice>
 				</xsd:complexType>
 			</xsd:element>
@@ -1796,6 +1817,8 @@
 			<xsd:element name="clientID" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="serverID" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
+			<xsd:element name="clientPort" type="xsd:integer" minOccurs="0"/>
+			<xsd:element name="serverPort" type="xsd:integer" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -2157,6 +2180,7 @@
 			<xsd:element name="accessPointIPAddress" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="accessPointAdditionalDescriptions" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="accessPointAdditionalProviders" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="hotspotName" type="xsd:string" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -2868,6 +2892,9 @@
 			<xsd:element name="reason" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="smsInformation" type="SmsInformation" minOccurs="0"/>
 			<xsd:element name="mmsInformation" type="MmsInformation" minOccurs="0"/>
+			<xsd:element name="trunkGroupIDs" type="TrunkGroupIDs" minOccurs="0"/>
+			<xsd:element name="interOperatorIDs" type="InterOperatorIDs" minOccurs="0"/>
+			<xsd:element name="transitIOIList" type="xsd:string" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
-- 
GitLab


From 7b2937be2d4ad26916dca8d24eaae9d72e5e73f3 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 21 Oct 2021 09:13:20 +0200
Subject: [PATCH 04/10] Updated RDMessage.asn based on comments received during
 TC LI #58-e.

---
 102657/RDMessage.asn | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index ef43546..d2d6924 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
@@ -841,8 +841,7 @@ TelephonyServiceUsage ::= SEQUENCE
 		-- CSP specific value which indicates the nature of a call
 		-- (e.g. "CallIndicator: GPR, CallActionCode: 2")
 	trunkGroupIDs					[12] TrunkGroupIDs OPTIONAL,
-	interOperatorIDs				[13] InterOperatorIDs OPTIONAL,
-	transitIOIList					[14] UTF8String OPTIONAL
+	interOperatorIDs				[13] InterOperatorIDs OPTIONAL
 }
 
 NationalTelephonyServiceUsage ::= SEQUENCE
@@ -1162,15 +1161,21 @@ TelephonyPartyRole ::= ENUMERATED
 
 TrunkGroupIDs ::= SEQUENCE
 {
-	incomingTrunkGroupID	[1] UTF8String OPTIONAL,
-	outgoingTrunkGroupID	[2] UTF8String OPTIONAL,
+	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
 {
-	originatingIOI		[1] UTF8String OPTIONAL,
-	terminatingIOI		[2] UTF8String OPTIONAL,
+	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].
 	...
 }
 
@@ -1696,8 +1701,8 @@ MsgTransmission ::= SEQUENCE
 	messageID				[10] MessageID OPTIONAL,
 	sourceServerName		[11] UTF8String OPTIONAL,
 	destinationServerName	[12] UTF8String OPTIONAL,
-	clientPort				[13] INTEGER (0..65535) OPTIONAL,
-	serverPort				[14] INTEGER (0..65535) OPTIONAL
+	clientPort				[13] IPPort OPTIONAL,
+	serverPort				[14] IPPort OPTIONAL
 }
 
 MsgStoreOperation ::= SEQUENCE
@@ -1740,8 +1745,8 @@ MsgStoreOperation ::= SEQUENCE
 	serverID		[9] IPAddress OPTIONAL,
 	...,
 	messageID		[10] MessageID OPTIONAL,
-	clientPort		[11] INTEGER (0..65535) OPTIONAL,
-	serverPort		[12] INTEGER (0..65535) OPTIONAL
+	clientPort		[11] IPPort OPTIONAL,
+	serverPort		[12] IPPort OPTIONAL
 }
 
 MessageID ::= UTF8String
@@ -1956,8 +1961,7 @@ MultimediaServiceUsage ::= SEQUENCE
 	smsInformation				[23] SmsInformation OPTIONAL,
 	mmsInformation				[24] MmsInformation OPTIONAL,
 	trunkGroupIDs				[25] TrunkGroupIDs OPTIONAL,
-	interOperatorIDs			[26] InterOperatorIDs OPTIONAL,
-	transitIOIList				[27] UTF8String OPTIONAL
+	interOperatorIDs			[26] InterOperatorIDs OPTIONAL
 }
 
 MultimediaPartyInformation ::= SEQUENCE
@@ -2434,7 +2438,10 @@ WifiInformation ::= SEQUENCE
 	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
-	hotspotName							[10] UTF8String OPTIONAL
+	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
@@ -2816,6 +2823,8 @@ IPAddress ::= CHOICE
 	...
 }
 
+IPPort ::= INTEGER (0..65535)
+
 NAAssignedAddress ::= SEQUENCE
 {
 	addressSetOrRangeOrMask		[1] IPAddressSetOrRangeOrMask OPTIONAL,
-- 
GitLab


From d1f8cf2f01c2a0b675994790419c7441f1229fe9 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 21 Oct 2021 09:15:28 +0200
Subject: [PATCH 05/10] Updated RDMessage.xsd based on comments received during
 TC LI #58-e.

---
 102657/RDMessage.xsd | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 0b6784d..64e031d 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.27.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.27.1#/RetainedData" elementFormDefault="qualified">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.28.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.28.1#/RetainedData" elementFormDefault="qualified">
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-            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
         </xsd:documentation>
 	</xsd:annotation>
 	<xsd:simpleType name="GeneralizedTime">
@@ -232,8 +232,9 @@
 	</xsd:complexType>
 	<xsd:complexType name="InterOperatorIDs">
 		<xsd:sequence>
-			<xsd:element name="originatingIOI" type="xsd:string" minOccurs="0"/>
-			<xsd:element name="terminatingIOI" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="originatingInterOperatorID" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="terminatingInterOperatorID" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="transitInterOperatorIDList" type="xsd:string" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -363,6 +364,9 @@
 			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:choice>
 	</xsd:complexType>
+	<xsd:simpleType name="IPPort">
+		<xsd:restriction base="xsd:integer"/>
+	</xsd:simpleType>
 	<xsd:complexType name="IPRange">
 		<xsd:sequence>
 			<xsd:element name="prefix" type="IPAddress"/>
@@ -1105,7 +1109,6 @@
 			<xsd:element name="operatorSpecificCallDetails" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="trunkGroupIDs" type="TrunkGroupIDs" minOccurs="0"/>
 			<xsd:element name="interOperatorIDs" type="InterOperatorIDs" minOccurs="0"/>
-			<xsd:element name="transitIOIList" type="xsd:string" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -1772,8 +1775,8 @@
 			<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
 			<xsd:element name="sourceServerName" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="destinationServerName" type="xsd:string" minOccurs="0"/>
-			<xsd:element name="clientPort" type="xsd:integer" minOccurs="0"/>
-			<xsd:element name="serverPort" type="xsd:integer" minOccurs="0"/>
+			<xsd:element name="clientPort" type="IPPort" minOccurs="0"/>
+			<xsd:element name="serverPort" type="IPPort" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -1817,8 +1820,8 @@
 			<xsd:element name="clientID" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="serverID" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
-			<xsd:element name="clientPort" type="xsd:integer" minOccurs="0"/>
-			<xsd:element name="serverPort" type="xsd:integer" minOccurs="0"/>
+			<xsd:element name="clientPort" type="IPPort" minOccurs="0"/>
+			<xsd:element name="serverPort" type="IPPort" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -2180,7 +2183,7 @@
 			<xsd:element name="accessPointIPAddress" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="accessPointAdditionalDescriptions" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="accessPointAdditionalProviders" type="xsd:string" minOccurs="0"/>
-			<xsd:element name="hotspotName" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="cSPDefinedName" type="xsd:string" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -2894,7 +2897,6 @@
 			<xsd:element name="mmsInformation" type="MmsInformation" minOccurs="0"/>
 			<xsd:element name="trunkGroupIDs" type="TrunkGroupIDs" minOccurs="0"/>
 			<xsd:element name="interOperatorIDs" type="InterOperatorIDs" minOccurs="0"/>
-			<xsd:element name="transitIOIList" type="xsd:string" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
-- 
GitLab


From 2a4442f46de0c83c1be3b18d69da6d30f444f337 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 21 Oct 2021 12:14:05 +0200
Subject: [PATCH 06/10] Update RDMessage.asn

---
 102657/RDMessage.asn | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index d2d6924..d6edcc4 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -1701,8 +1701,8 @@ MsgTransmission ::= SEQUENCE
 	messageID				[10] MessageID OPTIONAL,
 	sourceServerName		[11] UTF8String OPTIONAL,
 	destinationServerName	[12] UTF8String OPTIONAL,
-	clientPort				[13] IPPort OPTIONAL,
-	serverPort				[14] IPPort OPTIONAL
+	clientPort				[13] Port OPTIONAL,
+	serverPort				[14] Port OPTIONAL
 }
 
 MsgStoreOperation ::= SEQUENCE
@@ -1745,8 +1745,8 @@ MsgStoreOperation ::= SEQUENCE
 	serverID		[9] IPAddress OPTIONAL,
 	...,
 	messageID		[10] MessageID OPTIONAL,
-	clientPort		[11] IPPort OPTIONAL,
-	serverPort		[12] IPPort OPTIONAL
+	clientPort		[11] Port OPTIONAL,
+	serverPort		[12] Port OPTIONAL
 }
 
 MessageID ::= UTF8String
@@ -2438,7 +2438,7 @@ WifiInformation ::= SEQUENCE
 	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
+	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.
@@ -2823,7 +2823,15 @@ IPAddress ::= CHOICE
 	...
 }
 
-IPPort ::= INTEGER (0..65535)
+Port ::= CHOICE
+{ 
+	tCPPort	[0] TCPPort,
+	uDPPort	[1] UDPPort
+}
+
+TCPPort ::= INTEGER (1..65535)
+
+UDPPort ::= INTEGER (0..65535)
 
 NAAssignedAddress ::= SEQUENCE
 {
-- 
GitLab


From a348871e6e317644395f2d2cae80d8d56c3a4172 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 21 Oct 2021 12:15:18 +0200
Subject: [PATCH 07/10] Update RDMessage.xsd

---
 102657/RDMessage.xsd | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 64e031d..870e6c4 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -364,9 +364,24 @@
 			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:choice>
 	</xsd:complexType>
-	<xsd:simpleType name="IPPort">
-		<xsd:restriction base="xsd:integer"/>
+	<xsd:complexType name="Port"> 
+		<xsd:choice> 
+			<xsd:element name="TCPPort" type="TCPPort"/> 
+			<xsd:element name="UDPPort" type="UDPPort"/> 
+		</xsd:choice> 
+	</xsd:complexType> 
+	<xsd:simpleType name="TCPPort"> 
+		<xsd:restriction base="xsd:integer"> 
+			<xsd:minExclusive value="1"/> 
+			<xsd:maxInclusive value="65535"/> 
+		</xsd:restriction> 
 	</xsd:simpleType>
+	<xsd:simpleType name="UDPPort"> 
+		<xsd:restriction base="xsd:integer"> 
+		<xsd:minInclusive value="0"/> 
+		<xsd:maxInclusive value="65535"/> 
+		</xsd:restriction> 
+	</xsd:simpleType> 
 	<xsd:complexType name="IPRange">
 		<xsd:sequence>
 			<xsd:element name="prefix" type="IPAddress"/>
@@ -1775,8 +1790,8 @@
 			<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
 			<xsd:element name="sourceServerName" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="destinationServerName" type="xsd:string" minOccurs="0"/>
-			<xsd:element name="clientPort" type="IPPort" minOccurs="0"/>
-			<xsd:element name="serverPort" type="IPPort" minOccurs="0"/>
+			<xsd:element name="clientPort" type="Port" minOccurs="0"/>
+			<xsd:element name="serverPort" type="Port" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -1820,8 +1835,8 @@
 			<xsd:element name="clientID" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="serverID" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
-			<xsd:element name="clientPort" type="IPPort" minOccurs="0"/>
-			<xsd:element name="serverPort" type="IPPort" minOccurs="0"/>
+			<xsd:element name="clientPort" type="Port" minOccurs="0"/>
+			<xsd:element name="serverPort" type="Port" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
-- 
GitLab


From 05bb45bc74d6c0777c50a137776c2a8bc922221f Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 21 Oct 2021 16:33:24 +0200
Subject: [PATCH 08/10] Update RDMessage.asn based on TC LI #58-e meeting on
 Thursday afternoon.

---
 102657/RDMessage.asn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index d6edcc4..2f5ae31 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -1701,8 +1701,8 @@ MsgTransmission ::= SEQUENCE
 	messageID				[10] MessageID OPTIONAL,
 	sourceServerName		[11] UTF8String OPTIONAL,
 	destinationServerName	[12] UTF8String OPTIONAL,
-	clientPort				[13] Port OPTIONAL,
-	serverPort				[14] Port OPTIONAL
+	clientPort				[13] PortNumber OPTIONAL,
+	serverPort				[14] PortNumber OPTIONAL
 }
 
 MsgStoreOperation ::= SEQUENCE
@@ -1745,8 +1745,8 @@ MsgStoreOperation ::= SEQUENCE
 	serverID		[9] IPAddress OPTIONAL,
 	...,
 	messageID		[10] MessageID OPTIONAL,
-	clientPort		[11] Port OPTIONAL,
-	serverPort		[12] Port OPTIONAL
+	clientPort		[11] PortNumber OPTIONAL,
+	serverPort		[12] PortNumber OPTIONAL
 }
 
 MessageID ::= UTF8String
@@ -2823,7 +2823,7 @@ IPAddress ::= CHOICE
 	...
 }
 
-Port ::= CHOICE
+PortNumber ::= CHOICE
 { 
 	tCPPort	[0] TCPPort,
 	uDPPort	[1] UDPPort
-- 
GitLab


From d21966a2bc72d2372f3e7754113db97eb0a857c6 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 21 Oct 2021 16:35:02 +0200
Subject: [PATCH 09/10] Update RDMessage.xsd based on comments during the TC LI
 #58-e meeting on Thursday afternoon.

---
 102657/RDMessage.xsd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 870e6c4..39e5551 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -364,7 +364,7 @@
 			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:choice>
 	</xsd:complexType>
-	<xsd:complexType name="Port"> 
+	<xsd:complexType name="PortNumber"> 
 		<xsd:choice> 
 			<xsd:element name="TCPPort" type="TCPPort"/> 
 			<xsd:element name="UDPPort" type="UDPPort"/> 
@@ -1790,8 +1790,8 @@
 			<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
 			<xsd:element name="sourceServerName" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="destinationServerName" type="xsd:string" minOccurs="0"/>
-			<xsd:element name="clientPort" type="Port" minOccurs="0"/>
-			<xsd:element name="serverPort" type="Port" minOccurs="0"/>
+			<xsd:element name="clientPort" type="PortNumber" minOccurs="0"/>
+			<xsd:element name="serverPort" type="PortNumber" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -1835,8 +1835,8 @@
 			<xsd:element name="clientID" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="serverID" type="IPAddress" minOccurs="0"/>
 			<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
-			<xsd:element name="clientPort" type="Port" minOccurs="0"/>
-			<xsd:element name="serverPort" type="Port" minOccurs="0"/>
+			<xsd:element name="clientPort" type="PortNumber" minOccurs="0"/>
+			<xsd:element name="serverPort" type="PortNumber" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
-- 
GitLab


From d606893bcfc4e26680d1346cb5e5c2854c9ea0db Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 21 Oct 2021 16:43:54 +0200
Subject: [PATCH 10/10] Updated RDMessage.asn to add an extension point (...)
 to PortNumber.

---
 102657/RDMessage.asn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index 2f5ae31..f3d98eb 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -2826,7 +2826,8 @@ IPAddress ::= CHOICE
 PortNumber ::= CHOICE
 { 
 	tCPPort	[0] TCPPort,
-	uDPPort	[1] UDPPort
+	uDPPort	[1] UDPPort,
+	...
 }
 
 TCPPort ::= INTEGER (1..65535)
-- 
GitLab