~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Placate a trivial compiler warning.
[sgt/putty]
/
portfwd.c
diff --git
a/portfwd.c
b/portfwd.c
index
919d27d
..
dd8e655
100644
(file)
--- a/
portfwd.c
+++ b/
portfwd.c
@@
-1,4
+1,3
@@
-#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-61,6
+60,8
@@
struct PFwdPrivate {
struct plug_function_table *fn;
/* the above variable absolutely *must* be the first in this structure */
void *c; /* (channel) data used by ssh.c */
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;
Socket s;
char hostname[128];
int throttled, throttle_override;
@@
-137,6
+138,7
@@
char *pfd_newconnect(Socket *s, char *hostname, int port, void *c)
pr->throttled = pr->throttle_override = 0;
pr->ready = 1;
pr->c = c;
pr->throttled = pr->throttle_override = 0;
pr->ready = 1;
pr->c = c;
+ pr->backhandle = NULL; /* we shouldn't need this */
pr->s = *s = new_connection(addr, dummy_realhost, port, 0, 1, 0, (Plug) pr);
if ((err = sk_socket_error(*s))) {
pr->s = *s = new_connection(addr, dummy_realhost, port, 0, 1, 0, (Plug) pr);
if ((err = sk_socket_error(*s))) {
@@
-170,6
+172,7
@@
static int pfd_accepting(Plug p, void *sock)
pr->fn = &fn_table;
pr->c = NULL;
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))) {
pr->s = s = sk_register(sock, (Plug) pr);
if ((err = sk_socket_error(s))) {
@@
-177,7
+180,7
@@
static int pfd_accepting(Plug p, void *sock)
return err != NULL;
}
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;
strcpy(pr->hostname, org->hostname);
pr->port = org->port;
@@
-200,9
+203,10
@@
static int pfd_accepting(Plug p, void *sock)
/* Add a new forwarding from port -> desthost:destport
/* Add a new forwarding from port -> desthost:destport
- sets up a listener 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)
{
static struct plug_function_table fn_table = {
pfd_closing,
{
static struct plug_function_table fn_table = {
pfd_closing,
@@
-226,8
+230,9
@@
char *pfd_addforward(char *desthost, int destport, int port)
pr->throttled = pr->throttle_override = 0;
pr->ready = 0;
pr->waiting = NULL;
pr->throttled = pr->throttle_override = 0;
pr->ready = 0;
pr->waiting = NULL;
+ pr->backhandle = backhandle;
- pr->s = s = new_listener(port, (Plug) pr, !cfg.lport_acceptall);
+ pr->s = s = new_listener(
srcaddr,
port, (Plug) pr, !cfg.lport_acceptall);
if ((err = sk_socket_error(s))) {
sfree(pr);
return err;
if ((err = sk_socket_error(s))) {
sfree(pr);
return err;