Commit 67a16d9b authored by garciay's avatar garciay
Browse files

Merge STF455 staff

parent 456f299c
Loading
Loading
Loading
Loading
+61 −44
Changes for asn1/CALMfntp/CALMfntp.asn: 61 added lines, 44 removed lines.
Original line number Original line Diff line number Diff line
--<OSS.PDU>-- 
CALMfntp { iso (1) standard (0) calm-nonip(29281) fntp(1) asnm-1 (1)}  
CALMfntp { iso (1) standard (0) calm-nonip(29281) fntp(2) version1 (1)}  


DEFINITIONS AUTOMATIC TAGS::=BEGIN
DEFINITIONS AUTOMATIC TAGS::=BEGIN


IMPORTS
IMPORTS


CIstatus, Link-ID, UserPriority FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) version1(1)}
CIstatus, Link-ID, UserPriority FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) asnm-1(1)}


ITS-scuId FROM CALMmanagement { iso (1) standard (0) calm-management (24102) local (1) version1 (1)}
ITS-scuId FROM CALMmanagement { iso (1) standard (0) calm-management (24102) local (1) asnm-1 (1)}


NTtimeout FROM CALMfsap { iso (1) standard (0) calm-management (24102) fsap (5) version1 (1)}
COMMUPDOWN FROM CALMmsap { iso (1) standard (0) calm-management (24102) msap (3) asnm-1 (1)}


FNTPlpp FROM CALMlegacySupport { iso (1) standard (0) calm-nonip(29281) legacy (2) asnm-1 (1)} 


FNTPlpp FROM CALMlegacySupport { iso (1) standard (0) calm-nonip(29281) legacy (3) version1 (1)} 
ServiceRef FROM CITSapplReq {iso(1) standard(0) cits-applReq (17423) asnm-1 (1)}

;
;


-- End of IMPORTS
-- End of IMPORTS
@@ -39,11 +38,11 @@ FntpOptions::=SEQUENCE{
	intForw	FNTPintForwarding OPTIONAL,
	intForw	FNTPintForwarding OPTIONAL,
	sec	FNTPsecurity OPTIONAL,
	sec	FNTPsecurity OPTIONAL,
	hops	FNTPhopCount OPTIONAL,
	hops	FNTPhopCount OPTIONAL,
	opt4	NULL OPTIONAL,
	lpp	FNTPlpp OPTIONAL,
	cip	FNTPCIPheader OPTIONAL,
	opt5	NULL OPTIONAL,
	opt5	NULL OPTIONAL,
	opt6	NULL OPTIONAL,
	opt6	NULL OPTIONAL,
	lpp	FNTPlpp OPTIONAL,
	opt7	NULL OPTIONAL
	cip	FNTPCIPheader OPTIONAL
}
}


