projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate unfix.org's IPv6 patches up to level 10, with rather a lot
[u/mdw/putty]
/
proxy.c
diff --git
a/proxy.c
b/proxy.c
index
190b8c9
..
f21c17b
100644
(file)
--- a/
proxy.c
+++ b/
proxy.c
@@
-342,7
+342,7
@@
static int proxy_for_destination (SockAddr addr, char *hostname, int port,
}
SockAddr name_lookup(char *host, int port, char **canonicalname,
}
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) &&
{
if (cfg->proxy_type != PROXY_NONE &&
do_proxy_dns(cfg) &&
@@
-351,7
+351,7
@@
SockAddr name_lookup(char *host, int port, char **canonicalname,
return sk_nonamelookup(host);
}
return sk_nonamelookup(host);
}
- return sk_namelookup(host, canonicalname);
+ return sk_namelookup(host, canonicalname
, addressfamily
);
}
Socket new_connection(SockAddr addr, char *hostname,
}
Socket new_connection(SockAddr addr, char *hostname,
@@
-433,7
+433,7
@@
Socket new_connection(SockAddr addr, char *hostname,
/* look-up proxy */
proxy_addr = sk_namelookup(cfg->proxy_host,
/* 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;
if (sk_addr_error(proxy_addr) != NULL) {
ret->error = "Proxy error: Unable to resolve proxy host name";
return (Socket)ret;
@@
-461,13
+461,13
@@
Socket new_connection(SockAddr addr, char *hostname,
}
Socket new_listener(char *srcaddr, int port, Plug plug, int local_host_only,
}
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.
*/
{
/* 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
);
}
/* ----------------------------------------------------------------------
}
/* ----------------------------------------------------------------------