- markus@cvs.openbsd.org 2001/04/10 12:15:23
[channels.c]
debug cleanup
diff --git a/ChangeLog b/ChangeLog
index 038f18a..8fb3477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
- itojun@cvs.openbsd.org 2001/04/10 09:13:22
[ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
document id_rsa{.pub,}. markus ok
+ - markus@cvs.openbsd.org 2001/04/10 12:15:23
+ [channels.c]
+ debug cleanup
20010410
- OpenBSD CVS Sync
@@ -4999,4 +5002,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1095 2001/04/11 15:59:35 mouring Exp $
+$Id: ChangeLog,v 1.1096 2001/04/11 16:08:34 mouring Exp $
diff --git a/channels.c b/channels.c
index 008ff64..4283abc 100644
--- a/channels.c
+++ b/channels.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.104 2001/04/10 07:46:58 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.105 2001/04/10 12:15:23 markus Exp $");
#include <openssl/rsa.h>
#include <openssl/dsa.h>
@@ -420,7 +420,7 @@
packet_put_int(c->remote_id);
packet_send();
c->type = SSH_CHANNEL_CLOSED;
- debug("Closing channel %d after input drain.", c->self);
+ debug("channel %d: closing after input drain.", c->self);
}
}
@@ -641,7 +641,7 @@
have = buffer_len(&c->input);
debug2("channel %d: pre_dynamic: have %d", c->self, have);
- buffer_dump(&c->input);
+ /* buffer_dump(&c->input); */
/* check if the fixed size part of the packet is in buffer. */
if (have < 4) {
/* need more */
@@ -907,7 +907,7 @@
} else if (compat13) {
buffer_consume(&c->output, buffer_len(&c->output));
c->type = SSH_CHANNEL_INPUT_DRAINING;
- debug("Channel %d status set to input draining.", c->self);
+ debug("channel %d: status set to input draining.", c->self);
} else {
chan_read_failed(c);
}
@@ -915,7 +915,7 @@
}
if(c->input_filter != NULL) {
if (c->input_filter(c, buf, len) == -1) {
- debug("filter stops channel %d", c->self);
+ debug("channel %d: filter stops", c->self);
chan_read_failed(c);
}
} else {
@@ -945,7 +945,7 @@
return -1;
} else if (compat13) {
buffer_consume(&c->output, buffer_len(&c->output));
- debug("Channel %d status set to input draining.", c->self);
+ debug("channel %d: status set to input draining.", c->self);
c->type = SSH_CHANNEL_INPUT_DRAINING;
} else {
chan_write_failed(c);