FNTPintForwarding::=SEQUENCE{
FNTPintForwarding::=SEQUENCE{
@@ -56,7 +55,7 @@ FNTPintForwarding::=SEQUENCE{


FNTPpacketCounter::=INTEGER(0..255)
FNTPpacketCounter::=INTEGER(0..255)


FNTPsecurity::=OCTET STRING
FNTPsecurity::=OCTET STRING (SIZE(0..65535))


FNTPhopCount::=INTEGER(0..255)
FNTPhopCount::=INTEGER(0..255)


@@ -117,55 +116,68 @@ SetNotFNTP::=SEQUENCE{
	}
	}


UpdateFNTP::=SEQUENCE{
UpdateFNTP::=SEQUENCE{
	reference	[1] INTEGER(0..noFNTPfwtEntries),
	fill	BIT STRING (SIZE(1)),
	remotePort	[2] PortNumber OPTIONAL,
	reference	INTEGER(0..noFNTPfwtEntries),
	linkID	[3] Link-ID OPTIONAL,
	remotePort	PortNumber OPTIONAL,
	ciStatus	[4] CIstatus OPTIONAL,
	linkID	Link-ID OPTIONAL,
	linkPort	[5] PortNumber OPTIONAL,
	ciStatus	CIstatus OPTIONAL,
	serviceInfo	[6] HostServiceInfo OPTIONAL,
	linkPort	PortNumber OPTIONAL,
	priority	[7] UserPriority OPTIONAL,
	serviceInfo	HostServiceInfo OPTIONAL,
	timeout	[8] NTtimeout OPTIONAL
	priority	UserPriority OPTIONAL,
	timeout	NTtimeout OPTIONAL
	}
	}


UpdateNotFNTP::=SEQUENCE{
UpdateNotFNTP::=SEQUENCE{
	reference	[1] INTEGER(0..noFNTPfwtEntries),
	fill	BIT STRING (SIZE(1)),
	remotePort	[2] PortNumber OPTIONAL,
	reference	INTEGER(0..noFNTPfwtEntries),
	linkID	[3] Link-ID OPTIONAL,
	remotePort	PortNumber OPTIONAL,
	ciStatus	[4] CIstatus OPTIONAL,
	linkID	Link-ID OPTIONAL,
	linkPort	[5] PortNumber OPTIONAL,
	ciStatus	CIstatus OPTIONAL,
	serviceInfo	[6] HostServiceInfo OPTIONAL,
	linkPort	PortNumber OPTIONAL,
	priority	[7] UserPriority OPTIONAL,
	serviceInfo	HostServiceInfo OPTIONAL,
	timeout	[8] NTtimeout OPTIONAL
	priority	UserPriority OPTIONAL,
	timeout	NTtimeout OPTIONAL
	}
	}


  -- NF-SAP --
  -- NF-SAP --


NFSAP ::= COMMUPDOWN

NFsapPrimitivesDown::=SEQUENCE{
NFsapPrimitivesDown::=SEQUENCE{
	fill	BIT STRING (SIZE(7)),
	spRef	NFSAP.&primitiveRef ({NFsapspsdown}),
	primitivesDown	CHOICE{
	servPrimitive	NFSAP.&Primitive({NFsapspsdown}{@spRef})
	fntpPortRequest	NFfntpPortRequest,
	fntpCommRequest	NFfntpCommRequest
	}
	}
	}


NFsapspsdown NFSAP::={fntpPortRequest | fntpCommRequest, ...}

fntpPortRequest	NFSAP::={&primitiveRef 0, &Primitive NFfntpPortRequest}
fntpCommRequest	NFSAP::={&primitiveRef 1, &Primitive NFfntpCommRequest}

NFsapPrimitivesUp::=SEQUENCE{
NFsapPrimitivesUp::=SEQUENCE{
	fill	BIT STRING (SIZE(6)),
	spRef	NFSAP.&primitiveRef ({NFsapspsup}),
	primitivesUp	CHOICE{
	servPrimitive	NFSAP.&Primitive({NFsapspsup}{@spRef})
	fntpPortConfirm	NFfntpPortConfirm,
	fntpCommConfirm	NFfntpCommConfirm,
	fntpCommIndication	NFfntpCommIndication
	}
	}
	}


NFsapspsup NFSAP::={fntpPortConfirm | fntpCommConfirm | fntpCommIndication, ...}

fntpPortConfirm	NFSAP::={&primitiveRef 0, &Primitive NFfntpPortConfirm}
fntpCommConfirm	NFSAP::={&primitiveRef 1, &Primitive NFfntpCommConfirm}
fntpCommIndication	NFSAP::={&primitiveRef 2, &Primitive NFfntpCommIndication}

PortOp::=INTEGER{
     delete   (0),
     create   (255)
     } (0..255)

NFfntpPortRequest::=SEQUENCE{
NFfntpPortRequest::=SEQUENCE{
	serviceRef	INTEGER,
	serviceRef	ServiceRef,
	operation	BOOLEAN,
	operation	PortOp,
	port	PortNumber,
	portno	PortNumber,
	priority	UserPriority
	priority	UserPriority
	}
	}


NFfntpPortConfirm::=SEQUENCE{
NFfntpPortConfirm::=SEQUENCE{
	serviceRef	INTEGER,
	serviceRef	ServiceRef,
	servicePort	PortNumber
	servicePort	PortNumber
	}
	}


@@ -209,10 +221,15 @@ PortNumber::=CHOICE{
	portLong	INTEGER(0..32767)
	portLong	INTEGER(0..32767)
	}
	}


-- ITSfpdu as defined by application. Details not known to FNTP
ITSfpdu::=OCTET STRING(SIZE(0..65535)) -- as defined by application. Details not known to FNTP
ITSfpdu::=OCTET STRING


NTtimeout::=INTEGER(0..65535) -- in s

-- Values
-- Values


noFNTPfwtEntries	INTEGER::=65535
noFNTPfwtEntries	INTEGER::=65535




END
END
+2 −2
Changes for asn1/CALMfntp/CALMlegacySupport.asn: 2 added lines, 2 removed lines.
Original line number Original line Diff line number Diff line
CALMlegacySupport { iso (1) standard (0) calm-nonip(29281) legacy (3) version1 (1)}  
CALMlegacySupport { iso (1) standard (0) calm-nonip(29281) legacy (2) asnm-1 (1)}  


DEFINITIONS AUTOMATIC TAGS::=BEGIN
DEFINITIONS AUTOMATIC TAGS::=BEGIN


IMPORTS
IMPORTS
PortNumber FROM CALMfntp { iso (1) standard (0) calm-nonip(29281) fntp(2) version1 (1)} 
PortNumber FROM CALMfntp { iso (1) standard (0) calm-nonip(29281) fntp(1) asnm-1 (1)} 
;
;


-- End of IMPORTS
-- End of IMPORTS
+17 −21
Changes for asn1/CALMfsap/CALMfsap.asn: 17 added lines, 21 removed lines.
Original line number Original line Diff line number Diff line
--<OSS.PDU>-- 
CALMfsap { iso (1) standard (0) calm-management (24102) fsap (5) asnm-1 (1)} 
CALMfsap { iso (1) standard (0) calm-management (24102) fsap (5) version1 (1)} 


DEFINITIONS AUTOMATIC TAGS::=BEGIN
DEFINITIONS AUTOMATIC TAGS::=BEGIN


IMPORTS
IMPORTS


ITSaid FROM CITSapplMgmtApplReg {iso(1) standard(0) cits-applMgmt (17419) applRegistry (2) version1 (1)}
ITSaid FROM CITSapplMgmtApplReg {iso(1) standard(0) cits-applMgmt (17419) applRegistry (2)}


PortNumber FROM CALMfntp { iso (1) standard (0) calm-nonip(29281) fntp(2) version1 (1)}
PortNumber FROM CALMfntp { iso (1) standard (0) calm-nonip(29281) fntp(1) asnm-1(1)}


Directivity, LLserviceAddr, MedType, UserPriority FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) version1(1)} 
Directivity, LLserviceAddr, MedType, UserPriority FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) asnm-1(1)} 


