summaryrefslogtreecommitdiffstats
path: root/channels.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 13:28:45 +0100
committerDamien Miller <djm@mindrot.org>2002-01-22 13:28:45 +0100
commit5144df92616ff8ed4fa3aa709651333c09d850b4 (patch)
tree125fe86f2f84288a5736b2cfe180dc61297d6a63 /channels.c
parent - markus@cvs.openbsd.org 2002/01/14 13:41:13 (diff)
downloadopenssh-5144df92616ff8ed4fa3aa709651333c09d850b4.tar.xz
openssh-5144df92616ff8ed4fa3aa709651333c09d850b4.zip
- markus@cvs.openbsd.org 2002/01/14 13:55:55
[channels.c channels.h nchan.c] remove function pointers for events, remove chan_init*; ok provos@
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/channels.c b/channels.c
index db3bda66a..473c5efe4 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.158 2002/01/09 17:26:35 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.159 2002/01/14 13:55:55 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -217,7 +217,6 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
/* Do initial allocation if this is the first call. */
if (channels_alloc == 0) {
- chan_init();
channels_alloc = 10;
channels = xmalloc(channels_alloc * sizeof(Channel *));
for (i = 0; i < channels_alloc; i++)
@@ -246,7 +245,9 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
buffer_init(&c->input);
buffer_init(&c->output);
buffer_init(&c->extended);
- chan_init_iostates(c);
+ c->ostate = CHAN_OUTPUT_OPEN;
+ c->istate = CHAN_INPUT_OPEN;
+ c->flags = 0;
channel_register_fds(c, rfd, wfd, efd, extusage, nonblock);
c->self = found;
c->type = type;