projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate unfix.org's IPv6 patches up to level 10, with rather a lot
[u/mdw/putty]
/
portfwd.c
diff --git
a/portfwd.c
b/portfwd.c
index
a8c8b04
..
1239f67
100644
(file)
--- a/
portfwd.c
+++ b/
portfwd.c
@@
-107,6
+107,10
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
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) {
if (pr->port >= lenof(pr->hostname)) {
/* Request too long. */
if ((pr->dynamic >> 12) == 4) {
@@
-134,6
+138,7
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
pr->dynamic = 0x4000;
if (pr->port < 2) continue;/* don't have command code yet */
if (pr->hostname[1] != 1) {
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));
/* Send back a SOCKS 4 error before closing. */
char data[8];
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);
return 1;
}
pfd_close(pr->s);
return 1;
}
- if (pr->port <
8) continue; /* haven't started user
name */
+ if (pr->port <
= 8) continue; /* haven't started user/host
name */
if (pr->hostname[pr->port-1] != 0)
if (pr->hostname[pr->port-1] != 0)
- continue; /* haven't _finished_ username */
+ continue; /* haven't _finished_ user
/host
name */
/*
* Now we have a full SOCKS 4 request. Check it to
* see if it's a SOCKS 4A request.
/*
* Now we have a full SOCKS 4 request. Check it to
* 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[1] = 90; /* request granted */
sk_write(pr->s, pr->hostname, 8);
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;
pr->port = GET_16BIT_MSB_FIRST(pr->hostname+2);
memmove(pr->hostname, pr->hostname + 8, len);
goto connect;
@@
-250,7
+255,7
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
if (pr->hostname[1] != 1 || pr->hostname[2] != 0) {
/* Not CONNECT or reserved field nonzero - error */
reply[1] = 1; /* generic failure */
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;
}
pfd_close(pr->s);
return 1;
}
@@
-261,7
+266,7
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
pr->port = GET_16BIT_MSB_FIRST(pr->hostname+4+alen);
if (atype == 1) {
/* REP=0 (success) already */
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],
sprintf(pr->hostname, "%d.%d.%d.%d",
(unsigned char)pr->hostname[4],
(unsigned char)pr->hostname[5],
@@
-270,7
+275,7
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
goto connect;
} else if (atype == 3) {
/* REP=0 (success) already */
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;
memmove(pr->hostname, pr->hostname + 5, alen-1);
pr->hostname[alen-1] = '\0';
goto connect;
@@
-279,13
+284,13
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
* Unknown address type. (FIXME: support IPv6!)
*/
reply[1] = 8; /* atype not supported */
* 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);
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
/*
* If we get here without either having done `continue'
* or `goto connect', it must be because there is no
@@
-349,7
+354,7
@@
static void pfd_sent(Plug plug, int bufsize)
* Called when receiving a PORT OPEN from the server
*/
const char *pfd_newconnect(Socket *s, char *hostname, int port,
* Called when receiving a PORT OPEN from the server
*/
const char *pfd_newconnect(Socket *s, char *hostname, int port,
- void *c, const Config *cfg)
+ void *c, const Config *cfg
, int addressfamily
)
{
static const struct plug_function_table fn_table = {
pfd_closing,
{
static const struct plug_function_table fn_table = {
pfd_closing,
@@
-366,7
+371,7
@@
const char *pfd_newconnect(Socket *s, char *hostname, int port,
/*
* Try to find host.
*/
/*
* Try to find host.
*/
- addr = name_lookup(hostname, port, &dummy_realhost, cfg);
+ addr = name_lookup(hostname, port, &dummy_realhost, cfg
, addressfamily
);
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
@@
-385,7
+390,7
@@
const char *pfd_newconnect(Socket *s, char *hostname, int port,
pr->dynamic = 0;
pr->s = *s = new_connection(addr, dummy_realhost, port,
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 ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;
@@
-432,7
+437,7
@@
static int pfd_accepting(Plug p, OSSocket sock)
if (org->dynamic) {
pr->dynamic = 1;
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;
sk_set_frozen(s, 0); /* we want to receive SOCKS _now_! */
} else {
pr->dynamic = 0;
@@
-457,7
+462,8
@@
static int pfd_accepting(Plug p, OSSocket sock)
sets up a listener on the local machine on (srcaddr:)port
*/
const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
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, int address_family)
{
static const struct plug_function_table fn_table = {
pfd_closing,
{
static const struct plug_function_table fn_table = {
pfd_closing,
@@
-488,7
+494,7
@@
const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
pr->backhandle = backhandle;
pr->s = s = new_listener(srcaddr, port, (Plug) pr,
pr->backhandle = backhandle;
pr->s = s = new_listener(srcaddr, port, (Plug) pr,
- !cfg->lport_acceptall, cfg);
+ !cfg->lport_acceptall, cfg
, address_family
);
if ((err = sk_socket_error(s)) != NULL) {
sfree(pr);
return err;
if ((err = sk_socket_error(s)) != NULL) {
sfree(pr);
return err;
@@
-496,6
+502,8
@@
const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
sk_set_private_ptr(s, pr);
sk_set_private_ptr(s, pr);
+ *sockdata = (void *)s;
+
return NULL;
}
return NULL;
}
@@
-514,6
+522,14
@@
void pfd_close(Socket s)
sk_close(s);
}
sk_close(s);
}
+/*
+ * Terminate a listener.
+ */
+void pfd_terminate(void *sv)
+{
+ pfd_close((Socket)sv);
+}
+
void pfd_unthrottle(Socket s)
{
struct PFwdPrivate *pr;
void pfd_unthrottle(Socket s)
{
struct PFwdPrivate *pr;