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

peer: set up peer->nc only when in state NORMAL.

Browse Source 
This ensures we don't try to route before we're set up, or once we're
shutting down.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-08-18 14:25:13 +09:30
parent 87da9634bc
commit 9b869a80a1
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
daemon/peer.c
View File

@@ -252,18 +252,8 @@ void peer_open_complete(struct peer *peer, const char *problem)
{ {
if (problem) if (problem)
log_unusual(peer->log, "peer open failed: %s", problem); log_unusual(peer->log, "peer open failed: %s", problem);
else { else
struct lightningd_state *dstate = peer->dstate;
log_debug(peer->log, "peer open complete"); log_debug(peer->log, "peer open complete");
assert(!peer->nc);
peer->nc = add_connection(dstate,
&dstate->id, peer->id,
dstate->config.fee_base,
dstate->config.fee_per_satoshi,
dstate->config.min_htlc_expiry,
dstate->config.min_htlc_expiry);
}
} }
static void set_peer_state(struct peer *peer, enum state newstate, static void set_peer_state(struct peer *peer, enum state newstate,
@@ -272,6 +262,10 @@ static void set_peer_state(struct peer *peer, enum state newstate,
log_debug(peer->log, "%s: %s => %s", caller, log_debug(peer->log, "%s: %s => %s", caller,
state_name(peer->state), state_name(newstate)); state_name(peer->state), state_name(newstate));
peer->state = newstate; peer->state = newstate;
/* We can only route in normal state. */
if (!state_is_normal(peer->state))
peer->nc = tal_free(peer->nc);
} }
static void peer_breakdown(struct peer *peer) static void peer_breakdown(struct peer *peer)
@@ -1171,6 +1165,17 @@ static void state_single(struct peer *peer,
newstate = state(peer, input, pkt, &broadcast); newstate = state(peer, input, pkt, &broadcast);
set_peer_state(peer, newstate, input_name(input)); set_peer_state(peer, newstate, input_name(input));
/* We never come here again once we leave opening states. */
if (state_is_normal(peer->state)) {
assert(!peer->nc);
peer->nc = add_connection(peer->dstate,
&peer->dstate->id, peer->id,
peer->dstate->config.fee_base,
peer->dstate->config.fee_per_satoshi,
peer->dstate->config.min_htlc_expiry,
peer->dstate->config.min_htlc_expiry);
}
/* If we added uncommitted changes, we should have set them to send. */ /* If we added uncommitted changes, we should have set them to send. */
if (peer_uncommitted_changes(peer)) if (peer_uncommitted_changes(peer))
assert(peer->commit_timer); assert(peer->commit_timer);