ITS-scuId, StationID FROM CALMmanagement { iso (1) standard (0) calm-management (24102) local (1) version1 (1)}
ApplicationID, ITS-scuId, StationID FROM CALMmanagement { iso (1) standard (0) calm-management (24102) local (1) asnm-1(1)}


TransportAddressType, TransportAddress FROM TRANSPORT-ADDRESS-MIB
TransportAddressType, TransportAddress FROM TRANSPORT-ADDRESS-MIB


@@ -106,11 +105,14 @@ GCperiodCmd::=SEQUENCE{
GCsamctx::= SEQUENCE{
GCsamctx::= SEQUENCE{
	applicationID	ApplicationID, -- unique in the host
	applicationID	ApplicationID, -- unique in the host
	serverID	StationID, -- of peer station
	serverID	StationID, -- of peer station
	serviceInfo	ServiceInfo
	serviceInfo	ServiceInfo,
	link	LLserviceAddr
	}
	}


GCsamctxConf::= SEQUENCE{
GCsamctxConf::= SEQUENCE{
    port        PortNumber
	applicationID ApplicationID, -- unique in the host
	link	LLserviceAddr, -- as received in the GCsamctx
	port	PortNumber -- dynamically assigned port number to be used in CTX
	}
	}


GCdeleteCmd::=SEQUENCE{
GCdeleteCmd::=SEQUENCE{
@@ -150,7 +152,8 @@ SAMrxNot::=SEQUENCE{
GCsam::= SEQUENCE{
GCsam::= SEQUENCE{
	applicationID	ApplicationID,  -- unique in the host
	applicationID	ApplicationID,  -- unique in the host
	serverID	StationID,  -- peer station
	serverID	StationID,  -- peer station
	serviceData	SAMserviceData
	serviceData	SAMserviceData,
	link	LLserviceAddr
}
}


SAMserviceData::=SEQUENCE{
SAMserviceData::=SEQUENCE{
@@ -164,13 +167,15 @@ SAMserviceData::=SEQUENCE{
NonipSAM::=SEQUENCE{
NonipSAM::=SEQUENCE{
	serviceID	ITSaid,
	serviceID	ITSaid,
	serviceData	ServiceData,
	serviceData	ServiceData,
	providerPort	PortNumber 
	providerPort	PortNumber, 
	sessionChannel	SessionChannel
}
}


IpSAM::=SEQUENCE{
IpSAM::=SEQUENCE{
	serviceID	ITSaid,
	serviceID	ITSaid,
	serviceData	IpServiceData,
	serviceData	IpServiceData,
	ipInfo	IpInfo
	ipInfo	IpInfo,
	sessionChannel	SessionChannel
	}
	}


GCctx::= SEQUENCE{
GCctx::= SEQUENCE{
@@ -254,12 +259,6 @@ GCderegClientConf::= SEQUENCE{




-- General types --
-- General types --

ApplicationID::=SEQUENCE{
	hostITS-scuId	ITS-scuId,
	seqNumber	INTEGER(0..65535) -- unique in the ITS-SCU (host)
	}

ServiceData::=OCTET STRING (SIZE(0..noServiceDataOctets))
ServiceData::=OCTET STRING (SIZE(0..noServiceDataOctets))


ContextData::=OCTET STRING (SIZE(0..noContextDataOctets))
ContextData::=OCTET STRING (SIZE(0..noContextDataOctets))
@@ -286,7 +285,6 @@ ServiceDataReg::= SEQUENCE{


NonipServiceReg::=SEQUENCE{
NonipServiceReg::=SEQUENCE{
	serviceID	ITSaid,
	serviceID	ITSaid,
	timeout	NTtimeout, -- formerly named FASTtimeout
	serviceData	OCTET STRING (SIZE(0..noServiceDataOctets)),
	serviceData	OCTET STRING (SIZE(0..noServiceDataOctets)),
	providerPort	PortNumber -- if not used, put PORT_UNK
	providerPort	PortNumber -- if not used, put PORT_UNK
}
}
@@ -299,8 +297,6 @@ IpServiceReg::=SEQUENCE{


GcInterval::=INTEGER(0..65535) -- in ms
GcInterval::=INTEGER(0..65535) -- in ms


NTtimeout::=INTEGER(0..65535) -- in s

IpInfo::=SEQUENCE{
IpInfo::=SEQUENCE{
	address	IpAddressInfo
	address	IpAddressInfo
	}
	}
@@ -333,5 +329,5 @@ noIpContextDataOctets INTEGER::=65535


versionNoFSAP INTEGER::=0 -- This standard
versionNoFSAP INTEGER::=0 -- This standard


END


END
+290 −44
Changes for asn1/CALMiitsscu/CALMiitsscu.asn: 290 added lines, 44 removed lines.
Original line number Original line Diff line number Diff line
--<OSS.PDU>-- 
--<OSS.PDU>-- 
CALMiitsscu { iso (1) standard (0) calm-management (24102) iitsscu (4) version1 (1)} 


CALMiitsscu { iso (1) standard (0) calm-management (24102) iitsscu (4) asnm-1 (1) version1 (1)} 
DEFINITIONS AUTOMATIC TAGS::=BEGIN
DEFINITIONS AUTOMATIC TAGS::=BEGIN


IMPORTS
IMPORTS
CIaClass, CIclass, CIstatus, Directivity, Link-ID, LLserviceAddr, MACaddress, MedType, NullType FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) asnm-1 (1) version1 (1)} 


CIaClass, CIclass, CIstatus, Directivity, Link-ID, LLserviceAddr, MACaddress, MedType FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) version1(1)} 
ITS-scuId, Param24102No, Param24102 FROM CALMmanagement { iso (1) standard (0) calm-management (24102) local (1) asnm-1 (1) version1 (1)}


ITS-scuId, Param24102No, Param24102 FROM CALMmanagement { iso (1) standard (0) calm-management (24102) local (1) version1 (1)}
SimFUTcmd, SimFUTreq, SimFLTcmd, SimNUTcmd, SimNLTcmd, SimIUTcmd, SimFLTreq, SimNUTreq, SimNLTreq, SimIUTreq, ErrStatus, MF-Command-request, MF-Request-request, MN-Command-request, MN-Request-request, MI-Command-request, MI-Request-request, MA-Command-request, MA-Request-request, MS-Command-request, MS-Request-request, MI-Get-request, MI-Set-request, MF-Command-confirm, MF-Request-confirm, MN-Command-confirm, MN-Request-confirm, MI-Command-confirm, MI-Request-confirm, MA-Command-confirm, MA-Request-confirm, MS-Command-confirm, MS-Request-confirm, MI-Get-confirm, MI-Set-confirm FROM CALMmsap {iso (1) standard (0) calm-management (24102) msap (3) asnm-1 (1) version1 (1)} 

ErrStatus, MF-Command-request, MF-Request-request, MN-Command-request, MN-Request-request, MI-Command-request, MI-Request-request, MI-Get-request, MI-Set-request, MF-Command-confirm, MF-Request-confirm, MN-Command-confirm, MN-Request-confirm, MI-Command-confirm, MI-Request-confirm, MI-Get-confirm, MI-Set-confirm FROM CALMmsap {iso (1) standard (0) calm-management (24102) msap (3) version1 (1)} 


-- Details on SecRq and SecRs to be provided by a standard on security
-- Details on SecRq and SecRs to be provided by a standard on security
;
;

-- End of IMPORTS
-- End of IMPORTS


-- Types
-- Types


-- PDUs --
-- PDUs --
-- IIC-Request PDU
IIC-Request::=SEQUENCE{
IIC-Request::=SEQUENCE{
	sourceITS-scuId	ITS-scuId,
	sourceITS-scuId	ITS-scuId,
	destinationITS-scuId	ITS-scuId,
	destinationITS-scuId	ITS-scuId,
	pduCounter	PduCounter,
	pduCounter	PduCounter,
	requestID	RequestID, -- value zero
	pduRequest	PduRequest,
	pduRequest	PduRequest,
	seqRq	SecRq
	secRq	SecRq
	}
	}


SecRq::=OCTET STRING (SIZE(0..65535))
RequestID::=INTEGER{
	request	(0)
	} (0..255)


PduRequest::=SEQUENCE{
RefIICP ::= INTEGER { -- Define IICPREQ.ref values range
	fill	BIT STRING (SIZE(4)),
	c-alive       (0),
	requests	CHOICE{
	c-mfRcmd      (1),
	alive	ITS-SCUalive,
	c-mfRreq      (2),
	mf-rcmd	MF-Command-request,
	c-mnRcmd      (3),
	mf-rreq	MF-Request-request,
	c-mnRreq      (4),
	mn-rcmd	MN-Command-request,
	c-miRcmd      (5),
	mn-rreq	MN-Request-request,
	c-miRreq      (6),
	mi-rcmd	MI-Command-request,
	c-miRget      (7),
	mi-rreq	MI-Request-request,
	c-miRset      (8),
	mi-rget	MI-Get-request,
	c-mCmd        (9),
	mi-rset	MI-Set-request,
	c-maRcmd      (10),
	vCI-info	VCI-info-req,
	c-maRreq      (11), 
	vCI-update	VCI-update-req,
	c-msRcmd      (12), 
	get-param24102	Param24102No,
	c-msRreq      (13),
	set-param24102	Param24102
	c-simUtIn		(240),
	c-simUtOut	(241),
	c-simAutCmd	(242),
	c-simAutReq	(243),
	c-simFutCmd   (244),
	c-simFutReq   (245),
	c-simNutCmd   (246),
	c-simNutReq   (247),
	c-simIutCmd   (248),
	c-simIutReq   (249),
	c-simAltCmd	(250),
	c-simAltReq	(251),
	c-simFltCmd   (252),
	c-simFltReq   (253),
	c-simNltCmd   (254),
	c-simNltReq   (255)
} (0..255)

IICPREQ::=CLASS{
	&ref	RefIICP UNIQUE, -- data type identifier
	&IICPrequest
	}
	}

IICPrequests IICPREQ::={aliveRq | mfRcmdRq | mfRreqRq | mnRcmdRq | mnRreqRq | miRcmdRq | miRreqRq | miRgetRq | miRsetRq | mCmdRq | maRcmdRq | maRreqRq | msRcmdRq | msRreqRq | simFutCmdRq | simFutReqRq | simNutCmdRq | simNutReqRq | simIutCmdRq | simIutReqRq | simFltCmdRq | simFltReqRq | simNltCmdRq | simNltReqRq | simUtInRq | simUtOutRq, ...}

PduRequest::=SEQUENCE{
	reqRef	IICPREQ.&ref({IICPrequests}), -- data type identifier
	iicpReq	IICPREQ.&IICPrequest({IICPrequests}{@reqRef})
	}
	}


aliveRq		IICPREQ::={&ref c-alive, &IICPrequest ITS-SCUalive}
mfRcmdRq	IICPREQ::={&ref c-mfRcmd, &IICPrequest MF-Command-request}
mfRreqRq	IICPREQ::={&ref c-mfRreq, &IICPrequest MF-Request-request}
mnRcmdRq	IICPREQ::={&ref c-mnRcmd, &IICPrequest MN-Command-request}
mnRreqRq	IICPREQ::={&ref c-mnRreq, &IICPrequest MN-Request-request}
miRcmdRq	IICPREQ::={&ref c-miRcmd, &IICPrequest MI-Command-request}
miRreqRq	IICPREQ::={&ref c-miRreq, &IICPrequest MI-Request-request}
miRgetRq	IICPREQ::={&ref c-miRget, &IICPrequest MI-Get-request}
miRsetRq	IICPREQ::={&ref c-miRset, &IICPrequest MI-Set-request}
mCmdRq		IICPREQ::={&ref c-mCmd, &IICPrequest McmdRq}
maRcmdRq	IICPREQ::={&ref c-maRcmd, &IICPrequest MA-Command-request}
maRreqRq	IICPREQ::={&ref c-maRreq, &IICPrequest MA-Request-request}
msRcmdRq	IICPREQ::={&ref c-msRcmd, &IICPrequest MS-Command-request}
msRreqRq	IICPREQ::={&ref c-msRreq, &IICPrequest MS-Request-request}
-- simAutCmdRq	IICPREQ::={&ref c-simAutCmd, &IICPrequest SimAUTcmd}
-- simAutReqRq	IICPREQ::={&ref c-simAutReq, &IICPrequest SimAUTreq}
simFutCmdRq	IICPREQ::={&ref c-simFutCmd, &IICPrequest SimFUTcmd}
simFutReqRq	IICPREQ::={&ref c-simFutReq, &IICPrequest SimFUTreq}
simNutCmdRq	IICPREQ::={&ref c-simNutCmd, &IICPrequest SimNUTcmd}
simNutReqRq	IICPREQ::={&ref c-simNutReq, &IICPrequest SimNUTreq}
simIutCmdRq	IICPREQ::={&ref c-simIutCmd, &IICPrequest SimIUTcmd}
simIutReqRq	IICPREQ::={&ref c-simIutReq, &IICPrequest SimIUTreq}
-- simAltCmdRq	IICPREQ::={&ref c-simAltCmd, &IICPrequest SimALTcmd}
-- simAltReqRq	IICPREQ::={&ref c-simAltReq, &IICPrequest SimALTreq}
simFltCmdRq	IICPREQ::={&ref c-simFltCmd, &IICPrequest SimFLTcmd}
simFltReqRq	IICPREQ::={&ref c-simFltReq, &IICPrequest SimFLTreq}
simNltCmdRq	IICPREQ::={&ref c-simNltCmd, &IICPrequest SimNLTcmd}
simNltReqRq	IICPREQ::={&ref c-simNltReq, &IICPrequest SimNLTreq}
simUtInRq	IICPREQ::={&ref c-simUtIn, &IICPrequest SimUt}
simUtOutRq	IICPREQ::={&ref c-simUtOut, &IICPrequest SimUt}


ITS-SCUalive::=SEQUENCE{
ITS-SCUalive::=SEQUENCE{
	message	AliveMessage,
	message	AliveMessage,
	its-scuType	ITS-SCUtype
	its-scuType	ITS-SCUtype
@@ -60,11 +120,80 @@ AliveMessage::= INTEGER{
	} (0..255)
	} (0..255)


ITS-SCUtype::= INTEGER{
ITS-SCUtype::= INTEGER{
	host (1),
    unknown (0),
	router (2),
	host (1), -- multicast address
	any (255)
	router (2), -- multicast address
	itsTestSystem (3), -- used in conformance testing
	itsTestCIunit (4), -- used in conformance testing
	any (255) -- broadcast address
	} (0..255)
	
SimUt::=SEQUENCE{
	fill	BIT STRING (SIZE(3)), -- all bits set to '0'
	action	CHOICE{
		mfCmdReq	MF-Command-request,
		mfCmdConf	MF-Command-confirm,
		mnCmdReq	MN-Command-request,
		mnCmdConf	MN-Command-confirm,
		miCmdReq	MI-Command-request,
		miCmdConf	MI-Command-confirm,
		maCmdReq	MA-Command-request,
		maCmdConf	MA-Command-confirm,
		mfReqReq	MF-Request-request,
		mfReqConf	MF-Request-confirm,
		mnReqReq	MN-Request-request,
		mnReqConf	MN-Request-confirm,
		miReqReq	MI-Request-request,
		miReqConf	MI-Request-confirm,
		maReqReq	MA-Request-request,
		maReqConf	MA-Request-confirm,
		miGetReq	MI-Get-request,
		miGetConf	MI-Get-confirm,
		miSetReq	MI-Set-request,
		miSetConf	MI-Set-confirm,
		mcmdTrigger	McmdRq,
		mcmdEvent	McmdRs
--		msCmdReq	MS-Command-request,
--		msCmdConf	MS-Command-confirm,
--		msReqReq	MS-Request-request,
--		msReqConf	MS-Request-confirm
		}
	}


-- General OBJECT CLASS for management commands

RefMcmdRq ::= INTEGER { -- allows for 256 commands
	c-pingRq           (0),
	c-vCIinfoRq        (1),
	c-vCIupdateRq      (2),
	c-getParam24102Rq  (3),
	c-setParam24102Rq  (4),
	c-testIicpRq       (254),
	c-testConfigRq     (255)
} (0..255)
} (0..255)


MCMDREQ::=CLASS{
	&refMcmd	RefMcmdRq UNIQUE, -- allows for 256 commands
	&Mcmd
	}

McmdReqs MCMDREQ::={pingRq | vCIinfoRq | vCIupdateRq | getParam24102Rq | setParam24102Rq | testConfigRq, ...}

McmdRq::=SEQUENCE{
	mCmdRef	MCMDREQ.&refMcmd({McmdReqs}),
	mcmd	MCMDREQ.&Mcmd ({McmdReqs}{@mCmdRef})
	}

pingRq	        MCMDREQ::={&refMcmd c-pingRq, &Mcmd PingIICP}
vCIinfoRq	MCMDREQ::={&refMcmd c-vCIinfoRq, &Mcmd VCI-info-req}
vCIupdateRq	MCMDREQ::={&refMcmd c-vCIupdateRq, &Mcmd VCI-update-req}
getParam24102Rq	MCMDREQ::={&refMcmd c-getParam24102Rq, &Mcmd Param24102No}
setParam24102Rq	MCMDREQ::={&refMcmd c-setParam24102Rq, &Mcmd Param24102}
testConfigRq	MCMDREQ::={&refMcmd c-testConfigRq, &Mcmd TestConfigIICP}

PingIICP::=OCTET STRING (SIZE(0..255))

VCI-info-req::=SEQUENCE{
VCI-info-req::=SEQUENCE{
	medType	MedType,
	medType	MedType,
	ciaClass	CIaClass,
	ciaClass	CIaClass,
@@ -81,36 +210,103 @@ VCI-Info::=SEQUENCE{
	status	CIstatus
	status	CIstatus
	}
	}


TestConfigIICP::=SEQUENCE{
	location	BIT STRING (SIZE(6)),
	lowerLayers	BIT STRING (SIZE(1)),
	testMode	BIT STRING (SIZE(1))
	}

	

-- IIC-Response PDU

IIC-Response::=SEQUENCE{
IIC-Response::=SEQUENCE{
	sourceITS-scuId	ITS-scuId,
	sourceITS-scuId	ITS-scuId,
	destinationITS-scuId	ITS-scuId,
	destinationITS-scuId	ITS-scuId,
	pduCounter	PduCounter,
	pduCounter	PduCounter,
	responseID	ResponseID, -- value 1
	pduResponse	PduResponse,
	pduResponse	PduResponse,
	errorStatus	PduErrStatus,
	errorStatus	PduErrStatus,
	seqRs	SecRs
	secRs	SecRs
	}
	}


SecRs::=OCTET STRING (SIZE(0..65535))
ResponseID::=INTEGER{
	response	(1)
	} (0..255)


IICPRES::=CLASS{
	&ref	RefIICP UNIQUE,
	&IICPresponse
	}

IICPresponses IICPRES::={aliveRs | mfRcmdRs | mfRreqRs | mnRcmdRs | mnRreqRs | miRcmdRs | miRreqRs | miRgetRs | miRgetRs | miRsetRs | mCmdRs | maRcmdRs | maRreqRs | msRcmdRs | msRreqRs |  simAutCmdRs | simAutReqRs | simFutCmdRs | simFutReqRs | simNutCmdRs | simNutReqRs | simIutCmdRs | simIutReqRs | simAltCmdRs | simAltReqRs | simFltCmdRs | simFltReqRs | simNltCmdRs | simNltReqRs | simUtInRs | simUtOutRs, ...}


PduResponse::=SEQUENCE{
PduResponse::=SEQUENCE{
	fill	BIT STRING (SIZE(4)),
	resRef	IICPRES.&ref({IICPresponses}), -- data type identifier
	responses	CHOICE{
	iicpRes	IICPRES.&IICPresponse({IICPresponses}{@resRef})
	alive	ITS-SCUalive,
	mf-rcmd	MF-Command-confirm,
	mf-rreq	MF-Request-confirm,
	mn-rcmd	MN-Command-confirm,
	mn-rreq	MN-Request-confirm,
	mi-rcmd	MI-Command-confirm,
	mi-rreq	MI-Request-confirm,
	mi-rget	MI-Get-confirm,
	mi-rset	MI-Set-confirm,
	vCI-info	VCI-info-res,
	vCI-update	NULL,
	get-param24102	Param24102,
	set-param24102	ErrStatus
	}
	}

aliveRs		IICPRES::={&ref c-alive, &IICPresponse ITS-SCUalive}
mfRcmdRs	IICPRES::={&ref c-mfRcmd, &IICPresponse MF-Command-confirm}
mfRreqRs	IICPRES::={&ref c-mfRreq, &IICPresponse MF-Request-confirm}
mnRcmdRs	IICPRES::={&ref c-mnRcmd, &IICPresponse MN-Command-confirm}
mnRreqRs	IICPRES::={&ref c-mnRreq, &IICPresponse MN-Request-confirm}
miRcmdRs	IICPRES::={&ref c-miRcmd, &IICPresponse MI-Command-confirm}
miRreqRs	IICPRES::={&ref c-miRreq, &IICPresponse MI-Request-confirm}
miRgetRs	IICPRES::={&ref c-miRget, &IICPresponse MI-Get-confirm}
miRsetRs	IICPRES::={&ref c-miRset, &IICPresponse MI-Set-confirm}
mCmdRs		IICPRES::={&ref c-mCmd, &IICPresponse McmdRs}
maRcmdRs	IICPRES::={&ref c-maRcmd, &IICPresponse MA-Command-confirm}
maRreqRs	IICPRES::={&ref c-maRreq, &IICPresponse MA-Request-confirm}
msRcmdRs	IICPRES::={&ref c-msRcmd, &IICPresponse MS-Command-confirm}
msRreqRs	IICPRES::={&ref c-msRreq, &IICPresponse MS-Request-confirm}
simAutCmdRs	IICPRES::={&ref c-simAutCmd, &IICPresponse NULL}
simAutReqRs	IICPRES::={&ref c-simAutReq, &IICPresponse NULL}
simFutCmdRs	IICPRES::={&ref c-simFutCmd, &IICPresponse NULL}
simFutReqRs	IICPRES::={&ref c-simFutReq, &IICPresponse NULL}
simNutCmdRs	IICPRES::={&ref c-simNutCmd, &IICPresponse NULL}
simNutReqRs	IICPRES::={&ref c-simNutReq, &IICPresponse NULL}
simIutCmdRs	IICPRES::={&ref c-simIutCmd, &IICPresponse NULL}
simIutReqRs	IICPRES::={&ref c-simIutReq, &IICPresponse NULL}
simAltCmdRs	IICPRES::={&ref c-simAltCmd, &IICPresponse NULL}
simAltReqRs	IICPRES::={&ref c-simAltReq, &IICPresponse NULL}
simFltCmdRs	IICPRES::={&ref c-simFltCmd, &IICPresponse NULL}
simFltReqRs	IICPRES::={&ref c-simFltReq, &IICPresponse NULL}
simNltReqRs	IICPRES::={&ref c-simNltReq, &IICPresponse NULL}
simNltCmdRs	IICPRES::={&ref c-simNltCmd, &IICPresponse NULL}
simUtInRs	IICPRES::={&ref c-simUtIn, &IICPresponse NULL}
simUtOutRs	IICPRES::={&ref c-simUtOut, &IICPresponse NULL}

RefMcmdRs ::= INTEGER {
	c-pingRs           (0),
	c-vCIinfoRs        (1),
	c-vCIupdateRs      (2),
	c-getParam24102Rs  (3),
	c-setParam24102Rs  (4),
	c-testIicpRs       (254),
	c-testConfigRs     (255)
} (0..255)

MCMDRES::=CLASS{
	&refMcmd	RefMcmdRs UNIQUE, 
	&Mcmd
	}
	}


McmdRess MCMDRES::={pingRs | vCIinfoRs | vCIupdateRs | getParam24102Rs | setParam24102Rs | testConfigRs, ...}

McmdRs::=SEQUENCE{
	mCmdRef	MCMDRES.&refMcmd({McmdRess}),
	mcmd	MCMDRES.&Mcmd ({McmdRess}{@mCmdRef})
	}

pingRs	        MCMDRES::={&refMcmd c-pingRs, &Mcmd PingIICP}
vCIinfoRs	MCMDRES::={&refMcmd c-vCIinfoRs, &Mcmd VCI-info-res}
vCIupdateRs	MCMDRES::={&refMcmd c-vCIupdateRs, &Mcmd NULL}
getParam24102Rs	MCMDRES::={&refMcmd c-getParam24102Rs, &Mcmd Param24102}
setParam24102Rs	MCMDRES::={&refMcmd c-setParam24102Rs, &Mcmd ErrStatus}
testConfigRs	MCMDRES::={&refMcmd c-testConfigRs, &Mcmd NullType}

PduErrStatus::=INTEGER{
PduErrStatus::=INTEGER{
	success (0),
	success (0),
	pduUnknown (1),
	pduUnknown (1),
@@ -122,6 +318,49 @@ PduErrStatus::=INTEGER{


VCI-info-res::=SEQUENCE (SIZE(0..255)) OF VCI-Info
VCI-info-res::=SEQUENCE (SIZE(0..255)) OF VCI-Info


-- SECURITY IIC_REQUEST
RefSECIICPRQ ::= INTEGER {
	c-secRqRef (0),
	c-secRq    (1)
} (0..255)

SECIICPRQ::=CLASS{
	&ref	RefSECIICPRQ UNIQUE, -- security type identifier
	&SecIICP
	}


SecIICPRQs SECIICPRQ::={noSecurityRq | octStringRq, ...}

SecRq::=SEQUENCE{
	secRqRef	SECIICPRQ.&ref({SecIICPRQs}),
	secRq	SECIICPRQ.&SecIICP({SecIICPRQs}{@secRqRef})
	}

noSecurityRq   SECIICPRQ::={&ref c-secRqRef, &SecIICP NullType}
octStringRq    SECIICPRQ::={&ref c-secRq, &SecIICP SecIICPpayload }

-- SECURITY IIC_RESPONSE
RefSECIICPRS ::= INTEGER {
	c-secRsRef (0),
	c-secRs    (1)
} (0..255)
SECIICPRS ::= CLASS{
	&ref	RefSECIICPRS UNIQUE, -- security type identifier
	&SecIICP
	}
SECIICPRSs SECIICPRS::={noSecurityRs | octStringRs, ...}


SecRs::=SEQUENCE{
	secRsRef	SECIICPRS.&ref({SECIICPRSs}),
	secRs		SECIICPRS.&SecIICP({SECIICPRSs}{@secRsRef})
	}

noSecurityRs   SECIICPRS::={&ref c-secRsRef, &SecIICP NullType}
octStringRs    SECIICPRS::={&ref c-secRs, &SecIICP SecIICPpayload }

SecIICPpayload ::= OCTET STRING (SIZE(0..65535))
-- MF-SAP --
-- MF-SAP --


-- MF-COMMANDs --
-- MF-COMMANDs --
@@ -143,4 +382,11 @@ PduCounter::=INTEGER(0..65535)


-- Values
-- Values


version INTEGER(0..255)::=2 -- version of this ASN.1 module

/*
   The ASN.1 specification has been checked for conformance to the ASN.1
   standards by OSS ASN.1 Syntax Checker, and by OSS ASN-1STEP
*/

END
END
+3 −3
Changes for asn1/CALMipv6/CALMipv6.asn: 3 added lines, 3 removed lines.
Original line number Original line Diff line number Diff line
CALMipv6 { iso(1) standard(0) calm-ipv6(21210) version0(0) } 
CALMipv6 { iso(1) standard(0) calm-ipv6(21210) asnm-1(1)} 


DEFINITIONS AUTOMATIC TAGS::=BEGIN 
DEFINITIONS AUTOMATIC TAGS::=BEGIN 


IMPORTS 
IMPORTS 
Link-ID, CIstatus, UserPriority FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) version1(1)}
Link-ID, CIstatus, UserPriority FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) asnm-1(1)}


IpAddressInfo FROM CALMfsap { iso (1) standard (0) calm-management (24102) fsap (5) version1 (1)}  
IpAddressInfo FROM CALMfsap { iso (1) standard (0) calm-management (24102) fsap (5) asnm-1 (1)}  


TransportAddressType, TransportAddress FROM TRANSPORT-ADDRESS-MIB;
TransportAddressType, TransportAddress FROM TRANSPORT-ADDRESS-MIB;
-- It needs to be checked whether this ASN.1 module is the correct one.
-- It needs to be checked whether this ASN.1 module is the correct one.
Loading