- markus@cvs.openbsd.org 2002/01/10 12:47:59

     [nchan.c]
     more unused code (with channels.c:1.156)

2 files changed, 5 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d6a845ff..cdf6376fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,9 @@
    - markus@cvs.openbsd.org 2002/01/10 12:38:26
      [nchan.c]
      remove dead code (skip drain)
+   - markus@cvs.openbsd.org 2002/01/10 12:47:59
+     [nchan.c]
+     more unused code (with channels.c:1.156)
 
 
 20020121
@@ -7267,4 +7270,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1757 2002/01/22 12:22:20 djm Exp $
+$Id: ChangeLog,v 1.1758 2002/01/22 12:22:44 djm Exp $
diff --git a/nchan.c b/nchan.c
index 79fff66c8..905379b07 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.35 2002/01/10 12:38:26 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.36 2002/01/10 12:47:59 markus Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -155,29 +155,6 @@ static void
 chan_rcvd_ieof1(Channel *c)
 {
 	debug("channel %d: rcvd ieof", c->self);
-	if (c->type != SSH_CHANNEL_OPEN) {
-		debug("channel %d: non-open", c->self);
-		if (c->istate == CHAN_INPUT_OPEN) {
-			debug("channel %d: non-open: input open -> wait_oclose",
-			    c->self);
-			chan_shutdown_read(c);
-			chan_send_ieof1(c);
-			c->istate = CHAN_INPUT_WAIT_OCLOSE;
-		} else {
-			error("channel %d: non-open: istate %d != open",
-			    c->self, c->istate);
-		}
-		if (c->ostate == CHAN_OUTPUT_OPEN) {
-			debug("channel %d: non-open: output open -> closed",
-			    c->self);
-			chan_send_oclose1(c);
-			c->ostate = CHAN_OUTPUT_CLOSED;
-		} else {
-			error("channel %d: non-open: ostate %d != open",
-			    c->self, c->ostate);
-		}
-		return;
-	}
 	switch (c->ostate) {
 	case CHAN_OUTPUT_OPEN:
 		debug("channel %d: output open -> drain", c->self);