aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-29 02:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

wireaddr: Do hostname resolution in parse_wireaddr.

Browse Source 
Fixes: #834
This commit is contained in:
ZmnSCPxj
2018-02-25 02:30:33 +00:00
committed by Rusty Russell
parent bd07a91782
commit f7f55edcdb
6 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lightningd/connect_control.c
View File

@@ -114,6 +114,7 @@ static void json_connect(struct command *cmd,
const char *name;
struct wireaddr addr;
u8 *msg;
const char *err_msg;
if (!json_get_params(cmd, buffer, params,
"id", &idtok,
@@ -178,9 +179,9 @@ static void json_connect(struct command *cmd,
} else {
addr.port = DEFAULT_PORT;
}
if (!parse_wireaddr(name, &addr, addr.port) || !addr.port) {
command_fail(cmd, "Host %s:%u not valid",
name, addr.port);
if (!parse_wireaddr(name, &addr, addr.port, &err_msg) || !addr.port) {
command_fail(cmd, "Host %s:%u not valid: %s",
name, addr.port, err_msg ? err_msg : "port is 0");
return;
}

5
lightningd/options.c
View File

@@ -117,11 +117,12 @@ static char *opt_set_s32(const char *arg, s32 *u)
static char *opt_add_ipaddr(const char *arg, struct lightningd *ld)
{
size_t n = tal_count(ld->wireaddrs);
char const *err_msg;
tal_resize(&ld->wireaddrs, n+1);
if (!parse_wireaddr(arg, &ld->wireaddrs[n], ld->portnum)) {
return tal_fmt(NULL, "Unable to parse IP address '%s'", arg);
if (!parse_wireaddr(arg, &ld->wireaddrs[n], ld->portnum, &err_msg)) {
return tal_fmt(NULL, "Unable to parse IP address '%s': %s", arg, err_msg);
}
return NULL;