- (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.22.

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index b0f5dc3216ef36c55e12aadc08fa50f932a69949..79ebe047a465c6c19ffd29d6aaaf686450853bc6 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.99 2009/10/28 16:38:18 reyk Exp $ */
+/* $OpenBSD: channels.h,v 1.102 2010/01/11 01:39:46 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -97,7 +97,11 @@ struct Channel {
        int     wfd_isatty;     /* wfd is a tty */
        int     client_tty;     /* (client) TTY has been requested */
        int     force_drain;    /* force close on iEOF */
-       int     delayed;                /* fdset hack */
+       int     delayed;        /* post-select handlers for newly created
+                                * channels are delayed until the first call
+                                * to a matching pre-select handler. 
+                                * this way post-select handlers are not
+                                * accidenly called if a FD gets reused */
        Buffer  input;          /* data read from socket, to be sent over
                                 * encrypted connection */
        Buffer  output;         /* data received over encrypted connection for
@@ -231,7 +235,6 @@ int  channel_find_open(void);
 
 /* tcp forwarding */
 void    channel_set_af(int af);
-void    channel_set_rdomain(int);
 void     channel_permit_all_opens(void);
 void    channel_add_permitted_opens(char *, int);
 int     channel_add_adm_permitted_opens(char *, int);
@@ -240,6 +243,7 @@ void         channel_clear_adm_permitted_opens(void);
 void    channel_print_adm_permitted_opens(void);
 int      channel_input_port_forward_request(int, int);
 Channel        *channel_connect_to(const char *, u_short, char *, char *);
+Channel        *channel_connect_stdio_fwd(const char*, u_short);
 Channel        *channel_connect_by_listen_address(u_short, char *, char *);
 int     channel_request_remote_forwarding(const char *, u_short,
             const char *, u_short);