aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-08 08:34:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

state: INPUT_CONNECTION_LOST

Browse Source 
We used to have a hacky close timeout which would immediately fire
when we'd closed because the connection was down.  Far better to have
a specific "connection lost" input, and have it respond like CMD_CLOSE.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-03-24 12:09:44 +10:30
parent b423b33236
commit 994addadce
4 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/peer.c
View File

@@ -313,20 +313,18 @@ static void peer_disconnect(struct io_conn *conn, struct peer *peer)
}
/* FIXME: Try to reconnect. */
if (peer->cond == PEER_CLOSING
|| peer->cond == PEER_CLOSED)
if (peer->cond == PEER_CLOSED)
return;
state(peer, peer, CMD_CLOSE, NULL, &outpkt, &broadcast);
/* Can't send packet, so ignore it. */
tal_free(outpkt);
state(peer, peer, INPUT_CONNECTION_LOST, NULL, &outpkt, &broadcast);
assert(!outpkt);
if (broadcast) {
struct sha256_double txid;
bitcoin_txid(broadcast, &txid);
/* FIXME: log_struct */
log_debug(peer->log, "CMD_CLOSE: tx %02x%02x%02x%02x...",
log_debug(peer->log, "INPUT_CONN_LOST: tx %02x%02x%02x%02x...",
txid.sha.u.u8[0], txid.sha.u.u8[1],
txid.sha.u.u8[2], txid.sha.u.u8[3]);
bitcoind_send_tx(peer->dstate, broadcast);
@@ -940,7 +938,9 @@ bool peer_watch_our_htlc_outputs(struct peer *peer,
enum state_input tothem_spent,
enum state_input tothem_timeout)
{
FIXME_STUB(peer);
if (committed_to_htlcs(peer))
FIXME_STUB(peer);
return false;
}
bool peer_watch_their_htlc_outputs(struct peer *peer,
const struct bitcoin_event *tx,

4
daemon/test/test.sh
View File

@@ -192,7 +192,7 @@ if [ -n "$TIMEOUT_ANCHOR" ]; then
sleep 2
# It should send out commit tx.
lcli1 getpeers | $FGREP -w STATE_CLOSE_WAIT_CLOSE_OURCOMMIT
lcli1 getpeers | $FGREP -w STATE_CLOSE_WAIT_OURCOMMIT
# Generate a block (should include commit tx)
check_tx_spend
@@ -212,7 +212,7 @@ if [ -n "$TIMEOUT_ANCHOR" ]; then
lcli1 dev-mocktime $TIME
sleep 2
lcli1 getpeers | $FGREP -w STATE_CLOSE_WAIT_CLOSE_SPENDOURS
lcli1 getpeers | $FGREP -w STATE_CLOSE_WAIT_SPENDOURS
# Now it should have spent the commit tx.
check_tx_spend