summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/serverloop.c b/serverloop.c
index 39aa1560e..aa74bf9a2 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.90 2001/12/27 20:39:58 markus Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.91 2001/12/28 12:14:27 markus Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
@@ -806,7 +806,7 @@ server_input_stdin_data(int type, int plen, u_int32_t seq, void *ctxt)
806 if (fdin == -1) 806 if (fdin == -1)
807 return; 807 return;
808 data = packet_get_string(&data_len); 808 data = packet_get_string(&data_len);
809 packet_done(); 809 packet_check_eom();
810 buffer_append(&stdin_buffer, data, data_len); 810 buffer_append(&stdin_buffer, data, data_len);
811 memset(data, 0, data_len); 811 memset(data, 0, data_len);
812 xfree(data); 812 xfree(data);
@@ -821,7 +821,7 @@ server_input_eof(int type, int plen, u_int32_t seq, void *ctxt)
821 * drained. 821 * drained.
822 */ 822 */
823 debug("EOF received for stdin."); 823 debug("EOF received for stdin.");
824 packet_done(); 824 packet_check_eom();
825 stdin_eof = 1; 825 stdin_eof = 1;
826} 826}
827 827
@@ -834,7 +834,7 @@ server_input_window_size(int type, int plen, u_int32_t seq, void *ctxt)
834 int ypixel = packet_get_int(); 834 int ypixel = packet_get_int();
835 835
836 debug("Window change received."); 836 debug("Window change received.");
837 packet_done(); 837 packet_check_eom();
838 if (fdin != -1) 838 if (fdin != -1)
839 pty_change_window_size(fdin, row, col, xpixel, ypixel); 839 pty_change_window_size(fdin, row, col, xpixel, ypixel);
840} 840}
@@ -851,7 +851,7 @@ server_request_direct_tcpip(char *ctype)
851 target_port = packet_get_int(); 851 target_port = packet_get_int();
852 originator = packet_get_string(NULL); 852 originator = packet_get_string(NULL);
853 originator_port = packet_get_int(); 853 originator_port = packet_get_int();
854 packet_done(); 854 packet_check_eom();
855 855
856 debug("server_request_direct_tcpip: originator %s port %d, target %s port %d", 856 debug("server_request_direct_tcpip: originator %s port %d, target %s port %d",
857 originator, originator_port, target, target_port); 857 originator, originator_port, target, target_port);
@@ -878,7 +878,7 @@ server_request_session(char *ctype)
878 Channel *c; 878 Channel *c;
879 879
880 debug("input_session_request"); 880 debug("input_session_request");
881 packet_done(); 881 packet_check_eom();
882 /* 882 /*
883 * A server session has no fd to read or write until a 883 * A server session has no fd to read or write until a
884 * CHANNEL_REQUEST for a shell is made, so we set the type to 884 * CHANNEL_REQUEST for a shell is made, so we set the type to