dropbear: cli-runopts.c annotate

annotate cli-runopts.c @ 949:0d2d39957c02 DROPBEAR_2014.64

Archive should be bz2 nor gz

author	Matt Johnston <matt@ucc.asn.au>
date	Sun, 27 Jul 2014 22:56:35 +0800
parents	17d874ae93a1
children	1bf92da7a2a0

rev	line source
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Dropbear - a SSH2 server
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * All rights reserved.
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 *
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * Permission is hereby granted, free of charge, to any person obtaining a copy
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * of this software and associated documentation files (the "Software"), to deal
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * in the Software without restriction, including without limitation the rights
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * copies of the Software, and to permit persons to whom the Software is
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * furnished to do so, subject to the following conditions:
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 *
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * The above copyright notice and this permission notice shall be included in
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * all copies or substantial portions of the Software.
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 *
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * SOFTWARE. */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 #include "includes.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "runopts.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "signkey.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "buffer.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "dbutil.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "algo.h"
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	31 #include "tcpfwd.h"
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	32 #include "list.h"
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 cli_runopts cli_opts; /* GLOBAL */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	36 static void printhelp();
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	37 static void parse_hostname(const char* orighostarg);
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	38 static void parse_multihop_hostname(const char* orighostarg, const char* argv0);
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	39 static void fill_own_user();
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	40 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	41 static void loadidentityfile(const char* filename);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	42 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	43 #ifdef ENABLE_CLI_ANYTCPFWD
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	44 static void addforward(const char* str, m_list *fwdlist);
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	45 #endif
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	46 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	47 static void add_netcat(const char *str);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	48 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	50 static void printhelp() {
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51
716 af4ef98b8591 Add URL to usage text Matt Johnston <matt@ucc.asn.au> parents: 697 diff changeset	52 fprintf(stderr, "Dropbear SSH client v%s https://matt.ucc.asn.au/dropbear/dropbear.html\n"
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	53 #ifdef ENABLE_CLI_MULTIHOP
4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	54 "Usage: %s [options] [user@]host[/port][,[user@]host/port],...] [command]\n"
4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	55 #else
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	56 "Usage: %s [options] [user@]host[/port] [command]\n"
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	57 #endif
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	58 "-p <remoteport>\n"
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	59 "-l <username>\n"
56 6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	60 "-t Allocate a pty\n"
6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	61 "-T Don't allocate a pty\n"
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	62 "-N Don't run a remote command\n"
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	63 "-f Run in background after auth\n"
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	64 "-y Always accept remote host key if unknown\n"
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	65 "-y -y Don't perform any remote host key checking (caution)\n"
697 aadfa8de977d improve subsystem/sftp documentation, and multi-hop manual formatting Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	66 "-s Request a subsystem (use by external sftp)\n"
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	67 #ifdef ENABLE_CLI_PUBKEY_AUTH
56 6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	68 "-i <identityfile> (multiple allowed)\n"
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	69 #endif
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	70 #ifdef ENABLE_CLI_AGENTFWD
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	71 "-A Enable agent auth forwarding\n"
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	72 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	73 #ifdef ENABLE_CLI_LOCALTCPFWD
580 dd9947170fc8 - fixes for listenaddr Matt Johnston <matt@ucc.asn.au> parents: 579 diff changeset	74 "-L <[listenaddress:]listenport:remotehost:remoteport> Local port forwarding\n"
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	75 "-g Allow remote hosts to connect to forwarded ports\n"
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	76 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	77 #ifdef ENABLE_CLI_REMOTETCPFWD
580 dd9947170fc8 - fixes for listenaddr Matt Johnston <matt@ucc.asn.au> parents: 579 diff changeset	78 "-R <[listenaddress:]listenport:remotehost:remoteport> Remote port forwarding\n"
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	79 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	80 "-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n"
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	81 "-K <keepalive> (0 is never, default %d)\n"
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	82 "-I <idle_timeout> (0 is never, default %d)\n"
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	83 #ifdef ENABLE_CLI_NETCAT
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	84 "-B <endhost:endport> Netcat-alike forwarding\n"
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	85 #endif
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	86 #ifdef ENABLE_CLI_PROXYCMD
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	87 "-J <proxy_program> Use program pipe rather than TCP connection\n"
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	88 #endif
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	89 #ifdef ENABLE_USER_ALGO_LIST
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	90 "-c <cipher list> Specify preferred ciphers ('-c help' to list options)\n"
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	91 "-m <MAC list> Specify preferred MACs for packet verification (or '-m help')\n"
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	92 #endif
946 17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	93 "-V Version\n"
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	94 #ifdef DEBUG_TRACE
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	95 "-v verbose (compiled with DEBUG_TRACE)\n"
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	96 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	97 ,DROPBEAR_VERSION, cli_opts.progname,
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	98 DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE, DEFAULT_IDLE_TIMEOUT);
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	99
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 void cli_getopts(int argc, char ** argv) {
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	103 unsigned int i, j;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 char ** next = 0;
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	105 unsigned int cmdlen;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	106 #ifdef ENABLE_CLI_PUBKEY_AUTH
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	107 int nextiskey = 0; /* A flag if the next argument is a keyfile */
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	108 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	109 #ifdef ENABLE_CLI_LOCALTCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	110 int nextislocal = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	111 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	112 #ifdef ENABLE_CLI_REMOTETCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	113 int nextisremote = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	114 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	115 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	116 int nextisnetcat = 0;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	117 #endif
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	118 char* dummy = NULL; /* Not used for anything real */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119
459 f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	120 char* recv_window_arg = NULL;
f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	121 char* keepalive_arg = NULL;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	122 char* idle_timeout_arg = NULL;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	123 char *host_arg = NULL;
459 f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	124
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 /* see printhelp() for options */
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	126 cli_opts.progname = argv[0];
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 cli_opts.remotehost = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 cli_opts.remoteport = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 cli_opts.username = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 cli_opts.cmd = NULL;
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	131 cli_opts.no_cmd = 0;
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	132 cli_opts.backgrounded = 0;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	133 cli_opts.wantpty = 9; /* 9 means "it hasn't been touched", gets set later */
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	134 cli_opts.always_accept_key = 0;
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	135 cli_opts.no_hostkey_check = 0;
497 ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	136 cli_opts.is_subsystem = 0;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	137 #ifdef ENABLE_CLI_PUBKEY_AUTH
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	138 cli_opts.privkeys = list_new();
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	139 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	140 #ifdef ENABLE_CLI_LOCALTCPFWD
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	141 cli_opts.localfwds = list_new();
446 2cd2edfa11ee Just use /dev/urandom since that's what everyone ends up using anyway. Matt Johnston <matt@ucc.asn.au> parents: 442 diff changeset	142 opts.listen_fwd_all = 0;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	143 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	144 #ifdef ENABLE_CLI_REMOTETCPFWD
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	145 cli_opts.remotefwds = list_new();
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	146 #endif
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	147 #ifdef ENABLE_CLI_AGENTFWD
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	148 cli_opts.agent_fwd = 0;
674 1291413c7c7e Initialise agent_fd to -1 so we don't end up closing stdin (fd 0) Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	149 cli_opts.agent_fd = -1;
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	150 cli_opts.agent_keys_loaded = 0;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	151 #endif
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	152 #ifdef ENABLE_CLI_PROXYCMD
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	153 cli_opts.proxycmd = NULL;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	154 #endif
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	155 #ifndef DISABLE_ZLIB
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	156 opts.enable_compress = 1;
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	157 #endif
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	158 #ifdef ENABLE_USER_ALGO_LIST
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	159 opts.cipher_list = NULL;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	160 opts.mac_list = NULL;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	161 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162 /* not yet
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 opts.ipv4 = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 opts.ipv6 = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 */
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	166 opts.recv_window = DEFAULT_RECV_WINDOW;
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 895 diff changeset	167 opts.keepalive_secs = DEFAULT_KEEPALIVE;
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 895 diff changeset	168 opts.idle_timeout_secs = DEFAULT_IDLE_TIMEOUT;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	170 fill_own_user();
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	171
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	172 /* Iterate all the arguments */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	173 for (i = 1; i < (unsigned int)argc; i++) {
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	174 #ifdef ENABLE_CLI_PUBKEY_AUTH
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	175 if (nextiskey) {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	176 /* Load a hostkey since the previous argument was "-i" */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	177 loadidentityfile(argv[i]);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	178 nextiskey = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	179 continue;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	181 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	182 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	183 if (nextisremote) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	184 TRACE(("nextisremote true"))
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	185 addforward(argv[i], cli_opts.remotefwds);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	186 nextisremote = 0;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	187 continue;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	188 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	189 #endif
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	190 #ifdef ENABLE_CLI_LOCALTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	191 if (nextislocal) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	192 TRACE(("nextislocal true"))
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	193 addforward(argv[i], cli_opts.localfwds);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	194 nextislocal = 0;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	195 continue;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	196 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	197 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	198 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	199 if (nextisnetcat) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	200 TRACE(("nextisnetcat true"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	201 add_netcat(argv[i]);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	202 nextisnetcat = 0;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	203 continue;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	204 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	205 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 if (next) {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	207 /* The previous flag set a value to assign */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 *next = argv[i];
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 if (*next == NULL) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 dropbear_exit("Invalid null argument");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	212 next = NULL;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213 continue;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 if (argv[i][0] == '-') {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	217 /* A flag waves */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	218
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219 switch (argv[i][1]) {
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	220 case 'y': /* always accept the remote hostkey */
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	221 if (cli_opts.always_accept_key) {
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	222 /* twice means no checking at all */
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	223 cli_opts.no_hostkey_check = 1;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	224 }
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	225 cli_opts.always_accept_key = 1;
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	226 break;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	227 case 'p': /* remoteport */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	228 next = &cli_opts.remoteport;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 break;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	230 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	231 case 'i': /* an identityfile */
134 6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	232 /* Keep scp happy when it changes "-i file" to "-ifile" */
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	233 if (strlen(argv[i]) > 2) {
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	234 loadidentityfile(&argv[i][2]);
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	235 } else {
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	236 nextiskey = 1;
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	237 }
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 break;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 #endif
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	240 case 't': /* we want a pty */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	241 cli_opts.wantpty = 1;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	242 break;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	243 case 'T': /* don't want a pty */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	244 cli_opts.wantpty = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	245 break;
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	246 case 'N':
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	247 cli_opts.no_cmd = 1;
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	248 break;
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	249 case 'f':
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	250 cli_opts.backgrounded = 1;
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	251 break;
497 ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	252 case 's':
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	253 cli_opts.is_subsystem = 1;
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	254 break;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	255 #ifdef ENABLE_CLI_LOCALTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	256 case 'L':
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	257 nextislocal = 1;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	258 break;
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	259 case 'g':
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	260 opts.listen_fwd_all = 1;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	261 break;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	262 #endif
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	263 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	264 case 'R':
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	265 nextisremote = 1;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	266 break;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	267 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	268 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	269 case 'B':
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	270 nextisnetcat = 1;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	271 break;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	272 #endif
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	273 #ifdef ENABLE_CLI_PROXYCMD
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	274 case 'J':
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	275 next = &cli_opts.proxycmd;
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	276 break;
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	277 #endif
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	278 case 'l':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	279 next = &cli_opts.username;
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	280 break;
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	281 case 'h':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	282 printhelp();
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	283 exit(EXIT_SUCCESS);
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	284 break;
442 d82a2a44c684 Add -u option to specify /dev/urandom instead Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	285 case 'u':
446 2cd2edfa11ee Just use /dev/urandom since that's what everyone ends up using anyway. Matt Johnston <matt@ucc.asn.au> parents: 442 diff changeset	286 /* backwards compatibility with old urandom option */
442 d82a2a44c684 Add -u option to specify /dev/urandom instead Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	287 break;
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	288 case 'W':
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	289 next = &recv_window_arg;
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	290 break;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	291 case 'K':
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	292 next = &keepalive_arg;
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	293 break;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	294 case 'I':
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	295 next = &idle_timeout_arg;
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	296 break;
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	297 #ifdef ENABLE_CLI_AGENTFWD
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	298 case 'A':
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	299 cli_opts.agent_fwd = 1;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	300 break;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	301 #endif
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	302 #ifdef ENABLE_USER_ALGO_LIST
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	303 case 'c':
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	304 next = &opts.cipher_list;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	305 break;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	306 case 'm':
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	307 next = &opts.mac_list;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	308 break;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	309 #endif
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	310 #ifdef DEBUG_TRACE
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	311 case 'v':
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	312 debug_trace = 1;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	313 break;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	314 #endif
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	315 case 'F':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	316 case 'e':
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	317 #ifndef ENABLE_USER_ALGO_LIST
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	318 case 'c':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	319 case 'm':
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	320 #endif
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	321 case 'D':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	322 #ifndef ENABLE_CLI_REMOTETCPFWD
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	323 case 'R':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	324 #endif
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	325 #ifndef ENABLE_CLI_LOCALTCPFWD
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	326 case 'L':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	327 #endif
946 17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	328 case 'V':
17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	329 print_version();
17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	330 exit(EXIT_SUCCESS);
17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	331 break;
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	332 case 'o':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	333 case 'b':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	334 next = &dummy;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 default:
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	336 fprintf(stderr,
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	337 "WARNING: Ignoring unknown argument '%s'\n", argv[i]);
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338 break;
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	339 } /* Switch */
105 68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	340
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	341 /* Now we handle args where they might be "-luser" (no spaces)*/
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	342 if (next && strlen(argv[i]) > 2) {
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	343 *next = &argv[i][2];
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	344 next = NULL;
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	345 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	346
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	347 continue; /* next argument */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	348
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	349 } else {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	350 TRACE(("non-flag arg: '%s'", argv[i]))
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	351
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	352 /* Either the hostname or commands */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	353
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	354 if (host_arg == NULL) {
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	355 host_arg = argv[i];
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	356 } else {
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	357
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	358 /* this is part of the commands to send - after this we
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	359 * don't parse any more options, and flags are sent as the
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	360 * command */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	361 cmdlen = 0;
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	362 for (j = i; j < (unsigned int)argc; j++) {
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	363 cmdlen += strlen(argv[j]) + 1; /* +1 for spaces */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	364 }
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	365 /* Allocate the space */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	366 cli_opts.cmd = (char*)m_malloc(cmdlen);
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	367 cli_opts.cmd[0] = '\0';
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	368
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	369 /* Append all the bits */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	370 for (j = i; j < (unsigned int)argc; j++) {
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	371 strlcat(cli_opts.cmd, argv[j], cmdlen);
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	372 strlcat(cli_opts.cmd, " ", cmdlen);
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	373 }
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	374 /* It'll be null-terminated here */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	375
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	376 /* We've eaten all the options and flags */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	377 break;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	381
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	382 /* And now a few sanity checks and setup */
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	383
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	384 #ifdef ENABLE_USER_ALGO_LIST
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	385 parse_ciphers_macs();
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	386 #endif
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	387
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	388 if (host_arg == NULL) {
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	389 printhelp();
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	390 exit(EXIT_FAILURE);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	391 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	392
812 c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	393 #ifdef ENABLE_CLI_PROXYCMD
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	394 if (cli_opts.proxycmd) {
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	395 /* To match the common path of m_freeing it */
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	396 cli_opts.proxycmd = m_strdup(cli_opts.proxycmd);
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	397 }
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	398 #endif
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	399
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	400 if (cli_opts.remoteport == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	401 cli_opts.remoteport = "22";
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	402 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	403
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	404 /* If not explicitly specified with -t or -T, we don't want a pty if
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	405 * there's a command, but we do otherwise */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	406 if (cli_opts.wantpty == 9) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	407 if (cli_opts.cmd == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	408 cli_opts.wantpty = 1;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	409 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	410 cli_opts.wantpty = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	411 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	412 }
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	413
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	414 if (cli_opts.backgrounded && cli_opts.cmd == NULL
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	415 && cli_opts.no_cmd == 0) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 580 diff changeset	416 dropbear_exit("Command required for -f");
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	417 }
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	418
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	419 if (recv_window_arg) {
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	420 opts.recv_window = atol(recv_window_arg);
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	421 if (opts.recv_window == 0 \|\| opts.recv_window > MAX_RECV_WINDOW) {
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	422 dropbear_exit("Bad recv window '%s'", recv_window_arg);
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	423 }
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	424 }
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	425 if (keepalive_arg) {
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	426 unsigned int val;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	427 if (m_str_to_uint(keepalive_arg, &val) == DROPBEAR_FAILURE) {
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	428 dropbear_exit("Bad keepalive '%s'", keepalive_arg);
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	429 }
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	430 opts.keepalive_secs = val;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	431 }
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	432
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	433 if (idle_timeout_arg) {
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	434 unsigned int val;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	435 if (m_str_to_uint(idle_timeout_arg, &val) == DROPBEAR_FAILURE) {
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	436 dropbear_exit("Bad idle_timeout '%s'", idle_timeout_arg);
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	437 }
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	438 opts.idle_timeout_secs = val;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	439 }
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	440
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	441 #ifdef ENABLE_CLI_NETCAT
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	442 if (cli_opts.cmd && cli_opts.netcat_host) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	443 dropbear_log(LOG_INFO, "Ignoring command '%s' in netcat mode", cli_opts.cmd);
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	444 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	445 #endif
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	446
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	447 /* The hostname gets set up last, since
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	448 * in multi-hop mode it will require knowledge
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	449 * of other flags such as -i */
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	450 #ifdef ENABLE_CLI_MULTIHOP
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	451 parse_multihop_hostname(host_arg, argv[0]);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	452 #else
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	453 parse_hostname(host_arg);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	454 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	456
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	457 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	458 static void loadidentityfile(const char* filename) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	459 sign_key *key;
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 812 diff changeset	460 enum signkey_type keytype;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	461
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	462 key = new_sign_key();
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	463 keytype = DROPBEAR_SIGNKEY_ANY;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	464 if ( readhostkey(filename, key, &keytype) != DROPBEAR_SUCCESS ) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	465 fprintf(stderr, "Failed loading keyfile '%s'\n", filename);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	466 sign_key_free(key);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	467 } else {
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	468 key->type = keytype;
c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	469 key->source = SIGNKEY_SOURCE_RAW_FILE;
c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	470 key->filename = m_strdup(filename);
c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	471 list_append(cli_opts.privkeys, key);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	472 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	473 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	474 #endif
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	475
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	476 #ifdef ENABLE_CLI_MULTIHOP
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	477
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	478 static char*
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	479 multihop_passthrough_args() {
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	480 char *ret;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	481 int total;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	482 unsigned int len = 0;
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	483 m_list_elem *iter;
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	484 /* Fill out -i, -y, -W options that make sense for all
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	485 * the intermediate processes */
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	486 for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	487 {
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	488 sign_key * key = (sign_key*)iter->item;
c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	489 len += 3 + strlen(key->filename);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	490 }
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	491 len += 30; /* space for -W <size>, terminator. */
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	492 ret = m_malloc(len);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	493 total = 0;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	494
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	495 if (cli_opts.no_hostkey_check)
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	496 {
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	497 int written = snprintf(ret+total, len-total, "-y -y ");
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	498 total += written;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	499 }
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	500 else if (cli_opts.always_accept_key)
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	501 {
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	502 int written = snprintf(ret+total, len-total, "-y ");
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	503 total += written;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	504 }
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	505
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	506 if (opts.recv_window != DEFAULT_RECV_WINDOW)
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	507 {
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	508 int written = snprintf(ret+total, len-total, "-W %d ", opts.recv_window);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	509 total += written;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	510 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	511
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	512 for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	513 {
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	514 sign_key * key = (sign_key*)iter->item;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	515 const size_t size = len - total;
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	516 int written = snprintf(ret+total, size, "-i %s ", key->filename);
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	517 dropbear_assert((unsigned int)written < size);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	518 total += written;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	519 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	520
776 f7c8b786e595 changelog updates for 2013.57 Matt Johnston <matt@ucc.asn.au> parents: 772 diff changeset	521 /* if args were passed, total will be not zero, and it will have a space at the end, so remove that */
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	522 if (total > 0)
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	523 {
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	524 total--;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	525 }
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	526
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	527 return ret;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	528 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	529
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	530 /* Sets up 'onion-forwarding' connections. This will spawn
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	531 * a separate dbclient process for each hop.
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	532 * As an example, if the cmdline is
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	533 * dbclient wrt,madako,canyons
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	534 * then we want to run:
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	535 * dbclient -J "dbclient -B canyons:22 wrt,madako" canyons
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	536 * and then the inner dbclient will recursively run:
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	537 * dbclient -J "dbclient -B madako:22 wrt" madako
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	538 * etc for as many hosts as we want.
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	539 *
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	540 * Ports for hosts can be specified as host/port.
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	541 */
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	542 static void parse_multihop_hostname(const char* orighostarg, const char* argv0) {
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	543 char *userhostarg = NULL;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	544 char *hostbuf = NULL;
574 b6665c1eac43 Remove extraneous semicolon Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	545 char *last_hop = NULL;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	546 char *remainder = NULL;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	547
494 66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	548 /* both scp and rsync parse a user@host argument
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	549 * and turn it into "-l user host". This breaks
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	550 * for our multihop syntax, so we suture it back together.
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	551 * This will break usernames that have both '@' and ',' in them,
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	552 * though that should be fairly uncommon. */
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	553 if (cli_opts.username
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	554 && strchr(cli_opts.username, ',')
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	555 && strchr(cli_opts.username, '@')) {
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	556 unsigned int len = strlen(orighostarg) + strlen(cli_opts.username) + 2;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	557 hostbuf = m_malloc(len);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	558 snprintf(hostbuf, len, "%s@%s", cli_opts.username, orighostarg);
494 66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	559 } else {
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	560 hostbuf = m_strdup(orighostarg);
494 66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	561 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	562 userhostarg = hostbuf;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	563
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	564 last_hop = strrchr(userhostarg, ',');
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	565 if (last_hop) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	566 if (last_hop == userhostarg) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	567 dropbear_exit("Bad multi-hop hostnames");
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	568 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	569 *last_hop = '\0';
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	570 last_hop++;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	571 remainder = userhostarg;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	572 userhostarg = last_hop;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	573 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	574
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	575 parse_hostname(userhostarg);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	576
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	577 if (last_hop) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	578 /* Set up the proxycmd */
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	579 unsigned int cmd_len = 0;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	580 char *passthrough_args = multihop_passthrough_args();
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	581 if (cli_opts.proxycmd) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	582 dropbear_exit("-J can't be used with multihop mode");
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	583 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	584 if (cli_opts.remoteport == NULL) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	585 cli_opts.remoteport = "22";
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	586 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	587 cmd_len = strlen(argv0) + strlen(remainder)
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	588 + strlen(cli_opts.remotehost) + strlen(cli_opts.remoteport)
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	589 + strlen(passthrough_args)
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	590 + 30;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	591 cli_opts.proxycmd = m_malloc(cmd_len);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	592 snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s %s",
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	593 argv0, cli_opts.remotehost, cli_opts.remoteport,
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	594 passthrough_args, remainder);
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	595 #ifndef DISABLE_ZLIB
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	596 /* The stream will be incompressible since it's encrypted. */
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	597 opts.enable_compress = 0;
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	598 #endif
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	599 m_free(passthrough_args);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	600 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	601 m_free(hostbuf);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	602 }
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	603 #endif /* !ENABLE_CLI_MULTIHOP */
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	604
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	605 /* Parses a [user@]hostname[/port] argument. */
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	606 static void parse_hostname(const char* orighostarg) {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	607 char *userhostarg = NULL;
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	608 char *port = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	609
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	610 userhostarg = m_strdup(orighostarg);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	611
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	612 cli_opts.remotehost = strchr(userhostarg, '@');
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	613 if (cli_opts.remotehost == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	614 /* no username portion, the cli-auth.c code can figure the
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	615 * local user's name */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	616 cli_opts.remotehost = userhostarg;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	617 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	618 cli_opts.remotehost[0] = '\0'; /* Split the user/host */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	619 cli_opts.remotehost++;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	620 cli_opts.username = userhostarg;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	621 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	622
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	623 if (cli_opts.username == NULL) {
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	624 cli_opts.username = m_strdup(cli_opts.own_user);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	625 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	626
895 5608a5a61c2a Change port separator to ^ since % is used in ipv6 addresses Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	627 port = strchr(cli_opts.remotehost, '^');
783 34e69908b3f7 Use '#' for host#port separator, document it. This fixes scp Matt Johnston <matt@ucc.asn.au> parents: 776 diff changeset	628 if (!port) {
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	629 /* legacy separator */
783 34e69908b3f7 Use '#' for host#port separator, document it. This fixes scp Matt Johnston <matt@ucc.asn.au> parents: 776 diff changeset	630 port = strchr(cli_opts.remotehost, '/');
34e69908b3f7 Use '#' for host#port separator, document it. This fixes scp Matt Johnston <matt@ucc.asn.au> parents: 776 diff changeset	631 }
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	632 if (port) {
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	633 *port = '\0';
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	634 cli_opts.remoteport = port+1;
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	635 }
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	636
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	637 if (cli_opts.remotehost[0] == '\0') {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	638 dropbear_exit("Bad hostname");
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	639 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	640 }
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	641
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	642 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	643 static void add_netcat(const char* origstr) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	644 char *portstr = NULL;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	645
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	646 char * str = m_strdup(origstr);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	647
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	648 portstr = strchr(str, ':');
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	649 if (portstr == NULL) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	650 TRACE(("No netcat port"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	651 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	652 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	653 *portstr = '\0';
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	654 portstr++;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	655
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	656 if (strchr(portstr, ':')) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	657 TRACE(("Multiple netcat colons"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	658 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	659 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	660
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	661 if (m_str_to_uint(portstr, &cli_opts.netcat_port) == DROPBEAR_FAILURE) {
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	662 TRACE(("bad netcat port"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	663 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	664 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	665
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	666 if (cli_opts.netcat_port > 65535) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	667 TRACE(("too large netcat port"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	668 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	669 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	670
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	671 cli_opts.netcat_host = str;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	672 return;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	673
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	674 fail:
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	675 dropbear_exit("Bad netcat endpoint '%s'", origstr);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	676 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	677 #endif
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	678
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	679 static void fill_own_user() {
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	680 uid_t uid;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	681 struct passwd *pw = NULL;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	682
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	683 uid = getuid();
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	684
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	685 pw = getpwuid(uid);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	686 if (pw == NULL \|\| pw->pw_name == NULL) {
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	687 dropbear_exit("Unknown own user");
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	688 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	689
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	690 cli_opts.own_user = m_strdup(pw->pw_name);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	691 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	692
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	693 #ifdef ENABLE_CLI_ANYTCPFWD
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	694 /* Turn a "[listenaddr:]listenport:remoteaddr:remoteport" string into into a forwarding
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	695 * set, and add it to the forwarding list */
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	696 static void addforward(const char* origstr, m_list *fwdlist) {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	697
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	698 char part1 = NULL, part2 = NULL, part3 = NULL, part4 = NULL;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	699 char * listenaddr = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	700 char * listenport = NULL;
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	701 char * connectaddr = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	702 char * connectport = NULL;
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	703 struct TCPFwdEntry* newfwd = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	704 char * str = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	705
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	706 TRACE(("enter addforward"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	707
411 253958302381 Revert bogus fix, make a note that the var is meant to 'leak' Matt Johnston <matt@ucc.asn.au> parents: 407 diff changeset	708 /* We need to split the original argument up. This var
253958302381 Revert bogus fix, make a note that the var is meant to 'leak' Matt Johnston <matt@ucc.asn.au> parents: 407 diff changeset	709 is never free()d. */
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	710 str = m_strdup(origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	711
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	712 part1 = str;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	713
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	714 part2 = strchr(str, ':');
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	715 if (part2 == NULL) {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	716 TRACE(("part2 == NULL"))
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	717 goto fail;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	718 }
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	719 *part2 = '\0';
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	720 part2++;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	721
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	722 part3 = strchr(part2, ':');
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	723 if (part3 == NULL) {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	724 TRACE(("part3 == NULL"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	725 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	726 }
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	727 *part3 = '\0';
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	728 part3++;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	729
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	730 part4 = strchr(part3, ':');
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	731 if (part4) {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	732 *part4 = '\0';
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	733 part4++;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	734 }
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	735
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	736 if (part4) {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	737 listenaddr = part1;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	738 listenport = part2;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	739 connectaddr = part3;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	740 connectport = part4;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	741 } else {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	742 listenaddr = NULL;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	743 listenport = part1;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	744 connectaddr = part2;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	745 connectport = part3;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	746 }
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	747
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	748 newfwd = m_malloc(sizeof(struct TCPFwdEntry));
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	749
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	750 /* Now we check the ports - note that the port ints are unsigned,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	751 * the check later only checks for >= MAX_PORT */
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	752 if (m_str_to_uint(listenport, &newfwd->listenport) == DROPBEAR_FAILURE) {
b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	753 TRACE(("bad listenport strtoul"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	754 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	755 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	756
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	757 if (m_str_to_uint(connectport, &newfwd->connectport) == DROPBEAR_FAILURE) {
b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	758 TRACE(("bad connectport strtoul"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	759 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	760 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	761
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	762 newfwd->listenaddr = listenaddr;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	763 newfwd->connectaddr = connectaddr;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	764
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	765 if (newfwd->listenport > 65535) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	766 TRACE(("listenport > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	767 goto badport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	768 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	769
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	770 if (newfwd->connectport > 65535) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	771 TRACE(("connectport > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	772 goto badport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	773 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	774
505 805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 497 diff changeset	775 newfwd->have_reply = 0;
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	776 list_append(fwdlist, newfwd);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	777
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	778 TRACE(("leave addforward: done"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	779 return;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	780
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	781 fail:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	782 dropbear_exit("Bad TCP forward '%s'", origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	783
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	784 badport:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	785 dropbear_exit("Bad TCP port in '%s'", origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	786 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	787 #endif

Mercurial > dropbear

annotate cli-runopts.c @ 949:0d2d39957c02 DROPBEAR_2014.64