- markus@cvs.openbsd.org 2001/03/23 14:28:32

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index c0d60199c14d7da3bbdf244f28950b7f9c6d75cb..493b04aa2903e2d5da5b681510cda245c517309b 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.19 2000/09/07 21:13:37 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.28 2001/03/16 19:06:29 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. */
@@ -49,7 +51,9 @@
 #define SSH_CHANNEL_INPUT_DRAINING     8       /* sending remaining data to conn */
 #define SSH_CHANNEL_OUTPUT_DRAINING    9       /* sending remaining data to app */
 #define SSH_CHANNEL_LARVAL             10      /* larval session */
-#define SSH_CHANNEL_MAX_TYPE           11
+#define SSH_CHANNEL_RPORT_LISTENER     11      /* Listening to a R-style port  */
+#define SSH_CHANNEL_CONNECTING         12
+#define SSH_CHANNEL_MAX_TYPE           13
 
 /*
  * Data structure for channel data.  This is iniailized in channel_allocate
@@ -73,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
@@ -117,7 +122,6 @@ struct Channel {
 #define CHAN_X11_PACKET_DEFAULT        (CHAN_X11_WINDOW_DEFAULT/2)
 
 
-void   channel_set_fds(int id, int rfd, int wfd, int efd, int extusage);
 void   channel_open(int id);
 void   channel_request(int id, char *service, int wantconfirm);
 void   channel_request_start(int id, char *service, int wantconfirm);
@@ -129,20 +133,25 @@ Channel   *channel_lookup(int id);
 
 int
 channel_new(char *ctype, int type, int rfd, int wfd, int efd,
-    int window, int maxpack, int extended_usage, char *remote_name);
-
-void   channel_input_channel_request(int type, int plen);
-void   channel_input_close(int type, int plen);
-void   channel_input_close_confirmation(int type, int plen);
-void   channel_input_data(int type, int plen);
-void   channel_input_extended_data(int type, int plen);
-void   channel_input_ieof(int type, int plen);
-void   channel_input_oclose(int type, int plen);
-void   channel_input_open_confirmation(int type, int plen);
-void   channel_input_open_failure(int type, int plen);
-void   channel_input_port_open(int type, int plen);
-void   channel_input_window_adjust(int type, int plen);
-void   channel_input_open(int type, int plen);
+    int window, int maxpack, int extended_usage, char *remote_name,
+    int nonblock);
+void
+channel_set_fds(int id, int rfd, int wfd, int efd,
+    int extusage, int nonblock);
+
+void   deny_input_open(int type, int plen, void *ctxt);
+
+void   channel_input_channel_request(int type, int plen, void *ctxt);
+void   channel_input_close(int type, int plen, void *ctxt);
+void   channel_input_close_confirmation(int type, int plen, void *ctxt);
+void   channel_input_data(int type, int plen, void *ctxt);
+void   channel_input_extended_data(int type, int plen, void *ctxt);
+void   channel_input_ieof(int type, int plen, void *ctxt);
+void   channel_input_oclose(int type, int plen, void *ctxt);
+void   channel_input_open_confirmation(int type, int plen, void *ctxt);
+void   channel_input_open_failure(int type, int plen, void *ctxt);
+void   channel_input_port_open(int type, int plen, void *ctxt);
+void   channel_input_window_adjust(int type, int plen, void *ctxt);
 
 /* Sets specific protocol options. */
 void    channel_set_options(int hostname_in_open);
@@ -157,8 +166,12 @@ 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);
 
 /*
  * After select, perform any appropriate operations for channels which have
@@ -182,9 +195,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);
 
@@ -197,12 +207,15 @@ char   *channel_open_message(void);
 
 /*
  * Initiate forwarding of connections to local port "port" through the secure
- * channel to host:port from remote side.  This never returns if there was an
- * error.
+ * channel to host:port from remote side.
  */
-void
-channel_request_local_forwarding(u_short port, const char *host,
-    u_short remote_port, int gateway_ports);
+int
+channel_request_local_forwarding(u_short listen_port,
+    const char *host_to_connect, u_short port_to_connect, int gateway_ports);
+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);
 
 /*
  * Initiate forwarding of connections to port "port" on remote host through
@@ -215,12 +228,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
@@ -246,7 +265,7 @@ char   *x11_create_display_inet(int screen, int x11_display_offset);
  * the remote channel number.  We should do whatever we want, and respond
  * with either SSH_MSG_OPEN_CONFIRMATION or SSH_MSG_OPEN_FAILURE.
  */
-void    x11_input_open(int type, int plen);
+void    x11_input_open(int type, int plen, void *ctxt);
 
 /*
  * Requests forwarding of X11 connections.  This should be called on the
@@ -279,10 +298,11 @@ char   *auth_get_socket_name(void);
 int     auth_input_request_forwarding(struct passwd * pw);
 
 /* This is called to process an SSH_SMSG_AGENT_OPEN message. */
-void    auth_input_open_request(int type, int plen);
+void    auth_input_open_request(int type, int plen, void *ctxt);
 
 /* XXX */
 int    channel_connect_to(const char *host, u_short host_port);
+int    channel_connect_by_listen_adress(u_short listen_port);
 int    x11_connect_display(void);
 
 #endif