From e11553fc555a3bfe80ad255cbf23780b84f1ef1e Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 11 Oct 2017 20:34:50 +1030
Subject: [PATCH] lightningd: expose ipaddr parsing.

We don't do DNS lookups, but hack in localhost for the moment.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 lightningd/options.c | 25 ++++++++++++++++++++-----
 lightningd/options.h |  1 +
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lightningd/options.c b/lightningd/options.c
index a96389e5b..816236c00 100644
--- a/lightningd/options.c
+++ b/lightningd/options.c
@@ -112,24 +112,39 @@ static char *opt_set_s32(const char *arg, s32 *u)
 	return NULL;
 }
 
-static char *opt_set_ipaddr(const char *arg, struct ipaddr *addr)
+/* FIXME: Rename ipaddr and hoist up */
+bool parse_ipaddr(const char *arg, struct ipaddr *addr)
 {
 	struct in6_addr v6;
 	struct in_addr v4;
-	char *err = NULL;
+
+	/* FIXME: change arg to addr[:port] and use getaddrinfo? */
+	if (streq(arg, "localhost"))
+		arg = "127.0.0.1";
+	else if (streq(arg, "ip6-localhost"))
+		arg = "::1";
+
 	memset(&addr->addr, 0, sizeof(addr->addr));
 	if (inet_pton(AF_INET, arg, &v4) == 1) {
 		addr->type = ADDR_TYPE_IPV4;
 		addr->addrlen = 4;
 		memcpy(&addr->addr, &v4, addr->addrlen);
+		return true;
 	} else if (inet_pton(AF_INET6, arg, &v6) == 1) {
 		addr->type = ADDR_TYPE_IPV6;
 		addr->addrlen = 16;
 		memcpy(&addr->addr, &v6, addr->addrlen);
-	} else {
-		err = tal_fmt(NULL, "Unable to parse IP address '%s'", arg);
+		return true;
 	}
-	return err;
+	return false;
+}
+
+static char *opt_set_ipaddr(const char *arg, struct ipaddr *addr)
+{
+	if (parse_ipaddr(arg, addr))
+		return NULL;
+
+	return tal_fmt(NULL, "Unable to parse IP address '%s'", arg);
 }
 
 static void opt_show_u64(char buf[OPT_SHOW_LEN], const u64 *u)
diff --git a/lightningd/options.h b/lightningd/options.h
index a39cf35c3..f25254d8a 100644
--- a/lightningd/options.h
+++ b/lightningd/options.h
@@ -13,4 +13,5 @@ void register_opts(struct lightningd *ld);
  */
 bool handle_opts(struct lightningd *ld, int argc, char *argv[]);
 
+bool parse_ipaddr(const char *arg, struct ipaddr *addr);
 #endif /* LIGHTNING_LIGHTNINGD_OPTIONS_H */