mirror of
https://github.com/octoleo/syncthing.git
synced 2024-09-19 21:29:01 +00:00
674fc566bb
1. Removes separate relay lists and relay clients/services, just makes it a listen address 2. Easier plugging-in of other transports 3. Allows "hot" disabling and enabling NAT services 4. Allows "hot" listen address changes 5. Changes listen address list with a preferable "default" value just like for discovery 6. Debounces global discovery announcements as external addresses change (which it might alot upon starting) 7. Stops this whole "pick other peers relay by latency". This information is no longer available, but I don't think it matters as most of the time other peer only has one relay. 8. Rename ListenAddress to ListenAddresses, as well as in javascript land. 9. Stop serializing deprecated values to JSON GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/2982
83 lines
1.8 KiB
Go
83 lines
1.8 KiB
Go
// Copyright (C) 2016 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 http://mozilla.org/MPL/2.0/.
|
|
|
|
package connections
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"net"
|
|
"net/url"
|
|
"time"
|
|
|
|
"github.com/syncthing/syncthing/lib/config"
|
|
"github.com/syncthing/syncthing/lib/dialer"
|
|
"github.com/syncthing/syncthing/lib/protocol"
|
|
"github.com/syncthing/syncthing/lib/relay/client"
|
|
)
|
|
|
|
const relayPriority = 200
|
|
|
|
func init() {
|
|
dialers["relay"] = newRelayDialer
|
|
}
|
|
|
|
type relayDialer struct {
|
|
cfg *config.Wrapper
|
|
tlsCfg *tls.Config
|
|
}
|
|
|
|
func (d *relayDialer) Dial(id protocol.DeviceID, uri *url.URL) (IntermediateConnection, error) {
|
|
inv, err := client.GetInvitationFromRelay(uri, id, d.tlsCfg.Certificates, 10*time.Second)
|
|
if err != nil {
|
|
return IntermediateConnection{}, err
|
|
}
|
|
|
|
conn, err := client.JoinSession(inv)
|
|
if err != nil {
|
|
return IntermediateConnection{}, err
|
|
}
|
|
|
|
err = dialer.SetTCPOptions(conn.(*net.TCPConn))
|
|
if err != nil {
|
|
conn.Close()
|
|
return IntermediateConnection{}, err
|
|
}
|
|
|
|
var tc *tls.Conn
|
|
if inv.ServerSocket {
|
|
tc = tls.Server(conn, d.tlsCfg)
|
|
} else {
|
|
tc = tls.Client(conn, d.tlsCfg)
|
|
}
|
|
|
|
err = tc.Handshake()
|
|
if err != nil {
|
|
tc.Close()
|
|
return IntermediateConnection{}, err
|
|
}
|
|
|
|
return IntermediateConnection{tc, "Relay (Client)", relayPriority}, nil
|
|
}
|
|
|
|
func (relayDialer) Priority() int {
|
|
return relayPriority
|
|
}
|
|
|
|
func (d *relayDialer) RedialFrequency() time.Duration {
|
|
return time.Duration(d.cfg.Options().RelayReconnectIntervalM) * time.Minute
|
|
}
|
|
|
|
func (d *relayDialer) String() string {
|
|
return "Relay Dialer"
|
|
}
|
|
|
|
func newRelayDialer(cfg *config.Wrapper, tlsCfg *tls.Config) genericDialer {
|
|
return &relayDialer{
|
|
cfg: cfg,
|
|
tlsCfg: tlsCfg,
|
|
}
|
|
}
|