Commit 3eabda1e authored by garciay's avatar garciay
Browse files

Add UtPort/HttpPort mapping

parent 29b0b355

ttcn/Ats6RD/Ats6RD_Functions.ttcn3

+30 −7
Original line number Diff line number Diff line
@@ -48,10 +48,18 @@ module Ats6RD_Functions { 
            if (isbound(vc_dhcpv4Component)) { 

                connect(vc_dhcpv4Component:dhcpv4Port, self:dhcpv4Port);

            } 

            if (isbound(vc_hostComponents)) {

                v_hosts := lengthof(vc_hostComponents);

                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {

                    connect(vc_hostComponents[v_host]:ipv6Port, self:ipv6HostPort); 

                    connect(vc_hostComponents[v_host]:ipv4Port, self:ipv4HostPort); 

                }

            } 

            

            // Map ports

            map(self:ipPort, system:ipPort);

            map(self:ipv4Port, system:ipv4Port);

            map(self:utPort, system:utPort);

            

            // Connect synchronisation ports

            f_connect4SelfOrClientSync();
@@ -79,10 +87,18 @@ module Ats6RD_Functions { 
                    connect(vc_hostComponents[v_host]:ipv4Port, self:ipv4HostPort); 

                }

            } 

            if (isbound(vc_hostHttpComponents)) {

                v_hosts := lengthof(vc_hostHttpComponents);

                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {

                    connect(vc_hostHttpComponents[v_host]:ipv6Port, self:ipv6HostPort); 

                    connect(vc_hostHttpComponents[v_host]:ipv4Port, self:ipv4HostPort); 

                }

            } 

            

            // Map ports

            map(self:ipPort, system:ipPort);

            map(self:ipv4Port, system:ipv4Port);

            map(self:utPort, system:utPort);

            

            // Connect synchronisation ports

            f_connect4SelfOrClientSync();
@@ -103,13 +119,20 @@ module Ats6RD_Functions { 
            if (isbound(vc_brComponent)) { 

                connect(vc_brComponent:brPort, self:brPort);

            }

            // TODO To be removed

//            if (isbound(vc_hostHttpComponents)) {

//                v_hosts := lengthof(vc_hostHttpComponents);

//                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {

//                    connect(vc_hostHttpComponents[v_host]:httpPort, self:httpPort); 

//                }

//            } 

            if (isbound(vc_hostComponents)) {

                v_hosts := lengthof(vc_hostComponents);

                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {

                    connect(vc_hostComponents[v_host]:ipv6Port, self:ipv6HostPort); 

                    connect(vc_hostComponents[v_host]:ipv4Port, self:ipv4HostPort); 

                }

            } 

            if (isbound(vc_hostHttpComponents)) {

                v_hosts := lengthof(vc_hostHttpComponents);

                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {

                    connect(vc_hostHttpComponents[v_host]:ipv6Port, self:ipv6HostPort); 

                    connect(vc_hostHttpComponents[v_host]:ipv4Port, self:ipv4HostPort); 

                }

            } 

            

            // Map ports

            map(self:ipPort, system:ipPort);