From cc74df79d79f20d685c0968430857de59320811c Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 5 Mar 2001 06:20:14 +0000 Subject: - markus@cvs.openbsd.org 2001/02/28 12:55:07 [channels.c] unify debug messages --- ChangeLog | 5 ++++- channels.c | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b91677386..0efe52f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,9 @@ [packet.c packet.h sshconnect2.c] in ssh protocol v2 use ignore messages for padding (instead of trailing \0). + - markus@cvs.openbsd.org 2001/02/28 12:55:07 + [channels.c] + unify debug messages 20010304 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. @@ -4268,4 +4271,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.873 2001/03/05 06:17:49 mouring Exp $ +$Id: ChangeLog,v 1.874 2001/03/05 06:20:14 mouring Exp $ diff --git a/channels.c b/channels.c index f10427c17..d1c90b4ac 100644 --- a/channels.c +++ b/channels.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.93 2001/02/28 08:54:55 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.94 2001/02/28 12:55:07 markus Exp $"); #include #include @@ -195,10 +195,10 @@ channel_register_fds(Channel *c, int rfd, int wfd, int efd, /* XXX ugly hack: nonblock is only set by the server */ if (nonblock && isatty(c->rfd)) { - debug("channel: %d: rfd %d isatty", c->self, c->rfd); + debug("channel %d: rfd %d isatty", c->self, c->rfd); c->isatty = 1; if (!isatty(c->wfd)) { - error("channel: %d: wfd %d is not a tty?", + error("channel %d: wfd %d is not a tty?", c->self, c->wfd); } } else { @@ -1069,7 +1069,7 @@ channel_output_poll() if (compat20 && (c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD))) { /* XXX is this true? */ - debug("channel: %d: no data after CLOSE", c->self); + debug("channel %d: no data after CLOSE", c->self); continue; } @@ -1424,7 +1424,7 @@ channel_input_channel_request(int type, int plen, void *ctxt) debug2("callback done"); } else { char *service = packet_get_string(NULL); - debug("channel: %d rcvd request for %s", c->self, service); + debug("channel %d: rcvd request for %s", c->self, service); debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event); xfree(service); } -- cgit v1.2.3