mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: don't call connectd if we already know about peer.

Browse source 
The semantic here are that we 'succeed' if we're already connected.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-08-09 09:55:29 +09:30 • committed by Christian Decker
parent 8b5c80f42a
commit 684d60dbda
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lightningd/connect_control.c
View file

@ -59,6 +59,15 @@ static struct connect *find_connect(struct lightningd *ld,
return NULL;
}
static void connect_cmd_succeed(struct command *cmd, const struct pubkey *id)
{
struct json_result *response = new_json_result(cmd);
json_object_start(response, NULL);
json_add_pubkey(response, "id", id);
json_object_end(response);
command_success(cmd, response);
}
static void connectd_connect_result(struct lightningd *ld, const u8 *msg)
{
struct pubkey id;
@ -77,11 +86,7 @@ static void connectd_connect_result(struct lightningd *ld, const u8 *msg)
/* We can have multiple connect commands: complete them all */
while ((c = find_connect(ld, &id)) != NULL) {
if (connected) {
struct json_result *response = new_json_result(c->cmd);
json_object_start(response, NULL);
json_add_pubkey(response, "id", &id);
json_object_end(response);
command_success(c->cmd, response);
connect_cmd_succeed(c->cmd, &id);
} else {
command_fail(c->cmd, LIGHTNINGD, "%s", err);
}
@ -102,6 +107,7 @@ static void json_connect(struct command *cmd,
struct wireaddr_internal addr;
u8 *msg;
const char *err_msg;
struct peer *peer;
if (!param(cmd, buffer, params,
p_req("id", json_tok_tok, (const jsmntok_t **) &idtok),
@ -152,6 +158,18 @@ static void json_connect(struct command *cmd,
return;
}
/* If we know about peer, see if it's already connected. */
peer = peer_by_id(cmd->ld, &id);
if (peer) {
struct channel *channel = peer_active_channel(peer);
if (peer->uncommitted_channel
|| (channel && channel->connected)) {
connect_cmd_succeed(cmd, &id);
return;
}
}
/* Was there parseable host name? */
if (name) {
u32 port;