summaryrefslogtreecommitdiff
path: root/nchan.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:28:13 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:28:13 +1100
commitebc11d30121c53316e5119ce3dfd0844dfcd0002 (patch)
treeac53e2208778049e571a8d432a7160d579651542 /nchan.c
parentfcfc43b617e707a7f073c0241029341ed0ebe211 (diff)
- markus@cvs.openbsd.org 2002/01/14 13:40:10
[nchan.c] correct fn names for ssh2, do not switch from closed to closed; ok provos@
Diffstat (limited to 'nchan.c')
-rw-r--r--nchan.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/nchan.c b/nchan.c
index 76674a76..8b793714 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.39 2002/01/14 13:34:07 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.40 2002/01/14 13:40:10 markus Exp $");
#include "ssh1.h"
#include "ssh2.h"
@@ -274,7 +274,7 @@ chan_send_oclose1(Channel *c)
* the same for SSH2
*/
static void
-chan_rcvd_oclose2(Channel *c)
+chan_rcvd_close2(Channel *c)
{
debug("channel %d: rcvd close", c->self);
if (c->flags & CHAN_CLOSE_RCVD)
@@ -298,12 +298,13 @@ chan_rcvd_oclose2(Channel *c)
switch (c->istate) {
case CHAN_INPUT_OPEN:
chan_shutdown_read(c);
+ chan_set_istate(c, CHAN_INPUT_CLOSED);
break;
case CHAN_INPUT_WAIT_DRAIN:
chan_send_eof2(c);
+ chan_set_istate(c, CHAN_INPUT_CLOSED);
break;
}
- chan_set_istate(c, CHAN_INPUT_CLOSED);
}
static void
chan_ibuf_empty2(Channel *c)
@@ -311,7 +312,7 @@ chan_ibuf_empty2(Channel *c)
chan_ibuf_empty1(c);
}
static void
-chan_rcvd_ieof2(Channel *c)
+chan_rcvd_eof2(Channel *c)
{
debug("channel %d: rcvd eof", c->self);
if (c->ostate == CHAN_OUTPUT_OPEN)
@@ -446,11 +447,11 @@ void
chan_init(void)
{
if (compat20) {
- chan_rcvd_oclose = chan_rcvd_oclose2;
+ chan_rcvd_oclose = chan_rcvd_close2;
chan_read_failed = chan_read_failed_12;
chan_ibuf_empty = chan_ibuf_empty2;
- chan_rcvd_ieof = chan_rcvd_ieof2;
+ chan_rcvd_ieof = chan_rcvd_eof2;
chan_write_failed = chan_write_failed2;
chan_obuf_empty = chan_obuf_empty2;
} else {