Adapted mapping/unmapping/connecting/disconnecting. (a0bf2a98) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+27 −5

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@ module LibItsGeoNetworking_Functions {
	// Libcommon		// Libcommon
	import from LibCommon_BasicTypesAndValues all;		import from LibCommon_BasicTypesAndValues all;
	import from LibCommon_VerdictControl {type FncRetCode;}		import from LibCommon_VerdictControl {type FncRetCode;}
	import from LibCommon_Sync {altstep all};		import from LibCommon_Sync all;

	// LibIts		// LibIts
	import from LibIts_TestSystem all;		import from LibIts_TestSystem all;
	@@ -78,8 +78,12 @@ module LibItsGeoNetworking_Functions {
	var LongPosVector v_nodeDLongPosVector := f_computePosition(v_iutLongPosVector, c_compNodeD_longitudeFactor, c_compNodeD_latitudeFactor);		var LongPosVector v_nodeDLongPosVector := f_computePosition(v_iutLongPosVector, c_compNodeD_longitudeFactor, c_compNodeD_latitudeFactor);

	// Map		// Map
			map(self:utPort, system:utPort);
	map(self:geoNetworkingPort, system:geoNetworkingPort);		map(self:geoNetworkingPort, system:geoNetworkingPort);

			// Connect
			f_connect4SelfOrClientSync();

	// Position table		// Position table
	f_addPosition(v_positionTable, c_compIut, v_iutLongPosVector);		f_addPosition(v_positionTable, c_compIut, v_iutLongPosVector);
	f_addPosition(v_positionTable, c_compNodeA, v_nodeALongPosVector);		f_addPosition(v_positionTable, c_compNodeA, v_nodeALongPosVector);
	@@ -100,9 +104,13 @@ module LibItsGeoNetworking_Functions {
	*/		*/
	function f_cf01Down() runs on ItsNt {		function f_cf01Down() runs on ItsNt {

	// Map		// Unmap
			unmap(self:utPort, system:utPort);
	unmap(self:geoNetworkingPort, system:geoNetworkingPort);		unmap(self:geoNetworkingPort, system:geoNetworkingPort);

			// Disconnect
			f_disconnect4SelfOrClientSync();

	} // end f_cf01Down		} // end f_cf01Down

	/**		/**
	@@ -132,6 +140,8 @@ module LibItsGeoNetworking_Functions {
	p_nodeD := ItsNt.create(c_compNodeD) alive;		p_nodeD := ItsNt.create(c_compNodeD) alive;

	// Map		// Map
			map(p_nodeB:utPort, system:utPort);
			map(p_nodeD:utPort, system:utPort);
	map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);		map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);
	map(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);		map(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);

	@@ -164,7 +174,9 @@ module LibItsGeoNetworking_Functions {
	*/		*/
	function f_cf02Down(in ItsNt p_nodeB, in ItsNt p_nodeD) runs on ItsMtc {		function f_cf02Down(in ItsNt p_nodeB, in ItsNt p_nodeD) runs on ItsMtc {

	// Map		// Unmap
			unmap(p_nodeB:utPort, system:utPort);
			unmap(p_nodeD:utPort, system:utPort);
	unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);		unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);
	unmap(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);		unmap(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);

	@@ -200,6 +212,8 @@ module LibItsGeoNetworking_Functions {
	p_nodeC := ItsNt.create(c_compNodeC) alive;		p_nodeC := ItsNt.create(c_compNodeC) alive;

	// Map		// Map
			map(p_nodeB:utPort, system:utPort);
			map(p_nodeC:utPort, system:utPort);
	map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);		map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);
	map(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);		map(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

	@@ -234,7 +248,9 @@ module LibItsGeoNetworking_Functions {
	*/		*/
	function f_cf03Down(in ItsNt p_nodeB, in ItsNt p_nodeC) runs on ItsMtc {		function f_cf03Down(in ItsNt p_nodeB, in ItsNt p_nodeC) runs on ItsMtc {

	// Map		// Unmap
			unmap(p_nodeB:utPort, system:utPort);
			unmap(p_nodeC:utPort, system:utPort);
	unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);		unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);
	unmap(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);		unmap(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

	@@ -273,6 +289,9 @@ module LibItsGeoNetworking_Functions {
	p_nodeD := ItsNt.create(c_compNodeD) alive;		p_nodeD := ItsNt.create(c_compNodeD) alive;

	// Map		// Map
			map(p_nodeB:utPort, system:utPort);
			map(p_nodeC:utPort, system:utPort);
			map(p_nodeD:utPort, system:utPort);
	map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);		map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);
	map(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);		map(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);
	map(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);		map(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);
	@@ -312,7 +331,10 @@ module LibItsGeoNetworking_Functions {
	*/		*/
	function f_cf04Down(in ItsNt p_nodeB, in ItsNt p_nodeC, in ItsNt p_nodeD) runs on ItsMtc {		function f_cf04Down(in ItsNt p_nodeB, in ItsNt p_nodeC, in ItsNt p_nodeD) runs on ItsMtc {

	// Map		// Unmap
			unmap(p_nodeB:utPort, system:utPort);
			unmap(p_nodeC:utPort, system:utPort);
			unmap(p_nodeD:utPort, system:utPort);
	unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);		unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);
	unmap(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);		unmap(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);
	unmap(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);		unmap(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);

Admin message