diff options
| author | Bitflash <btf01@proton.me> | 2026-07-30 13:38:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-30 13:38:12 -0300 |
| commit | 9f7141b28e2da9db7d7cb099d1f13f28742ff0fa (patch) | |
| tree | a934b2a786639046298b23eef02a4d6468b1d629 /src/net.h | |
| parent | b539d776bd86df9224d97048f26f33d2750d1c92 (diff) | |
rendezvous: bound the wait for a dial, so a dead path is noticed (#51)
A node registers at a relay and waits to be dialled. The wait
had no bound, and ConnectTo() clears the socket timeout on
purpose -- a registration is idle by design and may sit for a
long time.
What that cannot survive is the path dying with neither end
saying so, which is the ordinary case and not the exotic one:
a NAT drops the idle mapping, a relay restarts, a route
changes. No FIN arrives, nothing becomes readable, and recv()
never returns. The thread stays alive and asleep, so
ThreadBtfAccept never reaches the `continue` that would
register again. The node is unreachable and every outward sign
says it is fine.
Caught on the bootstrap seed: 27 minutes without a block,
eight behind the network, relay reachable the whole time, and
a restart fixing it instantly. Nothing in the log marked the
moment it went deaf.
I tried TCP keepalive first and it does not work here. With
probes every 5s and a 2-probe limit, a socket whose replies
were being dropped was still ESTAB after four minutes with the
probe counter stuck at zero. It is measured, not assumed, and
that approach is not in this change.
So the bound is ours to enforce, at the one place that knows
what waiting means. RvServiceWaitPaired takes a timeout;
expiring is not an error but "nobody came, go round again",
which the loop above already handles. Cost is one reconnect
per relay per five minutes.
Verified by killing a registration's path silently -- dropping
only the relay's replies, so no RST or FIN is ever seen. With
a 60s bound for the test:
rendezvous: no dial at 92.246.128.180:8434 within 60s
(or it dropped us), re-registering
Registrations went 1 -> 2 and the node carried on. Before this,
the same treatment left it blocked past four minutes with no
log line at all.
The socket goes back to blocking once a dial lands, because
from that point it is a data tunnel and a tunnel is allowed to
sit quiet between messages.
Diffstat (limited to 'src/net.h')
| -rw-r--r-- | src/net.h | 8 |
1 files changed, 8 insertions, 0 deletions
| @@ -43,6 +43,14 @@ static const unsigned int MAX_PEX_DESCRIPTOR_BYTES = 1024; | |||
| 43 | // connection is the intended traffic; anything faster is someone else's idea. | 43 | // connection is the intended traffic; anything faster is someone else's idea. |
| 44 | static const int64 PEX_MIN_INTERVAL = 60; | 44 | static const int64 PEX_MIN_INTERVAL = 60; |
| 45 | 45 | ||
| 46 | // How long to sit registered at a rendezvous relay before giving up on this | ||
| 47 | // attempt and registering again. Bounded because a registration socket that | ||
| 48 | // goes quiet is indistinguishable, from inside recv(), from one whose path has | ||
| 49 | // died -- and the second kind never wakes up. Five minutes is short enough | ||
| 50 | // that a node is unreachable only briefly and long enough that the reconnect | ||
| 51 | // traffic is nothing: one per relay per five minutes. | ||
| 52 | static const int BTF_RENDEZVOUS_WAIT_SECS = 300; | ||
| 53 | |||
| 46 | // Descriptors to hand a peer: ours first, then peers that answered us. | 54 | // Descriptors to hand a peer: ours first, then peers that answered us. |
| 47 | void BtfPexCollect(std::vector<std::string>& vDescOut); | 55 | void BtfPexCollect(std::vector<std::string>& vDescOut); |
| 48 | // Verify descriptors a peer sent and remember the good ones. Returns how many. | 56 | // Verify descriptors a peer sent and remember the good ones. Returns how many. |