projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
`ssh-default': change the /DSSH_DEFAULT flag to a /DTELNET_DEFAULT one
[u/mdw/putty]
/
portfwd.c
diff --git
a/portfwd.c
b/portfwd.c
index
94aec6e
..
1143714
100644
(file)
--- a/
portfwd.c
+++ b/
portfwd.c
@@
-57,7
+57,7
@@
struct pfwd_queue {
};
struct PFwdPrivate {
};
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 */
/* 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 */
@@
-108,9
+108,10
@@
static void pfd_sent(Plug plug, int bufsize)
/*
* Called when receiving a PORT OPEN from the server
*/
/*
* 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,
pfd_closing,
pfd_receive,
pfd_sent,
@@
-124,7
+125,7
@@
char *pfd_newconnect(Socket *s, char *hostname, int port, void *c)
/*
* Try to find host.
*/
/*
* Try to find host.
*/
- addr = name_lookup(hostname, port, &dummy_realhost);
+ addr = name_lookup(hostname, port, &dummy_realhost
, cfg
);
if ((err = sk_addr_error(addr)) != NULL)
return err;
if ((err = sk_addr_error(addr)) != NULL)
return err;
@@
-138,7
+139,8
@@
char *pfd_newconnect(Socket *s, char *hostname, int port, void *c)
pr->c = c;
pr->backhandle = NULL; /* we shouldn't need this */
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);
+ 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;
if ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;
@@
-155,7
+157,7
@@
char *pfd_newconnect(Socket *s, char *hostname, int port, void *c)
static int pfd_accepting(Plug p, void *sock)
{
static int pfd_accepting(Plug p, void *sock)
{
- static struct plug_function_table fn_table = {
+ static
const
struct plug_function_table fn_table = {
pfd_closing,
pfd_receive,
pfd_sent,
pfd_closing,
pfd_receive,
pfd_sent,
@@
-204,9
+206,9
@@
static int pfd_accepting(Plug p, void *sock)
sets up a listener on the local machine on (srcaddr:)port
*/
char *pfd_addforward(char *desthost, int destport, char *srcaddr, int port,
sets up a listener on the local machine on (srcaddr:)port
*/
char *pfd_addforward(char *desthost, int destport, char *srcaddr, int port,
- void *backhandle)
+ 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_sent, /* also should not happen */
pfd_closing,
pfd_receive, /* should not happen... */
pfd_sent, /* also should not happen */
@@
-230,7
+232,8
@@
char *pfd_addforward(char *desthost, int destport, char *srcaddr, int port,
pr->waiting = NULL;
pr->backhandle = backhandle;
pr->waiting = NULL;
pr->backhandle = backhandle;
- pr->s = s = new_listener(srcaddr, port, (Plug) pr, !cfg.lport_acceptall);
+ pr->s = s = new_listener(srcaddr, port, (Plug) pr,
+ !cfg->lport_acceptall, cfg);
if ((err = sk_socket_error(s)) != NULL) {
sfree(pr);
return err;
if ((err = sk_socket_error(s)) != NULL) {
sfree(pr);
return err;