Many changes due to ASN.1 modification (46aa862e) · Commits · TTCN-3 Libraries / LibIts

ttcn/DENM/LibItsDenm_Functions.ttcn

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -130,8 +130,10 @@ module LibItsDenm_Functions {
	if (p_trigger == e_ets) {		if (p_trigger == e_ets) {
	f_sendDenMessage(		f_sendDenMessage(
	m_denmReq(		m_denmReq(
			m_denmPdu(
	m_denmWithCause(c_dataVersionCancellation, p_event, f_getCurrentPosition(), f_getStationId())		m_denmWithCause(c_dataVersionCancellation, p_event, f_getCurrentPosition(), f_getStationId())
	)		)
			)
	);		);
	}		}
	else {		else {
	@@ -306,7 +308,7 @@ module LibItsDenm_Functions {
	* @return		* @return
	*/		*/
	function f_sendDenMessage(template (value) DenmReq p_sendMsg) runs on ItsFa {		function f_sendDenMessage(template (value) DenmReq p_sendMsg) runs on ItsFa {
	p_sendMsg.msgOut.management.actionID.sequenceNo := vc_sequenceNo;		p_sendMsg.msgOut.denm.management.actionID.sequenceNo := vc_sequenceNo;

	denmPort.send(p_sendMsg);		denmPort.send(p_sendMsg);
	}		}

ttcn/DENM/LibItsDenm_Templates.ttcn

+26 −11

Original line number	Original line	Diff line number	Diff line
	@@ -16,19 +16,43 @@ module LibItsDenm_Templates {
	group primitivesTemplates {		group primitivesTemplates {

	template DenmReq m_denmReq(		template DenmReq m_denmReq(
	template (value) DecentralizedEnvironmentalNotificationMessage p_denMsg		template (value) DenmPdu p_denMsg
	) := {		) := {
	msgOut := p_denMsg		msgOut := p_denMsg
	}		}

	template DenmInd mw_denmInd(		template DenmInd mw_denmInd(
	template (present) DecentralizedEnvironmentalNotificationMessage p_denMsg		template (present) DenmPdu p_denMsg
	) := {		) := {
	msgIn := p_denMsg		msgIn := p_denMsg
	}		}

	} // end primitives		} // end primitives

			group denmPduTemplates {

			template ItsPduHeader m_itsPduHeader := {
			protocolVersion := c_protocolVersion_DENM,
			messageID := c_messageId,
			generationTime := 0 //TODO document: 0 indicates that the lower layer should add the time while sending
			}

			template ItsPduHeader mw_itsPduHeader modifies m_itsPduHeader := {
			generationTime := ?
			}

			template DenmPdu m_denmPdu(in template (value) DecentralizedEnvironmentalNotificationMessage p_denm) := {
			header := m_itsPduHeader,
			denm := p_denm
			}

			template DenmPdu mw_denmPdu(in template (present) DecentralizedEnvironmentalNotificationMessage p_denm) := {
			header := mw_itsPduHeader,
			denm := p_denm
			}

			} // end denmPduTemplates

	group DecentralizedEnvironmentalNotificationMessageTemplates {		group DecentralizedEnvironmentalNotificationMessageTemplates {

	template DecentralizedEnvironmentalNotificationMessage m_denm(		template DecentralizedEnvironmentalNotificationMessage m_denm(
	@@ -36,9 +60,6 @@ module LibItsDenm_Templates {
	template (value) DecentralizedSituation p_sit,		template (value) DecentralizedSituation p_sit,
	template (value) DecentralizedSituationLocation p_loc		template (value) DecentralizedSituationLocation p_loc
	) := {		) := {
	protocolVersion := c_protocolVersion_DENM,
	messageID := c_messageId,
	generationTime := 0, //TODO document: 0 indicates that the lower layer should add the time while sending
	management := p_mgmt,		management := p_mgmt,
	situation := p_sit,		situation := p_sit,
	location := p_loc		location := p_loc
	@@ -49,9 +70,6 @@ module LibItsDenm_Templates {
	template (present) DecentralizedSituation p_sit,		template (present) DecentralizedSituation p_sit,
	template (present) DecentralizedSituationLocation p_loc		template (present) DecentralizedSituationLocation p_loc
	) := {		) := {
	protocolVersion := c_protocolVersion_DENM,
	messageID := c_messageId,
	generationTime := ?,
	management := p_mgmt,		management := p_mgmt,
	situation := p_sit,		situation := p_sit,
	location := p_loc		location := p_loc
	@@ -63,9 +81,6 @@ module LibItsDenm_Templates {
	template (value) DecentralizedSituationLocation.eventPosition p_eventPosition,		template (value) DecentralizedSituationLocation.eventPosition p_eventPosition,
	template (value) StationID p_stationId		template (value) StationID p_stationId
	) := {		) := {
	protocolVersion := c_protocolVersion_DENM,
	messageID := c_messageId,
	generationTime := 0, //TODO document: 0 indicates that the lower layer should add the time while sending
	management := m_denmMgmtCon(p_dataVersion, p_stationId),		management := m_denmMgmtCon(p_dataVersion, p_stationId),
	situation := m_denmSitCon(p_sit, informative),		situation := m_denmSitCon(p_sit, informative),
	location := m_denmSitLoc(		location := m_denmSitLoc(

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,10 +22,10 @@ module LibItsDenm_TypesAndValues {

	group denmConstants {		group denmConstants {

	const DecentralizedEnvironmentalNotificationMessage.protocolVersion c_protocolVersion_DENM := 0;		const ItsPduHeader.protocolVersion c_protocolVersion_DENM := 0;

	//TODO check which value or value handling should be applied		//TODO check which value or value handling should be applied
	const DecentralizedEnvironmentalNotificationMessage.messageID c_messageId := 0;		const ItsPduHeader.messageID c_messageId := 0;

	const DataVersion c_dataVersionCancellation := 255;		const DataVersion c_dataVersionCancellation := 255;

ttcn/LibIts_Interface.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -314,7 +314,7 @@ module LibIts_Interface {
	* @member denmMsg		* @member denmMsg
	*/		*/
	type record DenmInd {		type record DenmInd {
	DecentralizedEnvironmentalNotificationMessage msgIn		DenmPdu msgIn
	}		}

	/**		/**
	@@ -323,7 +323,7 @@ module LibIts_Interface {
	* @member denmMsg		* @member denmMsg
	*/		*/
	type record DenmReq {		type record DenmReq {
	DecentralizedEnvironmentalNotificationMessage msgOut		DenmPdu msgOut
	}		}

	} // end fa1Primitives		} // end fa1Primitives

Admin message