summaryrefslogtreecommitdiff
path: root/channels.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-08-19 17:00:17 +0100
committerColin Watson <cjwatson@debian.org>2015-08-19 17:40:32 +0100
commit927d0032b865f05679d3cc052bc13cb0e6490283 (patch)
tree69f782deb79182f26069ff41e9539f17e6e44912 /channels.h
parentd35c65e77ab6a6a95fefa2c852827ba08e507f0b (diff)
parent810eecd6b2e03770f21e46b5cb8ce8c7fcd46da8 (diff)
New upstream release (6.9p1).
Diffstat (limited to 'channels.h')
-rw-r--r--channels.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/channels.h b/channels.h
index 5a672f22e..9d76c9d2a 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.h,v 1.116 2015/01/19 20:07:45 markus Exp $ */ 1/* $OpenBSD: channels.h,v 1.118 2015/07/01 02:26:31 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -113,7 +113,7 @@ struct Channel {
113 time_t notbefore; /* Pause IO until deadline (time_t) */ 113 time_t notbefore; /* Pause IO until deadline (time_t) */
114 int delayed; /* post-select handlers for newly created 114 int delayed; /* post-select handlers for newly created
115 * channels are delayed until the first call 115 * channels are delayed until the first call
116 * to a matching pre-select handler. 116 * to a matching pre-select handler.
117 * this way post-select handlers are not 117 * this way post-select handlers are not
118 * accidentally called if a FD gets reused */ 118 * accidentally called if a FD gets reused */
119 Buffer input; /* data read from socket, to be sent over 119 Buffer input; /* data read from socket, to be sent over
@@ -284,6 +284,7 @@ int permitopen_port(const char *);
284 284
285/* x11 forwarding */ 285/* x11 forwarding */
286 286
287void channel_set_x11_refuse_time(u_int);
287int x11_connect_display(void); 288int x11_connect_display(void);
288int x11_create_display_inet(int, int, int, u_int *, int **); 289int x11_create_display_inet(int, int, int, u_int *, int **);
289int x11_input_open(int, u_int32_t, void *); 290int x11_input_open(int, u_int32_t, void *);