Fixed cyclic redundency issue. (a1c89e90) · Commits · TTCN-3 Libraries / LibIts

ttcn/DENM/LibItsDenm_Functions.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ module LibItsDenm_Functions {
		if (p_trigger == e_ets) {
		f_sendDenMessage(
		m_denmReq(
		m_denmWithCause(c_dataVersionCancellation, p_event)
		m_denmWithCause(c_dataVersionCancellation, p_event, f_getCurrentPosition(), f_getStationId())
		)
		);
		}

ttcn/DENM/LibItsDenm_Templates.ttcn

+15 −9

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ module LibItsDenm_Templates {
		//LibIts
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;
		import from CAM_PDU_Descriptions language "ASN.1:1997" all;
		import from LibItsDenm_Functions all;
		import from LibIts_Interface all;
		import from LibItsDenm_TypesAndValues all;

		@@ -54,21 +53,25 @@ module LibItsDenm_Templates {

		template DecentralizedEnvironmentalNotificationMessage m_denmWithCause(
		template (value) DataVersion p_dataVersion,
		template (value) Situation p_sit
		template (value) Situation p_sit,
		template (value) DecentralizedSituationLocation.eventPosition p_eventPosition,
		template (value) StationID p_stationId
		) := {
		management := m_denmMgmtCon(p_dataVersion),
		management := m_denmMgmtCon(p_dataVersion, p_stationId),
		situation := m_denmSitCon(p_sit, informative),
		location := m_denmSitLoc(
		f_getCurrentPosition(),
		p_eventPosition,
		m_locationRef
		)
		}
		template DecentralizedEnvironmentalNotificationMessage m_denmWithCauseIsNeg(
		template (value) DataVersion p_dataVersion,
		template (value) Situation p_sit,
		template (value) DecentralizedSituationLocation.eventPosition p_eventPosition,
		template (value) StationID p_stationId,
		template (value) DecentralizedSituationManagement.isNegation p_isNeg
		) modifies m_denmWithCause := {
		management := m_denmMgmtCon_IsNeg(p_dataVersion, p_isNeg)
		management := m_denmMgmtCon_IsNeg(p_dataVersion, p_stationId, p_isNeg)
		}

		} // end group DecentralizedEnvironmentalNotificationMessageTemplates
		@@ -76,13 +79,14 @@ module LibItsDenm_Templates {
		group DecentralizedSituationManagementTemplates {

		template DecentralizedSituationManagement m_denmMgmtCon(
		template (value) DataVersion p_dataVersion
		template (value) DataVersion p_dataVersion,
		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
		actionID := {
		stationID := f_getStationId(),
		stationID := p_stationId,
		sequenceNo := 0
		},
		dataVersion := p_dataVersion,
		@@ -111,6 +115,7 @@ module LibItsDenm_Templates {

		template DecentralizedSituationManagement m_denmMgmtCon_IsNeg(
		template (value) DataVersion p_dataVersion,
		template (value) StationID p_stationId,
		template (value) DecentralizedSituationManagement.isNegation p_isNeg
		) modifies m_denmMgmtCon := {
		isNegation := p_isNeg
		@@ -118,6 +123,7 @@ module LibItsDenm_Templates {

		template DecentralizedSituationManagement mw_denmMgmtCon_IsNeg(
		template (present) DataVersion p_dataVersion,
		template (value) StationID p_stationId,
		template (present) DecentralizedSituationManagement.isNegation p_isNeg
		) modifies mw_denmMgmtCon := {
		isNegation := p_isNeg

ttcn/LibIts_Interface.ttcn

+2 −5

Original line number	Diff line number	Diff line
		@@ -10,15 +10,12 @@ module LibIts_Interface {
		// LibIts
		import from LibItsCam_Pixits all;
		import from LibItsGeoNetworking_TypesAndValues all;
		import from CAM_PDU_Descriptions language "ASN.1:1997" all;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;

		// LibCommon
		import from LibCommon_Time {modulepar all};

		// ASN1 definitions
		import from CAM_PDU_Descriptions language "ASN.1:1997" all;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;

		group adapterInterface {

		group portDefinitions {

Admin message