X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e8fa8f62da443bfc89c416d3eeafcde69c8c6403..7d77d56d511c2525e6e29eb6001fed437128de20:/proxy.c

diff --git a/proxy.c b/proxy.c
index be238c34..0065b5c4 100644
--- a/proxy.c
+++ b/proxy.c
@@ -15,8 +15,8 @@
 #include "proxy.h"
 
 #define do_proxy_dns(cfg) \
-    (cfg->proxy_dns == 2 || \
-	 (cfg->proxy_dns == 1 && cfg->proxy_type != PROXY_SOCKS))
+    (cfg->proxy_dns == FORCE_ON || \
+	 (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS))
 
 /*
  * Call this when proxy negotiation is complete, so that this
@@ -281,7 +281,7 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
 
     while (exclude_list[s]) {
 	while (exclude_list[s] &&
-	       (isspace(exclude_list[s]) ||
+	       (isspace((unsigned char)exclude_list[s]) ||
 		exclude_list[s] == ',')) s++;
 
 	if (!exclude_list[s]) break;
@@ -289,7 +289,7 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
 	e = s;
 
 	while (exclude_list[e] &&
-	       (isalnum(exclude_list[e]) ||
+	       (isalnum((unsigned char)exclude_list[e]) ||
 		exclude_list[e] == '-' ||
 		exclude_list[e] == '.' ||
 		exclude_list[e] == '*')) e++;
@@ -325,7 +325,7 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
 
 	/* Make sure we really have reached the next comma or end-of-string */
 	while (exclude_list[s] &&
-	       !isspace(exclude_list[s]) &&
+	       !isspace((unsigned char)exclude_list[s]) &&
 	       exclude_list[s] != ',') s++;
     }
 
@@ -378,7 +378,7 @@ Socket new_connection(SockAddr addr, char *hostname,
 	SockAddr proxy_addr;
 	char *proxy_canonical_name, *err;
 
-	ret = smalloc(sizeof(struct Socket_proxy_tag));
+	ret = snew(struct Socket_proxy_tag);
 	ret->fn = &socket_fn_table;
 	ret->cfg = *cfg;	       /* STRUCTURE COPY */
 	ret->plug = plug;
@@ -413,7 +413,7 @@ Socket new_connection(SockAddr addr, char *hostname,
 
 	/* create the proxy plug to map calls from the actual
 	 * socket into our proxy socket layer */
-	pplug = smalloc(sizeof(struct Plug_proxy_tag));
+	pplug = snew(struct Plug_proxy_tag);
 	pplug->fn = &plug_fn_table;
 	pplug->proxy_socket = ret;
 
@@ -519,7 +519,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 	    int i, j, len;
 	    sprintf(buf, "%s:%s", p->cfg.proxy_username, p->cfg.proxy_password);
 	    len = strlen(buf);
-	    sprintf(buf2, "Proxy-Authorization: basic ");
+	    sprintf(buf2, "Proxy-Authorization: Basic ");
 	    for (i = 0, j = strlen(buf2); i < len; i += 3, j += 4)
 		base64_encode_atom((unsigned char *)(buf+i),
 				   (len-i > 3 ? 3 : len-i), buf2+j);
@@ -579,7 +579,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 	    /* get the status line */
 	    len = bufchain_size(&p->pending_input_data);
 	    assert(len > 0);	       /* or we wouldn't be here */
-	    data = smalloc(len);
+	    data = snewn(len, char);
 	    bufchain_fetch(&p->pending_input_data, data, len);
 
 	    eol = get_line_end(data, len);
@@ -627,7 +627,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 
 	    len = bufchain_size(&p->pending_input_data);
 	    assert(len > 0);	       /* or we wouldn't be here */
-	    data = smalloc(len);
+	    data = snewn(len, char);
 	    datap = data;
 	    bufchain_fetch(&p->pending_input_data, data, len);
 
@@ -702,7 +702,7 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change)
 	}
 
 	length = strlen(p->cfg.proxy_username) + namelen + 9;
-	command = (char*) smalloc(length);
+	command = snewn(length, char);
 	strcpy(command + 8, p->cfg.proxy_username);
 
 	command[0] = 4; /* version 4 */