-#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
};
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 */
struct pfwd_queue *waiting;
};
-void pfd_close(Socket s);
-
static int pfd_closing(Plug plug, char *error_msg, int error_code,
int calling_back)
/*
* 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,
/*
* 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;
/*
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, cfg);
+ if ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;
}
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,
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;
}
/* 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, void *backhandle)
+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_sent, /* also should not happen */
pr->waiting = NULL;
pr->backhandle = backhandle;
- pr->s = s = new_listener(port, (Plug) pr, !cfg.lport_acceptall);
- 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;
}