Import of OpenSSH 2.3.0 (virgin OpenBSD source release).

1 files changed, 23 insertions, 18 deletions

diff --git a/crypto/openssh/channels.h b/crypto/openssh/channels.h
index c0d6019..0052686 100644
--- a/crypto/openssh/channels.h
+++ b/crypto/openssh/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.19 2000/09/07 21:13:37 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.22 2000/10/27 07:48:22 markus Exp $"); */
 
 #ifndef CHANNELS_H
 #define CHANNELS_H
@@ -117,7 +117,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 +128,26 @@ 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);
+void	channel_input_open(int type, int plen, void *ctxt);
 
 /* Sets specific protocol options. */
 void    channel_set_options(int hostname_in_open);
@@ -246,7 +251,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,7 +284,7 @@ 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);