Removed Flags from Common header templates (c59fea88) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+12 −38

Original line number	Diff line number	Diff line
		@@ -534,7 +534,7 @@ module LibItsGeoNetworking_Functions {
		var LongPosVector v_iutLongPosVector;

		[] a_receiveLsRequest(
		?, ?, ?, v_iutLongPosVector
		?, ?, v_iutLongPosVector
		) {
		repeat;
		}
		@@ -563,10 +563,9 @@ module LibItsGeoNetworking_Functions {
		altstep a_neighbourDefault() runs on ItsNt {

		[] a_receiveLsRequestAndReply(
		?, ?, f_getPosition(vc_componentName).gnAddr,
		?, f_getPosition(vc_componentName).gnAddr,
		f_getPosition(vc_componentName),
		f_getPosition(vc_componentName),
		e_vehicleStation
		f_getPosition(vc_componentName)
		) {
		repeat;
		}
		@@ -587,14 +586,12 @@ module LibItsGeoNetworking_Functions {
		altstep a_receiveGeoUnicast(
		in template (present) LongPosVector p_senderLongPosVec,
		in template (present) ShortPosVector p_destinationShortPosVec,
		in template (present) StationTypeIdentifier p_stationType,
		in template (present) UInt16 p_seqNumber
		) runs on ItsNt {

		[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoUnicastHeader(
		p_senderLongPosVec,
		p_destinationShortPosVec,
		p_stationType,
		p_seqNumber)))) {
		}
		}
		@@ -604,7 +601,7 @@ module LibItsGeoNetworking_Functions {
		*/
		altstep a_receiveGeoUnicastWithDestination(in template (present) ShortPosVector p_destinationShortPosVec) runs on ItsNt {

		[] a_receiveGeoUnicast(?, p_destinationShortPosVec, ?, ?) {}
		[] a_receiveGeoUnicast(?, p_destinationShortPosVec, ?) {}
		}

		/**
		@@ -612,7 +609,7 @@ module LibItsGeoNetworking_Functions {
		*/
		altstep a_receiveAnyGeoUnicast() runs on ItsNt {

		[] a_receiveGeoUnicast(?, ?, ?, ?) {}
		[] a_receiveGeoUnicast(?, ?, ?) {}
		}

		} // end geoGeoUnicastAltsteps
		@@ -625,14 +622,12 @@ module LibItsGeoNetworking_Functions {
		altstep a_receiveGeoBroadcast(
		in template (present) LongPosVector p_srcLongPosVec,
		in template (present) LongPosVector p_senderLongPosVec,
		in template (present) StationTypeIdentifier p_stationType,
		in template (present) UInt16 p_seqNumber
		) runs on ItsNt {

		[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoBroadcastHeader(
		p_srcLongPosVec,
		p_senderLongPosVec,
		p_stationType,
		p_seqNumber
		)))) {
		}
		@@ -644,7 +639,6 @@ module LibItsGeoNetworking_Functions {
		altstep a_receiveGeoBroadcastWithAreaWithHopLimit(
		in template (present) LongPosVector p_srcLongPosVec,
		in template (present) LongPosVector p_senderLongPosVec,
		in template (present) StationTypeIdentifier p_stationType,
		in template (present) UInt16 p_seqNumber,
		in template (present) GeoBroadcastArea p_broadcastArea,
		in template (present) UInt8 p_hopLimit
		@@ -653,7 +647,6 @@ module LibItsGeoNetworking_Functions {
		[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoBroadcastHeaderWithAreaWithHopLimit(
		p_srcLongPosVec,
		p_senderLongPosVec,
		p_stationType,
		p_seqNumber,
		p_broadcastArea,
		p_hopLimit
		@@ -667,7 +660,6 @@ module LibItsGeoNetworking_Functions {
		altstep a_receiveGeoBroadcastWithArea(
		in template (present) LongPosVector p_srcLongPosVec,
		in template (present) LongPosVector p_senderLongPosVec,
		in template (present) StationTypeIdentifier p_stationType,
		in template (present) UInt16 p_seqNumber,
		in template (present) GeoBroadcastArea p_broadcastArea
		) runs on ItsNt {
		@@ -675,7 +667,6 @@ module LibItsGeoNetworking_Functions {
		[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoBroadcastHeaderWithArea(
		p_srcLongPosVec,
		p_senderLongPosVec,
		p_stationType,
		p_seqNumber,
		p_broadcastArea
		)))) {
		@@ -692,14 +683,12 @@ module LibItsGeoNetworking_Functions {
		altstep a_receiveGeoAnycast(
		in template (present) LongPosVector p_srcLongPosVec,
		in template (present) LongPosVector p_senderLongPosVec,
		in template (present) StationTypeIdentifier p_stationType,
		in template (present) UInt16 p_seqNumber
		) runs on ItsNt {

		[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoAnycastHeader(
		p_srcLongPosVec,
		p_senderLongPosVec,
		p_stationType,
		p_seqNumber
		)))) {
		}
		@@ -711,7 +700,6 @@ module LibItsGeoNetworking_Functions {
		altstep a_receiveGeoAnycastWithAreaWithHopLimit(
		in template (present) LongPosVector p_srcLongPosVec,
		in template (present) LongPosVector p_senderLongPosVec,
		in template (present) StationTypeIdentifier p_stationType,
		in template (present) UInt16 p_seqNumber,
		in template (present) GeoAnycastArea p_anycastArea,
		in template (present) UInt8 p_hopLimit
		@@ -720,7 +708,6 @@ module LibItsGeoNetworking_Functions {
		[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoAnycastHeaderWithAreaWithHopLimit(
		p_srcLongPosVec,
		p_senderLongPosVec,
		p_stationType,
		p_seqNumber,
		p_anycastArea,
		p_hopLimit
		@@ -734,7 +721,6 @@ module LibItsGeoNetworking_Functions {
		altstep a_receiveGeoAnycastWithArea(
		in template (present) LongPosVector p_srcLongPosVec,
		in template (present) LongPosVector p_senderLongPosVec,
		in template (present) StationTypeIdentifier p_stationType,
		in template (present) UInt16 p_seqNumber,
		in template (present) GeoAnycastArea p_anycastArea
		) runs on ItsNt {
		@@ -742,7 +728,6 @@ module LibItsGeoNetworking_Functions {
		[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoAnycastHeaderWithArea(
		p_srcLongPosVec,
		p_senderLongPosVec,
		p_stationType,
		p_seqNumber,
		p_anycastArea
		)))) {
		@@ -757,7 +742,6 @@ module LibItsGeoNetworking_Functions {
		* @desc Receive Location Service Request
		*/
		altstep a_receiveLsRequest(
		in template (present) StationTypeIdentifier p_stationType,
		in template (present) UInt16 p_seqNumber,
		in template (present) GN_Address p_gnAddress,
		out LongPosVector p_reqSrcPosVector
		@@ -768,7 +752,6 @@ module LibItsGeoNetworking_Functions {
		mw_geoNwInd(
		mw_geoNwPdu(
		mw_lsRequestHeader(
		p_stationType,
		p_seqNumber,
		p_gnAddress
		)
		@@ -785,29 +768,26 @@ module LibItsGeoNetworking_Functions {
		altstep a_receiveAnyLsRequest() runs on ItsNt {
		var LongPosVector v_reqSrcPosVector;

		[] a_receiveLsRequest(?, ?, ?, v_reqSrcPosVector) {}
		[] a_receiveLsRequest(?, ?, v_reqSrcPosVector) {}
		}

		/**
		* @desc Receive Location Service Request and send Location Service Reply
		*/
		altstep a_receiveLsRequestAndReply(
		in template (present) StationTypeIdentifier p_reqStationType,
		in template (present) UInt16 p_reqSeqNumber,
		in template (value) GN_Address p_gnAddress,
		in template (value) LongPosVector p_repSrcPosVector,
		in template (value) LongPosVector p_repSenderPosVector,
		in template (value) StationTypeIdentifier p_repStationType
		in template (value) LongPosVector p_repSenderPosVector
		) runs on ItsNt {
		var LongPosVector v_repDstPosVector;

		[] a_receiveLsRequest(p_reqStationType, p_reqSeqNumber, p_gnAddress, v_repDstPosVector) {
		[] a_receiveLsRequest(p_reqSeqNumber, p_gnAddress, v_repDstPosVector) {
		f_sendGeoNetMessage(m_geoNwReq(m_geoNwPdu(
		m_lsReplyHeader(
		p_repSrcPosVector,
		v_repDstPosVector,
		f_longPosVector2ShortPosVector(v_repDstPosVector),
		p_repSenderPosVector,
		p_repStationType,
		vc_localSeqNumber
		))));
		}
		@@ -850,18 +830,15 @@ module LibItsGeoNetworking_Functions {
		}

		function f_handleLocationService(
		in template (present) StationTypeIdentifier p_reqStationType,
		in template (present) UInt16 p_reqSeqNumber,
		in template (value) GN_Address p_gnAddress,
		in template (value) LongPosVector p_repSrcPosVector,
		in template (value) LongPosVector p_repSenderPosVector,
		in template (value) StationTypeIdentifier p_repStationType
		in template (value) LongPosVector p_repSenderPosVector
		) runs on ItsNt {

		tc_ac.start;
		alt {
		[] a_receiveLsRequestAndReply(p_reqStationType, p_reqSeqNumber, p_gnAddress,
		p_repSrcPosVector, p_repSenderPosVector, p_repStationType) {
		[] a_receiveLsRequestAndReply(p_reqSeqNumber, p_gnAddress, p_repSrcPosVector, p_repSenderPosVector) {
		tc_ac.stop;
		}
		}
		@@ -870,7 +847,6 @@ module LibItsGeoNetworking_Functions {

		function f_processLocationService(
		in template (value) LongPosVector p_reqSrcPosVector,
		in template (value) StationTypeIdentifier p_reqStationType,
		in template (value) UInt16 p_reqSeqNumber,
		in template (value) GN_Address p_gnAddress,
		out LongPosVector p_repSrcPosVector
		@@ -884,7 +860,6 @@ module LibItsGeoNetworking_Functions {
		m_lsRequestHeader(
		p_reqSrcPosVector,
		p_reqSrcPosVector,
		p_reqStationType,
		p_reqSeqNumber,
		p_gnAddress
		)
		@@ -898,10 +873,9 @@ module LibItsGeoNetworking_Functions {
		mw_geoNwInd(
		mw_geoNwPdu(
		mw_lsReplyHeader(
		?,
		p_reqSeqNumber,
		?,
		p_reqSrcPosVector
		f_longPosVector2ShortPosVector(valueof(p_reqSrcPosVector))
		)
		)
		)

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+41 −156

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -863,7 +863,7 @@ module LibItsGeoNetworking_TypesAndValues {
		}

		type record GenerateGeoBroadcastMessage {
		charstring area,
		GeoArea area,
		Payload payload optional
		}

ttcn/Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ module LibItsIpv6OverGeoNetworking_Functions {
		m_geoBroadcastHeader(
		v_nodeLongPosVector,
		v_nodeLongPosVector,
		e_vehicleStation,
		vc_localSeqNumber,
		f_getGeoBroadcastArea(valueof(p_gvl.area))
		),