mirror of
https://github.com/octoleo/syncthing.git
synced 2024-12-22 10:58:57 +00:00
c6334e61aa
This adds the ability to have multiple concurrent connections to a single device. This is primarily useful when the network has multiple physical links for aggregated bandwidth. A single connection will never see a higher rate than a single link can give, but multiple connections are load-balanced over multiple links. It is also incidentally useful for older multi-core CPUs, where bandwidth could be limited by the TLS performance of a single CPU core -- using multiple connections achieves concurrency in the required crypto calculations... Co-authored-by: Simon Frei <freisim93@gmail.com> Co-authored-by: tomasz1986 <twilczynski@naver.com> Co-authored-by: bt90 <btom1990@googlemail.com>
133 lines
3.5 KiB
Go
133 lines
3.5 KiB
Go
// Copyright (C) 2019 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 go1.15 && !noquic
|
|
// +build go1.15,!noquic
|
|
|
|
package connections
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"fmt"
|
|
"net"
|
|
"net/url"
|
|
"time"
|
|
|
|
"github.com/quic-go/quic-go"
|
|
|
|
"github.com/syncthing/syncthing/lib/config"
|
|
"github.com/syncthing/syncthing/lib/connections/registry"
|
|
"github.com/syncthing/syncthing/lib/protocol"
|
|
)
|
|
|
|
const (
|
|
// The timeout for connecting, accepting and creating the various
|
|
// streams.
|
|
quicOperationTimeout = 10 * time.Second
|
|
)
|
|
|
|
func init() {
|
|
factory := &quicDialerFactory{}
|
|
for _, scheme := range []string{"quic", "quic4", "quic6"} {
|
|
dialers[scheme] = factory
|
|
}
|
|
}
|
|
|
|
type quicDialer struct {
|
|
commonDialer
|
|
registry *registry.Registry
|
|
}
|
|
|
|
func (d *quicDialer) Dial(ctx context.Context, _ protocol.DeviceID, uri *url.URL) (internalConn, error) {
|
|
uri = fixupPort(uri, config.DefaultQUICPort)
|
|
|
|
network := quicNetwork(uri)
|
|
|
|
addr, err := net.ResolveUDPAddr(network, uri.Host)
|
|
if err != nil {
|
|
return internalConn{}, err
|
|
}
|
|
|
|
// If we created the conn we need to close it at the end. If we got a
|
|
// Transport from the registry we have no conn to close.
|
|
var createdConn net.PacketConn
|
|
transport, _ := d.registry.Get(uri.Scheme, transportConnUnspecified).(*quic.Transport)
|
|
if transport == nil {
|
|
if packetConn, err := net.ListenPacket("udp", ":0"); err != nil {
|
|
return internalConn{}, err
|
|
} else {
|
|
createdConn = packetConn
|
|
transport = &quic.Transport{Conn: packetConn}
|
|
}
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(ctx, quicOperationTimeout)
|
|
defer cancel()
|
|
|
|
session, err := transport.Dial(ctx, addr, d.tlsCfg, quicConfig)
|
|
if err != nil {
|
|
if createdConn != nil {
|
|
_ = createdConn.Close()
|
|
}
|
|
return internalConn{}, fmt.Errorf("dial: %w", err)
|
|
}
|
|
|
|
stream, err := session.OpenStreamSync(ctx)
|
|
if err != nil {
|
|
// It's ok to close these, this does not close the underlying packetConn.
|
|
_ = session.CloseWithError(1, err.Error())
|
|
if createdConn != nil {
|
|
_ = createdConn.Close()
|
|
}
|
|
return internalConn{}, fmt.Errorf("open stream: %w", err)
|
|
}
|
|
|
|
priority := d.wanPriority
|
|
isLocal := d.lanChecker.isLAN(session.RemoteAddr())
|
|
if isLocal {
|
|
priority = d.lanPriority
|
|
}
|
|
|
|
return newInternalConn(&quicTlsConn{session, stream, createdConn}, connTypeQUICClient, isLocal, priority), nil
|
|
}
|
|
|
|
type quicDialerFactory struct{}
|
|
|
|
func (quicDialerFactory) New(opts config.OptionsConfiguration, tlsCfg *tls.Config, registry *registry.Registry, lanChecker *lanChecker) genericDialer {
|
|
// So the idea is that we should probably try dialing every 20 seconds.
|
|
// However it would still be nice if this was adjustable/proportional to ReconnectIntervalS
|
|
// But prevent something silly like 1/3 = 0 etc.
|
|
quicInterval := opts.ReconnectIntervalS / 3
|
|
if quicInterval < 10 {
|
|
quicInterval = 10
|
|
}
|
|
return &quicDialer{
|
|
commonDialer: commonDialer{
|
|
reconnectInterval: time.Duration(quicInterval) * time.Second,
|
|
tlsCfg: tlsCfg,
|
|
lanChecker: lanChecker,
|
|
lanPriority: opts.ConnectionPriorityQUICLAN,
|
|
wanPriority: opts.ConnectionPriorityQUICWAN,
|
|
allowsMultiConns: true,
|
|
},
|
|
registry: registry,
|
|
}
|
|
}
|
|
|
|
func (quicDialerFactory) AlwaysWAN() bool {
|
|
return false
|
|
}
|
|
|
|
func (quicDialerFactory) Valid(_ config.Configuration) error {
|
|
// Always valid
|
|
return nil
|
|
}
|
|
|
|
func (quicDialerFactory) String() string {
|
|
return "QUIC Dialer"
|
|
}
|