Fix build on Solaris

Conflicts:
	internal/config/config_test.go

CONTRIBUTING.md

@@ -39,6 +39,17 @@ attention. In general, any open issues are fair game! Be prepared for a
 review](https://discourse.syncthing.net/t/733); it's all in the name of
 quality. :)
 
+You may be asked to "rebase" or "squash" your pull request before it's
+accepted. This means to make sure that the pull request:
+
+ - Is based on the latest commit on `master`.
+
+ - Only contains a single commit (exceptions to be made where
+   appropriate).
+
+ - Has a descriptive commit message, ending in `(fixes #123)` if it
+   resolves an existing issue.
+
 ## Licensing
 
 All contributions are made under the same MIT License as the rest of the

build.go

@@ -67,75 +67,62 @@ func main() {
 
 	checkRequiredGoVersion()
 
-	if check() != nil {
-		setup()
-	}
-
 	if flag.NArg() == 0 {
 		install("./cmd/...")
 		return
 	}
 
-	switch flag.Arg(0) {
-	case "install":
-		pkg := "./cmd/..."
-		if flag.NArg() > 2 {
-			pkg = flag.Arg(1)
+	for _, cmd := range flag.Args() {
+		switch cmd {
+		case "setup":
+			setup()
+
+		case "install":
+			pkg := "./cmd/..."
+			install(pkg)
+
+		case "build":
+			pkg := "./cmd/syncthing"
+			var tags []string
+			if noupgrade {
+				tags = []string{"noupgrade"}
+			}
+			build(pkg, tags)
+
+		case "test":
+			pkg := "./..."
+			test(pkg)
+
+		case "assets":
+			assets()
+
+		case "xdr":
+			xdr()
+
+		case "translate":
+			translate()
+
+		case "transifex":
+			transifex()
+
+		case "deps":
+			deps()
+
+		case "tar":
+			buildTar()
+
+		case "zip":
+			buildZip()
+
+		case "clean":
+			clean()
+
+		default:
+			log.Fatalf("Unknown command %q", cmd)
 		}
-		install(pkg)
-
-	case "build":
-		pkg := "./cmd/syncthing"
-		if flag.NArg() > 2 {
-			pkg = flag.Arg(1)
-		}
-		var tags []string
-		if noupgrade {
-			tags = []string{"noupgrade"}
-		}
-		build(pkg, tags)
-
-	case "test":
-		pkg := "./..."
-		if flag.NArg() > 2 {
-			pkg = flag.Arg(1)
-		}
-		test(pkg)
-
-	case "assets":
-		assets()
-
-	case "xdr":
-		xdr()
-
-	case "translate":
-		translate()
-
-	case "transifex":
-		transifex()
-
-	case "deps":
-		deps()
-
-	case "tar":
-		buildTar()
-
-	case "zip":
-		buildZip()
-
-	case "clean":
-		clean()
-
-	default:
-		log.Fatalf("Unknown command %q", flag.Arg(0))
 	}
 }
 
-func check() error {
-	_, err := exec.LookPath("godep")
-	return err
-}
-
 func checkRequiredGoVersion() {
 	ver := run("go", "version")
 	re := regexp.MustCompile(`go version go(\d+\.\d+)`)
@@ -163,24 +150,25 @@ func setup() {
 }
 
 func test(pkg string) {
-	runPrint("godep", "go", "test", "-short", "-timeout", "10s", pkg)
+	setBuildEnv()
+	runPrint("go", "test", "-short", "-timeout", "10s", pkg)
 }
 
 func install(pkg string) {
 	os.Setenv("GOBIN", "./bin")
 	setBuildEnv()
-	runPrint("godep", "go", "install", "-ldflags", ldflags(), pkg)
+	runPrint("go", "install", "-ldflags", ldflags(), pkg)
 }
 
 func build(pkg string, tags []string) {
 	rmr("syncthing", "syncthing.exe")
-	args := []string{"go", "build", "-ldflags", ldflags()}
+	args := []string{"build", "-ldflags", ldflags()}
 	if len(tags) > 0 {
 		args = append(args, "-tags", strings.Join(tags, ","))
 	}
 	args = append(args, pkg)
 	setBuildEnv()
-	runPrint("godep", args...)
+	runPrint("go", args...)
 }
 
 func buildTar() {
@@ -230,14 +218,22 @@ func setBuildEnv() {
 	if goarch == "386" {
 		os.Setenv("GO386", "387")
 	}
+	wd, err := os.Getwd()
+	if err != nil {
+		log.Println("Warning: can't determine current dir:", err)
+		log.Println("Build might not work as expected")
+	}
+	os.Setenv("GOPATH", fmt.Sprintf("%s%c%s", filepath.Join(wd, "Godeps", "_workspace"), os.PathListSeparator, os.Getenv("GOPATH")))
+	log.Println("GOPATH=" + os.Getenv("GOPATH"))
 }
 
 func assets() {
-	runPipe("auto/gui.files.go", "godep", "go", "run", "cmd/genassets/main.go", "gui")
+	setBuildEnv()
+	runPipe("internal/auto/gui.files.go", "go", "run", "cmd/genassets/main.go", "gui")
 }
 
 func xdr() {
-	for _, f := range []string{"discover/packets", "files/leveldb", "protocol/message"} {
+	for _, f := range []string{"internal/discover/packets", "internal/files/leveldb", "internal/protocol/message"} {
 		runPipe(f+"_xdr.go", "go", "run", "./Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go", "--", f+".go")
 	}
 }

cmd/stindex/main.go

@@ -10,8 +10,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/syncthing/syncthing/files"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

cmd/syncthing/gui.go

@@ -21,13 +21,13 @@ import (
 	"time"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/syncthing/syncthing/auto"
-	"github.com/syncthing/syncthing/config"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/logger"
-	"github.com/syncthing/syncthing/model"
-	"github.com/syncthing/syncthing/protocol"
-	"github.com/syncthing/syncthing/upgrade"
+	"github.com/syncthing/syncthing/internal/auto"
+	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/logger"
+	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/syncthing/internal/upgrade"
 	"github.com/vitrun/qart/qr"
 )
 

cmd/syncthing/gui_auth.go

@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/internal/config"
 )
 
 var (

cmd/syncthing/gui_csrf.go

@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/osutil"
+	"github.com/syncthing/syncthing/internal/osutil"
 )
 
 var csrfTokens []string

cmd/syncthing/main.go

@@ -27,15 +27,15 @@ import (
 
 	"code.google.com/p/go.crypto/bcrypt"
 	"github.com/juju/ratelimit"
-	"github.com/syncthing/syncthing/config"
-	"github.com/syncthing/syncthing/discover"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/files"
-	"github.com/syncthing/syncthing/logger"
-	"github.com/syncthing/syncthing/model"
-	"github.com/syncthing/syncthing/protocol"
-	"github.com/syncthing/syncthing/upgrade"
-	"github.com/syncthing/syncthing/upnp"
+	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/discover"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/syncthing/internal/logger"
+	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/syncthing/internal/upgrade"
+	"github.com/syncthing/syncthing/internal/upnp"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
@@ -620,6 +620,10 @@ nextRepo:
 		go standbyMonitor()
 	}
 
+	if cfg.Options.AutoUpgradeIntervalH > 0 {
+		go autoUpgrade()
+	}
+
 	events.Default.Log(events.StartupComplete, nil)
 	go generateEvents()
 
@@ -1172,3 +1176,36 @@ func standbyMonitor() {
 		now = time.Now()
 	}
 }
+
+func autoUpgrade() {
+	var skipped bool
+	interval := time.Duration(cfg.Options.AutoUpgradeIntervalH) * time.Hour
+	for {
+		if skipped {
+			time.Sleep(interval)
+		} else {
+			skipped = true
+		}
+
+		rel, err := upgrade.LatestRelease(strings.Contains(Version, "-beta"))
+		if err != nil {
+			l.Warnln("Automatic upgrade:", err)
+			continue
+		}
+
+		if upgrade.CompareVersions(rel.Tag, Version) <= 0 {
+			continue
+		}
+
+		l.Infof("Automatic upgrade (current %q < latest %q)", Version, rel.Tag)
+		err = upgrade.UpgradeTo(rel, GoArchExtra)
+		if err != nil {
+			l.Warnln("Automatic upgrade:", err)
+			continue
+		}
+		l.Warnf("Automatically upgraded to version %q. Restarting in 1 minute.", rel.Tag)
+		time.Sleep(time.Minute)
+		stop <- exitUpgrading
+		return
+	}
+}

cmd/syncthing/perfstats_unix.go

@@ -12,6 +12,8 @@ import (
 	"runtime"
 	"syscall"
 	"time"
+
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 func init() {
@@ -30,6 +32,7 @@ func savePerfStats(file string) {
 	var prevTime int64
 	var rusage syscall.Rusage
 	var memstats runtime.MemStats
+	var prevIn, prevOut uint64
 
 	t0 := time.Now()
 	for t := range time.NewTicker(250 * time.Millisecond).C {
@@ -41,11 +44,18 @@ func savePerfStats(file string) {
 		cpuUsagePercent := 100 * float64(usageDiff) / float64(timeDiff)
 		prevTime = curTime
 		prevUsage = curUsage
+		in, out := protocol.TotalInOut()
+		var inRate, outRate float64
+		if timeDiff > 0 {
+			inRate = float64(in-prevIn) / (float64(timeDiff) / 1e9)    // bytes per second
+			outRate = float64(out-prevOut) / (float64(timeDiff) / 1e9) // bytes per second
+		}
+		prevIn, prevOut = in, out
 
 		runtime.ReadMemStats(&memstats)
 
 		startms := int(t.Sub(t0).Seconds() * 1000)
 
-		fmt.Fprintf(fd, "%d\t%f\t%d\t%d\n", startms, cpuUsagePercent, memstats.Alloc, memstats.Sys-memstats.HeapReleased)
+		fmt.Fprintf(fd, "%d\t%f\t%d\t%d\t%.0f\t%.0f\n", startms, cpuUsagePercent, memstats.Alloc, memstats.Sys-memstats.HeapReleased, inRate, outRate)
 	}
 }

cmd/syncthing/usage_report.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/model"
+	"github.com/syncthing/syncthing/internal/model"
 )
 
 // Current version number of the usage report, for acceptance purposes. If

gui/app.js

@@ -533,6 +533,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         $scope.tmpOptions = angular.copy($scope.config.Options);
         $scope.tmpOptions.UREnabled = ($scope.tmpOptions.URAccepted > 0);
         $scope.tmpOptions.NodeName = $scope.thisNode().Name;
+        $scope.tmpOptions.AutoUpgradeEnabled = ($scope.tmpOptions.AutoUpgradeIntervalH > 0);
         $scope.tmpGUI = angular.copy($scope.config.GUI);
         $('#settings').modal();
     };
@@ -563,6 +564,13 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
                 $scope.tmpOptions.URAccepted = -1;
             }
 
+            // Check if auto-upgrade has been enabled or disabled
+            if ($scope.tmpOptions.AutoUpgradeEnabled) {
+                $scope.tmpOptions.AutoUpgradeIntervalH = $scope.tmpOptions.AutoUpgradeIntervalH || 12;
+            } else {
+                $scope.tmpOptions.AutoUpgradeIntervalH = 0;
+            }
+
             // Check if protocol will need to be changed on restart
             if ($scope.config.GUI.UseTLS !== $scope.tmpGUI.UseTLS) {
                 $scope.protocolChanged = true;

gui/index.html

@@ -164,8 +164,10 @@
             </div>
           </div>
         </div>
-        <button class="btn btn-sm btn-default pull-right" ng-click="addRepo()"><span class="glyphicon glyphicon-plus"></span>&emsp;<span translate>Add Repository</span></button>
-        <div class="clearfix"></div>
+        <div class="form-group">
+          <button class="btn btn-sm btn-default pull-right" ng-click="addRepo()"><span class="glyphicon glyphicon-plus"></span>&emsp;<span translate>Add Repository</span></button>
+          <div class="clearfix"></div>
+        </div>
         <hr class="visible-sm"/>
       </div>
 
@@ -284,8 +286,10 @@
             </div>
           </div>
         </div>
-        <button class="btn btn-sm btn-default pull-right" ng-click="addNode()"><span class="glyphicon glyphicon-plus"></span>&emsp;<span translate>Add Node</span></button>
-        <div class="clearfix"></div>
+        <div class="form-group">
+          <button class="btn btn-sm btn-default pull-right" ng-click="addNode()"><span class="glyphicon glyphicon-plus"></span>&emsp;<span translate>Add Node</span></button>
+          <div class="clearfix"></div>
+        </div>
       </div>
     </div> <!-- /row -->
 
@@ -379,13 +383,13 @@
             </div>
             <div class="form-group">
               <label translate for="name">Node Name</label>
-              <input placeholder="Home Server" id="name" class="form-control" type="text" ng-model="currentNode.Name"></input>
+              <input id="name" class="form-control" type="text" ng-model="currentNode.Name"></input>
               <p translate ng-if="currentNode.NodeID == myID" class="help-block">Shown instead of Node ID in the cluster status. Will be advertised to other nodes as an optional default name.</p>
               <p translate ng-if="currentNode.NodeID != myID" class="help-block">Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.</p>
             </div>
             <div class="form-group">
               <label translate for="addresses">Addresses</label>
-              <input placeholder="dynamic" ng-disabled="currentNode.NodeID == myID" id="addresses" class="form-control" type="text" ng-model="currentNode.AddressesStr"></input>
+              <input ng-disabled="currentNode.NodeID == myID" id="addresses" class="form-control" type="text" ng-model="currentNode.AddressesStr"></input>
               <p translate class="help-block">Enter comma separated "ip:port" addresses or "dynamic" to perform automatic discovery of the address.</p>
             </div>
             <div ng-if="!editingSelf" class="form-group">
@@ -430,7 +434,7 @@
               <div class="col-md-12">
                 <div class="form-group" ng-class="{'has-error': repoEditor.repoID.$invalid && repoEditor.repoID.$dirty}">
                   <label for="repoID"><span translate>Repository ID</span></label>
-                  <input name="repoID" placeholder="documents" ng-disabled="editingExisting" id="repoID" class="form-control" type="text" ng-model="currentRepo.ID" required unique-repo ng-pattern="/^[a-zA-Z0-9-_.]{1,64}$/"></input>
+                  <input name="repoID" ng-disabled="editingExisting" id="repoID" class="form-control" type="text" ng-model="currentRepo.ID" required unique-repo ng-pattern="/^[a-zA-Z0-9-_.]{1,64}$/"></input>
                   <p class="help-block">
                     <span translate ng-if="repoEditor.repoID.$valid || repoEditor.repoID.$pristine">Short identifier for the repository. Must be the same on all cluster nodes.</span>
                     <span translate ng-if="repoEditor.repoID.$error.uniqueRepo">The repository ID must be unique.</span>
@@ -440,7 +444,7 @@
                 </div>
                 <div class="form-group" ng-class="{'has-error': repoEditor.repoPath.$invalid && repoEditor.repoPath.$dirty}">
                   <label translate for="repoPath">Repository Path</label>
-                  <input name="repoPath" placeholder="~/Documents" ng-disabled="editingExisting" id="repoPath" class="form-control" type="text" ng-model="currentRepo.Directory" required></input>
+                  <input name="repoPath" ng-disabled="editingExisting" id="repoPath" class="form-control" type="text" ng-model="currentRepo.Directory" required></input>
                   <p class="help-block">
                     <span translate ng-if="repoEditor.repoPath.$valid || repoEditor.repoPath.$pristine">Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for</span> <code>{{system.tilde}}</code>.
                     <span translate ng-if="repoEditor.repoPath.$error.required && repoEditor.repoPath.$dirty">The repository path cannot be blank.</span>
@@ -448,7 +452,7 @@
                 </div>
                 <div class="form-group" ng-class="{'has-error': repoEditor.rescanIntervalS.$invalid && repoEditor.rescanIntervalS.$dirty}">
                   <label for="rescanIntervalS"><span translate>Rescan Interval</span> (s)</label>
-                  <input name="rescanIntervalS" placeholder="60" id="rescanIntervalS" class="form-control" type="number" ng-model="currentRepo.RescanIntervalS" required min="5"></input>
+                  <input name="rescanIntervalS" id="rescanIntervalS" class="form-control" type="number" ng-model="currentRepo.RescanIntervalS" required min="5"></input>
                   <p class="help-block">
                     <span translate ng-if="!repoEditor.rescanIntervalS.$valid && repoEditor.rescanIntervalS.$dirty">The rescan interval must be at least 5 seconds.</span>
                   </p>
@@ -524,7 +528,7 @@
                 </div>
                 <div class="form-group" ng-if="currentRepo.FileVersioningSelector == 'staggered'">
                   <label translate for="staggeredVersionsPath">Versions Path</label>
-                  <input name="staggeredVersionsPath" placeholder="" id="staggeredVersionsPath" class="form-control" type="text" ng-model="currentRepo.staggeredVersionsPath"></input>
+                  <input name="staggeredVersionsPath" id="staggeredVersionsPath" class="form-control" type="text" ng-model="currentRepo.staggeredVersionsPath"></input>
                   <p translate class="help-block">Path where versions should be stored (leave empty for the default .stversions folder in the repository).</p>
                 </div>
               </div>
@@ -602,26 +606,36 @@
                   <label translate for="MaxSendKbps">Outgoing Rate Limit (KiB/s)</label>
                   <input id="MaxSendKbps" class="form-control" type="number" ng-model="tmpOptions.MaxSendKbps">
                 </div>
-                <div class="form-group">
-                  <div class="checkbox">
-                    <label>
-                      <span translate>Enable UPnP</span> <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled">
-                    </label>
+                <div class="col-md-6">
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label>
+                        <span translate>Enable UPnP</span> <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled">
+                      </label>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label>
+                        <span translate>Global Discovery</span> <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.GlobalAnnEnabled">
+                      </label>
+                    </div>
                   </div>
                 </div>
-
-                <div class="form-group">
-                  <div class="checkbox">
-                    <label>
-                      <span translate>Local Discovery</span> <input id="LocalAnnEnabled" type="checkbox" ng-model="tmpOptions.LocalAnnEnabled">
-                    </label>
+                <div class="col-md-6">
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label>
+                        <span translate>Automatic upgrades</span> <input id="AutoUpgradeEnabled" type="checkbox" ng-model="tmpOptions.AutoUpgradeEnabled">
+                      </label>
+                    </div>
                   </div>
-                </div>
-                <div class="form-group">
-                  <div class="checkbox">
-                    <label>
-                      <span translate>Global Discovery</span> <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.GlobalAnnEnabled">
-                    </label>
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label>
+                        <span translate>Local Discovery</span> <input id="LocalAnnEnabled" type="checkbox" ng-model="tmpOptions.LocalAnnEnabled">
+                      </label>
+                    </div>
                   </div>
                 </div>
                 <div class="form-group">

internal/auto/auto_test.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/syncthing/syncthing/auto"
+	"github.com/syncthing/syncthing/internal/auto"
 )
 
 func TestAssets(t *testing.T) {

internal/beacon/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/config/config.go

@@ -14,10 +14,10 @@ import (
 	"strconv"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/logger"
-	"github.com/syncthing/syncthing/osutil"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/logger"
+	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 var l = logger.DefaultLogger
@@ -112,22 +112,23 @@ type RepositoryNodeConfiguration struct {
 }
 
 type OptionsConfiguration struct {
-	ListenAddress      []string `xml:"listenAddress" default:"0.0.0.0:22000"`
-	GlobalAnnServer    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"`
-	LocalAnnMCAddr     string   `xml:"localAnnounceMCAddr" default:"[ff32::5222]:21026"`
-	ParallelRequests   int      `xml:"parallelRequests" default:"16"`
-	MaxSendKbps        int      `xml:"maxSendKbps"`
-	MaxRecvKbps        int      `xml:"maxRecvKbps"`
-	ReconnectIntervalS int      `xml:"reconnectionIntervalS" default:"60"`
-	StartBrowser       bool     `xml:"startBrowser" default:"true"`
-	UPnPEnabled        bool     `xml:"upnpEnabled" default:"true"`
-	UPnPLease          int      `xml:"upnpLeaseMinutes" default:"0"`
-	UPnPRenewal        int      `xml:"upnpRenewalMinutes" default:"30"`
-	URAccepted         int      `xml:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
-	RestartOnWakeup    bool     `xml:"restartOnWakeup" default:"true"`
+	ListenAddress        []string `xml:"listenAddress" default:"0.0.0.0:22000"`
+	GlobalAnnServer      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"`
+	LocalAnnMCAddr       string   `xml:"localAnnounceMCAddr" default:"[ff32::5222]:21026"`
+	ParallelRequests     int      `xml:"parallelRequests" default:"16"`
+	MaxSendKbps          int      `xml:"maxSendKbps"`
+	MaxRecvKbps          int      `xml:"maxRecvKbps"`
+	ReconnectIntervalS   int      `xml:"reconnectionIntervalS" default:"60"`
+	StartBrowser         bool     `xml:"startBrowser" default:"true"`
+	UPnPEnabled          bool     `xml:"upnpEnabled" default:"true"`
+	UPnPLease            int      `xml:"upnpLeaseMinutes" default:"0"`
+	UPnPRenewal          int      `xml:"upnpRenewalMinutes" default:"30"`
+	URAccepted           int      `xml:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
+	RestartOnWakeup      bool     `xml:"restartOnWakeup" default:"true"`
+	AutoUpgradeIntervalH int      `xml:"autoUpgradeIntervalH" default:"12"` // 0 for off
 
 	Deprecated_RescanIntervalS int    `xml:"rescanIntervalS,omitempty" json:"-"`
 	Deprecated_UREnabled       bool   `xml:"urEnabled,omitempty" json:"-"`

internal/config/config_test.go

@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 var node1, node2, node3, node4 protocol.NodeID
@@ -23,21 +23,22 @@ func init() {
 
 func TestDefaultValues(t *testing.T) {
 	expected := OptionsConfiguration{
-		ListenAddress:      []string{"0.0.0.0:22000"},
-		GlobalAnnServer:    "announce.syncthing.net:22026",
-		GlobalAnnEnabled:   true,
-		LocalAnnEnabled:    true,
-		LocalAnnPort:       21025,
-		LocalAnnMCAddr:     "[ff32::5222]:21026",
-		ParallelRequests:   16,
-		MaxSendKbps:        0,
-		MaxRecvKbps:        0,
-		ReconnectIntervalS: 60,
-		StartBrowser:       true,
-		UPnPEnabled:        true,
-		UPnPLease:          0,
-		UPnPRenewal:        30,
-		RestartOnWakeup:    true,
+		ListenAddress:        []string{"0.0.0.0:22000"},
+		GlobalAnnServer:      "announce.syncthing.net:22026",
+		GlobalAnnEnabled:     true,
+		LocalAnnEnabled:      true,
+		LocalAnnPort:         21025,
+		LocalAnnMCAddr:       "[ff32::5222]:21026",
+		ParallelRequests:     16,
+		MaxSendKbps:          0,
+		MaxRecvKbps:          0,
+		ReconnectIntervalS:   60,
+		StartBrowser:         true,
+		UPnPEnabled:          true,
+		UPnPLease:            0,
+		UPnPRenewal:          30,
+		RestartOnWakeup:      true,
+		AutoUpgradeIntervalH: 12,
 	}
 
 	cfg := New("test", node1)
@@ -115,21 +116,22 @@ func TestNoListenAddress(t *testing.T) {
 
 func TestOverriddenValues(t *testing.T) {
 	expected := OptionsConfiguration{
-		ListenAddress:      []string{":23000"},
-		GlobalAnnServer:    "syncthing.nym.se:22026",
-		GlobalAnnEnabled:   false,
-		LocalAnnEnabled:    false,
-		LocalAnnPort:       42123,
-		LocalAnnMCAddr:     "quux:3232",
-		ParallelRequests:   32,
-		MaxSendKbps:        1234,
-		MaxRecvKbps:        2341,
-		ReconnectIntervalS: 6000,
-		StartBrowser:       false,
-		UPnPEnabled:        false,
-		UPnPLease:          60,
-		UPnPRenewal:        15,
-		RestartOnWakeup:    false,
+		ListenAddress:        []string{":23000"},
+		GlobalAnnServer:      "syncthing.nym.se:22026",
+		GlobalAnnEnabled:     false,
+		LocalAnnEnabled:      false,
+		LocalAnnPort:         42123,
+		LocalAnnMCAddr:       "quux:3232",
+		ParallelRequests:     32,
+		MaxSendKbps:          1234,
+		MaxRecvKbps:          2341,
+		ReconnectIntervalS:   6000,
+		StartBrowser:         false,
+		UPnPEnabled:          false,
+		UPnPLease:            60,
+		UPnPRenewal:          15,
+		RestartOnWakeup:      false,
+		AutoUpgradeIntervalH: 24,
 	}
 
 	cfg, err := Load("testdata/overridenvalues.xml", node1)

internal/config/testdata/overridenvalues.xml

@@ -16,5 +16,6 @@
         <upnpLeaseMinutes>60</upnpLeaseMinutes>
         <upnpRenewalMinutes>15</upnpRenewalMinutes>
         <restartOnWakeup>false</restartOnWakeup>
+        <autoUpgradeIntervalH>24</autoUpgradeIntervalH>
     </options>
 </configuration>

internal/discover/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/discover/discover.go

@@ -14,9 +14,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/beacon"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/beacon"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 type Discoverer struct {

internal/events/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/events/events_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
 )
 
 var timeout = 100 * time.Millisecond

internal/files/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/files/leveldb.go

@@ -10,8 +10,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/syncthing/syncthing/lamport"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/lamport"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
 	"github.com/syndtr/goleveldb/leveldb/opt"
@@ -77,8 +77,8 @@ keyTypeNode (1 byte)
     repository (64 bytes)
         node (32 bytes)
             name (variable size)
-            	|
-            	scanner.File
+		|
+		scanner.File
 
 keyTypeGlobal (1 byte)
 	repository (64 bytes)

internal/files/set.go

@@ -13,8 +13,8 @@ package files
 import (
 	"sync"
 
-	"github.com/syncthing/syncthing/lamport"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/lamport"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

internal/files/set_test.go

@@ -11,9 +11,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/syncthing/syncthing/files"
-	"github.com/syncthing/syncthing/lamport"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/syncthing/internal/lamport"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 )

internal/ignore/ignore.go

@@ -13,7 +13,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/syncthing/syncthing/fnmatch"
+	"github.com/syncthing/syncthing/internal/fnmatch"
 )
 
 type Pattern struct {

internal/ignore/ignore_test.go

@@ -10,7 +10,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/syncthing/syncthing/ignore"
+	"github.com/syncthing/syncthing/internal/ignore"
 )
 
 func TestIgnore(t *testing.T) {

internal/luhn/luhn_test.go

@@ -7,7 +7,7 @@ package luhn_test
 import (
 	"testing"
 
-	"github.com/syncthing/syncthing/luhn"
+	"github.com/syncthing/syncthing/internal/luhn"
 )
 
 func TestGenerate(t *testing.T) {

internal/model/blockqueue.go

@@ -4,7 +4,7 @@
 
 package model
 
-import "github.com/syncthing/syncthing/protocol"
+import "github.com/syncthing/syncthing/internal/protocol"
 
 type bqAdd struct {
 	file protocol.FileInfo

internal/model/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/model/model.go

@@ -19,15 +19,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/config"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/files"
-	"github.com/syncthing/syncthing/ignore"
-	"github.com/syncthing/syncthing/lamport"
-	"github.com/syncthing/syncthing/osutil"
-	"github.com/syncthing/syncthing/protocol"
-	"github.com/syncthing/syncthing/scanner"
-	"github.com/syncthing/syncthing/stats"
+	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/syncthing/internal/ignore"
+	"github.com/syncthing/syncthing/internal/lamport"
+	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/syncthing/internal/scanner"
+	"github.com/syncthing/syncthing/internal/stats"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 
@@ -449,7 +449,7 @@ func (m *Model) ClusterConfig(nodeID protocol.NodeID, cm protocol.ClusterConfigM
 	l.Infof(`Node %s client is "%s %s"`, nodeID, cm.ClientName, cm.ClientVersion)
 
 	if name := cm.GetOption("name"); name != "" {
-		l.Infof("Node %s hostname is %q", nodeID, name)
+		l.Infof("Node %s name is %q", nodeID, name)
 		node := m.cfg.GetNodeConfiguration(nodeID)
 		if node != nil && node.Name == "" {
 			node.Name = name
@@ -475,7 +475,7 @@ func (m *Model) ClusterConfig(nodeID protocol.NodeID, cm protocol.ClusterConfigM
 				var id protocol.NodeID
 				copy(id[:], node.ID)
 
-				if _, ok := m.nodeRepos[id]; !ok {
+				if m.cfg.GetNodeConfiguration(id)==nil {
 					// The node is currently unknown. Add it to the config.
 
 					l.Infof("Adding node %v to config (vouched for by introducer %v)", id, nodeID)

internal/model/model_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/config"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 )

internal/model/puller.go

@@ -32,12 +32,12 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/syncthing/syncthing/config"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/osutil"
-	"github.com/syncthing/syncthing/protocol"
-	"github.com/syncthing/syncthing/scanner"
-	"github.com/syncthing/syncthing/versioner"
+	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/syncthing/internal/scanner"
+	"github.com/syncthing/syncthing/internal/versioner"
 )
 
 type requestResult struct {

internal/protocol/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/protocol/nodeid.go

@@ -13,7 +13,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/syncthing/syncthing/luhn"
+	"github.com/syncthing/syncthing/internal/luhn"
 )
 
 type NodeID [32]byte

internal/scanner/blockqueue.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 // The parallell hasher reads FileInfo structures from the inbox, hashes the

internal/scanner/blocks.go

@@ -9,7 +9,7 @@ import (
 	"crypto/sha256"
 	"io"
 
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 const StandardBlockSize = 128 * 1024