version 1.26, 2000/05/08 17:42:24 |
version 1.26.2.1, 2000/09/01 18:23:18 |
|
|
*/ |
*/ |
|
|
#include "includes.h" |
#include "includes.h" |
RCSID("$Id$"); |
RCSID("$OpenBSD$"); |
|
|
#include "xmalloc.h" |
#include "xmalloc.h" |
#include "ssh.h" |
#include "ssh.h" |
#include "packet.h" |
#include "packet.h" |
#include "buffer.h" |
#include "buffer.h" |
#include "authfd.h" |
|
#include "readconf.h" |
#include "readconf.h" |
|
|
#include "ssh2.h" |
#include "ssh2.h" |
|
|
#include "channels.h" |
#include "channels.h" |
#include "dispatch.h" |
#include "dispatch.h" |
|
|
|
#include "buffer.h" |
|
#include "bufaux.h" |
|
|
/* Flag indicating that stdin should be redirected from /dev/null. */ |
/* Flag indicating that stdin should be redirected from /dev/null. */ |
extern int stdin_null_flag; |
extern int stdin_null_flag; |
|
|
static int in_non_blocking_mode = 0; |
static int in_non_blocking_mode = 0; |
|
|
/* Common data for the client loop code. */ |
/* Common data for the client loop code. */ |
|
static int quit_pending; /* Set to non-zero to quit the client loop. */ |
|
static int escape_char; /* Escape character. */ |
static int escape_pending; /* Last character was the escape character */ |
static int escape_pending; /* Last character was the escape character */ |
static int last_was_cr; /* Last character was a newline. */ |
static int last_was_cr; /* Last character was a newline. */ |
static int exit_status; /* Used to store the exit status of the command. */ |
static int exit_status; /* Used to store the exit status of the command. */ |
|
|
static Buffer stdin_buffer; /* Buffer for stdin data. */ |
static Buffer stdin_buffer; /* Buffer for stdin data. */ |
static Buffer stdout_buffer; /* Buffer for stdout data. */ |
static Buffer stdout_buffer; /* Buffer for stdout data. */ |
static Buffer stderr_buffer; /* Buffer for stderr data. */ |
static Buffer stderr_buffer; /* Buffer for stderr data. */ |
|
static unsigned long stdin_bytes, stdout_bytes, stderr_bytes; |
static unsigned int buffer_high;/* Soft max buffer size. */ |
static unsigned int buffer_high;/* Soft max buffer size. */ |
static int max_fd; /* Maximum file descriptor number in select(). */ |
static int max_fd; /* Maximum file descriptor number in select(). */ |
static int connection_in; /* Connection to server (input). */ |
static int connection_in; /* Connection to server (input). */ |
static int connection_out; /* Connection to server (output). */ |
static int connection_out; /* Connection to server (output). */ |
static unsigned long stdin_bytes, stdout_bytes, stderr_bytes; |
|
static int quit_pending; /* Set to non-zero to quit the client loop. */ |
|
static int escape_char; /* Escape character. */ |
|
|
|
|
|
void client_init_dispatch(void); |
void client_init_dispatch(void); |
|
|
} |
} |
|
|
void |
void |
client_suspend_self() |
client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr) |
{ |
{ |
struct winsize oldws, newws; |
struct winsize oldws, newws; |
|
|
/* Flush stdout and stderr buffers. */ |
/* Flush stdout and stderr buffers. */ |
if (buffer_len(&stdout_buffer) > 0) |
if (buffer_len(bout) > 0) |
atomicio(write, fileno(stdout), buffer_ptr(&stdout_buffer), |
atomicio(write, fileno(stdout), buffer_ptr(bout), buffer_len(bout)); |
buffer_len(&stdout_buffer)); |
if (buffer_len(berr) > 0) |
if (buffer_len(&stderr_buffer) > 0) |
atomicio(write, fileno(stderr), buffer_ptr(berr), buffer_len(berr)); |
atomicio(write, fileno(stderr), buffer_ptr(&stderr_buffer), |
|
buffer_len(&stderr_buffer)); |
|
|
|
leave_raw_mode(); |
leave_raw_mode(); |
|
|
|
|
* Free (and clear) the buffer to reduce the amount of data that gets |
* Free (and clear) the buffer to reduce the amount of data that gets |
* written to swap. |
* written to swap. |
*/ |
*/ |
buffer_free(&stdin_buffer); |
buffer_free(bin); |
buffer_free(&stdout_buffer); |
buffer_free(bout); |
buffer_free(&stderr_buffer); |
buffer_free(berr); |
|
|
/* Save old window size. */ |
/* Save old window size. */ |
ioctl(fileno(stdin), TIOCGWINSZ, &oldws); |
ioctl(fileno(stdin), TIOCGWINSZ, &oldws); |
|
|
received_window_change_signal = 1; |
received_window_change_signal = 1; |
|
|
/* OK, we have been continued by the user. Reinitialize buffers. */ |
/* OK, we have been continued by the user. Reinitialize buffers. */ |
buffer_init(&stdin_buffer); |
buffer_init(bin); |
buffer_init(&stdout_buffer); |
buffer_init(bout); |
buffer_init(&stderr_buffer); |
buffer_init(berr); |
|
|
enter_raw_mode(); |
enter_raw_mode(); |
} |
} |
|
|
} |
} |
} |
} |
|
|
|
/* process the characters one by one */ |
|
int |
|
process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len) |
|
{ |
|
char string[1024]; |
|
pid_t pid; |
|
int bytes = 0; |
|
unsigned int i; |
|
unsigned char ch; |
|
char *s; |
|
|
|
for (i = 0; i < len; i++) { |
|
/* Get one character at a time. */ |
|
ch = buf[i]; |
|
|
|
if (escape_pending) { |
|
/* We have previously seen an escape character. */ |
|
/* Clear the flag now. */ |
|
escape_pending = 0; |
|
|
|
/* Process the escaped character. */ |
|
switch (ch) { |
|
case '.': |
|
/* Terminate the connection. */ |
|
snprintf(string, sizeof string, "%c.\r\n", escape_char); |
|
buffer_append(berr, string, strlen(string)); |
|
/*stderr_bytes += strlen(string); XXX*/ |
|
|
|
quit_pending = 1; |
|
return -1; |
|
|
|
case 'Z' - 64: |
|
/* Suspend the program. */ |
|
/* Print a message to that effect to the user. */ |
|
snprintf(string, sizeof string, "%c^Z [suspend ssh]\r\n", escape_char); |
|
buffer_append(berr, string, strlen(string)); |
|
/*stderr_bytes += strlen(string); XXX*/ |
|
|
|
/* Restore terminal modes and suspend. */ |
|
client_suspend_self(bin, bout, berr); |
|
|
|
/* We have been continued. */ |
|
continue; |
|
|
|
case '&': |
|
/* XXX does not work yet with proto 2 */ |
|
if (compat20) |
|
continue; |
|
/* |
|
* Detach the program (continue to serve connections, |
|
* but put in background and no more new connections). |
|
*/ |
|
if (!stdin_eof) { |
|
/* |
|
* Sending SSH_CMSG_EOF alone does not always appear |
|
* to be enough. So we try to send an EOF character |
|
* first. |
|
*/ |
|
packet_start(SSH_CMSG_STDIN_DATA); |
|
packet_put_string("\004", 1); |
|
packet_send(); |
|
/* Close stdin. */ |
|
stdin_eof = 1; |
|
if (buffer_len(bin) == 0) { |
|
packet_start(SSH_CMSG_EOF); |
|
packet_send(); |
|
} |
|
} |
|
/* Restore tty modes. */ |
|
leave_raw_mode(); |
|
|
|
/* Stop listening for new connections. */ |
|
channel_stop_listening(); |
|
|
|
printf("%c& [backgrounded]\n", escape_char); |
|
|
|
/* Fork into background. */ |
|
pid = fork(); |
|
if (pid < 0) { |
|
error("fork: %.100s", strerror(errno)); |
|
continue; |
|
} |
|
if (pid != 0) { /* This is the parent. */ |
|
/* The parent just exits. */ |
|
exit(0); |
|
} |
|
/* The child continues serving connections. */ |
|
continue; /*XXX ? */ |
|
|
|
case '?': |
|
snprintf(string, sizeof string, |
|
"%c?\r\n\ |
|
Supported escape sequences:\r\n\ |
|
~. - terminate connection\r\n\ |
|
~^Z - suspend ssh\r\n\ |
|
~# - list forwarded connections\r\n\ |
|
~& - background ssh (when waiting for connections to terminate)\r\n\ |
|
~? - this message\r\n\ |
|
~~ - send the escape character by typing it twice\r\n\ |
|
(Note that escapes are only recognized immediately after newline.)\r\n", |
|
escape_char); |
|
buffer_append(berr, string, strlen(string)); |
|
continue; |
|
|
|
case '#': |
|
snprintf(string, sizeof string, "%c#\r\n", escape_char); |
|
buffer_append(berr, string, strlen(string)); |
|
s = channel_open_message(); |
|
buffer_append(berr, s, strlen(s)); |
|
xfree(s); |
|
continue; |
|
|
|
default: |
|
if (ch != escape_char) { |
|
buffer_put_char(bin, escape_char); |
|
bytes++; |
|
} |
|
/* Escaped characters fall through here */ |
|
break; |
|
} |
|
} else { |
|
/* |
|
* The previous character was not an escape char. Check if this |
|
* is an escape. |
|
*/ |
|
if (last_was_cr && ch == escape_char) { |
|
/* It is. Set the flag and continue to next character. */ |
|
escape_pending = 1; |
|
continue; |
|
} |
|
} |
|
|
|
/* |
|
* Normal character. Record whether it was a newline, |
|
* and append it to the buffer. |
|
*/ |
|
last_was_cr = (ch == '\r' || ch == '\n'); |
|
buffer_put_char(bin, ch); |
|
bytes++; |
|
} |
|
return bytes; |
|
} |
|
|
void |
void |
client_process_input(fd_set * readset) |
client_process_input(fd_set * readset) |
{ |
{ |
|
int ret; |
int len; |
int len; |
pid_t pid; |
char buf[8192]; |
char buf[8192], *s; |
|
|
|
/* Read input from stdin. */ |
/* Read input from stdin. */ |
if (FD_ISSET(fileno(stdin), readset)) { |
if (FD_ISSET(fileno(stdin), readset)) { |
|
|
* Normal, successful read. But we have an escape character |
* Normal, successful read. But we have an escape character |
* and have to process the characters one by one. |
* and have to process the characters one by one. |
*/ |
*/ |
unsigned int i; |
ret = process_escapes(&stdin_buffer, &stdout_buffer, &stderr_buffer, buf, len); |
for (i = 0; i < len; i++) { |
if (ret == -1) |
unsigned char ch; |
return; |
/* Get one character at a time. */ |
stdout_bytes += ret; |
ch = buf[i]; |
|
|
|
if (escape_pending) { |
|
/* We have previously seen an escape character. */ |
|
/* Clear the flag now. */ |
|
escape_pending = 0; |
|
/* Process the escaped character. */ |
|
switch (ch) { |
|
case '.': |
|
/* Terminate the connection. */ |
|
snprintf(buf, sizeof buf, "%c.\r\n", escape_char); |
|
buffer_append(&stderr_buffer, buf, strlen(buf)); |
|
stderr_bytes += strlen(buf); |
|
quit_pending = 1; |
|
return; |
|
|
|
case 'Z' - 64: |
|
/* Suspend the program. */ |
|
/* Print a message to that effect to the user. */ |
|
snprintf(buf, sizeof buf, "%c^Z\r\n", escape_char); |
|
buffer_append(&stderr_buffer, buf, strlen(buf)); |
|
stderr_bytes += strlen(buf); |
|
|
|
/* Restore terminal modes and suspend. */ |
|
client_suspend_self(); |
|
|
|
/* We have been continued. */ |
|
continue; |
|
|
|
case '&': |
|
/* |
|
* Detach the program (continue to serve connections, |
|
* but put in background and no more new connections). |
|
*/ |
|
if (!stdin_eof) { |
|
/* |
|
* Sending SSH_CMSG_EOF alone does not always appear |
|
* to be enough. So we try to send an EOF character |
|
* first. |
|
*/ |
|
packet_start(SSH_CMSG_STDIN_DATA); |
|
packet_put_string("\004", 1); |
|
packet_send(); |
|
/* Close stdin. */ |
|
stdin_eof = 1; |
|
if (buffer_len(&stdin_buffer) == 0) { |
|
packet_start(SSH_CMSG_EOF); |
|
packet_send(); |
|
} |
|
} |
|
/* Restore tty modes. */ |
|
leave_raw_mode(); |
|
|
|
/* Stop listening for new connections. */ |
|
channel_stop_listening(); |
|
|
|
printf("%c& [backgrounded]\n", escape_char); |
|
|
|
/* Fork into background. */ |
|
pid = fork(); |
|
if (pid < 0) { |
|
error("fork: %.100s", strerror(errno)); |
|
continue; |
|
} |
|
if (pid != 0) { /* This is the parent. */ |
|
/* The parent just exits. */ |
|
exit(0); |
|
} |
|
/* The child continues serving connections. */ |
|
continue; |
|
|
|
case '?': |
|
snprintf(buf, sizeof buf, |
|
"%c?\r\n\ |
|
Supported escape sequences:\r\n\ |
|
~. - terminate connection\r\n\ |
|
~^Z - suspend ssh\r\n\ |
|
~# - list forwarded connections\r\n\ |
|
~& - background ssh (when waiting for connections to terminate)\r\n\ |
|
~? - this message\r\n\ |
|
~~ - send the escape character by typing it twice\r\n\ |
|
(Note that escapes are only recognized immediately after newline.)\r\n", |
|
escape_char); |
|
buffer_append(&stderr_buffer, buf, strlen(buf)); |
|
continue; |
|
|
|
case '#': |
|
snprintf(buf, sizeof buf, "%c#\r\n", escape_char); |
|
buffer_append(&stderr_buffer, buf, strlen(buf)); |
|
s = channel_open_message(); |
|
buffer_append(&stderr_buffer, s, strlen(s)); |
|
xfree(s); |
|
continue; |
|
|
|
default: |
|
if (ch != escape_char) { |
|
/* |
|
* Escape character followed by non-special character. |
|
* Append both to the input buffer. |
|
*/ |
|
buf[0] = escape_char; |
|
buf[1] = ch; |
|
buffer_append(&stdin_buffer, buf, 2); |
|
stdin_bytes += 2; |
|
continue; |
|
} |
|
/* |
|
* Note that escape character typed twice |
|
* falls through here; the latter gets processed |
|
* as a normal character below. |
|
*/ |
|
break; |
|
} |
|
} else { |
|
/* |
|
* The previous character was not an escape char. Check if this |
|
* is an escape. |
|
*/ |
|
if (last_was_cr && ch == escape_char) { |
|
/* It is. Set the flag and continue to next character. */ |
|
escape_pending = 1; |
|
continue; |
|
} |
|
} |
|
|
|
/* |
|
* Normal character. Record whether it was a newline, |
|
* and append it to the buffer. |
|
*/ |
|
last_was_cr = (ch == '\r' || ch == '\n'); |
|
buf[0] = ch; |
|
buffer_append(&stdin_buffer, buf, 1); |
|
stdin_bytes += 1; |
|
continue; |
|
} |
|
} |
} |
} |
} |
} |
} |
|
|
dispatch_run(DISPATCH_NONBLOCK, &quit_pending); |
dispatch_run(DISPATCH_NONBLOCK, &quit_pending); |
} |
} |
|
|
|
/* scan buf[] for '~' before sending data to the peer */ |
|
|
|
int |
|
simple_escape_filter(Channel *c, char *buf, int len) |
|
{ |
|
/* XXX we assume c->extended is writeable */ |
|
return process_escapes(&c->input, &c->output, &c->extended, buf, len); |
|
} |
|
|
/* |
/* |
* Implements the interactive session with the server. This is called after |
* Implements the interactive session with the server. This is called after |
* the user has been authenticated, and a command has been started on the |
* the user has been authenticated, and a command has been started on the |
|
|
*/ |
*/ |
|
|
int |
int |
client_loop(int have_pty, int escape_char_arg) |
client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) |
{ |
{ |
extern Options options; |
extern Options options; |
double start_time, total_time; |
double start_time, total_time; |
|
|
if (have_pty) |
if (have_pty) |
enter_raw_mode(); |
enter_raw_mode(); |
|
|
/* Check if we should immediately send of on stdin. */ |
/* Check if we should immediately send eof on stdin. */ |
if (!compat20) |
if (!compat20) |
client_check_initial_eof_on_stdin(); |
client_check_initial_eof_on_stdin(); |
|
|
|
if (compat20 && escape_char != -1) |
|
channel_register_filter(ssh2_chan_id, simple_escape_filter); |
|
|
/* Main loop of the client for the interactive session mode. */ |
/* Main loop of the client for the interactive session mode. */ |
while (!quit_pending) { |
while (!quit_pending) { |
fd_set readset, writeset; |
fd_set readset, writeset; |
|
|
/* XXX move to channels.c */ |
/* XXX move to channels.c */ |
sock = x11_connect_display(); |
sock = x11_connect_display(); |
if (sock >= 0) { |
if (sock >= 0) { |
|
/*XXX MAXPACK */ |
id = channel_new("x11", SSH_CHANNEL_X11_OPEN, |
id = channel_new("x11", SSH_CHANNEL_X11_OPEN, |
sock, sock, -1, 4*1024, 32*1024, 0, |
sock, sock, -1, 4*1024, 32*1024, 0, |
xstrdup("x11")); |
xstrdup("x11")); |