X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b8a98e2597d1db9b40442c9a2aa6474ecf54353d..51e9d3c00a3471f284e89ec1f59f38ca25f10c5f:/portfwd.c diff --git a/portfwd.c b/portfwd.c index f7402673..54a68769 100644 --- a/portfwd.c +++ b/portfwd.c @@ -11,46 +11,6 @@ #define TRUE 1 #endif -#define GET_32BIT_LSB_FIRST(cp) \ - (((unsigned long)(unsigned char)(cp)[0]) | \ - ((unsigned long)(unsigned char)(cp)[1] << 8) | \ - ((unsigned long)(unsigned char)(cp)[2] << 16) | \ - ((unsigned long)(unsigned char)(cp)[3] << 24)) - -#define PUT_32BIT_LSB_FIRST(cp, value) ( \ - (cp)[0] = (value), \ - (cp)[1] = (value) >> 8, \ - (cp)[2] = (value) >> 16, \ - (cp)[3] = (value) >> 24 ) - -#define GET_16BIT_LSB_FIRST(cp) \ - (((unsigned long)(unsigned char)(cp)[0]) | \ - ((unsigned long)(unsigned char)(cp)[1] << 8)) - -#define PUT_16BIT_LSB_FIRST(cp, value) ( \ - (cp)[0] = (value), \ - (cp)[1] = (value) >> 8 ) - -#define GET_32BIT_MSB_FIRST(cp) \ - (((unsigned long)(unsigned char)(cp)[0] << 24) | \ - ((unsigned long)(unsigned char)(cp)[1] << 16) | \ - ((unsigned long)(unsigned char)(cp)[2] << 8) | \ - ((unsigned long)(unsigned char)(cp)[3])) - -#define PUT_32BIT_MSB_FIRST(cp, value) ( \ - (cp)[0] = (value) >> 24, \ - (cp)[1] = (value) >> 16, \ - (cp)[2] = (value) >> 8, \ - (cp)[3] = (value) ) - -#define GET_16BIT_MSB_FIRST(cp) \ - (((unsigned long)(unsigned char)(cp)[0] << 8) | \ - ((unsigned long)(unsigned char)(cp)[1])) - -#define PUT_16BIT_MSB_FIRST(cp, value) ( \ - (cp)[0] = (value) >> 8, \ - (cp)[1] = (value) ) - struct PFwdPrivate { const struct plug_function_table *fn; /* the above variable absolutely *must* be the first in this structure */ @@ -86,6 +46,12 @@ struct PFwdPrivate { int buflen; }; +static void pfd_log(Plug plug, int type, SockAddr addr, int port, + const char *error_msg, int error_code) +{ + /* we have to dump these since we have no interface to logging.c */ +} + static int pfd_closing(Plug plug, const char *error_msg, int error_code, int calling_back) { @@ -255,7 +221,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 */ - sk_write(pr->s, reply, lenof(reply)); + sk_write(pr->s, (char *) reply, lenof(reply)); pfd_close(pr->s); return 1; } @@ -266,7 +232,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 */ - 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], @@ -275,7 +241,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len) 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; @@ -284,13 +250,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 */ - 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 @@ -354,9 +320,10 @@ 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, - void *c, const Config *cfg) + void *c, const Config *cfg, int addressfamily) { static const struct plug_function_table fn_table = { + pfd_log, pfd_closing, pfd_receive, pfd_sent, @@ -371,7 +338,7 @@ const char *pfd_newconnect(Socket *s, char *hostname, int port, /* * 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; @@ -390,7 +357,7 @@ const char *pfd_newconnect(Socket *s, char *hostname, int 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; @@ -407,6 +374,7 @@ const char *pfd_newconnect(Socket *s, char *hostname, int port, static int pfd_accepting(Plug p, OSSocket sock) { static const struct plug_function_table fn_table = { + pfd_log, pfd_closing, pfd_receive, pfd_sent, @@ -462,9 +430,11 @@ 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, - 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_log, pfd_closing, pfd_receive, /* should not happen... */ pfd_sent, /* also should not happen */ @@ -493,7 +463,7 @@ const char *pfd_addforward(char *desthost, int destport, char *srcaddr, 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; @@ -501,6 +471,8 @@ const char *pfd_addforward(char *desthost, int destport, char *srcaddr, sk_set_private_ptr(s, pr); + *sockdata = (void *)s; + return NULL; } @@ -519,6 +491,14 @@ void pfd_close(Socket s) sk_close(s); } +/* + * Terminate a listener. + */ +void pfd_terminate(void *sv) +{ + pfd_close((Socket)sv); +} + void pfd_unthrottle(Socket s) { struct PFwdPrivate *pr;