Translation update

Fixes and improvements

.gitignore

@@ -4,10 +4,8 @@ syncthing.exe
 *.zip
 *.asc
 *.sublime*
-discosrv
 .jshintrc
 coverage.out
 files/pidx
-discosrv.exe
 bin
 perfstats*.csv

build.sh

@@ -22,7 +22,6 @@ check() {
 build() {
 	check
 	godep go build $* -ldflags "$ldflags" ./cmd/syncthing
-	godep go build $* -ldflags "$ldflags" ./cmd/discosrv
 }
 
 assets() {
@@ -102,6 +101,13 @@ xdr() {
 	done
 }
 
+transifex() {
+	pushd gui
+	go run ../cmd/transifexdl/main.go > valid-langs.js
+	popd
+	assets
+}
+
 case "$1" in
 	"")
 		shift
@@ -208,6 +214,10 @@ case "$1" in
 		xdr
 		;;
 
+	transifex)
+		transifex
+		;;
+
 	*)
 		echo "Unknown build parameter $1"
 		;;

cmd/discosrv/.gitignore

@@ -1 +0,0 @@
-discosrv

cmd/discosrv/main.go

@@ -1,288 +0,0 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// All rights reserved. Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"encoding/binary"
-	"encoding/hex"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/calmh/syncthing/discover"
-	"github.com/calmh/syncthing/protocol"
-	"github.com/golang/groupcache/lru"
-	"github.com/juju/ratelimit"
-)
-
-type node struct {
-	addresses []address
-	updated   time.Time
-}
-
-type address struct {
-	ip   []byte
-	port uint16
-}
-
-var (
-	nodes      = make(map[protocol.NodeID]node)
-	lock       sync.Mutex
-	queries    = 0
-	announces  = 0
-	answered   = 0
-	limited    = 0
-	unknowns   = 0
-	debug      = false
-	lruSize    = 1024
-	limitAvg   = 1
-	limitBurst = 10
-	limiter    *lru.Cache
-)
-
-func main() {
-	var listen string
-	var timestamp bool
-	var statsIntv int
-	var statsFile string
-
-	flag.StringVar(&listen, "listen", ":22026", "Listen address")
-	flag.BoolVar(&debug, "debug", false, "Enable debug output")
-	flag.BoolVar(&timestamp, "timestamp", true, "Timestamp the log output")
-	flag.IntVar(&statsIntv, "stats-intv", 0, "Statistics output interval (s)")
-	flag.StringVar(&statsFile, "stats-file", "/var/log/discosrv.stats", "Statistics file name")
-	flag.IntVar(&lruSize, "limit-cache", lruSize, "Limiter cache entries")
-	flag.IntVar(&limitAvg, "limit-avg", limitAvg, "Allowed average package rate, per 10 s")
-	flag.IntVar(&limitBurst, "limit-burst", limitBurst, "Allowed burst size, packets")
-	flag.Parse()
-
-	limiter = lru.New(lruSize)
-
-	log.SetOutput(os.Stdout)
-	if !timestamp {
-		log.SetFlags(0)
-	}
-
-	addr, _ := net.ResolveUDPAddr("udp", listen)
-	conn, err := net.ListenUDP("udp", addr)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if statsIntv > 0 {
-		go logStats(statsFile, statsIntv)
-	}
-
-	var buf = make([]byte, 1024)
-	for {
-		buf = buf[:cap(buf)]
-		n, addr, err := conn.ReadFromUDP(buf)
-
-		if limit(addr) {
-			// Rate limit in effect for source
-			continue
-		}
-
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if n < 4 {
-			log.Printf("Received short packet (%d bytes)", n)
-			continue
-		}
-
-		buf = buf[:n]
-		magic := binary.BigEndian.Uint32(buf)
-
-		switch magic {
-		case discover.AnnouncementMagic:
-			handleAnnounceV2(addr, buf)
-
-		case discover.QueryMagic:
-			handleQueryV2(conn, addr, buf)
-
-		default:
-			lock.Lock()
-			unknowns++
-			lock.Unlock()
-		}
-	}
-}
-
-func limit(addr *net.UDPAddr) bool {
-	key := addr.IP.String()
-
-	lock.Lock()
-	defer lock.Unlock()
-
-	bkt, ok := limiter.Get(key)
-	if ok {
-		bkt := bkt.(*ratelimit.Bucket)
-		if bkt.TakeAvailable(1) != 1 {
-			// Rate limit exceeded; ignore packet
-			if debug {
-				log.Println("Rate limit exceeded for", key)
-			}
-			limited++
-			return true
-		}
-	} else {
-		if debug {
-			log.Println("New limiter for", key)
-		}
-		// One packet per ten seconds average rate, burst ten packets
-		limiter.Add(key, ratelimit.NewBucket(10*time.Second/time.Duration(limitAvg), int64(limitBurst)))
-	}
-
-	return false
-}
-
-func handleAnnounceV2(addr *net.UDPAddr, buf []byte) {
-	var pkt discover.Announce
-	err := pkt.UnmarshalXDR(buf)
-	if err != nil && err != io.EOF {
-		log.Println("AnnounceV2 Unmarshal:", err)
-		log.Println(hex.Dump(buf))
-		return
-	}
-	if debug {
-		log.Printf("<- %v %#v", addr, pkt)
-	}
-
-	lock.Lock()
-	announces++
-	lock.Unlock()
-
-	ip := addr.IP.To4()
-	if ip == nil {
-		ip = addr.IP.To16()
-	}
-
-	var addrs []address
-	for _, addr := range pkt.This.Addresses {
-		tip := addr.IP
-		if len(tip) == 0 {
-			tip = ip
-		}
-		addrs = append(addrs, address{
-			ip:   tip,
-			port: addr.Port,
-		})
-	}
-
-	node := node{
-		addresses: addrs,
-		updated:   time.Now(),
-	}
-
-	var id protocol.NodeID
-	if len(pkt.This.ID) == 32 {
-		// Raw node ID
-		copy(id[:], pkt.This.ID)
-	} else {
-		id.UnmarshalText(pkt.This.ID)
-	}
-
-	lock.Lock()
-	nodes[id] = node
-	lock.Unlock()
-}
-
-func handleQueryV2(conn *net.UDPConn, addr *net.UDPAddr, buf []byte) {
-	var pkt discover.Query
-	err := pkt.UnmarshalXDR(buf)
-	if err != nil {
-		log.Println("QueryV2 Unmarshal:", err)
-		log.Println(hex.Dump(buf))
-		return
-	}
-	if debug {
-		log.Printf("<- %v %#v", addr, pkt)
-	}
-
-	var id protocol.NodeID
-	if len(pkt.NodeID) == 32 {
-		// Raw node ID
-		copy(id[:], pkt.NodeID)
-	} else {
-		id.UnmarshalText(pkt.NodeID)
-	}
-
-	lock.Lock()
-	node, ok := nodes[id]
-	queries++
-	lock.Unlock()
-
-	if ok && len(node.addresses) > 0 {
-		ann := discover.Announce{
-			Magic: discover.AnnouncementMagic,
-			This: discover.Node{
-				ID: pkt.NodeID,
-			},
-		}
-		for _, addr := range node.addresses {
-			ann.This.Addresses = append(ann.This.Addresses, discover.Address{IP: addr.ip, Port: addr.port})
-		}
-		if debug {
-			log.Printf("-> %v %#v", addr, pkt)
-		}
-
-		tb := ann.MarshalXDR()
-		_, _, err = conn.WriteMsgUDP(tb, nil, addr)
-		if err != nil {
-			log.Println("QueryV2 response write:", err)
-		}
-
-		lock.Lock()
-		answered++
-		lock.Unlock()
-	}
-}
-
-func next(intv int) time.Time {
-	d := time.Duration(intv) * time.Second
-	t0 := time.Now()
-	t1 := t0.Add(d).Truncate(d)
-	time.Sleep(t1.Sub(t0))
-	return t1
-}
-
-func logStats(file string, intv int) {
-	f, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
-	if err != nil {
-		log.Fatal(err)
-	}
-	for {
-		t := next(intv)
-
-		lock.Lock()
-
-		var deleted = 0
-		for id, node := range nodes {
-			if time.Since(node.updated) > 60*time.Minute {
-				delete(nodes, id)
-				deleted++
-			}
-		}
-
-		fmt.Fprintf(f, "%d Nr:%d Ne:%d Qt:%d Qa:%d A:%d U:%d Lq:%d Lc:%d\n",
-			t.Unix(), len(nodes), deleted, queries, answered, announces, unknowns, limited, limiter.Len())
-		f.Sync()
-
-		queries = 0
-		announces = 0
-		answered = 0
-		limited = 0
-		unknowns = 0
-
-		lock.Unlock()
-	}
-}

cmd/syncthing/gui.go

