- stevesk@cvs.openbsd.org 2002/02/04 00:53:39

[openssh.git] / nchan.c

diff --git a/nchan.c b/nchan.c
index 04266d32629302a5f47be16f8c42fddb2bfb72eb..fc8e7f18de6d6ee2bba07c2c3d619795d5cdace3 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.37 2002/01/13 21:31:20 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.44 2002/01/21 23:27:10 markus Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -63,14 +63,6 @@ RCSID("$OpenBSD: nchan.c,v 1.37 2002/01/13 21:31:20 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)) {
@@ -159,8 +151,14 @@ chan_ibuf_empty1(Channel *c)
        }
        switch (c->istate) {
        case CHAN_INPUT_WAIT_DRAIN:
-               chan_send_ieof1(c);
-               chan_set_istate(c, CHAN_INPUT_WAIT_OCLOSE);
+               if (compat20) {
+                       if (!(c->flags & CHAN_CLOSE_SENT))
+                               chan_send_eof2(c);
+                       chan_set_istate(c, CHAN_INPUT_CLOSED);
+               } else {
+                       chan_send_ieof1(c);
+                       chan_set_istate(c, CHAN_INPUT_WAIT_OCLOSE);
+               }
                break;
        default:
                error("channel %d: chan_ibuf_empty for istate %d",
@@ -191,10 +189,12 @@ chan_write_failed1(Channel *c)
        debug("channel %d: write failed", c->self);
        switch (c->ostate) {
        case CHAN_OUTPUT_OPEN:
+               chan_shutdown_write(c);
                chan_send_oclose1(c);
                chan_set_ostate(c, CHAN_OUTPUT_WAIT_IEOF);
                break;
        case CHAN_OUTPUT_WAIT_DRAIN:
+               chan_shutdown_write(c);
                chan_send_oclose1(c);
                chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
                break;
@@ -204,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)) {
@@ -215,7 +215,9 @@ chan_obuf_empty1(Channel *c)
        }
        switch (c->ostate) {
        case CHAN_OUTPUT_WAIT_DRAIN:
-               chan_send_oclose1(c);
+               chan_shutdown_write(c);
+               if (!compat20)
+                       chan_send_oclose1(c);
                chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
                break;
        default:
@@ -248,7 +250,6 @@ chan_send_oclose1(Channel *c)
        switch (c->ostate) {
        case CHAN_OUTPUT_OPEN:
        case CHAN_OUTPUT_WAIT_DRAIN:
-               chan_shutdown_write(c);
                buffer_clear(&c->output);
                packet_start(SSH_MSG_CHANNEL_OUTPUT_CLOSE);
                packet_put_int(c->remote_id);
@@ -265,7 +266,7 @@ chan_send_oclose1(Channel *c)
  * the same for SSH2
  */
 static void
-chan_rcvd_oclose2(Channel *c)
+chan_rcvd_close2(Channel *c)
 {
        debug("channel %d: rcvd close", c->self);
        if (c->flags & CHAN_CLOSE_RCVD)
@@ -289,36 +290,16 @@ chan_rcvd_oclose2(Channel *c)
        switch (c->istate) {
        case CHAN_INPUT_OPEN:
                chan_shutdown_read(c);
+               chan_set_istate(c, CHAN_INPUT_CLOSED);
                break;
        case CHAN_INPUT_WAIT_DRAIN:
                chan_send_eof2(c);
-               break;
-       }
-       chan_set_istate(c, CHAN_INPUT_CLOSED);
-}
-static void
-chan_ibuf_empty2(Channel *c)
-{
-       debug("channel %d: ibuf empty", c->self);
-       if (buffer_len(&c->input)) {
-               error("channel %d: chan_ibuf_empty for non empty buffer",
-                   c->self);
-               return;
-       }
-       switch (c->istate) {
-       case CHAN_INPUT_WAIT_DRAIN:
-               if (!(c->flags & CHAN_CLOSE_SENT))
-                       chan_send_eof2(c);
                chan_set_istate(c, CHAN_INPUT_CLOSED);
                break;
-       default:
-               error("channel %d: chan_ibuf_empty for istate %d",
-                   c->self, c->istate);
-               break;
        }
 }
 static void
-chan_rcvd_ieof2(Channel *c)
+chan_rcvd_eof2(Channel *c)
 {
        debug("channel %d: rcvd eof", c->self);
        if (c->ostate == CHAN_OUTPUT_OPEN)
@@ -330,9 +311,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);
@@ -344,26 +322,6 @@ chan_write_failed2(Channel *c)
        }
 }
 static void
-chan_obuf_empty2(Channel *c)
-{
-       debug("channel %d: obuf empty", c->self);
-       if (buffer_len(&c->output)) {
-               error("channel %d: chan_obuf_empty for non empty buffer",
-                   c->self);
-               return;
-       }
-       switch (c->ostate) {
-       case CHAN_OUTPUT_WAIT_DRAIN:
-               chan_shutdown_write(c);
-               chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
-               break;
-       default:
-               error("channel %d: chan_obuf_empty for ostate %d",
-                   c->self, c->ostate);
-               break;
-       }
-}
-static void
 chan_send_eof2(Channel *c)
 {
        debug("channel %d: send eof", c->self);
@@ -399,6 +357,34 @@ 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)
+               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)
 {
@@ -455,37 +441,6 @@ chan_is_dead(Channel *c, int send)
        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_oclose2;
-               chan_read_failed                = chan_read_failed_12;
-               chan_ibuf_empty                 = chan_ibuf_empty2;
-
-               chan_rcvd_ieof                  = chan_rcvd_ieof2;
-               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;
-       }
-}
-
 /* helper */
 static void
 chan_shutdown_write(Channel *c)