mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

channeld: prioritize read from peer over (read from gossipd and) write to peer

Browse source 
This solves (or at least reduces probability of) a deadlock in channeld
when there is lot of gossip traffic, see issue #2286. That issue is
almost identical to #1943 (deadlock in openingd) and so is the fix.
This commit is contained in:
Simon Vrouwe 2019-01-26 14:55:07 +02:00 • committed by Christian Decker
parent 10057c8335
commit 6e4d9acac3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
channeld/channeld.c
View file

@ -2928,6 +2928,10 @@ int main(int argc, char *argv[])
"Can't read command: %s", "Can't read command: %s",
strerror(errno)); strerror(errno));
req_in(peer, msg); req_in(peer, msg);
} else if (FD_ISSET(PEER_FD, &rfds)) {
/* This could take forever, but who cares? */
msg = sync_crypto_read(tmpctx, &peer->cs, PEER_FD);
peer_in(peer, msg);
} else if (FD_ISSET(GOSSIP_FD, &rfds)) { } else if (FD_ISSET(GOSSIP_FD, &rfds)) {
msg = wire_sync_read(tmpctx, GOSSIP_FD); msg = wire_sync_read(tmpctx, GOSSIP_FD);
/* Gossipd hangs up on us to kill us when a new /* Gossipd hangs up on us to kill us when a new
@ -2935,10 +2939,6 @@ int main(int argc, char *argv[])
if (!msg) if (!msg)
peer_failed_connection_lost(); peer_failed_connection_lost();
handle_gossip_msg(PEER_FD, &peer->cs, take(msg)); handle_gossip_msg(PEER_FD, &peer->cs, take(msg));
} else if (FD_ISSET(PEER_FD, &rfds)) {
/* This could take forever, but who cares? */
msg = sync_crypto_read(tmpctx, &peer->cs, PEER_FD);
peer_in(peer, msg);
} }
} }