comparison cli-runopts.c @ 479:e3db1f7a2e43

- Split main socket var into ses.sock_in/ses.sock_out in preparation for -J proxy_cmd option (and some prelim options for that)
author Matt Johnston <matt@ucc.asn.au>
date Mon, 15 Sep 2008 12:51:50 +0000
parents f4addc06745b
children 738313e73b1c
comparison
equal deleted inserted replaced
477:657c045054ab 479:e3db1f7a2e43
63 #ifdef ENABLE_CLI_REMOTETCPFWD 63 #ifdef ENABLE_CLI_REMOTETCPFWD
64 "-R <listenport:remotehost:remoteport> Remote port forwarding\n" 64 "-R <listenport:remotehost:remoteport> Remote port forwarding\n"
65 #endif 65 #endif
66 "-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n" 66 "-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n"
67 "-K <keepalive> (0 is never, default %d)\n" 67 "-K <keepalive> (0 is never, default %d)\n"
68 #ifdef ENABLE_CLI_PROXYCMD
69 "-J <proxy_program> Use program rather than tcp connection"
70 #endif
68 #ifdef DEBUG_TRACE 71 #ifdef DEBUG_TRACE
69 "-v verbose\n" 72 "-v verbose\n"
70 #endif 73 #endif
71 ,DROPBEAR_VERSION, cli_opts.progname, 74 ,DROPBEAR_VERSION, cli_opts.progname,
72 DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE); 75 DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE);
84 #ifdef ENABLE_CLI_LOCALTCPFWD 87 #ifdef ENABLE_CLI_LOCALTCPFWD
85 int nextislocal = 0; 88 int nextislocal = 0;
86 #endif 89 #endif
87 #ifdef ENABLE_CLI_REMOTETCPFWD 90 #ifdef ENABLE_CLI_REMOTETCPFWD
88 int nextisremote = 0; 91 int nextisremote = 0;
92 #endif
93 #ifdef ENABLE_CLI_PROXYCMD
94 int nextisproxycmd = 0;
89 #endif 95 #endif
90 char* dummy = NULL; /* Not used for anything real */ 96 char* dummy = NULL; /* Not used for anything real */
91 97
92 char* recv_window_arg = NULL; 98 char* recv_window_arg = NULL;
93 char* keepalive_arg = NULL; 99 char* keepalive_arg = NULL;
197 #ifdef ENABLE_CLI_REMOTETCPFWD 203 #ifdef ENABLE_CLI_REMOTETCPFWD
198 case 'R': 204 case 'R':
199 nextisremote = 1; 205 nextisremote = 1;
200 break; 206 break;
201 #endif 207 #endif
208 #ifdef ENABLE_CLI_PROXYCMD
209 case 'J':
210 next = &cli_opts.proxycmd;
211 break;
212 #endif
202 case 'l': 213 case 'l':
203 next = &cli_opts.username; 214 next = &cli_opts.username;
204 break; 215 break;
205 case 'h': 216 case 'h':
206 printhelp(); 217 printhelp();