summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/channels.c b/channels.c
index 008ff64b9..4283abc3a 100644
--- a/channels.c
+++ b/channels.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: channels.c,v 1.104 2001/04/10 07:46:58 markus Exp $"); 43RCSID("$OpenBSD: channels.c,v 1.105 2001/04/10 12:15:23 markus Exp $");
44 44
45#include <openssl/rsa.h> 45#include <openssl/rsa.h>
46#include <openssl/dsa.h> 46#include <openssl/dsa.h>
@@ -420,7 +420,7 @@ channel_pre_input_draining(Channel *c, fd_set * readset, fd_set * writeset)
420 packet_put_int(c->remote_id); 420 packet_put_int(c->remote_id);
421 packet_send(); 421 packet_send();
422 c->type = SSH_CHANNEL_CLOSED; 422 c->type = SSH_CHANNEL_CLOSED;
423 debug("Closing channel %d after input drain.", c->self); 423 debug("channel %d: closing after input drain.", c->self);
424 } 424 }
425} 425}
426 426
@@ -641,7 +641,7 @@ channel_pre_dynamic(Channel *c, fd_set * readset, fd_set * writeset)
641 have = buffer_len(&c->input); 641 have = buffer_len(&c->input);
642 642
643 debug2("channel %d: pre_dynamic: have %d", c->self, have); 643 debug2("channel %d: pre_dynamic: have %d", c->self, have);
644 buffer_dump(&c->input); 644 /* buffer_dump(&c->input); */
645 /* check if the fixed size part of the packet is in buffer. */ 645 /* check if the fixed size part of the packet is in buffer. */
646 if (have < 4) { 646 if (have < 4) {
647 /* need more */ 647 /* need more */
@@ -907,7 +907,7 @@ channel_handle_rfd(Channel *c, fd_set * readset, fd_set * writeset)
907 } else if (compat13) { 907 } else if (compat13) {
908 buffer_consume(&c->output, buffer_len(&c->output)); 908 buffer_consume(&c->output, buffer_len(&c->output));
909 c->type = SSH_CHANNEL_INPUT_DRAINING; 909 c->type = SSH_CHANNEL_INPUT_DRAINING;
910 debug("Channel %d status set to input draining.", c->self); 910 debug("channel %d: status set to input draining.", c->self);
911 } else { 911 } else {
912 chan_read_failed(c); 912 chan_read_failed(c);
913 } 913 }
@@ -915,7 +915,7 @@ channel_handle_rfd(Channel *c, fd_set * readset, fd_set * writeset)
915 } 915 }
916 if(c->input_filter != NULL) { 916 if(c->input_filter != NULL) {
917 if (c->input_filter(c, buf, len) == -1) { 917 if (c->input_filter(c, buf, len) == -1) {
918 debug("filter stops channel %d", c->self); 918 debug("channel %d: filter stops", c->self);
919 chan_read_failed(c); 919 chan_read_failed(c);
920 } 920 }
921 } else { 921 } else {
@@ -945,7 +945,7 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
945 return -1; 945 return -1;
946 } else if (compat13) { 946 } else if (compat13) {
947 buffer_consume(&c->output, buffer_len(&c->output)); 947 buffer_consume(&c->output, buffer_len(&c->output));
948 debug("Channel %d status set to input draining.", c->self); 948 debug("channel %d: status set to input draining.", c->self);
949 c->type = SSH_CHANNEL_INPUT_DRAINING; 949 c->type = SSH_CHANNEL_INPUT_DRAINING;
950 } else { 950 } else {
951 chan_write_failed(c); 951 chan_write_failed(c);