Mercurial > dropbear
diff cli-main.c @ 1511:5916af64acd4 fuzz
merge from main
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sat, 17 Feb 2018 19:29:51 +0800 |
parents | 0c16b4ccbd54 |
children | 33b872649eb7 |
line wrap: on
line diff
--- a/cli-main.c Tue Jan 23 23:27:40 2018 +0800 +++ b/cli-main.c Sat Feb 17 19:29:51 2018 +0800 @@ -66,8 +66,8 @@ } #endif - TRACE(("user='%s' host='%s' port='%s'", cli_opts.username, - cli_opts.remotehost, cli_opts.remoteport)) + TRACE(("user='%s' host='%s' port='%s' bind_address='%s' bind_port='%s'", cli_opts.username, + cli_opts.remotehost, cli_opts.remoteport, cli_opts.bind_address, cli_opts.bind_port)) if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) { dropbear_exit("signal() error"); @@ -86,7 +86,8 @@ } else #endif { - progress = connect_remote(cli_opts.remotehost, cli_opts.remoteport, cli_connected, &ses); + progress = connect_remote(cli_opts.remotehost, cli_opts.remoteport, + cli_connected, &ses, cli_opts.bind_address, cli_opts.bind_port); sock_in = sock_out = -1; } @@ -107,7 +108,7 @@ vsnprintf(exitmsg, sizeof(exitmsg), format, param); /* Add the prefix depending on session/auth state */ - if (!sessinitdone) { + if (!ses.init_done) { snprintf(fullmsg, sizeof(fullmsg), "Exited: %s", exitmsg); } else { snprintf(fullmsg, sizeof(fullmsg), @@ -142,7 +143,7 @@ fflush(stderr); } -static void exec_proxy_cmd(void *user_data_cmd) { +static void exec_proxy_cmd(const void *user_data_cmd) { const char *cmd = user_data_cmd; char *usershell;