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 6d19b4a25..8b1976171 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" |
@@ -654,16 +654,18 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len) | |||
654 | snprintf(string, sizeof string, | 654 | snprintf(string, sizeof string, |
655 | "%c?\r\n\ | 655 | "%c?\r\n\ |
656 | Supported escape sequences:\r\n\ | 656 | Supported escape sequences:\r\n\ |
657 | ~. - terminate connection\r\n\ | 657 | %c. - terminate connection\r\n\ |
658 | ~C - open a command line\r\n\ | 658 | %cC - open a command line\r\n\ |
659 | ~R - Request rekey (SSH protocol 2 only)\r\n\ | 659 | %cR - Request rekey (SSH protocol 2 only)\r\n\ |
660 | ~^Z - suspend ssh\r\n\ | 660 | %c^Z - suspend ssh\r\n\ |
661 | ~# - list forwarded connections\r\n\ | 661 | %c# - list forwarded connections\r\n\ |
662 | ~& - background ssh (when waiting for connections to terminate)\r\n\ | 662 | %c& - background ssh (when waiting for connections to terminate)\r\n\ |
663 | ~? - this message\r\n\ | 663 | %c? - this message\r\n\ |
664 | ~~ - send the escape character by typing it twice\r\n\ | 664 | %c%c - send the escape character by typing it twice\r\n\ |
665 | (Note that escapes are only recognized immediately after newline.)\r\n", | 665 | (Note that escapes are only recognized immediately after newline.)\r\n", |
666 | escape_char); | 666 | escape_char, escape_char, escape_char, escape_char, |
667 | escape_char, escape_char, escape_char, escape_char, | ||
668 | escape_char, escape_char); | ||
667 | buffer_append(berr, string, strlen(string)); | 669 | buffer_append(berr, string, strlen(string)); |
668 | continue; | 670 | continue; |
669 | 671 | ||
@@ -1149,7 +1151,7 @@ client_input_exit_status(int type, u_int32_t seq, void *ctxt) | |||
1149 | static Channel * | 1151 | static Channel * |
1150 | client_request_forwarded_tcpip(const char *request_type, int rchan) | 1152 | client_request_forwarded_tcpip(const char *request_type, int rchan) |
1151 | { | 1153 | { |
1152 | Channel* c = NULL; | 1154 | Channel *c = NULL; |
1153 | char *listen_address, *originator_address; | 1155 | char *listen_address, *originator_address; |
1154 | int listen_port, originator_port; | 1156 | int listen_port, originator_port; |
1155 | int sock; | 1157 | int sock; |
@@ -1179,7 +1181,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) | |||
1179 | return c; | 1181 | return c; |
1180 | } | 1182 | } |
1181 | 1183 | ||
1182 | static Channel* | 1184 | static Channel * |
1183 | client_request_x11(const char *request_type, int rchan) | 1185 | client_request_x11(const char *request_type, int rchan) |
1184 | { | 1186 | { |
1185 | Channel *c = NULL; | 1187 | Channel *c = NULL; |
@@ -1215,7 +1217,7 @@ client_request_x11(const char *request_type, int rchan) | |||
1215 | return c; | 1217 | return c; |
1216 | } | 1218 | } |
1217 | 1219 | ||
1218 | static Channel* | 1220 | static Channel * |
1219 | client_request_agent(const char *request_type, int rchan) | 1221 | client_request_agent(const char *request_type, int rchan) |
1220 | { | 1222 | { |
1221 | Channel *c = NULL; | 1223 | Channel *c = NULL; |