update to http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.7p1-hpn13v1.diff.gz

[gssapi-openssh.git] / openssh / channels.h

diff --git a/openssh/channels.h b/openssh/channels.h
index f380531dcb7dce69fd1540c49dabdf05b894a2a3..da37281ceed3f8cd578e9911c5d2762bb443e32b 100644 (file)
--- a/openssh/channels.h
+++ b/openssh/channels.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: channels.h,v 1.83 2005/12/30 15:56:37 reyk Exp $      */
+/* $OpenBSD: channels.h,v 1.89 2007/06/11 09:14:00 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,8 +38,6 @@
 #ifndef CHANNEL_H
 #define CHANNEL_H
 
-#include "buffer.h"
-
 /* Definitions for channel types. */
 #define SSH_CHANNEL_X11_LISTENER       1       /* Listening for inet X11 conn. */
 #define SSH_CHANNEL_PORT_LISTENER      2       /* Listening on a port. */
@@ -125,17 +123,14 @@ struct Channel {
 #define CHAN_EXTENDED_WRITE            2
 
 /* default window/packet sizes for tcp/x11-fwd-channel */
-#define CHAN_SES_PACKET_DEFAULT                (32*1024)
-#define CHAN_SES_WINDOW_DEFAULT_HPN    (160*CHAN_TCP_PACKET_DEFAULT)
-#define CHAN_SES_WINDOW_DEFAULT                (4*CHAN_SES_PACKET_DEFAULT)
+#define CHAN_SES_PACKET_DEFAULT        (32*1024)
+#define CHAN_SES_WINDOW_DEFAULT        (4*CHAN_SES_PACKET_DEFAULT)
 
-#define CHAN_TCP_PACKET_DEFAULT                (32*1024)
-#define CHAN_TCP_WINDOW_DEFAULT_HPN    (160*CHAN_TCP_PACKET_DEFAULT)
-#define CHAN_TCP_WINDOW_DEFAULT                (4*CHAN_TCP_PACKET_DEFAULT)
+#define CHAN_TCP_PACKET_DEFAULT        (32*1024)
+#define CHAN_TCP_WINDOW_DEFAULT        (4*CHAN_TCP_PACKET_DEFAULT)
 
-#define CHAN_X11_PACKET_DEFAULT                (16*1024)
-#define CHAN_X11_WINDOW_DEFAULT_HPN    (4*CHAN_X11_PACKET_DEFAULT)
-#define CHAN_X11_WINDOW_DEFAULT                (4*CHAN_X11_PACKET_DEFAULT)
+#define CHAN_X11_PACKET_DEFAULT        (16*1024)
+#define CHAN_X11_WINDOW_DEFAULT        (4*CHAN_X11_PACKET_DEFAULT)
 
 /* possible input states */
 #define CHAN_INPUT_OPEN                        0
@@ -202,7 +197,7 @@ void         channel_input_window_adjust(int, u_int32_t, void *);
 
 void    channel_prepare_select(fd_set **, fd_set **, int *, u_int*, int);
 void     channel_after_select(fd_set *, fd_set *);
-void     channel_output_poll(void);
+int      channel_output_poll(void);
 
 int      channel_not_very_much_buffered_data(void);
 void     channel_close_all(void);
@@ -214,11 +209,13 @@ int        channel_find_open(void);
 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_clear_permitted_opens(void);
-void     channel_input_port_forward_request(int, int, int, int);
+void    channel_clear_adm_permitted_opens(void);
+int      channel_input_port_forward_request(int, int, int, int);
 int     channel_connect_to(const char *, u_short);
 int     channel_connect_by_listen_address(u_short);
-void    channel_request_remote_forwarding(const char *, u_short,
+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, int, int);