Change manifest files to declare Windows GUI apps to be "DPI-aware", that is,

[u/mdw/putty] / proxy.c

diff --git a/proxy.c b/proxy.c
index d3bcca6..c6008a5 100644 (file)
--- a/proxy.c
+++ b/proxy.c
@@ -16,9 +16,7 @@
 
 #define do_proxy_dns(cfg) \
     (cfg->proxy_dns == FORCE_ON || \
-        (cfg->proxy_dns == AUTO && \
-              cfg->proxy_type != PROXY_SOCKS4 && \
-              cfg->proxy_type != PROXY_SOCKS5))
+        (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS4))
 
 /*
  * Call this when proxy negotiation is complete, so that this
@@ -191,6 +189,15 @@ static const char * sk_proxy_socket_error (Socket s)
 
 /* basic proxy plug functions */
 
+static void plug_proxy_log(Plug plug, int type, SockAddr addr, int port,
+                          const char *error_msg, int error_code)
+{
+    Proxy_Plug pp = (Proxy_Plug) plug;
+    Proxy_Socket ps = pp->proxy_socket;
+
+    plug_log(ps->plug, type, addr, port, error_msg, error_code);
+}
+
 static int plug_proxy_closing (Plug p, const char *error_msg,
                               int error_code, int calling_back)
 {
@@ -342,7 +349,7 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
 }
 
 SockAddr name_lookup(char *host, int port, char **canonicalname,
-                    const Config *cfg)
+                    const Config *cfg, int addressfamily)
 {
     if (cfg->proxy_type != PROXY_NONE &&
        do_proxy_dns(cfg) &&
@@ -351,7 +358,7 @@ SockAddr name_lookup(char *host, int port, char **canonicalname,
        return sk_nonamelookup(host);
     }
 
-    return sk_namelookup(host, canonicalname);
+    return sk_namelookup(host, canonicalname, addressfamily);
 }
 
 Socket new_connection(SockAddr addr, char *hostname,
@@ -372,6 +379,7 @@ Socket new_connection(SockAddr addr, char *hostname,
     };
 
     static const struct plug_function_table plug_fn_table = {
+       plug_proxy_log,
        plug_proxy_closing,
        plug_proxy_receive,
        plug_proxy_sent,
@@ -433,7 +441,7 @@ Socket new_connection(SockAddr addr, char *hostname,
 
        /* look-up proxy */
        proxy_addr = sk_namelookup(cfg->proxy_host,
-                                  &proxy_canonical_name);
+                                  &proxy_canonical_name, cfg->addressfamily);
        if (sk_addr_error(proxy_addr) != NULL) {
            ret->error = "Proxy error: Unable to resolve proxy host name";
            return (Socket)ret;
@@ -461,13 +469,13 @@ Socket new_connection(SockAddr addr, char *hostname,
 }
 
 Socket new_listener(char *srcaddr, int port, Plug plug, int local_host_only,
-                   const Config *cfg)
+                   const Config *cfg, int addressfamily)
 {
     /* TODO: SOCKS (and potentially others) support inbound
      * TODO: connections via the proxy. support them.
      */
 
-    return sk_newlistener(srcaddr, port, plug, local_host_only);
+    return sk_newlistener(srcaddr, port, plug, local_host_only, addressfamily);
 }
 
 /* ----------------------------------------------------------------------
@@ -859,15 +867,16 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
         *     0x03 = CHAP
         */
 
-       char command[4];
+       char command[5];
        int len;
 
        command[0] = 5; /* version 5 */
        if (p->cfg.proxy_username[0] || p->cfg.proxy_password[0]) {
-           command[1] = 2;            /* two methods supported: */
            command[2] = 0x00;         /* no authentication */
-           command[3] = 0x02;         /* username/password */
-           len = 4;
+           len = 3;
+           proxy_socks5_offerencryptedauth (command, &len);
+           command[len++] = 0x02;             /* username/password */
+           command[1] = len - 2;       /* Number of methods supported */
        } else {
            command[1] = 1;            /* one methods supported: */
            command[2] = 0x00;         /* no authentication */
@@ -923,7 +932,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
             *    authentication methods:
             *     0x00 = no authentication
             *     0x01 = GSSAPI
-            *     0x02 = username/password 
+            *     0x02 = username/password
             *     0x03 = CHAP
             *     0xff = no acceptable methods
             */
@@ -988,6 +997,12 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
            p->state = 2;              /* now proceed as authenticated */
        }
 
+       if (p->state == 8) {
+           int ret;
+           ret = proxy_socks5_handlechap(p);
+           if (ret) return ret;
+       }
+
        if (p->state == 2) {
 
            /* request format:
@@ -1156,10 +1171,9 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
        }
 
        if (p->state == 6) {
-           /* TODO: Handle CHAP authentication */
-           plug_closing(p->plug, "Proxy error: We don't support CHAP authentication",
-                        PROXY_ERROR_GENERAL, 0);
-           return 1;
+           int ret;
+           ret = proxy_socks5_selectchap(p);
+           if (ret) return ret;
        }
 
     }
@@ -1309,7 +1323,8 @@ char *format_telnet_command(SockAddr addr, int port, const Config *cfg)
        } else {
 
            /* % escape. we recognize %%, %host, %port, %user, %pass.
-            * anything else, we just send unescaped (including the %).
+            * %proxyhost, %proxyport. Anything else we just send
+            * unescaped (including the %).
             */
 
            if (cfg->proxy_telnet_command[eo] == '%') {
@@ -1353,6 +1368,25 @@ char *format_telnet_command(SockAddr addr, int port, const Config *cfg)
                retlen += passlen;
                eo += 4;
            }
+           else if (strnicmp(cfg->proxy_telnet_command + eo,
+                             "proxyhost", 9) == 0) {
+               int phlen = strlen(cfg->proxy_host);
+               ENSURE(phlen);
+               memcpy(ret+retlen, cfg->proxy_host, phlen);
+               retlen += phlen;
+               eo += 9;
+           }
+           else if (strnicmp(cfg->proxy_telnet_command + eo,
+                             "proxyport", 9) == 0) {
+                char pport[50];
+               int pplen;
+                sprintf(pport, "%d", cfg->proxy_port);
+                pplen = strlen(pport);
+               ENSURE(pplen);
+               memcpy(ret+retlen, pport, pplen);
+               retlen += pplen;
+               eo += 9;
+           }
            else {
                /* we don't escape this, so send the % now, and
                 * don't advance eo, so that we'll consider the