lnsocket

commit 1460abf60ddea13002ad32a8e3e4b829c88b6261
parent fc325ab8ed2782f8e59e25a09331178ef72a413c
Author: William Casarin <jb55@jb55.com>
Date:   Mon, 28 Feb 2022 17:12:42 -0800

allow non-default ports

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
lnsocket.c
 | 
22
+++++++++++++++++++++-

1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/lnsocket.c b/lnsocket.c
@@ -450,6 +450,23 @@ static int io_fd_block(int fd, int block)
 	return fcntl(fd, F_SETFL, flags) != -1;
 }
 
+const char *parse_port(char *host)
+{
+	int i, len;
+
+	len = strlen(host);
+
+	for (i = 0; i < len; i++) {
+		if (host[i] == ':') {
+			host[i] = 0;
+			return &host[i+1];
+		}
+	}
+
+
+	return NULL;
+}
+
 int lnsocket_connect_with(struct lnsocket *ln, const char *node_id, const char *host, int timeout_ms)
 {
 	int ret;
@@ -458,6 +475,8 @@ int lnsocket_connect_with(struct lnsocket *ln, const char *node_id, const char *
 	struct pubkey their_id;
 	struct node_id their_node_id;
 	struct timeval timeout = {0};
+	char onlyhost[strlen(host)+1];
+	strncpy(onlyhost, host, sizeof(onlyhost));
 	fd_set set;
 
 	timeout.tv_sec = timeout_ms / 1000;
@@ -477,7 +496,8 @@ int lnsocket_connect_with(struct lnsocket *ln, const char *node_id, const char *
 		return note_error(&ln->errs, "failed to convert node_id to pubkey");
 
 	// parse ip into addrinfo
-	if ((ret = getaddrinfo(host, "9735", NULL, &addrs)) || !addrs)
+	const char *port = parse_port(onlyhost);
+	if ((ret = getaddrinfo(onlyhost, port ? port : "9735", NULL, &addrs)) || !addrs)
 		return note_error(&ln->errs, "%s", gai_strerror(ret));
 
 	// create our network socket for comms