Discovery clients now take an announcer, global discovery is delayed

2015-07-23 20:01:25 +01:00
parent 8f2db99c86
commit 687fbb0a7e
7 changed files with 62 additions and 32 deletions
--- a/cmd/syncthing/connections.go
+++ b/cmd/syncthing/connections.go
@@ -250,11 +250,8 @@ func (s *connectionSvc) connect() {
 				if addr == "dynamic" {
 					if discoverer != nil {
 						t, r := discoverer.Lookup(deviceID)
-						relays = append(relays, r...)
-						if len(t) == 0 {
-							continue
-						}
 						addrs = append(addrs, t...)
+						relays = append(relays, r...)
 					}
 				} else {
 					addrs = append(addrs, addr)