- markus@cvs.openbsd.org 2008/05/09 16:21:13

     [channels.h clientloop.c nchan.c serverloop.c]
     unbreak
        ssh -2 localhost od /bin/ls | true
     ignoring SIGPIPE by adding a new channel message (EOW) that signals
     the peer that we're not interested in any data it might send.
     fixes bz #85; discussion, debugging and ok djm@

1 files changed, 29 insertions, 1 deletions

diff --git a/nchan.c b/nchan.c
index 0d0faddb3..a4a456eab 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nchan.c,v 1.58 2008/05/08 12:02:23 djm Exp $ */
+/* $OpenBSD: nchan.c,v 1.59 2008/05/09 16:21:13 markus Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -78,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 *);
@@ -306,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)
 {
@@ -322,6 +334,7 @@ chan_write_failed2(Channel *c)
         case CHAN_OUTPUT_OPEN:
         case CHAN_OUTPUT_WAIT_DRAIN:
                 chan_shutdown_write(c);
+                chan_send_eow2(c);
                 chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
                 break;
         default:
@@ -364,6 +377,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 */