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
42 lines
1.0 KiB
Go
42 lines
1.0 KiB
Go
// Copyright (C) 2015 Audrius Butkevicius and Contributors (see the CONTRIBUTORS file).
|
|
|
|
package client
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"fmt"
|
|
"net/url"
|
|
"time"
|
|
|
|
"github.com/syncthing/syncthing/lib/relay/protocol"
|
|
)
|
|
|
|
type relayClientFactory func(uri *url.URL, certs []tls.Certificate, invitations chan protocol.SessionInvitation, timeout time.Duration) RelayClient
|
|
|
|
var (
|
|
supportedSchemes = map[string]relayClientFactory{
|
|
"relay": newStaticClient,
|
|
"dynamic+http": newDynamicClient,
|
|
"dynamic+https": newDynamicClient,
|
|
}
|
|
)
|
|
|
|
type RelayClient interface {
|
|
Serve()
|
|
Stop()
|
|
Error() error
|
|
Latency() time.Duration
|
|
String() string
|
|
Invitations() chan protocol.SessionInvitation
|
|
URI() *url.URL
|
|
}
|
|
|
|
func NewClient(uri *url.URL, certs []tls.Certificate, invitations chan protocol.SessionInvitation, timeout time.Duration) (RelayClient, error) {
|
|
factory, ok := supportedSchemes[uri.Scheme]
|
|
if !ok {
|
|
return nil, fmt.Errorf("Unsupported scheme: %s", uri.Scheme)
|
|
}
|
|
|
|
return factory(uri, certs, invitations, timeout), nil
|
|
}
|