tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-25 14:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/02/28 12:55:07

Browse Source 
[channels.c]
     unify debug messages
This commit is contained in:
Ben Lindstrom 2001-03-05 06:20:14 +00:00
parent 5699c5f9ac
commit cc74df79d7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -76,6 +76,9 @@
[packet.c packet.h sshconnect2.c] [packet.c packet.h sshconnect2.c]
in ssh protocol v2 use ignore messages for padding (instead of in ssh protocol v2 use ignore messages for padding (instead of
trailing \0). trailing \0).
- markus@cvs.openbsd.org 2001/02/28 12:55:07
[channels.c]
unify debug messages
20010304 20010304
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@ -4268,4 +4271,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

10
channels.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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 <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>
@ -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 */ /* XXX ugly hack: nonblock is only set by the server */
if (nonblock && isatty(c->rfd)) { 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; c->isatty = 1;
if (!isatty(c->wfd)) { 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); c->self, c->wfd);
} }
} else { } else {
@ -1069,7 +1069,7 @@ channel_output_poll()
if (compat20 && if (compat20 &&
(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD))) { (c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD))) {
/* XXX is this true? */ /* XXX is this true? */
debug("channel: %d: no data after CLOSE", c->self); debug("channel %d: no data after CLOSE", c->self);
continue; continue;
} }
@ -1424,7 +1424,7 @@ channel_input_channel_request(int type, int plen, void *ctxt)
debug2("callback done"); debug2("callback done");
} else { } else {
char *service = packet_get_string(NULL); 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); debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event);
xfree(service); xfree(service);
} }