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

gossipd: drain fd instead of passing around gossip index.

Browse Source 
(This was sitting in my gossip-enchancement patch queue, but it simplifies
this set too, so I moved it here).

In 94711969f we added an explicit gossip_index so when gossipd gets
peers back from other daemons, it knows what gossip it has sent (since
gossipd can send gossip after the other daemon is already complete).

This solution is insufficient for the more general case where gossipd
wants to send other messages reliably, so replace it with the other
solution: have gossipd drain the "gossip fd" which the daemon returns.

This turns out to be quite simple, and is probably how I should have
done it originally :(

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-04-26 14:21:01 +09:30
parent 9430a455ff
commit ab9d9ef3b8
26 changed files with 118 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/peer_failed.c
View File

@@ -9,7 +9,7 @@
/* We only support one channel per peer anyway */
void peer_failed_(int peer_fd, int gossip_fd,
struct crypto_state *cs, u64 gossip_index,
struct crypto_state *cs,
const struct channel_id *channel_id,
const char *fmt, ...)
{
@@ -22,7 +22,7 @@ void peer_failed_(int peer_fd, int gossip_fd,
va_end(ap);
msg = towire_status_peer_error(NULL, channel_id,
desc, cs, gossip_index,
desc, cs,
towire_errorfmt(desc, channel_id,
"%s", desc));
peer_billboard(true, desc);
@@ -32,12 +32,12 @@ void peer_failed_(int peer_fd, int gossip_fd,
/* We're failing because peer sent us an error message */
void peer_failed_received_errmsg(int peer_fd, int gossip_fd,
struct crypto_state *cs, u64 gossip_index,
struct crypto_state *cs,
const char *desc,
const struct channel_id *channel_id)
{
u8 *msg = towire_status_peer_error(NULL, channel_id,
desc, cs, gossip_index, NULL);
desc, cs, NULL);
peer_billboard(true, "Received error from peer: %s", desc);
status_send_fatal(take(msg), peer_fd, gossip_fd);
}