explewd/waste-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

fix: align offer/answer tiebreak with yaw2/browser (lower ID offers)

Browse Source 
The Go daemon was using higher-ID-offers while the browser adapter and
yaw2 use lower-ID-offers. This meant daemon↔browser pairs where the
daemon had the lower ID would never connect — neither side would offer.

All three comparison sites in anchor/client.go flipped: > 0 → < 0,
<= 0 → >= 0.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Fredrik Johansson
2026-06-25 11:47:13 +02:00
parent d529f58ddc
commit f7047b7bfe
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/anchor/client.go
View File

@@ -122,9 +122,8 @@ func runOnce(ctx context.Context, anchorURL, netHash string, id *crypto.Identity
if already { if already {
continue continue
} }
// Use the same lexicographic tiebreak as anchor join to avoid // Lower ID offers (matches yaw2/browser convention).
// both sides trying to offer simultaneously. if strings.Compare(string(id.PeerID()), string(pid)) >= 0 {
if strings.Compare(string(id.PeerID()), string(pid)) <= 0 {
continue continue
} }
go func(pid proto.PeerID) { go func(pid proto.PeerID) {
@@ -170,7 +169,7 @@ func runOnce(ctx context.Context, anchorURL, netHash string, id *crypto.Identity
log.Printf("anchor: joined network, %d peer(s) present", len(msg.Peers)) log.Printf("anchor: joined network, %d peer(s) present", len(msg.Peers))
for _, peerHex := range msg.Peers { for _, peerHex := range msg.Peers {
pid := proto.PeerID(peerHex) pid := proto.PeerID(peerHex)
if strings.Compare(string(id.PeerID()), peerHex) > 0 { if strings.Compare(string(id.PeerID()), peerHex) < 0 {
go func(pid proto.PeerID) { go func(pid proto.PeerID) {
sess, err := startOffer(ctx, pid, id, m, s) sess, err := startOffer(ctx, pid, id, m, s)
if err != nil { if err != nil {
@@ -187,7 +186,7 @@ func runOnce(ctx context.Context, anchorURL, netHash string, id *crypto.Identity
case proto.AnchorPeerJoin: case proto.AnchorPeerJoin:
pid := proto.PeerID(msg.ID) pid := proto.PeerID(msg.ID)
log.Printf("anchor: peer joined: %s", pid.Short()) log.Printf("anchor: peer joined: %s", pid.Short())
if strings.Compare(string(id.PeerID()), msg.ID) > 0 { if strings.Compare(string(id.PeerID()), msg.ID) < 0 {
go func(pid proto.PeerID) { go func(pid proto.PeerID) {
sess, err := startOffer(ctx, pid, id, m, s) sess, err := startOffer(ctx, pid, id, m, s)
if err != nil { if err != nil {