# HG changeset patch # User Matt Johnston # Date 1516897959 -28800 # Node ID 7279a633cc50e8897d15f54421bc3ebd7eedd6e3 # Parent ad637c9e0f6fb4e311b0dcfb9e8b673860f6b165# Parent f787f60f8e4533375977acec80e5c93d7641e4e7 Merge branch 'houseofkodai-cli_bind_address_connect' diff -r ad637c9e0f6f -r 7279a633cc50 cli-main.c --- a/cli-main.c Thu Jan 25 19:51:41 2018 +0530 +++ b/cli-main.c Fri Jan 26 00:32:39 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; } diff -r ad637c9e0f6f -r 7279a633cc50 cli-runopts.c --- a/cli-runopts.c Thu Jan 25 19:51:41 2018 +0530 +++ b/cli-runopts.c Fri Jan 26 00:32:39 2018 +0800 @@ -92,6 +92,7 @@ "-c Specify preferred ciphers ('-c help' to list options)\n" "-m Specify preferred MACs for packet verification (or '-m help')\n" #endif + "-b [bind_address][:bind_port]\n" "-V Version\n" #if DEBUG_TRACE "-v verbose (compiled with DEBUG_TRACE)\n" @@ -125,12 +126,12 @@ OPT_OTHER } opt; unsigned int cmdlen; - char* dummy = NULL; /* Not used for anything real */ char* recv_window_arg = NULL; char* keepalive_arg = NULL; char* idle_timeout_arg = NULL; char *host_arg = NULL; + char *bind_arg = NULL; char c; /* see printhelp() for options */ @@ -166,6 +167,8 @@ #if DROPBEAR_CLI_PROXYCMD cli_opts.proxycmd = NULL; #endif + cli_opts.bind_address = NULL; + cli_opts.bind_port = NULL; #ifndef DISABLE_ZLIB opts.compress_mode = DROPBEAR_COMPRESS_ON; #endif @@ -314,8 +317,8 @@ exit(EXIT_SUCCESS); break; case 'b': - next = &dummy; - /* FALLTHROUGH */ + next = &bind_arg; + break; default: fprintf(stderr, "WARNING: Ignoring unknown option -%c\n", c); @@ -420,6 +423,18 @@ cli_opts.remoteport = "22"; } + if (bind_arg) { + /* split [host][:port] */ + char *port = strrchr(bind_arg, ':'); + if (port) { + cli_opts.bind_port = m_strdup(port+1); + *port = '\0'; + } + if (strlen(bind_arg) > 0) { + cli_opts.bind_address = m_strdup(bind_arg); + } + } + /* If not explicitly specified with -t or -T, we don't want a pty if * there's a command, but we do otherwise */ if (cli_opts.wantpty == 9) { diff -r ad637c9e0f6f -r 7279a633cc50 cli-tcpfwd.c --- a/cli-tcpfwd.c Thu Jan 25 19:51:41 2018 +0530 +++ b/cli-tcpfwd.c Fri Jan 26 00:32:39 2018 +0800 @@ -274,7 +274,7 @@ } snprintf(portstring, sizeof(portstring), "%u", fwd->connectport); - channel->conn_pending = connect_remote(fwd->connectaddr, portstring, channel_connect_done, channel); + channel->conn_pending = connect_remote(fwd->connectaddr, portstring, channel_connect_done, channel, NULL, NULL); channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE; diff -r ad637c9e0f6f -r 7279a633cc50 dbclient.1 --- a/dbclient.1 Thu Jan 25 19:51:41 2018 +0530 +++ b/dbclient.1 Fri Jan 26 00:32:39 2018 +0800 @@ -133,8 +133,8 @@ useful for specifying options for which there is no separate command-line flag. For full details of the options listed below, and their possible values, see ssh_config(5). +The following options have currently been implemented: -For now following options have been implemented: .RS .TP .B ExitOnForwardFailure @@ -147,6 +147,10 @@ .B \-s The specified command will be requested as a subsystem, used for sftp. Dropbear doesn't implement sftp itself but the OpenSSH sftp client can be used eg \fIsftp -S dbclient user@host\fR .TP +.B \-b \fI[address][:port] +Bind to a specific local address when connecting to the remote host. This can be used to choose from +multiple outgoing interfaces. Either address or port (or both) can be given. +.TP .B \-V Print the version diff -r ad637c9e0f6f -r 7279a633cc50 netio.c --- a/netio.c Thu Jan 25 19:51:41 2018 +0530 +++ b/netio.c Fri Jan 26 00:32:39 2018 +0800 @@ -19,6 +19,7 @@ int sock; char* errstring; + char *bind_address, *bind_port; }; /* Deallocate a progress connection. Removes from the pending list if iter!=NULL. @@ -30,6 +31,8 @@ m_free(c->remotehost); m_free(c->remoteport); m_free(c->errstring); + m_free(c->bind_address); + m_free(c->bind_port); m_free(c); if (iter) { @@ -51,6 +54,7 @@ static void connect_try_next(struct dropbear_progress_connection *c) { struct addrinfo *r; + int err; int res = 0; int fastopen = 0; #if DROPBEAR_CLIENT_TCP_FAST_OPEN @@ -66,6 +70,44 @@ continue; } + if (c->bind_address || c->bind_port) { + /* bind to a source port/address */ + struct addrinfo hints; + struct addrinfo *bindaddr = NULL; + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_STREAM; + hints.ai_family = r->ai_family; + hints.ai_flags = AI_PASSIVE; + + err = getaddrinfo(c->bind_address, c->bind_port, &hints, &bindaddr); + if (err) { + int len = 100 + strlen(gai_strerror(err)); + m_free(c->errstring); + c->errstring = (char*)m_malloc(len); + snprintf(c->errstring, len, "Error resolving bind address '%s' (port %s). %s", + c->bind_address, c->bind_port, gai_strerror(err)); + TRACE(("Error resolving bind: %s", gai_strerror(err))) + close(c->sock); + c->sock = -1; + continue; + } + res = bind(c->sock, bindaddr->ai_addr, bindaddr->ai_addrlen); + freeaddrinfo(bindaddr); + bindaddr = NULL; + if (res < 0) { + /* failure */ + int keep_errno = errno; + int len = 300; + m_free(c->errstring); + c->errstring = m_malloc(len); + snprintf(c->errstring, len, "Error binding local address '%s' (port %s). %s", + c->bind_address, c->bind_port, strerror(keep_errno)); + close(c->sock); + c->sock = -1; + continue; + } + } + ses.maxfd = MAX(ses.maxfd, c->sock); set_sock_nodelay(c->sock); setnonblocking(c->sock); @@ -130,7 +172,8 @@ /* Connect via TCP to a host. */ struct dropbear_progress_connection *connect_remote(const char* remotehost, const char* remoteport, - connect_callback cb, void* cb_data) + connect_callback cb, void* cb_data, + const char* bind_address, const char* bind_port) { struct dropbear_progress_connection *c = NULL; int err; @@ -160,6 +203,13 @@ } else { c->res_iter = c->res; } + + if (bind_address) { + c->bind_address = m_strdup(bind_address); + } + if (bind_port) { + c->bind_port = m_strdup(bind_port); + } return c; } diff -r ad637c9e0f6f -r 7279a633cc50 netio.h --- a/netio.h Thu Jan 25 19:51:41 2018 +0530 +++ b/netio.h Fri Jan 26 00:32:39 2018 +0800 @@ -30,7 +30,7 @@ /* Always returns a progress connection, if it fails it will call the callback at a later point */ struct dropbear_progress_connection * connect_remote (const char* remotehost, const char* remoteport, - connect_callback cb, void *cb_data); + connect_callback cb, void *cb_data, const char* bind_address, const char* bind_port); /* Sets up for select() */ void set_connect_fds(fd_set *writefd); diff -r ad637c9e0f6f -r 7279a633cc50 runopts.h --- a/runopts.h Thu Jan 25 19:51:41 2018 +0530 +++ b/runopts.h Fri Jan 26 00:32:39 2018 +0800 @@ -167,6 +167,8 @@ #if DROPBEAR_CLI_PROXYCMD char *proxycmd; #endif + char *bind_address; + char *bind_port; } cli_runopts; extern cli_runopts cli_opts; diff -r ad637c9e0f6f -r 7279a633cc50 svr-tcpfwd.c --- a/svr-tcpfwd.c Thu Jan 25 19:51:41 2018 +0530 +++ b/svr-tcpfwd.c Fri Jan 26 00:32:39 2018 +0800 @@ -285,7 +285,7 @@ } snprintf(portstring, sizeof(portstring), "%u", destport); - channel->conn_pending = connect_remote(desthost, portstring, channel_connect_done, channel); + channel->conn_pending = connect_remote(desthost, portstring, channel_connect_done, channel, NULL, NULL); channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE;