- (stevesk) OpenBSD CVS sync X11 localhost display

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index 49a9df9dd7dd37f4d8731e4bd6a02c19632156cd..840268fcf85ac00a516fcfb52ec7992881ca857f 100644 (file)
--- a/channels.h
+++ b/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.48 2001/10/07 17:49:40 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.53 2001/11/29 21:10:51 stevesk Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -56,7 +56,7 @@
 #define SSH_CHANNEL_ZOMBIE             14      /* Almost dead. */
 #define SSH_CHANNEL_MAX_TYPE           15
 
-#define SSH_CHANNEL_PATH_LEN           30
+#define SSH_CHANNEL_PATH_LEN           256
 
 struct Channel;
 typedef struct Channel Channel;
@@ -143,7 +143,6 @@ Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int);
 void    channel_set_fds(int, int, int, int, int, int);
 void    channel_free(Channel *);
 void    channel_free_all(void);
-void    channel_detach_all(void);
 void    channel_stop_listening(void);
 
 void    channel_send_open(int);
@@ -177,7 +176,6 @@ void     channel_output_poll(void);
 
 int      channel_not_very_much_buffered_data(void);
 void     channel_close_all(void);
-void     channel_free_all(void);
 int      channel_still_open(void);
 char   *channel_open_message(void);
 int     channel_find_open(void);
@@ -199,8 +197,7 @@ channel_request_forwarding(const char *, u_short, const char *, u_short, int,
 /* x11 forwarding */
 
 int     x11_connect_display(void);
-char   *x11_create_display(int);
-char   *x11_create_display_inet(int, int);
+int     x11_create_display_inet(int, int);
 void     x11_input_open(int, int, void *);
 void     x11_request_forwarding(void);
 void    x11_request_forwarding_with_spoofing(int, const char *, const char *);
@@ -216,7 +213,7 @@ void         auth_input_open_request(int, int, void *);
 
 /* channel close */
 
-int     chan_is_dead(Channel *);
+int     chan_is_dead(Channel *, int);
 void    chan_mark_dead(Channel *);
 void    chan_init_iostates(Channel *);
 void    chan_init(void);