merge 6.0p1

1 files changed, 8 insertions, 2 deletions

diff --git a/channels.h b/channels.h
index e2941c85a..c1f01c48b 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.105 2011/06/22 22:08:42 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.109 2011/09/23 07:45:05 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -57,6 +57,8 @@
 #define SSH_CHANNEL_MUX_CLIENT          16      /* Conn. to mux slave */
 #define SSH_CHANNEL_MAX_TYPE            17
 
+#define CHANNEL_CANCEL_PORT_STATIC      -1
+
 struct Channel;
 typedef struct Channel Channel;
 
@@ -116,6 +118,7 @@ struct Channel {
         char    *path;
                 /* path for unix domain sockets, or host name for forwards */
         int     listening_port; /* port being listened for forwards */
+        char   *listening_addr; /* addr being listened for forwards */
         int     host_port;      /* remote port to connect for forwards */
         char   *remote_name;    /* remote hostname */
 
@@ -250,6 +253,7 @@ void	 channel_set_af(int af);
 void     channel_permit_all_opens(void);
 void     channel_add_permitted_opens(char *, int);
 int      channel_add_adm_permitted_opens(char *, int);
+void     channel_update_permitted_opens(int, int);
 void     channel_clear_permitted_opens(void);
 void     channel_clear_adm_permitted_opens(void);
 void     channel_print_adm_permitted_opens(void);
@@ -261,9 +265,11 @@ int	 channel_request_remote_forwarding(const char *, u_short,
              const char *, u_short);
 int      channel_setup_local_fwd_listener(const char *, u_short,
              const char *, u_short, int);
-void     channel_request_rforward_cancel(const char *host, u_short port);
+int      channel_request_rforward_cancel(const char *host, u_short port);
 int      channel_setup_remote_fwd_listener(const char *, u_short, int *, int);
 int      channel_cancel_rport_listener(const char *, u_short);
+int      channel_cancel_lport_listener(const char *, u_short, int, int);
+int      permitopen_port(const char *);
 
 /* x11 forwarding */