tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/04/10 12:15:23 

[channels.c]
     debug cleanup
This commit is contained in:
Ben Lindstrom 2001-04-11 16:08:34 +00:00
parent 18a82ac029
commit c486d88bf8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6,6 +6,9 @@
- itojun@cvs.openbsd.org 2001/04/10 09:13:22 - itojun@cvs.openbsd.org 2001/04/10 09:13:22
[ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8] [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
document id_rsa{.pub,}. markus ok document id_rsa{.pub,}. markus ok
- markus@cvs.openbsd.org 2001/04/10 12:15:23
[channels.c]
debug cleanup
20010410 20010410
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4999,4 +5002,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

12
channels.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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/rsa.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>
@ -420,7 +420,7 @@ channel_pre_input_draining(Channel *c, fd_set * readset, fd_set * writeset)
packet_put_int(c->remote_id); packet_put_int(c->remote_id);
packet_send(); packet_send();
c->type = SSH_CHANNEL_CLOSED; 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 @@ channel_pre_dynamic(Channel *c, fd_set * readset, fd_set * writeset)
have = buffer_len(&c->input); have = buffer_len(&c->input);
debug2("channel %d: pre_dynamic: have %d", c->self, have); 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. */ /* check if the fixed size part of the packet is in buffer. */
if (have < 4) { if (have < 4) {
/* need more */ /* need more */
@ -907,7 +907,7 @@ channel_handle_rfd(Channel *c, fd_set * readset, fd_set * writeset)
} else if (compat13) { } else if (compat13) {
buffer_consume(&c->output, buffer_len(&c->output)); buffer_consume(&c->output, buffer_len(&c->output));
c->type = SSH_CHANNEL_INPUT_DRAINING; 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 { } else {
chan_read_failed(c); chan_read_failed(c);
} }
@ -915,7 +915,7 @@ channel_handle_rfd(Channel *c, fd_set * readset, fd_set * writeset)
} }
if(c->input_filter != NULL) { if(c->input_filter != NULL) {
if (c->input_filter(c, buf, len) == -1) { 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); chan_read_failed(c);
} }
} else { } else {
@ -945,7 +945,7 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
return -1; return -1;
} else if (compat13) { } else if (compat13) {
buffer_consume(&c->output, buffer_len(&c->output)); 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; c->type = SSH_CHANNEL_INPUT_DRAINING;
} else { } else {
chan_write_failed(c); chan_write_failed(c);