Mercurial > dropbear
annotate cli-runopts.c @ 452:4cab61369879
Prevent invalid packets being sent during key-exchange, instead queue
them until afterwards. This could sometimes terminate connections
after 8 hours if (for example) a new TCP forwarded connection
was sent at the KEX timeout.
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Fri, 27 Jul 2007 17:13:42 +0000 |
| parents | 3e6c536bc023 |
| children | 7e43f5e473b9 |
| 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 | 31 #include "tcpfwd.h" |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
32 |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
33 cli_runopts cli_opts; /* GLOBAL */ |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
34 |
| 47 | 35 static void printhelp(); |
| 36 static void parsehostname(char* userhostarg); | |
|
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
37 #ifdef ENABLE_CLI_PUBKEY_AUTH |
| 47 | 38 static void loadidentityfile(const char* filename); |
| 39 #endif | |
| 64 | 40 #ifdef ENABLE_CLI_ANYTCPFWD |
| 41 static void addforward(char* str, struct TCPFwdList** fwdlist); | |
| 42 #endif | |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
43 |
| 47 | 44 static void printhelp() { |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
45 |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
46 fprintf(stderr, "Dropbear client v%s\n" |
|
333
9341570412e5
mention a command in the help
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
47 "Usage: %s [options] [user@]host [command]\n" |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
48 "Options are:\n" |
| 47 | 49 "-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
|
50 "-l <username>\n" |
|
56
6f091656c100
newlines which weren't there
Matt Johnston <matt@ucc.asn.au>
parents:
47
diff
changeset
|
51 "-t Allocate a pty\n" |
|
6f091656c100
newlines which weren't there
Matt Johnston <matt@ucc.asn.au>
parents:
47
diff
changeset
|
52 "-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
|
53 "-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
|
54 "-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
|
55 "-y Always accept remote host key if unknown\n" |
|
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
56 #ifdef ENABLE_CLI_PUBKEY_AUTH |
|
56
6f091656c100
newlines which weren't there
Matt Johnston <matt@ucc.asn.au>
parents:
47
diff
changeset
|
57 "-i <identityfile> (multiple allowed)\n" |
| 47 | 58 #endif |
| 64 | 59 #ifdef ENABLE_CLI_LOCALTCPFWD |
|
181
1916df7df911
* Add references in the manpages to the dbclient manpage
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
60 "-L <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
|
61 "-g Allow remote hosts to connect to forwarded ports\n" |
| 62 | 62 #endif |
| 64 | 63 #ifdef ENABLE_CLI_REMOTETCPFWD |
| 62 | 64 "-R <listenport:remotehost:remoteport> Remote port forwarding\n" |
| 65 #endif | |
|
449
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
66 "-W <receive_window_buffer> (default %d, larger may be faster)\n" |
|
94
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
67 #ifdef DEBUG_TRACE |
|
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
68 "-v verbose\n" |
|
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
69 #endif |
|
449
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
70 ,DROPBEAR_VERSION, cli_opts.progname, DEFAULT_RECV_WINDOW); |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
71 } |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
72 |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
73 void cli_getopts(int argc, char ** argv) { |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
74 |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
75 unsigned int i, j; |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
76 char ** next = 0; |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
77 unsigned int cmdlen; |
|
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
78 #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
|
79 int nextiskey = 0; /* A flag if the next argument is a keyfile */ |
| 47 | 80 #endif |
| 64 | 81 #ifdef ENABLE_CLI_LOCALTCPFWD |
| 62 | 82 int nextislocal = 0; |
| 83 #endif | |
| 64 | 84 #ifdef ENABLE_CLI_REMOTETCPFWD |
| 62 | 85 int nextisremote = 0; |
| 86 #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
|
87 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
|
88 |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
89 /* 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
|
90 cli_opts.progname = argv[0]; |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
91 cli_opts.remotehost = NULL; |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
92 cli_opts.remoteport = NULL; |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
93 cli_opts.username = NULL; |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
94 cli_opts.cmd = NULL; |
|
325
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
95 cli_opts.no_cmd = 0; |
|
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
96 cli_opts.backgrounded = 0; |
| 47 | 97 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
|
98 cli_opts.always_accept_key = 0; |
|
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
99 #ifdef ENABLE_CLI_PUBKEY_AUTH |
|
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
100 cli_opts.privkeys = NULL; |
| 47 | 101 #endif |
| 64 | 102 #ifdef ENABLE_CLI_LOCALTCPFWD |
| 103 cli_opts.localfwds = NULL; | |
|
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
|
104 opts.listen_fwd_all = 0; |
| 62 | 105 #endif |
| 64 | 106 #ifdef ENABLE_CLI_REMOTETCPFWD |
| 107 cli_opts.remotefwds = NULL; | |
| 62 | 108 #endif |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
109 /* not yet |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
110 opts.ipv4 = 1; |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
111 opts.ipv6 = 1; |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
112 */ |
|
449
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
113 opts.recv_window = DEFAULT_RECV_WINDOW; |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
114 char* recv_window_arg = NULL; |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
115 |
| 47 | 116 /* Iterate all the arguments */ |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
117 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
|
118 #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
|
119 if (nextiskey) { |
| 47 | 120 /* Load a hostkey since the previous argument was "-i" */ |
| 121 loadidentityfile(argv[i]); | |
| 122 nextiskey = 0; | |
| 123 continue; | |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
124 } |
| 47 | 125 #endif |
| 64 | 126 #ifdef ENABLE_CLI_REMOTETCPFWD |
| 127 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
|
128 TRACE(("nextisremote true")) |
| 64 | 129 addforward(argv[i], &cli_opts.remotefwds); |
| 130 nextisremote = 0; | |
| 131 continue; | |
| 132 } | |
| 133 #endif | |
| 134 #ifdef ENABLE_CLI_LOCALTCPFWD | |
| 135 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
|
136 TRACE(("nextislocal true")) |
| 64 | 137 addforward(argv[i], &cli_opts.localfwds); |
| 138 nextislocal = 0; | |
| 139 continue; | |
| 140 } | |
| 141 #endif | |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
142 if (next) { |
| 47 | 143 /* 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
|
144 *next = argv[i]; |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
145 if (*next == NULL) { |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
146 dropbear_exit("Invalid null argument"); |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
147 } |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
148 next = NULL; |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
149 continue; |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
150 } |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
151 |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
152 if (argv[i][0] == '-') { |
| 47 | 153 /* A flag *waves* */ |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
154 |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
155 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
|
156 case 'y': /* always accept the remote hostkey */ |
|
ab57ba0cb667
Add '-y' option to dbclient to accept the host key without checking
Matt Johnston <matt@ucc.asn.au>
parents:
412
diff
changeset
|
157 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
|
158 break; |
| 47 | 159 case 'p': /* remoteport */ |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
160 next = &cli_opts.remoteport; |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
161 break; |
|
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
162 #ifdef ENABLE_CLI_PUBKEY_AUTH |
| 47 | 163 case 'i': /* an identityfile */ |
| 134 | 164 /* Keep scp happy when it changes "-i file" to "-ifile" */ |
| 165 if (strlen(argv[i]) > 2) { | |
| 166 loadidentityfile(&argv[i][2]); | |
| 167 } else { | |
| 168 nextiskey = 1; | |
| 169 } | |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
170 break; |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
171 #endif |
| 47 | 172 case 't': /* we want a pty */ |
| 173 cli_opts.wantpty = 1; | |
| 174 break; | |
| 175 case 'T': /* don't want a pty */ | |
| 176 cli_opts.wantpty = 0; | |
| 177 break; | |
|
325
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
178 case 'N': |
|
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
179 cli_opts.no_cmd = 1; |
|
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
180 break; |
|
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
181 case 'f': |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
182 cli_opts.backgrounded = 1; |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
183 break; |
| 64 | 184 #ifdef ENABLE_CLI_LOCALTCPFWD |
| 185 case 'L': | |
| 186 nextislocal = 1; | |
| 187 break; | |
|
258
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
188 case 'g': |
|
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
189 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
|
190 break; |
| 64 | 191 #endif |
| 192 #ifdef ENABLE_CLI_REMOTETCPFWD | |
| 193 case 'R': | |
| 194 nextisremote = 1; | |
| 195 break; | |
| 196 #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
|
197 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
|
198 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
|
199 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
|
200 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
|
201 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
|
202 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
|
203 break; |
|
442
d82a2a44c684
Add -u option to specify /dev/urandom instead
Matt Johnston <matt@ucc.asn.au>
parents:
418
diff
changeset
|
204 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
|
205 /* 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
|
206 break; |
|
449
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
207 case 'W': |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
208 next = &recv_window_arg; |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
209 break; |
|
94
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
210 #ifdef DEBUG_TRACE |
|
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
211 case 'v': |
|
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
212 debug_trace = 1; |
|
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
213 break; |
|
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
214 #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
|
215 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
|
216 case 'e': |
|
38c3146aa23d
Some more sanity-checking of args, and just warn and ignore OpenSSH args
Matt Johnston <matt@ucc.asn.au>
parents:
64
diff
changeset
|
217 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
|
218 case 'm': |
|
38c3146aa23d
Some more sanity-checking of args, and just warn and ignore OpenSSH args
Matt Johnston <matt@ucc.asn.au>
parents:
64
diff
changeset
|
219 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
|
220 #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
|
221 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
|
222 #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
|
223 #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
|
224 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
|
225 #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
|
226 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
|
227 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
|
228 next = &dummy; |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
229 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
|
230 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
|
231 "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
|
232 break; |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
233 } /* Switch */ |
| 105 | 234 |
| 235 /* Now we handle args where they might be "-luser" (no spaces)*/ | |
| 236 if (next && strlen(argv[i]) > 2) { | |
| 237 *next = &argv[i][2]; | |
| 238 next = NULL; | |
| 239 } | |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
240 |
| 47 | 241 continue; /* next argument */ |
| 242 | |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
243 } 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
|
244 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
|
245 |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
246 /* Either the hostname or commands */ |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
247 |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
248 if (cli_opts.remotehost == NULL) { |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
249 |
| 47 | 250 parsehostname(argv[i]); |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
251 |
| 47 | 252 } else { |
|
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
253 |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
254 /* 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
|
255 * 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
|
256 * command */ |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
257 cmdlen = 0; |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
258 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
|
259 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
|
260 } |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
261 /* Allocate the space */ |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
262 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
|
263 cli_opts.cmd[0] = '\0'; |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
264 |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
265 /* Append all the bits */ |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
266 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
|
267 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
|
268 strlcat(cli_opts.cmd, " ", cmdlen); |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
269 } |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
270 /* 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
|
271 |
|
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
272 /* 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
|
273 break; |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
274 } |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
275 } |
|
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
276 } |
| 47 | 277 |
| 278 if (cli_opts.remotehost == 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
|
279 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
|
280 exit(EXIT_FAILURE); |
| 47 | 281 } |
| 282 | |
| 283 if (cli_opts.remoteport == NULL) { | |
| 284 cli_opts.remoteport = "22"; | |
| 285 } | |
| 286 | |
| 287 /* If not explicitly specified with -t or -T, we don't want a pty if | |
| 288 * there's a command, but we do otherwise */ | |
| 289 if (cli_opts.wantpty == 9) { | |
| 290 if (cli_opts.cmd == NULL) { | |
| 291 cli_opts.wantpty = 1; | |
| 292 } else { | |
| 293 cli_opts.wantpty = 0; | |
| 294 } | |
| 295 } | |
|
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
296 |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
297 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
|
298 && cli_opts.no_cmd == 0) { |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
299 dropbear_exit("command required for -f"); |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
300 } |
|
449
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
301 |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
302 if (recv_window_arg) |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
303 { |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
304 opts.recv_window = atol(recv_window_arg); |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
305 if (opts.recv_window == 0) |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
306 { |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
307 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
|
308 } |
|
3e6c536bc023
Add -W <windowsize> argument and document it.
Matt Johnston <matt@ucc.asn.au>
parents:
446
diff
changeset
|
309 } |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
310 } |
| 47 | 311 |
|
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
312 #ifdef ENABLE_CLI_PUBKEY_AUTH |
| 47 | 313 static void loadidentityfile(const char* filename) { |
| 314 | |
|
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
315 struct SignKeyList * nextkey; |
| 47 | 316 sign_key *key; |
| 317 int keytype; | |
| 318 | |
| 319 key = new_sign_key(); | |
| 320 keytype = DROPBEAR_SIGNKEY_ANY; | |
| 321 if ( readhostkey(filename, key, &keytype) != DROPBEAR_SUCCESS ) { | |
| 322 | |
| 323 fprintf(stderr, "Failed loading keyfile '%s'\n", filename); | |
| 324 sign_key_free(key); | |
| 325 | |
| 326 } else { | |
| 327 | |
|
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
328 nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList)); |
| 47 | 329 nextkey->key = key; |
|
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
330 nextkey->next = cli_opts.privkeys; |
| 47 | 331 nextkey->type = keytype; |
|
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
332 cli_opts.privkeys = nextkey; |
| 47 | 333 } |
| 334 } | |
| 335 #endif | |
| 336 | |
| 337 | |
| 338 /* Parses a [user@]hostname argument. userhostarg is the argv[i] corresponding | |
| 339 * - note that it will be modified */ | |
| 64 | 340 static void parsehostname(char* orighostarg) { |
| 47 | 341 |
| 342 uid_t uid; | |
| 343 struct passwd *pw = NULL; | |
| 64 | 344 char *userhostarg = NULL; |
| 345 | |
| 346 /* We probably don't want to be editing argvs */ | |
| 347 userhostarg = m_strdup(orighostarg); | |
| 47 | 348 |
| 349 cli_opts.remotehost = strchr(userhostarg, '@'); | |
| 350 if (cli_opts.remotehost == NULL) { | |
| 351 /* no username portion, the cli-auth.c code can figure the | |
| 352 * local user's name */ | |
| 353 cli_opts.remotehost = userhostarg; | |
| 354 } else { | |
| 355 cli_opts.remotehost[0] = '\0'; /* Split the user/host */ | |
| 356 cli_opts.remotehost++; | |
| 357 cli_opts.username = userhostarg; | |
| 358 } | |
| 359 | |
| 360 if (cli_opts.username == NULL) { | |
| 361 uid = getuid(); | |
| 362 | |
| 363 pw = getpwuid(uid); | |
| 364 if (pw == NULL || pw->pw_name == NULL) { | |
| 365 dropbear_exit("Unknown own user"); | |
| 366 } | |
| 367 | |
| 368 cli_opts.username = m_strdup(pw->pw_name); | |
| 369 } | |
| 370 | |
| 371 if (cli_opts.remotehost[0] == '\0') { | |
| 372 dropbear_exit("Bad hostname"); | |
| 373 } | |
| 374 } | |
| 64 | 375 |
| 376 #ifdef ENABLE_CLI_ANYTCPFWD | |
| 377 /* Turn a "listenport:remoteaddr:remoteport" string into into a forwarding | |
| 378 * set, and add it to the forwarding list */ | |
| 379 static void addforward(char* origstr, struct TCPFwdList** fwdlist) { | |
| 380 | |
| 381 char * listenport = NULL; | |
| 382 char * connectport = NULL; | |
| 383 char * connectaddr = NULL; | |
| 384 struct TCPFwdList* newfwd = NULL; | |
| 385 char * str = NULL; | |
| 386 | |
|
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
|
387 TRACE(("enter addforward")) |
| 64 | 388 |
|
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
|
389 /* 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
|
390 is never free()d. */ |
| 64 | 391 str = m_strdup(origstr); |
| 392 | |
| 393 listenport = str; | |
| 394 | |
| 395 connectaddr = strchr(str, ':'); | |
| 396 if (connectaddr == NULL) { | |
|
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
|
397 TRACE(("connectaddr == NULL")) |
| 64 | 398 goto fail; |
| 399 } | |
|
407
ea0929224294
Fix another leak found by Klocwork
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
400 *connectaddr = '\0'; |
| 64 | 401 connectaddr++; |
| 402 | |
| 403 connectport = strchr(connectaddr, ':'); | |
| 404 if (connectport == NULL) { | |
|
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
|
405 TRACE(("connectport == NULL")) |
| 64 | 406 goto fail; |
| 407 } | |
|
407
ea0929224294
Fix another leak found by Klocwork
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
408 *connectport = '\0'; |
| 64 | 409 connectport++; |
| 410 | |
| 411 newfwd = (struct TCPFwdList*)m_malloc(sizeof(struct TCPFwdList)); | |
| 412 | |
| 413 /* Now we check the ports - note that the port ints are unsigned, | |
| 414 * the check later only checks for >= MAX_PORT */ | |
| 415 newfwd->listenport = strtol(listenport, NULL, 10); | |
| 416 if (errno != 0) { | |
|
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
|
417 TRACE(("bad listenport strtol")) |
| 64 | 418 goto fail; |
| 419 } | |
| 420 | |
| 421 newfwd->connectport = strtol(connectport, NULL, 10); | |
| 422 if (errno != 0) { | |
|
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
|
423 TRACE(("bad connectport strtol")) |
| 64 | 424 goto fail; |
| 425 } | |
| 426 | |
| 427 newfwd->connectaddr = connectaddr; | |
| 428 | |
| 429 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
|
430 TRACE(("listenport > 65535")) |
| 64 | 431 goto badport; |
| 432 } | |
| 433 | |
| 434 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
|
435 TRACE(("connectport > 65535")) |
| 64 | 436 goto badport; |
| 437 } | |
| 438 | |
| 439 newfwd->next = *fwdlist; | |
| 440 *fwdlist = newfwd; | |
| 441 | |
|
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
|
442 TRACE(("leave addforward: done")) |
| 64 | 443 return; |
| 444 | |
| 445 fail: | |
| 446 dropbear_exit("Bad TCP forward '%s'", origstr); | |
| 447 | |
| 448 badport: | |
| 449 dropbear_exit("Bad TCP port in '%s'", origstr); | |
| 450 } | |
| 451 #endif |