nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Proxy command formatting now recognises `%proxyhost' and

Browse Source 
`%proxyport' in addition to the other things it interpolates. This
is useful when using the Unix-only `Local' proxy type: it allows me
to, for example, set up a proxy command such as
  ssh %proxyhost nc -q0 %host %port
and then enter the name of the proxy machine in `Proxy hostname',
which makes it marginally more convenient to quickly change to using
a different proxy to get at the same target.

I haven't documented this, because we currently don't document the
Local proxy type at all. Possibly we should, though.

[originally from svn r5073]
This commit is contained in:
Simon Tatham 2005-01-07 14:22:17 +00:00
parent 88c52fa85f
commit eb0583762c
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
proxy.c
View File

@ -1315,7 +1315,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] == '%') {
@ -1359,6 +1360,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", 4) == 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", 4) == 0) {
char pport[50];
int pplen;
sprintf(pport, "%d", cfg->proxy_port);
pplen = strlen(cfg->proxy_host);
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