X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/668a91b729c90583f07783bf9d4f0e68057f7c2c..9a6fee8b2b42608a177803d2351d3cfe732910d8:/nchan.c

diff --git a/nchan.c b/nchan.c
index 8b793714..c358e6aa 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.40 2002/01/14 13:40:10 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.47 2002/06/19 00:27:55 deraadt Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -63,14 +63,6 @@ RCSID("$OpenBSD: nchan.c,v 1.40 2002/01/14 13:40:10 markus Exp $");
 /*
  * EVENTS update channel input/output states execute ACTIONS
  */
-/* events concerning the INPUT from socket for channel (istate) */
-chan_event_fn *chan_rcvd_oclose			= NULL;
-chan_event_fn *chan_read_failed			= NULL;
-chan_event_fn *chan_ibuf_empty			= NULL;
-/* events concerning the OUTPUT from channel for socket (ostate) */
-chan_event_fn *chan_rcvd_ieof			= NULL;
-chan_event_fn *chan_write_failed		= NULL;
-chan_event_fn *chan_obuf_empty			= NULL;
 /*
  * ACTIONS: should never update the channel states
  */
@@ -133,8 +125,8 @@ chan_rcvd_oclose1(Channel *c)
 		return;
 	}
 }
-static void
-chan_read_failed_12(Channel *c)
+void
+chan_read_failed(Channel *c)
 {
 	debug("channel %d: read failed", c->self);
 	switch (c->istate) {
@@ -148,8 +140,8 @@ chan_read_failed_12(Channel *c)
 		break;
 	}
 }
-static void
-chan_ibuf_empty1(Channel *c)
+void
+chan_ibuf_empty(Channel *c)
 {
 	debug("channel %d: ibuf empty", c->self);
 	if (buffer_len(&c->input)) {
@@ -212,8 +204,8 @@ chan_write_failed1(Channel *c)
 		break;
 	}
 }
-static void
-chan_obuf_empty1(Channel *c)
+void
+chan_obuf_empty(Channel *c)
 {
 	debug("channel %d: obuf empty", c->self);
 	if (buffer_len(&c->output)) {
@@ -307,14 +299,10 @@ chan_rcvd_close2(Channel *c)
 	}
 }
 static void
-chan_ibuf_empty2(Channel *c)
-{
-	chan_ibuf_empty1(c);
-}
-static void
 chan_rcvd_eof2(Channel *c)
 {
 	debug("channel %d: rcvd eof", c->self);
+	c->flags |= CHAN_EOF_RCVD;
 	if (c->ostate == CHAN_OUTPUT_OPEN)
 		chan_set_ostate(c, CHAN_OUTPUT_WAIT_DRAIN);
 }
@@ -324,9 +312,6 @@ chan_write_failed2(Channel *c)
 	debug("channel %d: write failed", c->self);
 	switch (c->ostate) {
 	case CHAN_OUTPUT_OPEN:
-		chan_shutdown_write(c); /* ?? */
-		chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
-		break;
 	case CHAN_OUTPUT_WAIT_DRAIN:
 		chan_shutdown_write(c);
 		chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
@@ -338,11 +323,6 @@ chan_write_failed2(Channel *c)
 	}
 }
 static void
