Mercurial > dropbear

changeset 1466:f787f60f8e45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bind to port as well with -b
author Matt Johnston <matt@ucc.asn.au>
date Fri, 26 Jan 2018 00:27:48 +0800
parents f7a53832501d
children 7279a633cc50
files cli-main.c cli-runopts.c cli-tcpfwd.c dbclient.1 netio.c netio.h runopts.h svr-tcpfwd.c
diffstat 8 files changed, 70 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/cli-main.c	Mon May 01 08:26:15 2017 +0530
+++ b/cli-main.c	Fri Jan 26 00:27:48 2018 +0800
@@ -66,8 +66,8 @@
 	}
 #endif
 
-	TRACE(("user='%s' host='%s' port='%s' bind_address='%s'", cli_opts.username,
-				cli_opts.remotehost, cli_opts.remoteport, cli_opts.bind_address))
+	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, cli_opts.bind_address);
+		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;
 	}
 
--- a/cli-runopts.c	Mon May 01 08:26:15 2017 +0530
+++ b/cli-runopts.c	Fri Jan 26 00:27:48 2018 +0800
@@ -92,7 +92,7 @@
 					"-c <cipher list> Specify preferred ciphers ('-c help' to list options)\n"
 					"-m <MAC list> Specify preferred MACs for packet verification (or '-m help')\n"
 #endif
-					"-b    bind_address\n"
+					"-b    [bind_address][:bind_port]\n"
 					"-V    Version\n"
 #if DEBUG_TRACE
 					"-v    verbose (compiled with DEBUG_TRACE)\n"
@@ -131,6 +131,7 @@
 	char* keepalive_arg = NULL;
 	char* idle_timeout_arg = NULL;
 	char *host_arg = NULL;
+	char *bind_arg = NULL;
 	char c;
 
 	/* see printhelp() for options */
@@ -167,6 +168,7 @@
 	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
@@ -315,7 +317,7 @@
 					exit(EXIT_SUCCESS);
 					break;
 				case 'b':
-					next = &cli_opts.bind_address;
+					next = &bind_arg;
 					break;
 				default:
 					fprintf(stderr,
@@ -421,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) {
--- a/cli-tcpfwd.c	Mon May 01 08:26:15 2017 +0530
+++ b/cli-tcpfwd.c	Fri Jan 26 00:27:48 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, NULL);
+	channel->conn_pending = connect_remote(fwd->connectaddr, portstring, channel_connect_done, channel, NULL, NULL);
 
 	channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE;
 	
--- a/dbclient.1	Mon May 01 08:26:15 2017 +0530
+++ b/dbclient.1	Fri Jan 26 00:27:48 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
 
--- a/netio.c	Mon May 01 08:26:15 2017 +0530
+++ b/netio.c	Fri Jan 26 00:27:48 2018 +0800
@@ -19,7 +19,7 @@
 	int sock;
 
 	char* errstring;
-	struct addrinfo *bind_addrinfo;
+	char *bind_address, *bind_port;
 };
 
 /* Deallocate a progress connection. Removes from the pending list if iter!=NULL.
@@ -31,7 +31,8 @@
 	m_free(c->remotehost);
 	m_free(c->remoteport);
 	m_free(c->errstring);
-	if (c->bind_addrinfo) freeaddrinfo(c->bind_addrinfo);
+	m_free(c->bind_address);
+	m_free(c->bind_port);
 	m_free(c);
 
 	if (iter) {
@@ -53,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
@@ -68,11 +70,38 @@
 			continue;
 		}
 
-		if (c->bind_addrinfo) {
-			if (bind(c->sock, c->bind_addrinfo->ai_addr, c->bind_addrinfo->ai_addrlen) < 0) {
+		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_strdup(strerror(errno));
+				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;
@@ -143,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, char* bind_address)
+	connect_callback cb, void* cb_data, 
+	const char* bind_address, const char* bind_port)
 {
 	struct dropbear_progress_connection *c = NULL;
 	int err;
@@ -155,7 +185,6 @@
 	c->sock = -1;
 	c->cb = cb;
 	c->cb_data = cb_data;
-	c->bind_addrinfo = NULL;
 
 	list_append(&ses.conn_pending, c);
 
@@ -175,20 +204,11 @@
 		c->res_iter = c->res;
 	}
 	
-	if (NULL != bind_address) {
-		memset(&hints, 0, sizeof(hints));
-		hints.ai_socktype = SOCK_STREAM;
-		hints.ai_family = AF_UNSPEC;
-		err = getaddrinfo(bind_address, NULL, &hints, &c->bind_addrinfo);
-		if (err) {
-			int len;
-			len = 100 + strlen(gai_strerror(err));
-			c->errstring = (char*)m_malloc(len);
-			snprintf(c->errstring, len, "Error resolving '%s'. %s", 
-					bind_address, gai_strerror(err));
-			TRACE(("Error resolving: %s", gai_strerror(err)))
-			c->res_iter = NULL;
-		}
+	if (bind_address) {
+		c->bind_address = m_strdup(bind_address);
+	}
+	if (bind_port) {
+		c->bind_port = m_strdup(bind_port);
 	}
 
 	return c;
--- a/netio.h	Mon May 01 08:26:15 2017 +0530
+++ b/netio.h	Fri Jan 26 00:27:48 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, char* bind_address);
+	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);
--- a/runopts.h	Mon May 01 08:26:15 2017 +0530
+++ b/runopts.h	Fri Jan 26 00:27:48 2018 +0800
@@ -168,6 +168,7 @@
 	char *proxycmd;
 #endif
 	char *bind_address;
+	char *bind_port;
 } cli_runopts;
 
 extern cli_runopts cli_opts;
--- a/svr-tcpfwd.c	Mon May 01 08:26:15 2017 +0530
+++ b/svr-tcpfwd.c	Fri Jan 26 00:27:48 2018 +0800
@@ -285,7 +285,7 @@
 	}
 
 	snprintf(portstring, sizeof(portstring), "%u", destport);
-	channel->conn_pending = connect_remote(desthost, portstring, channel_connect_done, channel, NULL);
+	channel->conn_pending = connect_remote(desthost, portstring, channel_connect_done, channel, NULL, NULL);
 
 	channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE;