- markus@cvs.openbsd.org 2001/04/04 20:25:38

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index 8f5e987fc4c34f8b688b399129d91645f1eeeaca..2cd82148e55259824403ca88a2eb1b31e64b0019 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -32,11 +32,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.23 2000/11/06 23:04:56 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.29 2001/04/04 20:25:36 markus Exp $"); */
 
 #ifndef CHANNELS_H
 #define CHANNELS_H
 
+#include "buffer.h"
+
 /* Definitions for channel types. */
 #define SSH_CHANNEL_FREE               0       /* This channel is free (unused). */
 #define SSH_CHANNEL_X11_LISTENER       1       /* Listening for inet X11 conn. */
@@ -50,7 +52,8 @@
 #define SSH_CHANNEL_OUTPUT_DRAINING    9       /* sending remaining data to app */
 #define SSH_CHANNEL_LARVAL             10      /* larval session */
 #define SSH_CHANNEL_RPORT_LISTENER     11      /* Listening to a R-style port  */
-#define SSH_CHANNEL_MAX_TYPE           12
+#define SSH_CHANNEL_CONNECTING         12
+#define SSH_CHANNEL_MAX_TYPE           13
 
 /*
  * Data structure for channel data.  This is iniailized in channel_allocate
@@ -74,6 +77,7 @@ struct Channel {
        int     wfd;            /* write fd */
        int     efd;            /* extended fd */
        int     sock;           /* sock fd */
+       int     isatty;         /* rfd is a tty */
        Buffer  input;          /* data read from socket, to be sent over
                                 * encrypted connection */
        Buffer  output;         /* data received over encrypted connection for
@@ -162,8 +166,13 @@ int     channel_allocate(int type, int sock, char *remote_name);
 /* Free the channel and close its socket. */
 void    channel_free(int channel);
 
-/* Add any bits relevant to channels in select bitmasks. */
-void    channel_prepare_select(fd_set * readset, fd_set * writeset);
+/*
+ * Allocate/update select bitmasks and add any bits relevant to channels in
+ * select bitmasks.
+ */
+void
+channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
+    int rekeying);
 
 /*
  * After select, perform any appropriate operations for channels which have
@@ -187,9 +196,6 @@ void    channel_stop_listening(void);
  */
 void    channel_close_all(void);
 
-/* Returns the maximum file descriptor number used by the channels. */
-int     channel_max_fd(void);
-
 /* Returns true if there is still an open channel over the connection. */
 int     channel_still_open(void);
 
@@ -204,10 +210,10 @@ char   *channel_open_message(void);
  * Initiate forwarding of connections to local port "port" through the secure
  * channel to host:port from remote side.
  */
-void
+int
 channel_request_local_forwarding(u_short listen_port,
     const char *host_to_connect, u_short port_to_connect, int gateway_ports);
-void
+int
 channel_request_forwarding(const char *listen_address, u_short listen_port,
     const char *host_to_connect, u_short port_to_connect, int gateway_ports,
     int remote_fwd);
@@ -223,12 +229,18 @@ channel_request_remote_forwarding(u_short port, const char *host,
     u_short remote_port);
 
 /*
- * Permits opening to any host/port in SSH_MSG_PORT_OPEN.  This is usually
- * called by the server, because the user could connect to any port anyway,
- * and the server has no way to know but to trust the client anyway.
+ * Permits opening to any host/port if permitted_opens[] is empty.  This is
+ * usually called by the server, because the user could connect to any port
+ * anyway, and the server has no way to know but to trust the client anyway.
  */
 void    channel_permit_all_opens(void);
 
+/* Add host/port to list of allowed targets for port forwarding */
+void   channel_add_permitted_opens(char *host, int port);
+
+/* Flush list */
+void   channel_clear_permitted_opens(void);
+
 /*
  * This is called after receiving CHANNEL_FORWARDING_REQUEST.  This initates
  * listening for the port, and sends back a success reply (or disconnect