From 792f8ce938aed892885ae9b12e409fe2b76e84dc Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Thu, 19 Nov 2026 11:48:07 +0100 Subject: [PATCH] wip Signed-off-by: Jakob Borg --- .github/workflows/build-syncthing.yaml | 1 + lib/discover/manager.go | 20 +++++++--------- lib/discover/peertopeer.go | 33 +++++++++++++------------- lib/discover/peertopeer_disabled.go | 25 +++++++++++++++++++ 4 files changed, 52 insertions(+), 27 deletions(-) create mode 100644 lib/discover/peertopeer_disabled.go diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml index 08e845b82..f7d669338 100644 --- a/.github/workflows/build-syncthing.yaml +++ b/.github/workflows/build-syncthing.yaml @@ -383,6 +383,7 @@ jobs: done env: CGO_ENABLED: "1" + TAGS: "nolibp2p sqlite_omit_load_extension sqlite_dbstat" - name: Archive artifacts uses: actions/upload-artifact@v4 diff --git a/lib/discover/manager.go b/lib/discover/manager.go index 47d7d9b5b..e32ef82ff 100644 --- a/lib/discover/manager.go +++ b/lib/discover/manager.go @@ -20,7 +20,6 @@ import ( "github.com/thejerf/suture/v4" "github.com/syncthing/syncthing/internal/db" - "github.com/syncthing/syncthing/internal/dht" "github.com/syncthing/syncthing/internal/slogutil" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/connections/registry" @@ -252,7 +251,7 @@ func (m *manager) CommitConfiguration(_, to config.Configuration) (handled bool) toIdentities[ipv6Identity(to.Options.LocalAnnMCAddr)] = struct{}{} } - if to.Options.P2PDiscoveryEnabled { + if p2pDiscoveryAvailable && to.Options.P2PDiscoveryEnabled { toIdentities[p2pIdentity()] = struct{}{} } @@ -308,16 +307,10 @@ func (m *manager) CommitConfiguration(_, to config.Configuration) (handled bool) } } - if to.Options.P2PDiscoveryEnabled { + if p2pDiscoveryAvailable && to.Options.P2PDiscoveryEnabled { ident := p2pIdentity() if _, ok := m.finders[ident]; !ok { - listenAddresses := p2pQUICListenAddresses(to.Options.ListenAddresses()) - bootstrapPeers := to.Options.P2PDiscoveryBootstrapPeers() - dht, err := NewPeerToPeerDiscovery(m.cert, m.addressLister, m.evLogger, m.kv, dht.Options{ - UDP: m.registry.UDP, - ListenAddresses: listenAddresses, - BootstrapPeers: bootstrapPeers, - }) + dht, err := NewPeerToPeerDiscovery(m.cert, m.addressLister, m.evLogger, m.kv, m.registry.UDP, to.Options) if err != nil { slog.Warn("Failed to initialize peer-to-peer discovery", slogutil.Error(err)) } else { @@ -332,10 +325,15 @@ func (m *manager) CommitConfiguration(_, to config.Configuration) (handled bool) // P2PStats returns statistics about the currently running peer-to-peer // discovery. func (m *manager) P2PStats() P2PStats { + type p2pImpl interface { + Mode() string + Peers() int + } + m.mut.RLock() defer m.mut.RUnlock() - p2p, ok := m.finders[p2pIdentity()].Finder.(*PeerToPeerDiscovery) + p2p, ok := m.finders[p2pIdentity()].Finder.(p2pImpl) if !ok { return P2PStats{} } diff --git a/lib/discover/peertopeer.go b/lib/discover/peertopeer.go index cfd0dae27..b937a897c 100644 --- a/lib/discover/peertopeer.go +++ b/lib/discover/peertopeer.go @@ -4,6 +4,8 @@ // 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/. +//go:build !nolibp2p + package discover import ( @@ -25,13 +27,15 @@ import ( "github.com/syncthing/syncthing/internal/db" "github.com/syncthing/syncthing/internal/dht" "github.com/syncthing/syncthing/lib/config" + "github.com/syncthing/syncthing/lib/connections/registry" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/protocol" ) const ( - p2pIdentityKey = "dht-identity" - p2pIdentityLifetime = 7 * 24 * time.Hour + p2pDiscoveryAvailable = true + p2pIdentityKey = "dht-identity" + p2pIdentityLifetime = 7 * 24 * time.Hour ) type PeerToPeerDiscovery struct { @@ -48,28 +52,25 @@ type PeerToPeerDiscovery struct { var _ FinderService = (*PeerToPeerDiscovery)(nil) -func NewPeerToPeerDiscovery(cert tls.Certificate, addresses AddressLister, evLogger events.Logger, kv db.KV, opts dht.Options) (*PeerToPeerDiscovery, error) { +func NewPeerToPeerDiscovery(cert tls.Certificate, addresses AddressLister, evLogger events.Logger, kv db.KV, udp *registry.UDPReuseManager, cfg config.OptionsConfiguration) (Finder, error) { privateKey, ok := cert.PrivateKey.(crypto.Signer) if !ok { return nil, errors.New("TLS private key must implement crypto.Signer") } - if opts.ValueDatastore == nil { - opts.ValueDatastore = dht.NewDatastore(db.NewTyped(kv, "dht-values")) + identity, err := loadDHTIdentity(db.NewMiscDB(kv), time.Now()) + if err != nil { + return nil, fmt.Errorf("loading DHT identity: %w", err) } - if opts.RoutingDatastore == nil { - opts.RoutingDatastore = dht.NewDatastore(db.NewTyped(kv, "dht-routing")) + opts := dht.Options{ + UDP: udp, + ListenAddresses: p2pQUICListenAddresses(cfg.ListenAddresses()), + BootstrapPeers: cfg.P2PDiscoveryBootstrapPeers(), + ValueDatastore: dht.NewDatastore(db.NewTyped(kv, "dht-values")), + RoutingDatastore: dht.NewDatastore(db.NewTyped(kv, "dht-routing")), + Identity: identity, } - - if opts.Identity == nil { - identity, err := loadDHTIdentity(db.NewMiscDB(kv), time.Now()) - if err != nil { - return nil, fmt.Errorf("loading DHT identity: %w", err) - } - opts.Identity = identity - } - dht, err := dht.NewSyncthingDHT(opts) if err != nil { return nil, err diff --git a/lib/discover/peertopeer_disabled.go b/lib/discover/peertopeer_disabled.go new file mode 100644 index 000000000..465fa310f --- /dev/null +++ b/lib/discover/peertopeer_disabled.go @@ -0,0 +1,25 @@ +// Copyright (C) 2026 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/. + +//go:build nolibp2p + +package discover + +import ( + "crypto/tls" + "errors" + + "github.com/syncthing/syncthing/internal/db" + "github.com/syncthing/syncthing/lib/config" + "github.com/syncthing/syncthing/lib/connections/registry" + "github.com/syncthing/syncthing/lib/events" +) + +const p2pDiscoveryAvailable = false + +func NewPeerToPeerDiscovery(tls.Certificate, AddressLister, events.Logger, db.KV, *registry.UDPReuseManager, config.OptionsConfiguration) (Finder, error) { + return nil, errors.New("peer-to-peer discovery is disabled in this build") +}