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

channeld: don't send temporary announcements more than once.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-05-17 14:39:58 +09:30
committed by Christian Decker
parent f014cbb78c
commit f0231b0e6f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channeld/channel.c
View File

@@ -160,6 +160,7 @@ struct peer {
u8 channel_flags; u8 channel_flags;
bool announce_depth_reached; bool announce_depth_reached;
bool sent_temporary_announce;
/* Make sure timestamps move forward. */ /* Make sure timestamps move forward. */
u32 last_update_timestamp; u32 last_update_timestamp;
@@ -505,11 +506,13 @@ static void channel_announcement_negotiate(struct peer *peer)
if (!peer->funding_locked[LOCAL] || !peer->funding_locked[REMOTE]) if (!peer->funding_locked[LOCAL] || !peer->funding_locked[REMOTE])
return; return;
/* If we haven't reached announce depth yet, we can only send /* If we haven't reached announce depth yet, we can only send
* a local update */ * a local update */
if (!peer->announce_depth_reached) { if (!peer->announce_depth_reached) {
if (!peer->sent_temporary_announce) {
send_temporary_announcement(peer); send_temporary_announcement(peer);
peer->sent_temporary_announce = true;
}
return; return;
} }
@@ -2588,6 +2591,7 @@ int main(int argc, char *argv[])
peer->commit_timer = NULL; peer->commit_timer = NULL;
peer->have_sigs[LOCAL] = peer->have_sigs[REMOTE] = false; peer->have_sigs[LOCAL] = peer->have_sigs[REMOTE] = false;
peer->announce_depth_reached = false; peer->announce_depth_reached = false;
peer->sent_temporary_announce = false;
msg_queue_init(&peer->from_master, peer); msg_queue_init(&peer->from_master, peer);
msg_queue_init(&peer->from_gossipd, peer); msg_queue_init(&peer->from_gossipd, peer);
msg_queue_init(&peer->peer_out, peer); msg_queue_init(&peer->peer_out, peer);