- stevesk@cvs.openbsd.org 2002/02/04 00:53:39

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index a857db11edec53e15116439d8e261ee69b720680..781c49d479ad9f3bdb012e4b6572cb3330d5bfaf 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -10,7 +10,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 /*
- * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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.57 2002/01/13 21:31:20 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.62 2002/02/03 17:58:21 markus Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -101,9 +101,7 @@ struct Channel {
        char   *ctype;          /* type */
 
        /* callback */
-       channel_callback_fn     *cb_fn;
-       void    *cb_arg;
-       int     cb_event;
+       channel_callback_fn     *confirm;
        channel_callback_fn     *detach_user;
 
        /* filter */
@@ -149,15 +147,14 @@ void       channel_stop_listening(void);
 void    channel_send_open(int);
 void    channel_request(int, char *, int);
 void    channel_request_start(int, char *, int);
-void    channel_register_callback(int, int mtype, channel_callback_fn *, void *);
 void    channel_register_cleanup(int, channel_callback_fn *);
+void    channel_register_confirm(int, channel_callback_fn *);
 void    channel_register_filter(int, channel_filter_fn *);
 void    channel_cancel_cleanup(int);
 int     channel_close_fd(int *);
 
 /* protocol handler */
 
-void    channel_input_channel_request(int, u_int32_t, void *);
 void    channel_input_close(int, u_int32_t, void *);
 void    channel_input_close_confirmation(int, u_int32_t, void *);
 void    channel_input_data(int, u_int32_t, void *);
@@ -190,10 +187,8 @@ void     channel_input_port_forward_request(int, int);
 int     channel_connect_to(const char *, u_short);
 int     channel_connect_by_listen_address(u_short);
 void    channel_request_remote_forwarding(u_short, const char *, u_short);
-int     channel_request_local_forwarding(u_short, const char *, u_short, int);
-int
-channel_request_forwarding(const char *, u_short, const char *, u_short, int,
-    int);
+int     channel_setup_local_fwd_listener(u_short, const char *, u_short, int);
+int     channel_setup_remote_fwd_listener(const char *, u_short, int);
 
 /* x11 forwarding */
 
@@ -215,19 +210,15 @@ void       auth_input_open_request(int, u_int32_t, void *);
 
 int     chan_is_dead(Channel *, int);
 void    chan_mark_dead(Channel *);
-void    chan_init_iostates(Channel *);
-void    chan_init(void);
 
-typedef void    chan_event_fn(Channel *);
+/* channel events */
 
-/* for the input state */
-extern chan_event_fn   *chan_rcvd_oclose;
-extern chan_event_fn   *chan_read_failed;
-extern chan_event_fn   *chan_ibuf_empty;
+void    chan_rcvd_oclose(Channel *);
+void    chan_read_failed(Channel *);
+void    chan_ibuf_empty(Channel *);
 
-/* for the output state */
-extern chan_event_fn   *chan_rcvd_ieof;
-extern chan_event_fn   *chan_write_failed;
-extern chan_event_fn   *chan_obuf_empty;
+void    chan_rcvd_ieof(Channel *);
+void    chan_write_failed(Channel *);
+void    chan_obuf_empty(Channel *);
 
 #endif