- djm@cvs.openbsd.org 2005/03/01 10:09:52

     [auth-options.c channels.c channels.h clientloop.c compat.c compat.h]
     [misc.c misc.h readconf.c readconf.h servconf.c ssh.1 ssh.c ssh_config.5]
     [sshd_config.5]
     bz#413: allow optional specification of bind address for port forwardings.
     Patch originally by Dan Astorian, but worked on by several people
     Adds GatewayPorts=clientspecified option on server to allow remote
     forwards to bind to client-specified ports.

1 files changed, 8 insertions, 6 deletions

diff --git a/readconf.h b/readconf.h
index ded422585..03b772a2d 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: readconf.h,v 1.64 2004/07/11 17:48:47 deraadt Exp $   */
+/*      $OpenBSD: readconf.h,v 1.65 2005/03/01 10:09:52 djm Exp $       */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -21,9 +21,10 @@
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
-        u_short   port;         /* Port to forward. */
-        char     *host;         /* Host to connect. */
-        u_short   host_port;    /* Port to connect on host. */
+        char     *listen_host;          /* Host (address) to listen on. */
+        u_short   listen_port;          /* Port to forward. */
+        char     *connect_host;         /* Host to connect. */
+        u_short   connect_port;         /* Port to connect on connect_host. */
 }       Forward;
 /* Data structure for representing option data. */
 
@@ -117,11 +118,12 @@ typedef struct {
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 int      read_config_file(const char *, const char *, Options *, int);
+int      parse_forward(Forward *, const char *);
 
 int
 process_config_line(Options *, const char *, char *, const char *, int, int *);
 
-void     add_local_forward(Options *, u_short, const char *, u_short);
-void     add_remote_forward(Options *, u_short, const char *, u_short);
+void     add_local_forward(Options *, const Forward *);
+void     add_remote_forward(Options *, const Forward *);
 
 #endif                          /* READCONF_H */