@@ -47,7 +47,7 @@ var (
 	static       func(http.ResponseWriter, *http.Request, *log.Logger)
 	apiKey       string
 	modt         = time.Now().UTC().Format(http.TimeFormat)
-	eventSub     = events.NewBufferedSubscription(events.Default.Subscribe(events.AllEvents), 1000)
+	eventSub     *events.BufferedSubscription
 )
 
 const (
@@ -56,6 +56,8 @@ const (
 
 func init() {
 	l.AddHandler(logger.LevelWarn, showGuiError)
+	sub := events.Default.Subscribe(^events.EventType(events.ItemStarted | events.ItemCompleted))
+	eventSub = events.NewBufferedSubscription(sub, 1000)
 }
 
 func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) error {
@@ -92,32 +94,36 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 
 	// The GET handlers
 	getRestMux := http.NewServeMux()
-	getRestMux.HandleFunc("/rest/version", restGetVersion)
+	getRestMux.HandleFunc("/rest/completion", withModel(m, restGetCompletion))
+	getRestMux.HandleFunc("/rest/config", restGetConfig)
+	getRestMux.HandleFunc("/rest/config/sync", restGetConfigInSync)
+	getRestMux.HandleFunc("/rest/connections", withModel(m, restGetConnections))
+	getRestMux.HandleFunc("/rest/discovery", restGetDiscovery)
+	getRestMux.HandleFunc("/rest/errors", restGetErrors)
+	getRestMux.HandleFunc("/rest/events", restGetEvents)
+	getRestMux.HandleFunc("/rest/lang", restGetLang)
 	getRestMux.HandleFunc("/rest/model", withModel(m, restGetModel))
 	getRestMux.HandleFunc("/rest/model/version", withModel(m, restGetModelVersion))
 	getRestMux.HandleFunc("/rest/need", withModel(m, restGetNeed))
-	getRestMux.HandleFunc("/rest/connections", withModel(m, restGetConnections))
-	getRestMux.HandleFunc("/rest/config", restGetConfig)
-	getRestMux.HandleFunc("/rest/config/sync", restGetConfigInSync)
-	getRestMux.HandleFunc("/rest/system", restGetSystem)
-	getRestMux.HandleFunc("/rest/errors", restGetErrors)
-	getRestMux.HandleFunc("/rest/discovery", restGetDiscovery)
-	getRestMux.HandleFunc("/rest/report", withModel(m, restGetReport))
-	getRestMux.HandleFunc("/rest/events", restGetEvents)
-	getRestMux.HandleFunc("/rest/upgrade", restGetUpgrade)
 	getRestMux.HandleFunc("/rest/nodeid", restGetNodeID)
-	getRestMux.HandleFunc("/rest/lang", restGetLang)
+	getRestMux.HandleFunc("/rest/report", withModel(m, restGetReport))
+	getRestMux.HandleFunc("/rest/system", restGetSystem)
+	getRestMux.HandleFunc("/rest/upgrade", restGetUpgrade)
+	getRestMux.HandleFunc("/rest/version", restGetVersion)
+
+	// Debug endpoints, not for general use
+	getRestMux.HandleFunc("/rest/debug/peerCompletion", withModel(m, restGetPeerCompletion))
 
 	// The POST handlers
 	postRestMux := http.NewServeMux()
 	postRestMux.HandleFunc("/rest/config", withModel(m, restPostConfig))
-	postRestMux.HandleFunc("/rest/restart", restPostRestart)
-	postRestMux.HandleFunc("/rest/reset", restPostReset)
-	postRestMux.HandleFunc("/rest/shutdown", restPostShutdown)
+	postRestMux.HandleFunc("/rest/discovery/hint", restPostDiscoveryHint)
 	postRestMux.HandleFunc("/rest/error", restPostError)
 	postRestMux.HandleFunc("/rest/error/clear", restClearErrors)
-	postRestMux.HandleFunc("/rest/discovery/hint", restPostDiscoveryHint)
 	postRestMux.HandleFunc("/rest/model/override", withModel(m, restPostOverride))
+	postRestMux.HandleFunc("/rest/reset", restPostReset)
+	postRestMux.HandleFunc("/rest/restart", restPostRestart)
+	postRestMux.HandleFunc("/rest/shutdown", restPostShutdown)
 	postRestMux.HandleFunc("/rest/upgrade", restPostUpgrade)
 
 	// A handler that splits requests between the two above and disables
@@ -175,6 +181,25 @@ func restGetVersion(w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte(Version))
 }
 
+func restGetCompletion(m *model.Model, w http.ResponseWriter, r *http.Request) {
+	var qs = r.URL.Query()
+	var repo = qs.Get("repo")
+	var nodeStr = qs.Get("node")
+
+	node, err := protocol.NodeIDFromString(nodeStr)
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+
+	res := map[string]float64{
+		"completion": m.Completion(node, repo),
+	}
+
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	json.NewEncoder(w).Encode(res)
+}
+
 func restGetModelVersion(m *model.Model, w http.ResponseWriter, r *http.Request) {
 	var qs = r.URL.Query()
 	var repo = qs.Get("repo")
@@ -288,6 +313,7 @@ func restPostConfig(m *model.Model, w http.ResponseWriter, r *http.Request) {
 			nm := newCfg.NodeMap()
 			for k := range om {
 				if _, ok := nm[k]; !ok {
+					// A node was removed and another added
 					configInSync = false
 					break
 				}
@@ -422,11 +448,18 @@ func restGetReport(m *model.Model, w http.ResponseWriter, r *http.Request) {
 
 func restGetEvents(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
-	ts := qs.Get("since")
-	since, _ := strconv.Atoi(ts)
+	sinceStr := qs.Get("since")
+	limitStr := qs.Get("limit")
+	since, _ := strconv.Atoi(sinceStr)
+	limit, _ := strconv.Atoi(limitStr)
+
+	evs := eventSub.Since(since, nil)
+	if 0 < limit && limit < len(evs) {
+		evs = evs[len(evs)-limit:]
+	}
 
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(eventSub.Since(since, nil))
+	json.NewEncoder(w).Encode(evs)
 }
 
 func restGetUpgrade(w http.ResponseWriter, r *http.Request) {
@@ -495,6 +528,31 @@ func getQR(w http.ResponseWriter, r *http.Request) {
 	w.Write(code.PNG())
 }
 
+func restGetPeerCompletion(m *model.Model, w http.ResponseWriter, r *http.Request) {
+	tot := map[string]float64{}
+	count := map[string]float64{}
+
+	for _, repo := range cfg.Repositories {
+		for _, node := range repo.NodeIDs() {
+			nodeStr := node.String()
+			if m.ConnectedTo(node) {
+				tot[nodeStr] += m.Completion(node, repo.ID)
+			} else {
+				tot[nodeStr] = 0
+			}
+			count[nodeStr]++
+		}
+	}
+
+	comp := map[string]int{}
+	for node := range tot {
+		comp[node] = int(tot[node] / count[node])
+	}
+
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	json.NewEncoder(w).Encode(comp)
+}
+
 func basicAuthMiddleware(username string, passhash string, next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if validAPIKey(r.Header.Get("X-API-Key")) {

cmd/syncthing/main.go

@@ -293,7 +293,9 @@ func main() {
 		rateBucket = ratelimit.NewBucketWithRate(float64(1000*cfg.Options.MaxSendKbps), int64(5*1000*cfg.Options.MaxSendKbps))
 	}
 
-	removeLegacyIndexes()
+	// If this is the first time the user runs v0.9, archive the old indexes and config.
+	archiveLegacyConfig()
+
 	db, err := leveldb.OpenFile(filepath.Join(confDir, "index"), nil)
 	if err != nil {
 		l.Fatalln("leveldb.OpenFile():", err)
@@ -308,20 +310,29 @@ nextRepo:
 
 		repo.Directory = expandTilde(repo.Directory)
 
-		// Safety check. If the cached index contains files but the repository
-		// doesn't exist, we have a problem. We would assume that all files
-		// have been deleted which might not be the case, so abort instead.
-
-		id := fmt.Sprintf("%x", sha1.Sum([]byte(repo.Directory)))
-		idxFile := filepath.Join(confDir, id+".idx.gz")
-		if _, err := os.Stat(idxFile); err == nil {
-			if fi, err := os.Stat(repo.Directory); err != nil || !fi.IsDir() {
+		fi, err := os.Stat(repo.Directory)
+		if m.LocalVersion(repo.ID) > 0 {
+			// Safety check. If the cached index contains files but the
+			// repository doesn't exist, we have a problem. We would assume
+			// that all files have been deleted which might not be the case,
+			// so mark it as invalid instead.
+			if err != nil || !fi.IsDir() {
 				cfg.Repositories[i].Invalid = "repo directory missing"
 				continue nextRepo
 			}
+		} else if os.IsNotExist(err) {
+			// If we don't have ny files in the index, and the directory does
+			// exist, try creating it.
+			err = os.MkdirAll(repo.Directory, 0700)
+		}
+
+		if err != nil {
+			// If there was another error or we could not create the
+			// directory, the repository is invalid.
+			cfg.Repositories[i].Invalid = err.Error()
+			continue nextRepo
 		}
 
-		ensureDir(repo.Directory, -1)
 		m.AddRepo(repo)
 	}
 
@@ -483,7 +494,7 @@ func setupUPnP(r rand.Source) int {
 	if len(cfg.Options.ListenAddress) == 1 {
 		_, portStr, err := net.SplitHostPort(cfg.Options.ListenAddress[0])
 		if err != nil {
-			l.Warnln(err)
+			l.Warnln("Bad listen address:", err)
 		} else {
 			// Set up incoming port forwarding, if necessary and possible
 			port, _ := strconv.Atoi(portStr)
@@ -527,14 +538,39 @@ func resetRepositories() {
 	os.RemoveAll(idx)
 }
 
-func removeLegacyIndexes() {
+func archiveLegacyConfig() {
 	pat := filepath.Join(confDir, "*.idx.gz*")
 	idxs, err := filepath.Glob(pat)
-	if err == nil {
-		for _, idx := range idxs {
-			l.Infof("Reset: Removing %s", idx)
-			os.Remove(idx)
+	if err == nil && len(idxs) > 0 {
+		// There are legacy indexes. This is probably the first time we run as v0.9.
+		backupDir := filepath.Join(confDir, "backup-of-v0.8")
+		err = os.MkdirAll(backupDir, 0700)
+		if err != nil {
+			l.Warnln("Cannot archive config/indexes:", err)
+			return
 		}
+
+		for _, idx := range idxs {
+			l.Infof("Archiving %s", filepath.Base(idx))
+			os.Rename(idx, filepath.Join(backupDir, filepath.Base(idx)))
+		}
+
+		src, err := os.Open(filepath.Join(confDir, "config.xml"))
+		if err != nil {
+			l.Warnf("Cannot archive config:", err)
+			return
+		}
+		defer src.Close()
+
+		dst, err := os.Create(filepath.Join(backupDir, "config.xml"))
+		if err != nil {
+			l.Warnf("Cannot archive config:", err)
+			return
+		}
+		defer src.Close()
+
+		l.Infoln("Archiving config.xml")
+		io.Copy(dst, src)
 	}
 }
 
@@ -553,7 +589,7 @@ func restart() {
 	}
 	pgm, err := exec.LookPath(os.Args[0])
 	if err != nil {
-		l.Warnln(err)
+		l.Warnln("Cannot restart:", err)
 		return
 	}
 	proc, err := os.StartProcess(pgm, os.Args, &os.ProcAttr{
@@ -577,26 +613,26 @@ func saveConfigLoop(cfgFile string) {
 	for _ = range saveConfigCh {
 		fd, err := os.Create(cfgFile + ".tmp")
 		if err != nil {
-			l.Warnln(err)
+			l.Warnln("Saving config:", err)
 			continue
 		}
 
 		err = config.Save(fd, cfg)
 		if err != nil {
-			l.Warnln(err)
+			l.Warnln("Saving config:", err)
 			fd.Close()
 			continue
 		}
 
 		err = fd.Close()
 		if err != nil {
-			l.Warnln(err)
+			l.Warnln("Saving config:", err)
 			continue
 		}
 
 		err = osutil.Rename(cfgFile+".tmp", cfgFile)
 		if err != nil {
-			l.Warnln(err)
+			l.Warnln("Saving config:", err)
 		}
 	}
 }
@@ -624,7 +660,8 @@ next:
 			conn.Close()
 			continue
 		}
-		remoteID := protocol.NewNodeID(certs[0].Raw)
+		remoteCert := certs[0]
+		remoteID := protocol.NewNodeID(remoteCert.Raw)
 
 		if remoteID == myID {
 			l.Infof("Connected to myself (%s) - should not happen", remoteID)
@@ -640,12 +677,32 @@ next:
 
 		for _, nodeCfg := range cfg.Nodes {
 			if nodeCfg.NodeID == remoteID {
+				// Verify the name on the certificate. By default we set it to
+				// "syncthing" when generating, but the user may have replaced
+				// the certificate and used another name.
+				certName := nodeCfg.CertName
+				if certName == "" {
+					certName = "syncthing"
+				}
+				err := remoteCert.VerifyHostname(certName)
+				if err != nil {
+					// Incorrect certificate name is something the user most
+					// likely wants to know about, since it's an advanced
+					// config. Warn instead of Info.
+					l.Warnf("Bad certificate from %s (%v): %v", remoteID, conn.RemoteAddr(), err)
+					conn.Close()
+					continue next
+				}
+
+				// If rate limiting is set, we wrap the write side of the
+				// connection in a limiter.
 				var wr io.Writer = conn
 				if rateBucket != nil {
 					wr = &limitedWriter{conn, rateBucket}
 				}
+
 				name := fmt.Sprintf("%s-%s", conn.LocalAddr(), conn.RemoteAddr())
-				protoConn := protocol.NewConnection(remoteID, conn, wr, m, name)
+				protoConn := protocol.NewConnection(remoteID, conn, wr, m, name, nodeCfg.Compression)
 
 				l.Infof("Established secure connection to %s at %s", remoteID, name)
 				if debugNet {
@@ -679,7 +736,7 @@ func listenTLS(conns chan *tls.Conn, addr string, tlsCfg *tls.Config) {
 	for {
 		conn, err := listener.Accept()
 		if err != nil {
-			l.Warnln(err)
+			l.Warnln("Accepting connection:", err)
 			continue
 		}
 
@@ -693,7 +750,7 @@ func listenTLS(conns chan *tls.Conn, addr string, tlsCfg *tls.Config) {
 		tc := tls.Server(conn, tlsCfg)
 		err = tc.Handshake()
 		if err != nil {
-			l.Warnln(err)
+			l.Infoln("TLS handshake:", err)
 			tc.Close()
 			continue
 		}
@@ -765,7 +822,7 @@ func dialTLS(m *model.Model, conns chan *tls.Conn, tlsCfg *tls.Config) {
 				tc := tls.Client(conn, tlsCfg)
 				err = tc.Handshake()
 				if err != nil {
-					l.Warnln(err)
+					l.Infoln("TLS handshake:", err)
 					tc.Close()
 					continue
 				}

cmd/syncthing/upgrade_common.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"strconv"
 	"strings"
 )
@@ -17,17 +16,114 @@ type githubAsset struct {
 	Name string `json:"name"`
 }
 
+// Returns 1 if a>b, -1 if a<b and 0 if they are equal
 func compareVersions(a, b string) int {
-	return bytes.Compare(versionParts(a), versionParts(b))
+	arel, apre := versionParts(a)
+	brel, bpre := versionParts(b)
+
+	minlen := len(arel)
+	if l := len(brel); l < minlen {
+		minlen = l
+	}
+
+	// First compare major-minor-patch versions
+	for i := 0; i < minlen; i++ {
+		if arel[i] < brel[i] {
+			return -1
+		}
+		if arel[i] > brel[i] {
+			return 1
+		}
+	}
+
+	// Longer version is newer, when the preceding parts are equal
+	if len(arel) < len(brel) {
+		return -1
+	}
+	if len(arel) > len(brel) {
+		return 1
+	}
+
+	// Prerelease versions are older, if the versions are the same
+	if len(apre) == 0 && len(bpre) > 0 {
+		return 1
+	}
+	if len(apre) > 0 && len(bpre) == 0 {
+		return -1
+	}
+
+	minlen = len(apre)
+	if l := len(bpre); l < minlen {
+		minlen = l
+	}
+
+	// Compare prerelease strings
+	for i := 0; i < minlen; i++ {
+		switch av := apre[i].(type) {
+		case int:
+			switch bv := bpre[i].(type) {
+			case int:
+				if av < bv {
+					return -1
+				}
+				if av > bv {
+					return 1
+				}
+			case string:
+				return -1
+			}
+		case string:
+			switch bv := bpre[i].(type) {
+			case int:
+				return 1
+			case string:
+				if av < bv {
+					return -1
+				}
+				if av > bv {
+					return 1
+				}
+			}
+		}
+	}
+
+	// If all else is equal, longer prerelease string is newer
+	if len(apre) < len(bpre) {
+		return -1
+	}
+	if len(apre) > len(bpre) {
+		return 1
+	}
+
+	// Looks like they're actually the same
+	return 0
 }
 
-func versionParts(v string) []byte {
-	parts := strings.Split(v, "-")
+// Split a version into parts.
+// "1.2.3-beta.2" -> []int{1, 2, 3}, []interface{}{"beta", 2}
+func versionParts(v string) ([]int, []interface{}) {
+	parts := strings.SplitN(v, "-", 2)
 	fields := strings.Split(parts[0], ".")
-	res := make([]byte, len(fields))
+
+	release := make([]int, len(fields))
 	for i, s := range fields {
 		v, _ := strconv.Atoi(s)
-		res[i] = byte(v)
+		release[i] = v
 	}
-	return res
+
+	var prerelease []interface{}
+	if len(parts) > 1 {
+		fields = strings.Split(parts[1], ".")
+		prerelease = make([]interface{}, len(fields))
+		for i, s := range fields {
+			v, err := strconv.Atoi(s)
+			if err == nil {
+				prerelease[i] = v
+			} else {
+				prerelease[i] = s
+			}
+		}
+	}
+
+	return release, prerelease
 }

cmd/syncthing/upgrade_test.go

@@ -20,6 +20,14 @@ var testcases = []struct {
 	{"0.1.10", "0.1.9", 1},
 	{"0.10.0", "0.2.0", 1},
 	{"30.10.0", "4.9.0", 1},
+	{"0.9.0-beta7", "0.9.0-beta6", 1},
+	{"1.0.0-alpha", "1.0.0-alpha.1", -1},
+	{"1.0.0-alpha.1", "1.0.0-alpha.beta", -1},
+	{"1.0.0-alpha.beta", "1.0.0-beta", -1},
+	{"1.0.0-beta", "1.0.0-beta.2", -1},
+	{"1.0.0-beta.2", "1.0.0-beta.11", -1},
+	{"1.0.0-beta.11", "1.0.0-rc.1", -1},
+	{"1.0.0-rc.1", "1.0.0", -1},
 }
 
 func TestCompareVersions(t *testing.T) {

cmd/transifexdl/main.go

@@ -0,0 +1,93 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"sort"
+)
+
+type stat struct {
+	Translated   int `json:"translated_entities"`
+	Untranslated int `json:"untranslated_entities"`
+}
+
+type translation struct {
+	Content string
+}
+
+func main() {
+	log.SetFlags(log.Lshortfile)
+
+	if u, p := userPass(); u == "" || p == "" {
+		log.Fatal("Need environment variables TRANSIFEX_USER and TRANSIFEX_PASS")
+	}
+
+	resp := req("https://www.transifex.com/api/2/project/syncthing/resource/gui/stats")
+
+	var stats map[string]stat
+	err := json.NewDecoder(resp.Body).Decode(&stats)
+	if err != nil {
+		log.Fatal(err)
+	}
+	resp.Body.Close()
+
+	var langs []string
+	for code, stat := range stats {
+		shortCode := code[:2]
+		if pct := 100 * stat.Translated / (stat.Translated + stat.Untranslated); pct < 95 {
+			log.Printf("Skipping language %q (too low completion ratio %d%%)", shortCode, pct)
+			os.Remove("lang-" + shortCode + ".json")
+			continue
+		}
+
+		langs = append(langs, shortCode)
+		if shortCode == "en" {
+			continue
+		}
+
+		log.Printf("Updating language %q", shortCode)
+
+		resp := req("https://www.transifex.com/api/2/project/syncthing/resource/gui/translation/" + code)
+		var t translation
+		err := json.NewDecoder(resp.Body).Decode(&t)
+		if err != nil {
+			log.Fatal(err)
+		}
+		resp.Body.Close()
+
+		fd, err := os.Create("lang-" + shortCode + ".json")
+		if err != nil {
+			log.Fatal(err)
+		}
+		fd.WriteString(t.Content)
+		fd.Close()
+	}
+
+	sort.Strings(langs)
+	fmt.Print("var validLangs = ")
+	json.NewEncoder(os.Stdout).Encode(langs)
+}
+
+func userPass() (string, string) {
+	user := os.Getenv("TRANSIFEX_USER")
+	pass := os.Getenv("TRANSIFEX_PASS")
+	return user, pass
+}
+
+func req(url string) *http.Response {
+	user, pass := userPass()
+
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	req.SetBasicAuth(user, pass)
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		log.Fatal(err)
+	}
+	return resp
+}

config/config.go

@@ -93,9 +93,11 @@ func (r *RepositoryConfiguration) NodeIDs() []protocol.NodeID {
 }
 
 type NodeConfiguration struct {
-	NodeID    protocol.NodeID `xml:"id,attr"`
-	Name      string          `xml:"name,attr,omitempty"`
-	Addresses []string        `xml:"address,omitempty"`
+	NodeID      protocol.NodeID `xml:"id,attr"`
+	Name        string          `xml:"name,attr,omitempty"`
+	Addresses   []string        `xml:"address,omitempty"`
+	Compression bool            `xml:"compression,attr"`
+	CertName    string          `xml:"certName,attr,omitempty"`
 }
 
 type OptionsConfiguration struct {
@@ -313,10 +315,14 @@ func Load(rd io.Reader, myID protocol.NodeID) (Configuration, error) {
 
 	// Ensure this node is present in all relevant places
 	// Ensure that any loose nodes are not present in the wrong places
+	// Ensure that there are no duplicate nodes
 	cfg.Nodes = ensureNodePresent(cfg.Nodes, myID)
+	sort.Sort(NodeConfigurationList(cfg.Nodes))
 	for i := range cfg.Repositories {
 		cfg.Repositories[i].Nodes = ensureNodePresent(cfg.Repositories[i].Nodes, myID)
 		cfg.Repositories[i].Nodes = ensureExistingNodes(cfg.Repositories[i].Nodes, existingNodes)
+		cfg.Repositories[i].Nodes = ensureNoDuplicates(cfg.Repositories[i].Nodes)
+		sort.Sort(NodeConfigurationList(cfg.Repositories[i].Nodes))
 	}
 
 	// An empty address list is equivalent to a single "dynamic" entry
@@ -381,40 +387,50 @@ func (l NodeConfigurationList) Len() int {
 }
 
 func ensureNodePresent(nodes []NodeConfiguration, myID protocol.NodeID) []NodeConfiguration {
-	var myIDExists bool
 	for _, node := range nodes {
 		if node.NodeID.Equals(myID) {
-			myIDExists = true
-			break
+			return nodes
 		}
 	}
 
-	if !myIDExists {
-		name, _ := os.Hostname()
-		nodes = append(nodes, NodeConfiguration{
-			NodeID: myID,
-			Name:   name,
-		})
-	}
-
-	sort.Sort(NodeConfigurationList(nodes))
+	name, _ := os.Hostname()
+	nodes = append(nodes, NodeConfiguration{
+		NodeID: myID,
+		Name:   name,
+	})
 
 	return nodes
 }
 
 func ensureExistingNodes(nodes []NodeConfiguration, existingNodes map[protocol.NodeID]bool) []NodeConfiguration {
+	count := len(nodes)
 	i := 0
-	for _, node := range nodes {
-		if _, ok := existingNodes[node.NodeID]; !ok {
-			last := len(nodes) - 1
-			nodes[i] = nodes[last]
-			nodes = nodes[:last]
-		} else {
-			i++
+loop:
+	for i < count {
+		if _, ok := existingNodes[nodes[i].NodeID]; !ok {
+			nodes[i] = nodes[count-1]
+			count--
+			continue loop
 		}
+		i++
 	}
+	return nodes[0:count]
+}
 
-	sort.Sort(NodeConfigurationList(nodes))
-
-	return nodes
+func ensureNoDuplicates(nodes []NodeConfiguration) []NodeConfiguration {
+	count := len(nodes)
+	i := 0
+	seenNodes := make(map[protocol.NodeID]bool)
+loop:
+	for i < count {
+		id := nodes[i].NodeID
+		if _, ok := seenNodes[id]; ok {
+			nodes[i] = nodes[count-1]
+			count--
+			continue loop
+		}
+		seenNodes[id] = true
+		i++
+	}
+	return nodes[0:count]
 }

config/config_test.go

@@ -59,6 +59,12 @@ func TestNodeConfig(t *testing.T) {
         <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ" name="node two">
             <address>b</address>
         </node>
+        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" name="node one">
+            <address>a</address>
+        </node>
+        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ" name="node two">
+            <address>b</address>
+        </node>
     </repository>
     <options>
         <readOnly>true</readOnly>
@@ -69,9 +75,12 @@ func TestNodeConfig(t *testing.T) {
 	v2data := []byte(`
 <configuration version="2">
     <repository id="test" directory="~/Sync" ro="true">
+        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ"/>
         <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ"/>
         <node id="C4YBIESWDUAIGU62GOSRXCRAAJDWVE3TKCPMURZE2LH5QHAF576A"/>
         <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ"/>
+        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ"/>
+        <node id="C4YBIESWDUAIGU62GOSRXCRAAJDWVE3TKCPMURZE2LH5QHAF576A"/>
     </repository>
     <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" name="node one">
         <address>a</address>

files/leveldb.go

@@ -632,9 +632,6 @@ func ldbWithNeed(db *leveldb.DB, repo, node []byte, fn fileIterator) {
 
 		if need || !have {
 			name := globalKeyName(dbi.Key())
-			if debug {
-				l.Debugf("need repo=%q node=%v name=%q need=%v have=%v haveV=%d globalV=%d", repo, protocol.NodeIDFromBytes(node), name, need, have, haveVersion, vl.versions[0].version)
-			}
 			fk := nodeKey(repo, vl.versions[0].node, name)
 			bs, err := snap.Get(fk, nil)
 			if err != nil {
@@ -652,6 +649,10 @@ func ldbWithNeed(db *leveldb.DB, repo, node []byte, fn fileIterator) {
 				continue
 			}
 
+			if debug {
+				l.Debugf("need repo=%q node=%v name=%q need=%v have=%v haveV=%d globalV=%d", repo, protocol.NodeIDFromBytes(node), name, need, have, haveVersion, vl.versions[0].version)
+			}
+
 			if cont := fn(gf); !cont {
 				return
 			}

files/set.go

@@ -85,7 +85,7 @@ func (s *Set) Update(node protocol.NodeID, fs []protocol.FileInfo) {
 
 func (s *Set) WithNeed(node protocol.NodeID, fn fileIterator) {
 	if debug {
-		l.Debugf("%s Need(%v)", s.repo, node)
+		l.Debugf("%s WithNeed(%v)", s.repo, node)
 	}
 	ldbWithNeed(s.db, []byte(s.repo), node[:], fn)
 }

gui/app.js

@@ -9,7 +9,6 @@
 
 var syncthing = angular.module('syncthing', ['pascalprecht.translate']);
 var urlbase = 'rest';
-var validLangs = ['de', 'en', 'es', 'fr', 'pt', 'sv'];
 
 syncthing.config(function ($httpProvider, $translateProvider) {
     $httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token';
@@ -21,23 +20,69 @@ syncthing.config(function ($httpProvider, $translateProvider) {
     });
 });
 
+syncthing.controller('EventCtrl', function ($scope, $http) {
+    $scope.lastEvent = null;
+    var online = false;
+    var lastID = 0;
+
+    var successFn = function (data) {
+        if (!online) {
+            $scope.$emit('UIOnline');
+            online = true;
+        }
+
+        if (lastID > 0) {
+            data.forEach(function (event) {
+                console.log("event", event.id, event.type, event.data);
+                $scope.$emit(event.type, event);
+            });
+        };
+
+        $scope.lastEvent = data[data.length - 1];
+        lastID = $scope.lastEvent.id;
+
+        setTimeout(function () {
+            $http.get(urlbase + '/events?since=' + lastID)
+            .success(successFn)
+            .error(errorFn);
+        }, 500);
+    };
+
+    var errorFn = function (data) {
+        if (online) {
+            $scope.$emit('UIOffline');
+            online = false;
+        }
+        setTimeout(function () {
+            $http.get(urlbase + '/events?limit=1')
+            .success(successFn)
+            .error(errorFn);
+        }, 1000);
+    };
+
+    $http.get(urlbase + '/events?limit=1')
+        .success(successFn)
+        .error(errorFn);
+});
+
 syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $location) {
     var prevDate = 0;
     var getOK = true;
     var restarting = false;
 
-    $scope.connections = {};
+    $scope.completion = {};
     $scope.config = {};
+    $scope.configInSync = true;
+    $scope.connections = {};
+    $scope.errors = [];
+    $scope.model = {};
     $scope.myID = '';
     $scope.nodes = [];
-    $scope.configInSync = true;
     $scope.protocolChanged = false;
-    $scope.errors = [];
-    $scope.seenError = '';
-    $scope.model = {};
-    $scope.repos = {};
     $scope.reportData = {};
     $scope.reportPreview = false;
+    $scope.repos = {};
+    $scope.seenError = '';
     $scope.upgradeInfo = {};
 
     $http.get(urlbase+"/lang").success(function (langs) {
@@ -71,53 +116,136 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         'touch': 'asterisk',
     }
 
-    function getSucceeded() {
-        if (!getOK) {
-            $scope.init();
-            $('#networkError').modal('hide');
-            getOK = true;
-        }
-        if (restarting) {
-            $scope.init();
-            $('#restarting').modal('hide');
-            $('#shutdown').modal('hide');
-            restarting = false;
-        }
-    }
+    $scope.$on('UIOnline', function (event, arg) {
+        console.log('UIOnline');
+        $scope.init();
+        restarting = false;
+        $('#networkError').modal('hide');
+        $('#restarting').modal('hide');
+        $('#shutdown').modal('hide');
+    });
 
-    function getFailed() {
-        if (restarting) {
-            return;
-        }
-        if (getOK) {
+    $scope.$on('UIOffline', function (event, arg) {
+        console.log('UIOffline');
+        if (!restarting) {
             $('#networkError').modal({backdrop: 'static', keyboard: false});
-            getOK = false;
         }
+    });
+
+    $scope.$on('StateChanged', function (event, arg) {
+        var data = arg.data;
+        if ($scope.model[data.repo]) {
+            $scope.model[data.repo].state = data.to;
+        }
+    });
+
+    $scope.$on('LocalIndexUpdated', function (event, arg) {
+        var data = arg.data;
+        refreshRepo(data.repo);
+
+        // Update completion status for all nodes that we share this repo with.
+        $scope.repos[data.repo].Nodes.forEach(function (nodeCfg) {
+            refreshCompletion(nodeCfg.NodeID, data.repo);
+        });
+    });
+
+    $scope.$on('RemoteIndexUpdated', function (event, arg) {
+        var data = arg.data;
+        refreshRepo(data.repo);
+        refreshCompletion(data.node, data.repo);
+    });
+
+    $scope.$on('NodeDisconnected', function (event, arg) {
+        delete $scope.connections[arg.data.id];
+    });
+
+    $scope.$on('NodeConnected', function (event, arg) {
+        if (!$scope.connections[arg.data.id]) {
+            $scope.connections[arg.data.id] = {
+                inbps: 0,
+                outbps: 0,
+                InBytesTotal: 0,
+                OutBytesTotal: 0,
+                Address: arg.data.addr,
+            };
+        }
+    });
+
+    $scope.$on('ConfigLoaded', function (event) {
+        if ($scope.config.Options.URAccepted == 0) {
+            // If usage reporting has been neither accepted nor declined,
+            // we want to ask the user to make a choice. But we don't want
+            // to bug them during initial setup, so we set a cookie with
+            // the time of the first visit. When that cookie is present
+            // and the time is more than four hours ago, we ask the
+            // question.
+
+            var firstVisit = document.cookie.replace(/(?:(?:^|.*;\s*)firstVisit\s*\=\s*([^;]*).*$)|^.*$/, "$1");
+            if (!firstVisit) {
+                document.cookie = "firstVisit=" + Date.now() + ";max-age=" + 30*24*3600;
+            } else {
+                if (+firstVisit < Date.now() - 4*3600*1000){
+                    $('#ur').modal({backdrop: 'static', keyboard: false});
+                }
+            }
+        }
+    })
+
+    var debouncedFuncs = {};
+
+    function refreshRepo(repo) {
+        var key = "refreshRepo" + repo;
+        if (!debouncedFuncs[key]) {
+            debouncedFuncs[key] = debounce(function () {
+                $http.get(urlbase + '/model?repo=' + encodeURIComponent(repo)).success(function (data) {
+                    $scope.model[repo] = data;
+                    console.log("refreshRepo", repo, data);
+                });
+            }, 1000, true);
+        }
+        debouncedFuncs[key]();
     }
 
-    $scope.refresh = function () {
+    function refreshSystem() {
         $http.get(urlbase + '/system').success(function (data) {
-            getSucceeded();
+            $scope.myID = data.myID;
             $scope.system = data;
-        }).error(function () {
-            getFailed();
+            console.log("refreshSystem", data);
         });
-        Object.keys($scope.repos).forEach(function (id) {
-            if (typeof $scope.model[id] === 'undefined') {
-                // Never fetched before
-                $http.get(urlbase + '/model?repo=' + encodeURIComponent(id)).success(function (data) {
-                    $scope.model[id] = data;
-                });
-            } else {
-                $http.get(urlbase + '/model/version?repo=' + encodeURIComponent(id)).success(function (data) {
-                    if (data.version > $scope.model[id].version) {
-                        $http.get(urlbase + '/model?repo=' + encodeURIComponent(id)).success(function (data) {
-                            $scope.model[id] = data;
-                        });
+    }
+
+    function refreshCompletion(node, repo) {
+        if (node === $scope.myID) {
+            return
+        }
+
+        var key = "refreshCompletion" + node + repo;
+        if (!debouncedFuncs[key]) {
+            debouncedFuncs[key] = debounce(function () {
+                $http.get(urlbase + '/completion?node=' + node + '&repo=' + encodeURIComponent(repo)).success(function (data) {
+                    if (!$scope.completion[node]) {
+                        $scope.completion[node] = {};
                     }
+                    $scope.completion[node][repo] = data.completion;
+
+                    var tot = 0, cnt = 0;
+                    for (var cmp in $scope.completion[node]) {
+                        if (cmp === "_total") {
+                            continue;
+                        }
+                        tot += $scope.completion[node][cmp];
+                        cnt += 1;
+                    }
+                    $scope.completion[node]._total = tot / cnt;
+
+                    console.log("refreshCompletion", node, repo, $scope.completion[node]);
                 });
-            }
-        });
+            }, 1000, true);
+        }
+        debouncedFuncs[key]();
+    }
+
+    function refreshConnectionStats() {
         $http.get(urlbase + '/connections').success(function (data) {
             var now = Date.now(),
             td = (now - prevDate) / 1000,
@@ -137,10 +265,71 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
                 }
             }
             $scope.connections = data;
+            console.log("refreshConnections", data);
         });
+    }
+
+    function refreshErrors() {
         $http.get(urlbase + '/errors').success(function (data) {
             $scope.errors = data;
+            console.log("refreshErrors", data);
         });
+    }
+
+    function refreshConfig() {
+        $http.get(urlbase + '/config').success(function (data) {
+            var hasConfig = !isEmptyObject($scope.config);
+
+            $scope.config = data;
+            $scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', ');
+
+            $scope.nodes = $scope.config.Nodes;
+            $scope.nodes.sort(nodeCompare);
+
+            $scope.repos = repoMap($scope.config.Repositories);
+            Object.keys($scope.repos).forEach(function (repo) {
+                refreshRepo(repo);
+                $scope.repos[repo].Nodes.forEach(function (nodeCfg) {
+                    refreshCompletion(nodeCfg.NodeID, repo);
+                });
+            });
+
+            if (!hasConfig) {
+                $scope.$emit('ConfigLoaded');
+            }
+
+            console.log("refreshConfig", data);
+        });
+
+        $http.get(urlbase + '/config/sync').success(function (data) {
+            $scope.configInSync = data.configInSync;
+        });
+    }
+
+    $scope.init = function() {
+        refreshSystem();
+        refreshConfig();
+        refreshConnectionStats();
+
+        $http.get(urlbase + '/version').success(function (data) {
+            $scope.version = data;
+        });
+
+        $http.get(urlbase + '/report').success(function (data) {
+            $scope.reportData = data;
+        });
+
+        $http.get(urlbase + '/upgrade').success(function (data) {
+            $scope.upgradeInfo = data;
+        }).error(function () {
+            $scope.upgradeInfo = {};
+        });
+    };
+
+    $scope.refresh = function () {
+        refreshSystem();
+        refreshConnectionStats();
+        refreshErrors();
     };
 
     $scope.repoStatus = function (repo) {
@@ -187,9 +376,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     };
 
     $scope.nodeIcon = function (nodeCfg) {
-        var conn = $scope.connections[nodeCfg.NodeID];
-        if (conn) {
-            if (conn.Completion === 100) {
+        if ($scope.connections[nodeCfg.NodeID]) {
+            if ($scope.completion[nodeCfg.NodeID] && $scope.completion[nodeCfg.NodeID]._total === 100) {
                 return 'ok';
             } else {
                 return 'refresh';
@@ -200,9 +388,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     };
 
     $scope.nodeClass = function (nodeCfg) {
-        var conn = $scope.connections[nodeCfg.NodeID];
-        if (conn) {
-            if (conn.Completion === 100) {
+        if ($scope.connections[nodeCfg.NodeID]) {
+            if ($scope.completion[nodeCfg.NodeID] && $scope.completion[nodeCfg.NodeID]._total === 100) {
                 return 'success';
             } else {
                 return 'primary';
@@ -372,7 +559,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     };
 
     $scope.addNode = function () {
-        $scope.currentNode = {AddressesStr: 'dynamic'};
+        $scope.currentNode = {AddressesStr: 'dynamic', Compression: true};
         $scope.editingExisting = false;
         $scope.editingSelf = false;
         $scope.nodeEditor.$setPristine();
@@ -552,60 +739,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         cfg.APIKey = randomString(30, 32);
     };
 
-    $scope.init = function() {
-        $http.get(urlbase + '/version').success(function (data) {
-            $scope.version = data;
-        });
 
-        $http.get(urlbase + '/system').success(function (data) {
-            $scope.system = data;
-            $scope.myID = data.myID;
-        });
-
-        $http.get(urlbase + '/config').success(function (data) {
-            $scope.config = data;
-            $scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', ');
-
-            $scope.nodes = $scope.config.Nodes;
-            $scope.nodes.sort(nodeCompare);
-
-            $scope.repos = repoMap($scope.config.Repositories);
-
-            $scope.refresh();
-
-            if ($scope.config.Options.URAccepted == 0) {
-                // If usage reporting has been neither accepted nor declined,
-                // we want to ask the user to make a choice. But we don't want
-                // to bug them during initial setup, so we set a cookie with
-                // the time of the first visit. When that cookie is present
-                // and the time is more than four hours ago, we ask the
-                // question.
-
-                var firstVisit = document.cookie.replace(/(?:(?:^|.*;\s*)firstVisit\s*\=\s*([^;]*).*$)|^.*$/, "$1");
-                if (!firstVisit) {
-                    document.cookie = "firstVisit=" + Date.now() + ";max-age=" + 30*24*3600;
-                } else {
-                    if (+firstVisit < Date.now() - 4*3600*1000){
-                        $('#ur').modal({backdrop: 'static', keyboard: false});
-                    }
-                }
-            }
-        });
-
-        $http.get(urlbase + '/config/sync').success(function (data) {
-            $scope.configInSync = data.configInSync;
-        });
-
-        $http.get(urlbase + '/report').success(function (data) {
-            $scope.reportData = data;
-        });
-
-        $http.get(urlbase + '/upgrade').success(function (data) {
-            $scope.upgradeInfo = data;
-        }).error(function () {
-            $scope.upgradeInfo = {};
-        });
-    };
 
     $scope.acceptUR = function () {
         $scope.config.Options.URAccepted = 1000; // Larger than the largest existing report version
@@ -717,6 +851,48 @@ function randomString(len, bits)
     return outStr.toLowerCase();
 }
 
+function isEmptyObject(obj) {
+    var name;
+    for (name in obj) {
+        return false;
+    }
+    return true;
+}
+
+function debounce(func, wait) {
+    var timeout, args, context, timestamp, result, again;
+
+    var later = function() {
+        var last = Date.now() - timestamp;
+        if (last < wait) {
+            timeout = setTimeout(later, wait - last);
+        } else {
+            timeout = null;
+            if (again) {
+                result = func.apply(context, args);
+                context = args = null;
+                again = false;
+            }
+        }
+    };
+
+    return function() {
+        context = this;
+        args = arguments;
+        timestamp = Date.now();
+        var callNow = !timeout;
+        if (!timeout) {
+            timeout = setTimeout(later, wait);
+            result = func.apply(context, args);
+            context = args = null;
+        } else {
+            again = true;
+        }
+
+        return result;
+    };
+}
+
 syncthing.filter('natural', function () {
     return function (input, valid) {
         return input.toFixed(decimals(input, valid));

gui/index.html

@@ -89,6 +89,7 @@
 </head>
 
 <body>
+  <div ng-controller="EventCtrl"></div>
 
   <!-- Top bar -->
 
@@ -289,11 +290,11 @@
                   <span class="glyphicon glyphicon-retweet"></span>
                   {{nodeName(nodeCfg)}}
                   <span class="pull-right hidden-xs">
-                    <span ng-if="connections[nodeCfg.NodeID].Completion == 100">
+                    <span ng-if="connections[nodeCfg.NodeID] && completion[nodeCfg.NodeID]._total == 100">
                       <span translate>Up to Date</span> (100%)
                     </span>
-                    <span ng-if="connections[nodeCfg.NodeID].Completion < 100">
-                      <span translate>Syncing</span> ({{connections[nodeCfg.NodeID].Completion}}%)
+                    <span ng-if="connections[nodeCfg.NodeID] && completion[nodeCfg.NodeID]._total < 100">
+                      <span translate>Syncing</span> ({{completion[nodeCfg.NodeID]._total | number:0}}%)
                     </span>
                     <span translate ng-if="!connections[nodeCfg.NodeID]">Disconnected</span>
                   </span>
@@ -311,7 +312,12 @@
                       </tr>
                       <tr>
                         <th><span class="glyphicon glyphicon-comment"></span>&emsp;<span translate>Synchronization</span></th>
-                        <td class="text-right">{{connections[nodeCfg.NodeID].Completion | alwaysNumber}}%</td>
+                        <td class="text-right">{{completion[nodeCfg.NodeID]._total | alwaysNumber | number:0}}%</td>
+                      </tr>
+                      <tr>
+                        <th><span class="glyphicon glyphicon-compressed"></span>&emsp;<span translate>Use Compression</span></th>
+                        <td translate ng-if="nodeCfg.Compression" class="text-right">Yes</td>
+                        <td translate ng-if="!nodeCfg.Compression" class="text-right">No</td>
                       </tr>
                       <tr>
                         <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
@@ -428,6 +434,13 @@
               <input placeholder="dynamic" 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 class="form-group">
+              <div class="checkbox">
+                <label>
+                  <input type="checkbox" ng-model="currentNode.Compression"> <span translate>Use Compression</span>
+                </label>
+              </div>
+            </div>
           </form>
         </div>
         <div class="modal-footer">
@@ -739,6 +752,7 @@
   <script src="angular-translate-loader.min.js"></script>
   <script src="jquery-2.0.3.min.js"></script>
   <script src="bootstrap/js/bootstrap.min.js"></script>
+  <script src="valid-langs.js"></script>
   <script src="app.js"></script>
 </body>
 </html>

gui/lang-de.json

@@ -2,7 +2,7 @@
     "API Key": "API-Schlüssel",
     "About": "Über",
     "Add Node": "Knoten hinzufügen",
-    "Add Repository": "Speicher hinzufügen",
+    "Add Repository": "Verzeichnis hinzufügen",
     "Address": "Adresse",
     "Addresses": "Adressen",
     "Allow Anonymous Usage Reporting?": "Übertragung von anonymen Nutzungsstatistiken erlauben?",
@@ -18,7 +18,7 @@
     "Download Rate": "Downloadgeschwindigkeit",
     "Edit": "Bearbeiten",
     "Edit Node": "Knoten bearbeiten",
-    "Edit Repository": "Speicher ändern",
+    "Edit Repository": "Verzeichnis ändern",
     "Enable UPnP": "Aktiviere UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Trage durch ein Komma getrennte \"IP:Port\" Adressen oder \"dynamic\" ein um automatische Adresserkennung durchzuführen.",
     "Error": "Fehler",
@@ -32,15 +32,15 @@
     "GUI Listen Addresses": "Adresse(n) für die Benutzeroberfläche",
     "Generate": "Generiere",
     "Global Discovery": "Globale Auffindung",
-    "Global Repository": "Globaler Speicher",
+    "Global Repository": "Globales Verzeichnis",
     "Idle": "Untätig",
     "Ignore Permissions": "Berechtigungen ignorieren",
     "Keep Versions": "Versionen erhalten",
     "Latest Release": "Letzte Veröffentlichung",
     "Local Discovery": "Lokale Auffindung",
     "Local Discovery Port": "Lokaler Aufindungsport",
-    "Local Repository": "Lokaler Speicher",
-    "Master Repo": "Hauptspeicher",
+    "Local Repository": "Lokales Verzeichnis",
+    "Master Repo": "Keine Veränderungen zugelassen",
     "Max File Change Rate (KiB/s)": "Maximale Datenänderungsrate (KiB/s)",
     "Max Outstanding Requests": "Max. ausstehende Anfragen",
     "No": "Nein",
@@ -53,24 +53,24 @@
     "Out Of Sync": "Nicht synchronisiert",
     "Outgoing Rate Limit (KiB/s)": "Ausgehendes Datenratelimit (KiB/s)",
     "Override Changes": "Änderungen überschreiben",
-    "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": "Pfad zum Speicher auf dem lokalem Rechner. Wird erzeugt wenn es nicht existiert. Das Tilden-Zeichen (~)  kann als Abkürzung benutzt werden für",
+    "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": "Pfad zum Verzeichnis auf dem lokalen Rechner. Wird erzeugt, wenn es nicht existiert. Das Tilden-Zeichen (~)  kann als Abkürzung benutzt werden für",
     "Please wait": "Bitte warten",
     "Preview Usage Report": "Vorschau des Nutzungsberichts",
     "RAM Utilization": "Verwendeter Arbeitsspeicher",
     "Reconnect Interval (s)": "Wiederverbindungsintervall (s)",
-    "Repository ID": "Speicher-ID",
-    "Repository Master": "Hauptspeicher",
-    "Repository Path": "Speicherpfad",
+    "Repository ID": "Verzeichnis-ID",
+    "Repository Master": "Keine Veränderungen zulassen",
+    "Repository Path": "Pfad zum Verzeichnis",
     "Rescan Interval (s)": "Suchintervall (s)",
     "Restart": "Neustart",
     "Restart Needed": "Neustart notwendig",
     "Save": "Speichern",
     "Scanning": "Überprüfe",
-    "Select the nodes to share this repository with.": "Wähle die Knoten aus, mit denen du diese Quelle teilen willst.",
+    "Select the nodes to share this repository with.": "Wähle die Knoten aus, mit denen du dieses Verzeichnis teilen willst.",
     "Settings": "Einstellungen",
     "Share With Nodes": "Teile mit diesen Knoten",
     "Shared With": "Geteilt mit",
-    "Short identifier for the repository. Must be the same on all cluster nodes.": "Kurze ID für die Quelle. Muss auf allen Verbunds-Knoten gleich sein.",
+    "Short identifier for the repository. Must be the same on all cluster nodes.": "Kurze ID für das Verzeichnis. Muss auf allen Verbunds-Knoten gleich sein.",
     "Show ID": "ID anzeigen",
     "Shown instead of Node ID in the cluster status.": "Wird anstatt der Knoten-ID im Verbunds-Status angezeigt.",
     "Shutdown": "Herunterfahren",
@@ -86,25 +86,26 @@
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing scheint nicht erreichbar zu sein oder es gibt ein Problem mit Ihrer Internetverbindung. Versuche erneut...",
     "The aggregated statistics are publicly available at {{url}}": "Die aggregierten Statistiken sind öffentlich verfügbar unter {{url}}",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Die Konfiguration wurde gespeichert, aber nicht aktiviert. Syncthing muss neugestartet werden um die neue Konfiguration zu aktivieren.",
-    "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Der verschlüsselte Benutzungsbericht wird täglich gesendet. Er wird benutzt um übliche Betriebssysteme, Quellen-Größen und Programm-Versionen zu überprüfen. Wenn der Bericht andere Daten enthalten sollte, wird dir dieses Fenster erneut angezeigt.",
-    "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "Die eingegebene Knoten-ID scheint nicht gültig zu sein. Sie sollte eine 52 Stellen lange Zeichenkette aus Buchstaben und Nummern sein. Leerzeichen und Striche sind optional.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Der verschlüsselte Benutzungsbericht wird täglich gesendet. Er wird benutzt um Statistiken über verwendete Betriebssysteme, Verzeichnis-Größen und Programm-Versionen zu erstellen. Sobald der Bericht in Zukunft weitere Daten erfasst, wird dir dieses Fenster erneut angezeigt.",
+    "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "Die eingegebene Knoten-ID scheint nicht gültig zu sein. Sie sollte eine 52 Stellen lange Zeichenkette aus Buchstaben und Zahlen sein. Leerzeichen und Striche sind optional (werden ignoriert).",
     "The node ID cannot be blank.": "Die Knoten-ID darf nicht leer sein.",
-    "The node ID to enter here can be found in the \"Edit > Show ID\" dialog on the other node. Spaces and dashes are optional (ignored).": "Die hier einzutragende Knoten-ID kann im \"Bearbeiten > Zeige ID\"-dialog auf dem anderen Knoten gefunden werden. Leerzeichen und Striche sind optional (werden ignoriert).",
+    "The node ID to enter here can be found in the \"Edit > Show ID\" dialog on the other node. Spaces and dashes are optional (ignored).": "Die hier einzutragende Knoten-ID kann im \"Bearbeiten > Zeige ID\"-Dialog auf dem anderen Knoten gefunden werden. Leerzeichen und Striche sind optional (werden ignoriert).",
     "The number of old versions to keep, per file.": "Anzahl der alten Versionen, die von jeder Datei gespeichert werden sollen.",
     "The number of versions must be a number and cannot be blank.": "Die Anzahl von Versionen muss eine Zahl sein und darf nicht leer sein.",
-    "The repository ID cannot be blank.": "Die Quellen-ID darf nicht leer sein.",
-    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Die Quellen-ID muss eine kurze Kennung (64 Zeichen oder weniger) sein. Bestehend aus Buchstaben, Zahlen und den Punkt- (.), Strich- (-), und Unterstrich- (_) Zeichen.",
-    "The repository ID must be unique.": "Die Speicher-ID muss eindeutig sein.",
-    "The repository path cannot be blank.": "Der Quellen-Pfad kann nicht leer sein",
+    "The repository ID cannot be blank.": "Die Verzeichnis-ID darf nicht leer sein.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Die Verzeichnis-ID muss eine kurze Kennung (64 Zeichen oder weniger) sein. Sie kann aus Buchstaben, Zahlen und den Punkt- (.), Strich- (-), und Unterstrich- (_) Zeichen bestehen.",
+    "The repository ID must be unique.": "Die Verzeichnis-ID muss eindeutig sein.",
+    "The repository path cannot be blank.": "Der Verzeichnis-Pfad kann nicht leer sein",
     "Unknown": "Unbekannt",
     "Up to Date": "Aktuell",
     "Upgrade To {%version%}": "Upgrade auf {{version}}",
     "Upload Rate": "Uploadgeschwindigkeit",
     "Usage": "Benutzung",
+    "Use Compression": "Benutze Komprimierung",
     "Use HTTPS for GUI": "Benutze HTTPS für Benutzeroberfläche",
     "Version": "Version",
-    "When adding a new node, keep in mind that this node must be added on the other side too.": "Beachte beim hinzufügen eines neuen Kontens, dass dieser Knoten auch auf der anderen Seite hinzugefügt werden muss.",
-    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Beim hinzufügen einer neuen Quelle, beachte dass die Quellen-ID dazu verwendet wird, Quellen zwischen Knoten zu verbinden. Sie sind abhängig von Groß- und Kleinschreibung und müssen auf allen Knoten gleich sein.",
+    "When adding a new node, keep in mind that this node must be added on the other side too.": "Beachte beim Hinzufügen eines neuen Knotens, dass dieser Knoten auch auf der Gegenseite hinzugefügt werden muss.",
+    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Beim Hinzufügen eines neuen Verzeichnisses, beachte dass die Verzeichnis-ID dazu verwendet wird, Verzeichnisse zwischen Knoten zu verbinden. Die ID muss also auf allen Knoten gleich sein, Groß- und Kleinschreibung muss dabei beachtet werden.",
     "Yes": "Ja",
     "You must keep at least one version.": "Du musst mindestens eine Version behalten.",
     "items": "Einträge"

gui/lang-el.json

@@ -0,0 +1,112 @@
+{
+    "API Key": "Κλειδί API",
+    "About": "Σχετικά",
+    "Add Node": "Πρόσθεσε Κόμβο",
+    "Add Repository": "Πρόσθεσε Αποθετήριο",
+    "Address": "Διεύθυνση",
+    "Addresses": "Διευθύνσεις",
+    "Allow Anonymous Usage Reporting?": "Να επιτρέπεται Ανώνυμη Αποστολή Αναφοράς Χρήσης?",
+    "Announce Server": "Διακομιστής Αναγγελίας",
+    "Anonymous Usage Reporting": "Ανώνυμη Αναφορά Χρήσης",
+    "Bugs": "Bugs",
+    "CPU Utilization": "Χρήση CPU",
+    "Close": "Τέλος",
+    "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg και οι παρακάτω Συνεισφορείς:",
+    "Delete": "Διαγραφή",
+    "Disconnected": "Αποσυνδεδεμένος",
+    "Documentation": "Τεκμηρίωση",
+    "Download Rate": "Download Rate",
+    "Edit": "Επεξεργασία",
+    "Edit Node": "Επεξεργασία Κόμβου",
+    "Edit Repository": "Επεξεργασία Αποθετηρίου",
+    "Enable UPnP": "Ενεργοποίηση UPnP",
+    "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Εισήγαγε διαχωρισμένα με κόμμα \"ip:port\" διευθύνσεις ή \"dynamic\", για να πραγματοποιηθεί η αυτόματη εξεύρεση διευθύνσεων.",
+    "Error": "Σφάλμα",
+    "File Versioning": "File Versioning",
+    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Τα permission bits των αρχείων αγνοούνται όταν γίνεται αναζήτηση για αλλαγές. Χρήση σε FAT filesystems.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "Όταν τα αρχεία αντικατασταθούν ή διαγραφούν από το syncthing, μεταφέρονται σε φάκελο .stversions με χρονική σήμανση.",
+    "Files are protected from changes made on other nodes, but changes made on this node will be sent to the rest of the cluster.": "Τα αρχεία προστατεύονται από αλλαγές που γίνονται σε άλλους κόμβους, αλλά όποιες αλλαγές γίνουν εδώ θα αποσταλούν στο όλο το cluster.",
+    "Folder": "Κατάλογος",
+    "GUI Authentication Password": "GUI Authentication Password",
+    "GUI Authentication User": "GUI Authentication User",
+    "GUI Listen Addresses": "GUI Listen Addresses",
+    "Generate": "Δημιουργία",
+    "Global Discovery": "Global Discovery",
+    "Global Repository": "Global Repository",
+    "Idle": "Ανενεργός",
+    "Ignore Permissions": "Ignore Permissions",
+    "Keep Versions": "Keep Versions",
+    "Latest Release": "Τελευταία Έκδοση",
+    "Local Discovery": "Local Discovery",
+    "Local Discovery Port": "Local Discovery Port",
+    "Local Repository": "Τοπικό Αποθετήριο",
+    "Master Repo": "Master Repo",
+    "Max File Change Rate (KiB/s)": "Max File Change Rate (KiB/s)",
+    "Max Outstanding Requests": "Max Outstanding Requests",
+    "No": "Αριθμός",
+    "Node ID": "ID Κόμβου",
+    "Node Name": "Όνομα Κόμβου",
+    "Notice": "Notice",
+    "OK": "OK",
+    "Offline": "Ανεργός",
+    "Online": "Ενεργός",
+    "Out Of Sync": "Εκτός Συγχρονισμού",
+    "Outgoing Rate Limit (KiB/s)": "Outgoing Rate Limit (KiB/s)",
+    "Override Changes": "Override Changes",
+    "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": "Μονοπάτι του αποθετηρίου στον τοπικό υπολογιστή. Σε περίπτωση που δεν υπάρχει, θα δημιουργηθεί. Ο χαρακτήρας tilde (~) μπορεί να χρησιμοποιηθεί σαν συντόμευση για",
+    "Please wait": "Παρακαλώ περιμένετε",
+    "Preview Usage Report": "Preview Usage Report",
+    "RAM Utilization": "Χρήση RAM",
+    "Reconnect Interval (s)": "Reconnect Interval (s)",
+    "Repository ID": "ID Αποθετηρίου",
+    "Repository Master": "Repository Master",
+    "Repository Path": "Μονοπάτι Αποθετηρίου",
+    "Rescan Interval (s)": "Rescan Interval (s)",
+    "Restart": "Επανεκκίνηση",
+    "Restart Needed": "Απαιτείται Επανεκκίνηση",
+    "Save": "Αποθήκευση",
+    "Scanning": "Scanning",
+    "Select the nodes to share this repository with.": "Επιλογή των κόμβων με τους οποίους θα διαμοιραστεί αυτό το αποθετήριο.",
+    "Settings": "Ρυθμίσεις",
+    "Share With Nodes": "Διαμοιρασμός με Κόμβους",
+    "Shared With": "Διαμοιρασμός με",
+    "Short identifier for the repository. Must be the same on all cluster nodes.": "Σύντομη περιγραφή του αποθετηρίου. Θα πρέπει να είναι το ίδιο σε όλους τους κόμβους του cluster.",
+    "Show ID": "Εμφάνιση ID",
+    "Shown instead of Node ID in the cluster status.": "Εμφάνιση στη θέση του ID Αποθετηρίου, στην κατάσταση του cluster.",
+    "Shutdown": "Απενεργοποίηση",
+    "Source Code": "Πηγαίος Κώδικας",
+    "Start Browser": "Start Browser",
+    "Stopped": "Stopped",
+    "Support / Forum": "Υποστήριξη / Forum",
+    "Sync Protocol Listen Addresses": "Sync Protocol Listen Addresses",
+    "Synchronization": "Συγχρονισμός",
+    "Syncing": "Syncing",
+    "Syncthing has been shut down.": "Syncthing έχει απενεργοποιηθεί.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing includes the following software or portions thereof:",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…",
+    "The aggregated statistics are publicly available at {{url}}": "The aggregated statistics are publicly available at {{url}}",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.",
+    "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.",
+    "The node ID cannot be blank.": "The node ID cannot be blank.",
+    "The node ID to enter here can be found in the \"Edit > Show ID\" dialog on the other node. Spaces and dashes are optional (ignored).": "Το ID Κόμβου μπορείτε να βρείτε στο μενού \"Επεξεργασία > Εμφάνιση ID\" του άλλου κόμβου. Κενά και παύλες είναι προαιρετικά (αγνοούνται).",
+    "The number of old versions to keep, per file.": "The number of old versions to keep, per file.",
+    "The number of versions must be a number and cannot be blank.": "The number of versions must be a number and cannot be blank.",
+    "The repository ID cannot be blank.": "The repository ID cannot be blank.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.",
+    "The repository ID must be unique.": "The repository ID must be unique.",
+    "The repository path cannot be blank.": "The repository path cannot be blank.",
+    "Unknown": "Άγνωστο",
+    "Up to Date": "Up to Date",
+    "Upgrade To {%version%}": "Αναβάθμιση στην έκδοση {{version}}",
+    "Upload Rate": "Upload Rate",
+    "Usage": "Usage",
+    "Use Compression": "Χρήση συμπίεσης",
+    "Use HTTPS for GUI": "Use HTTPS for GUI",
+    "Version": "Έκδοση",
+    "When adding a new node, keep in mind that this node must be added on the other side too.": "When adding a new node, keep in mind that this node must be added on the other side too.",
+    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Κατά την πρόσθεση νέου αποθετηρίου, να γνωρίζεται πως το ID Αποθετηρίου χρησιμοποιείται για να συνδέει Αποθετήρια μεταξύ κόμβων. Τα ID είναι case sensitive και θα πρέπει να είναι ταυτόσημα μεταξύ όλων των κόμβων.",
+    "Yes": "Ναι",
+    "You must keep at least one version.": "You must keep at least one version.",
+    "items": "items"
+}

gui/lang-en.json

@@ -101,6 +101,7 @@
    "Upgrade To {%version%}": "Upgrade To {{version}}",
    "Upload Rate": "Upload Rate",
    "Usage": "Usage",
+   "Use Compression": "Use Compression",
    "Use HTTPS for GUI": "Use HTTPS for GUI",
    "Version": "Version",
    "When adding a new node, keep in mind that this node must be added on the other side too.": "When adding a new node, keep in mind that this node must be added on the other side too.",

gui/lang-es.json

@@ -13,7 +13,7 @@
     "Close": "Cerrar",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Derechos de autor © 2014 Jakob Borg y los siguientes  colaboradores:",
     "Delete": "Suprimir",
-    "Disconnected": "Disconnected",
+    "Disconnected": "Desconectado",
     "Documentation": "Documentación",
     "Download Rate": "Tasa de descarga",
     "Edit": "Editar",
@@ -33,7 +33,7 @@
     "Generate": "Generar",
     "Global Discovery": "Búsqueda en internet",
     "Global Repository": "Repositorio global",
-    "Idle": "Idle",
+    "Idle": "Inactivo",
     "Ignore Permissions": "Ignorar permisos",
     "Keep Versions": "Conservar versiones",
     "Latest Release": "Última versión",
@@ -65,7 +65,7 @@
     "Restart": "Reiniciar",
     "Restart Needed": "Es necesario reiniciar",
     "Save": "Guardar",
-    "Scanning": "Scanning",
+    "Scanning": "Actualización",
     "Select the nodes to share this repository with.": "Seleccione los nodos con los cuales compartir el repositorio.",
     "Settings": "Configuración",
     "Share With Nodes": "Compartir con los nodos",
@@ -76,11 +76,11 @@
     "Shutdown": "Apagar",
     "Source Code": "Código fuente",
     "Start Browser": "Iniciar navegador",
-    "Stopped": "Stopped",
+    "Stopped": "Parado",
     "Support / Forum": "Soporte / Foro",
     "Sync Protocol Listen Addresses": "Dirección de escucha del protocolo de sincronización",
     "Synchronization": "Sincronización",
-    "Syncing": "Syncing",
+    "Syncing": "Sincronización",
     "Syncthing has been shut down.": "La sincronización esta apagada",
     "Syncthing includes the following software or portions thereof:": "Syncthing incluye los siguientes softwares o partes de ellos:",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece estar apagado, o hay un problema con su conexión de Internet. Reintentando...",
@@ -96,11 +96,12 @@
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "El ID de repositorio debe ser una cadena corta (64 caracteres o menos) consistente solamente en letras, números, punto (.), guion (-) y guion bajo (_).",
     "The repository ID must be unique.": "El ID de repositorio debe ser único.",
     "The repository path cannot be blank.": "La ruta del repositorio no puede estar vacía.",
-    "Unknown": "Unknown",
-    "Up to Date": "Up to Date",
+    "Unknown": "Desconocido",
+    "Up to Date": "Actualizado",
     "Upgrade To {%version%}": "Actualizar a {{version}}",
     "Upload Rate": "Tasa de subida",
     "Usage": "Utilización",
+    "Use Compression": "Use Compression",
     "Use HTTPS for GUI": "Usar HTTPS para la GUI",
     "Version": "Versión",
     "When adding a new node, keep in mind that this node must be added on the other side too.": "Al agregar un nuevo nodo, recuerde que este nodo debe ser agregado en el otro lado también.",

gui/lang-fr.json

@@ -15,7 +15,7 @@
     "Delete": "Supprimer",
     "Disconnected": "Déconnecté",
     "Documentation": "Documentation",
-    "Download Rate": "Débit Download",
+    "Download Rate": "Débit de téléchargement",
     "Edit": "Éditer",
     "Edit Node": "Éditer le nœud",
     "Edit Repository": "Éditer le répertoire",
@@ -42,7 +42,7 @@
     "Local Repository": "Dossier local",
     "Master Repo": "Dossier maître",
     "Max File Change Rate (KiB/s)": "Débit maximum de changement de fichier (KiB/s)",
-    "Max Outstanding Requests": "Nombre maximum de demandes conccurentes pour des blocs de fichier",
+    "Max Outstanding Requests": "Nombre maximum de demandes conccurentes de blocs de fichier",
     "No": "Non",
     "Node ID": "ID du nœud",
     "Node Name": "Nom du nœud",
@@ -99,8 +99,9 @@
     "Unknown": "Inconnu",
     "Up to Date": "Synchronistation à jour",
     "Upgrade To {%version%}": "Upgrader vers {{version}}",
-    "Upload Rate": "Débit Upload",
+    "Upload Rate": "Débit d'envoi",
     "Usage": "Utilisation",
+    "Use Compression": "Utiliser la compression",
     "Use HTTPS for GUI": "Utiliser l'HTTPS pour le GUI",
     "Version": "Version",
     "When adding a new node, keep in mind that this node must be added on the other side too.": "Lorsqu'un nœud est ajouté, gardez à l'esprit que ce nœud doit aussi être ajouté de l'autre coté.",

gui/lang-it.json

@@ -0,0 +1,112 @@
+{
+    "API Key": "Chiave API",
+    "About": "Informazioni",
+    "Add Node": "Aggiungi Nodo",
+    "Add Repository": "Aggiungi Deposito",
+    "Address": "Indirizzo",
+    "Addresses": "Indirizzi",
+    "Allow Anonymous Usage Reporting?": "Abilitare Statistiche Anonime di Utilizzo?",
+    "Announce Server": "Server di Ricerca Globale dei Nodi",
+    "Anonymous Usage Reporting": "Statistiche Anonime di Utilizzo",
+    "Bugs": "Bug",
+    "CPU Utilization": "Utilizzo della CPU",
+    "Close": "Chiudi",
+    "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg e i seguenti Collaboratori:",
+    "Delete": "Elimina",
+    "Disconnected": "Disconnesso",
+    "Documentation": "Documentazione",
+    "Download Rate": "Velocità Download",
+    "Edit": "Modifica",
+    "Edit Node": "Modifica Nodo",
+    "Edit Repository": "Modifica Deposito",
+    "Enable UPnP": "Attiva UPnP",
+    "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Inserisci gli indirizzi \"ip:porta\" separati da una virgola, altrimenti inserisci \"dynamic\" per effettuare il rilevamento automatico dell'indirizzo.",
+    "Error": "Errore",
+    "File Versioning": "Controllo Versione dei File",
+    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Il software evita i bit dei permessi dei file durante il controllo delle modifiche. Utilizzato nei filesystem FAT.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "I file sostituiti o eliminati da syncthing vengono datati e spostati in una cartella .stversions .",
+    "Files are protected from changes made on other nodes, but changes made on this node will be sent to the rest of the cluster.": "I file sono protetti dalle modifiche effettuate negli altri nodi, ma le modifiche effettuate in questo nodo verranno inviate anche al resto del cluster.",
+    "Folder": "Cartella",
+    "GUI Authentication Password": "Password di Autenticazione dell'Utente",
+    "GUI Authentication User": "Utente dell'Interfaccia Grafica",
+    "GUI Listen Addresses": "Indirizzi dell'Interfaccia Grafica",
+    "Generate": "Genera",
+    "Global Discovery": "Individuazione Globale",
+    "Global Repository": "Deposito Globale",
+    "Idle": "Inattivo",
+    "Ignore Permissions": "Ignora Permessi",
+    "Keep Versions": "Mantieni le Versioni",
+    "Latest Release": "Ultimo Rilascio",
+    "Local Discovery": "Individuazione Locale",
+    "Local Discovery Port": "Porta di Individuazione Locale",
+    "Local Repository": "Deposito Locale",
+    "Master Repo": "Deposito Principale",
+    "Max File Change Rate (KiB/s)": "Tasso Massimo di Cambiamento dei File (KiB/s)",
+    "Max Outstanding Requests": "Numero Massimo di Richieste Simultanee per i Blocchi di File",
+    "No": "No",
+    "Node ID": "ID Nodo",
+    "Node Name": "Nome Nodo",
+    "Notice": "Avviso",
+    "OK": "OK",
+    "Offline": "Non in linea",
+    "Online": "In linea",
+    "Out Of Sync": "Non Sincronizzati",
+    "Outgoing Rate Limit (KiB/s)": "Limite di Velocità in Uscita (KiB/s)",
+    "Override Changes": "Ignora Modifiche",
+    "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": "Percorso del deposito nel computer locale. Verrà creato se non esiste già. Il carattere tilde (~) può essere utilizzato come scorciatoia per",
+    "Please wait": "Attendere prego",
+    "Preview Usage Report": "Anteprima Statistiche di Utilizzo",
+    "RAM Utilization": "Utilizzo della RAM",
+    "Reconnect Interval (s)": "Intervallo di Riconnessione (s)",
+    "Repository ID": "ID Deposito",
+    "Repository Master": "Deposito Principale",
+    "Repository Path": "Percorso del Deposito",
+    "Rescan Interval (s)": "Intervallo di Scansione dei File (s)",
+    "Restart": "Riavvia",
+    "Restart Needed": "Riavvio Necessario",
+    "Save": "Salva",
+    "Scanning": "Scansione in corso",
+    "Select the nodes to share this repository with.": "Seleziona i nodi con i quali vuoi condividere questo deposito.",
+    "Settings": "Impostazioni",
+    "Share With Nodes": "Condividi Con i Nodi",
+    "Shared With": "Condiviso Con",
+    "Short identifier for the repository. Must be the same on all cluster nodes.": "Breve identificatore del deposito. Deve essere lo stesso su tutti i nodi del cluster.",
+    "Show ID": "Mostra ID",
+    "Shown instead of Node ID in the cluster status.": "Visibile al posto dell'ID Nodo nello stato del cluster.",
+    "Shutdown": "Arresta",
+    "Source Code": "Codice Sorgente",
+    "Start Browser": "Avvia Browser",
+    "Stopped": "Fermato",
+    "Support / Forum": "Supporto / Forum",
+    "Sync Protocol Listen Addresses": "Indirizzi del Protocollo di Sincronizzazione",
+    "Synchronization": "Sincronizzazione",
+    "Syncing": "Sincronizzazione in corso",
+    "Syncthing has been shut down.": "Syncthing è stato arrestato.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing include i seguenti software o porzioni di questi:",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing sembra inattivo, oppure c'è un problema con la tua connessione a Internet. Nuovo tentativo…",
+    "The aggregated statistics are publicly available at {{url}}": "Le statistiche aggregate sono disponibili pubblicamente su {{url}}",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configurazione è stata salvata ma non attivata. Devi riavviare Syncthing per attivare la nuova configurazione.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Quotidianamente il software invia le statistiche di utilizzo in forma criptata. Questi dati riguardano i sistemi operativi utilizzati, le dimensioni dei depositi e le versioni del software. Se i dati riportati cambiano verrà mostrata di nuovo questa finestra di dialogo.",
+    "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "L'ID del nodo inserito non sembra valido. Dovrebbe essere una stringa di 52 caratteri costituita da lettere e numeri, con spazi e trattini opzionali.",
+    "The node ID cannot be blank.": "L'ID del nodo non può essere vuoto.",
+    "The node ID to enter here can be found in the \"Edit > Show ID\" dialog on the other node. Spaces and dashes are optional (ignored).": "Trova l'ID del nodo nella finestra di dialogo \"Modifica > Mostra ID\" dell'altro nodo e poi inseriscilo qui. Gli spazi e i trattini sono opzionali (ignorati).",
+    "The number of old versions to keep, per file.": "Il numero di vecchie versioni da mantenere, per file.",
+    "The number of versions must be a number and cannot be blank.": "Il numero di versioni dev'essere un numero e non può essere vuoto.",
+    "The repository ID cannot be blank.": "L'ID del deposito non può essere vuoto.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "L'ID del deposito dev'essere un identificatore breve (64 caratteri o meno) costituito solamente da lettere, numeri, punti (.), trattini (-) e trattini bassi (_).",
+    "The repository ID must be unique.": "L'ID del deposito dev'essere unico.",
+    "The repository path cannot be blank.": "Il percorso del deposito non può essere vuoto.",
+    "Unknown": "Sconosciuto",
+    "Up to Date": "Sincronizzato",
+    "Upgrade To {%version%}": "Aggiorna Alla {{version}}",
+    "Upload Rate": "Velocità Upload",
+    "Usage": "Utilizzo",
+    "Use Compression": "Utilizza Compressione",
+    "Use HTTPS for GUI": "Utilizza HTTPS per l'interfaccia grafica",
+    "Version": "Versione",
+    "When adding a new node, keep in mind that this node must be added on the other side too.": "Quando aggiungi un nuovo nodo, ricordati di aggiungerlo anche dall'altro lato.",
+    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Quando aggiungi un nuovo deposito ricordati che gli ID vengono utilizzati per collegare i depositi nei nodi. Distinguono maiuscole e minuscole e devono corrispondere esattamente su tutti i nodi.",
+    "Yes": "Sì",
+    "You must keep at least one version.": "È necessario mantenere almeno una versione.",
+    "items": "elementi"
+}

gui/lang-pt.json

@@ -9,11 +9,11 @@
     "Announce Server": "Servidor de anúncios",
     "Anonymous Usage Reporting": "Envio de Relatórios Anónimos",
     "Bugs": "Erros",
-    "CPU Utilization": "Utilização CPU",
+    "CPU Utilization": "Utilização da CPU",
     "Close": "Fechar",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Direitos Reservados © 2014 Jakob Borg e os seguintes Contribuidores:",
     "Delete": "Apagar",
-    "Disconnected": "Disconnected",
+    "Disconnected": "Desconectado",
     "Documentation": "Documentação",
     "Download Rate": "Taxa de transferência",
     "Edit": "Editar",
@@ -22,8 +22,8 @@
     "Enable UPnP": "Ativar UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduza endereços \"ip:porto\" separados por virgulas ou \"dynamic\" para o descobrimento automático do endereço.",
     "Error": "Erro",
-    "File Versioning": " ",
-    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "As permissões do ficheiro são ignoradas na pesquisa por mudanças. Utilize nos sistemas de ficheiros FAT",
+    "File Versioning": "Gestão de versões",
+    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "As permissões do ficheiro são ignoradas na pesquisa por mudanças. Utilize nos sistemas de ficheiros FAT.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "Os ficheiros são movidos para versões carimbadas com o tempo numa pasta .stversions quando substituídos ou apagados por syncthing.",
     "Files are protected from changes made on other nodes, but changes made on this node will be sent to the rest of the cluster.": "Os ficheiros são protegidos de mudanças feitas em outros nós, mas alterações feitas neste nó serão enviadas para o resto do agrupamento.",
     "Folder": "Pasta",
@@ -33,61 +33,61 @@
     "Generate": "Gerar",
     "Global Discovery": "Descoberta Global",
     "Global Repository": "Repositório Global",
-    "Idle": "Idle",
+    "Idle": "Em espera",
     "Ignore Permissions": "Ignorar Permissões",
     "Keep Versions": "Manter Versões",
     "Latest Release": "Última versão",
     "Local Discovery": "Descoberta Local",
-    "Local Discovery Port": "Porto Descoberta Local",
+    "Local Discovery Port": "Porto de Descoberta Local",
     "Local Repository": "Repositório local",
     "Master Repo": "Repositório Mestre",
-    "Max File Change Rate (KiB/s)": "Taxa máxima te troca ficheiros (KiB/s)",
-    "Max Outstanding Requests": "Numero máximo de pedidos pendentes",
+    "Max File Change Rate (KiB/s)": "Taxa máxima de troca de ficheiros (KiB/s)",
+    "Max Outstanding Requests": "Número máximo de pedidos pendentes",
     "No": "Não",
-    "Node ID": "Id do Nó",
+    "Node ID": "ID do Nó",
     "Node Name": "Nome do Nó",
     "Notice": "Nota",
     "OK": "OK",
     "Offline": "Desconectado",
     "Online": "Conectado",
     "Out Of Sync": "Não sincronizado",
-    "Outgoing Rate Limit (KiB/s)": "Limite taxa envio (KiB/s)",
+    "Outgoing Rate Limit (KiB/s)": "Limite da taxa de envio (KiB/s)",
     "Override Changes": "Sobrepor Mudanças",
     "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": "Caminho para o repositório no computador local. Será criado se não existir. O carácter (~) pode ser utilizado como atalho para",
     "Please wait": "Aguarde",
     "Preview Usage Report": "Visualização de Relatório",
-    "RAM Utilization": "Utilização RAM",
+    "RAM Utilization": "Utilização da RAM",
     "Reconnect Interval (s)": "Intervalo de reestabelecimento de ligação (s)",
     "Repository ID": "ID do Repositório",
     "Repository Master": "Repositório Mestre",
     "Repository Path": "Caminho do Repositório",
     "Rescan Interval (s)": "Intervalo de monitorização (s)",
-    "Restart": "Reniniciar",
+    "Restart": "Reiniciar",
     "Restart Needed": "É preciso reiniciar",
     "Save": "Gravar",
-    "Scanning": "Scanning",
+    "Scanning": "Varrendo",
     "Select the nodes to share this repository with.": "Selecione os nós com quais partilhar este repositório.",
     "Settings": "Configurações",
     "Share With Nodes": "Partilhar com Nós",
     "Shared With": "Partilhado Com",
     "Short identifier for the repository. Must be the same on all cluster nodes.": "Identificador curto para o repositório. Tem que ser igual em todos os nós do agrupamento.",
     "Show ID": "Mostrar ID",
-    "Shown instead of Node ID in the cluster status.": "Mostrado invés do ID do Nó no estado do agrupamento.",
+    "Shown instead of Node ID in the cluster status.": "Mostrado ao invés do ID do Nó no estado do agrupamento.",
     "Shutdown": "Desligar",
     "Source Code": "Código Fonte",
     "Start Browser": "Iniciar Navegador",
-    "Stopped": "Stopped",
+    "Stopped": "Parado",
     "Support / Forum": "Suporte / Fórum",
     "Sync Protocol Listen Addresses": "Endereços de escuta do protocolo de sincronização",
     "Synchronization": "Sincronização",
-    "Syncing": "Syncing",
+    "Syncing": "Sincronizando",
     "Syncthing has been shut down.": "Syncthing foi desligado.",
     "Syncthing includes the following software or portions thereof:": "Syncthing inclui as seguintes aplicacoes ou partes delas:",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece estar em baixo, ou existe um problema com a sua ligação Internet. A tentar novamente...",
     "The aggregated statistics are publicly available at {{url}}": "As estatísticas agrupadas estão disponíveis publicamente em {{url}}",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A configuração foi gravada mas não ativada. Syncthing tem que reiniciar para ativar a nova configuração.",
-    "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "O relatório de utilização cifrado é enviado diariamente. É utilizado para seguir plataformas comuns, tamanhos de repositórios e versões da aplicação. Se o tipo de dados do relatório é alterado será notificado novamente através desta janela.",
-    "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "O ID do nó indicado não parece válido. Deveria conter uma palavra de 52 carateres constituída por letras e números, com os espaços e traços opcionais. ",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A configuração foi gravada mas não activada. Syncthing tem que reiniciar para activar a nova configuração.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "O relatório de utilização cifrado é enviado diariamente. É utilizado para seguir plataformas comuns, tamanhos de repositórios e versões da aplicação. Se o conjunto de dados do relatório for alterado, será notificado novamente através desta janela.",
+    "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "O ID do nó indicado não parece ser válido. Deveria conter uma palavra de 52 caracteres constituída por letras e números, com espaços e traços opcionais. ",
     "The node ID cannot be blank.": "O ID do nó não pode ser vazio.",
     "The node ID to enter here can be found in the \"Edit > Show ID\" dialog on the other node. Spaces and dashes are optional (ignored).": "O ID do nó a introduzir pode ser encontrado no diálogo \"Editar > Mostrar ID\" no outro nó. Espaços e traços são opcionais (ignorados).",
     "The number of old versions to keep, per file.": "O número de versões antigas a manter, por ficheiro.",
@@ -96,15 +96,16 @@
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "O ID do repositório tem que ser um identificador curto (64 carateres ou menos) e consiste em letras, números e os carateres ponto (.), traço (-) e (_).",
     "The repository ID must be unique.": "O ID do repositório tem que ser único.",
     "The repository path cannot be blank.": "O caminho do repositório não pode ser vazio.",
-    "Unknown": "Unknown",
-    "Up to Date": "Up to Date",
+    "Unknown": "Desconhecido",
+    "Up to Date": "Actualizado",
     "Upgrade To {%version%}": "Atualizar para {{version}}",
     "Upload Rate": "Taxa de envio",
     "Usage": "Utilização",
+    "Use Compression": "Usar Compressão",
     "Use HTTPS for GUI": "Utilizar HTTPS para GUI",
     "Version": "Versão",
     "When adding a new node, keep in mind that this node must be added on the other side too.": "Quando adicionar um novo nó, lembre-se que este nó tem que ser adicionado do outro lado também.",
-    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Quando adicionar um novo repositório, lembre-se que o ID do Repositório é utilizado para juntar os repositórios entre nós. São sensíveis às maiúsculas e minúsculas e tem que corresponder exatamente entre todos os nós.",
+    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Quando adicionar um novo repositório, lembre-se que o ID do Repositório é utilizado para juntar os repositórios entre nós. São sensíveis às maiúsculas e minúsculas e tem que corresponder exactamente entre todos os nós.",
     "Yes": "Sim",
     "You must keep at least one version.": "Tem que manter pelo menos uma versão.",
     "items": "itens"

gui/lang-ru.json

@@ -0,0 +1,112 @@
+{
+    "API Key": "Ключ API",
+    "About": "О программе",
+    "Add Node": "Добавить Узел",
+    "Add Repository": "Добавить репозиторий",
+    "Address": "Адрес",
+    "Addresses": "Адреса",
+    "Allow Anonymous Usage Reporting?": "Разрешить сбор анонимной статистики использования?",
+    "Announce Server": "Сервер публикации",
+    "Anonymous Usage Reporting": "Анонимная статистика использования",
+    "Bugs": "Ошибки",
+    "CPU Utilization": "Загрузка ЦПУ",
+    "Close": "Закрыть",
+    "Copyright © 2014 Jakob Borg and the following Contributors:": "Все права защищены © 2014 Jakob Borg и следующие участники:",
+    "Delete": "Удалить",
+    "Disconnected": "Нет соединения",
+    "Documentation": "Документация",
+    "Download Rate": "Скорость загрузки",
+    "Edit": "Изменить",
+    "Edit Node": "Изменить Узел",
+    "Edit Repository": "Изменить Репозиторий",
+    "Enable UPnP": "Включить UPnP",
+    "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": " Введите пары \"IP:PORT\" разделённые запятыми, или слово \"dynamic\" для автоматического обнаружения адреса.",
+    "Error": "Ошибка",
+    "File Versioning": "Управление версиями",
+    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Права доступа к файлам будут игнорироваться. Используйте на файловых системах типа FAT.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "Версии файлов с временнОй меткой перемещаются в директорию .stversions, если они удалены или перемещены в процессе синхронизации.",
+    "Files are protected from changes made on other nodes, but changes made on this node will be sent to the rest of the cluster.": "Файлы защищены от изменений сторонними узлами, но изменения внесённые текущим узлом будут синхронизированы со всем кластером.",
+    "Folder": "Папка",
+    "GUI Authentication Password": "Пароль для доступа к панели управления",
+    "GUI Authentication User": "Имя пользователя для доступа к панели управления",
+    "GUI Listen Addresses": "Адрес панели управления",
+    "Generate": "Сгенерировать",
+    "Global Discovery": "Глобальное обнаружение",
+    "Global Repository": "Глобальный репозиторий",
+    "Idle": "Бездействует",
+    "Ignore Permissions": "Игнорировать файловые права доступа",
+    "Keep Versions": "Количество хранимых версий",
+    "Latest Release": "Последняя версия",
+    "Local Discovery": "Локальное обнаружение",
+    "Local Discovery Port": "Порт локального обнаружения",
+    "Local Repository": "Локальный репозиторий",
+    "Master Repo": "Главный репозиторий",
+    "Max File Change Rate (KiB/s)": "Максимальная скорость изменения файлов (KiB/s)",
+    "Max Outstanding Requests": "Максимальное количество исходящих запросов",
+    "No": "Нет",
+    "Node ID": "ID Узла",
+    "Node Name": "Имя Узла",
+    "Notice": "Внимание",
+    "OK": "ОК",
+    "Offline": "Оффлайн",
+    "Online": "Онлайн",
+    "Out Of Sync": "Не синхронизировано",
+    "Outgoing Rate Limit (KiB/s)": "Предел скорости отдачи (KiB/s)",
+    "Override Changes": "Перезаписать изменения",
+    "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": "Путь к репозиторию на локальном компьютере. Если не существует, то будет создан. Знак тильды (~) может использоваться как ссылка",
+    "Please wait": "Пожалуйста, подождите",
+    "Preview Usage Report": "Посмотреть отчёт об использовании",
+    "RAM Utilization": "Использование ОЗУ",
+    "Reconnect Interval (s)": "Интервал переподключений (секунды)",
+    "Repository ID": "ID Репозитория",
+    "Repository Master": "Главный Репозиторий",
+    "Repository Path": "Путь к Репозиторию",
+    "Rescan Interval (s)": "Интервал между сканированием (сек)",
+    "Restart": "Перезапуск",
+    "Restart Needed": "Требуется перезапуск",
+    "Save": "Сохранить",
+    "Scanning": "Сканирование",
+    "Select the nodes to share this repository with.": "Выберите узлы для которых будет доступен данный репозиторий.",
+    "Settings": "Настройки",
+    "Share With Nodes": "Предоставить доступ узлам",
+    "Shared With": "Доступ предоставлен",
+    "Short identifier for the repository. Must be the same on all cluster nodes.": "Короткий идентификатор репозитория. Должен быть одинаковый на всех узлах кластера.",
+    "Show ID": "Показать ID",
+    "Shown instead of Node ID in the cluster status.": "Отображается вместо ID узла в статусе кластера.",
+    "Shutdown": "Выключить",
+    "Source Code": "Исходный код",
+    "Start Browser": "Открыть браузер",
+    "Stopped": "Остановлено",
+    "Support / Forum": "Поддержка / Форум",
+    "Sync Protocol Listen Addresses": "Адрес протокола синхронизации",
+    "Synchronization": "Синхронизация",
+    "Syncing": "Синхронизация",
+    "Syncthing has been shut down.": "Syncthing выключен.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing включает в себя следующее ПО или его части:",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Кажется, Syncthing не запущен или есть проблемы с подключением к Интернету. Переподключаюсь...",
+    "The aggregated statistics are publicly available at {{url}}": "Суммарная статистика общедоступна на {{url}}",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Конфигурация была сохранена но не активирована. Для активации новой конфигурации необходимо рестартовать Syncthing.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Зашифрованные отчёты об использовании отправляются ежедневно. Они используются для отслеживания проблем, размеров репозиториев и версий Syncthing. Если набор данных в отчёте будет изменён, то вы получите уведомление об этом в этом диалоге.",
+    "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "Введённый ID узла выглядит неправильно: ID должен быть строкой, длинной 52 символа, обязательно содержащей группы букв и цифр которые могут быть разделены пробелами или тире.",
+    "The node ID cannot be blank.": "ID узла не может быть пустым.",
+    "The node ID to enter here can be found in the \"Edit > Show ID\" dialog on the other node. Spaces and dashes are optional (ignored).": "ID узла можно узнать в окне \"Редактировать > Показать ID\" на требуемом узле. Пробелы и тире используются для удобства и не обязательны (игнорируются).",
+    "The number of old versions to keep, per file.": "Количество хранимых версий файла.",
+    "The number of versions must be a number and cannot be blank.": "Количество версий должно быть числом и не может быть пустым.",
+    "The repository ID cannot be blank.": "ID Репозитория не может быть пустым.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "ID репозитория должен быть коротким id (64 символа или меньше) состоящий только из букв, цифр,  точек (.), тире (-) и нижнего подчёркивания (_).",
+    "The repository ID must be unique.": "ID Репозитория должен быть уникальным.",
+    "The repository path cannot be blank.": "Путь к репозиторию не может быть пустым.",
+    "Unknown": "Неизвестно",
+    "Up to Date": "Обновлено",
+    "Upgrade To {%version%}": "Обновить до {{version}}",
+    "Upload Rate": "Скорость отдачи",
+    "Usage": "Справка",
+    "Use Compression": "Использовать сжатие",
+    "Use HTTPS for GUI": "Использовать HTTPS для панели управления",
+    "Version": "Версия",
+    "When adding a new node, keep in mind that this node must be added on the other side too.": "Добавляя новый узел помните, что новый узел должен быть добавлен и на другой стороне.",
+    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Добавляя новый репозиторий помните, что ID репозитория используется для связи всех репозиториев между узлами. ID чувствительны к регистру и должны совпадать на всех узлах.",
+    "Yes": "Да",
+    "You must keep at least one version.": "Вы должны хранить как минимум одну версию.",
+    "items": "элементы"
+}

gui/lang-sv.json

@@ -101,6 +101,7 @@
     "Upgrade To {%version%}": "Uppgradera till {{version}}",
     "Upload Rate": "Uppladdningshastighet",
     "Usage": "Användande",
+    "Use Compression": "Använd komprimering",
     "Use HTTPS for GUI": "Använd HTTPS för GUI",
     "Version": "Version",
     "When adding a new node, keep in mind that this node must be added on the other side too.": "När du lägger till en ny nod, kom ihåg att den här noden måste läggas till på den andra noden också.",

gui/valid-langs.js

@@ -0,0 +1 @@
+var validLangs = ["de","el","en","es","fr","it","pt","ru","sv"]

integration/h1/config.xml

@@ -10,7 +10,7 @@
         <node id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></node>
         <versioning></versioning>
     </repository>
-    <node id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1">
+    <node id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="true">
         <address>127.0.0.1:22001</address>
     </node>
     <node id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU" name="s2">

integration/h2/config.xml

@@ -18,10 +18,10 @@
         <versioning></versioning>
         <syncorder></syncorder>
     </repository>
-    <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="s1">
+    <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="s1" compression="true">
         <address>127.0.0.1:22001</address>
     </node>
-    <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="s2">
+    <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="s2" compression="true">
         <address>127.0.0.1:22002</address>
     </node>
     <node id="373HSRPQLPNLIJYKZVQFP4PKZ6R2ZE6K3YD442UJHBGBQGWWXAHA" name="s3">

integration/test-delupd.sh

@@ -31,9 +31,9 @@ stop() {
 testConvergence() {
 	while true ; do
 		sleep 5
-		s1comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8082/rest/connections" | ./json "$id1/Completion")
-		s2comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8083/rest/connections" | ./json "$id2/Completion")
-		s3comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8081/rest/connections" | ./json "$id3/Completion")
+		s1comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8082/rest/debug/peerCompletion" | ./json "$id1")
+		s2comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8083/rest/debug/peerCompletion" | ./json "$id2")
+		s3comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8081/rest/debug/peerCompletion" | ./json "$id3")
 		s1comp=${s1comp:-0}
 		s2comp=${s2comp:-0}
 		s3comp=${s3comp:-0}

integration/test-folders.sh

@@ -46,8 +46,8 @@ setup() {
 testConvergence() {
 	while true ; do
 		sleep 5
-		s1comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8082/rest/connections" | ./json "$id1/Completion")
-		s2comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8081/rest/connections" | ./json "$id2/Completion")
+		s1comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8082/rest/debug/peerCompletion" | ./json "$id1")
+		s2comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8081/rest/debug/peerCompletion" | ./json "$id2")
 		s1comp=${s1comp:-0}
 		s2comp=${s2comp:-0}
 		tot=$(($s1comp + $s2comp))

integration/test-merge.sh

@@ -40,9 +40,9 @@ clean() {
 testConvergence() {
 	while true ; do
 		sleep 5
-		s1comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8082/rest/connections" | ./json "$id1/Completion")
-		s2comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8083/rest/connections" | ./json "$id2/Completion")
-		s3comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8081/rest/connections" | ./json "$id3/Completion")
+		s1comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8082/rest/debug/peerCompletion" | ./json "$id1")
+		s2comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8083/rest/debug/peerCompletion" | ./json "$id2")
+		s3comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8081/rest/debug/peerCompletion" | ./json "$id3")
 		s1comp=${s1comp:-0}
 		s2comp=${s2comp:-0}
 		s3comp=${s3comp:-0}

integration/test-reconnect.sh

@@ -43,7 +43,7 @@ testConvergence() {
 
 	while true ; do
 		sleep 5
-		comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8081/rest/connections" | ./json "$id2/Completion")
+		comp=$(curl -HX-API-Key:abc123 -s "http://localhost:8081/rest/debug/peerCompletion" | ./json "$id2")
 		comp=${comp:-0}
 		echo $comp / 100
 

model/model.go

@@ -157,7 +157,6 @@ type ConnectionInfo struct {
 	protocol.Statistics
 	Address       string
 	ClientVersion string
-	Completion    int
 }
 
 // ConnectionStats returns a map with connection statistics for each connected node.
@@ -179,43 +178,6 @@ func (m *Model) ConnectionStats() map[string]ConnectionInfo {
 			ci.Address = nc.RemoteAddr().String()
 		}
 
-		var tot int64
-		var have int64
-
-		for _, repo := range m.nodeRepos[node] {
-			m.repoFiles[repo].WithGlobal(func(f protocol.FileInfo) bool {
-				if !protocol.IsDeleted(f.Flags) {
-					var size int64
-					if protocol.IsDirectory(f.Flags) {
-						size = zeroEntrySize
-					} else {
-						size = f.Size()
-					}
-					tot += size
-					have += size
-				}
-				return true
-			})
-
-			m.repoFiles[repo].WithNeed(node, func(f protocol.FileInfo) bool {
-				if !protocol.IsDeleted(f.Flags) {
-					var size int64
-					if protocol.IsDirectory(f.Flags) {
-						size = zeroEntrySize
-					} else {
-						size = f.Size()
-					}
-					have -= size
-				}
-				return true
-			})
-		}
-
-		ci.Completion = 100
-		if tot != 0 {
-			ci.Completion = int(100 * have / tot)
-		}
-
 		res[node.String()] = ci
 	}
 
@@ -234,6 +196,39 @@ func (m *Model) ConnectionStats() map[string]ConnectionInfo {
 	return res
 }
 
+// Returns the completion status, in percent, for the given node and repo.
+func (m *Model) Completion(node protocol.NodeID, repo string) float64 {
+	var tot int64
+	m.repoFiles[repo].WithGlobal(func(f protocol.FileInfo) bool {
+		if !protocol.IsDeleted(f.Flags) {
+			var size int64
+			if protocol.IsDirectory(f.Flags) {
+				size = zeroEntrySize
+			} else {
+				size = f.Size()
+			}
+			tot += size
+		}
+		return true
+	})
+
+	var need int64
+	m.repoFiles[repo].WithNeed(node, func(f protocol.FileInfo) bool {
+		if !protocol.IsDeleted(f.Flags) {
+			var size int64
+			if protocol.IsDirectory(f.Flags) {
+				size = zeroEntrySize
+			} else {
+				size = f.Size()
+			}
+			need += size
+		}
+		return true
+	})
+
+	return 100 * (1 - float64(need)/float64(tot))
+}
+
 func sizeOf(fs []protocol.FileInfo) (files, deleted int, bytes int64) {
 	for _, f := range fs {
 		fs, de, by := sizeOfFile(f)
@@ -568,83 +563,86 @@ func (m *Model) AddConnection(rawConn io.Closer, protoConn protocol.Connection)
 func sendIndexes(conn protocol.Connection, repo string, fs *files.Set) {
 	nodeID := conn.ID()
 	name := conn.Name()
+	var err error
 
 	if debug {
 		l.Debugf("sendIndexes for %s-%s@/%q starting", nodeID, name, repo)
 	}
 
-	initial := true
-	minLocalVer := uint64(0)
-	var err error
-
 	defer func() {
 		if debug {
 			l.Debugf("sendIndexes for %s-%s@/%q exiting: %v", nodeID, name, repo, err)
 		}
 	}()
 
+	minLocalVer, err := sendIndexTo(true, 0, conn, repo, fs)
+
 	for err == nil {
-		if !initial {
-			time.Sleep(5 * time.Second)
-			if fs.LocalVersion(protocol.LocalNodeID) <= minLocalVer {
-				continue
-			}
+		time.Sleep(5 * time.Second)
+		if fs.LocalVersion(protocol.LocalNodeID) <= minLocalVer {
+			continue
 		}
 
-		batch := make([]protocol.FileInfo, 0, indexBatchSize)
-		maxLocalVer := uint64(0)
-
-		fs.WithHave(protocol.LocalNodeID, func(f protocol.FileInfo) bool {
-			if f.LocalVersion <= minLocalVer {
-				return true
-			}
-
-			if f.LocalVersion > maxLocalVer {
-				maxLocalVer = f.LocalVersion
-			}
-
-			if len(batch) == indexBatchSize {
-				if initial {
-					if err = conn.Index(repo, batch); err != nil {
-						return false
-					}
-					if debug {
-						l.Debugf("sendIndexes for %s-%s/%q: %d files (initial index)", nodeID, name, repo, len(batch))
-					}
-					initial = false
-				} else {
-					if err = conn.IndexUpdate(repo, batch); err != nil {
-						return false
-					}
-					if debug {
-						l.Debugf("sendIndexes for %s-%s/%q: %d files (batched update)", nodeID, name, repo, len(batch))
-					}
-				}
-
-				batch = make([]protocol.FileInfo, 0, indexBatchSize)
-			}
-
-			batch = append(batch, f)
-			return true
-		})
-
-		if initial {
-			err = conn.Index(repo, batch)
-			if debug && err == nil {
-				l.Debugf("sendIndexes for %s-%s/%q: %d files (small initial index)", nodeID, name, repo, len(batch))
-			}
-			initial = false
-		} else if len(batch) > 0 {
-			err = conn.IndexUpdate(repo, batch)
-			if debug && err == nil {
-				l.Debugf("sendIndexes for %s-%s/%q: %d files (last batch)", nodeID, name, repo, len(batch))
-			}
-		}
-
-		minLocalVer = maxLocalVer
+		minLocalVer, err = sendIndexTo(false, minLocalVer, conn, repo, fs)
 	}
 }
 
+func sendIndexTo(initial bool, minLocalVer uint64, conn protocol.Connection, repo string, fs *files.Set) (uint64, error) {
+	nodeID := conn.ID()
+	name := conn.Name()
+	batch := make([]protocol.FileInfo, 0, indexBatchSize)
+	maxLocalVer := uint64(0)
+	var err error
+
+	fs.WithHave(protocol.LocalNodeID, func(f protocol.FileInfo) bool {
+		if f.LocalVersion <= minLocalVer {
+			return true
+		}
+
+		if f.LocalVersion > maxLocalVer {
+			maxLocalVer = f.LocalVersion
+		}
+
+		if len(batch) == indexBatchSize {
+			if initial {
+				if err = conn.Index(repo, batch); err != nil {
+					return false
+				}
+				if debug {
+					l.Debugf("sendIndexes for %s-%s/%q: %d files (initial index)", nodeID, name, repo, len(batch))
+				}
+				initial = false
+			} else {
+				if err = conn.IndexUpdate(repo, batch); err != nil {
+					return false
+				}
+				if debug {
+					l.Debugf("sendIndexes for %s-%s/%q: %d files (batched update)", nodeID, name, repo, len(batch))
+				}
+			}
+
+			batch = make([]protocol.FileInfo, 0, indexBatchSize)
+		}
+
+		batch = append(batch, f)
+		return true
+	})
+
+	if initial && err == nil {
+		err = conn.Index(repo, batch)
+		if debug && err == nil {
+			l.Debugf("sendIndexes for %s-%s/%q: %d files (small initial index)", nodeID, name, repo, len(batch))
+		}
+	} else if len(batch) > 0 && err == nil {
+		err = conn.IndexUpdate(repo, batch)
+		if debug && err == nil {
+			l.Debugf("sendIndexes for %s-%s/%q: %d files (last batch)", nodeID, name, repo, len(batch))
+		}
+	}
+
+	return maxLocalVer, err
+}
+
 func (m *Model) updateLocal(repo string, f protocol.FileInfo) {
 	f.LocalVersion = 0
 	m.rmut.RLock()
@@ -769,6 +767,13 @@ func (m *Model) ScanRepo(repo string) error {
 	batchSize := 100
 	batch := make([]protocol.FileInfo, 0, 00)
 	for f := range fchan {
+		events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
+			"repo":     repo,
+			"name":     f.Name,
+			"modified": time.Unix(f.Modified, 0),
+			"flags":    fmt.Sprintf("0%o", f.Flags),
+			"size":     f.Size(),
+		})
 		if len(batch) == batchSize {
 			fs.Update(protocol.LocalNodeID, batch)
 			batch = batch[:0]
@@ -792,6 +797,13 @@ func (m *Model) ScanRepo(repo string) error {
 				f.Flags |= protocol.FlagDeleted
 				f.Version = lamport.Default.Tick(f.Version)
 				f.LocalVersion = 0
+				events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
+					"repo":     repo,
+					"name":     f.Name,
+					"modified": time.Unix(f.Modified, 0),
+					"flags":    fmt.Sprintf("0%o", f.Flags),
+					"size":     f.Size(),
+				})
 				batch = append(batch, f)
 			}
 		}

protocol/PROTOCOL.md

@@ -25,13 +25,11 @@ Transport and Authentication
 ----------------------------
 
 BEP is deployed as the highest level in a protocol stack, with the lower
-level protocols providing compression, encryption and authentication.
+level protocols providing encryption and authentication.
 
     +-----------------------------|
     |   Block Exchange Protocol   |
     |-----------------------------|
-    |      Compression (LZ4)      |
-    |-----------------------------|
     | Encryption & Auth (TLS 1.2) |
     |-----------------------------|
     |             TCP             |
@@ -62,48 +60,19 @@ requests are received.
 
 The underlying transport protocol MUST be TCP.
 
-Compression
------------
-
-All data is sent within compressed blocks. Blocks are compressed using
-the LZ4 format and algorithm described in
-https://code.google.com/p/lz4/. Each compressed block is preceded by a
-header consisting of three 32 bit words, in network order (big endian):
-
-     0                   1                   2                   3
-     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                     Magic (0x0x5e63b278)                      |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                          Data Length                          |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                   Uncompressed Block Length                   |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    /                                                               /
-    \                        Compressed Data                        \
-    /                                                               /
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-The Data Length indicates the length of data following the Data Length
-field until the next header, i.e. the length of the Compressed Data
-section plus four bytes for the Uncompressed Block Length field. The
-Uncompressed Block Length indicates the amount of data that will result
-when decompressing the Compressed Data section.
-
-A single BEP message SHOULD be sent as a single compressed block. A
-single compressed block MAY NOT contain more than one BEP message.
-
 Messages
 --------
 
 Every message starts with one 32 bit word indicating the message
-version, type and ID. The header is in network byte order, i.e. big
-endian.
+version, type and ID, followed by the length of the message. The header
+is in network byte order, i.e. big endian.
 
      0                   1                   2                   3
      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |  Ver  |       Message ID      |      Type     |    Reserved   |
+    |  Ver  |       Message ID      |      Type     |   Reserved  |C|
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                            Length                             |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
 For BEP v1 the Version field is set to zero. Future versions with
@@ -125,10 +94,28 @@ The Type field indicates the type of data following the message header
 and is one of the integers defined below. A message of an unknown type
 is a protocol error and MUST result in the connection being terminated.
 
-All data following the message header MUST be in XDR (RFC 1014)
-encoding. All fields shorter than 32 bits and all variable length data
-MUST be padded to a multiple of 32 bits. The actual data types in use by
-BEP, in XDR naming convention, are the following:
+The Compression bit "C" indicates the compression used for the message.
+
+For C=1:
+
+  * The Length field contains the length, in bytes, of the
+    compressed message data.
+
+  * The message data is compressed using the LZ4 format and algorithm
+    described in https://code.google.com/p/lz4/.
+
+For C=0:
+
+  * The Length field contains the length, in bytes, of the
+    uncompressed message data.
+
+  * The message is not compressed.
+
+All data within the the message (post decompression, if compression is
+in use) MUST be in XDR (RFC 1014) encoding. All fields shorter than 32
+bits and all variable length data MUST be padded to a multiple of 32
+bits. The actual data types in use by BEP, in XDR naming convention, are
+the following:
 
  - (unsigned) int   -- (unsigned) 32 bit integer
  - (unsigned) hyper -- (unsigned) 64 bit integer

protocol/counting.go

@@ -7,11 +7,13 @@ package protocol
 import (
 	"io"
 	"sync/atomic"
+	"time"
 )
 
 type countingReader struct {
 	io.Reader
-	tot uint64
+	tot  uint64 // bytes
+	last int64  // unix nanos
 }
 
 var (
@@ -23,6 +25,7 @@ func (c *countingReader) Read(bs []byte) (int, error) {
 	n, err := c.Reader.Read(bs)
 	atomic.AddUint64(&c.tot, uint64(n))
 	atomic.AddUint64(&totalIncoming, uint64(n))
+	atomic.StoreInt64(&c.last, time.Now().UnixNano())
 	return n, err
 }
 
@@ -30,15 +33,21 @@ func (c *countingReader) Tot() uint64 {
 	return atomic.LoadUint64(&c.tot)
 }
 
+func (c *countingReader) Last() time.Time {
+	return time.Unix(0, atomic.LoadInt64(&c.last))
+}
+
 type countingWriter struct {
 	io.Writer
-	tot uint64
+	tot  uint64 // bytes
+	last int64  // unix nanos
 }
 
 func (c *countingWriter) Write(bs []byte) (int, error) {
 	n, err := c.Writer.Write(bs)
 	atomic.AddUint64(&c.tot, uint64(n))
 	atomic.AddUint64(&totalOutgoing, uint64(n))
+	atomic.StoreInt64(&c.last, time.Now().UnixNano())
 	return n, err
 }
 
@@ -46,6 +55,10 @@ func (c *countingWriter) Tot() uint64 {
 	return atomic.LoadUint64(&c.tot)
 }
 
+func (c *countingWriter) Last() time.Time {
+	return time.Unix(0, atomic.LoadInt64(&c.last))
+}
+
 func TotalInOut() (uint64, uint64) {
 	return atomic.LoadUint64(&totalIncoming), atomic.LoadUint64(&totalOutgoing)
 }

protocol/header.go

@@ -7,9 +7,10 @@ package protocol
 import "github.com/calmh/syncthing/xdr"
 
 type header struct {
-	version int
-	msgID   int
-	msgType int
+	version     int
+	msgID       int
+	msgType     int
+	compression bool
 }
 
 func (h header) encodeXDR(xw *xdr.Writer) (int, error) {
@@ -24,15 +25,21 @@ func (h *header) decodeXDR(xr *xdr.Reader) error {
 }
 
 func encodeHeader(h header) uint32 {
+	var isComp uint32
+	if h.compression {
+		isComp = 1 << 0 // the zeroth bit is the compression bit
+	}
 	return uint32(h.version&0xf)<<28 +
 		uint32(h.msgID&0xfff)<<16 +
-		uint32(h.msgType&0xff)<<8
+		uint32(h.msgType&0xff)<<8 +
+		isComp
 }
 
 func decodeHeader(u uint32) header {
 	return header{
-		version: int(u>>28) & 0xf,
-		msgID:   int(u>>16) & 0xfff,
-		msgType: int(u>>8) & 0xff,
+		version:     int(u>>28) & 0xf,
+		msgID:       int(u>>16) & 0xfff,
+		msgType:     int(u>>8) & 0xff,
+		compression: u&1 == 1,
 	}
 }

protocol/message.go

@@ -49,6 +49,10 @@ type RequestMessage struct {
 	Size       uint32
 }
 
+type ResponseMessage struct {
+	Data []byte
+}
+
 type ClusterConfigMessage struct {
 	ClientName    string       // max:64
 	ClientVersion string       // max:64
@@ -75,3 +79,5 @@ type Option struct {
 type CloseMessage struct {
 	Reason string // max:1024
 }
+
+type EmptyMessage struct{}

protocol/message_xdr.go

@@ -348,6 +348,64 @@ func (o *RequestMessage) decodeXDR(xr *xdr.Reader) error {
 
 /*
 
+ResponseMessage Structure:
+
+ 0                   1                   2                   3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                        Length of Data                         |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+/                                                               /
+\                    Data (variable length)                     \
+/                                                               /
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+struct ResponseMessage {
+	opaque Data<>;
+}
+
+*/
+
+func (o ResponseMessage) EncodeXDR(w io.Writer) (int, error) {
+	var xw = xdr.NewWriter(w)
+	return o.encodeXDR(xw)
+}
+
+func (o ResponseMessage) MarshalXDR() []byte {
+	return o.AppendXDR(make([]byte, 0, 128))
+}
+
+func (o ResponseMessage) AppendXDR(bs []byte) []byte {
+	var aw = xdr.AppendWriter(bs)
+	var xw = xdr.NewWriter(&aw)
+	o.encodeXDR(xw)
+	return []byte(aw)
+}
+
+func (o ResponseMessage) encodeXDR(xw *xdr.Writer) (int, error) {
+	xw.WriteBytes(o.Data)
+	return xw.Tot(), xw.Error()
+}
+
+func (o *ResponseMessage) DecodeXDR(r io.Reader) error {
+	xr := xdr.NewReader(r)
+	return o.decodeXDR(xr)
+}
+
+func (o *ResponseMessage) UnmarshalXDR(bs []byte) error {
+	var br = bytes.NewReader(bs)
+	var xr = xdr.NewReader(br)
+	return o.decodeXDR(xr)
+}
+
+func (o *ResponseMessage) decodeXDR(xr *xdr.Reader) error {
+	o.Data = xr.ReadBytes()
+	return xr.Error()
+}
+
+/*
+
 ClusterConfigMessage Structure:
 
  0                   1                   2                   3
@@ -752,3 +810,52 @@ func (o *CloseMessage) decodeXDR(xr *xdr.Reader) error {
 	o.Reason = xr.ReadStringMax(1024)
 	return xr.Error()
 }
+
+/*
+
+EmptyMessage Structure:
+
+ 0                   1                   2                   3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+struct EmptyMessage {
+}
+
+*/
+
+func (o EmptyMessage) EncodeXDR(w io.Writer) (int, error) {
+	var xw = xdr.NewWriter(w)
+	return o.encodeXDR(xw)
+}
+
+func (o EmptyMessage) MarshalXDR() []byte {
+	return o.AppendXDR(make([]byte, 0, 128))
+}
+
+func (o EmptyMessage) AppendXDR(bs []byte) []byte {
+	var aw = xdr.AppendWriter(bs)
+	var xw = xdr.NewWriter(&aw)
+	o.encodeXDR(xw)
+	return []byte(aw)
+}
+
+func (o EmptyMessage) encodeXDR(xw *xdr.Writer) (int, error) {
+	return xw.Tot(), xw.Error()
+}
+
+func (o *EmptyMessage) DecodeXDR(r io.Reader) error {
+	xr := xdr.NewReader(r)
+	return o.decodeXDR(xr)
+}
+
+func (o *EmptyMessage) UnmarshalXDR(bs []byte) error {
+	var br = bytes.NewReader(bs)
+	var xr = xdr.NewReader(br)
+	return o.decodeXDR(xr)
+}
+
+func (o *EmptyMessage) decodeXDR(xr *xdr.Reader) error {
+	return xr.Error()
+}

protocol/protocol.go

@@ -6,16 +6,20 @@ package protocol
 
 import (
 	"bufio"
+	"encoding/binary"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
 	"sync"
 	"time"
 
-	"github.com/calmh/syncthing/xdr"
+	lz4 "github.com/bkaradzic/go-lz4"
 )
 
-const BlockSize = 128 * 1024
+const (
+	BlockSize = 128 * 1024
+)
 
 const (
 	messageTypeClusterConfig = 0
@@ -82,21 +86,24 @@ type rawConnection struct {
 	state    int
 
 	cr *countingReader
-	xr *xdr.Reader
 
 	cw *countingWriter
 	wb *bufio.Writer
-	xw *xdr.Writer
 
-	awaiting    []chan asyncResult
+	awaiting    [4096]chan asyncResult
 	awaitingMut sync.Mutex
 
 	idxMut sync.Mutex // ensures serialization of Index calls
 
 	nextID chan int
-	outbox chan []encodable
+	outbox chan hdrMsg
 	closed chan struct{}
 	once   sync.Once
+
+	compressionThreshold int // compress messages larger than this many bytes
+
+	rdbuf0 []byte // used & reused by readMessage
+	rdbuf1 []byte // used & reused by readMessage
 }
 
 type asyncResult struct {
@@ -104,38 +111,39 @@ type asyncResult struct {
 	err error
 }
 
+type hdrMsg struct {
+	hdr header
+	msg encodable
+}
+
+type encodable interface {
+	AppendXDR([]byte) []byte
+}
+
 const (
 	pingTimeout  = 30 * time.Second
 	pingIdleTime = 60 * time.Second
 )
 
-func NewConnection(nodeID NodeID, reader io.Reader, writer io.Writer, receiver Model, name string) Connection {
-	// Byte counters are at the lowest level, counting compressed bytes
+func NewConnection(nodeID NodeID, reader io.Reader, writer io.Writer, receiver Model, name string, compress bool) Connection {
 	cr := &countingReader{Reader: reader}
 	cw := &countingWriter{Writer: writer}
 
-	// Compression is just above counting
-	zr := newLZ4Reader(cr)
-	zw := newLZ4Writer(cw)
-
-	// We buffer writes on top of compression.
-	// The LZ4 reader is already internally buffered
-	wb := bufio.NewWriterSize(zw, 65536)
-
+	compThres := 1<<31 - 1 // compression disabled
+	if compress {
+		compThres = 128 // compress messages that are 128 bytes long or larger
+	}
 	c := rawConnection{
-		id:       nodeID,
-		name:     name,
-		receiver: nativeModel{receiver},
-		state:    stateInitial,
-		cr:       cr,
-		xr:       xdr.NewReader(zr),
-		cw:       cw,
-		wb:       wb,
-		xw:       xdr.NewWriter(wb),
-		awaiting: make([]chan asyncResult, 0x1000),
-		outbox:   make(chan []encodable),
-		nextID:   make(chan int),
-		closed:   make(chan struct{}),
+		id:                   nodeID,
+		name:                 name,
+		receiver:             nativeModel{receiver},
+		state:                stateInitial,
+		cr:                   cr,
+		cw:                   cw,
+		outbox:               make(chan hdrMsg),
+		nextID:               make(chan int),
+		closed:               make(chan struct{}),
+		compressionThreshold: compThres,
 	}
 
 	go c.readerLoop()
@@ -162,7 +170,7 @@ func (c *rawConnection) Index(repo string, idx []FileInfo) error {
 	default:
 	}
 	c.idxMut.Lock()
-	c.send(header{0, -1, messageTypeIndex}, IndexMessage{repo, idx})
+	c.send(-1, messageTypeIndex, IndexMessage{repo, idx})
 	c.idxMut.Unlock()
 	return nil
 }
@@ -175,7 +183,7 @@ func (c *rawConnection) IndexUpdate(repo string, idx []FileInfo) error {
 	default:
 	}
 	c.idxMut.Lock()
-	c.send(header{0, -1, messageTypeIndexUpdate}, IndexMessage{repo, idx})
+	c.send(-1, messageTypeIndexUpdate, IndexMessage{repo, idx})
 	c.idxMut.Unlock()
 	return nil
 }
@@ -197,8 +205,7 @@ func (c *rawConnection) Request(repo string, name string, offset int64, size int
 	c.awaiting[id] = rc
 	c.awaitingMut.Unlock()
 
-	ok := c.send(header{0, id, messageTypeRequest},
-		RequestMessage{repo, name, uint64(offset), uint32(size)})
+	ok := c.send(id, messageTypeRequest, RequestMessage{repo, name, uint64(offset), uint32(size)})
 	if !ok {
 		return nil, ErrClosed
 	}
@@ -212,7 +219,7 @@ func (c *rawConnection) Request(repo string, name string, offset int64, size int
 
 // ClusterConfig send the cluster configuration message to the peer and returns any error
 func (c *rawConnection) ClusterConfig(config ClusterConfigMessage) {
-	c.send(header{0, -1, messageTypeClusterConfig}, config)
+	c.send(-1, messageTypeClusterConfig, config)
 }
 
 func (c *rawConnection) ping() bool {
@@ -228,7 +235,7 @@ func (c *rawConnection) ping() bool {
 	c.awaiting[id] = rc
 	c.awaitingMut.Unlock()
 
-	ok := c.send(header{0, id, messageTypePing})
+	ok := c.send(id, messageTypePing, nil)
 	if !ok {
 		return false
 	}
@@ -249,68 +256,53 @@ func (c *rawConnection) readerLoop() (err error) {
 		default:
 		}
 
-		var hdr header
-		hdr.decodeXDR(c.xr)
-		if err := c.xr.Error(); err != nil {
+		hdr, msg, err := c.readMessage()
+		if err != nil {
 			return err
 		}
-		if hdr.version != 0 {
-			return fmt.Errorf("protocol error: %s: unknown message version %#x", c.id, hdr.version)
-		}
 
 		switch hdr.msgType {
 		case messageTypeIndex:
 			if c.state < stateCCRcvd {
 				return fmt.Errorf("protocol error: index message in state %d", c.state)
 			}
-			if err := c.handleIndex(); err != nil {
-				return err
-			}
+			c.handleIndex(msg.(IndexMessage))
 			c.state = stateIdxRcvd
 
 		case messageTypeIndexUpdate:
 			if c.state < stateIdxRcvd {
 				return fmt.Errorf("protocol error: index update message in state %d", c.state)
 			}
-			if err := c.handleIndexUpdate(); err != nil {
-				return err
-			}
+			c.handleIndexUpdate(msg.(IndexMessage))
 
 		case messageTypeRequest:
 			if c.state < stateIdxRcvd {
 				return fmt.Errorf("protocol error: request message in state %d", c.state)
 			}
-			if err := c.handleRequest(hdr); err != nil {
-				return err
-			}
+			// Requests are handled asynchronously
+			go c.handleRequest(hdr.msgID, msg.(RequestMessage))
 
 		case messageTypeResponse:
 			if c.state < stateIdxRcvd {
 				return fmt.Errorf("protocol error: response message in state %d", c.state)
 			}
-			if err := c.handleResponse(hdr); err != nil {
-				return err
-			}
+			c.handleResponse(hdr.msgID, msg.(ResponseMessage))
 
 		case messageTypePing:
-			c.send(header{0, hdr.msgID, messageTypePong})
+			c.send(hdr.msgID, messageTypePong, EmptyMessage{})
 
 		case messageTypePong:
-			c.handlePong(hdr)
+			c.handlePong(hdr.msgID)
 
 		case messageTypeClusterConfig:
 			if c.state != stateInitial {
 				return fmt.Errorf("protocol error: cluster config message in state %d", c.state)
 			}
-			if err := c.handleClusterConfig(); err != nil {
-				return err
-			}
+			go c.receiver.ClusterConfig(c.id, msg.(ClusterConfigMessage))
 			c.state = stateCCRcvd
 
 		case messageTypeClose:
-			if err := c.handleClose(); err != nil {
-				return err
-			}
+			return errors.New(msg.(CloseMessage).Reason)
 
 		default:
 			return fmt.Errorf("protocol error: %s: unknown message type %#x", c.id, hdr.msgType)
@@ -318,114 +310,153 @@ func (c *rawConnection) readerLoop() (err error) {
 	}
 }
 
-func (c *rawConnection) handleIndex() error {
-	var im IndexMessage
-	im.decodeXDR(c.xr)
-	if err := c.xr.Error(); err != nil {
-		return err
+func (c *rawConnection) readMessage() (hdr header, msg encodable, err error) {
+	if cap(c.rdbuf0) < 8 {
+		c.rdbuf0 = make([]byte, 8)
 	} else {
-		if debug {
-			l.Debugf("Index(%v, %v, %d files)", c.id, im.Repository, len(im.Files))
-		}
-		c.receiver.Index(c.id, im.Repository, im.Files)
+		c.rdbuf0 = c.rdbuf0[:8]
+	}
+	_, err = io.ReadFull(c.cr, c.rdbuf0)
+	if err != nil {
+		return
 	}
-	return nil
-}
 
-func (c *rawConnection) handleIndexUpdate() error {
-	var im IndexMessage
-	im.decodeXDR(c.xr)
-	if err := c.xr.Error(); err != nil {
-		return err
+	hdr = decodeHeader(binary.BigEndian.Uint32(c.rdbuf0[0:4]))
+	msglen := int(binary.BigEndian.Uint32(c.rdbuf0[4:8]))
+
+	if debug {
+		l.Debugf("read header %v (msglen=%d)", hdr, msglen)
+	}
+
+	if cap(c.rdbuf0) < msglen {
+		c.rdbuf0 = make([]byte, msglen)
 	} else {
+		c.rdbuf0 = c.rdbuf0[:msglen]
+	}
+	_, err = io.ReadFull(c.cr, c.rdbuf0)
+	if err != nil {
+		return
+	}
+
+	if debug {
+		l.Debugf("read %d bytes", len(c.rdbuf0))
+	}
+
+	msgBuf := c.rdbuf0
+	if hdr.compression {
+		c.rdbuf1 = c.rdbuf1[:cap(c.rdbuf1)]
+		c.rdbuf1, err = lz4.Decode(c.rdbuf1, c.rdbuf0)
+		if err != nil {
+			return
+		}
+		msgBuf = c.rdbuf1
 		if debug {
-			l.Debugf("queueing IndexUpdate(%v, %v, %d files)", c.id, im.Repository, len(im.Files))
+			l.Debugf("decompressed to %d bytes", len(msgBuf))
 		}
-		c.receiver.IndexUpdate(c.id, im.Repository, im.Files)
 	}
-	return nil
+
+	if debug {
+		if len(msgBuf) > 1024 {
+			l.Debugf("message data:\n%s", hex.Dump(msgBuf[:1024]))
+		} else {
+			l.Debugf("message data:\n%s", hex.Dump(msgBuf))
+		}
+	}
+
+	switch hdr.msgType {
+	case messageTypeIndex, messageTypeIndexUpdate:
+		var idx IndexMessage
+		err = idx.UnmarshalXDR(msgBuf)
+		msg = idx
+
+	case messageTypeRequest:
+		var req RequestMessage
+		err = req.UnmarshalXDR(msgBuf)
+		msg = req
+
+	case messageTypeResponse:
+		var resp ResponseMessage
+		err = resp.UnmarshalXDR(msgBuf)
+		msg = resp
+
+	case messageTypePing, messageTypePong:
+		msg = EmptyMessage{}
+
+	case messageTypeClusterConfig:
+		var cc ClusterConfigMessage
+		err = cc.UnmarshalXDR(msgBuf)
+		msg = cc
+
+	case messageTypeClose:
+		var cm CloseMessage
+		err = cm.UnmarshalXDR(msgBuf)
+		msg = cm
+
+	default:
+		err = fmt.Errorf("protocol error: %s: unknown message type %#x", c.id, hdr.msgType)
+	}
+
+	return
 }
 
-func (c *rawConnection) handleRequest(hdr header) error {
-	var req RequestMessage
-	req.decodeXDR(c.xr)
-	if err := c.xr.Error(); err != nil {
-		return err
+func (c *rawConnection) handleIndex(im IndexMessage) {
+	if debug {
+		l.Debugf("Index(%v, %v, %d files)", c.id, im.Repository, len(im.Files))
 	}
-	go c.processRequest(hdr.msgID, req)
-	return nil
+	c.receiver.Index(c.id, im.Repository, im.Files)
 }
 
-func (c *rawConnection) handleResponse(hdr header) error {
-	data := c.xr.ReadBytesMax(256 * 1024) // Sufficiently larger than max expected block size
-
-	if err := c.xr.Error(); err != nil {
-		return err
+func (c *rawConnection) handleIndexUpdate(im IndexMessage) {
+	if debug {
+		l.Debugf("queueing IndexUpdate(%v, %v, %d files)", c.id, im.Repository, len(im.Files))
 	}
+	c.receiver.IndexUpdate(c.id, im.Repository, im.Files)
+}
 
+func (c *rawConnection) handleRequest(msgID int, req RequestMessage) {
+	data, _ := c.receiver.Request(c.id, req.Repository, req.Name, int64(req.Offset), int(req.Size))
+
+	c.send(msgID, messageTypeResponse, ResponseMessage{data})
+}
+
+func (c *rawConnection) handleResponse(msgID int, resp ResponseMessage) {
 	c.awaitingMut.Lock()
-	if rc := c.awaiting[hdr.msgID]; rc != nil {
-		c.awaiting[hdr.msgID] = nil
-		rc <- asyncResult{data, nil}
+	if rc := c.awaiting[msgID]; rc != nil {
+		c.awaiting[msgID] = nil
+		rc <- asyncResult{resp.Data, nil}
 		close(rc)
 	}
 	c.awaitingMut.Unlock()
-
-	return nil
 }
 
-func (c *rawConnection) handlePong(hdr header) {
+func (c *rawConnection) handlePong(msgID int) {
 	c.awaitingMut.Lock()
-	if rc := c.awaiting[hdr.msgID]; rc != nil {
-		c.awaiting[hdr.msgID] = nil
+	if rc := c.awaiting[msgID]; rc != nil {
+		c.awaiting[msgID] = nil
 		rc <- asyncResult{}
 		close(rc)
 	}
 	c.awaitingMut.Unlock()
 }
 
-func (c *rawConnection) handleClusterConfig() error {
-	var cm ClusterConfigMessage
-	cm.decodeXDR(c.xr)
-	if err := c.xr.Error(); err != nil {
-		return err
-	} else {
-		go c.receiver.ClusterConfig(c.id, cm)
-	}
-	return nil
-}
-
-func (c *rawConnection) handleClose() error {
-	var cm CloseMessage
-	cm.decodeXDR(c.xr)
-	if err := c.xr.Error(); err != nil {
-		return err
-	}
-	return errors.New(cm.Reason)
-}
-
-type encodable interface {
-	encodeXDR(*xdr.Writer) (int, error)
-}
-type encodableBytes []byte
-
-func (e encodableBytes) encodeXDR(xw *xdr.Writer) (int, error) {
-	return xw.WriteBytes(e)
-}
-
-func (c *rawConnection) send(h header, es ...encodable) bool {
-	if h.msgID < 0 {
+func (c *rawConnection) send(msgID int, msgType int, msg encodable) bool {
+	if msgID < 0 {
 		select {
 		case id := <-c.nextID:
-			h.msgID = id
+			msgID = id
 		case <-c.closed:
 			return false
 		}
 	}
-	msg := append([]encodable{h}, es...)
+
+	hdr := header{
+		version: 0,
+		msgID:   msgID,
+		msgType: msgType,
+	}
 
 	select {
-	case c.outbox <- msg:
+	case c.outbox <- hdrMsg{hdr, msg}:
 		return true
 	case <-c.closed:
 		return false
@@ -433,13 +464,71 @@ func (c *rawConnection) send(h header, es ...encodable) bool {
 }
 
 func (c *rawConnection) writerLoop() {
+	var msgBuf = make([]byte, 8) // buffer for wire format message, kept and reused
+	var uncBuf []byte            // buffer for uncompressed message, kept and reused
 	for {
+		var tempBuf []byte
+		var err error
+
 		select {
-		case es := <-c.outbox:
-			for _, e := range es {
-				e.encodeXDR(c.xw)
+		case hm := <-c.outbox:
+			if hm.msg != nil {
+				// Uncompressed message in uncBuf
+				uncBuf = hm.msg.AppendXDR(uncBuf[:0])
+
+				if len(uncBuf) >= c.compressionThreshold {
+					// Use compression for large messages
+					hm.hdr.compression = true
+
+					// Make sure we have enough space for the compressed message plus header in msgBug
+					msgBuf = msgBuf[:cap(msgBuf)]
+					if maxLen := lz4.CompressBound(len(uncBuf)) + 8; maxLen > len(msgBuf) {
+						msgBuf = make([]byte, maxLen)
+					}
+
+					// Compressed is written to msgBuf, we keep tb for the length only
+					tempBuf, err = lz4.Encode(msgBuf[8:], uncBuf)
+					binary.BigEndian.PutUint32(msgBuf[4:8], uint32(len(tempBuf)))
+					msgBuf = msgBuf[0 : len(tempBuf)+8]
+
+					if debug {
+						l.Debugf("write compressed message; %v (len=%d)", hm.hdr, len(tempBuf))
+					}
+				} else {
+					// No point in compressing very short messages
+					hm.hdr.compression = false
+
+					msgBuf = msgBuf[:cap(msgBuf)]
+					if l := len(uncBuf) + 8; l > len(msgBuf) {
+						msgBuf = make([]byte, l)
+					}
+
+					binary.BigEndian.PutUint32(msgBuf[4:8], uint32(len(uncBuf)))
+					msgBuf = msgBuf[0 : len(uncBuf)+8]
+					copy(msgBuf[8:], uncBuf)
+
+					if debug {
+						l.Debugf("write uncompressed message; %v (len=%d)", hm.hdr, len(uncBuf))
+					}
+				}
+			} else {
+				if debug {
+					l.Debugf("write empty message; %v", hm.hdr)
+				}
+				binary.BigEndian.PutUint32(msgBuf[4:8], 0)
+				msgBuf = msgBuf[:8]
 			}
-			if err := c.flush(); err != nil {
+
+			binary.BigEndian.PutUint32(msgBuf[0:4], encodeHeader(hm.hdr))
+
+			if err == nil {
+				var n int
+				n, err = c.cw.Write(msgBuf)
+				if debug {
+					l.Debugf("wrote %d bytes on the wire", n)
+				}
+			}
+			if err != nil {
 				c.close(err)
 				return
 			}
@@ -449,16 +538,6 @@ func (c *rawConnection) writerLoop() {
 	}
 }
 
-func (c *rawConnection) flush() error {
-	if err := c.xw.Error(); err != nil {
-		return err
-	}
-	if err := c.wb.Flush(); err != nil {
-		return err
-	}
-	return nil
-}
-
 func (c *rawConnection) close(err error) {
 	c.once.Do(func() {
 		close(c.closed)
@@ -494,13 +573,13 @@ func (c *rawConnection) pingerLoop() {
 	for {
 		select {
 		case <-ticker:
-			if d := time.Since(c.xr.LastRead()); d < pingIdleTime {
+			if d := time.Since(c.cr.Last()); d < pingIdleTime {
 				if debug {
 					l.Debugln(c.id, "ping skipped after rd", d)
 				}
 				continue
 			}
-			if d := time.Since(c.xw.LastWrite()); d < pingIdleTime {
+			if d := time.Since(c.cw.Last()); d < pingIdleTime {
 				if debug {
 					l.Debugln(c.id, "ping skipped after wr", d)
 				}
@@ -532,12 +611,6 @@ func (c *rawConnection) pingerLoop() {
 	}
 }
 
-func (c *rawConnection) processRequest(msgID int, req RequestMessage) {
-	data, _ := c.receiver.Request(c.id, req.Repository, req.Name, int64(req.Offset), int(req.Size))
-
-	c.send(header{0, msgID, messageTypeResponse}, encodableBytes(data))
-}
-
 type Statistics struct {
 	At            time.Time
 	InBytesTotal  uint64

protocol/protocol_test.go

@@ -9,6 +9,8 @@ import (
 	"io"
 	"testing"
 	"testing/quick"
+
+	"github.com/calmh/syncthing/xdr"
 )
 
 var (
@@ -21,7 +23,7 @@ func TestHeaderFunctions(t *testing.T) {
 		ver = int(uint(ver) % 16)
 		id = int(uint(id) % 4096)
 		typ = int(uint(typ) % 256)
-		h0 := header{ver, id, typ}
+		h0 := header{version: ver, msgID: id, msgType: typ}
 		h1 := decodeHeader(encodeHeader(h0))
 		return h0 == h1
 	}
@@ -35,21 +37,21 @@ func TestHeaderLayout(t *testing.T) {
 
 	// Version are the first four bits
 	e = 0xf0000000
-	a = encodeHeader(header{0xf, 0, 0})
+	a = encodeHeader(header{version: 0xf})
 	if a != e {
 		t.Errorf("Header layout incorrect; %08x != %08x", a, e)
 	}
 
 	// Message ID are the following 12 bits
 	e = 0x0fff0000
-	a = encodeHeader(header{0, 0xfff, 0})
+	a = encodeHeader(header{msgID: 0xfff})
 	if a != e {
 		t.Errorf("Header layout incorrect; %08x != %08x", a, e)
 	}
 
 	// Type are the last 8 bits before reserved
 	e = 0x0000ff00
-	a = encodeHeader(header{0, 0, 0xff})
+	a = encodeHeader(header{msgType: 0xff})
 	if a != e {
 		t.Errorf("Header layout incorrect; %08x != %08x", a, e)
 	}
@@ -59,8 +61,8 @@ func TestPing(t *testing.T) {
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
-	c0 := NewConnection(c0ID, ar, bw, nil, "name").(wireFormatConnection).next.(*rawConnection)
-	c1 := NewConnection(c1ID, br, aw, nil, "name").(wireFormatConnection).next.(*rawConnection)
+	c0 := NewConnection(c0ID, ar, bw, nil, "name", true).(wireFormatConnection).next.(*rawConnection)
+	c1 := NewConnection(c1ID, br, aw, nil, "name", true).(wireFormatConnection).next.(*rawConnection)
 
 	if ok := c0.ping(); !ok {
 		t.Error("c0 ping failed")
@@ -83,8 +85,8 @@ func TestPingErr(t *testing.T) {
 			eaw := &ErrPipe{PipeWriter: *aw, max: i, err: e}
 			ebw := &ErrPipe{PipeWriter: *bw, max: j, err: e}
 
-			c0 := NewConnection(c0ID, ar, ebw, m0, "name").(wireFormatConnection).next.(*rawConnection)
-			NewConnection(c1ID, br, eaw, m1, "name")
+			c0 := NewConnection(c0ID, ar, ebw, m0, "name", true).(wireFormatConnection).next.(*rawConnection)
+			NewConnection(c1ID, br, eaw, m1, "name", true)
 
 			res := c0.ping()
 			if (i < 8 || j < 8) && res {
@@ -159,15 +161,16 @@ func TestVersionErr(t *testing.T) {
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
-	c0 := NewConnection(c0ID, ar, bw, m0, "name").(wireFormatConnection).next.(*rawConnection)
-	NewConnection(c1ID, br, aw, m1, "name")
+	c0 := NewConnection(c0ID, ar, bw, m0, "name", true).(wireFormatConnection).next.(*rawConnection)
+	NewConnection(c1ID, br, aw, m1, "name", true)
 
-	c0.xw.WriteUint32(encodeHeader(header{
+	w := xdr.NewWriter(c0.cw)
+	w.WriteUint32(encodeHeader(header{
 		version: 2,
 		msgID:   0,
 		msgType: 0,
 	}))
-	c0.flush()
+	w.WriteUint32(0)
 
 	if !m1.isClosed() {
 		t.Error("Connection should close due to unknown version")
@@ -181,15 +184,16 @@ func TestTypeErr(t *testing.T) {
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
-	c0 := NewConnection(c0ID, ar, bw, m0, "name").(wireFormatConnection).next.(*rawConnection)
-	NewConnection(c1ID, br, aw, m1, "name")
+	c0 := NewConnection(c0ID, ar, bw, m0, "name", true).(wireFormatConnection).next.(*rawConnection)
+	NewConnection(c1ID, br, aw, m1, "name", true)
 
-	c0.xw.WriteUint32(encodeHeader(header{
+	w := xdr.NewWriter(c0.cw)
+	w.WriteUint32(encodeHeader(header{
 		version: 0,
 		msgID:   0,
 		msgType: 42,
 	}))
-	c0.flush()
+	w.WriteUint32(0)
 
 	if !m1.isClosed() {
 		t.Error("Connection should close due to unknown message type")
@@ -203,8 +207,8 @@ func TestClose(t *testing.T) {
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
-	c0 := NewConnection(c0ID, ar, bw, m0, "name").(wireFormatConnection).next.(*rawConnection)
-	NewConnection(c1ID, br, aw, m1, "name")
+	c0 := NewConnection(c0ID, ar, bw, m0, "name", true).(wireFormatConnection).next.(*rawConnection)
+	NewConnection(c1ID, br, aw, m1, "name", true)
 
 	c0.close(nil)
 

scanner/blockqueue.go

@@ -0,0 +1,65 @@
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// All rights reserved. Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package scanner
+
+import (
+	"os"
+	"path/filepath"
+	"sync"
+
+	"github.com/calmh/syncthing/protocol"
+)
+
+// The parallell hasher reads FileInfo structures from the inbox, hashes the
+// file to populate the Blocks element and sends it to the outbox. A number of
+// workers are used in parallel. The outbox will become closed when the inbox
+// is closed and all items handled.
+
+func newParallelHasher(dir string, blockSize, workers int, outbox, inbox chan protocol.FileInfo) {
+	var wg sync.WaitGroup
+	wg.Add(workers)
+
+	for i := 0; i < workers; i++ {
+		go func() {
+			hashFile(dir, blockSize, outbox, inbox)
+			wg.Done()
+		}()
+	}
+
+	go func() {
+		wg.Wait()
+		close(outbox)
+	}()
+}
+
+func hashFile(dir string, blockSize int, outbox, inbox chan protocol.FileInfo) {
+	for f := range inbox {
+		if protocol.IsDirectory(f.Flags) || protocol.IsDeleted(f.Flags) {
+			outbox <- f
+			continue
+		}
+
+		fd, err := os.Open(filepath.Join(dir, f.Name))
+		if err != nil {
+			if debug {
+				l.Debugln("open:", err)
+			}
+			continue
+		}
+
+		blocks, err := Blocks(fd, blockSize)
+		fd.Close()
+
+		if err != nil {
+			if debug {
+				l.Debugln("hash error:", f.Name, err)
+			}
+			continue
+		}
+
+		f.Blocks = blocks
+		outbox <- f
+	}
+}

scanner/walk.go

@@ -13,7 +13,6 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
-	"time"
 	"code.google.com/p/go.text/unicode/norm"
 
 	"github.com/calmh/syncthing/lamport"
@@ -60,18 +59,20 @@ type CurrentFiler interface {
 
 // Walk returns the list of files found in the local repository by scanning the
 // file system. Files are blockwise hashed.
-func (w *Walker) Walk() (files chan protocol.FileInfo, ignore map[string][]string, err error) {
+func (w *Walker) Walk() (chan protocol.FileInfo, map[string][]string, error) {
 	if debug {
 		l.Debugln("Walk", w.Dir, w.BlockSize, w.IgnoreFile)
 	}
 
-	err = checkDir(w.Dir)
+	err := checkDir(w.Dir)
 	if err != nil {
-		return
+		return nil, nil, err
 	}
 
-	ignore = make(map[string][]string)
-	files = make(chan protocol.FileInfo)
+	ignore := make(map[string][]string)
+	files := make(chan protocol.FileInfo)
+	hashedFiles := make(chan protocol.FileInfo)
+	newParallelHasher(w.Dir, w.BlockSize, runtime.NumCPU(), hashedFiles, files)
 	hashFiles := w.walkAndHashFiles(files, ignore)
 
 	go func() {
@@ -80,7 +81,7 @@ func (w *Walker) Walk() (files chan protocol.FileInfo, ignore map[string][]strin
 		close(files)
 	}()
 
-	return
+	return hashedFiles, ignore, nil
 }
 
 // CleanTempFiles removes all files that match the temporary filename pattern.
@@ -167,9 +168,6 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo, ign map[string][
 				cf := w.CurrentFiler.CurrentFile(rn)
 				permUnchanged := w.IgnorePerms || !protocol.HasPermissionBits(cf.Flags) || PermsEqual(cf.Flags, uint32(info.Mode()))
 				if !protocol.IsDeleted(cf.Flags) && protocol.IsDirectory(cf.Flags) && permUnchanged {
-					if debug {
-						l.Debugln("unchanged:", cf)
-					}
 					return nil
 				}
 			}
@@ -198,9 +196,6 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo, ign map[string][
 				cf := w.CurrentFiler.CurrentFile(rn)
 				permUnchanged := w.IgnorePerms || !protocol.HasPermissionBits(cf.Flags) || PermsEqual(cf.Flags, uint32(info.Mode()))
 				if !protocol.IsDeleted(cf.Flags) && cf.Modified == info.ModTime().Unix() && permUnchanged {
-					if debug {
-						l.Debugln("unchanged:", cf)
-					}
 					return nil
 				}
 
@@ -225,40 +220,17 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo, ign map[string][
 				}
 			}
 
-			fd, err := os.Open(p)
-			if err != nil {
-				if debug {
-					l.Debugln("open:", p, err)
-				}
-				return nil
-			}
-			defer fd.Close()
-
-			t0 := time.Now()
-			blocks, err := Blocks(fd, w.BlockSize)
-			if err != nil {
-				if debug {
-					l.Debugln("hash error:", rn, err)
-				}
-				return nil
-			}
-			if debug {
-				t1 := time.Now()
-				l.Debugln("hashed:", rn, ";", len(blocks), "blocks;", info.Size(), "bytes;", int(float64(info.Size())/1024/t1.Sub(t0).Seconds()), "KB/s")
-			}
-
 			var flags = uint32(info.Mode() & os.ModePerm)
 			if w.IgnorePerms {
 				flags = protocol.FlagNoPermBits | 0666
 			}
-			f := protocol.FileInfo{
+
+			fchan <- protocol.FileInfo{
 				Name:     rn,
 				Version:  lamport.Default.Tick(0),
 				Flags:    flags,
 				Modified: info.ModTime().Unix(),
-				Blocks:   blocks,
 			}
-			fchan <- f
 		}
 
 		return nil

scanner/walk_test.go

@@ -7,6 +7,7 @@ package scanner
 import (
 	"fmt"
 	"reflect"
+	"sort"
 	"testing"
 	"time"
 
@@ -39,6 +40,7 @@ func TestWalk(t *testing.T) {
 	for f := range fchan {
 		files = append(files, f)
 	}
+	sort.Sort(fileList(files))
 
 	if err != nil {
 		t.Fatal(err)
@@ -133,3 +135,17 @@ func TestIgnore(t *testing.T) {
 		}
 	}
 }
+
+type fileList []protocol.FileInfo
+
+func (f fileList) Len() int {
+	return len(f)
+}
+
+func (f fileList) Less(a, b int) bool {
+	return f[a].Name < f[b].Name
+}
+
+func (f fileList) Swap(a, b int) {
+	f[a], f[b] = f[b], f[a]
+}

xdr/reader.go

@@ -7,18 +7,15 @@ package xdr
 import (
 	"errors"
 	"io"
-	"time"
 )
 
 var ErrElementSizeExceeded = errors.New("element size exceeded")
 
 type Reader struct {
-	r    io.Reader
-	tot  int
-	err  error
-	b    [8]byte
-	sb   []byte
-	last time.Time
+	r   io.Reader
+	err error
+	b   [8]byte
+	sb  []byte
 }
 
 func NewReader(r io.Reader) *Reader {
@@ -63,8 +60,6 @@ func (r *Reader) ReadBytesMaxInto(max int, dst []byte) []byte {
 	if r.err != nil {
 		return nil
 	}
-	r.last = time.Now()
-	s := r.tot
 
 	l := int(r.ReadUint32())
 	if r.err != nil {
@@ -85,17 +80,16 @@ func (r *Reader) ReadBytesMaxInto(max int, dst []byte) []byte {
 	n, r.err = io.ReadFull(r.r, dst)
 	if r.err != nil {
 		if debug {
-			dl.Debugf("@0x%x: rd bytes (%d): %v", s, len(dst), r.err)
+			dl.Debugf("rd bytes (%d): %v", len(dst), r.err)
 		}
 		return nil
 	}
-	r.tot += n
 
 	if debug {
 		if n > maxDebugBytes {
-			dl.Debugf("@0x%x: rd bytes (%d): %x...", s, len(dst), dst[:maxDebugBytes])
+			dl.Debugf("rd bytes (%d): %x...", len(dst), dst[:maxDebugBytes])
 		} else {
-			dl.Debugf("@0x%x: rd bytes (%d): %x", s, len(dst), dst)
+			dl.Debugf("rd bytes (%d): %x", len(dst), dst)
 		}
 	}
 	return dst[:l]
@@ -113,15 +107,11 @@ func (r *Reader) ReadUint32() uint32 {
 	if r.err != nil {
 		return 0
 	}
-	r.last = time.Now()
-	s := r.tot
 
-	var n int
-	n, r.err = io.ReadFull(r.r, r.b[:4])
-	r.tot += n
+	_, r.err = io.ReadFull(r.r, r.b[:4])
 	if r.err != nil {
 		if debug {
-			dl.Debugf("@0x%x: rd uint32: %v", r.tot, r.err)
+			dl.Debugf("rd uint32: %v", r.err)
 		}
 		return 0
 	}
@@ -129,7 +119,7 @@ func (r *Reader) ReadUint32() uint32 {
 	v := uint32(r.b[3]) | uint32(r.b[2])<<8 | uint32(r.b[1])<<16 | uint32(r.b[0])<<24
 
 	if debug {
-		dl.Debugf("@0x%x: rd uint32=%d (0x%08x)", s, v, v)
+		dl.Debugf("rd uint32=%d (0x%08x)", v, v)
 	}
 	return v
 }
@@ -138,15 +128,11 @@ func (r *Reader) ReadUint64() uint64 {
 	if r.err != nil {
 		return 0
 	}
-	r.last = time.Now()
-	s := r.tot
 
-	var n int
-	n, r.err = io.ReadFull(r.r, r.b[:8])
-	r.tot += n
+	_, r.err = io.ReadFull(r.r, r.b[:8])
 	if r.err != nil {
 		if debug {
-			dl.Debugf("@0x%x: rd uint64: %v", r.tot, r.err)
+			dl.Debugf("rd uint64: %v", r.err)
 		}
 		return 0
 	}
@@ -155,19 +141,23 @@ func (r *Reader) ReadUint64() uint64 {
 		uint64(r.b[3])<<32 | uint64(r.b[2])<<40 | uint64(r.b[1])<<48 | uint64(r.b[0])<<56
 
 	if debug {
-		dl.Debugf("@0x%x: rd uint64=%d (0x%016x)", s, v, v)
+		dl.Debugf("rd uint64=%d (0x%016x)", v, v)
 	}
 	return v
 }
 
-func (r *Reader) Tot() int {
-	return r.tot
+type XDRError struct {
+	op  string
+	err error
+}
+
+func (e XDRError) Error() string {
+	return "xdr " + e.op + ": " + e.err.Error()
 }
 
 func (r *Reader) Error() error {
-	return r.err
-}
-
-func (r *Reader) LastRead() time.Time {
-	return r.last
+	if r.err == nil {
+		return nil
+	}
+	return XDRError{"read", r.err}
 }

xdr/writer.go

@@ -4,10 +4,7 @@
 
 package xdr
 
-import (
-	"io"
-	"time"
-)
+import "io"
 
 func pad(l int) int {
 	d := l % 4
@@ -20,11 +17,10 @@ func pad(l int) int {
 var padBytes = []byte{0, 0, 0}
 
 type Writer struct {
-	w    io.Writer
-	tot  int
-	err  error
-	b    [8]byte
-	last time.Time
+	w   io.Writer
+	tot int
+	err error
+	b   [8]byte
 }
 
 type AppendWriter []byte
@@ -49,7 +45,6 @@ func (w *Writer) WriteBytes(bs []byte) (int, error) {
 		return 0, w.err
 	}
 
-	w.last = time.Now()
 	w.WriteUint32(uint32(len(bs)))
 	if w.err != nil {
 		return 0, w.err
@@ -93,7 +88,6 @@ func (w *Writer) WriteUint32(v uint32) (int, error) {
 		return 0, w.err
 	}
 
-	w.last = time.Now()
 	if debug {
 		dl.Debugf("wr uint32=%d", v)
 	}
@@ -114,7 +108,6 @@ func (w *Writer) WriteUint64(v uint64) (int, error) {
 		return 0, w.err
 	}
 
-	w.last = time.Now()
 	if debug {
 		dl.Debugf("wr uint64=%d", v)
 	}
@@ -139,9 +132,8 @@ func (w *Writer) Tot() int {
 }
 
 func (w *Writer) Error() error {
-	return w.err
-}
-
-func (w *Writer) LastWrite() time.Time {
-	return w.last
+	if w.err == nil {
+		return nil
+	}
+	return XDRError{"write", w.err}
 }