PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.
Dart airdrop-alternativeclipboardclipboard-sharingclipboard-synccopy-pastecross-platformend-to-end-encryptionfile-syncfile-transferfluttergolanglinuxmacosnat-traversalp2pself-hostedtailscaleuniversal-clipboardwebrtcwindows
fix(core): send LAN packets before checking the interface list
baiyuzedc7cc3a07e37
diff --git a/client-core/internal/transport/lan/lan.go b/client-core/internal/transport/lan/lan.goindex c4446e1..0bb600c 100644--- a/client-core/internal/transport/lan/lan.go+++ b/client-core/internal/transport/lan/lan.go@@ -1042,12 +1042,12 @@ func (t *Transport) send(dst netip.AddrPort, pkt []byte, probe bool) error {if !running {return ErrDisabled}- if !onLink(dst.Addr()) {- _, err := conn.WriteToUDPAddrPort(pkt, dst)- return err+ // 先发再判断是不是直连网段:onLink 要列举网卡,放在前面会让每个包都晚一点发出,+ // 「搜索附近设备」关窗口前发出的最后一个 ping 就可能晚于撤下设备名的广播到达+ err := writeUDP(conn, dst, pkt)+ if onLink(dst.Addr()) {+ t.noteSend(err, probe, time.Now())}- err := writeOnLink(conn, dst, pkt)- t.noteSend(err, probe, time.Now())return err}@@ -1056,13 +1056,13 @@ type udpWriter interface {WriteToUDPAddrPort(b []byte, addr netip.AddrPort) (int, error)}-// writeOnLink 往直连网段里的地址发一个包。+// writeUDP 发一个包。//-// 对方不在线时,ARP 解析失败的那一次发送也返回 EHOSTUNREACH,与被本地网络权限拦下时相同,+// 直连网段里的对方不在线时,ARP 解析失败的那一次发送也返回 EHOSTUNREACH,与被本地网络权限拦下时相同,// 但紧接着再发得到的是 EHOSTDOWN:系统把对方标成不在线,20 秒内都这样。被权限拦下的包到不了 ARP// 那一步,再发还是 EHOSTUNREACH。所以遇到它就再发一次,以第二次的结果为准。-// 第一次没有发出去,对方最多收到一份。-func writeOnLink(w udpWriter, dst netip.AddrPort, pkt []byte) error {+// 第一次没有发出去,对方最多收到一份。只有 macOS 会把错误认作被拦,其他系统只发一次。+func writeUDP(w udpWriter, dst netip.AddrPort, pkt []byte) error {_, err := w.WriteToUDPAddrPort(pkt, dst)if deniedByOS(err) {_, err = w.WriteToUDPAddrPort(pkt, dst)diff --git a/client-core/internal/transport/lan/permission_darwin.go b/client-core/internal/transport/lan/permission_darwin.goindex 19a3f46..7585fb1 100644--- a/client-core/internal/transport/lan/permission_darwin.go+++ b/client-core/internal/transport/lan/permission_darwin.go@@ -19,7 +19,7 @@ func RequestPermission() error {// deniedByOS 判断一次发送失败是不是被系统的本地网络权限拦下的。// 只对本机直连网段里的地址下这个结论:真的没有路由时也会是同一个错误。-// 直连网段里的对方不在线时,ARP 解析失败也会返回一次同样的错误,见 writeOnLink。+// 直连网段里的对方不在线时,ARP 解析失败也会返回一次同样的错误,见 writeUDP。func deniedByOS(err error) bool {return errors.Is(err, syscall.EHOSTUNREACH)}diff --git a/client-core/internal/transport/lan/permission_darwin_test.go b/client-core/internal/transport/lan/permission_darwin_test.goindex a4c1e11..29a82fd 100644--- a/client-core/internal/transport/lan/permission_darwin_test.go+++ b/client-core/internal/transport/lan/permission_darwin_test.go@@ -116,7 +116,7 @@ func TestUnresolvedPeerIsNotDenied(t *testing.T) {{"被本地网络权限拦下", []error{syscall.EHOSTUNREACH, syscall.EHOSTUNREACH}, 2, true},} {w := &fakeWriter{errs: c.errs}- err := writeOnLink(w, dst, []byte(magic))+ err := writeUDP(w, dst, []byte(magic))if w.n != c.writes || deniedByOS(err) != c.denied {t.Errorf("%s:发了 %d 次,结果 %v;应当发 %d 次,被拦=%v", c.name, w.n, err, c.writes, c.denied)}@@ -130,7 +130,7 @@ func TestUnresolvedPeerKeepsDiscovery(t *testing.T) {now := time.Now()tr.nextProbe = now.Add(probeEvery)- err := writeOnLink(&fakeWriter{errs: []error{syscall.EHOSTUNREACH, syscall.EHOSTDOWN}}, netip.MustParseAddrPort("192.168.1.77:8788"), []byte(magic))+ err := writeUDP(&fakeWriter{errs: []error{syscall.EHOSTUNREACH, syscall.EHOSTDOWN}}, netip.MustParseAddrPort("192.168.1.77:8788"), []byte(magic))tr.noteSend(err, false, now)tr.noteSend(nil, true, now.Add(time.Second))if tr.rediscover || !tr.deniedSince.IsZero() || tr.nextProbe.Before(now.Add(time.Minute)) {