1 files changed, 30 insertions, 1 deletions

diff --git a/misc.h b/misc.h
index ceb173bda..89e1f75d3 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.50 2013/10/14 23:28:23 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)));
@@ -82,6 +105,12 @@ void		put_u32(void *, u_int32_t)
 void            put_u16(void *, u_int16_t)
     __attribute__((__bounded__( __minbytes__, 1, 2)));
 
+/* Little-endian store/load, used by umac.c */
+u_int32_t       get_u32_le(const void *)
+    __attribute__((__bounded__(__minbytes__, 1, 4)));
+void            put_u32_le(void *, u_int32_t)
+    __attribute__((__bounded__(__minbytes__, 1, 4)));
+
 struct bwlimit {
         size_t buflen;
         u_int64_t rate, thresh, lamt;