From fbdeecef92bbf5b265bdb8d8c876c6989a0e8c9e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 2 Sep 2003 22:52:31 +1000 Subject: - markus@cvs.openbsd.org 2003/08/29 10:04:36 [channels.c nchan.c] be less chatty; debug -> debug2, cleanup; ok henning@ --- nchan.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'nchan.c') diff --git a/nchan.c b/nchan.c index 2935df32..3138cdd1 100644 --- a/nchan.c +++ b/nchan.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: nchan.c,v 1.48 2003/04/08 20:21:29 itojun Exp $"); +RCSID("$OpenBSD: nchan.c,v 1.49 2003/08/29 10:04:36 markus Exp $"); #include "ssh1.h" #include "ssh2.h" @@ -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,7 +301,7 @@ 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); @@ -309,7 +309,7 @@ chan_rcvd_eof2(Channel *c) 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: @@ -325,7 +325,7 @@ 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); @@ -342,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", @@ -398,13 +398,13 @@ int chan_is_dead(Channel *c, int 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; } if ((datafellows & SSH_BUG_EXTEOF) && @@ -421,7 +421,7 @@ chan_is_dead(Channel *c, int send) } else { /* channel would be dead if we sent a close */ if (c->flags & CHAN_CLOSE_RCVD) { - debug("channel %d: almost dead", + debug2("channel %d: almost dead", c->self); return 1; } @@ -429,7 +429,7 @@ chan_is_dead(Channel *c, int send) } if ((c->flags & CHAN_CLOSE_SENT) && (c->flags & CHAN_CLOSE_RCVD)) { - debug("channel %d: is dead", c->self); + debug2("channel %d: is dead", c->self); return 1; } return 0; @@ -443,10 +443,10 @@ 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 { @@ -461,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 -- cgit v1.2.1