Only change the announce server when upgrading config version

.travis.yml

@@ -11,8 +11,8 @@ script:
    - ./build.sh test-cov
 
 after_success:
-   - goveralls -coverprofile=coverage.out -service=travis-ci -package=calmh/syncthing -repotoken="$COVERALS_TOKEN"
+   - goveralls -coverprofile=coverage.out -service=travis-ci -package=syncthing/syncthing -repotoken="$COVERALLS_TOKEN"
 
 env:
    global:
-      secure: "zEV2h2XtKHNLVdXJjM4LA/VjMfLVydm6goF+ARit+nOSGxGoH7f7jIdzJzhxgh7shKG93q61eLO1Tug+WBMYB2EpBuYnTB5AIMYhCDwNI8C4uBV6c3brHfcrie7MASNao8TID2QScASKNFFWvjv/i1Ccn5ztxdcQuhSsNjGZp8A="
+      secure: "TSPJDsokGCQhKLjgG3c58qHn8Qxhh4zEkWFf0XIOOY2nlDVzdgXDsC+Nq0YaP4106Ee4FgkSefsUTQV5lq/IyYW8elgqlgghjOtOi6RJa14eIS9Yy5Bkx6MXn0QfZX/lG+sy42pKSNk43y9GWx/qrt4nkfTtTvI5cXgwDGYdmX8="

Godeps/Godeps.json

