1 files changed, 31 insertions, 1 deletions

diff --git a/nchan.c b/nchan.c
index ad461f4af..e0ebf43f1 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nchan.c,v 1.57 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: nchan.c,v 1.60 2008/06/30 12:16:02 djm Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <stdarg.h>
 
+#include "openbsd-compat/sys-queue.h"
 #include "ssh1.h"
 #include "ssh2.h"
 #include "buffer.h"
@@ -77,6 +78,7 @@ static void	chan_send_ieof1(Channel *);
 static void     chan_send_oclose1(Channel *);
 static void     chan_send_close2(Channel *);
 static void     chan_send_eof2(Channel *);
+static void     chan_send_eow2(Channel *);
 
 /* helper */
 static void     chan_shutdown_write(Channel *);
@@ -305,6 +307,17 @@ chan_rcvd_close2(Channel *c)
                 break;
         }
 }
+void
+chan_rcvd_eow(Channel *c)
+{
+        debug2("channel %d: rcvd eow", c->self);
+        switch (c->istate) {
+        case CHAN_INPUT_OPEN:
+                chan_shutdown_read(c);
+                chan_set_istate(c, CHAN_INPUT_CLOSED);
+                break;
+        }
+}
 static void
 chan_rcvd_eof2(Channel *c)
 {
@@ -321,6 +334,8 @@ chan_write_failed2(Channel *c)
         case CHAN_OUTPUT_OPEN:
         case CHAN_OUTPUT_WAIT_DRAIN:
                 chan_shutdown_write(c);
+                if (strcmp(c->ctype, "session") == 0)
+                        chan_send_eow2(c);
                 chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
                 break;
         default:
@@ -363,6 +378,21 @@ chan_send_close2(Channel *c)
                 c->flags |= CHAN_CLOSE_SENT;
         }
 }
+static void
+chan_send_eow2(Channel *c)
+{
+        debug2("channel %d: send eow", c->self);
+        if (c->ostate == CHAN_OUTPUT_CLOSED) {
+                error("channel %d: must not sent eow on closed output",
+                    c->self);
+                return;
+        }
+        packet_start(SSH2_MSG_CHANNEL_REQUEST);
+        packet_put_int(c->remote_id);
+        packet_put_cstring("eow@openssh.com");
+        packet_put_char(0);
+        packet_send();
+}
 
 /* shared */