Instead of testing for different versions of GTK in increasing order

[sgt/putty] / portfwd.c

diff --git a/portfwd.c b/portfwd.c
index e6cf200..e7e9d63 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);
@@ -289,11 +295,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().
         */
@@ -324,7 +325,7 @@ static void pfd_sent(Plug plug, int bufsize)
  * Called when receiving a PORT OPEN from the server
  */
 const char *pfd_newconnect(Socket *s, char *hostname, int port,
-                          void *c, const Config *cfg, int addressfamily)
+                          void *c, Conf *conf, int addressfamily)
 {
     static const struct plug_function_table fn_table = {
        pfd_log,
@@ -342,7 +343,7 @@ const char *pfd_newconnect(Socket *s, char *hostname, int port,
     /*
      * Try to find host.
      */
-    addr = name_lookup(hostname, port, &dummy_realhost, cfg, addressfamily);
+    addr = name_lookup(hostname, port, &dummy_realhost, conf, addressfamily);
     if ((err = sk_addr_error(addr)) != NULL) {
        sk_addr_free(addr);
        return err;
@@ -361,7 +362,7 @@ const char *pfd_newconnect(Socket *s, char *hostname, int port,
     pr->dynamic = 0;
 
     pr->s = *s = new_connection(addr, dummy_realhost, port,
-                               0, 1, 0, 0, (Plug) pr, cfg);
+                               0, 1, 0, 0, (Plug) pr, conf);
     if ((err = sk_socket_error(*s)) != NULL) {
        sfree(pr);
        return err;
@@ -434,7 +435,7 @@ static int pfd_accepting(Plug p, OSSocket sock)
  sets up a listener on the local machine on (srcaddr:)port
  */
 const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
-                          int port, void *backhandle, const Config *cfg,
+                          int port, void *backhandle, Conf *conf,
                           void **sockdata, int address_family)
 {
     static const struct plug_function_table fn_table = {
@@ -467,7 +468,8 @@ const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
     pr->backhandle = backhandle;
 
     pr->s = s = new_listener(srcaddr, port, (Plug) pr,
-                            !cfg->lport_acceptall, cfg, address_family);
+                            !conf_get_int(conf, CONF_lport_acceptall),
+                            conf, address_family);
     if ((err = sk_socket_error(s)) != NULL) {
        sfree(pr);
        return err;