@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/calmh/syncthing",
+	"ImportPath": "github.com/syncthing/syncthing",
 	"GoVersion": "go1.3",
 	"Packages": [
 		"./cmd/..."
@@ -22,13 +22,13 @@
 		},
 		{
 			"ImportPath": "code.google.com/p/go.text/transform",
-			"Comment": "null-88",
-			"Rev": "1506dcc33592c369c3be7bd30b38f90445b86deb"
+			"Comment": "null-89",
+			"Rev": "df15baaf13e3f62b6b7a901e74caa3818a7c0a7c"
 		},
 		{
 			"ImportPath": "code.google.com/p/go.text/unicode/norm",
-			"Comment": "null-88",
-			"Rev": "1506dcc33592c369c3be7bd30b38f90445b86deb"
+			"Comment": "null-89",
+			"Rev": "df15baaf13e3f62b6b7a901e74caa3818a7c0a7c"
 		},
 		{
 			"ImportPath": "code.google.com/p/snappy-go/snappy",
@@ -41,7 +41,7 @@
 		},
 		{
 			"ImportPath": "github.com/calmh/xdr",
-			"Rev": "89d756f35ba26bcdd47ca25cf9795b3b8d1e1852"
+			"Rev": "694859acb207675085232438780db923ceb43e96"
 		},
 		{
 			"ImportPath": "github.com/juju/ratelimit",

Godeps/_workspace/src/code.google.com/p/go.text/unicode/norm/maketables.go

@@ -11,7 +11,6 @@
 package main
 
 import (
-	"bufio"
 	"bytes"
 	"flag"
 	"fmt"
@@ -24,6 +23,8 @@ import (
 	"strconv"
 	"strings"
 	"unicode"
+
+	"code.google.com/p/go.text/internal/ucd"
 )
 
 func main() {
@@ -63,31 +64,7 @@ var localFiles = flag.Bool("local",
 
 var logger = log.New(os.Stderr, "", log.Lshortfile)
 
-// UnicodeData.txt has form:
-//	0037;DIGIT SEVEN;Nd;0;EN;;7;7;7;N;;;;;
-//	007A;LATIN SMALL LETTER Z;Ll;0;L;;;;;N;;;005A;;005A
-// See http://unicode.org/reports/tr44/ for full explanation
-// The fields:
-const (
-	FCodePoint = iota
-	FName
-	FGeneralCategory
-	FCanonicalCombiningClass
-	FBidiClass
-	FDecompMapping
-	FDecimalValue
-	FDigitValue
-	FNumericValue
-	FBidiMirrored
-	FUnicode1Name
-	FISOComment
-	FSimpleUppercaseMapping
-	FSimpleLowercaseMapping
-	FSimpleTitlecaseMapping
-	NumField
-
-	MaxChar = 0x10FFFF // anything above this shouldn't exist
-)
+const MaxChar = 0x10FFFF // anything above this shouldn't exist
 
 // Quick Check properties of runes allow us to quickly
 // determine whether a rune may occur in a normal form.
@@ -232,7 +209,7 @@ func openReader(file string) (input io.ReadCloser) {
 	return
 }
 
-func parseDecomposition(s string, skipfirst bool) (a []rune, e error) {
+func parseDecomposition(s string, skipfirst bool) (a []rune, err error) {
 	decomp := strings.Split(s, " ")
 	if len(decomp) > 0 && skipfirst {
 		decomp = decomp[1:]
@@ -247,56 +224,31 @@ func parseDecomposition(s string, skipfirst bool) (a []rune, e error) {
 	return a, nil
 }
 
-func parseCharacter(line string) {
-	field := strings.Split(line, ";")
-	if len(field) != NumField {
-		logger.Fatalf("%5s: %d fields (expected %d)\n", line, len(field), NumField)
-	}
-	x, err := strconv.ParseUint(field[FCodePoint], 16, 64)
-	point := int(x)
-	if err != nil {
-		logger.Fatalf("%.5s...: %s", line, err)
-	}
-	if point == 0 {
-		return // not interesting and we use 0 as unset
-	}
-	if point > MaxChar {
-		logger.Fatalf("%5s: Rune %X > MaxChar (%X)", line, point, MaxChar)
-		return
-	}
-	state := SNormal
-	switch {
-	case strings.Index(field[FName], ", First>") > 0:
-		state = SFirst
-	case strings.Index(field[FName], ", Last>") > 0:
-		state = SLast
-	}
-	firstChar := lastChar + 1
-	lastChar = rune(point)
-	if state != SLast {
-		firstChar = lastChar
-	}
-	x, err = strconv.ParseUint(field[FCanonicalCombiningClass], 10, 64)
-	if err != nil {
-		logger.Fatalf("%U: bad ccc field: %s", int(x), err)
-	}
-	ccc := uint8(x)
-	decmap := field[FDecompMapping]
-	exp, e := parseDecomposition(decmap, false)
-	isCompat := false
-	if e != nil {
-		if len(decmap) > 0 {
-			exp, e = parseDecomposition(decmap, true)
-			if e != nil {
-				logger.Fatalf(`%U: bad decomp |%v|: "%s"`, int(x), decmap, e)
+func loadUnicodeData() {
+	f := openReader("UnicodeData.txt")
+	defer f.Close()
+	p := ucd.New(f)
+	for p.Next() {
+		r := p.Rune(ucd.CodePoint)
+		char := &chars[r]
+
+		char.ccc = uint8(p.Uint(ucd.CanonicalCombiningClass))
+		decmap := p.String(ucd.DecompMapping)
+
+		exp, err := parseDecomposition(decmap, false)
+		isCompat := false
+		if err != nil {
+			if len(decmap) > 0 {
+				exp, err = parseDecomposition(decmap, true)
+				if err != nil {
+					logger.Fatalf(`%U: bad decomp |%v|: "%s"`, r, decmap, err)
+				}
+				isCompat = true
 			}
-			isCompat = true
 		}
-	}
-	for i := firstChar; i <= lastChar; i++ {
-		char := &chars[i]
-		char.name = field[FName]
-		char.codePoint = i
+
+		char.name = p.String(ucd.Name)
+		char.codePoint = r
 		char.forms[FCompatibility].decomp = exp
 		if !isCompat {
 			char.forms[FCanonical].decomp = exp
@@ -306,24 +258,9 @@ func parseCharacter(line string) {
 		if len(decmap) > 0 {
 			char.forms[FCompatibility].decomp = exp
 		}
-		char.ccc = ccc
-		char.state = SMissing
-		if i == lastChar {
-			char.state = state
-		}
 	}
-	return
-}
-
-func loadUnicodeData() {
-	f := openReader("UnicodeData.txt")
-	defer f.Close()
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		parseCharacter(scanner.Text())
-	}
-	if scanner.Err() != nil {
-		logger.Fatal(scanner.Err())
+	if err := p.Err(); err != nil {
+		logger.Fatal(err)
 	}
 }
 
@@ -354,47 +291,22 @@ func compactCCC() {
 	}
 }
 
-var singlePointRe = regexp.MustCompile(`^([0-9A-F]+) *$`)
-
 // CompositionExclusions.txt has form:
 // 0958    # ...
 // See http://unicode.org/reports/tr44/ for full explanation
-func parseExclusion(line string) int {
-	comment := strings.Index(line, "#")
-	if comment >= 0 {
-		line = line[0:comment]
-	}
-	if len(line) == 0 {
-		return 0
-	}
-	matches := singlePointRe.FindStringSubmatch(line)
-	if len(matches) != 2 {
-		logger.Fatalf("%s: %d matches (expected 1)\n", line, len(matches))
-	}
-	point, err := strconv.ParseUint(matches[1], 16, 64)
-	if err != nil {
-		logger.Fatalf("%.5s...: %s", line, err)
-	}
-	return int(point)
-}
-
 func loadCompositionExclusions() {
 	f := openReader("CompositionExclusions.txt")
 	defer f.Close()
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		point := parseExclusion(scanner.Text())
-		if point == 0 {
-			continue
-		}
-		c := &chars[point]
+	p := ucd.New(f)
+	for p.Next() {
+		c := &chars[p.Rune(0)]
 		if c.excludeInComp {
 			logger.Fatalf("%U: Duplicate entry in exclusions.", c.codePoint)
 		}
 		c.excludeInComp = true
 	}
-	if scanner.Err() != nil {
-		log.Fatal(scanner.Err())
+	if e := p.Err(); e != nil {
+		logger.Fatal(e)
 	}
 }
 
@@ -988,8 +900,6 @@ func verifyComputed() {
 	}
 }
 
-var qcRe = regexp.MustCompile(`([0-9A-F\.]+) *; (NF.*_QC); ([YNM]) #.*`)
-
 // Use values in DerivedNormalizationProps.txt to compare against the
 // values we computed.
 // DerivedNormalizationProps.txt has form:
@@ -999,27 +909,13 @@ var qcRe = regexp.MustCompile(`([0-9A-F\.]+) *; (NF.*_QC); ([YNM]) #.*`)
 func testDerived() {
 	f := openReader("DerivedNormalizationProps.txt")
 	defer f.Close()
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		line := scanner.Text()
-		qc := qcRe.FindStringSubmatch(line)
-		if qc == nil {
-			continue
-		}
-		rng := strings.Split(qc[1], "..")
-		i, err := strconv.ParseUint(rng[0], 16, 64)
-		if err != nil {
-			log.Fatal(err)
-		}
-		j := i
-		if len(rng) > 1 {
-			j, err = strconv.ParseUint(rng[1], 16, 64)
-			if err != nil {
-				log.Fatal(err)
-			}
-		}
+	p := ucd.New(f)
+	for p.Next() {
+		r := p.Rune(0)
+		c := &chars[r]
+
 		var ftype, mode int
-		qt := strings.TrimSpace(qc[2])
+		qt := p.String(1)
 		switch qt {
 		case "NFC_QC":
 			ftype, mode = FCanonical, MComposed
@@ -1030,10 +926,10 @@ func testDerived() {
 		case "NFKD_QC":
 			ftype, mode = FCompatibility, MDecomposed
 		default:
-			log.Fatalf(`Unexpected quick check type "%s"`, qt)
+			continue
 		}
 		var qr QCResult
-		switch qc[3] {
+		switch p.String(2) {
 		case "Y":
 			qr = QCYes
 		case "N":
@@ -1041,27 +937,15 @@ func testDerived() {
 		case "M":
 			qr = QCMaybe
 		default:
-			log.Fatalf(`Unexpected quick check value "%s"`, qc[3])
+			log.Fatalf(`Unexpected quick check value "%s"`, p.String(2))
 		}
-		var lastFailed bool
-		// Verify current
-		for ; i <= j; i++ {
-			c := &chars[int(i)]
-			c.forms[ftype].verified[mode] = true
-			curqr := c.forms[ftype].quickCheck[mode]
-			if curqr != qr {
-				if !lastFailed {
-					logger.Printf("%s: %.4X..%.4X -- %s\n",
-						qt, int(i), int(j), line[0:50])
-				}
-				logger.Printf("%U: FAILED %s (was %v need %v)\n",
-					int(i), qt, curqr, qr)
-				lastFailed = true
-			}
+		if got := c.forms[ftype].quickCheck[mode]; got != qr {
+			logger.Printf("%U: FAILED %s (was %v need %v)\n", r, qt, got, qr)
 		}
+		c.forms[ftype].verified[mode] = true
 	}
-	if scanner.Err() != nil {
-		logger.Fatal(scanner.Err())
+	if err := p.Err(); err != nil {
+		logger.Fatal(err)
 	}
 	// Any unspecified value must be QCYes. Verify this.
 	for i, c := range chars {

Godeps/_workspace/src/github.com/calmh/xdr/.gitignore

@@ -0,0 +1 @@
+coverage.out

Godeps/_workspace/src/github.com/calmh/xdr/.travis.yml

@@ -0,0 +1,19 @@
+language: go
+go:
+- tip
+
+install:
+- export PATH=$PATH:$HOME/gopath/bin
+- go get code.google.com/p/go.tools/cmd/cover
+- go get github.com/mattn/goveralls
+
+script:
+- ./generate.sh
+- go test -coverprofile=coverage.out
+
+after_success:
+- goveralls -coverprofile=coverage.out -service=travis-ci -package=calmh/xdr -repotoken="$COVERALLS_TOKEN"
+
+env:
+  global:
+    secure: SmgnrGfp2zLrA44ChRMpjPeujubt9veZ8Fx/OseMWECmacyV5N/TuDhzIbwo6QwV4xB0sBacoPzvxQbJRVjNKsPiSu72UbcQmQ7flN4Tf7nW09tSh1iW8NgrpBCq/3UYLoBu2iPBEBKm93IK0aGNAKs6oEkB0fU27iTVBwiTXOY=

Godeps/_workspace/src/github.com/calmh/xdr/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2014 Jakob Borg.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+- The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

Godeps/_workspace/src/github.com/calmh/xdr/README.md

@@ -0,0 +1,12 @@
+xdr
+===
+
+[![Build Status](https://img.shields.io/travis/calmh/xdr.svg?style=flat)](https://travis-ci.org/calmh/xdr)
+[![Coverage Status](https://img.shields.io/coveralls/calmh/xdr.svg?style=flat)](https://coveralls.io/r/calmh/xdr?branch=master)
+[![API Documentation](http://img.shields.io/badge/api-Godoc-blue.svg?style=flat)](http://godoc.org/github.com/calmh/xdr)
+[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](http://opensource.org/licenses/MIT)
+
+This is an XDR encoding/decoding library. It uses code generation and
+not reflection. It supports the IPDR bastardized XDR format when built
+with `-tags ipdr`.
+

Godeps/_workspace/src/github.com/calmh/xdr/encdec_test.go

@@ -5,8 +5,12 @@ package xdr_test
 
 import (
 	"bytes"
+	"math/rand"
+	"reflect"
 	"testing"
 	"testing/quick"
+
+	"github.com/calmh/xdr"
 )
 
 // Contains all supported types
@@ -22,6 +26,25 @@ type TestStruct struct {
 	UI64 uint64
 	BS   []byte
 	S    string
+	C    Opaque
+}
+
+type Opaque [32]byte
+
+func (u *Opaque) encodeXDR(w *xdr.Writer) (int, error) {
+	return w.WriteRaw(u[:])
+}
+
+func (u *Opaque) decodeXDR(r *xdr.Reader) (int, error) {
+	return r.ReadRaw(u[:])
+}
+
+func (Opaque) Generate(rand *rand.Rand, size int) reflect.Value {
+	var u Opaque
+	for i := range u[:] {
+		u[i] = byte(rand.Int())
+	}
+	return reflect.ValueOf(u)
 }
 
 func TestEncDec(t *testing.T) {
@@ -39,7 +62,7 @@ func TestEncDec(t *testing.T) {
 			t0.I32 != t1.I32 || t0.UI32 != t1.UI32 ||
 			t0.I64 != t1.I64 || t0.UI64 != t1.UI64 ||
 			bytes.Compare(t0.BS, t1.BS) != 0 ||
-			t0.S != t1.S {
+			t0.S != t1.S || t0.C != t1.C {
 			t.Logf("%#v", t0)
 			t.Logf("%#v", t1)
 			return false

Godeps/_workspace/src/github.com/calmh/xdr/encdec_xdr_test.go

@@ -52,6 +52,8 @@ TestStruct Structure:
 \                      S (variable length)                      \
 /                                                               /
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                            Opaque                             |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
 
 struct TestStruct {
@@ -66,6 +68,7 @@ struct TestStruct {
 	unsigned hyper UI64;
 	opaque BS<>;
 	string S<>;
+	Opaque C;
 }
 
 */
@@ -98,6 +101,10 @@ func (o TestStruct) encodeXDR(xw *xdr.Writer) (int, error) {
 	xw.WriteUint64(o.UI64)
 	xw.WriteBytes(o.BS)
 	xw.WriteString(o.S)
+	_, err := o.C.encodeXDR(xw)
+	if err != nil {
+		return xw.Tot(), err
+	}
 	return xw.Tot(), xw.Error()
 }
 
@@ -124,5 +131,6 @@ func (o *TestStruct) decodeXDR(xr *xdr.Reader) error {
 	o.UI64 = xr.ReadUint64()
 	o.BS = xr.ReadBytes()
 	o.S = xr.ReadString()
+	(&o.C).decodeXDR(xr)
 	return xr.Error()
 }

Godeps/_workspace/src/github.com/calmh/xdr/xdr_test.go

@@ -67,7 +67,7 @@ func TestReadBytesMaxInto(t *testing.T) {
 	}
 }
 
-func TestReadBytesMaxIntoNil(t *testing.T) {
+func TestReadStringMax(t *testing.T) {
 	for tot := 42; tot < 72; tot++ {
 		for max := 0; max < 128; max++ {
 			var b = new(bytes.Buffer)
@@ -77,8 +77,8 @@ func TestReadBytesMaxIntoNil(t *testing.T) {
 			var toWrite = make([]byte, tot)
 			w.WriteBytes(toWrite)
 
-			var bs = r.ReadBytesMaxInto(max, nil)
-			var read = len(bs)
+			var str = r.ReadStringMax(max)
+			var read = len(str)
 
 			if max == 0 || tot <= max {
 				if read != tot {

README.md

@@ -1,9 +1,9 @@
 syncthing
 =========
 
-[![Build Status](https://img.shields.io/travis/calmh/syncthing.svg?style=flat)](https://travis-ci.org/calmh/syncthing)
-[![Coverage Status](https://img.shields.io/coveralls/calmh/syncthing.svg?style=flat)](https://coveralls.io/r/calmh/syncthing?branch=master)
-[![API Documentation](http://img.shields.io/badge/api-Godoc-blue.svg?style=flat)](http://godoc.org/github.com/calmh/syncthing)
+[![Build Status](https://img.shields.io/travis/syncthing/syncthing.svg?style=flat)](https://travis-ci.org/syncthing/syncthing)
+[![Coverage Status](https://img.shields.io/coveralls/syncthing/syncthing.svg?style=flat)](https://coveralls.io/r/syncthing/syncthing?branch=master)
+[![API Documentation](http://img.shields.io/badge/api-Godoc-blue.svg?style=flat)](http://godoc.org/github.com/syncthing/syncthing)
 [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](http://opensource.org/licenses/MIT)
 
 This is the `syncthing` project. The following are the project goals:
@@ -12,7 +12,7 @@ This is the `syncthing` project. The following are the project goals:
     number of collaborating nodes. The protocol should be well defined,
     unambiguous, easily understood, free to use, efficient, secure and
     language neutral. This is the [Block Exchange
-    Protocol](https://github.com/calmh/syncthing/blob/master/protocol/PROTOCOL.md).
+    Protocol](https://github.com/syncthing/syncthing/blob/master/protocol/PROTOCOL.md).
 
  2. Provide the reference implementation to demonstrate the usability of
     said protocol. This is the `syncthing` utility. It is the hope that
@@ -50,4 +50,4 @@ under the [Creative Commons Attribution 4.0 International
 License](http://creativecommons.org/licenses/by/4.0/).
 
 All code is licensed under the [MIT
-License](https://github.com/calmh/syncthing/blob/master/LICENSE).
+License](https://github.com/syncthing/syncthing/blob/master/LICENSE).

beacon/debug.go

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

build.sh

@@ -47,7 +47,7 @@ test-cov() {
 test() {
 	check
 	go vet ./...
-	godep go test -cpu=1,2,4 ./...
+	godep go test -cpu=1,2,4 $* ./...
 }
 
 sign() {
@@ -133,7 +133,7 @@ case "$1" in
 		;;
 
 	test)
-		test
+		test -short
 		;;
 
 	test-cov)
@@ -142,19 +142,19 @@ case "$1" in
 
 	tar)
 		rm -f *.tar.gz *.zip
-		test || exit 1
+		test -short || exit 1
 		assets
 		build
 
 		eval $(go env)
-		name="syncthing-$GOOS-$GOARCH-$version"
+		name="syncthing-${GOOS/darwin/macosx}-$GOARCH-$version"
 
 		tarDist "$name"
 		;;
 
 	all)
 		rm -f *.tar.gz *.zip
-		test || exit 1
+		test -short || exit 1
 		assets
 
 		for os in darwin-amd64 linux-386 linux-amd64 freebsd-amd64 windows-amd64 windows-386 solaris-amd64 ; do
@@ -163,7 +163,7 @@ case "$1" in
 
 			build
 
-			name="syncthing-$os-$version"
+			name="syncthing-${os/darwin/macosx}-$version"
 			case $GOOS in
 				windows)
 					zipDist "$name"
@@ -202,7 +202,7 @@ case "$1" in
 		tag=$(git describe)
 		shopt -s nullglob
 		for f in *.tar.gz *.zip *.asc ; do
-			relup calmh/syncthing "$tag" "$f"
+			relup syncthing/syncthing "$tag" "$f"
 		done
 		;;
 

cmd/stindex/main.go

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

cmd/syncthing/gui.go

@@ -26,13 +26,13 @@ import (
 
 	"crypto/tls"
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/calmh/syncthing/auto"
-	"github.com/calmh/syncthing/config"
-	"github.com/calmh/syncthing/events"
-	"github.com/calmh/syncthing/logger"
-	"github.com/calmh/syncthing/model"
-	"github.com/calmh/syncthing/protocol"
-	"github.com/calmh/syncthing/upgrade"
+	"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/vitrun/qart/qr"
 )
 

cmd/syncthing/gui_csrf.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/calmh/syncthing/osutil"
+	"github.com/syncthing/syncthing/osutil"
 )
 
 var csrfTokens []string
@@ -43,6 +43,12 @@ func csrfMiddleware(prefix string, next http.Handler) http.Handler {
 			return
 		}
 
+		if r.Method == "GET" {
+			// Allow GET requests unconditionally
+			next.ServeHTTP(w, r)
+			return
+		}
+
 		// Verify the CSRF token
 		token := r.Header.Get("X-CSRF-Token")
 		if !validCsrfToken(token) {

cmd/syncthing/main.go

@@ -26,16 +26,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/calmh/syncthing/config"
-	"github.com/calmh/syncthing/discover"
-	"github.com/calmh/syncthing/events"
-	"github.com/calmh/syncthing/logger"
-	"github.com/calmh/syncthing/model"
-	"github.com/calmh/syncthing/osutil"
-	"github.com/calmh/syncthing/protocol"
-	"github.com/calmh/syncthing/upgrade"
-	"github.com/calmh/syncthing/upnp"
 	"github.com/juju/ratelimit"
+	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/discover"
+	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/model"
+	"github.com/syncthing/syncthing/osutil"
+	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/upgrade"
+	"github.com/syncthing/syncthing/upnp"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

cmd/syncthing/usage_report.go

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

config/config.go

@@ -15,14 +15,14 @@ import (
 	"strconv"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/calmh/syncthing/logger"
-	"github.com/calmh/syncthing/protocol"
+	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/protocol"
 )
 
 var l = logger.DefaultLogger
 
 type Configuration struct {
-	Version      int                       `xml:"version,attr" default:"2"`
+	Version      int                       `xml:"version,attr" default:"3"`
 	Repositories []RepositoryConfiguration `xml:"repository"`
 	Nodes        []NodeConfiguration       `xml:"node"`
 	GUI          GUIConfiguration          `xml:"gui"`
@@ -296,6 +296,11 @@ func Load(rd io.Reader, myID protocol.NodeID) (Configuration, error) {
 		convertV1V2(&cfg)
 	}
 
+	// Upgrade to v3 configuration if appropriate
+	if cfg.Version == 2 {
+		convertV2V3(&cfg)
+	}
+
 	// Hash old cleartext passwords
 	if len(cfg.GUI.Password) > 0 && cfg.GUI.Password[0] != '$' {
 		hash, err := bcrypt.GenerateFromPassword([]byte(cfg.GUI.Password), 0)
@@ -333,13 +338,24 @@ func Load(rd io.Reader, myID protocol.NodeID) (Configuration, error) {
 		}
 	}
 
+	return cfg, err
+}
+
+func convertV2V3(cfg *Configuration) {
+	// In previous versions, compression was always on. When upgrading, enable
+	// compression on all existing new. New nodes will get compression on by
+	// default by the GUI.
+	for i := range cfg.Nodes {
+		cfg.Nodes[i].Compression = true
+	}
+
 	// 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"
 	}
 
-	return cfg, err
+	cfg.Version = 3
 }
 
 func convertV1V2(cfg *Configuration) {

config/config_test.go

@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/calmh/syncthing/protocol"
+	"github.com/syncthing/syncthing/protocol"
 )
 
 var node1, node2, node3, node4 protocol.NodeID
@@ -91,7 +91,21 @@ func TestNodeConfig(t *testing.T) {
 </configuration>
 `)
 
-	for i, data := range [][]byte{v1data, v2data} {
+	v3data := []byte(`
+<configuration version="3">
+    <repository id="test" directory="~/Sync" ro="true" ignorePerms="false">
+        <node id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" compression="false"></node>
+        <node id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" compression="false"></node>
+    </repository>
+    <node id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" name="node one" compression="true">
+        <address>a</address>
+    </node>
+    <node id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" name="node two" compression="true">
+        <address>b</address>
+    </node>
+</configuration>`)
+
+	for i, data := range [][]byte{v1data, v2data, v3data} {
 		cfg, err := Load(bytes.NewReader(data), node1)
 		if err != nil {
 			t.Error(err)
@@ -107,20 +121,22 @@ func TestNodeConfig(t *testing.T) {
 		}
 		expectedNodes := []NodeConfiguration{
 			{
-				NodeID:    node1,
-				Name:      "node one",
-				Addresses: []string{"a"},
+				NodeID:      node1,
+				Name:        "node one",
+				Addresses:   []string{"a"},
+				Compression: true,
 			},
 			{
-				NodeID:    node4,
-				Name:      "node two",
-				Addresses: []string{"b"},
+				NodeID:      node4,
+				Name:        "node two",
+				Addresses:   []string{"b"},
+				Compression: true,
 			},
 		}
 		expectedNodeIDs := []protocol.NodeID{node1, node4}
 
-		if cfg.Version != 2 {
-			t.Errorf("%d: Incorrect version %d != 2", i, cfg.Version)
+		if cfg.Version != 3 {
+			t.Errorf("%d: Incorrect version %d != 3", i, cfg.Version)
 		}
 		if !reflect.DeepEqual(cfg.Repositories, expectedRepos) {
 			t.Errorf("%d: Incorrect Repositories\n  A: %#v\n  E: %#v", i, cfg.Repositories, expectedRepos)
@@ -222,16 +238,19 @@ func TestNodeAddressesDynamic(t *testing.T) {
 	name, _ := os.Hostname()
 	expected := []NodeConfiguration{
 		{
-			NodeID:    node1,
-			Addresses: []string{"dynamic"},
+			NodeID:      node1,
+			Addresses:   []string{"dynamic"},
+			Compression: true,
 		},
 		{
-			NodeID:    node2,
-			Addresses: []string{"dynamic"},
+			NodeID:      node2,
+			Addresses:   []string{"dynamic"},
+			Compression: true,
 		},
 		{
-			NodeID:    node3,
-			Addresses: []string{"dynamic"},
+			NodeID:      node3,
+			Addresses:   []string{"dynamic"},
+			Compression: true,
 		},
 		{
 			NodeID:    node4,
@@ -252,7 +271,7 @@ func TestNodeAddressesDynamic(t *testing.T) {
 
 func TestNodeAddressesStatic(t *testing.T) {
 	data := []byte(`
-<configuration version="2">
+<configuration version="3">
     <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ">
         <address>192.0.2.1</address>
         <address>192.0.2.2</address>

discover/debug.go

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

discover/discover.go

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

events/debug.go

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

events/events_test.go

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

files/debug.go

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

files/leveldb.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/calmh/syncthing/lamport"
-	"github.com/calmh/syncthing/protocol"
+	"github.com/syncthing/syncthing/lamport"
+	"github.com/syncthing/syncthing/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
 	"github.com/syndtr/goleveldb/leveldb/opt"

files/set.go

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

files/set_test.go

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

gui/index.html

@@ -367,10 +367,10 @@
     <div class="container">
       <ul class="nav navbar-nav">
         <li><a class="navbar-link" href="http://discourse.syncthing.net/"><span translate>Support / Forum</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/calmh/syncthing/releases"><span translate>Latest Release</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/releases"><span translate>Latest Release</span></a></li>
         <li><a class="navbar-link" href="http://discourse.syncthing.net/category/documentation"><span translate>Documentation</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/calmh/syncthing/issues"><span translate>Bugs</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/calmh/syncthing"><span translate>Source Code</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/issues"><span translate>Bugs</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing"><span translate>Source Code</span></a></li>
       </ul>
     </div>
   </nav>

luhn/luhn_test.go

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

model/blockqueue.go

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

model/debug.go

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

model/model.go

@@ -15,12 +15,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/calmh/syncthing/config"
-	"github.com/calmh/syncthing/events"
-	"github.com/calmh/syncthing/files"
-	"github.com/calmh/syncthing/lamport"
-	"github.com/calmh/syncthing/protocol"
-	"github.com/calmh/syncthing/scanner"
+	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/files"
+	"github.com/syncthing/syncthing/lamport"
+	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/scanner"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

model/model_test.go

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

model/puller.go

@@ -11,12 +11,12 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/calmh/syncthing/config"
-	"github.com/calmh/syncthing/events"
-	"github.com/calmh/syncthing/osutil"
-	"github.com/calmh/syncthing/protocol"
-	"github.com/calmh/syncthing/scanner"
-	"github.com/calmh/syncthing/versioner"
+	"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"
 )
 
 type requestResult struct {

protocol/debug.go

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

protocol/nodeid.go

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

protocol/protocol_test.go

@@ -251,6 +251,11 @@ func TestElementSizeExceededNested(t *testing.T) {
 }
 
 func TestMarshalIndexMessage(t *testing.T) {
+	var quickCfg = &quick.Config{MaxCountScale: 10}
+	if testing.Short() {
+		quickCfg = nil
+	}
+
 	f := func(m1 IndexMessage) bool {
 		for _, f := range m1.Files {
 			for i := range f.Blocks {
@@ -264,22 +269,32 @@ func TestMarshalIndexMessage(t *testing.T) {
 		return testMarshal(t, "index", &m1, &IndexMessage{})
 	}
 
-	if err := quick.Check(f, &quick.Config{MaxCountScale: 10}); err != nil {
+	if err := quick.Check(f, quickCfg); err != nil {
 		t.Error(err)
 	}
 }
 
 func TestMarshalRequestMessage(t *testing.T) {
+	var quickCfg = &quick.Config{MaxCountScale: 10}
+	if testing.Short() {
+		quickCfg = nil
+	}
+
 	f := func(m1 RequestMessage) bool {
 		return testMarshal(t, "request", &m1, &RequestMessage{})
 	}
 
-	if err := quick.Check(f, &quick.Config{MaxCountScale: 10}); err != nil {
+	if err := quick.Check(f, quickCfg); err != nil {
 		t.Error(err)
 	}
 }
 
 func TestMarshalResponseMessage(t *testing.T) {
+	var quickCfg = &quick.Config{MaxCountScale: 10}
+	if testing.Short() {
+		quickCfg = nil
+	}
+
 	f := func(m1 ResponseMessage) bool {
 		if len(m1.Data) == 0 {
 			m1.Data = nil
@@ -287,27 +302,37 @@ func TestMarshalResponseMessage(t *testing.T) {
 		return testMarshal(t, "response", &m1, &ResponseMessage{})
 	}
 
-	if err := quick.Check(f, &quick.Config{MaxCountScale: 10}); err != nil {
+	if err := quick.Check(f, quickCfg); err != nil {
 		t.Error(err)
 	}
 }
 
 func TestMarshalClusterConfigMessage(t *testing.T) {
+	var quickCfg = &quick.Config{MaxCountScale: 10}
+	if testing.Short() {
+		quickCfg = nil
+	}
+
 	f := func(m1 ClusterConfigMessage) bool {
 		return testMarshal(t, "clusterconfig", &m1, &ClusterConfigMessage{})
 	}
 
-	if err := quick.Check(f, &quick.Config{MaxCountScale: 10}); err != nil {
+	if err := quick.Check(f, quickCfg); err != nil {
 		t.Error(err)
 	}
 }
 
 func TestMarshalCloseMessage(t *testing.T) {
+	var quickCfg = &quick.Config{MaxCountScale: 10}
+	if testing.Short() {
+		quickCfg = nil
+	}
+
 	f := func(m1 CloseMessage) bool {
 		return testMarshal(t, "close", &m1, &CloseMessage{})
 	}
 
-	if err := quick.Check(f, &quick.Config{MaxCountScale: 10}); err != nil {
+	if err := quick.Check(f, quickCfg); err != nil {
 		t.Error(err)
 	}
 }

scanner/blockqueue.go

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

scanner/blocks.go

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

scanner/blocks_test.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/calmh/syncthing/protocol"
+	"github.com/syncthing/syncthing/protocol"
 )
 
 var blocksTestData = []struct {

scanner/debug.go

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

scanner/walk.go

@@ -15,8 +15,8 @@ import (
 	"strings"
 	"code.google.com/p/go.text/unicode/norm"
 
-	"github.com/calmh/syncthing/lamport"
-	"github.com/calmh/syncthing/protocol"
+	"github.com/syncthing/syncthing/lamport"
+	"github.com/syncthing/syncthing/protocol"
 )
 
 type Walker struct {

scanner/walk_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/calmh/syncthing/protocol"
+	"github.com/syncthing/syncthing/protocol"
 )
 
 var testdata = []struct {

upgrade/upgrade_supported.go

@@ -32,7 +32,13 @@ func UpgradeTo(rel Release) error {
 		return err
 	}
 
-	expectedRelease := fmt.Sprintf("syncthing-%s-%s%s-%s.", runtime.GOOS, runtime.GOARCH, GoArchExtra, rel.Tag)
+	osName := runtime.GOOS
+	if osName == "darwin" {
+		// We call the darwin release bundles macosx because that makes more
+		// sense for people downloading them
+		osName = "macosx"
+	}
+	expectedRelease := fmt.Sprintf("syncthing-%s-%s%s-%s.", osName, runtime.GOARCH, GoArchExtra, rel.Tag)
 	for _, asset := range rel.Assets {
 		if strings.HasPrefix(asset.Name, expectedRelease) {
 			if strings.HasSuffix(asset.Name, ".tar.gz") {
@@ -60,7 +66,7 @@ func UpgradeTo(rel Release) error {
 
 // Returns the latest release, including prereleases or not depending on the argument
 func LatestRelease(prerelease bool) (Release, error) {
-	resp, err := http.Get("https://api.github.com/repos/calmh/syncthing/releases?per_page=10")
+	resp, err := http.Get("https://api.github.com/repos/syncthing/syncthing/releases?per_page=10")
 	if err != nil {
 		return Release{}, err
 	}

upnp/debug.go

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

versioner/debug.go

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

versioner/simple.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/calmh/syncthing/osutil"
+	"github.com/syncthing/syncthing/osutil"
 )
 
 func init() {