Add support for multiple announce servers (fixes #677)

Somebody owes me a beer.

cmd/syncthing/main.go

@@ -826,7 +826,7 @@ func renewUPnP(port int) {
 		if forwardedPort != 0 {
 			externalPort = forwardedPort
 			discoverer.StopGlobal()
-			discoverer.StartGlobal(opts.GlobalAnnServer, uint16(forwardedPort))
+			discoverer.StartGlobal(opts.GlobalAnnServers, uint16(forwardedPort))
 			if debugNet {
 				l.Debugf("Updated UPnP port mapping for external port %d on device %s.", forwardedPort, igd.FriendlyIdentifier())
 			}
@@ -1098,7 +1098,7 @@ func discovery(extPort int) *discover.Discoverer {
 
 	if opts.GlobalAnnEnabled {
 		l.Infoln("Starting global discovery announcements")
-		disc.StartGlobal(opts.GlobalAnnServer, uint16(extPort))
+		disc.StartGlobal(opts.GlobalAnnServers, uint16(extPort))
 	}
 
 	return disc

gui/index.html

@@ -203,11 +203,17 @@
                     <th><span class="glyphicon glyphicon-dashboard"></span>&emsp;<span translate>CPU Utilization</span></th>
                     <td class="text-right">{{system.cpuPercent | alwaysNumber | natural:1}}%</td>
                   </tr>
-                  <tr ng-if="system.extAnnounceOK != undefined">
-                    <th><span class="glyphicon glyphicon-bullhorn"></span>&emsp;<span translate>Global Discovery Server</span></th>
+                  <tr ng-if="system.extAnnounceOK != undefined && announceServersTotal > 0">
+                    <th><span class="glyphicon glyphicon-bullhorn"></span>&emsp;<span translate>Global Discovery Servers</span></th>
                     <td class="text-right">
-                      <span class="data text-success" ng-if="system.extAnnounceOK"><span translate>Online</span></span>
-                      <span class="data text-danger" ng-if="!system.extAnnounceOK"><span translate>Offline</span></span>
+                      <span ng-if="announceServersFailed.length == 0" class="data text-success">
+                        <span>OK</span>
+                      </span>
+                      <span ng-if="announceServersFailed.length != 0" class="data text-danger">
+                        <span popover data-trigger="hover" data-placement="bottom" data-content="{{announceServersFailed.join('\n')}}">
+                          {{announceServersTotal-announceServersFailed.length}}/{{announceServersTotal}}
+                        </span>
+                      </span>
                     </td>
                   </tr>
                   <tr>
@@ -609,8 +615,8 @@
                   <input id="DeviceName" class="form-control" type="text" ng-model="tmpOptions.DeviceName">
                 </div>
                 <div class="form-group">
-                  <label translate for="ListenStr">Sync Protocol Listen Addresses</label>
-                  <input id="ListenStr" class="form-control" type="text" ng-model="tmpOptions.ListenStr">
+                  <label translate for="ListenAddressStr">Sync Protocol Listen Addresses</label>
+                  <input id="ListenAddressStr" class="form-control" type="text" ng-model="tmpOptions.ListenAddressStr">
                 </div>
                 <div class="form-group">
                   <label translate for="MaxRecvKbps">Incoming Rate Limit (KiB/s)</label>
@@ -653,8 +659,8 @@
                   </div>
                 </div>
                 <div class="form-group">
-                  <label translate for="GlobalAnnServer">Global Discovery Server</label>
-                  <input ng-disabled="!tmpOptions.GlobalAnnEnabled" id="GlobalAnnServer" class="form-control" type="text" ng-model="tmpOptions.GlobalAnnServer">
+                  <label translate for="GlobalAnnServersStr">Global Discovery Server</label>
+                  <input ng-disabled="!tmpOptions.GlobalAnnEnabled" id="GlobalAnnServersStr" class="form-control" type="text" ng-model="tmpOptions.GlobalAnnServersStr">
                 </div>
               </div>
 
@@ -865,6 +871,7 @@
   <script src="scripts/syncthing/core/directives/modalDirective.js"></script>
   <script src="scripts/syncthing/core/directives/uniqueFolderDirective.js"></script>
   <script src="scripts/syncthing/core/directives/validDeviceidDirective.js"></script>
+  <script src="scripts/syncthing/core/directives/popoverDirective.js"></script>
   <script src="scripts/syncthing/core/filters/alwaysNumberFilter.js"></script>
   <script src="scripts/syncthing/core/filters/basenameFilter.js"></script>
   <script src="scripts/syncthing/core/filters/binaryFilter.js"></script>

gui/scripts/syncthing/core/controllers/syncthingController.js

@@ -245,7 +245,8 @@ angular.module('syncthing.core')
             var hasConfig = !isEmptyObject($scope.config);
 
             $scope.config = config;
-            $scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', ');
+            $scope.config.Options.ListenAddressStr = $scope.config.Options.ListenAddress.join(', ');
+            $scope.config.Options.GlobalAnnServersStr = $scope.config.Options.GlobalAnnServers.join(', ');
 
             $scope.devices = $scope.config.Devices;
             $scope.devices.forEach(function (deviceCfg) {
@@ -272,6 +273,14 @@ angular.module('syncthing.core')
             $http.get(urlbase + '/system').success(function (data) {
                 $scope.myID = data.myID;
                 $scope.system = data;
+                $scope.announceServersTotal = Object.keys(data.extAnnounceOK).length;
+                var failed = [];
+                for (var server in data.extAnnounceOK) {
+                    if (!data.extAnnounceOK[server]) {
+                        failed.push(server);
+                    }
+                }
+                $scope.announceServersFailed = failed;
                 console.log("refreshSystem", data);
             });
         }
@@ -599,8 +608,11 @@ angular.module('syncthing.core')
                 $scope.thisDevice().Name = $scope.tmpOptions.DeviceName;
                 $scope.config.Options = angular.copy($scope.tmpOptions);
                 $scope.config.GUI = angular.copy($scope.tmpGUI);
-                $scope.config.Options.ListenAddress = $scope.config.Options.ListenStr.split(',').map(function (x) {
-                    return x.trim();
+
+                ['ListenAddress', 'GlobalAnnServers'].forEach(function (key) {
+                   $scope.config.Options[key] = $scope.config.Options[key + "Str"].split(/[ ,]+/).map(function (x) {
+                        return x.trim();
+                    });
                 });
 
                 $scope.saveConfig();

gui/scripts/syncthing/core/directives/popoverDirective.js

@@ -0,0 +1,9 @@
+angular.module('syncthing.core')
+    .directive('popover', function () {
+        return {
+            restrict: 'A',
+            link: function (scope, element, attributes) {
+                $(element).popover();
+            }
+        };
+});

internal/auto/gui.files.go

@@ -8,7 +8,7 @@ import (
 )
 
 func Assets() map[string][]byte {
-	var assets = make(map[string][]byte, 51)
+	var assets = make(map[string][]byte, 52)
 	var bs []byte
 	var gr *gzip.Reader
 
@@ -132,7 +132,7 @@ func Assets() map[string][]byte {
 	bs, _ = ioutil.ReadAll(gr)
 	assets["assets/lang/valid-langs.js"] = bs
 
-	bs, _ = base64.StdEncoding.DecodeString("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 truncated
+	bs, _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/+x96XbjttLg/zwFWt9N2p5jSXY66fnGsf0dL92Jk148ln0zmUzmHoiEJLS5NUHarTi+bzRPMS82VQBIgiQoUoudni8356QtkkABKBQKtaFw8Ozs/enVLxevyCzxvaMvDp71+18Mh+Q0jOYxn84SsnW6Tb7e3fuGXM0YGc0DJ5nxYEqO02QWxmIAhbH81YwLEsXhNKY+gZ+TmDEiwklyR2O2T+ZhShwakJi5XCQxH6cJIzwhNHCHYUz80OWTObxAUGngspgk0FrCYl+QcCIfvn93Tb5nAYupRy7Ssccd8oY7LBCMUGga34gZc8l4Lou/hg4gtJHuA3kdAmCa8DDYIYxDkZjcsljAM3mRtaEB7hDo0xZNsNsxCSOstI3AaDAnHk2Kqk3DL0bpEh5I2LMwghHNACqM+457Hhkzkgo2Sb0dAiXJz+dXP7y/vkJwx+9+IT8fX14ev7v65TsoDKiGAuyWKVDcjzwOkGFcMQ2SOXb/7avL0x+g/PHJ+Zvzq19gBAjo9fnVu1ejEXn9/pIck4vjy6vz0+s3x5fk4vry4v3o1YCMGGtD70TB8kPAossSyr182n+BeRXQOc8lM3rLYH4dxm+ha5Q4QEFd5s4LgymCwlFC4QKPA3I+IUGY7BABfTyYJUm0Pxze3d0NpkE6COPp0FMwxPBo8EW/D8SLNAwTFEwPeyzokWDap1F02BMZ1cpXThgkceh5LD7s5fR8mr/sEcejQhz2sKgX0pseAmbUPfqCkAMfxk+cGY0FSw57aTLp/3uv+IB97LOPKb897P2P/vVx/zT0I6C5sccALDTBAqh1/uqQuVNm1Auozw57t5zdRWGcGEXvuJvMDl12CyPty4cdoCeecOr1hUM9drg32K0BcplwYi7J1oBVK0blEq6V8HhwAxPpAd7gc+IA5XEHIc1iNoFaAoYuhtyfDif0Fr8MIsDs0RdYN+GJx44KLvEHub/HOT2TI3gHzW5tPzwcDFW5vDUFGcjbDePhOAwTWD00GjpCFE8DnwcDeNPTfUvmHoMFz5JeFY7u4QSGNQSKY3d0vlRFbDaEBR5zQGRTzYOhookvDsahO5eQXH5bpa9XMKbEoK2jgyGUUrgCTkuuwoiMaUyQevFdQG9z8qO3+EX96SdQUP902YSmHlAJwGSyHJ9KvibHo/uhgWBfKA+wZfkNvooI+HCpjf4YuIgLfYM5zb544TTsERE7pQnHt/2EfUr6L7+Rs05mDDeJw96Lr3tEEWtvb++/9oYwUGwobzWqNIlAyIy7Lgv6n0TvyE4mUV4/9QwAGSaMn3KvygcppxXngsOsphFwE5edB5OQfPUVMR4HAbszUCPrASdOYEtI5hHgVj3kHGGcBFl7+BP+70cx92k8l7+Fn60RxWeAPd3kzW9tl9qpTMTUm0czXEsk/9V3Zuw2hr9p1Muw+RXzRfSdBQwskEDgzlT86t9SL4V/1UZ12Lu/N0eOJUTy8NA7ulZvgRTJ/Ze69JcP5emTDQ0VNgwcAwMuY1yPxo3DyA3vgjJmqUbOv/Wq5YC6p1NkkbA/U/1gQmlHVQikSGNO+x4d41J95fIkx9rBkJY6UtBS3gGfBWl1fmBweZ/NCQURJhmxJAH+JnBWO/WuPIOVSTvKwBkdLiN3YYe4q9ZNp858jJ3QZW39mYV35PysrTs5GvktsErJ3Tp3WszSBFHfqdPhZNLaYwVuNQzGsBZonHTqC1SG4rOW/lwqiI+JQToGobBTl2GnipM+86Nk3tLtY4S5oNMHw9SzM4Dii97i8AcwS7WvNWxJqjxuhK95LBLY0e5A9g68OQqVdwHhIACCRCkEsNjviMYpir0BChd60yx2XuT2zwD+hE/PAxRCck4DgIsdsNQZr++7/b2vza3D+A54YB6R//Z1s2WmVi2LuHZlqYPZC4Mtl8pI6aeX0Qh5x5jLXBAoXhzluGtuAMWNKquKjClENU3hII2lWACSuQBdA3QHQVE0R10DxGpCnYTfQg13YKh1forToDuWhHkhKcbDdlkGPTC26NLUN3d/AvJcZc/tsOuq7VX+0eIPaHyep7f9J13J1V2wRlIerLYJ/9SzTGb5RenReChkxPLiYNPUA4kQaLlC+iUiz+DJiqGHujRoxqDHowjpsUmyXdS2LoaXi9ZCfxqHIJAQ7h72JhK6WLwg9OLJhVaYqphFjCZZfdSP1a830M26mNS4wsrSAnTeo5HIhIgIVH5Uaf4t62QmfKjn/v3933jgsk8gAREp1wOENBZhvE+ikAd1EoWewIK2LeNKsQ6S3cx1K0R3f6/6NTg/e3hYDLCg+0J+JlImz4CcYsEt9XsbBwg4F6BeO7MM56OEJmlexDKEulyZw+jfzRiIk2lwE0jh7Fr9qAuM3SEJ0KeZi6DUr9VhCSDyCEGN1I81IDk0UOx+pH+1wapBAKZa3S8a25c688JGCNm6v0eYFyx2gLbplG3lRAPT/OW2rWdL9pm7Voq2dfgcij5Rb+3v5YZZ5hVVhqvZR8GsSuu+tJgz/kEKRiJ3FVnkngf7RFUkh4eHZPehzh26bNSyYELHXi4QqAf5LxoOXLRnufoZTYiSmG2oSjKzg+1bbP+An2bt+6JGVRixoGVv1PvLBU1m+f4ILTQ27ubDRn6ldfac9yEYaRxyG8Y1bBoYjDiT/3zQbrxfc1L7bcADUIS5HYudUaJlv77g0zacvIrjMF4HG00jWBk1a4186oXjNnXxeyhDPYK7CtvoyKcS8GvuMUH+INS7o3PxLvXHLH54qDEknkDndPM75J+N4E7miQQ35gGoFQ8PJ38GWmeh34bVN6HzKEj1EO7GcCqhbQqljYs4ABVJdfmI7K63lB0vTN0+2gq8kFblsOr434Ou9H4i9aPV56ChtDSJmQaR8A41QWObzM2JtmksULKBWURglkmkjSNdb351y5cgyb8HbX+9CQUKvOm2T72lAgT7x5jISnu/MLFINNoU/s6nQRizC/SSrofCNHBmzLlhbctBNUiwRS7QUCz+8yAT9HwQ9M9R9YPtdkSeHZKXa7KazgYGdI1nLW9AkKoMBTiCWB5H8N4uYsIHFE/r4nhN+O5s/5FFtQ2owepDgyn6Zu0MBP06LXuGwWkz356V07avlajLvqGbIKcz7LhYaD2So7er+HbZfzGmMkuLYTHGvcWq++PYQaMhz1Hxe14xpAENKcZpImqzVN+Kl1VGa/hpSv3v0nnQeRzutYn4ALl9RpuU2W62woYltZRNsdzYJIx9bb6zeTxXsbZS19UY7oRbLxVt/gfX1UbLBfjthMHq4yzOqtxywaV67feGFeuraTtVPjXDdipHXzaeShc+hqyoCI11DKsL7KQK+OlkiqbSXws/+db2bx2dEU2mUm0T1fElCLmjNbSjLfQAWGCQSDKQPZAuaWNAAzWQ8zOcvrxsbhN1i3CAvMp2xT5atQLZXRBoASqNcrHtBxDdaoa2mnc2YdxpNu00Kp2bV3zOdDFy2UX9bBRIoN2AOegqEr8+T8KEes/RnjGOSorGUKC10Fr2PJBqyRU+mlW2mwSaRnFmA7jrtPVfR4+FtzBNuiMONNfPAnNJqyBw/JZcJ9zjv0uX4uo4E3PQ7vwB/OliiXic0bpUzMYhjduI5PTieqODdqJUG9or1gB4DEDei6m3v/fw8OUK2MhEbt0StH4cBCFojOz9T6gkYbjuhAfA2EAIp/rTCDQPFmviazbZdMLpGESPWRi32V21EfKMCwcF/DnRfVgVt026V+Y3QZxUhvuagrrhDjwWTJMZitW7RagTbH/KSydSByMa2hTgo/c/tWm9C7927uYzeze1wtWmpkdhhNjWAgagbophjzN8l3liPeowXzpjxyGIcr5+n0ed3t/b+/cBJI+t5/8reI4+zOZ+EFIDIMmuv2jUDw9Dey2L97Ujwhd8fWKOS9vCzf6uovxW5zo6TLDZI2EfWYNJwWpQ6KjoFM8oi18yP0yYlsaFKY7bJDgjlEHXWDmUoSSih3i4QEm2YuPxDFlPK7L7o8YzPL4UL5spe6SzBrS9oqja6xIJoYvLSAiz1QWxDjVfeID+647e8OsIo6XOCqGPbO3t7m7EJ79OHIESD/3IYyhm/Fqfst8G/0i0hBhIgWF/d8VQguZQChe3ZCmior5zZjytEzSSChUygn8fM3DAssBaAgc+79CATCgwtQYLXTyhk205XbOj1mQj9Q6Kp63a0jpoR8fDE8zAxjXWNbDfRX211Vtek31Mxz0eF2o3YsYg4a+DS4UHBFTavdYkuGcFevFgGnayODa0Ij4cDajVd3gNLNJotSN2ahHUJp7ehWsipMDHOR7RclNngcrT0dwBu6ion9mpeVLz9jaBCOki/Xx50eY0kjXYz6nHQTL9e5vm0nUpPSrC2Jx1Cb97Q0WCh2OXX0zZKAQI13Z0IewRgD6jaE/7g3QseXRIXrz8tmddrewWqb0J7aqLmbGpW2sHjY3d37eDgL0E9Bm235vDf/23b/uuS374Yd/3e2uTh2pWebJMBSQzuqwdxVQPIbfHvGxgF7KMQppmejukt9Ke9OSRBU2+9QO6mldZu98MlfQxHMv06C/iQl7i9GJHF7KCuFEXcu18jrI4DcuncfCVDAAW9tNpDL+pcy4mK/iTj6nZrEBVtL4LExOl65xVM+xmgA+0mBlowZZ96nnAfuDt4Ir7LOfTyJv3hQD2vA8dkaXI/f0kho3d9eaZxQ2ryTkoHyG3k/4GzqcZZqgmNlKQuyQ2RSHdTr62KRu5m+BpT6aV1kB+pDPPY4CvT6S1v1t6g4xH6EfoJHP7yl1gZgn4or4wavkNmjIFlJMDGLxfF5GKnWb4OteINFylsWCDPIPIIGDJsL46RmmEmTvIkLwO49RvPEHbqWUBTU85aBLjAWhXw7xt41fMYC4FGqzrMiEe7CeXqsB6HVmAAgeamYbxfOiGToreHZ2Bom7bMT4/Olq4EKkNKLine truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	assets["index.html"] = bs
@@ -162,7 +162,7 @@ func Assets() map[string][]byte {
 	bs, _ = ioutil.ReadAll(gr)
 	assets["scripts/syncthing/core/controllers/eventController.js"] = bs
 
-	bs, _ = base64.StdEncoding.DecodeString("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 truncated
+	bs, _ = base64.StdEncoding.DecodeString("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 truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	assets["scripts/syncthing/core/controllers/syncthingController.js"] = bs
@@ -177,6 +177,11 @@ func Assets() map[string][]byte {
 	bs, _ = ioutil.ReadAll(gr)
 	assets["scripts/syncthing/core/directives/modalDirective.js"] = bs
 
+	bs, _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/1yOQc6DIBCF955iFn8CJIQD6Oo/isWpJcXBDINJ03j3Ymsa7bfjvY+X6WkssWc3paFE1Co/yMst0Oh8YlSmgYobAqOXsFRhTnNakJWFa6lqSATawPPtbTBKYToEnzALBy8tqH9lT1UMdG8PW9mnGS1gxAlJLPRSf16KYDY/oxt/eheN2w/TpjtZ6/e1ds1ayxcAAAD//wEAAP///ZZiOfIAAAA=")
+	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
+	bs, _ = ioutil.ReadAll(gr)
+	assets["scripts/syncthing/core/directives/popoverDirective.js"] = bs
+
 	bs, _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/7SSP28CMQzFdz6Fh0oH0insMLdbV5aqQ3TxcVZDArYDRRXfvQmHgPKnrVT1LSfZfu9+tmLDPHnLZhFd8jisZBsa7SjMTRMZq9EAsowjxkZpnQdSoFXCp+gdclVDm/I8xQDDEXzsh4sYNXE4K/TFVco5E6jC/Dk69FX9pe8pvE3OAqWJS6wB/aIGq8pSQ6PsRxexRaVuHpaWBVlMCtJRq8NT1JpwM7M+4S1zEbWH/xl0pHn9x3eS8r1nKBqPYYMgXUzehUphbT05q3jX0GMK6qxMkm6vzqmcGac3A3b5EoJnpO3eJC/H5V5/gNUOoTcBlvUErGe0bvsH4NZmqO+Jf8tEAn34P93vZvXwUo83vPbuLvJOObvpoDQ/AQAA//8BAAD//3zSfX5DAwAA")
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)

internal/config/config.go

@@ -160,7 +160,7 @@ type FolderDeviceConfiguration struct {
 
 type OptionsConfiguration struct {
 	ListenAddress           []string `xml:"listenAddress" default:"0.0.0.0:22000"`
-	GlobalAnnServer         string   `xml:"globalAnnounceServer" default:"announce.syncthing.net:22026"`
+	GlobalAnnServers        []string `xml:"globalAnnounceServer" default:"announce.syncthing.net:22026"`
 	GlobalAnnEnabled        bool     `xml:"globalAnnounceEnabled" default:"true"`
 	LocalAnnEnabled         bool     `xml:"localAnnounceEnabled" default:"true"`
 	LocalAnnPort            int      `xml:"localAnnouncePort" default:"21025"`
@@ -239,8 +239,6 @@ func (cfg *Configuration) WriteXML(w io.Writer) error {
 func (cfg *Configuration) prepare(myID protocol.DeviceID) {
 	fillNilSlices(&cfg.Options)
 
-	cfg.Options.ListenAddress = uniqueStrings(cfg.Options.ListenAddress)
-
 	// Initialize an empty slice for folders if the config has none
 	if cfg.Folders == nil {
 		cfg.Folders = []FolderConfiguration{}
@@ -362,6 +360,9 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
 			n.Addresses = []string{"dynamic"}
 		}
 	}
+
+	cfg.Options.ListenAddress = uniqueStrings(cfg.Options.ListenAddress)
+	cfg.Options.GlobalAnnServers = uniqueStrings(cfg.Options.GlobalAnnServers)
 }
 
 // ChangeRequiresRestart returns true if updating the configuration requires a
@@ -469,8 +470,8 @@ func convertV2V3(cfg *Configuration) {
 
 	// The global discovery format and port number changed in v0.9. Having the
 	// default announce server but old port number is guaranteed to be legacy.
-	if cfg.Options.GlobalAnnServer == "announce.syncthing.net:22025" {
-		cfg.Options.GlobalAnnServer = "announce.syncthing.net:22026"
+	if len(cfg.Options.GlobalAnnServers) == 1 && cfg.Options.GlobalAnnServers[0] == "announce.syncthing.net:22025" {
+		cfg.Options.GlobalAnnServers = []string{"announce.syncthing.net:22026"}
 	}
 
 	cfg.Version = 3

internal/config/config_test.go

@@ -36,7 +36,7 @@ func init() {
 func TestDefaultValues(t *testing.T) {
 	expected := OptionsConfiguration{
 		ListenAddress:           []string{"0.0.0.0:22000"},
-		GlobalAnnServer:         "announce.syncthing.net:22026",
+		GlobalAnnServers:        []string{"announce.syncthing.net:22026"},
 		GlobalAnnEnabled:        true,
 		LocalAnnEnabled:         true,
 		LocalAnnPort:            21025,
@@ -138,7 +138,7 @@ func TestNoListenAddress(t *testing.T) {
 func TestOverriddenValues(t *testing.T) {
 	expected := OptionsConfiguration{
 		ListenAddress:           []string{":23000"},
-		GlobalAnnServer:         "syncthing.nym.se:22026",
+		GlobalAnnServers:        []string{"syncthing.nym.se:22026"},
 		GlobalAnnEnabled:        false,
 		LocalAnnEnabled:         false,
 		LocalAnnPort:            42123,
@@ -163,7 +163,7 @@ func TestOverriddenValues(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(cfg.Options(), expected) {
-		t.Errorf("Overridden config differs;\n  E: %#v\n  A: %#v", expected, cfg.Options)
+		t.Errorf("Overridden config differs;\n  E: %#v\n  A: %#v", expected, cfg.Options())
 	}
 }
 

internal/discover/discover.go

@@ -42,13 +42,13 @@ type Discoverer struct {
 	multicastBeacon  beacon.Interface
 	registry         map[protocol.DeviceID][]CacheEntry
 	registryLock     sync.RWMutex
-	extServer        string
+	extServers       []string
 	extPort          uint16
 	localBcastTick   <-chan time.Time
 	stopGlobal       chan struct{}
 	globalWG         sync.WaitGroup
 	forcedBcastTick  chan time.Time
-	extAnnounceOK    bool
+	extAnnounceOK    map[string]bool
 	extAnnounceOKmut sync.Mutex
 }
 
@@ -70,6 +70,7 @@ func NewDiscoverer(id protocol.DeviceID, addresses []string) *Discoverer {
 		errorRetryIntv:  60 * time.Second,
 		cacheLifetime:   5 * time.Minute,
 		registry:        make(map[protocol.DeviceID][]CacheEntry),
+		extAnnounceOK:   make(map[string]bool),
 	}
 }
 
@@ -110,14 +111,26 @@ func (d *Discoverer) StartLocal(localPort int, localMCAddr string) {
 	}
 }
 
-func (d *Discoverer) StartGlobal(server string, extPort uint16) {
+func (d *Discoverer) StartGlobal(servers []string, extPort uint16) {
 	// Wait for any previous announcer to stop before starting a new one.
 	d.globalWG.Wait()
-	d.extServer = server
+	d.extServers = servers
 	d.extPort = extPort
 	d.stopGlobal = make(chan struct{})
 	d.globalWG.Add(1)
-	go d.sendExternalAnnouncements()
+	go func() {
+		defer d.globalWG.Done()
+
+		buf := d.announcementPkt()
+
+		for _, extServer := range d.extServers {
+			d.globalWG.Add(1)
+			go func(server string) {
+				d.sendExternalAnnouncements(server, buf)
+				d.globalWG.Done()
+			}(extServer)
+		}
+	}()
 }
 
 func (d *Discoverer) StopGlobal() {
@@ -127,7 +140,7 @@ func (d *Discoverer) StopGlobal() {
 	}
 }
 
-func (d *Discoverer) ExtAnnounceOK() bool {
+func (d *Discoverer) ExtAnnounceOK() map[string]bool {
 	d.extAnnounceOKmut.Lock()
 	defer d.extAnnounceOKmut.Unlock()
 	return d.extAnnounceOK
@@ -144,7 +157,7 @@ func (d *Discoverer) Lookup(device protocol.DeviceID) []string {
 			addrs[i] = cached[i].Address
 		}
 		return addrs
-	} else if len(d.extServer) != 0 && time.Since(d.localBcastStart) > d.localBcastIntv {
+	} else if len(d.extServers) != 0 && time.Since(d.localBcastStart) > d.localBcastIntv {
 		// Only perform external lookups if we have at least one external
 		// server and one local announcement interval has passed. This is to
 		// avoid finding local peers on their remote address at startup.
@@ -188,20 +201,24 @@ func (d *Discoverer) All() map[protocol.DeviceID][]CacheEntry {
 
 func (d *Discoverer) announcementPkt() []byte {
 	var addrs []Address
-	for _, astr := range d.listenAddrs {
-		addr, err := net.ResolveTCPAddr("tcp", astr)
-		if err != nil {
-			l.Warnln("%v: not announcing %s", err, astr)
-			continue
-		} else if debug {
-			l.Debugf("discover: announcing %s: %#v", astr, addr)
-		}
-		if len(addr.IP) == 0 || addr.IP.IsUnspecified() {
-			addrs = append(addrs, Address{Port: uint16(addr.Port)})
-		} else if bs := addr.IP.To4(); bs != nil {
-			addrs = append(addrs, Address{IP: bs, Port: uint16(addr.Port)})
-		} else if bs := addr.IP.To16(); bs != nil {
-			addrs = append(addrs, Address{IP: bs, Port: uint16(addr.Port)})
+	if d.extPort != 0 {
+		addrs = []Address{{Port: d.extPort}}
+	} else {
+		for _, astr := range d.listenAddrs {
+			addr, err := net.ResolveTCPAddr("tcp", astr)
+			if err != nil {
+				l.Warnln("%v: not announcing %s", err, astr)
+				continue
+			} else if debug {
+				l.Debugf("discover: announcing %s: %#v", astr, addr)
+			}
+			if len(addr.IP) == 0 || addr.IP.IsUnspecified() {
+				addrs = append(addrs, Address{Port: uint16(addr.Port)})
+			} else if bs := addr.IP.To4(); bs != nil {
+				addrs = append(addrs, Address{IP: bs, Port: uint16(addr.Port)})
+			} else if bs := addr.IP.To16(); bs != nil {
+				addrs = append(addrs, Address{IP: bs, Port: uint16(addr.Port)})
+			}
 		}
 	}
 	var pkt = Announce{
@@ -235,44 +252,43 @@ func (d *Discoverer) sendLocalAnnouncements() {
 	}
 }
 
-func (d *Discoverer) sendExternalAnnouncements() {
-	defer d.globalWG.Done()
-
-	remote, err := net.ResolveUDPAddr("udp", d.extServer)
-	for err != nil {
-		l.Warnf("Global discovery: %v; trying again in %v", err, d.errorRetryIntv)
-		time.Sleep(d.errorRetryIntv)
-		remote, err = net.ResolveUDPAddr("udp", d.extServer)
-	}
+func (d *Discoverer) sendExternalAnnouncements(extServer string, buf []byte) {
+	timer := time.NewTimer(0)
 
 	conn, err := net.ListenUDP("udp", nil)
 	for err != nil {
+		timer.Reset(d.errorRetryIntv)
 		l.Warnf("Global discovery: %v; trying again in %v", err, d.errorRetryIntv)
-		time.Sleep(d.errorRetryIntv)
+		select {
+		case <-d.stopGlobal:
+			return
+		case <-timer.C:
+		}
 		conn, err = net.ListenUDP("udp", nil)
 	}
 
-	var buf []byte
-	if d.extPort != 0 {
-		var pkt = Announce{
-			Magic: AnnouncementMagic,
-			This:  Device{d.myID[:], []Address{{Port: d.extPort}}},
+	remote, err := net.ResolveUDPAddr("udp", extServer)
+	for err != nil {
+		timer.Reset(d.errorRetryIntv)
+		l.Warnf("Global discovery: %s: %v; trying again in %v", extServer, err, d.errorRetryIntv)
+		select {
+		case <-d.stopGlobal:
+			return
+		case <-timer.C:
 		}
-		buf = pkt.MustMarshalXDR()
-	} else {
-		buf = d.announcementPkt()
+		remote, err = net.ResolveUDPAddr("udp", extServer)
 	}
 
 	// Delay the first announcement until after a full local announcement
 	// cycle, to increase the chance of other peers finding us locally first.
-	nextAnnouncement := time.NewTimer(d.localBcastIntv)
+	timer.Reset(d.localBcastIntv)
 
 	for {
 		select {
 		case <-d.stopGlobal:
 			return
 
-		case <-nextAnnouncement.C:
+		case <-timer.C:
 			var ok bool
 
 			if debug {
@@ -282,28 +298,29 @@ func (d *Discoverer) sendExternalAnnouncements() {
 			_, err := conn.WriteTo(buf, remote)
 			if err != nil {
 				if debug {
-					l.Debugln("discover: warning:", err)
+					l.Debugln("discover: %s: warning:", extServer, err)
 				}
 				ok = false
 			} else {
 				// Verify that the announce server responds positively for our device ID
 
 				time.Sleep(1 * time.Second)
-				res := d.externalLookup(d.myID)
+				res := d.externalLookupOnServer(extServer, d.myID)
+
 				if debug {
-					l.Debugln("discover: external lookup check:", res)
+					l.Debugln("discover:", extServer, "external lookup check:", res)
 				}
 				ok = len(res) > 0
 			}
 
 			d.extAnnounceOKmut.Lock()
-			d.extAnnounceOK = ok
+			d.extAnnounceOK[extServer] = ok
 			d.extAnnounceOKmut.Unlock()
 
 			if ok {
-				nextAnnouncement.Reset(d.globalBcastIntv)
+				timer.Reset(d.globalBcastIntv)
 			} else {
-				nextAnnouncement.Reset(d.errorRetryIntv)
+				timer.Reset(d.errorRetryIntv)
 			}
 		}
 	}
@@ -390,10 +407,39 @@ func (d *Discoverer) registerDevice(addr net.Addr, device Device) bool {
 }
 
 func (d *Discoverer) externalLookup(device protocol.DeviceID) []string {
-	extIP, err := net.ResolveUDPAddr("udp", d.extServer)
+	// Buffer up to as many answers as we have servers to query.
+	results := make(chan []string, len(d.extServers))
+
+	// Query all servers.
+	wg := sync.WaitGroup{}
+	for _, extServer := range d.extServers {
+		wg.Add(1)
+		go func(server string) {
+			result := d.externalLookupOnServer(server, device)
+			if debug {
+				l.Debugln("discover:", result, "from", server, "for", device)
+			}
+			results <- result
+			wg.Done()
+		}(extServer)
+	}
+
+	wg.Wait()
+	close(results)
+
+	addrs := []string{}
+	for result := range results {
+		addrs = append(addrs, result...)
+	}
+
+	return addrs
+}
+
+func (d *Discoverer) externalLookupOnServer(extServer string, device protocol.DeviceID) []string {
+	extIP, err := net.ResolveUDPAddr("udp", extServer)
 	if err != nil {
 		if debug {
-			l.Debugf("discover: %v; no external lookup", err)
+			l.Debugf("discover: %s: %v; no external lookup", extServer, err)
 		}
 		return nil
 	}
@@ -401,7 +447,7 @@ func (d *Discoverer) externalLookup(device protocol.DeviceID) []string {
 	conn, err := net.DialUDP("udp", nil, extIP)
 	if err != nil {
 		if debug {
-			l.Debugf("discover: %v; no external lookup", err)
+			l.Debugf("discover: %s: %v; no external lookup", extServer, err)
 		}
 		return nil
 	}
@@ -410,7 +456,7 @@ func (d *Discoverer) externalLookup(device protocol.DeviceID) []string {
 	err = conn.SetDeadline(time.Now().Add(5 * time.Second))
 	if err != nil {
 		if debug {
-			l.Debugf("discover: %v; no external lookup", err)
+			l.Debugf("discover: %s: %v; no external lookup", extServer, err)
 		}
 		return nil
 	}
@@ -419,7 +465,7 @@ func (d *Discoverer) externalLookup(device protocol.DeviceID) []string {
 	_, err = conn.Write(buf)
 	if err != nil {
 		if debug {
-			l.Debugf("discover: %v; no external lookup", err)
+			l.Debugf("discover: %s: %v; no external lookup", extServer, err)
 		}
 		return nil
 	}
@@ -432,20 +478,20 @@ func (d *Discoverer) externalLookup(device protocol.DeviceID) []string {
 			return nil
 		}
 		if debug {
-			l.Debugf("discover: %v; no external lookup", err)
+			l.Debugf("discover: %s: %v; no external lookup", extServer, err)
 		}
 		return nil
 	}
 
 	if debug {
-		l.Debugf("discover: read external:\n%s", hex.Dump(buf[:n]))
+		l.Debugf("discover: %s: read external:\n%s", extServer, hex.Dump(buf[:n]))
 	}
 
 	var pkt Announce
 	err = pkt.UnmarshalXDR(buf[:n])
 	if err != nil && err != io.EOF {
 		if debug {
-			l.Debugln("discover:", err)
+			l.Debugln("discover:", extServer, err)
 		}
 		return nil
 	}

internal/model/model.go

@@ -1125,7 +1125,9 @@ func (m *Model) ScanFolderSub(folder, sub string) error {
 
 			if (ignores != nil && ignores.Match(f.Name)) || symlinkInvalid(f.IsSymlink()) {
 				// File has been ignored or an unsupported symlink. Set invalid bit.
-				l.Debugln("setting invalid bit on ignored", f)
+				if debug {
+					l.Debugln("setting invalid bit on ignored", f)
+				}
 				nf := protocol.FileInfo{
 					Name:     f.Name,
 					Flags:    f.Flags | protocol.FlagInvalid,