When starting a SOCKS connection in dynamic forwarding, freeze the

local socket _before_ calling the SSH setup functions. This makes no
difference to ssh.c itself, but it makes portfwd.c easier to reuse
for other purposes (e.g. as a component of a standalone SOCKS
server), because now ssh_send_port_open() can itself call
pfd_confirm() without the freeze and unfreeze happening in the wrong
order.

[originally from svn r8500]

diff --git a/portfwd.c b/portfwd.c
index e6cf20059476a5e3c78467abdef52e6abc936587..662d995d89444f1f99e352360d18ac4272651357 100644 (file)
--- a/portfwd.c
+++ b/portfwd.c
@@ -278,6 +278,12 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
         */
        connect:
 
+       /*
+        * Freeze the socket until the SSH server confirms the
+        * connection.
+        */
+       sk_set_frozen(pr->s, 1);
+
        pr->c = new_sock_channel(pr->backhandle, pr->s);
        if (pr->c == NULL) {
            pfd_close(pr->s);
@@ -288,11 +294,6 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
        }
        pr->dynamic = 0;
 
-       /*
-        * Now freeze the socket until the SSH server confirms the
-        * connection.
-        */
-       sk_set_frozen(pr->s, 1);
        /*
         * If there's any data remaining in our current buffer,
         * save it to be sent on pfd_confirm().