diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -76,6 +76,9 @@ | |||
76 | [packet.c packet.h sshconnect2.c] | 76 | [packet.c packet.h sshconnect2.c] |
77 | in ssh protocol v2 use ignore messages for padding (instead of | 77 | in ssh protocol v2 use ignore messages for padding (instead of |
78 | trailing \0). | 78 | trailing \0). |
79 | - markus@cvs.openbsd.org 2001/02/28 12:55:07 | ||
80 | [channels.c] | ||
81 | unify debug messages | ||
79 | 82 | ||
80 | 20010304 | 83 | 20010304 |
81 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. | 84 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. |
@@ -4268,4 +4271,4 @@ | |||
4268 | - Wrote replacements for strlcpy and mkdtemp | 4271 | - Wrote replacements for strlcpy and mkdtemp |
4269 | - Released 1.0pre1 | 4272 | - Released 1.0pre1 |
4270 | 4273 | ||
4271 | $Id: ChangeLog,v 1.873 2001/03/05 06:17:49 mouring Exp $ | 4274 | $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 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: channels.c,v 1.93 2001/02/28 08:54:55 markus Exp $"); | 43 | RCSID("$OpenBSD: channels.c,v 1.94 2001/02/28 12:55:07 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/rsa.h> | 45 | #include <openssl/rsa.h> |
46 | #include <openssl/dsa.h> | 46 | #include <openssl/dsa.h> |
@@ -195,10 +195,10 @@ channel_register_fds(Channel *c, int rfd, int wfd, int efd, | |||
195 | 195 | ||
196 | /* XXX ugly hack: nonblock is only set by the server */ | 196 | /* XXX ugly hack: nonblock is only set by the server */ |
197 | if (nonblock && isatty(c->rfd)) { | 197 | if (nonblock && isatty(c->rfd)) { |
198 | debug("channel: %d: rfd %d isatty", c->self, c->rfd); | 198 | debug("channel %d: rfd %d isatty", c->self, c->rfd); |
199 | c->isatty = 1; | 199 | c->isatty = 1; |
200 | if (!isatty(c->wfd)) { | 200 | if (!isatty(c->wfd)) { |
201 | error("channel: %d: wfd %d is not a tty?", | 201 | error("channel %d: wfd %d is not a tty?", |
202 | c->self, c->wfd); | 202 | c->self, c->wfd); |
203 | } | 203 | } |
204 | } else { | 204 | } else { |
@@ -1069,7 +1069,7 @@ channel_output_poll() | |||
1069 | if (compat20 && | 1069 | if (compat20 && |
1070 | (c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD))) { | 1070 | (c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD))) { |
1071 | /* XXX is this true? */ | 1071 | /* XXX is this true? */ |
1072 | debug("channel: %d: no data after CLOSE", c->self); | 1072 | debug("channel %d: no data after CLOSE", c->self); |
1073 | continue; | 1073 | continue; |
1074 | } | 1074 | } |
1075 | 1075 | ||
@@ -1424,7 +1424,7 @@ channel_input_channel_request(int type, int plen, void *ctxt) | |||
1424 | debug2("callback done"); | 1424 | debug2("callback done"); |
1425 | } else { | 1425 | } else { |
1426 | char *service = packet_get_string(NULL); | 1426 | char *service = packet_get_string(NULL); |
1427 | debug("channel: %d rcvd request for %s", c->self, service); | 1427 | debug("channel %d: rcvd request for %s", c->self, service); |
1428 | debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event); | 1428 | debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event); |
1429 | xfree(service); | 1429 | xfree(service); |
1430 | } | 1430 | } |