diff options
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/clientloop.c b/clientloop.c index cd2eab77a..2c030e71b 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.102 2002/06/24 14:33:27 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.104 2002/08/22 19:38:42 stevesk Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -635,16 +635,18 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len) | |||
635 | snprintf(string, sizeof string, | 635 | snprintf(string, sizeof string, |
636 | "%c?\r\n\ | 636 | "%c?\r\n\ |
637 | Supported escape sequences:\r\n\ | 637 | Supported escape sequences:\r\n\ |
638 | ~. - terminate connection\r\n\ | 638 | %c. - terminate connection\r\n\ |
639 | ~C - open a command line\r\n\ | 639 | %cC - open a command line\r\n\ |
640 | ~R - Request rekey (SSH protocol 2 only)\r\n\ | 640 | %cR - Request rekey (SSH protocol 2 only)\r\n\ |
641 | ~^Z - suspend ssh\r\n\ | 641 | %c^Z - suspend ssh\r\n\ |
642 | ~# - list forwarded connections\r\n\ | 642 | %c# - list forwarded connections\r\n\ |
643 | ~& - background ssh (when waiting for connections to terminate)\r\n\ | 643 | %c& - background ssh (when waiting for connections to terminate)\r\n\ |
644 | ~? - this message\r\n\ | 644 | %c? - this message\r\n\ |
645 | ~~ - send the escape character by typing it twice\r\n\ | 645 | %c%c - send the escape character by typing it twice\r\n\ |
646 | (Note that escapes are only recognized immediately after newline.)\r\n", | 646 | (Note that escapes are only recognized immediately after newline.)\r\n", |
647 | escape_char); | 647 | escape_char, escape_char, escape_char, escape_char, |
648 | escape_char, escape_char, escape_char, escape_char, | ||
649 | escape_char, escape_char); | ||
648 | buffer_append(berr, string, strlen(string)); | 650 | buffer_append(berr, string, strlen(string)); |
649 | continue; | 651 | continue; |
650 | 652 | ||
@@ -1114,7 +1116,7 @@ client_input_exit_status(int type, u_int32_t seq, void *ctxt) | |||
1114 | static Channel * | 1116 | static Channel * |
1115 | client_request_forwarded_tcpip(const char *request_type, int rchan) | 1117 | client_request_forwarded_tcpip(const char *request_type, int rchan) |
1116 | { | 1118 | { |
1117 | Channel* c = NULL; | 1119 | Channel *c = NULL; |
1118 | char *listen_address, *originator_address; | 1120 | char *listen_address, *originator_address; |
1119 | int listen_port, originator_port; | 1121 | int listen_port, originator_port; |
1120 | int sock; | 1122 | int sock; |
@@ -1144,7 +1146,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) | |||
1144 | return c; | 1146 | return c; |
1145 | } | 1147 | } |
1146 | 1148 | ||
1147 | static Channel* | 1149 | static Channel * |
1148 | client_request_x11(const char *request_type, int rchan) | 1150 | client_request_x11(const char *request_type, int rchan) |
1149 | { | 1151 | { |
1150 | Channel *c = NULL; | 1152 | Channel *c = NULL; |
@@ -1180,7 +1182,7 @@ client_request_x11(const char *request_type, int rchan) | |||
1180 | return c; | 1182 | return c; |
1181 | } | 1183 | } |
1182 | 1184 | ||
1183 | static Channel* | 1185 | static Channel * |
1184 | client_request_agent(const char *request_type, int rchan) | 1186 | client_request_agent(const char *request_type, int rchan) |
1185 | { | 1187 | { |
1186 | Channel *c = NULL; | 1188 | Channel *c = NULL; |