Before: - Local discovery on Android 10+ is broken. The phone receives local discovery packets from other devices running Syncthing on the same network, e.g. a computer. But it doesn't send its own local discovery packets. - Startup of the beacon/broadcast.go and beacon/multicast.go "services" subsequently fail, see the log entries of "service.go" with "2 of 2 failures, backing off". Root cause: - Android 10+ restricts determining the network interfaces for privacy reasons. The interfaces and IP addresses cannot be determined. - There's a bug in the go "net" library. I can actually get the interfaces, but the fix was not implemented by the go team. Workaround: - The "community" found a workaround by creating a light wrapper around "net" called "anet" library. - "anet" adjusts the behaviour on Android 10+ and gets the interfaces plus their IP addresses, as required by Syncthing. After: - By using the "anet" lib, Syncthing is able to get the interface ip addresses and put them into the "AllAddresses" string array. - The "AllAddresses" string array is then announced on the local discovery multicast and broadcast packets, if enabled in Syncthing's config. - By correctly getting the interfaces and IP addresses using "anet" in "beacon/broadcast.go" and "beacon/multicast.go", the services start up fine again. Verification: - I've built "libSyncthingNative.so" with this PR applied for Android and put it into Syncthing-Fork v1.29.7.5 for testing. My two phones, Android 10 and Android 15 (arm64-v8a) immediately discovered each other using local discovery. - I can see the "sent XX bytes" and "recv XX bytes" on both phones in the log filtering for "SyncthingNativeCode" :-). Personal note: - Please go light on me, and, if it's not demanded too much of your time, please help me on this. I am no go programmer. Most things you think are easy or common sense aren't part of my knowledge set. I'd just like to help and hope we somehow can drive this home together to fix the problem. ---- ref: https://github.com/Catfriend1/syncthing-android/pull/1501 ref: https://github.com/Catfriend1/syncthing-android/issues/1500 ref: https://github.com/wlynxg/anet/blob/main/interface.go & https://github.com/wlynxg/anet/blob/main/interface_android.go With that fix, I can see the broadcast/multicast lines again and my phone can be discovered by other phones running the Syncthing app which wasn't possible before on Android 10+. ``` [ET76H] .346892 broadcast.go:107: DEBUG: sent 185 bytes to 192.168.x.255:21027 [ET76H] .347114 multicast.go:86: DEBUG: sent 185 bytes to [ff12::8384]:21027 on wlan0 ``` --------- Co-authored-by: Marcus B Spencer <marcus@marcusspencer.us>
168 lines
3.6 KiB
Go
168 lines
3.6 KiB
Go
// Copyright (C) 2014 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package beacon
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"time"
|
|
|
|
"github.com/wlynxg/anet"
|
|
)
|
|
|
|
func NewBroadcast(port int) Interface {
|
|
c := newCast("broadcastBeacon")
|
|
c.addReader(func(ctx context.Context) error {
|
|
return readBroadcasts(ctx, c.outbox, port)
|
|
})
|
|
c.addWriter(func(ctx context.Context) error {
|
|
return writeBroadcasts(ctx, c.inbox, port)
|
|
})
|
|
return c
|
|
}
|
|
|
|
func writeBroadcasts(ctx context.Context, inbox <-chan []byte, port int) error {
|
|
conn, err := net.ListenUDP("udp4", nil)
|
|
if err != nil {
|
|
l.Debugln(err)
|
|
return err
|
|
}
|
|
doneCtx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
go func() {
|
|
<-doneCtx.Done()
|
|
conn.Close()
|
|
}()
|
|
|
|
for {
|
|
var bs []byte
|
|
select {
|
|
case bs = <-inbox:
|
|
case <-doneCtx.Done():
|
|
return doneCtx.Err()
|
|
}
|
|
|
|
intfs, err := anet.Interfaces()
|
|
if err != nil {
|
|
l.Debugln("Failed to list interfaces:", err)
|
|
// net.Interfaces() is broken on Android. see https://github.com/golang/go/issues/40569
|
|
// Use the general broadcast address 255.255.255.255 instead.
|
|
}
|
|
|
|
var dsts []net.IP
|
|
for i := range intfs {
|
|
intf := intfs[i]
|
|
|
|
if intf.Flags&net.FlagRunning == 0 || intf.Flags&net.FlagBroadcast == 0 {
|
|
continue
|
|
}
|
|
|
|
addrs, err := anet.InterfaceAddrsByInterface(&intf)
|
|
if err != nil {
|
|
l.Debugln("Failed to list interface addresses:", err)
|
|
// Interface discovery might work while retrieving the addresses doesn't. So log the error and carry on.
|
|
continue
|
|
}
|
|
|
|
for _, addr := range addrs {
|
|
if iaddr, ok := addr.(*net.IPNet); ok && len(iaddr.IP) >= 4 && iaddr.IP.IsGlobalUnicast() && iaddr.IP.To4() != nil {
|
|
baddr := bcast(iaddr)
|
|
dsts = append(dsts, baddr.IP)
|
|
}
|
|
}
|
|
}
|
|
|
|
if len(dsts) == 0 {
|
|
// Fall back to the general IPv4 broadcast address
|
|
dsts = append(dsts, net.IP{0xff, 0xff, 0xff, 0xff})
|
|
}
|
|
|
|
l.Debugln("addresses:", dsts)
|
|
|
|
success := 0
|
|
for _, ip := range dsts {
|
|
dst := &net.UDPAddr{IP: ip, Port: port}
|
|
|
|
conn.SetWriteDeadline(time.Now().Add(time.Second))
|
|
_, err = conn.WriteTo(bs, dst)
|
|
conn.SetWriteDeadline(time.Time{})
|
|
|
|
if nerr, ok := err.(net.Error); ok && nerr.Timeout() {
|
|
// Write timeouts should not happen. We treat it as a fatal
|
|
// error on the socket.
|
|
l.Debugln(err)
|
|
return err
|
|
}
|
|
|
|
if err != nil {
|
|
// Some other error that we don't expect. Debug and continue.
|
|
l.Debugln(err)
|
|
continue
|
|
}
|
|
|
|
l.Debugf("sent %d bytes to %s", len(bs), dst)
|
|
success++
|
|
}
|
|
|
|
if success == 0 {
|
|
l.Debugln("couldn't send any broadcasts")
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
func readBroadcasts(ctx context.Context, outbox chan<- recv, port int) error {
|
|
conn, err := net.ListenUDP("udp4", &net.UDPAddr{Port: port})
|
|
if err != nil {
|
|
l.Debugln(err)
|
|
return err
|
|
}
|
|
|
|
doneCtx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
go func() {
|
|
<-doneCtx.Done()
|
|
conn.Close()
|
|
}()
|
|
|
|
bs := make([]byte, 65536)
|
|
for {
|
|
n, addr, err := conn.ReadFrom(bs)
|
|
if err != nil {
|
|
l.Debugln(err)
|
|
return err
|
|
}
|
|
|
|
l.Debugf("recv %d bytes from %s", n, addr)
|
|
|
|
c := make([]byte, n)
|
|
copy(c, bs)
|
|
select {
|
|
case outbox <- recv{c, addr}:
|
|
case <-doneCtx.Done():
|
|
return doneCtx.Err()
|
|
default:
|
|
l.Debugln("dropping message")
|
|
}
|
|
}
|
|
}
|
|
|
|
func bcast(ip *net.IPNet) *net.IPNet {
|
|
bc := &net.IPNet{}
|
|
bc.IP = make([]byte, len(ip.IP))
|
|
copy(bc.IP, ip.IP)
|
|
bc.Mask = ip.Mask
|
|
|
|
offset := len(bc.IP) - len(bc.Mask)
|
|
for i := range bc.IP {
|
|
if i-offset >= 0 {
|
|
bc.IP[i] = ip.IP[i] | ^ip.Mask[i-offset]
|
|
}
|
|
}
|
|
return bc
|
|
}
|