20010115

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index a74f592617871ff065bdc8d18d7db3d8c7478a2e..45b783fb31e880338721f16761f9470d5a2bdce6 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -32,7 +32,7 @@
  * (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.20 2000/09/21 11:25:33 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.24 2000/12/05 20:34:10 markus Exp $"); */
 
 #ifndef CHANNELS_H
 #define CHANNELS_H
@@ -49,7 +49,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
@@ -117,7 +119,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,7 +130,13 @@ 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);
+    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);
@@ -142,7 +149,6 @@ 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);
-void   channel_input_open(int type, int plen, void *ctxt);
 
 /* Sets specific protocol options. */
 void    channel_set_options(int hostname_in_open);
@@ -197,12 +203,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);
+channel_request_local_forwarding(u_short listen_port,
+    const char *host_to_connect, u_short port_to_connect, int gateway_ports);
+void
+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
@@ -283,6 +292,7 @@ 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