===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/nchan.c,v
retrieving revision 1.17.2.4
retrieving revision 1.18
diff -u -r1.17.2.4 -r1.18
--- src/usr.bin/ssh/nchan.c	2001/03/21 18:52:53	1.17.2.4
+++ src/usr.bin/ssh/nchan.c	2000/06/20 01:39:42	1.18
@@ -9,6 +9,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Markus Friedl.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -23,16 +28,17 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.17.2.4 2001/03/21 18:52:53 jason Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.18 2000/06/20 01:39:42 markus Exp $");
 
-#include "ssh1.h"
-#include "ssh2.h"
+#include "ssh.h"
+
 #include "buffer.h"
 #include "packet.h"
 #include "channels.h"
 #include "nchan.h"
+
+#include "ssh2.h"
 #include "compat.h"
-#include "log.h"
 
 /* functions manipulating channel states */
 /*
@@ -54,6 +60,9 @@
 static void	chan_send_close2(Channel *c);
 static void	chan_send_eof2(Channel *c);
 
+/* channel cleanup */
+chan_event_fn *chan_delete_if_full_closed	= NULL;
+
 /* helper */
 static void	chan_shutdown_write(Channel *c);
 static void	chan_shutdown_read(Channel *c);
@@ -246,6 +255,14 @@
 		break;
 	}
 }
+static void
+chan_delete_if_full_closed1(Channel *c)
+{
+	if (c->istate == CHAN_INPUT_CLOSED && c->ostate == CHAN_OUTPUT_CLOSED) {
+		debug("channel %d: full closed", c->self);
+		channel_free(c->self);
+	}
+}
 
 /*
  * the same for SSH2
@@ -388,46 +405,22 @@
 		c->flags |= CHAN_CLOSE_SENT;
 	}
 }
-
-/* shared */
-
-int
-chan_is_dead(Channel *c)
+static void
+chan_delete_if_full_closed2(Channel *c)
 {
-	if (c->istate != CHAN_INPUT_CLOSED || c->ostate != CHAN_OUTPUT_CLOSED)
-		return 0;
-	if (!compat20) {
-		debug("channel %d: is dead", c->self);
-		return 1;
-	}
-	/*
-	 * we have to delay the close message if the efd (for stderr) is
-	 * still active
-	 */
-	if (((c->extended_usage != CHAN_EXTENDED_IGNORE) &&
-	    buffer_len(&c->extended) > 0)
-#if 0
-	    || ((c->extended_usage == CHAN_EXTENDED_READ) &&
-	    c->efd != -1)
-#endif
-	    ) {
-		debug2("channel %d: active efd: %d len %d type %s",
-		    c->self, c->efd, buffer_len(&c->extended),
-		    c->extended_usage==CHAN_EXTENDED_READ ?
-		       "read": "write");
-	} else {
+	if (c->istate == CHAN_INPUT_CLOSED && c->ostate == CHAN_OUTPUT_CLOSED) {
 		if (!(c->flags & CHAN_CLOSE_SENT)) {
 			chan_send_close2(c);
 		}
 		if ((c->flags & CHAN_CLOSE_SENT) &&
 		    (c->flags & CHAN_CLOSE_RCVD)) {
-			debug("channel %d: is dead", c->self);
-			return 1;
+			debug("channel %d: full closed2", c->self);
+			channel_free(c->self);
 		}
 	}
-	return 0;
 }
 
+/* shared */
 void
 chan_init_iostates(Channel *c)
 {
@@ -448,6 +441,8 @@
 		chan_rcvd_ieof			= chan_rcvd_ieof2;
 		chan_write_failed		= chan_write_failed2;
 		chan_obuf_empty			= chan_obuf_empty2;
+
+		chan_delete_if_full_closed	= chan_delete_if_full_closed2;
 	} else {
 		chan_rcvd_oclose		= chan_rcvd_oclose1;
 		chan_read_failed		= chan_read_failed_12;
@@ -456,6 +451,8 @@
 		chan_rcvd_ieof			= chan_rcvd_ieof1;
 		chan_write_failed		= chan_write_failed1;
 		chan_obuf_empty			= chan_obuf_empty1;
+
+		chan_delete_if_full_closed	= chan_delete_if_full_closed1;
 	}
 }