-chan_obuf_empty2(Channel *c)
-{
-	chan_obuf_empty1(c);
-}
-static void
 chan_send_eof2(Channel *c)
 {
 	debug("channel %d: send eof", c->self);
@@ -351,6 +331,7 @@ chan_send_eof2(Channel *c)
 		packet_start(SSH2_MSG_CHANNEL_EOF);
 		packet_put_int(c->remote_id);
 		packet_send();
+		c->flags |= CHAN_EOF_SENT;
 		break;
 	default:
 		error("channel %d: cannot send eof for istate %d",
@@ -378,6 +359,35 @@ chan_send_close2(Channel *c)
 
 /* shared */
 
+void
+chan_rcvd_ieof(Channel *c)
+{
+	if (compat20)
+		chan_rcvd_eof2(c);
+	else
+		chan_rcvd_ieof1(c);
+	if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN &&
+	    buffer_len(&c->output) == 0 &&
+	    !CHANNEL_EFD_OUTPUT_ACTIVE(c))
+		chan_obuf_empty(c);
+}
+void
+chan_rcvd_oclose(Channel *c)
+{
+	if (compat20)
+		chan_rcvd_close2(c);
+	else
+		chan_rcvd_oclose1(c);
+}
+void
+chan_write_failed(Channel *c)
+{
+	if (compat20)
+		chan_write_failed2(c);
+	else
+		chan_write_failed1(c);
+}
+
 void
 chan_mark_dead(Channel *c)
 {
@@ -397,72 +407,32 @@ chan_is_dead(Channel *c, int send)
 		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->flags & CHAN_CLOSE_SENT)) {
-			if (send) {
-				chan_send_close2(c);
-			} else {
-				/* channel would be dead if we sent a close */
-				if (c->flags & CHAN_CLOSE_RCVD) {
-					debug("channel %d: almost dead",
-					    c->self);
-					return 1;
-				}
+	if ((datafellows & SSH_BUG_EXTEOF) &&
+	    c->extended_usage == CHAN_EXTENDED_WRITE &&
+	    c->efd != -1 &&
+	    buffer_len(&c->extended) > 0) {
+		debug2("channel %d: active efd: %d len %d",
+		    c->self, c->efd, buffer_len(&c->extended));
+		return 0;
+	}
+	if (!(c->flags & CHAN_CLOSE_SENT)) {
+		if (send) {
+			chan_send_close2(c);
+		} else {
+			/* channel would be dead if we sent a close */
+			if (c->flags & CHAN_CLOSE_RCVD) {
+				debug("channel %d: almost dead",
+				    c->self);
+				return 1;
 			}
 		}
-		if ((c->flags & CHAN_CLOSE_SENT) &&
-		    (c->flags & CHAN_CLOSE_RCVD)) {
-			debug("channel %d: is dead", c->self);
-			return 1;
-		}
 	}
-	return 0;
-}
-
-void
-chan_init_iostates(Channel *c)
-{
-	c->ostate = CHAN_OUTPUT_OPEN;
-	c->istate = CHAN_INPUT_OPEN;
-	c->flags = 0;
-}
-
-/* init */
-void
-chan_init(void)
-{
-	if (compat20) {
-		chan_rcvd_oclose		= chan_rcvd_close2;
-		chan_read_failed		= chan_read_failed_12;
-		chan_ibuf_empty			= chan_ibuf_empty2;
-
-		chan_rcvd_ieof			= chan_rcvd_eof2;
-		chan_write_failed		= chan_write_failed2;
-		chan_obuf_empty			= chan_obuf_empty2;
-	} else {
-		chan_rcvd_oclose		= chan_rcvd_oclose1;
-		chan_read_failed		= chan_read_failed_12;
-		chan_ibuf_empty			= chan_ibuf_empty1;
-
-		chan_rcvd_ieof			= chan_rcvd_ieof1;
-		chan_write_failed		= chan_write_failed1;
-		chan_obuf_empty			= chan_obuf_empty1;
+	if ((c->flags & CHAN_CLOSE_SENT) &&
+	    (c->flags & CHAN_CLOSE_RCVD)) {
+		debug("channel %d: is dead", c->self);
+		return 1;
 	}
+	return 0;
 }
 
 /* helper */
@@ -481,7 +451,7 @@ chan_shutdown_write(Channel *c)
 			    c->self, c->sock, strerror(errno));
 	} else {
 		if (channel_close_fd(&c->wfd) < 0)
-			log("channel %d: chan_shutdown_write: "
+			logit("channel %d: chan_shutdown_write: "
 			    "close() failed for fd%d: %.100s",
 			    c->self, c->wfd, strerror(errno));
 	}
@@ -506,7 +476,7 @@ chan_shutdown_read(Channel *c)
 			    strerror(errno));
 	} else {
 		if (channel_close_fd(&c->rfd) < 0)
-			log("channel %d: chan_shutdown_read: "
+			logit("channel %d: chan_shutdown_read: "
 			    "close() failed for fd%d: %.100s",
 			    c->self, c->rfd, strerror(errno));
 	}