nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-16 02:27:32 -05:00
Code Issues Projects Releases Wiki Activity

Dynamic port forwarding by means of a local SOCKS server. Fully

Browse Source 
supports SOCKS 4, SOCKS 4A and SOCKS 5 (well, actually IPv6 in SOCKS
5 isn't supported, but it'll be no difficulty once I actually get
round to it). Thanks to Chas Honton for his `stone soup' patch: I
didn't end up actually using any of his code, but it galvanised me
into doing it properly myself :-)

[originally from svn r3055]
This commit is contained in:
Simon Tatham
2003-04-05 11:45:21 +00:00
parent 3bd0415579
commit 8a3ff2bf3e
8 changed files with 398 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
ssh.c
View File

@ -3149,30 +3149,34 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
if (n < 255) sports[n++] = *ssh->portfwd_strptr++;
}
sports[n] = 0;
if (*ssh->portfwd_strptr == '\t')
ssh->portfwd_strptr++;
n = 0;
while (*ssh->portfwd_strptr && *ssh->portfwd_strptr != ':') {
if (n < 255) host[n++] = *ssh->portfwd_strptr++;
}
host[n] = 0;
if (*ssh->portfwd_strptr == ':')
ssh->portfwd_strptr++;
n = 0;
while (*ssh->portfwd_strptr) {
if (n < 255) dports[n++] = *ssh->portfwd_strptr++;
}
dports[n] = 0;
ssh->portfwd_strptr++;
dport = atoi(dports);
dserv = 0;
if (dport == 0) {
dserv = 1;
dport = net_service_lookup(dports);
if (!dport) {
logeventf(ssh, "Service lookup failed for"
" destination port \"%s\"", dports);
if (type != 'D') {
if (*ssh->portfwd_strptr == '\t')
ssh->portfwd_strptr++;
n = 0;
while (*ssh->portfwd_strptr && *ssh->portfwd_strptr != ':') {
if (n < 255) host[n++] = *ssh->portfwd_strptr++;
}
host[n] = 0;
if (*ssh->portfwd_strptr == ':')
ssh->portfwd_strptr++;
n = 0;
while (*ssh->portfwd_strptr) {
if (n < 255) dports[n++] = *ssh->portfwd_strptr++;
}
dports[n] = 0;
ssh->portfwd_strptr++;
dport = atoi(dports);
dserv = 0;
if (dport == 0) {
dserv = 1;
dport = net_service_lookup(dports);
if (!dport) {
logeventf(ssh, "Service lookup failed for"
" destination port \"%s\"", dports);
}
}
} else {
while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
}
sport = atoi(sports);
sserv = 0;
@ -3197,6 +3201,15 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
host,
(int)(dserv ? strlen(dports) : 0), dports,
dserv, "(", dport, dserv, ")");
} else if (type == 'D') {
pfd_addforward(NULL, -1, *saddr ? saddr : NULL,
sport, ssh, &ssh->cfg);
logeventf(ssh, "Local port %.*s%.*s%.*s%.*s%d%.*s"
" doing SOCKS dynamic forwarding",
(int)(*saddr?strlen(saddr):0), *saddr?saddr:NULL,
(int)(*saddr?1:0), ":",
(int)(sserv ? strlen(sports) : 0), sports,
sserv, "(", sport, sserv, ")");
} else {
struct ssh_rportfwd *pf;
pf = snew(struct ssh_rportfwd);
@ -5230,30 +5243,34 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
if (n < 255) sports[n++] = *ssh->portfwd_strptr++;
}
sports[n] = 0;
if (*ssh->portfwd_strptr == '\t')
ssh->portfwd_strptr++;
n = 0;
while (*ssh->portfwd_strptr && *ssh->portfwd_strptr != ':') {
if (n < 255) host[n++] = *ssh->portfwd_strptr++;
}
host[n] = 0;
if (*ssh->portfwd_strptr == ':')
ssh->portfwd_strptr++;
n = 0;
while (*ssh->portfwd_strptr) {
if (n < 255) dports[n++] = *ssh->portfwd_strptr++;
}
dports[n] = 0;
ssh->portfwd_strptr++;
dport = atoi(dports);
dserv = 0;
if (dport == 0) {
dserv = 1;
dport = net_service_lookup(dports);
if (!dport) {
logeventf(ssh, "Service lookup failed for destination"
" port \"%s\"", dports);
if (type != 'D') {
if (*ssh->portfwd_strptr == '\t')
ssh->portfwd_strptr++;
n = 0;
while (*ssh->portfwd_strptr && *ssh->portfwd_strptr != ':') {
if (n < 255) host[n++] = *ssh->portfwd_strptr++;
}
host[n] = 0;
if (*ssh->portfwd_strptr == ':')
ssh->portfwd_strptr++;
n = 0;
while (*ssh->portfwd_strptr) {
if (n < 255) dports[n++] = *ssh->portfwd_strptr++;
}
dports[n] = 0;
ssh->portfwd_strptr++;
dport = atoi(dports);
dserv = 0;
if (dport == 0) {
dserv = 1;
dport = net_service_lookup(dports);
if (!dport) {
logeventf(ssh, "Service lookup failed for destination"
" port \"%s\"", dports);
}
}
} else {
while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
}
sport = atoi(sports);
sserv = 0;
@ -5278,6 +5295,15 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
host,
(int)(dserv ? strlen(dports) : 0), dports,
dserv, "(", dport, dserv, ")");
} else if (type == 'D') {
pfd_addforward(NULL, -1, *saddr ? saddr : NULL,
sport, ssh, &ssh->cfg);
logeventf(ssh, "Local port %.*s%.*s%.*s%.*s%d%.*s"
" doing SOCKS dynamic forwarding",
(int)(*saddr?strlen(saddr):0), *saddr?saddr:NULL,
(int)(*saddr?1:0), ":",
(int)(sserv ? strlen(sports) : 0), sports,
sserv, "(", sport, sserv, ")");
} else {
struct ssh_rportfwd *pf;
pf = snew(struct ssh_rportfwd);