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) {
pr->dynamic = 0x4000;
if (pr->port < 2) continue;/* don't have command code yet */
if (pr->hostname[1] != 1) {
+ /* Not CONNECT. */
/* Send back a SOCKS 4 error before closing. */
char data[8];
memset(data, 0, sizeof(data));
pfd_close(pr->s);
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)
- continue; /* haven't _finished_ username */
+ 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.
pr->hostname[0] = 0; /* reply version code */
pr->hostname[1] = 90; /* request granted */
sk_write(pr->s, pr->hostname, 8);
- len= pr->port;
+ len= pr->port - 8;
pr->port = GET_16BIT_MSB_FIRST(pr->hostname+2);
memmove(pr->hostname, pr->hostname + 8, len);
goto connect;
if (pr->hostname[1] != 1 || pr->hostname[2] != 0) {
/* Not CONNECT or reserved field nonzero - error */
reply[1] = 1; /* generic failure */
- sk_write(pr->s, reply, lenof(reply));
+ sk_write(pr->s, (char *) reply, lenof(reply));
pfd_close(pr->s);
return 1;
}
pr->port = GET_16BIT_MSB_FIRST(pr->hostname+4+alen);
if (atype == 1) {
/* REP=0 (success) already */
- sk_write(pr->s, reply, lenof(reply));
+ 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],
goto connect;
} else if (atype == 3) {
/* REP=0 (success) already */
- sk_write(pr->s, reply, lenof(reply));
+ sk_write(pr->s, (char *) reply, lenof(reply));
memmove(pr->hostname, pr->hostname + 5, alen-1);
pr->hostname[alen-1] = '\0';
goto connect;
* Unknown address type. (FIXME: support IPv6!)
*/
reply[1] = 8; /* atype not supported */
- sk_write(pr->s, reply, lenof(reply));
+ sk_write(pr->s, (char *) reply, lenof(reply));
pfd_close(pr->s);
- return 1;
+ return 1;
}
}
}
-
+
/*
* If we get here without either having done `continue'
* or `goto connect', it must be because there is no
pr->dynamic = 0;
pr->s = *s = new_connection(addr, dummy_realhost, port,
- 0, 1, 0, (Plug) pr, cfg);
+ 0, 1, 0, 0, (Plug) pr, cfg);
if ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;
if (org->dynamic) {
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_! */
} else {
pr->dynamic = 0;
sets up a listener on the local machine on (srcaddr:)port
*/
const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
- int port, void *backhandle, const Config *cfg)
+ int port, void *backhandle, const Config *cfg,
+ void **sockdata)
{
static const struct plug_function_table fn_table = {
pfd_closing,
sk_set_private_ptr(s, pr);
+ *sockdata = (void *)s;
+
return NULL;
}
sk_close(s);
}
+/*
+ * Terminate a listener.
+ */
+void pfd_terminate(void *sv)
+{
+ pfd_close((Socket)sv);
+}
+
void pfd_unthrottle(Socket s)
{
struct PFwdPrivate *pr;