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

Add random commentary to SOCKS code.

Browse Source 
Also fix what I think are a couple of very minor bugs in SOCKS4; one won't
affect anyone AFAIK, and the other is unlikely to cause trouble.

[originally from svn r3497]
This commit is contained in:
Jacob Nevins 2003-10-10 22:58:53 +00:00
parent 4de860abcf
commit 5415873b3f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
portfwd.c
View File

@ -107,6 +107,10 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
struct PFwdPrivate *pr = (struct PFwdPrivate *) plug; struct PFwdPrivate *pr = (struct PFwdPrivate *) plug;
if (pr->dynamic) { if (pr->dynamic) {
while (len--) { while (len--) {
/*
* Throughout SOCKS negotiation, "hostname" is re-used as a
* random protocol buffer with "port" storing the length.
*/
if (pr->port >= lenof(pr->hostname)) { if (pr->port >= lenof(pr->hostname)) {
/* Request too long. */ /* Request too long. */
if ((pr->dynamic >> 12) == 4) { if ((pr->dynamic >> 12) == 4) {
@ -134,6 +138,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
pr->dynamic = 0x4000; pr->dynamic = 0x4000;
if (pr->port < 2) continue;/* don't have command code yet */ if (pr->port < 2) continue;/* don't have command code yet */
if (pr->hostname[1] != 1) { if (pr->hostname[1] != 1) {
/* Not CONNECT. */
/* Send back a SOCKS 4 error before closing. */ /* Send back a SOCKS 4 error before closing. */
char data[8]; char data[8];
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
@ -142,9 +147,9 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
pfd_close(pr->s); pfd_close(pr->s);
return 1; return 1;
} }
if (pr->port < 8) continue; /* haven't started username */ if (pr->port <= 8) continue; /* haven't started user/hostname */
if (pr->hostname[pr->port-1] != 0) if (pr->hostname[pr->port-1] != 0)
continue; /* haven't _finished_ username */ continue; /* haven't _finished_ user/hostname */
/* /*
* Now we have a full SOCKS 4 request. Check it to * Now we have a full SOCKS 4 request. Check it to
* see if it's a SOCKS 4A request. * see if it's a SOCKS 4A request.
@ -166,7 +171,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
pr->hostname[0] = 0; /* reply version code */ pr->hostname[0] = 0; /* reply version code */
pr->hostname[1] = 90; /* request granted */ pr->hostname[1] = 90; /* request granted */
sk_write(pr->s, pr->hostname, 8); sk_write(pr->s, pr->hostname, 8);
len= pr->port; len= pr->port - 8;
pr->port = GET_16BIT_MSB_FIRST(pr->hostname+2); pr->port = GET_16BIT_MSB_FIRST(pr->hostname+2);
memmove(pr->hostname, pr->hostname + 8, len); memmove(pr->hostname, pr->hostname + 8, len);
goto connect; goto connect;
@ -432,7 +437,7 @@ static int pfd_accepting(Plug p, OSSocket sock)
if (org->dynamic) { if (org->dynamic) {
pr->dynamic = 1; pr->dynamic = 1;
pr->port = 0; /* hostname buffer is so far empty */ pr->port = 0; /* "hostname" buffer is so far empty */
sk_set_frozen(s, 0); /* we want to receive SOCKS _now_! */ sk_set_frozen(s, 0); /* we want to receive SOCKS _now_! */
} else { } else {
pr->dynamic = 0; pr->dynamic = 0;