From 997e511e120272e8f2ddd29716b486e597410f02 Mon Sep 17 00:00:00 2001 From: Bitflash Date: Wed, 29 Jul 2026 13:28:50 -0300 Subject: rendezvous: register and wait for a dial as separate steps (#30) A node could not become reachable. RvServiceRegister connected, sent its 'S'+pubkey header, and then blocked reading the relay's 0x01 byte -- which the relay only writes when a client pairs with the service. So the call did not return when the node was registered; it returned when somebody had already dialled it. ThreadBtfAccept called BtfSetActiveRelay after that. The result is a deadlock: - to be dialled, a node must publish a descriptor naming its meeting node - to publish, BtfActiveRelay() must be set - it is only set once somebody has dialled Before #26 this was masked. BtfActiveRelay() fell back to vBtfMeetingRelays[0], so a node always published something, and ThreadBtfAccept picks its relay at random -- so it worked whenever the two happened to match, roughly one time in the number of relays. That is the flakiness this project has been chasing: not a bad relay, an advertisement that usually named the wrong one. #26 removed the fallback, which was right on its own terms and turned an unreliable heuristic into a reliable deadlock. This is the other half of that change and they belong together. RvServiceRegister now returns as soon as the relay has the service listed. RvServiceWaitPaired does the blocking read. ThreadBtfAccept registers, advertises, then waits. RvClientConnect is untouched -- a dialer blocking until it is paired is correct. Registration failure also had no log line at all, which is why this stayed invisible: a node that never registered looked identical to one waiting quietly for a peer. There are now lines for registering, failing over, and being dropped. Verified: a fresh node reports `registered at 90.156.222.107:8434, waiting for a dial` and then self-resolves with `meeting_node=90.156.222.107:8434` -- the relay it is actually on. Two nodes on one machine reach each other. --- src/btfrv.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/btfrv.cpp') diff --git a/src/btfrv.cpp b/src/btfrv.cpp index 0d02ca8..63e092e 100644 --- a/src/btfrv.cpp +++ b/src/btfrv.cpp @@ -250,11 +250,20 @@ RvSocket RvServiceRegister(const char* relay_host, unsigned short port, hdr[0] = (unsigned char)'S'; memcpy(hdr + 1, my_pubkey, 32); if (!WriteN(s, hdr, 33)) { CLOSESOCK(s); return RV_INVALID; } - unsigned char paired = 0; - if (!ReadN(s, &paired, 1) || paired != 0x01) { CLOSESOCK(s); return RV_INVALID; } + // Return here: registered, not yet paired. The relay lists the service as + // soon as it reads this header. The 0x01 that used to be consumed below + // only arrives when somebody dials us, so blocking on it made "registered" + // and "already in use" indistinguishable to the caller -- and left the node + // unable to advertise a meeting node until after it had been reached there. return (RvSocket)s; } +bool RvServiceWaitPaired(RvSocket s) +{ + unsigned char paired = 0; + return ReadN((SOCKET)s, &paired, 1) && paired == 0x01; +} + RvSocket RvClientConnect(const char* relay_host, unsigned short port, const unsigned char target_pubkey[32]) { -- cgit v1.2.3