There's no real need for portfwd.c to reference `cfg' directly, when

[u/mdw/putty] / portfwd.c

diff --git a/portfwd.c b/portfwd.c
index dc865f6..010838e 100644 (file)
--- a/portfwd.c
+++ b/portfwd.c
@@ -70,8 +70,6 @@ struct PFwdPrivate {
     struct pfwd_queue *waiting;
 };
 
-void pfd_close(Socket s);
-
 
 static int pfd_closing(Plug plug, char *error_msg, int error_code,
                       int calling_back)
@@ -127,7 +125,7 @@ char *pfd_newconnect(Socket *s, char *hostname, int port, void *c)
      * Try to find host.
      */
     addr = name_lookup(hostname, port, &dummy_realhost);
-    if ((err = sk_addr_error(addr)))
+    if ((err = sk_addr_error(addr)) != NULL)
        return err;
 
     /*
@@ -141,7 +139,7 @@ char *pfd_newconnect(Socket *s, char *hostname, int port, void *c)
     pr->backhandle = NULL;            /* we shouldn't need this */
 
     pr->s = *s = new_connection(addr, dummy_realhost, port, 0, 1, 0, (Plug) pr);
-    if ((err = sk_socket_error(*s))) {
+    if ((err = sk_socket_error(*s)) != NULL) {
        sfree(pr);
        return err;
     }
@@ -175,7 +173,7 @@ static int pfd_accepting(Plug p, void *sock)
     pr->backhandle = org->backhandle;
 
     pr->s = s = sk_register(sock, (Plug) pr);
-    if ((err = sk_socket_error(s))) {
+    if ((err = sk_socket_error(s)) != NULL) {
        sfree(pr);
        return err != NULL;
     }
@@ -206,7 +204,7 @@ static int pfd_accepting(Plug p, void *sock)
  sets up a listener on the local machine on (srcaddr:)port
  */
 char *pfd_addforward(char *desthost, int destport, char *srcaddr, int port,
-                    void *backhandle)
+                    void *backhandle, int acceptall)
 {
     static struct plug_function_table fn_table = {
        pfd_closing,
@@ -232,8 +230,8 @@ char *pfd_addforward(char *desthost, int destport, char *srcaddr, int port,
     pr->waiting = NULL;
     pr->backhandle = backhandle;
 
-    pr->s = s = new_listener(srcaddr, port, (Plug) pr, !cfg.lport_acceptall);
-    if ((err = sk_socket_error(s))) {
+    pr->s = s = new_listener(srcaddr, port, (Plug) pr, !acceptall);
+    if ((err = sk_socket_error(s)) != NULL) {
        sfree(pr);
        return err;
     }