summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/nchan.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-03-28 20:34:15 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-03-28 20:34:15 +0000
commit40dbe8cbedba0ae7ae8caf768cdc3e32f7c0a8c0 (patch)
tree1735797187cca8658b8321667fa8c77e86bc9778 /usr.bin/ssh/nchan.c
parente679a7eb1f598263240196055e2e63b0db45e73c (diff)
sync w/ channels.c
Diffstat (limited to 'usr.bin/ssh/nchan.c')
-rw-r--r--usr.bin/ssh/nchan.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.bin/ssh/nchan.c b/usr.bin/ssh/nchan.c
index 48b61ef541d..58c68d6b332 100644
--- a/usr.bin/ssh/nchan.c
+++ b/usr.bin/ssh/nchan.c
@@ -28,7 +28,7 @@
*/
#include "includes.h"
-RCSID("$Id: nchan.c,v 1.11 2000/03/28 20:31:27 markus Exp $");
+RCSID("$Id: nchan.c,v 1.12 2000/03/28 20:34:14 markus Exp $");
#include "ssh.h"
@@ -72,7 +72,6 @@ chan_rcvd_oclose(Channel *c)
error("protocol error: chan_rcvd_oclose %d for istate %d", c->self, c->istate);
return;
}
- chan_delete_if_full_closed(c);
}
void
chan_read_failed(Channel *c)
@@ -120,7 +119,6 @@ chan_rcvd_ieof(Channel *c)
case CHAN_OUTPUT_WAIT_IEOF:
debug("channel %d: OUTPUT_WAIT_IEOF -> OUTPUT_CLOSED [rvcd IEOF]", c->self);
c->ostate = CHAN_OUTPUT_CLOSED;
- chan_delete_if_full_closed(c);
break;
default:
error("protocol error: chan_rcvd_ieof %d for ostate %d", c->self, c->ostate);
@@ -140,7 +138,6 @@ chan_write_failed(Channel *c)
debug("channel %d: OUTPUT_WAIT_DRAIN -> OUTPUT_CLOSED [write failed]", c->self);
chan_send_oclose(c);
c->ostate = CHAN_OUTPUT_CLOSED;
- chan_delete_if_full_closed(c);
break;
default:
error("internal error: chan_write_failed %d for ostate %d", c->self, c->ostate);
@@ -159,7 +156,6 @@ chan_obuf_empty(Channel *c)
debug("channel %d: OUTPUT_WAIT_DRAIN -> OUTPUT_CLOSED [obuf empty, send OCLOSE]", c->self);
chan_send_oclose(c);
c->ostate = CHAN_OUTPUT_CLOSED;
- chan_delete_if_full_closed(c);
break;
default:
error("internal error: chan_obuf_empty %d for ostate %d", c->self, c->ostate);