connection, and replace it with sensible dynamically allocated
storage. While I'm at it, get rid of the disgusting dual use between
storing an actual hostname and storing an incoming SOCKS request; we
now have a separate pointer variable for each.
git-svn-id: http://svn.tartarus.org/sgt/putty@9903
cda61777-01e9-0310-a592-
d414129be87e
int dynamic;
/*
* `hostname' and `port' are the real hostname and port, once
int dynamic;
/*
* `hostname' and `port' are the real hostname and port, once
- * we know what we're connecting to; they're unused for this
- * purpose while conducting a local SOCKS exchange, which means
- * we can also use them as a buffer and pointer for reading
- * data from the SOCKS client.
+ * we know what we're connecting to.
+ /*
+ * `socksbuf' is the buffer we use to accumulate a SOCKS request.
+ */
+ char *socksbuf;
+ int sockslen, sockssize;
/*
* When doing dynamic port forwarding, we can receive
* connection data before we are actually able to send it; so
/*
* When doing dynamic port forwarding, we can receive
* connection data before we are actually able to send it; so
+static struct PFwdPrivate *new_portfwd_private(void)
+{
+ struct PFwdPrivate *pr = snew(struct PFwdPrivate);
+ pr->hostname = NULL;
+ pr->socksbuf = NULL;
+ pr->sockslen = pr->sockssize = 0;
+ pr->buffer = NULL;
+ return pr;
+}
+
+static void free_portfwd_private(struct PFwdPrivate *pr)
+{
+ if (!pr)
+ return;
+ sfree(pr->hostname);
+ sfree(pr->socksbuf);
+ sfree(pr->buffer);
+ sfree(pr);
+}
+
static void pfd_log(Plug plug, int type, SockAddr addr, int port,
const char *error_msg, int error_code)
{
static void pfd_log(Plug plug, int type, SockAddr addr, int port,
const char *error_msg, int error_code)
{
struct PFwdPrivate *pr = (struct PFwdPrivate *) plug;
if (pr->dynamic) {
while (len--) {
struct PFwdPrivate *pr = (struct PFwdPrivate *) plug;
if (pr->dynamic) {
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)) {
- /* Request too long. */
- if ((pr->dynamic >> 12) == 4) {
- /* Send back a SOCKS 4 error before closing. */
- char data[8];
- memset(data, 0, sizeof(data));
- data[1] = 91; /* generic `request rejected' */
- sk_write(pr->s, data, 8);
- }
- pfd_close(pr->s);
- return 1;
+ if (pr->sockslen >= pr->sockssize) {
+ pr->sockssize = pr->sockslen * 5 / 4 + 256;
+ pr->socksbuf = sresize(pr->socksbuf, pr->sockssize, char);
- pr->hostname[pr->port++] = *data++;
+ pr->socksbuf[pr->sockslen++] = *data++;
/*
* Now check what's in the buffer to see if it's a
* valid and complete message in the SOCKS exchange.
*/
if ((pr->dynamic == 1 || (pr->dynamic >> 12) == 4) &&
/*
* Now check what's in the buffer to see if it's a
* valid and complete message in the SOCKS exchange.
*/
if ((pr->dynamic == 1 || (pr->dynamic >> 12) == 4) &&
- pr->hostname[0] == 4) {
+ pr->socksbuf[0] == 4) {
/*
* SOCKS 4.
*/
if (pr->dynamic == 1)
pr->dynamic = 0x4000;
/*
* SOCKS 4.
*/
if (pr->dynamic == 1)
pr->dynamic = 0x4000;
- if (pr->port < 2) continue;/* don't have command code yet */
- if (pr->hostname[1] != 1) {
+ if (pr->sockslen < 2)
+ continue; /* don't have command code yet */
+ if (pr->socksbuf[1] != 1) {
/* Not CONNECT. */
/* Send back a SOCKS 4 error before closing. */
char data[8];
/* Not CONNECT. */
/* Send back a SOCKS 4 error before closing. */
char data[8];
pfd_close(pr->s);
return 1;
}
pfd_close(pr->s);
return 1;
}
- if (pr->port <= 8) continue; /* haven't started user/hostname */
- if (pr->hostname[pr->port-1] != 0)
+ if (pr->sockslen <= 8)
+ continue; /* haven't started user/hostname */
+ if (pr->socksbuf[pr->sockslen-1] != 0)
continue; /* haven't _finished_ user/hostname */
/*
* Now we have a full SOCKS 4 request. Check it to
* see if it's a SOCKS 4A request.
*/
continue; /* haven't _finished_ user/hostname */
/*
* Now we have a full SOCKS 4 request. Check it to
* see if it's a SOCKS 4A request.
*/
- if (pr->hostname[4] == 0 && pr->hostname[5] == 0 &&
- pr->hostname[6] == 0 && pr->hostname[7] != 0) {
+ if (pr->socksbuf[4] == 0 && pr->socksbuf[5] == 0 &&
+ pr->socksbuf[6] == 0 && pr->socksbuf[7] != 0) {
/*
* It's SOCKS 4A. So if we haven't yet
* collected the host name, we should continue
/*
* It's SOCKS 4A. So if we haven't yet
* collected the host name, we should continue
int len;
if (pr->dynamic == 0x4000) {
pr->dynamic = 0x4001;
int len;
if (pr->dynamic == 0x4000) {
pr->dynamic = 0x4001;
- pr->port = 8; /* reset buffer to overwrite name */
+ pr->sockslen = 8; /* reset buffer to overwrite name */
- pr->hostname[0] = 0; /* reply version code */
- pr->hostname[1] = 90; /* request granted */
- sk_write(pr->s, pr->hostname, 8);
- len= pr->port - 8;
- pr->port = GET_16BIT_MSB_FIRST(pr->hostname+2);
- memmove(pr->hostname, pr->hostname + 8, len);
+ pr->socksbuf[0] = 0; /* reply version code */
+ pr->socksbuf[1] = 90; /* request granted */
+ sk_write(pr->s, pr->socksbuf, 8);
+ len = pr->sockslen - 8;
+ pr->port = GET_16BIT_MSB_FIRST(pr->socksbuf+2);
+ pr->hostname = snewn(len+1, char);
+ pr->hostname[len] = '\0';
+ memcpy(pr->hostname, pr->socksbuf + 8, len);
goto connect;
} else {
/*
goto connect;
} else {
/*
* the IP address into the hostname string and
* then just go.
*/
* the IP address into the hostname string and
* then just go.
*/
- pr->hostname[0] = 0; /* reply version code */
- pr->hostname[1] = 90; /* request granted */
- sk_write(pr->s, pr->hostname, 8);
- pr->port = GET_16BIT_MSB_FIRST(pr->hostname+2);
- sprintf(pr->hostname, "%d.%d.%d.%d",
- (unsigned char)pr->hostname[4],
- (unsigned char)pr->hostname[5],
- (unsigned char)pr->hostname[6],
- (unsigned char)pr->hostname[7]);
+ pr->socksbuf[0] = 0; /* reply version code */
+ pr->socksbuf[1] = 90; /* request granted */
+ sk_write(pr->s, pr->socksbuf, 8);
+ pr->port = GET_16BIT_MSB_FIRST(pr->socksbuf+2);
+ pr->hostname = dupprintf("%d.%d.%d.%d",
+ (unsigned char)pr->socksbuf[4],
+ (unsigned char)pr->socksbuf[5],
+ (unsigned char)pr->socksbuf[6],
+ (unsigned char)pr->socksbuf[7]);
goto connect;
}
}
if ((pr->dynamic == 1 || (pr->dynamic >> 12) == 5) &&
goto connect;
}
}
if ((pr->dynamic == 1 || (pr->dynamic >> 12) == 5) &&
- pr->hostname[0] == 5) {
+ pr->socksbuf[0] == 5) {
/*
* We're receiving a set of method identifiers.
*/
/*
* We're receiving a set of method identifiers.
*/
- if (pr->port < 2) continue;/* no method count yet */
- if (pr->port < 2 + (unsigned char)pr->hostname[1])
+ if (pr->sockslen < 2)
+ continue; /* no method count yet */
+ if (pr->sockslen < 2 + (unsigned char)pr->socksbuf[1])
continue; /* no methods yet */
method = 0xFF; /* invalid */
continue; /* no methods yet */
method = 0xFF; /* invalid */
- for (i = 0; i < (unsigned char)pr->hostname[1]; i++)
- if (pr->hostname[2+i] == 0) {
+ for (i = 0; i < (unsigned char)pr->socksbuf[1]; i++)
+ if (pr->socksbuf[2+i] == 0) {
method = 0;/* no auth */
break;
}
method = 0;/* no auth */
break;
}
data[1] = method;
sk_write(pr->s, data, 2);
pr->dynamic = 0x5001;
data[1] = method;
sk_write(pr->s, data, 2);
pr->dynamic = 0x5001;
- pr->port = 0; /* re-empty the buffer */
+ pr->sockslen = 0; /* re-empty the buffer */
reply[0] = 5; /* VER */
reply[3] = 1; /* ATYP = 1 (IPv4, 0.0.0.0:0) */
reply[0] = 5; /* VER */
reply[3] = 1; /* ATYP = 1 (IPv4, 0.0.0.0:0) */
- if (pr->port < 6) continue;
- atype = (unsigned char)pr->hostname[3];
+ if (pr->sockslen < 6) continue;
+ atype = (unsigned char)pr->socksbuf[3];
if (atype == 1) /* IPv4 address */
alen = 4;
if (atype == 4) /* IPv6 address */
alen = 16;
if (atype == 3) /* domain name has leading length */
if (atype == 1) /* IPv4 address */
alen = 4;
if (atype == 4) /* IPv6 address */
alen = 16;
if (atype == 3) /* domain name has leading length */
- alen = 1 + (unsigned char)pr->hostname[4];
- if (pr->port < 6 + alen) continue;
- if (pr->hostname[1] != 1 || pr->hostname[2] != 0) {
+ alen = 1 + (unsigned char)pr->socksbuf[4];
+ if (pr->sockslen < 6 + alen) continue;
+ if (pr->socksbuf[1] != 1 || pr->socksbuf[2] != 0) {
/* Not CONNECT or reserved field nonzero - error */
reply[1] = 1; /* generic failure */
sk_write(pr->s, (char *) reply, lenof(reply));
/* Not CONNECT or reserved field nonzero - error */
reply[1] = 1; /* generic failure */
sk_write(pr->s, (char *) reply, lenof(reply));
* Now we have a viable connect request. Switch
* on atype.
*/
* Now we have a viable connect request. Switch
* on atype.
*/
- pr->port = GET_16BIT_MSB_FIRST(pr->hostname+4+alen);
+ pr->port = GET_16BIT_MSB_FIRST(pr->socksbuf+4+alen);
if (atype == 1) {
/* REP=0 (success) already */
sk_write(pr->s, (char *) reply, lenof(reply));
if (atype == 1) {
/* REP=0 (success) already */
sk_write(pr->s, (char *) reply, lenof(reply));
- sprintf(pr->hostname, "%d.%d.%d.%d",
- (unsigned char)pr->hostname[4],
- (unsigned char)pr->hostname[5],
- (unsigned char)pr->hostname[6],
- (unsigned char)pr->hostname[7]);
+ pr->hostname = dupprintf("%d.%d.%d.%d",
+ (unsigned char)pr->socksbuf[4],
+ (unsigned char)pr->socksbuf[5],
+ (unsigned char)pr->socksbuf[6],
+ (unsigned char)pr->socksbuf[7]);
goto connect;
} else if (atype == 3) {
/* REP=0 (success) already */
sk_write(pr->s, (char *) reply, lenof(reply));
goto connect;
} else if (atype == 3) {
/* REP=0 (success) already */
sk_write(pr->s, (char *) reply, lenof(reply));
- memmove(pr->hostname, pr->hostname + 5, alen-1);
+ pr->hostname = snewn(alen, char);
pr->hostname[alen-1] = '\0';
pr->hostname[alen-1] = '\0';
+ memcpy(pr->hostname, pr->socksbuf + 5, alen-1);
goto connect;
} else {
/*
goto connect;
} else {
/*
* connection.
*/
connect:
* connection.
*/
connect:
+ sfree(pr->socksbuf);
+ pr->socksbuf = NULL;
/*
* Freeze the socket until the SSH server confirms the
/*
* Freeze the socket until the SSH server confirms the
- pr = snew(struct PFwdPrivate);
- pr->buffer = NULL;
+ pr = new_portfwd_private();
pr->fn = &fn_table;
pr->throttled = pr->throttle_override = 0;
pr->ready = 1;
pr->fn = &fn_table;
pr->throttled = pr->throttle_override = 0;
pr->ready = 1;
pr->s = *s = new_connection(addr, dummy_realhost, port,
0, 1, 0, 0, (Plug) pr, conf);
if ((err = sk_socket_error(*s)) != NULL) {
pr->s = *s = new_connection(addr, dummy_realhost, port,
0, 1, 0, 0, (Plug) pr, conf);
if ((err = sk_socket_error(*s)) != NULL) {
+ free_portfwd_private(pr);
const char *err;
org = (struct PFwdPrivate *)p;
const char *err;
org = (struct PFwdPrivate *)p;
- pr = snew(struct PFwdPrivate);
- pr->buffer = NULL;
+ pr = new_portfwd_private();
pr->fn = &fn_table;
pr->c = NULL;
pr->fn = &fn_table;
pr->c = NULL;
pr->s = s = sk_register(sock, (Plug) pr);
if ((err = sk_socket_error(s)) != NULL) {
pr->s = s = sk_register(sock, (Plug) pr);
if ((err = sk_socket_error(s)) != NULL) {
+ free_portfwd_private(pr);
sk_set_frozen(s, 0); /* we want to receive SOCKS _now_! */
} else {
pr->dynamic = 0;
sk_set_frozen(s, 0); /* we want to receive SOCKS _now_! */
} else {
pr->dynamic = 0;
- strcpy(pr->hostname, org->hostname);
+ pr->hostname = dupstr(org->hostname);
pr->port = org->port;
pr->c = new_sock_channel(org->backhandle, s);
if (pr->c == NULL) {
pr->port = org->port;
pr->c = new_sock_channel(org->backhandle, s);
if (pr->c == NULL) {
+ free_portfwd_private(pr);
return 1;
} else {
/* asks to forward to the specified host/port for this */
return 1;
} else {
/* asks to forward to the specified host/port for this */
- pr = snew(struct PFwdPrivate);
- pr->buffer = NULL;
+ pr = new_portfwd_private();
pr->fn = &fn_table;
pr->c = NULL;
if (desthost) {
pr->fn = &fn_table;
pr->c = NULL;
if (desthost) {
- strcpy(pr->hostname, desthost);
+ pr->hostname = dupstr(desthost);
pr->port = destport;
pr->dynamic = 0;
} else
pr->port = destport;
pr->dynamic = 0;
} else
!conf_get_int(conf, CONF_lport_acceptall),
conf, address_family);
if ((err = sk_socket_error(s)) != NULL) {
!conf_get_int(conf, CONF_lport_acceptall),
conf, address_family);
if ((err = sk_socket_error(s)) != NULL) {
+ free_portfwd_private(pr);
pr = (struct PFwdPrivate *) sk_get_private_ptr(s);
pr = (struct PFwdPrivate *) sk_get_private_ptr(s);
- sfree(pr->buffer);
- sfree(pr);
+ free_portfwd_private(pr);