Integrate unfix.org's IPv6 patches up to level 10, with rather a lot

[u/mdw/putty] / portfwd.c

diff --git a/portfwd.c b/portfwd.c
index f740267..1239f67 100644 (file)
--- a/portfwd.c
+++ b/portfwd.c
@@ -255,7 +255,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
                    if (pr->hostname[1] != 1 || pr->hostname[2] != 0) {
                        /* Not CONNECT or reserved field nonzero - error */
                        reply[1] = 1;   /* generic failure */
-                       sk_write(pr->s, reply, lenof(reply));
+                       sk_write(pr->s, (char *) reply, lenof(reply));
                        pfd_close(pr->s);
                        return 1;
                    }
@@ -266,7 +266,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
                    pr->port = GET_16BIT_MSB_FIRST(pr->hostname+4+alen);
                    if (atype == 1) {
                        /* REP=0 (success) already */
-                       sk_write(pr->s, reply, lenof(reply));
+                       sk_write(pr->s, (char *) reply, lenof(reply));
                        sprintf(pr->hostname, "%d.%d.%d.%d",
                                (unsigned char)pr->hostname[4],
                                (unsigned char)pr->hostname[5],
@@ -275,7 +275,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
                        goto connect;
                    } else if (atype == 3) {
                        /* REP=0 (success) already */
-                       sk_write(pr->s, reply, lenof(reply));
+                       sk_write(pr->s, (char *) reply, lenof(reply));
                        memmove(pr->hostname, pr->hostname + 5, alen-1);
                        pr->hostname[alen-1] = '\0';
                        goto connect;
@@ -284,13 +284,13 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
                         * Unknown address type. (FIXME: support IPv6!)
                         */
                        reply[1] = 8;   /* atype not supported */
-                       sk_write(pr->s, reply, lenof(reply));
+                       sk_write(pr->s, (char *) reply, lenof(reply));
                        pfd_close(pr->s);
-                       return 1;                       
+                       return 1;
                    }
                }
            }
-           
+
            /*
             * If we get here without either having done `continue'
             * or `goto connect', it must be because there is no
@@ -354,7 +354,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)
+                          void *c, const Config *cfg, int addressfamily)
 {
     static const struct plug_function_table fn_table = {
        pfd_closing,
@@ -371,7 +371,7 @@ const char *pfd_newconnect(Socket *s, char *hostname, int port,
     /*
      * Try to find host.
      */
-    addr = name_lookup(hostname, port, &dummy_realhost, cfg);
+    addr = name_lookup(hostname, port, &dummy_realhost, cfg, addressfamily);
     if ((err = sk_addr_error(addr)) != NULL) {
        sk_addr_free(addr);
        return err;
@@ -390,7 +390,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, (Plug) pr, cfg);
+                               0, 1, 0, 0, (Plug) pr, cfg);
     if ((err = sk_socket_error(*s)) != NULL) {
        sfree(pr);
        return err;
@@ -462,7 +462,8 @@ 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, const Config *cfg,
+                          void **sockdata, int address_family)
 {
     static const struct plug_function_table fn_table = {
        pfd_closing,
@@ -493,7 +494,7 @@ 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);
+                            !cfg->lport_acceptall, cfg, address_family);
     if ((err = sk_socket_error(s)) != NULL) {
        sfree(pr);
        return err;
@@ -501,6 +502,8 @@ const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
 
     sk_set_private_ptr(s, pr);
 
+    *sockdata = (void *)s;
+
     return NULL;
 }
 
@@ -519,6 +522,14 @@ void pfd_close(Socket s)
     sk_close(s);
 }
 
+/*
+ * Terminate a listener.
+ */
+void pfd_terminate(void *sv)
+{
+    pfd_close((Socket)sv);
+}
+
 void pfd_unthrottle(Socket s)
 {
     struct PFwdPrivate *pr;