===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/channels.h,v
retrieving revision 1.79.2.2
retrieving revision 1.80
diff -u -r1.79.2.2 -r1.80
--- src/usr.bin/ssh/channels.h	2006/10/06 03:19:32	1.79.2.2
+++ src/usr.bin/ssh/channels.h	2005/10/10 10:23:08	1.80
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.79.2.2 2006/10/06 03:19:32 brad Exp $ */
+/*	$OpenBSD: channels.h,v 1.80 2005/10/10 10:23:08 djm Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,6 +38,8 @@
 #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. */
@@ -61,8 +63,7 @@
 typedef struct Channel Channel;
 
 typedef void channel_callback_fn(int, void *);
-typedef int channel_infilter_fn(struct Channel *, char *, int);
-typedef u_char *channel_outfilter_fn(struct Channel *, u_char **, u_int *);
+typedef int channel_filter_fn(struct Channel *, char *, int);
 
 struct Channel {
 	int     type;		/* channel type/state */
@@ -109,10 +110,7 @@
 	int			detach_close;
 
 	/* filter */
-	channel_infilter_fn	*input_filter;
-	channel_outfilter_fn	*output_filter;
-
-	int     datagram;	/* keep boundaries */
+	channel_filter_fn	*input_filter;
 };
 
 #define CHAN_EXTENDED_IGNORE		0
@@ -144,8 +142,6 @@
 #define CHAN_EOF_SENT			0x04
 #define CHAN_EOF_RCVD			0x08
 
-#define CHAN_RBUF	16*1024
-
 /* check whether 'efd' is still in use */
 #define CHANNEL_EFD_INPUT_ACTIVE(c) \
 	(compat20 && c->extended_usage == CHAN_EXTENDED_READ && \
@@ -158,7 +154,6 @@
 
 /* channel management */
 
-Channel	*channel_by_id(int);
 Channel	*channel_lookup(int);
 Channel *channel_new(char *, int, int, int, int, u_int, u_int, int, char *, int);
 void	 channel_set_fds(int, int, int, int, int, int, u_int);
@@ -170,7 +165,7 @@
 void	 channel_request_start(int, char *, int);
 void	 channel_register_cleanup(int, channel_callback_fn *, int);
 void	 channel_register_confirm(int, channel_callback_fn *, void *);
-void	 channel_register_filter(int, channel_infilter_fn *, channel_outfilter_fn *);
+void	 channel_register_filter(int, channel_filter_fn *);
 void	 channel_cancel_cleanup(int);
 int	 channel_close_fd(int *);
 void	 channel_send_window_changes(void);
@@ -204,13 +199,11 @@
 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_clear_adm_permitted_opens(void);
-int      channel_input_port_forward_request(int, int);
+void     channel_input_port_forward_request(int, int);
 int	 channel_connect_to(const char *, u_short);
 int	 channel_connect_by_listen_address(u_short);
-int	 channel_request_remote_forwarding(const char *, u_short,
+void	 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);