summaryrefslogtreecommitdiff
path: root/channels.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-10-10 15:03:58 +1000
committerDamien Miller <djm@mindrot.org>2001-10-10 15:03:58 +1000
commit4623a754624624523ef2f50ba8647cad7f31d992 (patch)
tree15191803247f8fcc963b1b7b62989d90a7b84f33 /channels.h
parent058655ccedb9cdad84be346bce7416454e45a598 (diff)
- markus@cvs.openbsd.org 2001/10/07 17:49:40
[channels.c channels.h] avoid possible FD_ISSET overflow for channels established during channnel_after_select() (used for dynamic channels).
Diffstat (limited to 'channels.h')
-rw-r--r--channels.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels.h b/channels.h
index c6d1aabc7..49a9df9dd 100644
--- a/channels.h
+++ b/channels.h
@@ -32,7 +32,7 @@
32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */ 34 */
35/* RCSID("$OpenBSD: channels.h,v 1.47 2001/10/01 21:38:53 markus Exp $"); */ 35/* RCSID("$OpenBSD: channels.h,v 1.48 2001/10/07 17:49:40 markus Exp $"); */
36 36
37#ifndef CHANNEL_H 37#ifndef CHANNEL_H
38#define CHANNEL_H 38#define CHANNEL_H
@@ -68,7 +68,6 @@ struct Channel {
68 int type; /* channel type/state */ 68 int type; /* channel type/state */
69 int self; /* my own channel identifier */ 69 int self; /* my own channel identifier */
70 int remote_id; /* channel identifier for remote peer */ 70 int remote_id; /* channel identifier for remote peer */
71 /* peer can be reached over encrypted connection, via packet-sent */
72 int istate; /* input from channel (state of receive half) */ 71 int istate; /* input from channel (state of receive half) */
73 int ostate; /* output to channel (state of transmit half) */ 72 int ostate; /* output to channel (state of transmit half) */
74 int flags; /* close sent/rcvd */ 73 int flags; /* close sent/rcvd */
@@ -77,7 +76,8 @@ struct Channel {
77 int efd; /* extended fd */ 76 int efd; /* extended fd */
78 int sock; /* sock fd */ 77 int sock; /* sock fd */
79 int isatty; /* rfd is a tty */ 78 int isatty; /* rfd is a tty */
80 int force_drain; /* force close on iEOF */ 79 int force_drain; /* force close on iEOF */
80 int delayed; /* fdset hack */
81 Buffer input; /* data read from socket, to be sent over 81 Buffer input; /* data read from socket, to be sent over
82 * encrypted connection */ 82 * encrypted connection */
83 Buffer output; /* data received over encrypted connection for 83 Buffer output; /* data received over encrypted connection for