- millert@cvs.openbsd.org 2014/07/15 15:54:14

     [PROTOCOL auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
     [auth-rsa.c auth.c auth1.c auth2-hostbased.c auth2-kbdint.c auth2-none.c]
     [auth2-passwd.c auth2-pubkey.c auth2.c canohost.c channels.c channels.h]
     [clientloop.c misc.c misc.h monitor.c mux.c packet.c readconf.c]
     [readconf.h servconf.c servconf.h serverloop.c session.c ssh-agent.c]
     [ssh.c ssh_config.5 sshconnect.c sshconnect1.c sshconnect2.c sshd.c]
     [sshd_config.5 sshlogin.c]
     Add support for Unix domain socket forwarding.  A remote TCP port
     may be forwarded to a local Unix domain socket and vice versa or
     both ends may be a Unix domain socket.  This is a reimplementation
     of the streamlocal patches by William Ahern from:
         http://www.25thandclement.com/~william/projects/streamlocal.html
     OK djm@ markus@

1 files changed, 24 insertions, 1 deletions

diff --git a/misc.h b/misc.h
index 7b0c503a3..374c33ce1 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.53 2014/05/02 03:27:54 djm Exp $ */
+/* $OpenBSD: misc.h,v 1.54 2014/07/15 15:54:14 millert Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,6 +15,25 @@
 #ifndef _MISC_H
 #define _MISC_H
 
+/* Data structure for representing a forwarding request. */
+struct Forward {
+        char     *listen_host;          /* Host (address) to listen on. */
+        int       listen_port;          /* Port to forward. */
+        char     *listen_path;          /* Path to bind domain socket. */
+        char     *connect_host;         /* Host to connect. */
+        int       connect_port;         /* Port to connect on connect_host. */
+        char     *connect_path;         /* Path to connect domain socket. */
+        int       allocated_port;       /* Dynamically allocated listen port */
+        int       handle;               /* Handle for dynamic listen ports */
+};
+
+/* Common server and client forwarding options. */
+struct ForwardOptions {
+        int      gateway_ports; /* Allow remote connects to forwarded ports. */
+        mode_t   streamlocal_bind_mask; /* umask for streamlocal binds */
+        int      streamlocal_bind_unlink; /* unlink socket before bind */
+};
+
 /* misc.c */
 
 char    *chop(char *);
@@ -37,6 +56,7 @@ void	 ms_subtract_diff(struct timeval *, int *);
 void     ms_to_timeval(struct timeval *, int);
 time_t   monotime(void);
 void     lowercase(char *s);
+int      unix_listener(const char *, int, int);
 
 void     sock_set_v6only(int);
 
@@ -68,6 +88,9 @@ int	 tun_open(int, int);
 #define SSH_TUNID_ERR           (SSH_TUNID_ANY - 1)
 #define SSH_TUNID_MAX           (SSH_TUNID_ANY - 2)
 
+/* Fake port to indicate that host field is really a path. */
+#define PORT_STREAMLOCAL        -2
+
 /* Functions to extract or store big-endian words of various sizes */
 u_int64_t       get_u64(const void *)
     __attribute__((__bounded__( __minbytes__, 1, 8)));