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

peer: restart from the other side.

Browse Source 
Testing this revealed that we can't just reconnect when we have something to
send, as we might be NATed; we should try to reconnect anyway.

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

14
daemon/peer.c
View File

@@ -2321,7 +2321,7 @@ static struct io_plan *reconnect_pkt_in(struct io_conn *conn, struct peer *peer)
return pkt_out(conn, peer);
}
/* Queue prompted us to reconnect, but we need to eliminate it now. */
/* We need to eliminate queue now. */
clear_output_queue(peer);
/* They might have missed the error, tell them before hanging up */
@@ -3832,7 +3832,8 @@ static struct io_plan *peer_reconnect(struct io_conn *conn, struct peer *peer)
peer->id, crypto_on_reconnect_out, peer);
}
/* Only retry when we want to send something. */
/* We can't only retry when we want to send: they may want to send us
* something but not be able to connect (NAT). So keep retrying.. */
static void reconnect_failed(struct io_conn *conn, struct peer *peer)
{
/* Already otherwise connected (ie. they connected in)? */
@@ -3841,13 +3842,8 @@ static void reconnect_failed(struct io_conn *conn, struct peer *peer)
return;
}
if (!tal_count(peer->outpkt)) {
log_debug(peer->log, "reconnect_failed: nothing to send");
return;
}
log_debug(peer->log, "Have packets to send, setting timer");
new_reltimer(peer->dstate, peer, time_from_sec(60), try_reconnect, peer);
log_debug(peer->log, "Setting timer to re-connect");
new_reltimer(peer->dstate, peer, time_from_sec(15), try_reconnect, peer);
}
static struct io_plan *init_conn(struct io_conn *conn, struct peer *peer)