X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f26d5c334fe3c74b2647f7ea17ae7f539c5dbca9..c85623f918b8a6c639afc15604414f9b113bb20d:/portfwd.c diff --git a/portfwd.c b/portfwd.c index 76531fb3..11437140 100644 --- a/portfwd.c +++ b/portfwd.c @@ -1,4 +1,3 @@ -#include #include #include @@ -52,27 +51,25 @@ (cp)[0] = (value) >> 8, \ (cp)[1] = (value) ) -extern void sshfwd_close(void *); -extern void sshfwd_write(void *, char *, int); - struct pfwd_queue { struct pfwd_queue *next; char *buf; }; struct PFwdPrivate { - struct plug_function_table *fn; + const struct plug_function_table *fn; /* the above variable absolutely *must* be the first in this structure */ void *c; /* (channel) data used by ssh.c */ + void *backhandle; /* instance of SSH backend itself */ + /* Note that backhandle need not be filled in if c is non-NULL */ Socket s; char hostname[128]; + int throttled, throttle_override; int port; int ready; struct pfwd_queue *waiting; }; -void pfd_close(Socket s); - static int pfd_closing(Plug plug, char *error_msg, int error_code, int calling_back) @@ -92,20 +89,32 @@ static int pfd_closing(Plug plug, char *error_msg, int error_code, static int pfd_receive(Plug plug, int urgent, char *data, int len) { struct PFwdPrivate *pr = (struct PFwdPrivate *) plug; - - if (pr->ready) - sshfwd_write(pr->c, data, len); + if (pr->ready) { + if (sshfwd_write(pr->c, data, len) > 0) { + pr->throttled = 1; + sk_set_frozen(pr->s, 1); + } + } return 1; } +static void pfd_sent(Plug plug, int bufsize) +{ + struct PFwdPrivate *pr = (struct PFwdPrivate *) plug; + + sshfwd_unthrottle(pr->c, bufsize); +} + /* * Called when receiving a PORT OPEN from the server */ -char *pfd_newconnect(Socket *s, char *hostname, int port, void *c) +char *pfd_newconnect(Socket *s, char *hostname, int port, void *c, + const Config *cfg) { - static struct plug_function_table fn_table = { + static const struct plug_function_table fn_table = { pfd_closing, pfd_receive, + pfd_sent, NULL }; @@ -116,8 +125,8 @@ char *pfd_newconnect(Socket *s, char *hostname, int port, void *c) /* * Try to find host. */ - addr = sk_namelookup(hostname, &dummy_realhost); - if ((err = sk_addr_error(addr))) + addr = name_lookup(hostname, port, &dummy_realhost, cfg); + if ((err = sk_addr_error(addr)) != NULL) return err; /* @@ -125,11 +134,14 @@ char *pfd_newconnect(Socket *s, char *hostname, int port, void *c) */ pr = (struct PFwdPrivate *) smalloc(sizeof(struct PFwdPrivate)); pr->fn = &fn_table; + pr->throttled = pr->throttle_override = 0; pr->ready = 1; pr->c = c; + pr->backhandle = NULL; /* we shouldn't need this */ - pr->s = *s = sk_new(addr, port, 0, 1, (Plug) pr); - if ((err = sk_socket_error(*s))) { + pr->s = *s = new_connection(addr, dummy_realhost, port, + 0, 1, 0, (Plug) pr, cfg); + if ((err = sk_socket_error(*s)) != NULL) { sfree(pr); return err; } @@ -143,38 +155,36 @@ char *pfd_newconnect(Socket *s, char *hostname, int port, void *c) called when someone connects to the local port */ -static int pfd_accepting(Plug p, struct sockaddr *addr, void *sock) +static int pfd_accepting(Plug p, void *sock) { - /* for now always accept this socket */ - static struct plug_function_table fn_table = { + static const struct plug_function_table fn_table = { pfd_closing, pfd_receive, + pfd_sent, NULL }; struct PFwdPrivate *pr, *org; - struct sockaddr_in *sin = (struct sockaddr_in *)addr; Socket s; char *err; - if (ntohl(sin->sin_addr.s_addr) != 0x7F000001 && !cfg.lport_acceptall) - return 1; /* denied */ - org = (struct PFwdPrivate *)p; pr = (struct PFwdPrivate *) smalloc(sizeof(struct PFwdPrivate)); pr->fn = &fn_table; pr->c = NULL; + pr->backhandle = org->backhandle; pr->s = s = sk_register(sock, (Plug) pr); - if ((err = sk_socket_error(s))) { + if ((err = sk_socket_error(s)) != NULL) { sfree(pr); return err != NULL; } - pr->c = new_sock_channel(s); + pr->c = new_sock_channel(org->backhandle, s); strcpy(pr->hostname, org->hostname); pr->port = org->port; + pr->throttled = pr->throttle_override = 0; pr->ready = 0; pr->waiting = NULL; @@ -193,13 +203,15 @@ static int pfd_accepting(Plug p, struct sockaddr *addr, void *sock) /* Add a new forwarding from port -> desthost:destport - sets up a listenner on the local machine on port + sets up a listener on the local machine on (srcaddr:)port */ -char *pfd_addforward(char *desthost, int destport, int port) +char *pfd_addforward(char *desthost, int destport, char *srcaddr, int port, + void *backhandle, const Config *cfg) { - static struct plug_function_table fn_table = { + static const struct plug_function_table fn_table = { pfd_closing, - pfd_receive, /* should not happen... */ + pfd_receive, /* should not happen... */ + pfd_sent, /* also should not happen */ pfd_accepting }; @@ -215,11 +227,14 @@ char *pfd_addforward(char *desthost, int destport, int port) pr->c = NULL; strcpy(pr->hostname, desthost); pr->port = destport; + pr->throttled = pr->throttle_override = 0; pr->ready = 0; pr->waiting = NULL; + pr->backhandle = backhandle; - pr->s = s = sk_newlistenner(port, (Plug) pr); - if ((err = sk_socket_error(s))) { + pr->s = s = new_listener(srcaddr, port, (Plug) pr, + !cfg->lport_acceptall, cfg); + if ((err = sk_socket_error(s)) != NULL) { sfree(pr); return err; } @@ -243,27 +258,47 @@ void pfd_close(Socket s) sk_close(s); } +void pfd_unthrottle(Socket s) +{ + struct PFwdPrivate *pr; + if (!s) + return; + pr = (struct PFwdPrivate *) sk_get_private_ptr(s); + + pr->throttled = 0; + sk_set_frozen(s, pr->throttled || pr->throttle_override); +} + +void pfd_override_throttle(Socket s, int enable) +{ + struct PFwdPrivate *pr; + if (!s) + return; + pr = (struct PFwdPrivate *) sk_get_private_ptr(s); + + pr->throttle_override = enable; + sk_set_frozen(s, pr->throttled || pr->throttle_override); +} + /* * Called to send data down the raw connection. */ -void pfd_send(Socket s, char *data, int len) +int pfd_send(Socket s, char *data, int len) { - struct PFwdPrivate *pr = (struct PFwdPrivate *) sk_get_private_ptr(s); - if (s == NULL) - return; - - sk_write(s, data, len); + return 0; + return sk_write(s, data, len); } void pfd_confirm(Socket s) { - struct PFwdPrivate *pr = (struct PFwdPrivate *) sk_get_private_ptr(s); + struct PFwdPrivate *pr; if (s == NULL) return; + pr = (struct PFwdPrivate *) sk_get_private_ptr(s); pr->ready = 1; sk_set_frozen(s, 0); sk_write(s, NULL, 0);