Commit 589a5f2d authored by berge's avatar berge
Browse files

Added better cleanup handling (port unmapping) in case of unexpected TC termination

parent d72b3b80

GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+8 −3
Original line number Diff line number Diff line
@@ -176,9 +176,10 @@ module LibItsGeoNetworking_Functions { 
            unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);

            unmap(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);

            

            // Connect

            // Disconnect

            disconnect(p_nodeB:syncPort, self:syncPort);

            disconnect(p_nodeD:syncPort, self:syncPort);

			disconnect(self:syncPort, self:syncPort);

        

        } // end f_cf02Down
@@ -217,6 +218,7 @@ module LibItsGeoNetworking_Functions { 
            // Connect

            connect(p_nodeB:syncPort, self:syncPort);

            connect(p_nodeC:syncPort, self:syncPort);

			connect(self:syncPort, self:syncPort);

			activate(a_cf03Down(p_nodeB, p_nodeC));



            //Initialze the IUT
@@ -269,9 +271,10 @@ module LibItsGeoNetworking_Functions { 
            unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);

            unmap(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

            

            // Connect

            // Disconnect

            disconnect(p_nodeB:syncPort, self:syncPort);

            disconnect(p_nodeC:syncPort, self:syncPort);

			disconnect(self:syncPort, self:syncPort);

        

        } // end f_cf03Down
@@ -318,6 +321,7 @@ module LibItsGeoNetworking_Functions { 
            connect(p_nodeB:syncPort, self:syncPort);

            connect(p_nodeC:syncPort, self:syncPort);

            connect(p_nodeD:syncPort, self:syncPort);

			connect(self:syncPort, self:syncPort);

			activate(a_cf04Down(p_nodeB, p_nodeC, p_nodeD));

            

            //Initialze the IUT
@@ -378,10 +382,11 @@ module LibItsGeoNetworking_Functions { 
            unmap(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

            unmap(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);

            

            // Connect

            // Disonnect

            disconnect(p_nodeB:syncPort, self:syncPort);

            disconnect(p_nodeC:syncPort, self:syncPort);

            disconnect(p_nodeD:syncPort, self:syncPort);

			disconnect(self:syncPort, self:syncPort);

        

        } // end f_cf04Down