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

lightningd: make "is peer connected" a tristate.

Browse Source 
First, connectd tells us the peer has connected, and we call the connected hook,
and if it says it's fine, we are actually connected and we fire off notifications.

Of course, we could be disconnected while in the connected hook, and that would
mean we tell people about a connection which is no longer current.

Make this clear with a tristate: if we're not marked disconnected by
the time the hooks finish, we're good.  It also gives us a cleaner
"connect" command return when we connected but disconnected before
processing.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-07-16 14:19:31 +09:30
committed by neil saitug
parent 571f0fad1b
commit eff53495db
10 changed files with 104 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lightningd/peer_control.c
View File

@@ -99,7 +99,7 @@ struct peer *new_peer(struct lightningd *ld, u64 dbid,
peer->their_features = NULL;
list_head_init(&peer->channels);
peer->direction = node_id_idx(&peer->ld->id, &peer->id);
peer->is_connected = false;
peer->connected = PEER_DISCONNECTED;
#if DEVELOPER
peer->ignore_htlcs = false;
#endif
@@ -1020,8 +1020,10 @@ static void peer_connected_hook_final(struct peer_connected_hook_payload *payloa
* subd). */
tal_steal(tmpctx, payload);
/* Notify anyone who cares */
notify_connect(ld, &peer->id, payload->incoming, &addr);
/* If we disconnected in the meantime, forget about it.
* (disconnect will have failed any connect commands). */
if (peer->connected == PEER_DISCONNECTED)
return;
/* Check for specific errors of a hook */
if (payload->error) {
@@ -1029,6 +1031,16 @@ static void peer_connected_hook_final(struct peer_connected_hook_payload *payloa
goto send_error;
}
/* Now we finally consider ourselves connected! */
assert(peer->connected == PEER_CONNECTING);
peer->connected = PEER_CONNECTED;
/* Succeed any connect() commands */
connect_succeeded(ld, peer, payload->incoming, &payload->addr);
/* Notify anyone who cares */
notify_connect(ld, &peer->id, payload->incoming, &addr);
list_for_each(&peer->channels, channel, list) {
#if DEVELOPER
if (dev_disconnect_permanent(ld)) {
@@ -1196,7 +1208,11 @@ void peer_connected(struct lightningd *ld, const u8 *msg)
if (!peer)
peer = new_peer(ld, 0, &id, &hook_payload->addr,
hook_payload->incoming);
peer->is_connected = true;
/* We mark peer in "connecting" state until hooks have passed. */
assert(peer->connected == PEER_DISCONNECTED);
peer->connected = PEER_CONNECTING;
/* Update peer address and direction */
peer->addr = hook_payload->addr;
peer->connected_incoming = hook_payload->incoming;
@@ -1208,8 +1224,6 @@ void peer_connected(struct lightningd *ld, const u8 *msg)
tal_steal(peer, hook_payload);
hook_payload->peer = peer;
connect_succeeded(ld, peer, hook_payload->incoming, &hook_payload->addr);
/* Log and update remote_addr for Nat/IP discovery. */
if (hook_payload->remote_addr) {
log_peer_debug(ld->log, &id, "Peer says it sees our address as: %s",
@@ -1429,11 +1443,14 @@ void peer_disconnect_done(struct lightningd *ld, const u8 *msg)
p = peer_by_id(ld, &id);
if (p) {
log_peer_debug(ld->log, &id, "peer_disconnect_done");
p->is_connected = false;
p->connected = PEER_DISCONNECTED;
peer_channels_cleanup_on_disconnect(p);
}
/* If you were trying to connect, it failed. */
connect_failed_disconnect(ld, &id);
/* Fire off plugin notifications */
notify_disconnect(ld, &id);
@@ -1700,12 +1717,12 @@ static void json_add_peer(struct lightningd *ld,
json_object_start(response, NULL);
json_add_node_id(response, "id", &p->id);
json_add_bool(response, "connected", p->is_connected);
json_add_bool(response, "connected", p->connected == PEER_CONNECTED);
/* If it's not connected, features are unreliable: we don't
* store them in the database, and they would only reflect
* their features *last* time they connected. */
if (p->is_connected) {
if (p->connected == PEER_CONNECTED) {
json_array_start(response, "netaddr");
json_add_string(response, NULL,
type_to_string(tmpctx,
@@ -1982,7 +1999,7 @@ static struct command_result *json_disconnect(struct command *cmd,
if (!peer) {
return command_fail(cmd, LIGHTNINGD, "Unknown peer");
}
if (!peer->is_connected) {
if (peer->connected == PEER_DISCONNECTED) {
return command_fail(cmd, LIGHTNINGD, "Peer not connected");
}