aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

json_connect: separate port arg so we can parse IPv6 addresses.

Browse Source 
Fixes: #391
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-12-04 19:42:22 +10:30
committed by Christian Decker
parent 0069787eb6
commit af5dbbc9f8
3 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lightningd/peer_control.c
View File

@@ -738,15 +738,16 @@ struct peer *peer_by_id(struct lightningd *ld, const struct pubkey *id)
static void json_connect(struct command *cmd,
const char *buffer, const jsmntok_t *params)
{
jsmntok_t *hosttok, *idtok;
jsmntok_t *hosttok, *porttok, *idtok;
struct pubkey id;
const char *name, *port, *colon;
const char *name;
struct wireaddr addr;
u8 *msg;
if (!json_get_params(buffer, params,
"id", &idtok,
"?host", &hosttok,
"?port", &porttok,
NULL)) {
command_fail(cmd, "Need id to connect");
return;
@@ -759,22 +760,29 @@ static void json_connect(struct command *cmd,
return;
}
if (porttok && !hosttok) {
command_fail(cmd, "Can't specify port without host");
return;
}
if (hosttok) {
colon = memchr(buffer + hosttok->start, ':',
hosttok->end - hosttok->start);
if (colon) {
name = tal_strndup(cmd, buffer + hosttok->start,
colon - (buffer + hosttok->start));
port = tal_strndup(cmd, colon + 1,
(buffer + hosttok->end) - colon - 1);
name = tal_strndup(cmd, buffer + hosttok->start,
hosttok->end - hosttok->start);
if (porttok) {
u32 port;
if (!json_tok_number(buffer, porttok, &port)) {
command_fail(cmd, "port %.*s not valid",
porttok->end - porttok->start,
buffer + porttok->start);
return;
}
addr.port = port;
} else {
name = tal_strndup(cmd, buffer + hosttok->start,
hosttok->end - hosttok->start);
port = tal_strdup(cmd, stringify(DEFAULT_PORT));
addr.port = DEFAULT_PORT;
}
addr.port = atoi(port);
if (!parse_wireaddr(name, &addr, addr.port) || !addr.port) {
command_fail(cmd, "host %s:%s not valid", name, port);
command_fail(cmd, "host %s:%u not valid",
name, addr.port);
return;
}