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
108 lines
2.1 KiB
Go
108 lines
2.1 KiB
Go
// Copyright (C) 2014 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 main
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"errors"
|
|
"flag"
|
|
"fmt"
|
|
"net/url"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/syncthing/syncthing/lib/config"
|
|
"github.com/syncthing/syncthing/lib/discover"
|
|
"github.com/syncthing/syncthing/lib/protocol"
|
|
)
|
|
|
|
var timeout = 5 * time.Second
|
|
|
|
func main() {
|
|
var server string
|
|
|
|
flag.StringVar(&server, "server", "", "Announce server (blank for default set)")
|
|
flag.DurationVar(&timeout, "timeout", timeout, "Query timeout")
|
|
flag.Usage = usage
|
|
flag.Parse()
|
|
|
|
if flag.NArg() != 1 {
|
|
flag.Usage()
|
|
os.Exit(64)
|
|
}
|
|
|
|
id, err := protocol.DeviceIDFromString(flag.Args()[0])
|
|
if err != nil {
|
|
fmt.Println(err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
if server != "" {
|
|
checkServers(id, server)
|
|
} else {
|
|
checkServers(id, config.DefaultDiscoveryServers...)
|
|
}
|
|
}
|
|
|
|
type checkResult struct {
|
|
server string
|
|
addresses []string
|
|
error
|
|
}
|
|
|
|
func checkServers(deviceID protocol.DeviceID, servers ...string) {
|
|
t0 := time.Now()
|
|
resc := make(chan checkResult)
|
|
for _, srv := range servers {
|
|
srv := srv
|
|
go func() {
|
|
res := checkServer(deviceID, srv)
|
|
res.server = srv
|
|
resc <- res
|
|
}()
|
|
}
|
|
|
|
for _ = range servers {
|
|
res := <-resc
|
|
|
|
u, _ := url.Parse(res.server)
|
|
fmt.Printf("%s (%v):\n", u.Host, time.Since(t0))
|
|
|
|
if res.error != nil {
|
|
fmt.Println(" " + res.error.Error())
|
|
}
|
|
for _, addr := range res.addresses {
|
|
fmt.Println(" address:", addr)
|
|
}
|
|
}
|
|
}
|
|
|
|
func checkServer(deviceID protocol.DeviceID, server string) checkResult {
|
|
disco, err := discover.NewGlobal(server, tls.Certificate{}, nil)
|
|
if err != nil {
|
|
return checkResult{error: err}
|
|
}
|
|
|
|
res := make(chan checkResult, 1)
|
|
|
|
time.AfterFunc(timeout, func() {
|
|
res <- checkResult{error: errors.New("timeout")}
|
|
})
|
|
|
|
go func() {
|
|
addresses, err := disco.Lookup(deviceID)
|
|
res <- checkResult{addresses: addresses, error: err}
|
|
}()
|
|
|
|
return <-res
|
|
}
|
|
|
|
func usage() {
|
|
fmt.Printf("Usage:\n\t%s [options] <device ID>\n\nOptions:\n", os.Args[0])
|
|
flag.PrintDefaults()
|
|
}
|