Commit 7cdfc032 authored by Antoine Millet's avatar Antoine Millet
Browse files

Forward tunnel label is now set by server

parent a358eebe
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -1025,10 +1025,9 @@ class CliHandler(RegisteredCCHandler):
    #

    @listed
    def forward(self, label, login, port, destination='127.0.0.1'):
    def forward(self, login, port, destination='127.0.0.1'):
        """ Forward a TCP port to the client.

        :param label: label of the tunnel created by the client (cli side)
        :param login: login of the remote client on which establish the tunnel
        :param port: port on which establish the tunnel on destination
        :param destination: tunnel destination (from the remote client side)
@@ -1042,7 +1041,9 @@ class CliHandler(RegisteredCCHandler):
        s2n_tun = host_client.forward(port, destination)

        # Create tunnel to the CLI
        self.client.register_tunnel('forward', host_client, s2n_tun)
        c2s_tun = self.client.register_tunnel('forward', host_client, s2n_tun)

        return c2s_tun.label

    #
    # Debug: