Bug fixed in AtsGeoNetworking: Some tests cases were missing (26b8f58b) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+63 −74

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ module LibItsGeoNetworking_Functions {
		// Disconnect
		f_disconnect4SelfOrClientSync();

		} // end f_cf01Down
		} // End of function f_cf01Down

		/**
		* @desc This configuration features:
		@@ -270,7 +270,7 @@ module LibItsGeoNetworking_Functions {
		}
		}

		} // end f_cf02Up
		} // End of group f_cf02Up

		/**
		* @desc Deletes configuration cf02
		@@ -293,7 +293,7 @@ module LibItsGeoNetworking_Functions {
		unmap(self:utPort, system:utPort);
		disconnect(self:syncPort, mtc:syncPort);

		} // end f_cf02Down
		} // End of group f_cf02Down

		/**
		* @desc This configuration features:
		@@ -364,7 +364,7 @@ module LibItsGeoNetworking_Functions {
		}
		}

		} // end f_cf03Up
		} // End of group f_cf03Up

		/**
		* @desc Deletes configuration cf03
		@@ -387,7 +387,7 @@ module LibItsGeoNetworking_Functions {
		unmap(self:utPort, system:utPort);
		disconnect(self:syncPort, mtc:syncPort);

		} // end f_cf03Down
		} // End of group f_cf03Down

		/**
		* @desc This configuration features:
		@@ -460,7 +460,7 @@ module LibItsGeoNetworking_Functions {
		}
		}

		} // end f_cf04Up
		} // End of group f_cf04Up

		/**
		* @desc Deletes configuration cf04
		@@ -483,7 +483,7 @@ module LibItsGeoNetworking_Functions {
		unmap(self:utPort, system:utPort);
		disconnect(self:syncPort, mtc:syncPort);

		} // end f_cf04Down
		} // End of group f_cf04Down

		/**
		* @desc This configuration features:
		@@ -574,7 +574,7 @@ module LibItsGeoNetworking_Functions {
		unmap(self:utPort, system:utPort);
		disconnect(self:syncPort, mtc:syncPort);

		} // end f_cf05Down
		} // End of group f_cf05Down

		/**
		* @desc This configuration features:
		@@ -666,7 +666,7 @@ module LibItsGeoNetworking_Functions {
		unmap(self:utPort, system:utPort);
		disconnect(self:syncPort, mtc:syncPort);

		} // end f_cf06Down
		} // End of group f_cf06Down

		/**
		* @desc This configuration features:
		@@ -757,7 +757,7 @@ module LibItsGeoNetworking_Functions {
		unmap(self:utPort, system:utPort);
		disconnect(self:syncPort, mtc:syncPort);

		} // end f_cf07Down
		} // End of group f_cf07Down

		/**
		* @desc Behavior function for initializing component's variables and tables
		@@ -778,7 +778,7 @@ module LibItsGeoNetworking_Functions {
		vc_localSeqNumber := f_getInitialSequenceNumber();
		vc_multipleMessagesCount := f_getMessageCount();

		} // end f_initialiseComponent
		} // End of function f_initialiseComponent

		/**
		* @desc Makes the simulated ITS node behave as a neighbour of IUT
		@@ -788,7 +788,7 @@ module LibItsGeoNetworking_Functions {
		vc_neighbourDefault := activate(a_neighbourDefault());
		f_acTriggerEvent(m_startBeaconing(m_beaconHeader(f_getPosition(vc_componentName)).beaconHeader));
		f_sleepIgnoreDef(PX_NEIGHBOUR_DISCOVERY_DELAY);
		} // end f_startBeingNeighbour
		} // End of function f_startBeingNeighbour

		/**
		* @desc Makes the simulated ITS node behave as not being a neighbour of IUT
		@@ -799,7 +799,7 @@ module LibItsGeoNetworking_Functions {
		if (PICS_GN_SECURITY == true) {
		deactivate(vc_neighbourDefault);
		}
		} // end f_stopBeingNeighbour
		} // End of function f_stopBeingNeighbour

		/**
		* @desc Initialise secure mode if required
		@@ -834,7 +834,7 @@ module LibItsGeoNetworking_Functions {
		}
		} // End of function f_uninitialiseSecuredMode()

		} // end geoConfigurationFunctions
		} // End of group geoConfigurationFunctions

		group componentFunctions {
		/**
		@@ -1201,7 +1201,7 @@ module LibItsGeoNetworking_Functions {
		return fx_computeDistance(p_pointA.latitude, p_pointA.longitude, p_pointB.latitude, p_pointB.longitude);
		}

		} // end geoPositionFunctions
		} // End of group geoPositionFunctions

		group geoAltsteps {

		@@ -1397,7 +1397,7 @@ module LibItsGeoNetworking_Functions {
		[vc_gnDefaultActive] a_receiveGeoUnicast(?, ?) {}
		}

		} // end geoGeoUnicastAltsteps
		} // End of group geoGeoUnicastAltsteps

		group geoGeoBroadcastAltsteps {

		@@ -1466,7 +1466,7 @@ module LibItsGeoNetworking_Functions {
		}
		}

		} // end geoGeoBroadcastAltsteps
		} // End of group geoGeoBroadcastAltsteps

		group geoGeoAnycastAltsteps {

		@@ -1537,7 +1537,7 @@ module LibItsGeoNetworking_Functions {
		}
		}

		} // end geoGeoAnycastAltsteps
		} // End of group geoGeoAnycastAltsteps

		group geoLocationServiceAltsteps {

		@@ -1610,10 +1610,10 @@ module LibItsGeoNetworking_Functions {
		}
		}

		} // end geoLocationServiceAltsteps
		} // End of group geoLocationServiceAltsteps


		} // end geoAltsteps
		} // End of group geoAltsteps

		group preambles {

		@@ -1739,7 +1739,7 @@ module LibItsGeoNetworking_Functions {
		return v_ret;
		}

		} // end preambles
		} // End of group preambles

		group postambles {

		@@ -1758,7 +1758,7 @@ module LibItsGeoNetworking_Functions {
		f_poDefault();
		}

		} // end postambles
		} // End of group postambles

		group adapterControl {

		@@ -1918,7 +1918,7 @@ module LibItsGeoNetworking_Functions {
		if (PX_GNSS_SCENARIO_SUPPORT==true) {
		f_acTriggerGnssEvent(m_loadScenario(p_scenario));
		}
		} // end f_acLoadScenario
		} // End of function f_acLoadScenario

		/**
		* @desc Starts a loaded scenario
		@@ -1929,7 +1929,7 @@ module LibItsGeoNetworking_Functions {
		f_acTriggerGnssEvent(m_startScenario);
		vc_scenarioStarted := true;
		}
		} // end f_acStartScenario
		} // End of function f_acStartScenario

		/**
		* @desc Stops a loaded scenario
		@@ -1940,7 +1940,7 @@ module LibItsGeoNetworking_Functions {
		f_acTriggerGnssEvent(m_stopScenario);
		vc_scenarioStarted := false;
		}
		} // end f_acStopScenario
		} // End of function f_acStopScenario

		function f_acAwaitTimeInRunningScenario(integer p_time) runs on ItsBaseGeoNetworking return FncRetCode {
		var FncRetCode v_ret := e_success;
		@@ -1966,9 +1966,9 @@ module LibItsGeoNetworking_Functions {

		}
		return v_ret;
		} // end f_acAwaitTimeInRunningScenario
		} // End of function f_acAwaitTimeInRunningScenario

		} // end adapterControl
		} // End of group adapterControl

		group commonFunctions {

		@@ -2009,7 +2009,7 @@ module LibItsGeoNetworking_Functions {
		return v_timestamp;
		}

		} // end commonFunctions
		} // End of group commonFunctions

		group testerFunctions {

		@@ -2120,7 +2120,7 @@ module LibItsGeoNetworking_Functions {
		return PX_MESSAGE_COUNT;
		}

		} // end testerFunctions
		} // End of group testerFunctions

		group iutFunctions {

		@@ -2155,19 +2155,19 @@ module LibItsGeoNetworking_Functions {
		/**
		* @desc Gets the GeoUnicast forwarding algorithm
		* @return IUT's GeoUnicast forwarding algorithm
		* @see PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM
		* @see PICS_GN_NON_AREA_FORWARDING_ALGORITHM
		*/
		function f_getGeoUnicastForwardingAlgorithm() return GeoUnicastForwardingAlgorithm {
		return PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM;
		function f_getNonAreaForwardingAlgorithm() return NonAreaForwardingAlgorithm {
		return PICS_GN_NON_AREA_FORWARDING_ALGORITHM;
		}

		/**
		* @desc Gets the GeoBroadcast forwarding algorithm
		* @return IUT's GeoBroadcast forwarding algorithm
		* @see PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM
		* @see PICS_GN_AREA_FORWARDING_ALGORITHM
		*/
		function f_getGeoBroadcastForwardingAlgorithm() return GeoBroadcastForwardingAlgorithm {
		return PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM;
		function f_getAreaForwardingAlgorithm() return AreaForwardingAlgorithm {
		return PICS_GN_AREA_FORWARDING_ALGORITHM;
		}

		/**
		@@ -2288,7 +2288,7 @@ module LibItsGeoNetworking_Functions {
		var integer v_itsGnLocationServicePacketBufferSize := PICS_GN_LOCATION_SERVICE_PACKET_BUFFER_SIZE;

		return v_itsGnLocationServicePacketBufferSize;
		} // end f_getLsPacketBufferSize
		} // End of function f_getLsPacketBufferSize

		/**
		* @desc Gets the UC forwarding packet buffer size.
		@@ -2299,7 +2299,7 @@ module LibItsGeoNetworking_Functions {
		var integer v_itsGnUcForwardingPacketBufferSize := PICS_GN_UC_FORWARDING_PACKET_BUFFER_SIZE;

		return v_itsGnUcForwardingPacketBufferSize * 1024;
		} // end f_getUcForwardingPacketBufferSize
		} // End of function f_getUcForwardingPacketBufferSize

		/**
		* @desc Gets the BC forwarding packet buffer size.
		@@ -2310,7 +2310,7 @@ module LibItsGeoNetworking_Functions {
		var integer v_itsGnBcForwardingPacketBufferSize := PICS_GN_BC_FORWARDING_PACKET_BUFFER_SIZE;

		return v_itsGnBcForwardingPacketBufferSize * 1024;
		} // end f_getBcForwardingPacketBufferSize
		} // End of function f_getBcForwardingPacketBufferSize

		/**
		* @desc Gets the maximum lifetime of a packet.
		@@ -2392,7 +2392,7 @@ module LibItsGeoNetworking_Functions {
		var float v_itsGnLifetimeLocTableEntry := int2float(PICS_GN_LIFETIME_LOC_TE);

		return v_itsGnLifetimeLocTableEntry;
		} // end f_getLifetimeLocTableEntry
		} // End of function f_getLifetimeLocTableEntry

		/**
		* @desc Gets the maximum communication range for CBF algorithm
		@@ -2403,37 +2403,25 @@ module LibItsGeoNetworking_Functions {
		var integer v_maxCommunicationRange := PICS_GN_DEFAULT_MAX_COMMUNICATION_RANGE;

		return v_maxCommunicationRange;
		} // end f_getCbfMaxCommunicationRange
		} // End of function f_getCbfMaxCommunicationRange

		function f_getGeoUnicastCbfMaxTime() return integer {
		var integer v_cbfMaxTime := PICS_GN_GEOUNICAST_CBF_MAX_TIME;
		function f_getCbfMaxTime() return integer {
		var integer v_cbfMaxTime := PICS_GN_CBF_MAX_TIME;

		return v_cbfMaxTime;
		} // end f_getGeoUnicastCbfMaxTime
		} // End of function f_getCbfMaxTime

		function f_getGeoUnicastCbfMinTime() return integer {
		var integer v_cbfMinTime := PICS_GN_GEOUNICAST_CBF_MIN_TIME;
		function f_getCbfMinTime() return integer {
		var integer v_cbfMinTime := PICS_GN_CBF_MIN_TIME;

		return v_cbfMinTime;
		} // end f_getGeoUnicastCbfMinTime

		function f_getGeoBroadcastCbfMaxTime() return integer {
		var integer v_cbfMaxTime := PICS_GN_GEOBROADCAST_CBF_MAX_TIME;

		return v_cbfMaxTime;
		} // end f_getGeoBroadcastCbfMaxTime

		function f_getGeoBroadcastCbfMinTime() return integer {
		var integer v_cbfMinTime := PICS_GN_GEOBROADCAST_CBF_MIN_TIME;

		return v_cbfMinTime;
		} // end f_getGeoBroadcastCbfMinTime
		} // End of function f_getCbfMinTime

		function f_getGnMaxAreaSize() return float {
		var float v_maxAreaSize := PICS_GN_MAX_GEO_AREA_SIZE;

		return v_maxAreaSize;
		} // end f_getGnMaxAreaSize
		} // End of function f_getGnMaxAreaSize

		function f_getAdvancedGbcForwardingMaxCounter() return integer {
		var integer v_maxCounter := PICS_GN_ADVANCED_BC_FORWARDING_MAX_COUNTER;
		@@ -2450,7 +2438,7 @@ module LibItsGeoNetworking_Functions {

		f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);

		} // end f_setNrNeighbourLocTableDefault
		} // End of function f_setNrNeighbourLocTableDefault

		/**
		* @desc Set the number of neighbour in the Location Table (medium).
		@@ -2462,7 +2450,7 @@ module LibItsGeoNetworking_Functions {

		f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);

		} // end f_setNrNeighbourLocTableMedium
		} // End of function f_setNrNeighbourLocTableMedium

		/**
		* @desc Set the number of neighbour in the Location Table (maximum).
		@@ -2474,9 +2462,9 @@ module LibItsGeoNetworking_Functions {

		f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);

		} // end f_setNrNeighbourLocTableMaximum
		} // End of function f_setNrNeighbourLocTableMaximum

		} // end iutFunctions
		} // End of group iutFunctions

		group posVectorFunctions {

		@@ -2539,7 +2527,7 @@ module LibItsGeoNetworking_Functions {
		return v_result;
		}

		} // end posVectorFunctions
		} // End of group posVectorFunctions

		group externalFunctions {

		@@ -2594,7 +2582,7 @@ module LibItsGeoNetworking_Functions {
		) {
		// Nothing to do
		}
		} // End of altstep a_securedMessageWithCertificate
		} // End of 'altstep' a_securedMessageWithCertificate

		/**
		* @desc Receive GN message with security containing digest as a signer info
		@@ -2652,9 +2640,9 @@ module LibItsGeoNetworking_Functions {
		* @desc Ask for the certificate chain and wait for GN message with security containing certificate chain as a signer info
		* @return the certificate chain used for sign received message
		*/
		function f_askForCertificateChain (in template(value) octetstring p_CamPayload)
		runs on ItsGeoNetworking
		return boolean {
		function f_askForCertificateChain(
		in template(value) octetstring p_CamPayload
		) runs on ItsGeoNetworking return boolean {
		var EtsiTs103097Data v_recv;
		var boolean v_ret := false;

		@@ -2772,7 +2760,7 @@ module LibItsGeoNetworking_Functions {
		m_geoNwSecPdu(
		v_gnNonSecuredPacket,
		v_securedMessage
		) // End of template m_geoNwSecPdu
		)
		)); // End of template m_geoNwReq_linkLayerBroadcast

		// Send Message
		@@ -2834,11 +2822,12 @@ module LibItsGeoNetworking_Functions {
		* @param p_msg GeoNetworking packet
		* @return the EtsiTs103097Data if any
		*/
		function f_getSecuredMessage(in GeoNetworkingPdu p_msg)
		return EtsiTs103097Data {
		function f_getSecuredMessage(
		in GeoNetworkingPdu p_msg
		) return EtsiTs103097Data {
		return p_msg.gnPacket.securedMsg;
		}

		}

		} // end LibItsGeoNetworking_Functions
		} // End of module LibItsGeoNetworking_Functions

ttcn/GeoNetworking/LibItsGeoNetworking_Pics.ttcn

+92 −74

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -881,7 +881,7 @@ module LibItsGeoNetworking_TypesAndValues {
		/**
		* @desc The GeoUnicast forwarding algorithm.
		*/
		type enumerated GeoUnicastForwardingAlgorithm {
		type enumerated NonAreaForwardingAlgorithm {
		e_unspecified(0),
		e_greedy(1),
		e_cbf(2)
		@@ -890,7 +890,7 @@ module LibItsGeoNetworking_TypesAndValues {
		/**
		* @desc The GeoBroadcast forwarding algorithm.
		*/
		type enumerated GeoBroadcastForwardingAlgorithm {
		type enumerated AreaForwardingAlgorithm {
		e_unspecified(0),
		e_simple(1),
		e_cbf(2),

Admin message