Changes to IP-based classes

- TCICommonTypes: Added enumerated ExceptionID - TCIDispatcher: clarified comments for time format - Several: replaced types IpAddress with IPv6Address, IpPort with ServicePort from 16093.WEE module - Several: removed imports of IpPort and IPv6Address - TCIip: renamed SendIPv6Ping to StartIPv6Ping, added StopIPv6Ping - 16093, 16094: updates to reflect changes to StartIPv6Ping, added StopIPv6Ping - TCIip: created root classes IPv6RxRecord, IPv6TxRecord as base classes for IP-based messages
certificationoperatingcouncil · Aug 1, 2016 · 62bf945 · 62bf945
1 parent 68d1610
commit 62bf945
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/TCI Interface/ASN1 files.docx b/TCI Interface/ASN1 files.docx
diff --git a/TCI Interface/ASN1/TCICommonTypes.asn b/TCI Interface/ASN1/TCICommonTypes.asn
@@ -54,8 +54,13 @@ ExceptionType	::= ENUMERATED{
 Module ::= UTF8String (SIZE(0..255))
 -- Function/Module reporting an exception
 
-ExceptionId ::= INTEGER (0..65535)
--- exception numerical identifier
+ExceptionId ::= ENUMERATED {
+ critical-error (1),
+ incorrect-parameter-value (2),
+ missing-parameter (3),
+ radio-interface-unavailable (4),
+ ...	-- future exception IDs
+}
 
 ExceptionText ::= UTF8String (SIZE(0..1200))
 -- short description of exception
@@ -108,8 +113,8 @@ Time64 ::= INTEGER (0..9223372036854775807)
 -- due to ASN.1 limitation in OSS, the highest bit is set to 0
 
 Psid ::= VarLengthNumber
-IpAddress ::= UTF8String(SIZE(2..255)) -- text string containing IPv6 (or IPv4 or hostname). Used as a parameter in WSA, IPv6 configuration, etc
-IpPort ::= INTEGER(0..65535)		-- UDP port used in WSA, in SetInitialState
+--IpAddress ::= UTF8String(SIZE(2..255)) ---- text string containing IPv6 (or IPv4 or hostname). Used as a parameter in WSA, IPv6 configuration, etc
+--IpPort ::= INTEGER(0..65535)		---- UDP port used in WSA, in SetInitialState
 
 RepeatRate ::= INTEGER (0..255) -- Number of messages transmitted per 5sec interval; if set to 0, transmit message one time only
 

diff --git a/TCI Interface/ASN1/TCISutControl.asn b/TCI Interface/ASN1/TCISutControl.asn
@@ -3,8 +3,7 @@ TCI-SutControl
 DEFINITIONS AUTOMATIC TAGS ::= BEGIN
 
 IMPORTS
-Response, 
-IpPort, 
+Response,
 MsgID, 
 Exception FROM TCI-CommonTypes
 

diff --git a/TCI Interface/ASN1/TCIindication.asn b/TCI Interface/ASN1/TCIindication.asn
@@ -4,6 +4,7 @@ DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
+IPv6Address,
 ChannelNumber80211, 
 TXpower80211, 
 DataRate80211,
@@ -20,9 +21,8 @@ HashedId8,
 Exception, 
 RadioInterface, 
 Psid, 
-Time64, 
-IpPort, 
-IpAddress, 
+Time64,
+--IpAddress, 
 MsgID FROM TCI-CommonTypes
 ;
 
@@ -85,7 +85,7 @@ WsmParameters ::= SEQUENCE{	-- used in EventParams
 
 IpParameters ::= SEQUENCE{ -- used in EventParams
 	interfaceName			UTF8String(SIZE(1..255)),
-	sourceIPaddress			IpAddress,
+	sourceIPaddress			IPv6Address,
 	...
 }
 

diff --git a/TCI Interface/ASN1/TCIip.asn b/TCI Interface/ASN1/TCIip.asn
@@ -3,11 +3,9 @@ DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
-IPv6Address FROM IEEE-1609-3-WEE {iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot3(3) wee(1) version0(0)}
+IPv6Address, ServicePort FROM IEEE-1609-3-WEE {iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot3(3) wee(1) version0(0)}
 
 RepeatRate, 
---IpAddress, 
-IpPort, 
 Opaque, 
 RadioInterface FROM TCI-CommonTypes
 
@@ -31,7 +29,7 @@ IPv6TxRecord ::= SEQUENCE{
 	radio				RadioInterface,
 	interfaceName		UTF8String(SIZE(1..255)),
 	destIpAddress		IPv6Address,
-	destPort			IpPort OPTIONAL,
+	destPort			ServicePort OPTIONAL,
 	protocol			ENUMERATED { tcp, udp, icmp },
 	repeatRate      	RepeatRate OPTIONAL,
 	eventHandling       EventHandling  (WITH COMPONENTS {..., eventFlag }) OPTIONAL,
@@ -86,7 +84,7 @@ StopIPv6Ping ::= IPv6TxRecord (WITH COMPONENTS {
 IPv6RxRecord ::= SEQUENCE{
 	radio				RadioInterface,
 	interfaceName		UTF8String(SIZE(1..255)),
-	listenPort			IpPort,
+	listenPort			ServicePort,
 	protocol			ENUMERATED { tcp (0), udp (1) },
 	eventHandling		EventHandling (WITH COMPONENTS {..., eventFlag ({eIpv6PktRx}) }) OPTIONAL,
 	...

diff --git a/TCI Interface/Changes.txt b/TCI Interface/Changes.txt
@@ -1,3 +1,12 @@
+TCI_20160801
+- TCICommonTypes: Added enumerated ExceptionID 
+- TCIDispatcher: clarified comments for time format
+- Several: replaced types IpAddress with IPv6Address, IpPort with ServicePort from 16093.WEE module
+- Several: removed imports of IpPort and IPv6Address
+- TCIip: renamed SendIPv6Ping to StartIPv6Ping, added StopIPv6Ping
+- 16093, 16094: updates to reflect changes to StartIPv6Ping, added StopIPv6Ping
+- TCIip: created root classes IPv6RxRecord, IPv6TxRecord as base classes for IP-based messages
+
 TCI 20160406
 - 16094: defined Dot4SetWsmTxInfo, Dot4StartWsmTx.
 - 80211: defined Dot11SetWsmTxInfo, Dot11StartWsmTx. Added SetWsmTxInfo to the list of messages.