- (tim) [configure.ac] updwtmpx() on OpenServer seems to add duplicate entry.

[openssh.git] / nchan.c

diff --git a/nchan.c b/nchan.c
index ebb8e6858fff53b0a52a456978d472a1dd1abec9..aee3f37b0a0ea609e962f1c47d39dc2f90b171ca 100644 (file)
--- 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.42 2002/01/14 13:55:55 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -42,15 +42,15 @@ RCSID("$OpenBSD: nchan.c,v 1.42 2002/01/14 13:55:55 markus Exp $");
  * tear down of channels:
  *
  * 1.3:        strict request-ack-protocol:
- *     CLOSE   ->
- *             <-  CLOSE_CONFIRM
+ *     CLOSE   ->
+ *             <-  CLOSE_CONFIRM
  *
  * 1.5:        uses variations of:
- *     IEOF    ->
- *             <-  OCLOSE
- *             <-  IEOF
- *     OCLOSE  ->
- *     i.e. both sides have to close the channel
+ *     IEOF    ->
+ *             <-  OCLOSE
+ *             <-  IEOF
+ *     OCLOSE  ->
+ *     i.e. both sides have to close the channel
  *
  * 2.0: the EOF messages are optional
  *
@@ -83,7 +83,7 @@ chan_set_istate(Channel *c, u_int next)
 {
        if (c->istate > CHAN_INPUT_CLOSED || next > CHAN_INPUT_CLOSED)
                fatal("chan_set_istate: bad state %d -> %d", c->istate, next);
-       debug("channel %d: input %s -> %s", c->self, istates[c->istate],
+       debug2("channel %d: input %s -> %s", c->self, istates[c->istate],
            istates[next]);
        c->istate = next;
 }
@@ -92,7 +92,7 @@ chan_set_ostate(Channel *c, u_int next)
 {
        if (c->ostate > CHAN_OUTPUT_CLOSED || next > CHAN_OUTPUT_CLOSED)
                fatal("chan_set_ostate: bad state %d -> %d", c->ostate, next);
-       debug("channel %d: output %s -> %s", c->self, ostates[c->ostate],
+       debug2("channel %d: output %s -> %s", c->self, ostates[c->ostate],
            ostates[next]);
        c->ostate = next;
 }
@@ -104,7 +104,7 @@ chan_set_ostate(Channel *c, u_int next)
 static void
 chan_rcvd_oclose1(Channel *c)
 {
-       debug("channel %d: rcvd oclose", c->self);
+       debug2("channel %d: rcvd oclose", c->self);
        switch (c->istate) {
        case CHAN_INPUT_WAIT_OCLOSE:
                chan_set_istate(c, CHAN_INPUT_CLOSED);
@@ -128,7 +128,7 @@ chan_rcvd_oclose1(Channel *c)
 void
 chan_read_failed(Channel *c)
 {
-       debug("channel %d: read failed", c->self);
+       debug2("channel %d: read failed", c->self);
        switch (c->istate) {
        case CHAN_INPUT_OPEN:
                chan_shutdown_read(c);
@@ -143,7 +143,7 @@ chan_read_failed(Channel *c)
 void
 chan_ibuf_empty(Channel *c)
 {
-       debug("channel %d: ibuf empty", c->self);
+       debug2("channel %d: ibuf empty", c->self);
        if (buffer_len(&c->input)) {
                error("channel %d: chan_ibuf_empty for non empty buffer",
                    c->self);
@@ -169,7 +169,7 @@ chan_ibuf_empty(Channel *c)
 static void
 chan_rcvd_ieof1(Channel *c)
 {
-       debug("channel %d: rcvd ieof", c->self);
+       debug2("channel %d: rcvd ieof", c->self);
        switch (c->ostate) {
        case CHAN_OUTPUT_OPEN:
                chan_set_ostate(c, CHAN_OUTPUT_WAIT_DRAIN);
@@ -186,7 +186,7 @@ chan_rcvd_ieof1(Channel *c)
 static void
 chan_write_failed1(Channel *c)
 {
-       debug("channel %d: write failed", c->self);
+       debug2("channel %d: write failed", c->self);
        switch (c->ostate) {
        case CHAN_OUTPUT_OPEN:
                chan_shutdown_write(c);
@@ -207,7 +207,7 @@ chan_write_failed1(Channel *c)
 void
 chan_obuf_empty(Channel *c)
 {
-       debug("channel %d: obuf empty", c->self);
+       debug2("channel %d: obuf empty", c->self);
        if (buffer_len(&c->output)) {
                error("channel %d: chan_obuf_empty for non empty buffer",
                    c->self);
@@ -229,7 +229,7 @@ chan_obuf_empty(Channel *c)
 static void
 chan_send_ieof1(Channel *c)
 {
-       debug("channel %d: send ieof", c->self);
+       debug2("channel %d: send ieof", c->self);
        switch (c->istate) {
        case CHAN_INPUT_OPEN:
        case CHAN_INPUT_WAIT_DRAIN:
@@ -246,7 +246,7 @@ chan_send_ieof1(Channel *c)
 static void
 chan_send_oclose1(Channel *c)
 {
-       debug("channel %d: send oclose", c->self);
+       debug2("channel %d: send oclose", c->self);
        switch (c->ostate) {
        case CHAN_OUTPUT_OPEN:
        case CHAN_OUTPUT_WAIT_DRAIN:
@@ -268,7 +268,7 @@ chan_send_oclose1(Channel *c)
 static void
 chan_rcvd_close2(Channel *c)
 {
-       debug("channel %d: rcvd close", c->self);
+       debug2("channel %d: rcvd close", c->self);
        if (c->flags & CHAN_CLOSE_RCVD)
                error("channel %d: protocol error: close rcvd twice", c->self);
        c->flags |= CHAN_CLOSE_RCVD;
@@ -301,14 +301,15 @@ chan_rcvd_close2(Channel *c)
 static void
 chan_rcvd_eof2(Channel *c)
 {
-       debug("channel %d: rcvd eof", c->self);
+       debug2("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);
 }
 static void
 chan_write_failed2(Channel *c)
 {
-       debug("channel %d: write failed", c->self);
+       debug2("channel %d: write failed", c->self);
        switch (c->ostate) {
        case CHAN_OUTPUT_OPEN:
        case CHAN_OUTPUT_WAIT_DRAIN:
@@ -324,12 +325,13 @@ chan_write_failed2(Channel *c)
 static void
 chan_send_eof2(Channel *c)
 {
-       debug("channel %d: send eof", c->self);
+       debug2("channel %d: send eof", c->self);
        switch (c->istate) {
        case CHAN_INPUT_WAIT_DRAIN:
                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",
@@ -340,7 +342,7 @@ chan_send_eof2(Channel *c)
 static void
 chan_send_close2(Channel *c)
 {
-       debug("channel %d: send close", c->self);
+       debug2("channel %d: send close", c->self);
        if (c->ostate != CHAN_OUTPUT_CLOSED ||
            c->istate != CHAN_INPUT_CLOSED) {
                error("channel %d: cannot send close for istate/ostate %d/%d",
@@ -364,6 +366,10 @@ chan_rcvd_ieof(Channel *c)
                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)
@@ -389,51 +395,42 @@ chan_mark_dead(Channel *c)
 }
 
 int
-chan_is_dead(Channel *c, int send)
+chan_is_dead(Channel *c, int do_send)
 {
        if (c->type == SSH_CHANNEL_ZOMBIE) {
-               debug("channel %d: zombie", c->self);
+               debug2("channel %d: zombie", c->self);
                return 1;
        }
        if (c->istate != CHAN_INPUT_CLOSED || c->ostate != CHAN_OUTPUT_CLOSED)
                return 0;
        if (!compat20) {
-               debug("channel %d: is dead", c->self);
+               debug2("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 (do_send) {
+                       chan_send_close2(c);
+               } else {
+                       /* channel would be dead if we sent a close */
+                       if (c->flags & CHAN_CLOSE_RCVD) {
+                               debug2("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;
-               }
+       }
+       if ((c->flags & CHAN_CLOSE_SENT) &&
+           (c->flags & CHAN_CLOSE_RCVD)) {
+               debug2("channel %d: is dead", c->self);
+               return 1;
        }
        return 0;
 }
@@ -446,15 +443,15 @@ chan_shutdown_write(Channel *c)
        if (compat20 && c->type == SSH_CHANNEL_LARVAL)
                return;
        /* shutdown failure is allowed if write failed already */
-       debug("channel %d: close_write", c->self);
+       debug2("channel %d: close_write", c->self);
        if (c->sock != -1) {
                if (shutdown(c->sock, SHUT_WR) < 0)
-                       debug("channel %d: chan_shutdown_write: "
+                       debug2("channel %d: chan_shutdown_write: "
                            "shutdown() failed for fd%d: %.100s",
                            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));
        }
@@ -464,7 +461,7 @@ chan_shutdown_read(Channel *c)
 {
        if (compat20 && c->type == SSH_CHANNEL_LARVAL)
                return;
-       debug("channel %d: close_read", c->self);
+       debug2("channel %d: close_read", c->self);
        if (c->sock != -1) {
                /*
                 * shutdown(sock, SHUT_READ) may return ENOTCONN if the
@@ -479,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));
        }