Upgrade Test System for TLC (33556043) · Commits · TTCN-3 Libraries / LibIts

ttcn/Common/LibItsCommon_TypesAndValues.ttcn

+7 −6

Original line number	Diff line number	Diff line
		@@ -191,14 +191,15 @@ module LibItsCommon_TypesAndValues {

		/**
		* @see ETSI TS 102 965 Intelligent Transport Systems (ITS); Application Object Identifier (ITS-AID); Registration list ETSI ITS registration list
		* @see https://standards.iso.org/iso/ts/17419/TS17419%20Assigned%20Numbers/TS17419_ITS-AID_AssignedNumbers.pdf
		*/
		group securityConstants {
		const integer c_its_aid_CAM := 36;
		const integer c_its_aid_DENM := 37;
		const integer c_its_aid_GPC := 128;
		const integer c_its_aid_SPAT := 137;
		const integer c_its_aid_MAP := 138;
		const integer c_its_aid_IVI := 139;
		const integer c_its_aid_GPC := 140;
		const integer c_its_aid_TLC := 140;
		const integer c_its_aid_TLS := 140;
		const integer c_its_aid_GN := 141;

ttcn/SremSsem/LibItsSremSsem_EncdecDeclarations.ttcn

+54 −3

Original line number	Diff line number	Diff line
		module LibItsSremSsem_EncdecDeclarations {

		// LibItsSremSsem
		import from ITS_Container language "ASN.1:1997" all;
		import from SREM_PDU_Descriptions language "ASN.1:1997" all;
		import from SSEM_PDU_Descriptions language "ASN.1:1997" all;
		import from DSRC language "ASN.1:1997" all;

		external function fx_enc_SSM (SignalStatusMessage p) return octetstring
		with {extension "prototype(convert) encode(BER:BER_ENCODE_CER)"}
		import from LibItsSremSsem_TypesAndValues all;
		import from LibItsSremSsem_TestSystem all;

		external function fx_enc_SremReq (SremReq p) return bitstring
		with {extension "prototype(convert) encode(LibIts_Interface)"}

		external function fx_dec_SremReq (inout bitstring b, out SremReq p) return integer
		with {extension "prototype(sliding) decode(LibIts_Interface)"}

		external function fx_enc_SremInd (SremInd p) return bitstring
		with {extension "prototype(convert) encode(LibIts_Interface)"}

		external function fx_dec_SremInd (inout bitstring b, out SremInd p) return integer
		with {extension "prototype(sliding) decode(LibIts_Interface)"}

		external function fx_enc_SsemReq (SsemReq p) return bitstring
		with {extension "prototype(convert) encode(LibIts_Interface)"}

		external function fx_dec_SsemReq (inout bitstring b, out SsemReq p) return integer
		with {extension "prototype(sliding) decode(LibIts_Interface)"}

		external function fx_enc_SsemInd (SsemInd p) return bitstring
		with {extension "prototype(convert) encode(LibIts_Interface)"}

		external function fx_dec_SsemInd (inout bitstring b, out SsemInd p) return integer
		with {extension "prototype(sliding) decode(LibIts_Interface)"}

		external function fx_enc_SREM (SREM p) return bitstring
		with {extension "prototype(convert) encode(PER)"}

		external function fx_dec_SREM (inout bitstring b, out SREM p) return integer
		with {extension "prototype(sliding) decode(PER)"}

		external function fx_enc_SSEM (SSEM p) return bitstring
		with {extension "prototype(convert) encode(PER)"}

		external function fx_dec_SSEM (inout bitstring b, out SSEM p) return integer
		with {extension "prototype(sliding) decode(PER)"}

		/*external function fx_enc_SRM (SignalRequestMessage p) return bitstring
		with {extension "prototype(convert) encode(PER)"}

		external function fx_dec_SRM (inout bitstring b, out SignalRequestMessage p) return integer
		with {extension "prototype(sliding) decode(PER)"}

		external function fx_enc_SSM (SignalStatusMessage p) return bitstring
		with {extension "prototype(convert) encode(PER)"}

		external function fx_dec_SSM (inout bitstring b, out SignalStatusMessage p) return integer
		with {extension "prototype(sliding) decode(PER)"}*/
		}

ttcn/SremSsem/LibItsSremSsem_Templates.ttcn

+8 −7

Original line number	Diff line number	Diff line
		@@ -594,7 +594,7 @@ module LibItsSremSsem_Templates {
		timeStamp := omit,
		second := PX_SECOND,
		sequenceNumber := omit,
		status := { m_signalStatus(PX_SEQUENCE_NUMBER, PX_STATUS) },
		status := { m_signalStatus(PX_SEQUENCE_NUMBER, m_requestorDescription(m_vehicleID(f_getIutStationId())), m_signalRequest(m_intersectionReferenceID, 17, priorityRequestTypeReserved, { lane := 2 } )) },
		regional := omit
		}

		@@ -605,7 +605,7 @@ module LibItsSremSsem_Templates {
		in SignalRequestMessage p_signalRequestMessage
		) modifies m_defaultSsem := {
		second := p_signalRequestMessage.second,
		status := { m_signalStatus(p_signalRequestMessage.sequenceNumber, p_signalRequestMessage.requests[0].request.id) },
		status := { m_signalStatus(p_signalRequestMessage.sequenceNumber, p_signalRequestMessage.requestor, p_signalRequestMessage.requests[0].request) },
		regional := omit
		}

		@@ -625,11 +625,12 @@ module LibItsSremSsem_Templates {

		template (value) SignalStatus m_signalStatus(
		in template (value) MsgCount p_sequenceNumber,
		in template (value) IntersectionReferenceID p_id
		in template (value) RequestorDescription p_requestor,
		in template (value) SignalRequest p_signalRequest
		) := {
		sequenceNumber := p_sequenceNumber,
		id := p_id,
		sigStatus := { m_signalStatusPackage(m_requester(m_vehicleID(f_getIutStationId()), 4, 6, basicVehicle)) },
		id := p_signalRequest.id,
		sigStatus := { m_signalStatusPackage(m_requester(p_requestor.id, p_signalRequest.requestID, p_sequenceNumber, p_requestor.type_.role)) },
		regional := omit
		}

		@@ -648,12 +649,12 @@ module LibItsSremSsem_Templates {
		in template (value) VehicleID p_id,
		in template (value) RequestID p_request,
		in template (value) MsgCount p_sequenceNumber,
		in template (omit) BasicVehicleRole role := omit
		in template (omit) BasicVehicleRole p_role := omit
		) := {
		id := p_id,
		request := p_request,
		sequenceNumber := p_sequenceNumber,
		role := omit,
		role := p_role,
		typeData := omit
		}

Admin message