Fixed compilation issues with TestCast (57cea8c1) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Functions.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,7 @@ module LibItsCam_Functions {
	/**		/**
	* @desc The default postamble.		* @desc The default postamble.
	*/		*/
	function f_poDefault() runs on ItsNt {		function f_poDefault() runs on ItsFa {
	//empty		//empty
	}		}

ttcn/DENM/LibItsDenm_Functions.ttcn

+0 −37

Original line number	Original line	Diff line number	Diff line
	@@ -48,43 +48,6 @@ module LibItsDenm_Functions {

	} // end f_cfDown		} // end f_cfDown

	/**
	* @desc Create Facility component and connects DENM port
	* @remark Only used when ItsFa is a PTC
	* @param p_ptcDenm returned Facility component variable
	*/
	function f_ptcDenmUp(out ItsFa p_ptcDenm) {

	// Create Facility component
	p_ptcDenm := ItsFa.create("DENM Tester");

	// map ports
	map(p_ptcDenm:denmPort, system:denmPort);
	map(p_ptcDenm:utPort, system:utPort);

	} // end f_ptcDenmUp

	/**
	* @desc Wait for component to finish and unmap DENM ports
	* @remark Only used when ItsFa is a PTC
	* @param p_camPtc Facility component variable
	*/
	function f_ptcDenmDown(in ItsFa p_ptcDenm) runs on ItsMtc {
	tc_guard.start;
	alt {
	[] p_ptcDenm.done {
	tc_guard.stop;
	}

	[] tc_guard.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_ptcDenmDown: Timeout while waiting for component *");
	}
	}
	unmap(p_ptcDenm:denmPort);
	unmap(p_ptcDenm:utPort);

	} // end f_ptcDenmDown

	} //end denmConfigurationFunctions		} //end denmConfigurationFunctions

	group altsteps {		group altsteps {

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -939,7 +939,7 @@ module LibItsGeoNetworking_Functions {
	* @param p_event The event to trigger		* @param p_event The event to trigger
	* @return		* @return
	*/		*/
	function f_acTriggerEvent(template (value) AcGNEvent p_event) runs on ItsNt return FncRetCode {		function f_acTriggerEvent(template (value) AcGNEvent p_event) runs on ItsAdapterComponent return FncRetCode {
	var FncRetCode v_ret := e_success;		var FncRetCode v_ret := e_success;

	acPort.send(p_event);		acPort.send(p_event);
	@@ -952,7 +952,7 @@ module LibItsGeoNetworking_Functions {
	* @param p_event The event to trigger		* @param p_event The event to trigger
	* @return		* @return
	*/		*/
	function f_acGetLongPosVector(template (value) GN_Address p_gnAddress) runs on ItsNt return LongPosVector {		function f_acGetLongPosVector(GN_Address p_gnAddress) runs on ItsAdapterComponent return LongPosVector {
	var AcGNResult v_result;		var AcGNResult v_result;

	f_acTriggerEvent(m_getLongPosVector(p_gnAddress));		f_acTriggerEvent(m_getLongPosVector(p_gnAddress));
	@@ -1016,7 +1016,7 @@ module LibItsGeoNetworking_Functions {
	* @desc Gets the tester GN local address for a specific node		* @desc Gets the tester GN local address for a specific node
	*/		*/
	function f_getTsGnLocalAddress(in charstring p_node) return GN_Address {		function f_getTsGnLocalAddress(in charstring p_node) return GN_Address {
	var GN_Address v_gnAddr;		var GN_Address v_gnAddr := valueof(m_dummyGnAddr);

	select (p_node) {		select (p_node) {
	case (c_compNodeA) {		case (c_compNodeA) {
	@@ -1032,7 +1032,7 @@ module LibItsGeoNetworking_Functions {
	v_gnAddr := PX_TS_NODE_D_LOCAL_GN_ADDR;		v_gnAddr := PX_TS_NODE_D_LOCAL_GN_ADDR;
	}		}
	case else {		case else {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_getTsGnLocalAddress: Unknown node given *");		log("* f_getTsGnLocalAddress: INFO: Unknown component " & p_node & " *");
	}		}
	}		}

	@@ -1306,7 +1306,7 @@ module LibItsGeoNetworking_Functions {
	* @desc Set the number of neighbour in the Location Table.		* @desc Set the number of neighbour in the Location Table.
	* @return		* @return
	*/		*/
	function f_setNrNeighbourLocTableDefault() {		function f_setNrNeighbourLocTableDefault() runs on ItsNt {
	var integer v_nrNeighbour := f_random (0, PX_MIN_NR_NEIGHBOUR);		var integer v_nrNeighbour := f_random (0, PX_MIN_NR_NEIGHBOUR);

	f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);		f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);
	@@ -1317,7 +1317,7 @@ module LibItsGeoNetworking_Functions {
	* @desc Set the number of neighbour in the Location Table.		* @desc Set the number of neighbour in the Location Table.
	* @return		* @return
	*/		*/
	function f_setNrNeighbourLocTableMedium() {		function f_setNrNeighbourLocTableMedium() runs on ItsNt {
	var integer v_nrNeighbour := f_random (PX_MIN_NR_NEIGHBOUR, PX_MAX_NR_NEIGHBOUR);		var integer v_nrNeighbour := f_random (PX_MIN_NR_NEIGHBOUR, PX_MAX_NR_NEIGHBOUR);

	f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);		f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);
	@@ -1328,7 +1328,7 @@ module LibItsGeoNetworking_Functions {
	* @desc Set the number of neighbour in the Location Table.		* @desc Set the number of neighbour in the Location Table.
	* @return		* @return
	*/		*/
	function f_setNrNeighbourLocTableMaximum() {		function f_setNrNeighbourLocTableMaximum() runs on ItsNt {
	var integer v_nrNeighbour := f_random (PX_MAX_NR_NEIGHBOUR, (2*PX_MIN_NR_NEIGHBOUR));		var integer v_nrNeighbour := f_random (PX_MAX_NR_NEIGHBOUR, (2*PX_MIN_NR_NEIGHBOUR));

	f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);		f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);
	@@ -1352,11 +1352,11 @@ module LibItsGeoNetworking_Functions {
	return v_shortPosVector;		return v_shortPosVector;
	}		}

	function f_getIutLongPosVector() return LongPosVector {		function f_getIutLongPosVector() runs on ItsAdapterComponent return LongPosVector {
	return f_acGetLongPosVector(f_getIutGnLocalAddress());		return f_acGetLongPosVector(f_getIutGnLocalAddress());
	}		}

	function f_getIutShortPosVector() return ShortPosVector {		function f_getIutShortPosVector() runs on ItsAdapterComponent return ShortPosVector {
	return f_longPosVector2ShortPosVector(f_getIutLongPosVector());		return f_longPosVector2ShortPosVector(f_getIutLongPosVector());
	}		}

	@@ -1390,7 +1390,7 @@ module LibItsGeoNetworking_Functions {
	* @param p_orientation direction of the computed position (0 to 359; 0 means North)		* @param p_orientation direction of the computed position (0 to 359; 0 means North)
	* @return LongPosVector		* @return LongPosVector
	*/		*/
	function fx_computePositionUsingDistance(		external function fx_computePositionUsingDistance(
	in LongPosVector p_iutLongPosVector,		in LongPosVector p_iutLongPosVector,
	in integer p_distance,		in integer p_distance,
	in integer p_orientation,		in integer p_orientation,

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+274 −274

Original line number	Original line	Diff line number	Diff line
	@@ -211,7 +211,7 @@ module LibItsGeoNetworking_Templates {
	* @desc Checks the receive of a packet		* @desc Checks the receive of a packet
	* @param p_packet The GN packet to check		* @param p_packet The GN packet to check
	*/		*/
	template (value) UtEvent m_checkPacket(GeoNetworkingPacket p_packet) := {		template (value) UtEvent m_checkPacket(template (value) GeoNetworkingPacket p_packet) := {
	utGnEvent := {		utGnEvent := {
	checkPacket := p_packet		checkPacket := p_packet
	}		}
	@@ -567,7 +567,7 @@ module LibItsGeoNetworking_Templates {
	* @param p_longPosVector The base long position vector		* @param p_longPosVector The base long position vector
	*/		*/
	template LongPosVector mw_longPosVectorPosition(		template LongPosVector mw_longPosVectorPosition(
	in template (value) LongPosVector p_longPosVector		in LongPosVector p_longPosVector
	) := {		) := {
	gnAddr := p_longPosVector.gnAddr,		gnAddr := p_longPosVector.gnAddr,
	timestamp := ?,		timestamp := ?,
	@@ -588,7 +588,7 @@ module LibItsGeoNetworking_Templates {
	* @param p_shortPosVector The base short position vector		* @param p_shortPosVector The base short position vector
	*/		*/
	template ShortPosVector mw_shortPosVectorPosition(		template ShortPosVector mw_shortPosVectorPosition(
	in template (value) ShortPosVector p_shortPosVector		in ShortPosVector p_shortPosVector
	) := {		) := {
	gnAddr := p_shortPosVector.gnAddr,		gnAddr := p_shortPosVector.gnAddr,
	timestamp := ?,		timestamp := ?,

ttcn/Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	function f_acUpdateInterfaces() {		function f_acUpdateInterfaces() {

	//TODO		//TODO
			// + vc_tvlInterface
	}		}

	} // end group testAdapter		} // end group testAdapter
	@@ -127,9 +127,9 @@ module LibItsIpv6OverGeoNetworking_Functions {
	return f_getGVL(p_areaIndex).interface		return f_getGVL(p_areaIndex).interface
	} // end f_getGvlInterface		} // end f_getGvlInterface

	function f_getTVL() runs on ItsNt return GvlTableEntry {		function f_getTvlInterface() runs on ItsNt return charstring {
	return valueof(vc_gvlTable[0]); // FIXME !!!		return valueof(vc_tvlInterface);
	} // end f_getTVL		} // end f_getTvlInterface

	/**		/**
	* @desc Retrieves the MAC address from the GN address.		* @desc Retrieves the MAC address from the GN address.

Admin message