From 77970d5113a938e742cf5aa3f5f15fde1f0d3d3b Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 1 Dec 2024 16:50:17 +0100 Subject: [PATCH] refactor: use modern Protobuf encoder (#9817) At a high level, this is what I've done and why: - I'm moving the protobuf generation for the `protocol`, `discovery` and `db` packages to the modern alternatives, and using `buf` to generate because it's nice and simple. - After trying various approaches on how to integrate the new types with the existing code, I opted for splitting off our own data model types from the on-the-wire generated types. This means we can have a `FileInfo` type with nicer ergonomics and lots of methods, while the protobuf generated type stays clean and close to the wire protocol. It does mean copying between the two when required, which certainly adds a small amount of inefficiency. If we want to walk this back in the future and use the raw generated type throughout, that's possible, this however makes the refactor smaller (!) as it doesn't change everything about the type for everyone at the same time. - I have simply removed in cold blood a significant number of old database migrations. These depended on previous generations of generated messages of various kinds and were annoying to support in the new fashion. The oldest supported database version now is the one from Syncthing 1.9.0 from Sep 7, 2020. - I changed config structs to be regular manually defined structs. For the sake of discussion, some things I tried that turned out not to work... ### Embedding / wrapping Embedding the protobuf generated structs in our existing types as a data container and keeping our methods and stuff: ``` package protocol type FileInfo struct { *generated.FileInfo } ``` This generates a lot of problems because the internal shape of the generated struct is quite different (different names, different types, more pointers), because initializing it doesn't work like you'd expect (i.e., you end up with an embedded nil pointer and a panic), and because the types of child types don't get wrapped. That is, even if we also have a similar wrapper around a `Vector`, that's not the type you get when accessing `someFileInfo.Version`, you get the `*generated.Vector` that doesn't have methods, etc. ### Aliasing ``` package protocol type FileInfo = generated.FileInfo ``` Doesn't help because you can't attach methods to it, plus all the above. ### Generating the types into the target package like we do now and attaching methods This fails because of the different shape of the generated type (as in the embedding case above) plus the generated struct already has a bunch of methods that we can't necessarily override properly (like `String()` and a bunch of getters). ### Methods to functions I considered just moving all the methods we attach to functions in a specific package, so that for example ``` package protocol func (f FileInfo) Equal(other FileInfo) bool ``` would become ``` package fileinfos func Equal(a, b *generated.FileInfo) bool ``` and this would mostly work, but becomes quite verbose and cumbersome, and somewhat limits discoverability (you can't see what methods are available on the type in auto completions, etc). In the end I did this in some cases, like in the database layer where a lot of things like `func (fv *FileVersion) IsEmpty() bool` becomes `func fvIsEmpty(fv *generated.FileVersion)` because they were anyway just internal methods. Fixes #8247 --- .golangci.yml | 47 +- buf.gen.yaml | 12 + buf.yaml | 10 + build.go | 27 +- cmd/dev/stdisco/main.go | 20 +- cmd/infra/strelaypoolsrv/main.go | 1 + cmd/infra/ursrv/serve/serve.go | 4 +- cmd/stdiscosrv/amqp.go | 28 +- cmd/stdiscosrv/apisrv.go | 7 +- cmd/stdiscosrv/database.go | 62 +- cmd/stdiscosrv/database.pb.go | 792 -- cmd/stdiscosrv/database.proto | 32 - cmd/stdiscosrv/database_test.go | 89 +- cmd/stdiscosrv/main.go | 6 +- cmd/strelaysrv/listener.go | 3 +- cmd/strelaysrv/main.go | 3 +- cmd/syncthing/cli/index_dump.go | 40 +- cmd/syncthing/cli/index_idxck.go | 133 +- cmd/syncthing/decrypt/decrypt.go | 10 +- cmd/syncthing/main.go | 2 +- go.mod | 1 - go.sum | 10 - .../syncthing/core/aboutModalView.html | 1 - internal/gen/apiproto/tokenset.pb.go | 143 + internal/gen/bep/bep.pb.go | 2335 ++++++ internal/gen/dbproto/structs.pb.go | 938 +++ internal/gen/discoproto/local.pb.go | 155 + internal/gen/discosrv/discosrv.pb.go | 276 + internal/protoutil/protoutil.go | 24 + lib/api/api.go | 20 +- lib/api/api_test.go | 3 +- lib/api/tokenmanager.go | 11 +- lib/api/tokenset.pb.go | 411 - lib/config/authmode.go | 7 + lib/config/authmode.pb.go | 69 - lib/config/blockpullorder.go | 8 + lib/config/blockpullorder.pb.go | 73 - lib/config/compression.go | 58 + lib/{protocol => config}/compression_test.go | 2 +- lib/config/config.go | 22 + lib/config/config.pb.go | 1155 --- lib/config/config_test.go | 26 +- lib/config/copyrangemethod.go | 86 + lib/config/deviceconfiguration.go | 24 + lib/config/deviceconfiguration.pb.go | 1057 --- lib/config/filesystemtype.go | 54 + lib/config/folderconfiguration.go | 79 +- lib/config/folderconfiguration.pb.go | 2626 ------- lib/config/foldertype.go | 9 + lib/config/foldertype.pb.go | 77 - lib/config/guiconfiguration.go | 17 + lib/config/guiconfiguration.pb.go | 840 -- lib/config/ldapconfiguration.go | 9 + lib/config/ldapconfiguration.pb.go | 526 -- lib/config/ldaptransport.go | 8 + lib/config/ldaptransport.pb.go | 75 - lib/config/migrations.go | 6 +- lib/config/observed.go | 26 + lib/config/observed.pb.go | 716 -- lib/config/optionsconfiguration.go | 75 + lib/config/optionsconfiguration.pb.go | 2735 ------- lib/config/pullorder.go | 11 + lib/config/pullorder.pb.go | 87 - lib/config/size.go | 5 + lib/config/size.pb.go | 336 - lib/config/tuning.go | 8 + lib/config/tuning.pb.go | 71 - lib/config/versioningconfiguration.go | 24 +- lib/config/versioningconfiguration.pb.go | 591 -- lib/config/wrapper.go | 3 +- lib/connections/limiter.go | 3 +- lib/connections/limiter_test.go | 3 +- lib/connections/service.go | 9 +- lib/connections/structs.go | 4 +- lib/db/benchmark_test.go | 14 +- lib/db/db_test.go | 323 +- lib/db/lowlevel.go | 68 +- lib/db/meta.go | 64 +- lib/db/observed.go | 63 +- lib/db/schemaupdater.go | 862 +- lib/db/set.go | 77 +- lib/db/set_test.go | 50 +- lib/db/structs.go | 369 +- lib/db/structs.pb.go | 3478 -------- lib/db/testdata/.gitignore | 1 - lib/db/testdata/v0.14.45-update0to3.db.jsons | 22 - .../testdata/v0.14.48-ignoredfiles.db.jsons | 15 - lib/db/testdata/v1.4.0-updateTo10.json | 24 - lib/db/transactions.go | 217 +- lib/db/util.go | 7 +- lib/discover/cache.go | 3 +- lib/discover/global.go | 3 +- lib/discover/local.go | 45 +- lib/discover/local.pb.go | 399 - lib/discover/local_test.go | 31 +- lib/fs/basicfs_platformdata_unix.go | 4 +- lib/fs/basicfs_watch_errors_others.go | 2 +- lib/fs/basicfs_xattr_unsupported.go | 4 +- lib/fs/copyrangemethod.go | 39 +- lib/fs/copyrangemethod.pb.go | 90 - lib/fs/types.go | 23 +- lib/fs/types.pb.go | 68 - lib/model/fakeconns_test.go | 2 +- lib/model/folder.go | 70 +- lib/model/folder_recvenc.go | 15 +- lib/model/folder_recvonly.go | 5 +- lib/model/folder_recvonly_test.go | 7 +- lib/model/folder_sendonly.go | 15 +- lib/model/folder_sendrecv.go | 18 +- lib/model/folder_sendrecv_test.go | 12 +- lib/model/indexhandler.go | 4 +- lib/model/mocks/folderSummaryService.go | 30 - lib/model/mocks/model.go | 80 +- lib/model/model.go | 52 +- lib/model/model_test.go | 84 +- lib/model/sharedpullerstate.go | 7 +- lib/model/testutils_test.go | 4 +- lib/osutil/osutil.go | 2 +- lib/protocol/LICENSE | 19 - lib/protocol/benchmark_test.go | 6 +- lib/protocol/bep.pb.go | 6989 ----------------- lib/protocol/bep_clusterconfig.go | 147 + lib/protocol/bep_download_progress.go | 79 + .../{bep_extensions.go => bep_fileinfo.go} | 605 +- lib/protocol/bep_fileinfo_test.go | 293 + lib/protocol/{hello.go => bep_hello.go} | 63 +- .../{hello_test.go => bep_hello_test.go} | 10 +- lib/protocol/bep_index_updates.go | 78 + lib/protocol/bep_request_response.go | 80 + lib/protocol/bufferpool.go | 15 +- lib/protocol/bufferpool_test.go | 6 +- lib/protocol/common_test.go | 10 +- lib/protocol/compression.go | 39 - lib/protocol/conflict_test.go | 14 +- lib/protocol/counting.go | 6 +- lib/protocol/debug.go | 6 +- lib/protocol/deviceid.go | 13 +- lib/protocol/deviceid_test.go | 59 +- lib/protocol/deviceid_test.pb.go | 481 -- lib/protocol/doc.go | 6 +- lib/protocol/encryption.go | 14 +- lib/protocol/errors.go | 14 +- lib/protocol/indexid.go | 39 + lib/protocol/luhn.go | 6 +- lib/protocol/luhn_test.go | 6 +- lib/protocol/nativemodel_darwin.go | 6 +- lib/protocol/nativemodel_unix.go | 6 +- lib/protocol/nativemodel_windows.go | 6 +- lib/protocol/nativemodel_windows_test.go | 6 +- lib/protocol/protocol.go | 301 +- lib/protocol/protocol_test.go | 463 +- lib/protocol/vector.go | 55 +- lib/protocol/vector_test.go | 6 +- lib/protocol/wireformat.go | 6 +- lib/relay/protocol/packets.go | 4 +- lib/scanner/walk.go | 7 +- lib/scanner/walk_test.go | 3 +- lib/sliceutil/sliceutil.go | 8 + lib/syncthing/globalmigrations.go | 3 +- lib/syncthing/utils.go | 2 +- lib/ur/usage_report.go | 6 +- lib/versioner/simple.go | 2 +- lib/versioner/simple_test.go | 8 +- lib/versioner/staggered.go | 2 +- lib/versioner/staggered_test.go | 4 +- lib/versioner/trashcan.go | 2 +- lib/versioner/trashcan_test.go | 10 +- lib/versioner/util.go | 6 +- lib/watchaggregator/aggregator_test.go | 2 +- proto/apiproto/tokenset.proto | 8 + proto/bep/bep.proto | 253 + proto/dbproto/structs.proto | 103 + proto/discoproto/local.proto | 9 + proto/discosrv/discosrv.proto | 19 + proto/ext.proto | 26 - proto/ext/ext.pb.go | 152 - proto/generate.go | 53 - proto/lib/api/tokenset.proto | 8 - proto/lib/config/authmode.proto | 14 - proto/lib/config/blockpullorder.proto | 13 - proto/lib/config/config.proto | 34 - proto/lib/config/deviceconfiguration.proto | 30 - proto/lib/config/folderconfiguration.proto | 86 - proto/lib/config/foldertype.proto | 14 - proto/lib/config/guiconfiguration.proto | 24 - proto/lib/config/ldapconfiguration.proto | 17 - proto/lib/config/ldaptransport.proto | 15 - proto/lib/config/observed.proto | 20 - proto/lib/config/optionsconfiguration.proto | 88 - proto/lib/config/pullorder.proto | 16 - proto/lib/config/size.proto | 14 - proto/lib/config/tuning.proto | 13 - .../lib/config/versioningconfiguration.proto | 16 - proto/lib/db/structs.proto | 106 - proto/lib/discover/local.proto | 13 - proto/lib/fs/copyrangemethod.proto | 16 - proto/lib/fs/types.proto | 12 - proto/lib/protocol/bep.proto | 261 - proto/lib/protocol/deviceid_test.proto | 15 - proto/scripts/dump_tags.go | 68 - proto/scripts/protoc_plugin.go | 313 - proto/scripts/protofmt.go | 122 - tools.go | 1 - 203 files changed, 7424 insertions(+), 28623 deletions(-) create mode 100644 buf.gen.yaml create mode 100644 buf.yaml delete mode 100644 cmd/stdiscosrv/database.pb.go delete mode 100644 cmd/stdiscosrv/database.proto create mode 100644 internal/gen/apiproto/tokenset.pb.go create mode 100644 internal/gen/bep/bep.pb.go create mode 100644 internal/gen/dbproto/structs.pb.go create mode 100644 internal/gen/discoproto/local.pb.go create mode 100644 internal/gen/discosrv/discosrv.pb.go create mode 100644 internal/protoutil/protoutil.go delete mode 100644 lib/api/tokenset.pb.go delete mode 100644 lib/config/authmode.pb.go delete mode 100644 lib/config/blockpullorder.pb.go create mode 100644 lib/config/compression.go rename lib/{protocol => config}/compression_test.go (98%) delete mode 100644 lib/config/config.pb.go create mode 100644 lib/config/copyrangemethod.go delete mode 100644 lib/config/deviceconfiguration.pb.go create mode 100644 lib/config/filesystemtype.go delete mode 100644 lib/config/folderconfiguration.pb.go delete mode 100644 lib/config/foldertype.pb.go delete mode 100644 lib/config/guiconfiguration.pb.go delete mode 100644 lib/config/ldapconfiguration.pb.go delete mode 100644 lib/config/ldaptransport.pb.go create mode 100644 lib/config/observed.go delete mode 100644 lib/config/observed.pb.go delete mode 100644 lib/config/optionsconfiguration.pb.go delete mode 100644 lib/config/pullorder.pb.go delete mode 100644 lib/config/size.pb.go delete mode 100644 lib/config/tuning.pb.go delete mode 100644 lib/config/versioningconfiguration.pb.go delete mode 100644 lib/db/structs.pb.go delete mode 100644 lib/db/testdata/.gitignore delete mode 100644 lib/db/testdata/v0.14.45-update0to3.db.jsons delete mode 100644 lib/db/testdata/v0.14.48-ignoredfiles.db.jsons delete mode 100644 lib/db/testdata/v1.4.0-updateTo10.json delete mode 100644 lib/discover/local.pb.go delete mode 100644 lib/fs/copyrangemethod.pb.go delete mode 100644 lib/fs/types.pb.go delete mode 100644 lib/protocol/LICENSE delete mode 100644 lib/protocol/bep.pb.go create mode 100644 lib/protocol/bep_clusterconfig.go create mode 100644 lib/protocol/bep_download_progress.go rename lib/protocol/{bep_extensions.go => bep_fileinfo.go} (52%) create mode 100644 lib/protocol/bep_fileinfo_test.go rename lib/protocol/{hello.go => bep_hello.go} (63%) rename lib/protocol/{hello_test.go => bep_hello_test.go} (86%) create mode 100644 lib/protocol/bep_index_updates.go create mode 100644 lib/protocol/bep_request_response.go delete mode 100644 lib/protocol/compression.go delete mode 100644 lib/protocol/deviceid_test.pb.go create mode 100644 lib/protocol/indexid.go create mode 100644 proto/apiproto/tokenset.proto create mode 100644 proto/bep/bep.proto create mode 100644 proto/dbproto/structs.proto create mode 100644 proto/discoproto/local.proto create mode 100644 proto/discosrv/discosrv.proto delete mode 100644 proto/ext.proto delete mode 100644 proto/ext/ext.pb.go delete mode 100644 proto/generate.go delete mode 100644 proto/lib/api/tokenset.proto delete mode 100644 proto/lib/config/authmode.proto delete mode 100644 proto/lib/config/blockpullorder.proto delete mode 100644 proto/lib/config/config.proto delete mode 100644 proto/lib/config/deviceconfiguration.proto delete mode 100644 proto/lib/config/folderconfiguration.proto delete mode 100644 proto/lib/config/foldertype.proto delete mode 100644 proto/lib/config/guiconfiguration.proto delete mode 100644 proto/lib/config/ldapconfiguration.proto delete mode 100644 proto/lib/config/ldaptransport.proto delete mode 100644 proto/lib/config/observed.proto delete mode 100644 proto/lib/config/optionsconfiguration.proto delete mode 100644 proto/lib/config/pullorder.proto delete mode 100644 proto/lib/config/size.proto delete mode 100644 proto/lib/config/tuning.proto delete mode 100644 proto/lib/config/versioningconfiguration.proto delete mode 100644 proto/lib/db/structs.proto delete mode 100644 proto/lib/discover/local.proto delete mode 100644 proto/lib/fs/copyrangemethod.proto delete mode 100644 proto/lib/fs/types.proto delete mode 100644 proto/lib/protocol/bep.proto delete mode 100644 proto/lib/protocol/deviceid_test.proto delete mode 100644 proto/scripts/dump_tags.go delete mode 100644 proto/scripts/protoc_plugin.go delete mode 100644 proto/scripts/protofmt.go diff --git a/.golangci.yml b/.golangci.yml index 490c1856833..dfabd12054f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,26 +1,39 @@ -linters-settings: - maligned: - suggest-new: true - linters: enable-all: true disable: - - goimports + - cyclop - depguard - - lll - - gochecknoinits + - exhaustive + - exhaustruct + - funlen + - gci - gochecknoglobals + - gochecknoinits + - gocognit + - goconst + - gocyclo + - godox - gofmt + - goimports + - gomoddirectives + - inamedparam + - interfacebloat + - ireturn + - lll + - maintidx + - nestif + - nonamedreturns + - paralleltest + - protogetter - scopelint - - gocyclo - - funlen + - tagalign + - tagliatelle + - testpackage + - varnamelen - wsl - - gocognit - - godox -service: - golangci-lint-version: 1.21.x - prepare: - - rm -f go.sum # 1.12 -> 1.13 issues with QUIC-go - - GO111MODULE=on go mod vendor - - go run build.go assets +issues: + exclude-dirs: + - internal/gen + - cmd/dev + - repos \ No newline at end of file diff --git a/buf.gen.yaml b/buf.gen.yaml new file mode 100644 index 00000000000..25d2191de35 --- /dev/null +++ b/buf.gen.yaml @@ -0,0 +1,12 @@ +version: v2 +managed: + enabled: true + override: + - file_option: go_package_prefix + value: github.com/syncthing/syncthing/internal/gen +plugins: + - remote: buf.build/protocolbuffers/go:v1.35.1 + out: . + opt: module=github.com/syncthing/syncthing +inputs: + - directory: proto diff --git a/buf.yaml b/buf.yaml new file mode 100644 index 00000000000..1b1724b907b --- /dev/null +++ b/buf.yaml @@ -0,0 +1,10 @@ +version: v2 +modules: + - path: proto + name: github.com/syncthing/syncthing +lint: + use: + - STANDARD +breaking: + use: + - WIRE_JSON diff --git a/build.go b/build.go index 876649fe95a..4a4f4bb0ff6 100644 --- a/build.go +++ b/build.go @@ -925,22 +925,9 @@ func updateDependencies() { } func proto() { - pv := protobufVersion() - repo := "https://github.com/gogo/protobuf.git" - path := filepath.Join("repos", "protobuf") - - runPrint(goCmd, "install", fmt.Sprintf("github.com/gogo/protobuf/protoc-gen-gogofast@%v", pv)) - os.MkdirAll("repos", 0o755) - - if _, err := os.Stat(path); err != nil { - runPrint("git", "clone", repo, path) - } else { - runPrintInDir(path, "git", "fetch") - } - runPrintInDir(path, "git", "checkout", pv) - - runPrint(goCmd, "generate", "github.com/syncthing/syncthing/cmd/stdiscosrv") - runPrint(goCmd, "generate", "proto/generate.go") + // buf needs to be installed + // https://buf.build/docs/installation/ + runPrint("buf", "generate") } func testmocks() { @@ -1483,14 +1470,6 @@ func (t target) BinaryName() string { return t.binaryName } -func protobufVersion() string { - bs, err := runError(goCmd, "list", "-f", "{{.Version}}", "-m", "github.com/gogo/protobuf") - if err != nil { - log.Fatal("Getting protobuf version:", err) - } - return string(bs) -} - func currentAndLatestVersions(n int) ([]string, error) { bs, err := runError("git", "tag", "--sort", "taggerdate") if err != nil { diff --git a/cmd/dev/stdisco/main.go b/cmd/dev/stdisco/main.go index 8815e1de1fa..5f909f02820 100644 --- a/cmd/dev/stdisco/main.go +++ b/cmd/dev/stdisco/main.go @@ -15,6 +15,9 @@ import ( "strings" "time" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/discoproto" _ "github.com/syncthing/syncthing/lib/automaxprocs" "github.com/syncthing/syncthing/lib/beacon" "github.com/syncthing/syncthing/lib/discover" @@ -75,20 +78,21 @@ func recv(bc beacon.Interface) { continue } - var ann discover.Announce - ann.Unmarshal(data[4:]) + var ann discoproto.Announce + proto.Unmarshal(data[4:], &ann) - if ann.ID == myID { + id, _ := protocol.DeviceIDFromBytes(ann.Id) + if id == myID { // This is one of our own fake packets, don't print it. continue } // Print announcement details for the first packet from a given // device ID and source address, or if -all was given. - key := ann.ID.String() + src.String() + key := id.String() + src.String() if all || !seen[key] { log.Printf("Announcement from %v\n", src) - log.Printf(" %v at %s\n", ann.ID, strings.Join(ann.Addresses, ", ")) + log.Printf(" %v at %s\n", id, strings.Join(ann.Addresses, ", ")) seen[key] = true } } @@ -96,11 +100,11 @@ func recv(bc beacon.Interface) { // sends fake discovery announcements once every second func send(bc beacon.Interface) { - ann := discover.Announce{ - ID: myID, + ann := &discoproto.Announce{ + Id: myID[:], Addresses: []string{"tcp://fake.example.com:12345"}, } - bs, _ := ann.Marshal() + bs, _ := proto.Marshal(ann) for { bc.Send(bs) diff --git a/cmd/infra/strelaypoolsrv/main.go b/cmd/infra/strelaypoolsrv/main.go index e007b286b98..77770cae476 100644 --- a/cmd/infra/strelaypoolsrv/main.go +++ b/cmd/infra/strelaypoolsrv/main.go @@ -23,6 +23,7 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto" "github.com/syncthing/syncthing/lib/assets" _ "github.com/syncthing/syncthing/lib/automaxprocs" diff --git a/cmd/infra/ursrv/serve/serve.go b/cmd/infra/ursrv/serve/serve.go index 0986b40750b..b1cdabc991b 100644 --- a/cmd/infra/ursrv/serve/serve.go +++ b/cmd/infra/ursrv/serve/serve.go @@ -17,17 +17,15 @@ import ( "log/slog" "net" "net/http" + _ "net/http/pprof" "os" "regexp" "strings" "time" - _ "net/http/pprof" - "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/puzpuzpuz/xsync/v3" - "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/geoip" "github.com/syncthing/syncthing/lib/s3" diff --git a/cmd/stdiscosrv/amqp.go b/cmd/stdiscosrv/amqp.go index bb99c1e6d32..d1b6817f16a 100644 --- a/cmd/stdiscosrv/amqp.go +++ b/cmd/stdiscosrv/amqp.go @@ -13,8 +13,12 @@ import ( "log" amqp "github.com/rabbitmq/amqp091-go" - "github.com/syncthing/syncthing/lib/protocol" "github.com/thejerf/suture/v4" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/discosrv" + "github.com/syncthing/syncthing/internal/protoutil" + "github.com/syncthing/syncthing/lib/protocol" ) type amqpReplicator struct { @@ -22,7 +26,7 @@ type amqpReplicator struct { broker string sender *amqpSender receiver *amqpReceiver - outbox chan ReplicationRecord + outbox chan *discosrv.ReplicationRecord } func newAMQPReplicator(broker, clientID string, db database) *amqpReplicator { @@ -31,7 +35,7 @@ func newAMQPReplicator(broker, clientID string, db database) *amqpReplicator { sender := &amqpSender{ broker: broker, clientID: clientID, - outbox: make(chan ReplicationRecord, replicationOutboxSize), + outbox: make(chan *discosrv.ReplicationRecord, replicationOutboxSize), } svc.Add(sender) @@ -47,18 +51,18 @@ func newAMQPReplicator(broker, clientID string, db database) *amqpReplicator { broker: broker, sender: sender, receiver: receiver, - outbox: make(chan ReplicationRecord, replicationOutboxSize), + outbox: make(chan *discosrv.ReplicationRecord, replicationOutboxSize), } } -func (s *amqpReplicator) send(key *protocol.DeviceID, ps []DatabaseAddress, seen int64) { +func (s *amqpReplicator) send(key *protocol.DeviceID, ps []*discosrv.DatabaseAddress, seen int64) { s.sender.send(key, ps, seen) } type amqpSender struct { broker string clientID string - outbox chan ReplicationRecord + outbox chan *discosrv.ReplicationRecord } func (s *amqpSender) Serve(ctx context.Context) error { @@ -73,12 +77,12 @@ func (s *amqpSender) Serve(ctx context.Context) error { for { select { case rec := <-s.outbox: - size := rec.Size() + size := proto.Size(rec) if len(buf) < size { buf = make([]byte, size) } - n, err := rec.MarshalTo(buf) + n, err := protoutil.MarshalTo(buf, rec) if err != nil { replicationSendsTotal.WithLabelValues("error").Inc() return fmt.Errorf("replication marshal: %w", err) @@ -111,8 +115,8 @@ func (s *amqpSender) String() string { return fmt.Sprintf("amqpSender(%q)", s.broker) } -func (s *amqpSender) send(key *protocol.DeviceID, ps []DatabaseAddress, seen int64) { - item := ReplicationRecord{ +func (s *amqpSender) send(key *protocol.DeviceID, ps []*discosrv.DatabaseAddress, seen int64) { + item := &discosrv.ReplicationRecord{ Key: key[:], Addresses: ps, Seen: seen, @@ -158,8 +162,8 @@ func (s *amqpReceiver) Serve(ctx context.Context) error { continue } - var rec ReplicationRecord - if err := rec.Unmarshal(msg.Body); err != nil { + var rec discosrv.ReplicationRecord + if err := proto.Unmarshal(msg.Body, &rec); err != nil { replicationRecvsTotal.WithLabelValues("error").Inc() return fmt.Errorf("replication unmarshal: %w", err) } diff --git a/cmd/stdiscosrv/apisrv.go b/cmd/stdiscosrv/apisrv.go index 96bfce75c78..a6b698f612e 100644 --- a/cmd/stdiscosrv/apisrv.go +++ b/cmd/stdiscosrv/apisrv.go @@ -28,6 +28,7 @@ import ( "sync" "time" + "github.com/syncthing/syncthing/internal/gen/discosrv" "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/stringutil" ) @@ -52,7 +53,7 @@ type apiSrv struct { } type replicator interface { - send(key *protocol.DeviceID, addrs []DatabaseAddress, seen int64) + send(key *protocol.DeviceID, addrs []*discosrv.DatabaseAddress, seen int64) } type requestID int64 @@ -312,7 +313,7 @@ func (s *apiSrv) handleAnnounce(deviceID protocol.DeviceID, addresses []string) slices.Sort(addresses) addresses = slices.Compact(addresses) - dbAddrs := make([]DatabaseAddress, len(addresses)) + dbAddrs := make([]*discosrv.DatabaseAddress, len(addresses)) for i := range addresses { dbAddrs[i].Address = addresses[i] dbAddrs[i].Expires = expire @@ -511,7 +512,7 @@ func (lrw *loggingResponseWriter) WriteHeader(code int) { lrw.ResponseWriter.WriteHeader(code) } -func addressStrs(dbAddrs []DatabaseAddress) []string { +func addressStrs(dbAddrs []*discosrv.DatabaseAddress) []string { res := make([]string, len(dbAddrs)) for i, a := range dbAddrs { res[i] = a.Address diff --git a/cmd/stdiscosrv/database.go b/cmd/stdiscosrv/database.go index 911ddd851da..a206d281b90 100644 --- a/cmd/stdiscosrv/database.go +++ b/cmd/stdiscosrv/database.go @@ -4,9 +4,6 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -//go:generate go run ../../proto/scripts/protofmt.go database.proto -//go:generate protoc -I ../../ -I . --gogofast_out=. database.proto - package main import ( @@ -25,6 +22,10 @@ import ( "time" "github.com/puzpuzpuz/xsync/v3" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/discosrv" + "github.com/syncthing/syncthing/internal/protoutil" "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rand" "github.com/syncthing/syncthing/lib/s3" @@ -41,13 +42,13 @@ func (defaultClock) Now() time.Time { } type database interface { - put(key *protocol.DeviceID, rec DatabaseRecord) error - merge(key *protocol.DeviceID, addrs []DatabaseAddress, seen int64) error - get(key *protocol.DeviceID) (DatabaseRecord, error) + put(key *protocol.DeviceID, rec *discosrv.DatabaseRecord) error + merge(key *protocol.DeviceID, addrs []*discosrv.DatabaseAddress, seen int64) error + get(key *protocol.DeviceID) (*discosrv.DatabaseRecord, error) } type inMemoryStore struct { - m *xsync.MapOf[protocol.DeviceID, DatabaseRecord] + m *xsync.MapOf[protocol.DeviceID, *discosrv.DatabaseRecord] dir string flushInterval time.Duration s3 *s3.Session @@ -61,7 +62,7 @@ func newInMemoryStore(dir string, flushInterval time.Duration, s3sess *s3.Sessio hn = rand.String(8) } s := &inMemoryStore{ - m: xsync.NewMapOf[protocol.DeviceID, DatabaseRecord](), + m: xsync.NewMapOf[protocol.DeviceID, *discosrv.DatabaseRecord](), dir: dir, flushInterval: flushInterval, s3: s3sess, @@ -95,7 +96,7 @@ func newInMemoryStore(dir string, flushInterval time.Duration, s3sess *s3.Sessio return s } -func (s *inMemoryStore) put(key *protocol.DeviceID, rec DatabaseRecord) error { +func (s *inMemoryStore) put(key *protocol.DeviceID, rec *discosrv.DatabaseRecord) error { t0 := time.Now() s.m.Store(*key, rec) databaseOperations.WithLabelValues(dbOpPut, dbResSuccess).Inc() @@ -103,16 +104,17 @@ func (s *inMemoryStore) put(key *protocol.DeviceID, rec DatabaseRecord) error { return nil } -func (s *inMemoryStore) merge(key *protocol.DeviceID, addrs []DatabaseAddress, seen int64) error { +func (s *inMemoryStore) merge(key *protocol.DeviceID, addrs []*discosrv.DatabaseAddress, seen int64) error { t0 := time.Now() - newRec := DatabaseRecord{ + newRec := &discosrv.DatabaseRecord{ Addresses: addrs, Seen: seen, } - oldRec, _ := s.m.Load(*key) - newRec = merge(oldRec, newRec) + if oldRec, ok := s.m.Load(*key); ok { + newRec = merge(oldRec, newRec) + } s.m.Store(*key, newRec) databaseOperations.WithLabelValues(dbOpMerge, dbResSuccess).Inc() @@ -121,7 +123,7 @@ func (s *inMemoryStore) merge(key *protocol.DeviceID, addrs []DatabaseAddress, s return nil } -func (s *inMemoryStore) get(key *protocol.DeviceID) (DatabaseRecord, error) { +func (s *inMemoryStore) get(key *protocol.DeviceID) (*discosrv.DatabaseRecord, error) { t0 := time.Now() defer func() { databaseOperationSeconds.WithLabelValues(dbOpGet).Observe(time.Since(t0).Seconds()) @@ -130,7 +132,7 @@ func (s *inMemoryStore) get(key *protocol.DeviceID) (DatabaseRecord, error) { rec, ok := s.m.Load(*key) if !ok { databaseOperations.WithLabelValues(dbOpGet, dbResNotFound).Inc() - return DatabaseRecord{}, nil + return &discosrv.DatabaseRecord{}, nil } rec.Addresses = expire(rec.Addresses, s.clock.Now()) @@ -176,7 +178,7 @@ func (s *inMemoryStore) expireAndCalculateStatistics() { current, currentIPv4, currentIPv6, currentIPv6GUA, last24h, last1w := 0, 0, 0, 0, 0, 0 n := 0 - s.m.Range(func(key protocol.DeviceID, rec DatabaseRecord) bool { + s.m.Range(func(key protocol.DeviceID, rec *discosrv.DatabaseRecord) bool { if n%1000 == 0 { runtime.Gosched() } @@ -261,7 +263,7 @@ func (s *inMemoryStore) write() (err error) { now := s.clock.Now() cutoff1w := now.Add(-7 * 24 * time.Hour).UnixNano() n := 0 - s.m.Range(func(key protocol.DeviceID, value DatabaseRecord) bool { + s.m.Range(func(key protocol.DeviceID, value *discosrv.DatabaseRecord) bool { if n%1000 == 0 { runtime.Gosched() } @@ -271,16 +273,16 @@ func (s *inMemoryStore) write() (err error) { // drop the record if it's older than a week return true } - rec := ReplicationRecord{ + rec := &discosrv.ReplicationRecord{ Key: key[:], Addresses: value.Addresses, Seen: value.Seen, } - s := rec.Size() + s := proto.Size(rec) if s+4 > len(buf) { buf = make([]byte, s+4) } - n, err := rec.MarshalTo(buf[4:]) + n, err := protoutil.MarshalTo(buf[4:], rec) if err != nil { rangeErr = err return false @@ -349,8 +351,8 @@ func (s *inMemoryStore) read() (int, error) { if _, err := io.ReadFull(br, buf[:n]); err != nil { return nr, err } - rec := ReplicationRecord{} - if err := rec.Unmarshal(buf[:n]); err != nil { + rec := &discosrv.ReplicationRecord{} + if err := proto.Unmarshal(buf[:n], rec); err != nil { return nr, err } key, err := protocol.DeviceIDFromBytes(rec.Key) @@ -362,9 +364,9 @@ func (s *inMemoryStore) read() (int, error) { continue } - slices.SortFunc(rec.Addresses, DatabaseAddress.Cmp) - rec.Addresses = slices.CompactFunc(rec.Addresses, DatabaseAddress.Equal) - s.m.Store(key, DatabaseRecord{ + slices.SortFunc(rec.Addresses, Cmp) + rec.Addresses = slices.CompactFunc(rec.Addresses, Equal) + s.m.Store(key, &discosrv.DatabaseRecord{ Addresses: expire(rec.Addresses, s.clock.Now()), Seen: rec.Seen, }) @@ -377,7 +379,7 @@ func (s *inMemoryStore) read() (int, error) { // result is the union of the two address sets, with the newer expiry time // chosen for any duplicates. The address list in a is overwritten and // reused for the result. -func merge(a, b DatabaseRecord) DatabaseRecord { +func merge(a, b *discosrv.DatabaseRecord) *discosrv.DatabaseRecord { // Both lists must be sorted for this to work. a.Seen = max(a.Seen, b.Seen) @@ -396,7 +398,7 @@ func merge(a, b DatabaseRecord) DatabaseRecord { aIdx++ case 1: // a > b, insert b before a - a.Addresses = append(a.Addresses[:aIdx], append([]DatabaseAddress{b.Addresses[bIdx]}, a.Addresses[aIdx:]...)...) + a.Addresses = append(a.Addresses[:aIdx], append([]*discosrv.DatabaseAddress{b.Addresses[bIdx]}, a.Addresses[aIdx:]...)...) bIdx++ } } @@ -410,7 +412,7 @@ func merge(a, b DatabaseRecord) DatabaseRecord { // expire returns the list of addresses after removing expired entries. // Expiration happen in place, so the slice given as the parameter is // destroyed. Internal order is preserved. -func expire(addrs []DatabaseAddress, now time.Time) []DatabaseAddress { +func expire(addrs []*discosrv.DatabaseAddress, now time.Time) []*discosrv.DatabaseAddress { cutoff := now.UnixNano() naddrs := addrs[:0] for i := range addrs { @@ -428,13 +430,13 @@ func expire(addrs []DatabaseAddress, now time.Time) []DatabaseAddress { return naddrs } -func (d DatabaseAddress) Cmp(other DatabaseAddress) (n int) { +func Cmp(d, other *discosrv.DatabaseAddress) (n int) { if c := cmp.Compare(d.Address, other.Address); c != 0 { return c } return cmp.Compare(d.Expires, other.Expires) } -func (d DatabaseAddress) Equal(other DatabaseAddress) bool { +func Equal(d, other *discosrv.DatabaseAddress) bool { return d.Address == other.Address } diff --git a/cmd/stdiscosrv/database.pb.go b/cmd/stdiscosrv/database.pb.go deleted file mode 100644 index cf51a714333..00000000000 --- a/cmd/stdiscosrv/database.pb.go +++ /dev/null @@ -1,792 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: database.proto - -package main - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type DatabaseRecord struct { - Addresses []DatabaseAddress `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses"` - Seen int64 `protobuf:"varint,3,opt,name=seen,proto3" json:"seen,omitempty"` -} - -func (m *DatabaseRecord) Reset() { *m = DatabaseRecord{} } -func (m *DatabaseRecord) String() string { return proto.CompactTextString(m) } -func (*DatabaseRecord) ProtoMessage() {} -func (*DatabaseRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_b90fe3356ea5df07, []int{0} -} -func (m *DatabaseRecord) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DatabaseRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DatabaseRecord.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DatabaseRecord) XXX_Merge(src proto.Message) { - xxx_messageInfo_DatabaseRecord.Merge(m, src) -} -func (m *DatabaseRecord) XXX_Size() int { - return m.Size() -} -func (m *DatabaseRecord) XXX_DiscardUnknown() { - xxx_messageInfo_DatabaseRecord.DiscardUnknown(m) -} - -var xxx_messageInfo_DatabaseRecord proto.InternalMessageInfo - -type ReplicationRecord struct { - Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Addresses []DatabaseAddress `protobuf:"bytes,2,rep,name=addresses,proto3" json:"addresses"` - Seen int64 `protobuf:"varint,3,opt,name=seen,proto3" json:"seen,omitempty"` -} - -func (m *ReplicationRecord) Reset() { *m = ReplicationRecord{} } -func (m *ReplicationRecord) String() string { return proto.CompactTextString(m) } -func (*ReplicationRecord) ProtoMessage() {} -func (*ReplicationRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_b90fe3356ea5df07, []int{1} -} -func (m *ReplicationRecord) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ReplicationRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ReplicationRecord.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ReplicationRecord) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReplicationRecord.Merge(m, src) -} -func (m *ReplicationRecord) XXX_Size() int { - return m.Size() -} -func (m *ReplicationRecord) XXX_DiscardUnknown() { - xxx_messageInfo_ReplicationRecord.DiscardUnknown(m) -} - -var xxx_messageInfo_ReplicationRecord proto.InternalMessageInfo - -type DatabaseAddress struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Expires int64 `protobuf:"varint,2,opt,name=expires,proto3" json:"expires,omitempty"` -} - -func (m *DatabaseAddress) Reset() { *m = DatabaseAddress{} } -func (m *DatabaseAddress) String() string { return proto.CompactTextString(m) } -func (*DatabaseAddress) ProtoMessage() {} -func (*DatabaseAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_b90fe3356ea5df07, []int{2} -} -func (m *DatabaseAddress) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DatabaseAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DatabaseAddress.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DatabaseAddress) XXX_Merge(src proto.Message) { - xxx_messageInfo_DatabaseAddress.Merge(m, src) -} -func (m *DatabaseAddress) XXX_Size() int { - return m.Size() -} -func (m *DatabaseAddress) XXX_DiscardUnknown() { - xxx_messageInfo_DatabaseAddress.DiscardUnknown(m) -} - -var xxx_messageInfo_DatabaseAddress proto.InternalMessageInfo - -func init() { - proto.RegisterType((*DatabaseRecord)(nil), "main.DatabaseRecord") - proto.RegisterType((*ReplicationRecord)(nil), "main.ReplicationRecord") - proto.RegisterType((*DatabaseAddress)(nil), "main.DatabaseAddress") -} - -func init() { proto.RegisterFile("database.proto", fileDescriptor_b90fe3356ea5df07) } - -var fileDescriptor_b90fe3356ea5df07 = []byte{ - // 243 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4b, 0x49, 0x2c, 0x49, - 0x4c, 0x4a, 0x2c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xc9, 0x4d, 0xcc, 0xcc, - 0x93, 0x52, 0x2e, 0x4a, 0x2d, 0xc8, 0x2f, 0xd6, 0x07, 0x0b, 0x25, 0x95, 0xa6, 0xe9, 0xa7, 0xe7, - 0xa7, 0xe7, 0x83, 0x39, 0x60, 0x16, 0x44, 0xa9, 0x52, 0x3c, 0x17, 0x9f, 0x0b, 0x54, 0x73, 0x50, - 0x6a, 0x72, 0x7e, 0x51, 0x8a, 0x90, 0x25, 0x17, 0x67, 0x62, 0x4a, 0x4a, 0x51, 0x6a, 0x71, 0x71, - 0x6a, 0xb1, 0x04, 0xa3, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0xa8, 0x1e, 0xc8, 0x40, 0x3d, 0x98, 0x42, - 0x47, 0x88, 0xb4, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0x08, 0xd5, 0x42, 0x42, 0x5c, 0x2c, - 0xc5, 0xa9, 0xa9, 0x79, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x60, 0xb6, 0x52, 0x09, 0x97, - 0x60, 0x50, 0x6a, 0x41, 0x4e, 0x66, 0x72, 0x62, 0x49, 0x66, 0x7e, 0x1e, 0xd4, 0x0e, 0x01, 0x2e, - 0xe6, 0xec, 0xd4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x9e, 0x20, 0x10, 0x13, 0xd5, 0x56, 0x26, - 0x8a, 0x6d, 0x75, 0xe5, 0xe2, 0x47, 0xd3, 0x27, 0x24, 0xc1, 0xc5, 0x0e, 0xd5, 0x03, 0xb6, 0x97, - 0x33, 0x08, 0xc6, 0x05, 0xc9, 0xa4, 0x56, 0x14, 0x64, 0x16, 0x81, 0x6d, 0x06, 0x99, 0x01, 0xe3, - 0x3a, 0xc9, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, - 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, - 0x49, 0x6c, 0xe0, 0x20, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x0b, 0x9b, 0x77, 0x7f, - 0x01, 0x00, 0x00, -} - -func (m *DatabaseRecord) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DatabaseRecord) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DatabaseRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Seen != 0 { - i = encodeVarintDatabase(dAtA, i, uint64(m.Seen)) - i-- - dAtA[i] = 0x18 - } - if len(m.Addresses) > 0 { - for iNdEx := len(m.Addresses) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Addresses[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDatabase(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *ReplicationRecord) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ReplicationRecord) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ReplicationRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Seen != 0 { - i = encodeVarintDatabase(dAtA, i, uint64(m.Seen)) - i-- - dAtA[i] = 0x18 - } - if len(m.Addresses) > 0 { - for iNdEx := len(m.Addresses) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Addresses[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDatabase(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Key) > 0 { - i -= len(m.Key) - copy(dAtA[i:], m.Key) - i = encodeVarintDatabase(dAtA, i, uint64(len(m.Key))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DatabaseAddress) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DatabaseAddress) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DatabaseAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Expires != 0 { - i = encodeVarintDatabase(dAtA, i, uint64(m.Expires)) - i-- - dAtA[i] = 0x10 - } - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintDatabase(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintDatabase(dAtA []byte, offset int, v uint64) int { - offset -= sovDatabase(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *DatabaseRecord) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Addresses) > 0 { - for _, e := range m.Addresses { - l = e.Size() - n += 1 + l + sovDatabase(uint64(l)) - } - } - if m.Seen != 0 { - n += 1 + sovDatabase(uint64(m.Seen)) - } - return n -} - -func (m *ReplicationRecord) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Key) - if l > 0 { - n += 1 + l + sovDatabase(uint64(l)) - } - if len(m.Addresses) > 0 { - for _, e := range m.Addresses { - l = e.Size() - n += 1 + l + sovDatabase(uint64(l)) - } - } - if m.Seen != 0 { - n += 1 + sovDatabase(uint64(m.Seen)) - } - return n -} - -func (m *DatabaseAddress) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Address) - if l > 0 { - n += 1 + l + sovDatabase(uint64(l)) - } - if m.Expires != 0 { - n += 1 + sovDatabase(uint64(m.Expires)) - } - return n -} - -func sovDatabase(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozDatabase(x uint64) (n int) { - return sovDatabase(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *DatabaseRecord) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DatabaseRecord: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DatabaseRecord: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDatabase - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDatabase - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Addresses = append(m.Addresses, DatabaseAddress{}) - if err := m.Addresses[len(m.Addresses)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Seen", wireType) - } - m.Seen = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Seen |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipDatabase(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDatabase - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ReplicationRecord) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ReplicationRecord: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ReplicationRecord: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthDatabase - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthDatabase - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Key = append(m.Key[:0], dAtA[iNdEx:postIndex]...) - if m.Key == nil { - m.Key = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDatabase - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDatabase - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Addresses = append(m.Addresses, DatabaseAddress{}) - if err := m.Addresses[len(m.Addresses)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Seen", wireType) - } - m.Seen = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Seen |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipDatabase(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDatabase - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DatabaseAddress) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DatabaseAddress: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DatabaseAddress: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDatabase - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDatabase - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Expires", wireType) - } - m.Expires = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDatabase - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Expires |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipDatabase(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDatabase - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipDatabase(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDatabase - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDatabase - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDatabase - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthDatabase - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupDatabase - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthDatabase - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthDatabase = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDatabase = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupDatabase = fmt.Errorf("proto: unexpected end of group") -) diff --git a/cmd/stdiscosrv/database.proto b/cmd/stdiscosrv/database.proto deleted file mode 100644 index e53dd9f1b64..00000000000 --- a/cmd/stdiscosrv/database.proto +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2018 The Syncthing Authors. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// You can obtain one at https://mozilla.org/MPL/2.0/. - -syntax = "proto3"; - -package main; - -import "repos/protobuf/gogoproto/gogo.proto"; - -option (gogoproto.goproto_getters_all) = false; -option (gogoproto.goproto_unkeyed_all) = false; -option (gogoproto.goproto_unrecognized_all) = false; -option (gogoproto.goproto_sizecache_all) = false; - -message DatabaseRecord { - repeated DatabaseAddress addresses = 1 [(gogoproto.nullable) = false]; - int64 seen = 3; // Unix nanos, last device announce -} - -message ReplicationRecord { - bytes key = 1; // raw 32 byte device ID - repeated DatabaseAddress addresses = 2 [(gogoproto.nullable) = false]; - int64 seen = 3; // Unix nanos, last device announce -} - -message DatabaseAddress { - string address = 1; - int64 expires = 2; // Unix nanos -} diff --git a/cmd/stdiscosrv/database_test.go b/cmd/stdiscosrv/database_test.go index b9bd9c6b542..496e0184b09 100644 --- a/cmd/stdiscosrv/database_test.go +++ b/cmd/stdiscosrv/database_test.go @@ -12,6 +12,7 @@ import ( "testing" "time" + "github.com/syncthing/syncthing/internal/gen/discosrv" "github.com/syncthing/syncthing/lib/protocol" ) @@ -39,7 +40,7 @@ func TestDatabaseGetSet(t *testing.T) { // Put a record - rec.Addresses = []DatabaseAddress{ + rec.Addresses = []*discosrv.DatabaseAddress{ {Address: "tcp://1.2.3.4:5", Expires: tc.Now().Add(time.Minute).UnixNano()}, } if err := db.put(&protocol.EmptyDeviceID, rec); err != nil { @@ -65,7 +66,7 @@ func TestDatabaseGetSet(t *testing.T) { tc.wind(30 * time.Second) - addrs := []DatabaseAddress{ + addrs := []*discosrv.DatabaseAddress{ {Address: "tcp://6.7.8.9:0", Expires: tc.Now().Add(time.Minute).UnixNano()}, } if err := db.merge(&protocol.EmptyDeviceID, addrs, tc.Now().UnixNano()); err != nil { @@ -112,7 +113,7 @@ func TestDatabaseGetSet(t *testing.T) { // Set an address - addrs = []DatabaseAddress{ + addrs = []*discosrv.DatabaseAddress{ {Address: "tcp://6.7.8.9:0", Expires: tc.Now().Add(time.Minute).UnixNano()}, } if err := db.merge(&protocol.GlobalDeviceID, addrs, tc.Now().UnixNano()); err != nil { @@ -134,28 +135,28 @@ func TestDatabaseGetSet(t *testing.T) { func TestFilter(t *testing.T) { // all cases are expired with t=10 cases := []struct { - a []DatabaseAddress - b []DatabaseAddress + a []*discosrv.DatabaseAddress + b []*discosrv.DatabaseAddress }{ { a: nil, b: nil, }, { - a: []DatabaseAddress{{Address: "a", Expires: 9}, {Address: "b", Expires: 9}, {Address: "c", Expires: 9}}, - b: []DatabaseAddress{}, + a: []*discosrv.DatabaseAddress{{Address: "a", Expires: 9}, {Address: "b", Expires: 9}, {Address: "c", Expires: 9}}, + b: []*discosrv.DatabaseAddress{}, }, { - a: []DatabaseAddress{{Address: "a", Expires: 10}}, - b: []DatabaseAddress{{Address: "a", Expires: 10}}, + a: []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}}, + b: []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}}, }, { - a: []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}}, - b: []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}}, + a: []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}}, + b: []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}}, }, { - a: []DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}, {Address: "c", Expires: 5}, {Address: "d", Expires: 15}, {Address: "e", Expires: 5}}, - b: []DatabaseAddress{{Address: "b", Expires: 15}, {Address: "d", Expires: 15}}, + a: []*discosrv.DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}, {Address: "c", Expires: 5}, {Address: "d", Expires: 15}, {Address: "e", Expires: 5}}, + b: []*discosrv.DatabaseAddress{{Address: "b", Expires: 15}, {Address: "d", Expires: 15}}, }, } @@ -169,62 +170,62 @@ func TestFilter(t *testing.T) { func TestMerge(t *testing.T) { cases := []struct { - a, b, res []DatabaseAddress + a, b, res []*discosrv.DatabaseAddress }{ {nil, nil, nil}, { nil, - []DatabaseAddress{{Address: "a", Expires: 10}}, - []DatabaseAddress{{Address: "a", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}}, }, { nil, - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}}, - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}}, }, { - []DatabaseAddress{{Address: "a", Expires: 10}}, - []DatabaseAddress{{Address: "a", Expires: 15}}, - []DatabaseAddress{{Address: "a", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 15}}, }, { - []DatabaseAddress{{Address: "a", Expires: 10}}, - []DatabaseAddress{{Address: "b", Expires: 15}}, - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "b", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}, }, { - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}, - []DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 15}}, - []DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 15}}, }, { - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}, - []DatabaseAddress{{Address: "b", Expires: 15}, {Address: "c", Expires: 20}}, - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "b", Expires: 15}, {Address: "c", Expires: 20}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}}, }, { - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}, - []DatabaseAddress{{Address: "b", Expires: 5}, {Address: "c", Expires: 20}}, - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "b", Expires: 5}, {Address: "c", Expires: 20}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}}, }, { - []DatabaseAddress{{Address: "y", Expires: 10}, {Address: "z", Expires: 10}}, - []DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}}, - []DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}, {Address: "y", Expires: 10}, {Address: "z", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "y", Expires: 10}, {Address: "z", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}, {Address: "y", Expires: 10}, {Address: "z", Expires: 10}}, }, { - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "d", Expires: 10}}, - []DatabaseAddress{{Address: "b", Expires: 5}, {Address: "c", Expires: 20}}, - []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}, {Address: "d", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "d", Expires: 10}}, + []*discosrv.DatabaseAddress{{Address: "b", Expires: 5}, {Address: "c", Expires: 20}}, + []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}, {Address: "d", Expires: 10}}, }, } for _, tc := range cases { - rec := merge(DatabaseRecord{Addresses: tc.a}, DatabaseRecord{Addresses: tc.b}) + rec := merge(&discosrv.DatabaseRecord{Addresses: tc.a}, &discosrv.DatabaseRecord{Addresses: tc.b}) if fmt.Sprint(rec.Addresses) != fmt.Sprint(tc.res) { t.Errorf("Incorrect result %v, expected %v", rec.Addresses, tc.res) } - rec = merge(DatabaseRecord{Addresses: tc.b}, DatabaseRecord{Addresses: tc.a}) + rec = merge(&discosrv.DatabaseRecord{Addresses: tc.b}, &discosrv.DatabaseRecord{Addresses: tc.a}) if fmt.Sprint(rec.Addresses) != fmt.Sprint(tc.res) { t.Errorf("Incorrect result %v, expected %v", rec.Addresses, tc.res) } @@ -233,9 +234,9 @@ func TestMerge(t *testing.T) { func BenchmarkMergeEqual(b *testing.B) { for i := 0; i < b.N; i++ { - ar := []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}} - br := []DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 10}} - res := merge(DatabaseRecord{Addresses: ar}, DatabaseRecord{Addresses: br}) + ar := []*discosrv.DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}} + br := []*discosrv.DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 10}} + res := merge(&discosrv.DatabaseRecord{Addresses: ar}, &discosrv.DatabaseRecord{Addresses: br}) if len(res.Addresses) != 2 { b.Fatal("wrong length") } diff --git a/cmd/stdiscosrv/main.go b/cmd/stdiscosrv/main.go index 0005c09f5db..9b7edf8769d 100644 --- a/cmd/stdiscosrv/main.go +++ b/cmd/stdiscosrv/main.go @@ -11,22 +11,22 @@ import ( "crypto/tls" "log" "net/http" + _ "net/http/pprof" "os" "os/signal" "runtime" "time" - _ "net/http/pprof" - "github.com/alecthomas/kong" "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/thejerf/suture/v4" + _ "github.com/syncthing/syncthing/lib/automaxprocs" "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rand" "github.com/syncthing/syncthing/lib/s3" "github.com/syncthing/syncthing/lib/tlsutil" - "github.com/thejerf/suture/v4" ) const ( diff --git a/cmd/strelaysrv/listener.go b/cmd/strelaysrv/listener.go index c89f8a2c802..16476904762 100644 --- a/cmd/strelaysrv/listener.go +++ b/cmd/strelaysrv/listener.go @@ -12,9 +12,8 @@ import ( "time" syncthingprotocol "github.com/syncthing/syncthing/lib/protocol" - "github.com/syncthing/syncthing/lib/tlsutil" - "github.com/syncthing/syncthing/lib/relay/protocol" + "github.com/syncthing/syncthing/lib/tlsutil" ) var ( diff --git a/cmd/strelaysrv/main.go b/cmd/strelaysrv/main.go index 2efd6113787..e96e9af86df 100644 --- a/cmd/strelaysrv/main.go +++ b/cmd/strelaysrv/main.go @@ -19,6 +19,8 @@ import ( "syscall" "time" + "golang.org/x/time/rate" + _ "github.com/syncthing/syncthing/lib/automaxprocs" "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/config" @@ -30,7 +32,6 @@ import ( "github.com/syncthing/syncthing/lib/relay/protocol" "github.com/syncthing/syncthing/lib/tlsutil" _ "github.com/syncthing/syncthing/lib/upnp" - "golang.org/x/time/rate" ) var ( diff --git a/cmd/syncthing/cli/index_dump.go b/cmd/syncthing/cli/index_dump.go index 4288af248ef..6eff4717c37 100644 --- a/cmd/syncthing/cli/index_dump.go +++ b/cmd/syncthing/cli/index_dump.go @@ -11,6 +11,10 @@ import ( "fmt" "time" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" + "github.com/syncthing/syncthing/internal/gen/dbproto" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/protocol" ) @@ -33,19 +37,19 @@ func indexDump() error { name := nulString(key[1+4+4:]) fmt.Printf("[device] F:%d D:%d N:%q", folder, device, name) - var f protocol.FileInfo - err := f.Unmarshal(it.Value()) + var f bep.FileInfo + err := proto.Unmarshal(it.Value(), &f) if err != nil { return err } - fmt.Printf(" V:%v\n", f) + fmt.Printf(" V:%v\n", &f) case db.KeyTypeGlobal: folder := binary.BigEndian.Uint32(key[1:]) name := nulString(key[1+4:]) - var flv db.VersionList - flv.Unmarshal(it.Value()) - fmt.Printf("[global] F:%d N:%q V:%s\n", folder, name, flv) + var flv dbproto.VersionList + proto.Unmarshal(it.Value(), &flv) + fmt.Printf("[global] F:%d N:%q V:%s\n", folder, name, &flv) case db.KeyTypeBlock: folder := binary.BigEndian.Uint32(key[1:]) @@ -94,11 +98,11 @@ func indexDump() error { case db.KeyTypeFolderMeta: folder := binary.BigEndian.Uint32(key[1:]) fmt.Printf("[foldermeta] F:%d", folder) - var cs db.CountsSet - if err := cs.Unmarshal(it.Value()); err != nil { + var cs dbproto.CountsSet + if err := proto.Unmarshal(it.Value(), &cs); err != nil { fmt.Printf(" (invalid)\n") } else { - fmt.Printf(" V:%v\n", cs) + fmt.Printf(" V:%v\n", &cs) } case db.KeyTypeMiscData: @@ -125,20 +129,20 @@ func indexDump() error { case db.KeyTypeVersion: fmt.Printf("[version] H:%x", key[1:]) - var v protocol.Vector - err := v.Unmarshal(it.Value()) + var v bep.Vector + err := proto.Unmarshal(it.Value(), &v) if err != nil { fmt.Printf(" (invalid)\n") } else { - fmt.Printf(" V:%v\n", v) + fmt.Printf(" V:%v\n", &v) } case db.KeyTypePendingFolder: device := binary.BigEndian.Uint32(key[1:]) folder := string(key[5:]) - var of db.ObservedFolder - of.Unmarshal(it.Value()) - fmt.Printf("[pendingFolder] D:%d F:%s V:%v\n", device, folder, of) + var of dbproto.ObservedFolder + proto.Unmarshal(it.Value(), &of) + fmt.Printf("[pendingFolder] D:%d F:%s V:%v\n", device, folder, &of) case db.KeyTypePendingDevice: device := "" @@ -146,9 +150,9 @@ func indexDump() error { if err == nil { device = dev.String() } - var od db.ObservedDevice - od.Unmarshal(it.Value()) - fmt.Printf("[pendingDevice] D:%v V:%v\n", device, od) + var od dbproto.ObservedDevice + proto.Unmarshal(it.Value(), &od) + fmt.Printf("[pendingDevice] D:%v V:%v\n", device, &od) default: fmt.Printf("[??? %d]\n %x\n %x\n", key[0], key, it.Value()) diff --git a/cmd/syncthing/cli/index_idxck.go b/cmd/syncthing/cli/index_idxck.go index 7da7793ffff..a0dab459a94 100644 --- a/cmd/syncthing/cli/index_idxck.go +++ b/cmd/syncthing/cli/index_idxck.go @@ -13,6 +13,10 @@ import ( "fmt" "sort" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" + "github.com/syncthing/syncthing/internal/gen/dbproto" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/protocol" ) @@ -42,12 +46,12 @@ func indexCheck() (err error) { folders := make(map[uint32]string) devices := make(map[uint32]string) deviceToIDs := make(map[string]uint32) - fileInfos := make(map[fileInfoKey]protocol.FileInfo) - globals := make(map[globalKey]db.VersionList) + fileInfos := make(map[fileInfoKey]*bep.FileInfo) + globals := make(map[globalKey]*dbproto.VersionList) sequences := make(map[sequenceKey]string) needs := make(map[globalKey]struct{}) blocklists := make(map[string]struct{}) - versions := make(map[string]protocol.Vector) + versions := make(map[string]*bep.Vector) usedBlocklists := make(map[string]struct{}) usedVersions := make(map[string]struct{}) var localDeviceKey uint32 @@ -74,26 +78,26 @@ func indexCheck() (err error) { device := binary.BigEndian.Uint32(key[1+4:]) name := nulString(key[1+4+4:]) - var f protocol.FileInfo - err := f.Unmarshal(it.Value()) + var f bep.FileInfo + err := proto.Unmarshal(it.Value(), &f) if err != nil { fmt.Println("Unable to unmarshal FileInfo:", err) success = false continue } - fileInfos[fileInfoKey{folder, device, name}] = f + fileInfos[fileInfoKey{folder, device, name}] = &f case db.KeyTypeGlobal: folder := binary.BigEndian.Uint32(key[1:]) name := nulString(key[1+4:]) - var flv db.VersionList - if err := flv.Unmarshal(it.Value()); err != nil { + var flv dbproto.VersionList + if err := proto.Unmarshal(it.Value(), &flv); err != nil { fmt.Println("Unable to unmarshal VersionList:", err) success = false continue } - globals[globalKey{folder, name}] = flv + globals[globalKey{folder, name}] = &flv case db.KeyTypeFolderIdx: key := binary.BigEndian.Uint32(it.Key()[1:]) @@ -124,13 +128,13 @@ func indexCheck() (err error) { case db.KeyTypeVersion: hash := string(key[1:]) - var v protocol.Vector - if err := v.Unmarshal(it.Value()); err != nil { + var v bep.Vector + if err := proto.Unmarshal(it.Value(), &v); err != nil { fmt.Println("Unable to unmarshal Vector:", err) success = false continue } - versions[hash] = v + versions[hash] = &v } } @@ -248,25 +252,27 @@ func indexCheck() (err error) { if fi.VersionHash != nil { fiv = versions[string(fi.VersionHash)] } - if !fiv.Equal(version) { + if !protocol.VectorFromWire(fiv).Equal(version) { fmt.Printf("VersionList %q, folder %q, entry %d, FileInfo version mismatch, %v (VersionList) != %v (FileInfo)\n", gk.name, folder, i, version, fi.Version) success = false } - if fi.IsInvalid() != invalid { - fmt.Printf("VersionList %q, folder %q, entry %d, FileInfo invalid mismatch, %v (VersionList) != %v (FileInfo)\n", gk.name, folder, i, invalid, fi.IsInvalid()) + ffi := protocol.FileInfoFromDB(fi) + if ffi.IsInvalid() != invalid { + fmt.Printf("VersionList %q, folder %q, entry %d, FileInfo invalid mismatch, %v (VersionList) != %v (FileInfo)\n", gk.name, folder, i, invalid, ffi.IsInvalid()) success = false } - if fi.IsDeleted() != deleted { - fmt.Printf("VersionList %q, folder %q, entry %d, FileInfo deleted mismatch, %v (VersionList) != %v (FileInfo)\n", gk.name, folder, i, deleted, fi.IsDeleted()) + if ffi.IsDeleted() != deleted { + fmt.Printf("VersionList %q, folder %q, entry %d, FileInfo deleted mismatch, %v (VersionList) != %v (FileInfo)\n", gk.name, folder, i, deleted, ffi.IsDeleted()) success = false } } - for i, fv := range vl.RawVersions { + for i, fv := range vl.Versions { + ver := protocol.VectorFromWire(fv.Version) for _, device := range fv.Devices { - checkGlobal(i, device, fv.Version, false, fv.Deleted) + checkGlobal(i, device, ver, false, fv.Deleted) } for _, device := range fv.InvalidDevices { - checkGlobal(i, device, fv.Version, true, fv.Deleted) + checkGlobal(i, device, ver, true, fv.Deleted) } } @@ -276,10 +282,10 @@ func indexCheck() (err error) { if needsLocally(vl) { _, ok := needs[gk] if !ok { - fv, _ := vl.GetGlobal() - devB, _ := fv.FirstDevice() + fv, _ := vlGetGlobal(vl) + devB, _ := fvFirstDevice(fv) dev := deviceToIDs[string(devB)] - fi := fileInfos[fileInfoKey{gk.folder, dev, gk.name}] + fi := protocol.FileInfoFromDB(fileInfos[fileInfoKey{gk.folder, dev, gk.name}]) if !fi.IsDeleted() && !fi.IsIgnored() { fmt.Printf("Missing need entry for needed file %q, folder %q\n", gk.name, folder) } @@ -345,11 +351,84 @@ func indexCheck() (err error) { return nil } -func needsLocally(vl db.VersionList) bool { - gfv, gok := vl.GetGlobal() +func needsLocally(vl *dbproto.VersionList) bool { + gfv, gok := vlGetGlobal(vl) if !gok { // That's weird, but we hardly need something non-existent return false } - fv, ok := vl.Get(protocol.LocalDeviceID[:]) - return db.Need(gfv, ok, fv.Version) + fv, ok := vlGet(vl, protocol.LocalDeviceID[:]) + return db.Need(gfv, ok, protocol.VectorFromWire(fv.Version)) +} + +// Get returns a FileVersion that contains the given device and whether it has +// been found at all. +func vlGet(vl *dbproto.VersionList, device []byte) (*dbproto.FileVersion, bool) { + _, i, _, ok := vlFindDevice(vl, device) + if !ok { + return &dbproto.FileVersion{}, false + } + return vl.Versions[i], true +} + +// GetGlobal returns the current global FileVersion. The returned FileVersion +// may be invalid, if all FileVersions are invalid. Returns false only if +// VersionList is empty. +func vlGetGlobal(vl *dbproto.VersionList) (*dbproto.FileVersion, bool) { + i := vlFindGlobal(vl) + if i == -1 { + return nil, false + } + return vl.Versions[i], true +} + +// findGlobal returns the first version that isn't invalid, or if all versions are +// invalid just the first version (i.e. 0) or -1, if there's no versions at all. +func vlFindGlobal(vl *dbproto.VersionList) int { + for i := range vl.Versions { + if !fvIsInvalid(vl.Versions[i]) { + return i + } + } + if len(vl.Versions) == 0 { + return -1 + } + return 0 +} + +// findDevice returns whether the device is in InvalidVersions or Versions and +// in InvalidDevices or Devices (true for invalid), the positions in the version +// and device slices and whether it has been found at all. +func vlFindDevice(vl *dbproto.VersionList, device []byte) (bool, int, int, bool) { + for i, v := range vl.Versions { + if j := deviceIndex(v.Devices, device); j != -1 { + return false, i, j, true + } + if j := deviceIndex(v.InvalidDevices, device); j != -1 { + return true, i, j, true + } + } + return false, -1, -1, false +} + +func deviceIndex(devices [][]byte, device []byte) int { + for i, dev := range devices { + if bytes.Equal(device, dev) { + return i + } + } + return -1 +} + +func fvFirstDevice(fv *dbproto.FileVersion) ([]byte, bool) { + if len(fv.Devices) != 0 { + return fv.Devices[0], true + } + if len(fv.InvalidDevices) != 0 { + return fv.InvalidDevices[0], true + } + return nil, false +} + +func fvIsInvalid(fv *dbproto.FileVersion) bool { + return fv == nil || len(fv.Devices) == 0 } diff --git a/cmd/syncthing/decrypt/decrypt.go b/cmd/syncthing/decrypt/decrypt.go index 33a9bcd7ffa..ed162964c76 100644 --- a/cmd/syncthing/decrypt/decrypt.go +++ b/cmd/syncthing/decrypt/decrypt.go @@ -17,6 +17,9 @@ import ( "os" "path/filepath" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/osutil" @@ -280,10 +283,11 @@ func loadEncryptedFileInfo(fd fs.File) (*protocol.FileInfo, error) { return nil, err } - var encFi protocol.FileInfo - if err := encFi.Unmarshal(trailer); err != nil { + var encFi bep.FileInfo + if err := proto.Unmarshal(trailer, &encFi); err != nil { return nil, err } + fi := protocol.FileInfoFromWire(&encFi) - return &encFi, nil + return &fi, nil } diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 4ea56a0b32a..8d9bbc8d768 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -30,7 +30,6 @@ import ( "time" "github.com/alecthomas/kong" - _ "github.com/syncthing/syncthing/lib/automaxprocs" "github.com/thejerf/suture/v4" "github.com/willabides/kongplete" @@ -38,6 +37,7 @@ import ( "github.com/syncthing/syncthing/cmd/syncthing/cmdutil" "github.com/syncthing/syncthing/cmd/syncthing/decrypt" "github.com/syncthing/syncthing/cmd/syncthing/generate" + _ "github.com/syncthing/syncthing/lib/automaxprocs" "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" diff --git a/go.mod b/go.mod index 86da0d24d61..12192aa2c1b 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,6 @@ require ( github.com/getsentry/raven-go v0.2.0 github.com/go-ldap/ldap/v3 v3.4.8 github.com/gobwas/glob v0.2.3 - github.com/gogo/protobuf v1.3.2 github.com/greatroar/blobloom v0.8.0 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/jackpal/gateway v1.0.15 diff --git a/go.sum b/go.sum index d14df09cb56..2fb6cc1f840 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,6 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= @@ -135,8 +133,6 @@ github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4d github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -252,7 +248,6 @@ github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0 h1:okhMind4q9H1OxF44gN github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod h1:TTbGUfE+cXXceWtbTHq6lqcTvYPBKLNejBEbnUsQJtU= github.com/willabides/kongplete v0.4.0 h1:eivXxkp5ud5+4+NVN9e4goxC5mSh3n1RHov+gsblM2g= github.com/willabides/kongplete v0.4.0/go.mod h1:0P0jtWD9aTsqPSUAl4de35DLghrr57XcayPyvqSi2X8= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= @@ -274,7 +269,6 @@ golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -284,7 +278,6 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -301,7 +294,6 @@ golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -357,9 +349,7 @@ golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= diff --git a/gui/default/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html index 1c8a5c5c01b..8fcab366619 100644 --- a/gui/default/syncthing/core/aboutModalView.html +++ b/gui/default/syncthing/core/aboutModalView.html @@ -55,7 +55,6 @@

The Syncthing Authors

  • chmduquesne/rollinghash, Copyright © 2015 Christophe-Marie Duquesne.
  • d4l3k/messagediff, Copyright © 2015 Tristan Rice.
  • gobwas/glob, Copyright © 2016 Sergey Kamardin.
    • -
  • gogo/protobuf, Copyright © 2013 The GoGo Authors.
  • golang/groupcache, Copyright © 2013 Google Inc.
  • golang/protobuf, Copyright © 2010 The Go Authors.
  • golang/snappy, Copyright © 2011 The Snappy-Go Authors.
    • diff --git a/internal/gen/apiproto/tokenset.pb.go b/internal/gen/apiproto/tokenset.pb.go new file mode 100644 index 00000000000..3ac977dd7a9 --- /dev/null +++ b/internal/gen/apiproto/tokenset.pb.go @@ -0,0 +1,143 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc (unknown) +// source: apiproto/tokenset.proto + +package apiproto + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type TokenSet struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // token -> expiry time (epoch nanoseconds) + Tokens map[string]int64 `protobuf:"bytes,1,rep,name=tokens,proto3" json:"tokens,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` +} + +func (x *TokenSet) Reset() { + *x = TokenSet{} + mi := &file_apiproto_tokenset_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *TokenSet) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TokenSet) ProtoMessage() {} + +func (x *TokenSet) ProtoReflect() protoreflect.Message { + mi := &file_apiproto_tokenset_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TokenSet.ProtoReflect.Descriptor instead. +func (*TokenSet) Descriptor() ([]byte, []int) { + return file_apiproto_tokenset_proto_rawDescGZIP(), []int{0} +} + +func (x *TokenSet) GetTokens() map[string]int64 { + if x != nil { + return x.Tokens + } + return nil +} + +var File_apiproto_tokenset_proto protoreflect.FileDescriptor + +var file_apiproto_tokenset_proto_rawDesc = []byte{ + 0x0a, 0x17, 0x61, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, + 0x73, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x61, 0x70, 0x69, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x22, 0x7d, 0x0a, 0x08, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x53, 0x65, 0x74, 0x12, + 0x36, 0x0a, 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, + 0x53, 0x65, 0x74, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x6f, 0x6b, 0x65, 0x6e, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x42, 0x93, 0x01, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x69, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x42, 0x0d, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x65, 0x74, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x74, + 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02, 0x03, 0x41, 0x58, 0x58, + 0xaa, 0x02, 0x08, 0x41, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xca, 0x02, 0x08, 0x41, 0x70, + 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xe2, 0x02, 0x14, 0x41, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x08, + 0x41, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_apiproto_tokenset_proto_rawDescOnce sync.Once + file_apiproto_tokenset_proto_rawDescData = file_apiproto_tokenset_proto_rawDesc +) + +func file_apiproto_tokenset_proto_rawDescGZIP() []byte { + file_apiproto_tokenset_proto_rawDescOnce.Do(func() { + file_apiproto_tokenset_proto_rawDescData = protoimpl.X.CompressGZIP(file_apiproto_tokenset_proto_rawDescData) + }) + return file_apiproto_tokenset_proto_rawDescData +} + +var file_apiproto_tokenset_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_apiproto_tokenset_proto_goTypes = []any{ + (*TokenSet)(nil), // 0: apiproto.TokenSet + nil, // 1: apiproto.TokenSet.TokensEntry +} +var file_apiproto_tokenset_proto_depIdxs = []int32{ + 1, // 0: apiproto.TokenSet.tokens:type_name -> apiproto.TokenSet.TokensEntry + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_apiproto_tokenset_proto_init() } +func file_apiproto_tokenset_proto_init() { + if File_apiproto_tokenset_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_apiproto_tokenset_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_apiproto_tokenset_proto_goTypes, + DependencyIndexes: file_apiproto_tokenset_proto_depIdxs, + MessageInfos: file_apiproto_tokenset_proto_msgTypes, + }.Build() + File_apiproto_tokenset_proto = out.File + file_apiproto_tokenset_proto_rawDesc = nil + file_apiproto_tokenset_proto_goTypes = nil + file_apiproto_tokenset_proto_depIdxs = nil +} diff --git a/internal/gen/bep/bep.pb.go b/internal/gen/bep/bep.pb.go new file mode 100644 index 00000000000..7671339a46d --- /dev/null +++ b/internal/gen/bep/bep.pb.go @@ -0,0 +1,2335 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc (unknown) +// source: bep/bep.proto + +package bep + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type MessageType int32 + +const ( + MessageType_MESSAGE_TYPE_CLUSTER_CONFIG MessageType = 0 + MessageType_MESSAGE_TYPE_INDEX MessageType = 1 + MessageType_MESSAGE_TYPE_INDEX_UPDATE MessageType = 2 + MessageType_MESSAGE_TYPE_REQUEST MessageType = 3 + MessageType_MESSAGE_TYPE_RESPONSE MessageType = 4 + MessageType_MESSAGE_TYPE_DOWNLOAD_PROGRESS MessageType = 5 + MessageType_MESSAGE_TYPE_PING MessageType = 6 + MessageType_MESSAGE_TYPE_CLOSE MessageType = 7 +) + +// Enum value maps for MessageType. +var ( + MessageType_name = map[int32]string{ + 0: "MESSAGE_TYPE_CLUSTER_CONFIG", + 1: "MESSAGE_TYPE_INDEX", + 2: "MESSAGE_TYPE_INDEX_UPDATE", + 3: "MESSAGE_TYPE_REQUEST", + 4: "MESSAGE_TYPE_RESPONSE", + 5: "MESSAGE_TYPE_DOWNLOAD_PROGRESS", + 6: "MESSAGE_TYPE_PING", + 7: "MESSAGE_TYPE_CLOSE", + } + MessageType_value = map[string]int32{ + "MESSAGE_TYPE_CLUSTER_CONFIG": 0, + "MESSAGE_TYPE_INDEX": 1, + "MESSAGE_TYPE_INDEX_UPDATE": 2, + "MESSAGE_TYPE_REQUEST": 3, + "MESSAGE_TYPE_RESPONSE": 4, + "MESSAGE_TYPE_DOWNLOAD_PROGRESS": 5, + "MESSAGE_TYPE_PING": 6, + "MESSAGE_TYPE_CLOSE": 7, + } +) + +func (x MessageType) Enum() *MessageType { + p := new(MessageType) + *p = x + return p +} + +func (x MessageType) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (MessageType) Descriptor() protoreflect.EnumDescriptor { + return file_bep_bep_proto_enumTypes[0].Descriptor() +} + +func (MessageType) Type() protoreflect.EnumType { + return &file_bep_bep_proto_enumTypes[0] +} + +func (x MessageType) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use MessageType.Descriptor instead. +func (MessageType) EnumDescriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{0} +} + +type MessageCompression int32 + +const ( + MessageCompression_MESSAGE_COMPRESSION_NONE MessageCompression = 0 + MessageCompression_MESSAGE_COMPRESSION_LZ4 MessageCompression = 1 +) + +// Enum value maps for MessageCompression. +var ( + MessageCompression_name = map[int32]string{ + 0: "MESSAGE_COMPRESSION_NONE", + 1: "MESSAGE_COMPRESSION_LZ4", + } + MessageCompression_value = map[string]int32{ + "MESSAGE_COMPRESSION_NONE": 0, + "MESSAGE_COMPRESSION_LZ4": 1, + } +) + +func (x MessageCompression) Enum() *MessageCompression { + p := new(MessageCompression) + *p = x + return p +} + +func (x MessageCompression) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (MessageCompression) Descriptor() protoreflect.EnumDescriptor { + return file_bep_bep_proto_enumTypes[1].Descriptor() +} + +func (MessageCompression) Type() protoreflect.EnumType { + return &file_bep_bep_proto_enumTypes[1] +} + +func (x MessageCompression) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use MessageCompression.Descriptor instead. +func (MessageCompression) EnumDescriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{1} +} + +type Compression int32 + +const ( + Compression_COMPRESSION_METADATA Compression = 0 + Compression_COMPRESSION_NEVER Compression = 1 + Compression_COMPRESSION_ALWAYS Compression = 2 +) + +// Enum value maps for Compression. +var ( + Compression_name = map[int32]string{ + 0: "COMPRESSION_METADATA", + 1: "COMPRESSION_NEVER", + 2: "COMPRESSION_ALWAYS", + } + Compression_value = map[string]int32{ + "COMPRESSION_METADATA": 0, + "COMPRESSION_NEVER": 1, + "COMPRESSION_ALWAYS": 2, + } +) + +func (x Compression) Enum() *Compression { + p := new(Compression) + *p = x + return p +} + +func (x Compression) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (Compression) Descriptor() protoreflect.EnumDescriptor { + return file_bep_bep_proto_enumTypes[2].Descriptor() +} + +func (Compression) Type() protoreflect.EnumType { + return &file_bep_bep_proto_enumTypes[2] +} + +func (x Compression) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use Compression.Descriptor instead. +func (Compression) EnumDescriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{2} +} + +type FileInfoType int32 + +const ( + FileInfoType_FILE_INFO_TYPE_FILE FileInfoType = 0 + FileInfoType_FILE_INFO_TYPE_DIRECTORY FileInfoType = 1 + // Deprecated: Marked as deprecated in bep/bep.proto. + FileInfoType_FILE_INFO_TYPE_SYMLINK_FILE FileInfoType = 2 + // Deprecated: Marked as deprecated in bep/bep.proto. + FileInfoType_FILE_INFO_TYPE_SYMLINK_DIRECTORY FileInfoType = 3 + FileInfoType_FILE_INFO_TYPE_SYMLINK FileInfoType = 4 +) + +// Enum value maps for FileInfoType. +var ( + FileInfoType_name = map[int32]string{ + 0: "FILE_INFO_TYPE_FILE", + 1: "FILE_INFO_TYPE_DIRECTORY", + 2: "FILE_INFO_TYPE_SYMLINK_FILE", + 3: "FILE_INFO_TYPE_SYMLINK_DIRECTORY", + 4: "FILE_INFO_TYPE_SYMLINK", + } + FileInfoType_value = map[string]int32{ + "FILE_INFO_TYPE_FILE": 0, + "FILE_INFO_TYPE_DIRECTORY": 1, + "FILE_INFO_TYPE_SYMLINK_FILE": 2, + "FILE_INFO_TYPE_SYMLINK_DIRECTORY": 3, + "FILE_INFO_TYPE_SYMLINK": 4, + } +) + +func (x FileInfoType) Enum() *FileInfoType { + p := new(FileInfoType) + *p = x + return p +} + +func (x FileInfoType) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (FileInfoType) Descriptor() protoreflect.EnumDescriptor { + return file_bep_bep_proto_enumTypes[3].Descriptor() +} + +func (FileInfoType) Type() protoreflect.EnumType { + return &file_bep_bep_proto_enumTypes[3] +} + +func (x FileInfoType) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use FileInfoType.Descriptor instead. +func (FileInfoType) EnumDescriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{3} +} + +type ErrorCode int32 + +const ( + ErrorCode_ERROR_CODE_NO_ERROR ErrorCode = 0 + ErrorCode_ERROR_CODE_GENERIC ErrorCode = 1 + ErrorCode_ERROR_CODE_NO_SUCH_FILE ErrorCode = 2 + ErrorCode_ERROR_CODE_INVALID_FILE ErrorCode = 3 +) + +// Enum value maps for ErrorCode. +var ( + ErrorCode_name = map[int32]string{ + 0: "ERROR_CODE_NO_ERROR", + 1: "ERROR_CODE_GENERIC", + 2: "ERROR_CODE_NO_SUCH_FILE", + 3: "ERROR_CODE_INVALID_FILE", + } + ErrorCode_value = map[string]int32{ + "ERROR_CODE_NO_ERROR": 0, + "ERROR_CODE_GENERIC": 1, + "ERROR_CODE_NO_SUCH_FILE": 2, + "ERROR_CODE_INVALID_FILE": 3, + } +) + +func (x ErrorCode) Enum() *ErrorCode { + p := new(ErrorCode) + *p = x + return p +} + +func (x ErrorCode) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ErrorCode) Descriptor() protoreflect.EnumDescriptor { + return file_bep_bep_proto_enumTypes[4].Descriptor() +} + +func (ErrorCode) Type() protoreflect.EnumType { + return &file_bep_bep_proto_enumTypes[4] +} + +func (x ErrorCode) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ErrorCode.Descriptor instead. +func (ErrorCode) EnumDescriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{4} +} + +type FileDownloadProgressUpdateType int32 + +const ( + FileDownloadProgressUpdateType_FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND FileDownloadProgressUpdateType = 0 + FileDownloadProgressUpdateType_FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_FORGET FileDownloadProgressUpdateType = 1 +) + +// Enum value maps for FileDownloadProgressUpdateType. +var ( + FileDownloadProgressUpdateType_name = map[int32]string{ + 0: "FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND", + 1: "FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_FORGET", + } + FileDownloadProgressUpdateType_value = map[string]int32{ + "FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND": 0, + "FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_FORGET": 1, + } +) + +func (x FileDownloadProgressUpdateType) Enum() *FileDownloadProgressUpdateType { + p := new(FileDownloadProgressUpdateType) + *p = x + return p +} + +func (x FileDownloadProgressUpdateType) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (FileDownloadProgressUpdateType) Descriptor() protoreflect.EnumDescriptor { + return file_bep_bep_proto_enumTypes[5].Descriptor() +} + +func (FileDownloadProgressUpdateType) Type() protoreflect.EnumType { + return &file_bep_bep_proto_enumTypes[5] +} + +func (x FileDownloadProgressUpdateType) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use FileDownloadProgressUpdateType.Descriptor instead. +func (FileDownloadProgressUpdateType) EnumDescriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{5} +} + +type Hello struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DeviceName string `protobuf:"bytes,1,opt,name=device_name,json=deviceName,proto3" json:"device_name,omitempty"` + ClientName string `protobuf:"bytes,2,opt,name=client_name,json=clientName,proto3" json:"client_name,omitempty"` + ClientVersion string `protobuf:"bytes,3,opt,name=client_version,json=clientVersion,proto3" json:"client_version,omitempty"` + NumConnections int32 `protobuf:"varint,4,opt,name=num_connections,json=numConnections,proto3" json:"num_connections,omitempty"` + Timestamp int64 `protobuf:"varint,5,opt,name=timestamp,proto3" json:"timestamp,omitempty"` +} + +func (x *Hello) Reset() { + *x = Hello{} + mi := &file_bep_bep_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Hello) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Hello) ProtoMessage() {} + +func (x *Hello) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Hello.ProtoReflect.Descriptor instead. +func (*Hello) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{0} +} + +func (x *Hello) GetDeviceName() string { + if x != nil { + return x.DeviceName + } + return "" +} + +func (x *Hello) GetClientName() string { + if x != nil { + return x.ClientName + } + return "" +} + +func (x *Hello) GetClientVersion() string { + if x != nil { + return x.ClientVersion + } + return "" +} + +func (x *Hello) GetNumConnections() int32 { + if x != nil { + return x.NumConnections + } + return 0 +} + +func (x *Hello) GetTimestamp() int64 { + if x != nil { + return x.Timestamp + } + return 0 +} + +type Header struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Type MessageType `protobuf:"varint,1,opt,name=type,proto3,enum=bep.MessageType" json:"type,omitempty"` + Compression MessageCompression `protobuf:"varint,2,opt,name=compression,proto3,enum=bep.MessageCompression" json:"compression,omitempty"` +} + +func (x *Header) Reset() { + *x = Header{} + mi := &file_bep_bep_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Header) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Header) ProtoMessage() {} + +func (x *Header) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Header.ProtoReflect.Descriptor instead. +func (*Header) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{1} +} + +func (x *Header) GetType() MessageType { + if x != nil { + return x.Type + } + return MessageType_MESSAGE_TYPE_CLUSTER_CONFIG +} + +func (x *Header) GetCompression() MessageCompression { + if x != nil { + return x.Compression + } + return MessageCompression_MESSAGE_COMPRESSION_NONE +} + +type ClusterConfig struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Folders []*Folder `protobuf:"bytes,1,rep,name=folders,proto3" json:"folders,omitempty"` + Secondary bool `protobuf:"varint,2,opt,name=secondary,proto3" json:"secondary,omitempty"` +} + +func (x *ClusterConfig) Reset() { + *x = ClusterConfig{} + mi := &file_bep_bep_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ClusterConfig) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ClusterConfig) ProtoMessage() {} + +func (x *ClusterConfig) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ClusterConfig.ProtoReflect.Descriptor instead. +func (*ClusterConfig) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{2} +} + +func (x *ClusterConfig) GetFolders() []*Folder { + if x != nil { + return x.Folders + } + return nil +} + +func (x *ClusterConfig) GetSecondary() bool { + if x != nil { + return x.Secondary + } + return false +} + +type Folder struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Label string `protobuf:"bytes,2,opt,name=label,proto3" json:"label,omitempty"` + ReadOnly bool `protobuf:"varint,3,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"` + IgnorePermissions bool `protobuf:"varint,4,opt,name=ignore_permissions,json=ignorePermissions,proto3" json:"ignore_permissions,omitempty"` + IgnoreDelete bool `protobuf:"varint,5,opt,name=ignore_delete,json=ignoreDelete,proto3" json:"ignore_delete,omitempty"` + DisableTempIndexes bool `protobuf:"varint,6,opt,name=disable_temp_indexes,json=disableTempIndexes,proto3" json:"disable_temp_indexes,omitempty"` + Paused bool `protobuf:"varint,7,opt,name=paused,proto3" json:"paused,omitempty"` + Devices []*Device `protobuf:"bytes,16,rep,name=devices,proto3" json:"devices,omitempty"` +} + +func (x *Folder) Reset() { + *x = Folder{} + mi := &file_bep_bep_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Folder) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Folder) ProtoMessage() {} + +func (x *Folder) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Folder.ProtoReflect.Descriptor instead. +func (*Folder) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{3} +} + +func (x *Folder) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *Folder) GetLabel() string { + if x != nil { + return x.Label + } + return "" +} + +func (x *Folder) GetReadOnly() bool { + if x != nil { + return x.ReadOnly + } + return false +} + +func (x *Folder) GetIgnorePermissions() bool { + if x != nil { + return x.IgnorePermissions + } + return false +} + +func (x *Folder) GetIgnoreDelete() bool { + if x != nil { + return x.IgnoreDelete + } + return false +} + +func (x *Folder) GetDisableTempIndexes() bool { + if x != nil { + return x.DisableTempIndexes + } + return false +} + +func (x *Folder) GetPaused() bool { + if x != nil { + return x.Paused + } + return false +} + +func (x *Folder) GetDevices() []*Device { + if x != nil { + return x.Devices + } + return nil +} + +type Device struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id []byte `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Addresses []string `protobuf:"bytes,3,rep,name=addresses,proto3" json:"addresses,omitempty"` + Compression Compression `protobuf:"varint,4,opt,name=compression,proto3,enum=bep.Compression" json:"compression,omitempty"` + CertName string `protobuf:"bytes,5,opt,name=cert_name,json=certName,proto3" json:"cert_name,omitempty"` + MaxSequence int64 `protobuf:"varint,6,opt,name=max_sequence,json=maxSequence,proto3" json:"max_sequence,omitempty"` + Introducer bool `protobuf:"varint,7,opt,name=introducer,proto3" json:"introducer,omitempty"` + IndexId uint64 `protobuf:"varint,8,opt,name=index_id,json=indexId,proto3" json:"index_id,omitempty"` + SkipIntroductionRemovals bool `protobuf:"varint,9,opt,name=skip_introduction_removals,json=skipIntroductionRemovals,proto3" json:"skip_introduction_removals,omitempty"` + EncryptionPasswordToken []byte `protobuf:"bytes,10,opt,name=encryption_password_token,json=encryptionPasswordToken,proto3" json:"encryption_password_token,omitempty"` +} + +func (x *Device) Reset() { + *x = Device{} + mi := &file_bep_bep_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Device) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Device) ProtoMessage() {} + +func (x *Device) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Device.ProtoReflect.Descriptor instead. +func (*Device) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{4} +} + +func (x *Device) GetId() []byte { + if x != nil { + return x.Id + } + return nil +} + +func (x *Device) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *Device) GetAddresses() []string { + if x != nil { + return x.Addresses + } + return nil +} + +func (x *Device) GetCompression() Compression { + if x != nil { + return x.Compression + } + return Compression_COMPRESSION_METADATA +} + +func (x *Device) GetCertName() string { + if x != nil { + return x.CertName + } + return "" +} + +func (x *Device) GetMaxSequence() int64 { + if x != nil { + return x.MaxSequence + } + return 0 +} + +func (x *Device) GetIntroducer() bool { + if x != nil { + return x.Introducer + } + return false +} + +func (x *Device) GetIndexId() uint64 { + if x != nil { + return x.IndexId + } + return 0 +} + +func (x *Device) GetSkipIntroductionRemovals() bool { + if x != nil { + return x.SkipIntroductionRemovals + } + return false +} + +func (x *Device) GetEncryptionPasswordToken() []byte { + if x != nil { + return x.EncryptionPasswordToken + } + return nil +} + +type Index struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Folder string `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder,omitempty"` + Files []*FileInfo `protobuf:"bytes,2,rep,name=files,proto3" json:"files,omitempty"` + LastSequence int64 `protobuf:"varint,3,opt,name=last_sequence,json=lastSequence,proto3" json:"last_sequence,omitempty"` // the highest sequence in this batch +} + +func (x *Index) Reset() { + *x = Index{} + mi := &file_bep_bep_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Index) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Index) ProtoMessage() {} + +func (x *Index) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Index.ProtoReflect.Descriptor instead. +func (*Index) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{5} +} + +func (x *Index) GetFolder() string { + if x != nil { + return x.Folder + } + return "" +} + +func (x *Index) GetFiles() []*FileInfo { + if x != nil { + return x.Files + } + return nil +} + +func (x *Index) GetLastSequence() int64 { + if x != nil { + return x.LastSequence + } + return 0 +} + +type IndexUpdate struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Folder string `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder,omitempty"` + Files []*FileInfo `protobuf:"bytes,2,rep,name=files,proto3" json:"files,omitempty"` + LastSequence int64 `protobuf:"varint,3,opt,name=last_sequence,json=lastSequence,proto3" json:"last_sequence,omitempty"` // the highest sequence in this batch + PrevSequence int64 `protobuf:"varint,4,opt,name=prev_sequence,json=prevSequence,proto3" json:"prev_sequence,omitempty"` // the highest sequence in the previous batch +} + +func (x *IndexUpdate) Reset() { + *x = IndexUpdate{} + mi := &file_bep_bep_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *IndexUpdate) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IndexUpdate) ProtoMessage() {} + +func (x *IndexUpdate) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use IndexUpdate.ProtoReflect.Descriptor instead. +func (*IndexUpdate) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{6} +} + +func (x *IndexUpdate) GetFolder() string { + if x != nil { + return x.Folder + } + return "" +} + +func (x *IndexUpdate) GetFiles() []*FileInfo { + if x != nil { + return x.Files + } + return nil +} + +func (x *IndexUpdate) GetLastSequence() int64 { + if x != nil { + return x.LastSequence + } + return 0 +} + +func (x *IndexUpdate) GetPrevSequence() int64 { + if x != nil { + return x.PrevSequence + } + return 0 +} + +type FileInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Size int64 `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"` + ModifiedS int64 `protobuf:"varint,5,opt,name=modified_s,json=modifiedS,proto3" json:"modified_s,omitempty"` + ModifiedBy uint64 `protobuf:"varint,12,opt,name=modified_by,json=modifiedBy,proto3" json:"modified_by,omitempty"` + Version *Vector `protobuf:"bytes,9,opt,name=version,proto3" json:"version,omitempty"` + Sequence int64 `protobuf:"varint,10,opt,name=sequence,proto3" json:"sequence,omitempty"` + Blocks []*BlockInfo `protobuf:"bytes,16,rep,name=blocks,proto3" json:"blocks,omitempty"` + SymlinkTarget string `protobuf:"bytes,17,opt,name=symlink_target,json=symlinkTarget,proto3" json:"symlink_target,omitempty"` + BlocksHash []byte `protobuf:"bytes,18,opt,name=blocks_hash,json=blocksHash,proto3" json:"blocks_hash,omitempty"` + Encrypted []byte `protobuf:"bytes,19,opt,name=encrypted,proto3" json:"encrypted,omitempty"` + Type FileInfoType `protobuf:"varint,2,opt,name=type,proto3,enum=bep.FileInfoType" json:"type,omitempty"` + Permissions uint32 `protobuf:"varint,4,opt,name=permissions,proto3" json:"permissions,omitempty"` + ModifiedNs int32 `protobuf:"varint,11,opt,name=modified_ns,json=modifiedNs,proto3" json:"modified_ns,omitempty"` + BlockSize int32 `protobuf:"varint,13,opt,name=block_size,json=blockSize,proto3" json:"block_size,omitempty"` + Platform *PlatformData `protobuf:"bytes,14,opt,name=platform,proto3" json:"platform,omitempty"` + // The local_flags fields stores flags that are relevant to the local + // host only. It is not part of the protocol, doesn't get sent or + // received (we make sure to zero it), nonetheless we need it on our + // struct and to be able to serialize it to/from the database. + LocalFlags uint32 `protobuf:"varint,1000,opt,name=local_flags,json=localFlags,proto3" json:"local_flags,omitempty"` + // The version_hash is an implementation detail and not part of the wire + // format. + VersionHash []byte `protobuf:"bytes,1001,opt,name=version_hash,json=versionHash,proto3" json:"version_hash,omitempty"` + // The time when the inode was last changed (i.e., permissions, xattrs + // etc changed). This is host-local, not sent over the wire. + InodeChangeNs int64 `protobuf:"varint,1002,opt,name=inode_change_ns,json=inodeChangeNs,proto3" json:"inode_change_ns,omitempty"` + // The size of the data appended to the encrypted file on disk. This is + // host-local, not sent over the wire. + EncryptionTrailerSize int32 `protobuf:"varint,1003,opt,name=encryption_trailer_size,json=encryptionTrailerSize,proto3" json:"encryption_trailer_size,omitempty"` + Deleted bool `protobuf:"varint,6,opt,name=deleted,proto3" json:"deleted,omitempty"` + Invalid bool `protobuf:"varint,7,opt,name=invalid,proto3" json:"invalid,omitempty"` + NoPermissions bool `protobuf:"varint,8,opt,name=no_permissions,json=noPermissions,proto3" json:"no_permissions,omitempty"` +} + +func (x *FileInfo) Reset() { + *x = FileInfo{} + mi := &file_bep_bep_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FileInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FileInfo) ProtoMessage() {} + +func (x *FileInfo) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[7] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FileInfo.ProtoReflect.Descriptor instead. +func (*FileInfo) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{7} +} + +func (x *FileInfo) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *FileInfo) GetSize() int64 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *FileInfo) GetModifiedS() int64 { + if x != nil { + return x.ModifiedS + } + return 0 +} + +func (x *FileInfo) GetModifiedBy() uint64 { + if x != nil { + return x.ModifiedBy + } + return 0 +} + +func (x *FileInfo) GetVersion() *Vector { + if x != nil { + return x.Version + } + return nil +} + +func (x *FileInfo) GetSequence() int64 { + if x != nil { + return x.Sequence + } + return 0 +} + +func (x *FileInfo) GetBlocks() []*BlockInfo { + if x != nil { + return x.Blocks + } + return nil +} + +func (x *FileInfo) GetSymlinkTarget() string { + if x != nil { + return x.SymlinkTarget + } + return "" +} + +func (x *FileInfo) GetBlocksHash() []byte { + if x != nil { + return x.BlocksHash + } + return nil +} + +func (x *FileInfo) GetEncrypted() []byte { + if x != nil { + return x.Encrypted + } + return nil +} + +func (x *FileInfo) GetType() FileInfoType { + if x != nil { + return x.Type + } + return FileInfoType_FILE_INFO_TYPE_FILE +} + +func (x *FileInfo) GetPermissions() uint32 { + if x != nil { + return x.Permissions + } + return 0 +} + +func (x *FileInfo) GetModifiedNs() int32 { + if x != nil { + return x.ModifiedNs + } + return 0 +} + +func (x *FileInfo) GetBlockSize() int32 { + if x != nil { + return x.BlockSize + } + return 0 +} + +func (x *FileInfo) GetPlatform() *PlatformData { + if x != nil { + return x.Platform + } + return nil +} + +func (x *FileInfo) GetLocalFlags() uint32 { + if x != nil { + return x.LocalFlags + } + return 0 +} + +func (x *FileInfo) GetVersionHash() []byte { + if x != nil { + return x.VersionHash + } + return nil +} + +func (x *FileInfo) GetInodeChangeNs() int64 { + if x != nil { + return x.InodeChangeNs + } + return 0 +} + +func (x *FileInfo) GetEncryptionTrailerSize() int32 { + if x != nil { + return x.EncryptionTrailerSize + } + return 0 +} + +func (x *FileInfo) GetDeleted() bool { + if x != nil { + return x.Deleted + } + return false +} + +func (x *FileInfo) GetInvalid() bool { + if x != nil { + return x.Invalid + } + return false +} + +func (x *FileInfo) GetNoPermissions() bool { + if x != nil { + return x.NoPermissions + } + return false +} + +type BlockInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hash []byte `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash,omitempty"` + Offset int64 `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"` + Size int32 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"` + WeakHash uint32 `protobuf:"varint,4,opt,name=weak_hash,json=weakHash,proto3" json:"weak_hash,omitempty"` +} + +func (x *BlockInfo) Reset() { + *x = BlockInfo{} + mi := &file_bep_bep_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *BlockInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*BlockInfo) ProtoMessage() {} + +func (x *BlockInfo) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[8] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use BlockInfo.ProtoReflect.Descriptor instead. +func (*BlockInfo) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{8} +} + +func (x *BlockInfo) GetHash() []byte { + if x != nil { + return x.Hash + } + return nil +} + +func (x *BlockInfo) GetOffset() int64 { + if x != nil { + return x.Offset + } + return 0 +} + +func (x *BlockInfo) GetSize() int32 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *BlockInfo) GetWeakHash() uint32 { + if x != nil { + return x.WeakHash + } + return 0 +} + +type Vector struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Counters []*Counter `protobuf:"bytes,1,rep,name=counters,proto3" json:"counters,omitempty"` +} + +func (x *Vector) Reset() { + *x = Vector{} + mi := &file_bep_bep_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Vector) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Vector) ProtoMessage() {} + +func (x *Vector) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[9] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Vector.ProtoReflect.Descriptor instead. +func (*Vector) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{9} +} + +func (x *Vector) GetCounters() []*Counter { + if x != nil { + return x.Counters + } + return nil +} + +type Counter struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Value uint64 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"` +} + +func (x *Counter) Reset() { + *x = Counter{} + mi := &file_bep_bep_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Counter) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Counter) ProtoMessage() {} + +func (x *Counter) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[10] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Counter.ProtoReflect.Descriptor instead. +func (*Counter) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{10} +} + +func (x *Counter) GetId() uint64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *Counter) GetValue() uint64 { + if x != nil { + return x.Value + } + return 0 +} + +type PlatformData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Unix *UnixData `protobuf:"bytes,1,opt,name=unix,proto3" json:"unix,omitempty"` + Windows *WindowsData `protobuf:"bytes,2,opt,name=windows,proto3" json:"windows,omitempty"` + Linux *XattrData `protobuf:"bytes,3,opt,name=linux,proto3" json:"linux,omitempty"` + Darwin *XattrData `protobuf:"bytes,4,opt,name=darwin,proto3" json:"darwin,omitempty"` + Freebsd *XattrData `protobuf:"bytes,5,opt,name=freebsd,proto3" json:"freebsd,omitempty"` + Netbsd *XattrData `protobuf:"bytes,6,opt,name=netbsd,proto3" json:"netbsd,omitempty"` +} + +func (x *PlatformData) Reset() { + *x = PlatformData{} + mi := &file_bep_bep_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *PlatformData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlatformData) ProtoMessage() {} + +func (x *PlatformData) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[11] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PlatformData.ProtoReflect.Descriptor instead. +func (*PlatformData) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{11} +} + +func (x *PlatformData) GetUnix() *UnixData { + if x != nil { + return x.Unix + } + return nil +} + +func (x *PlatformData) GetWindows() *WindowsData { + if x != nil { + return x.Windows + } + return nil +} + +func (x *PlatformData) GetLinux() *XattrData { + if x != nil { + return x.Linux + } + return nil +} + +func (x *PlatformData) GetDarwin() *XattrData { + if x != nil { + return x.Darwin + } + return nil +} + +func (x *PlatformData) GetFreebsd() *XattrData { + if x != nil { + return x.Freebsd + } + return nil +} + +func (x *PlatformData) GetNetbsd() *XattrData { + if x != nil { + return x.Netbsd + } + return nil +} + +type UnixData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // The owner name and group name are set when known (i.e., could be + // resolved on the source device), while the UID and GID are always set + // as they come directly from the stat() call. + OwnerName string `protobuf:"bytes,1,opt,name=owner_name,json=ownerName,proto3" json:"owner_name,omitempty"` + GroupName string `protobuf:"bytes,2,opt,name=group_name,json=groupName,proto3" json:"group_name,omitempty"` + Uid int32 `protobuf:"varint,3,opt,name=uid,proto3" json:"uid,omitempty"` + Gid int32 `protobuf:"varint,4,opt,name=gid,proto3" json:"gid,omitempty"` +} + +func (x *UnixData) Reset() { + *x = UnixData{} + mi := &file_bep_bep_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UnixData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UnixData) ProtoMessage() {} + +func (x *UnixData) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[12] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UnixData.ProtoReflect.Descriptor instead. +func (*UnixData) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{12} +} + +func (x *UnixData) GetOwnerName() string { + if x != nil { + return x.OwnerName + } + return "" +} + +func (x *UnixData) GetGroupName() string { + if x != nil { + return x.GroupName + } + return "" +} + +func (x *UnixData) GetUid() int32 { + if x != nil { + return x.Uid + } + return 0 +} + +func (x *UnixData) GetGid() int32 { + if x != nil { + return x.Gid + } + return 0 +} + +type WindowsData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Windows file objects have a single owner, which may be a user or a + // group. We keep the name of that account, and a flag to indicate what + // type it is. + OwnerName string `protobuf:"bytes,1,opt,name=owner_name,json=ownerName,proto3" json:"owner_name,omitempty"` + OwnerIsGroup bool `protobuf:"varint,2,opt,name=owner_is_group,json=ownerIsGroup,proto3" json:"owner_is_group,omitempty"` +} + +func (x *WindowsData) Reset() { + *x = WindowsData{} + mi := &file_bep_bep_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *WindowsData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WindowsData) ProtoMessage() {} + +func (x *WindowsData) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[13] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WindowsData.ProtoReflect.Descriptor instead. +func (*WindowsData) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{13} +} + +func (x *WindowsData) GetOwnerName() string { + if x != nil { + return x.OwnerName + } + return "" +} + +func (x *WindowsData) GetOwnerIsGroup() bool { + if x != nil { + return x.OwnerIsGroup + } + return false +} + +type XattrData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Xattrs []*Xattr `protobuf:"bytes,1,rep,name=xattrs,proto3" json:"xattrs,omitempty"` +} + +func (x *XattrData) Reset() { + *x = XattrData{} + mi := &file_bep_bep_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *XattrData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*XattrData) ProtoMessage() {} + +func (x *XattrData) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[14] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use XattrData.ProtoReflect.Descriptor instead. +func (*XattrData) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{14} +} + +func (x *XattrData) GetXattrs() []*Xattr { + if x != nil { + return x.Xattrs + } + return nil +} + +type Xattr struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` +} + +func (x *Xattr) Reset() { + *x = Xattr{} + mi := &file_bep_bep_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Xattr) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Xattr) ProtoMessage() {} + +func (x *Xattr) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[15] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Xattr.ProtoReflect.Descriptor instead. +func (*Xattr) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{15} +} + +func (x *Xattr) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *Xattr) GetValue() []byte { + if x != nil { + return x.Value + } + return nil +} + +type Request struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Folder string `protobuf:"bytes,2,opt,name=folder,proto3" json:"folder,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Offset int64 `protobuf:"varint,4,opt,name=offset,proto3" json:"offset,omitempty"` + Size int32 `protobuf:"varint,5,opt,name=size,proto3" json:"size,omitempty"` + Hash []byte `protobuf:"bytes,6,opt,name=hash,proto3" json:"hash,omitempty"` + FromTemporary bool `protobuf:"varint,7,opt,name=from_temporary,json=fromTemporary,proto3" json:"from_temporary,omitempty"` + WeakHash uint32 `protobuf:"varint,8,opt,name=weak_hash,json=weakHash,proto3" json:"weak_hash,omitempty"` + BlockNo int32 `protobuf:"varint,9,opt,name=block_no,json=blockNo,proto3" json:"block_no,omitempty"` +} + +func (x *Request) Reset() { + *x = Request{} + mi := &file_bep_bep_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Request) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Request) ProtoMessage() {} + +func (x *Request) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[16] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Request.ProtoReflect.Descriptor instead. +func (*Request) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{16} +} + +func (x *Request) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *Request) GetFolder() string { + if x != nil { + return x.Folder + } + return "" +} + +func (x *Request) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *Request) GetOffset() int64 { + if x != nil { + return x.Offset + } + return 0 +} + +func (x *Request) GetSize() int32 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *Request) GetHash() []byte { + if x != nil { + return x.Hash + } + return nil +} + +func (x *Request) GetFromTemporary() bool { + if x != nil { + return x.FromTemporary + } + return false +} + +func (x *Request) GetWeakHash() uint32 { + if x != nil { + return x.WeakHash + } + return 0 +} + +func (x *Request) GetBlockNo() int32 { + if x != nil { + return x.BlockNo + } + return 0 +} + +type Response struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Code ErrorCode `protobuf:"varint,3,opt,name=code,proto3,enum=bep.ErrorCode" json:"code,omitempty"` +} + +func (x *Response) Reset() { + *x = Response{} + mi := &file_bep_bep_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Response) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Response) ProtoMessage() {} + +func (x *Response) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[17] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Response.ProtoReflect.Descriptor instead. +func (*Response) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{17} +} + +func (x *Response) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *Response) GetData() []byte { + if x != nil { + return x.Data + } + return nil +} + +func (x *Response) GetCode() ErrorCode { + if x != nil { + return x.Code + } + return ErrorCode_ERROR_CODE_NO_ERROR +} + +type DownloadProgress struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Folder string `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder,omitempty"` + Updates []*FileDownloadProgressUpdate `protobuf:"bytes,2,rep,name=updates,proto3" json:"updates,omitempty"` +} + +func (x *DownloadProgress) Reset() { + *x = DownloadProgress{} + mi := &file_bep_bep_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DownloadProgress) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DownloadProgress) ProtoMessage() {} + +func (x *DownloadProgress) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[18] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DownloadProgress.ProtoReflect.Descriptor instead. +func (*DownloadProgress) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{18} +} + +func (x *DownloadProgress) GetFolder() string { + if x != nil { + return x.Folder + } + return "" +} + +func (x *DownloadProgress) GetUpdates() []*FileDownloadProgressUpdate { + if x != nil { + return x.Updates + } + return nil +} + +type FileDownloadProgressUpdate struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + UpdateType FileDownloadProgressUpdateType `protobuf:"varint,1,opt,name=update_type,json=updateType,proto3,enum=bep.FileDownloadProgressUpdateType" json:"update_type,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Version *Vector `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` + BlockIndexes []int32 `protobuf:"varint,4,rep,name=block_indexes,json=blockIndexes,proto3" json:"block_indexes,omitempty"` + BlockSize int32 `protobuf:"varint,5,opt,name=block_size,json=blockSize,proto3" json:"block_size,omitempty"` +} + +func (x *FileDownloadProgressUpdate) Reset() { + *x = FileDownloadProgressUpdate{} + mi := &file_bep_bep_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FileDownloadProgressUpdate) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FileDownloadProgressUpdate) ProtoMessage() {} + +func (x *FileDownloadProgressUpdate) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[19] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FileDownloadProgressUpdate.ProtoReflect.Descriptor instead. +func (*FileDownloadProgressUpdate) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{19} +} + +func (x *FileDownloadProgressUpdate) GetUpdateType() FileDownloadProgressUpdateType { + if x != nil { + return x.UpdateType + } + return FileDownloadProgressUpdateType_FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND +} + +func (x *FileDownloadProgressUpdate) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *FileDownloadProgressUpdate) GetVersion() *Vector { + if x != nil { + return x.Version + } + return nil +} + +func (x *FileDownloadProgressUpdate) GetBlockIndexes() []int32 { + if x != nil { + return x.BlockIndexes + } + return nil +} + +func (x *FileDownloadProgressUpdate) GetBlockSize() int32 { + if x != nil { + return x.BlockSize + } + return 0 +} + +type Ping struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *Ping) Reset() { + *x = Ping{} + mi := &file_bep_bep_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Ping) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Ping) ProtoMessage() {} + +func (x *Ping) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[20] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Ping.ProtoReflect.Descriptor instead. +func (*Ping) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{20} +} + +type Close struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Reason string `protobuf:"bytes,1,opt,name=reason,proto3" json:"reason,omitempty"` +} + +func (x *Close) Reset() { + *x = Close{} + mi := &file_bep_bep_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Close) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Close) ProtoMessage() {} + +func (x *Close) ProtoReflect() protoreflect.Message { + mi := &file_bep_bep_proto_msgTypes[21] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Close.ProtoReflect.Descriptor instead. +func (*Close) Descriptor() ([]byte, []int) { + return file_bep_bep_proto_rawDescGZIP(), []int{21} +} + +func (x *Close) GetReason() string { + if x != nil { + return x.Reason + } + return "" +} + +var File_bep_bep_proto protoreflect.FileDescriptor + +var file_bep_bep_proto_rawDesc = []byte{ + 0x0a, 0x0d, 0x62, 0x65, 0x70, 0x2f, 0x62, 0x65, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x03, 0x62, 0x65, 0x70, 0x22, 0xb7, 0x01, 0x0a, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x12, 0x1f, + 0x0a, 0x0b, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, + 0x1f, 0x0a, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, + 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0f, 0x6e, 0x75, 0x6d, 0x5f, 0x63, + 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0e, 0x6e, 0x75, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x69, + 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x39, + 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x63, 0x6f, + 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x54, 0x0a, 0x0d, 0x43, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x6f, + 0x6c, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x62, 0x65, + 0x70, 0x2e, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x52, 0x07, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, + 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x22, + 0x90, 0x02, 0x0a, 0x06, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x61, 0x64, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x2d, 0x0a, + 0x12, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x69, 0x67, 0x6e, 0x6f, 0x72, + 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0d, + 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x65, 0x6d, + 0x70, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x12, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x49, 0x6e, 0x64, 0x65, + 0x78, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x75, 0x73, 0x65, 0x64, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x61, 0x75, 0x73, 0x65, 0x64, 0x12, 0x25, 0x0a, 0x07, 0x64, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x62, + 0x65, 0x70, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07, 0x64, 0x65, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x22, 0xf3, 0x02, 0x0a, 0x06, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x03, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, + 0x32, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x72, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x65, 0x72, 0x74, 0x4e, 0x61, 0x6d, 0x65, + 0x12, 0x21, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x75, 0x65, + 0x6e, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, + 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, + 0x63, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x69, 0x64, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x64, 0x12, 0x3c, + 0x0a, 0x1a, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x61, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x18, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x61, 0x6c, 0x73, 0x12, 0x3a, 0x0a, 0x19, + 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x17, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x69, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65, + 0x78, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x05, 0x66, 0x69, 0x6c, + 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x46, + 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x23, + 0x0a, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x71, 0x75, 0x65, + 0x6e, 0x63, 0x65, 0x22, 0x94, 0x01, 0x0a, 0x0b, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x05, 0x66, + 0x69, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x62, 0x65, 0x70, + 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x66, 0x69, 0x6c, 0x65, 0x73, + 0x12, 0x23, 0x0a, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x71, + 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x76, 0x5f, 0x73, 0x65, + 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x70, 0x72, + 0x65, 0x76, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0xfe, 0x05, 0x0a, 0x08, 0x46, + 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, + 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, + 0x1d, 0x0a, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x73, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x09, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x53, 0x12, 0x1f, + 0x0a, 0x0b, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x04, 0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x42, 0x79, 0x12, + 0x25, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x07, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, + 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, + 0x63, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x10, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x06, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x79, + 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x11, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0d, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x61, 0x72, 0x67, 0x65, + 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, + 0x18, 0x12, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x48, 0x61, + 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x18, + 0x13, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, + 0x12, 0x25, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, + 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x54, 0x79, 0x70, + 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x70, 0x65, + 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x6f, 0x64, + 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x6e, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x4e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x2d, 0x0a, 0x08, 0x70, 0x6c, 0x61, + 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x62, 0x65, + 0x70, 0x2e, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, + 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, + 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x0b, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x73, 0x68, 0x12, 0x27, + 0x0a, 0x0f, 0x69, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6e, + 0x73, 0x18, 0xea, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x69, 0x6e, 0x6f, 0x64, 0x65, 0x43, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4e, 0x73, 0x12, 0x37, 0x0a, 0x17, 0x65, 0x6e, 0x63, 0x72, 0x79, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x65, 0x6e, 0x63, 0x72, 0x79, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x53, 0x69, 0x7a, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x6e, + 0x76, 0x61, 0x6c, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x6e, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x6e, 0x6f, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x6e, 0x6f, + 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x68, 0x0a, 0x09, 0x42, + 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, + 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, + 0x66, 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x65, 0x61, 0x6b, + 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x77, 0x65, 0x61, + 0x6b, 0x48, 0x61, 0x73, 0x68, 0x22, 0x32, 0x0a, 0x06, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, + 0x28, 0x0a, 0x08, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0c, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x52, + 0x08, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x22, 0x2f, 0x0a, 0x07, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xfd, 0x01, 0x0a, 0x0c, 0x50, + 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x04, 0x75, + 0x6e, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x62, 0x65, 0x70, 0x2e, + 0x55, 0x6e, 0x69, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x75, 0x6e, 0x69, 0x78, 0x12, 0x2a, + 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x10, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x12, 0x24, 0x0a, 0x05, 0x6c, 0x69, + 0x6e, 0x75, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x62, 0x65, 0x70, 0x2e, + 0x58, 0x61, 0x74, 0x74, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x6c, 0x69, 0x6e, 0x75, 0x78, + 0x12, 0x26, 0x0a, 0x06, 0x64, 0x61, 0x72, 0x77, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0e, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x58, 0x61, 0x74, 0x74, 0x72, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x06, 0x64, 0x61, 0x72, 0x77, 0x69, 0x6e, 0x12, 0x28, 0x0a, 0x07, 0x66, 0x72, 0x65, 0x65, + 0x62, 0x73, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x62, 0x65, 0x70, 0x2e, + 0x58, 0x61, 0x74, 0x74, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x66, 0x72, 0x65, 0x65, 0x62, + 0x73, 0x64, 0x12, 0x26, 0x0a, 0x06, 0x6e, 0x65, 0x74, 0x62, 0x73, 0x64, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x58, 0x61, 0x74, 0x74, 0x72, 0x44, 0x61, + 0x74, 0x61, 0x52, 0x06, 0x6e, 0x65, 0x74, 0x62, 0x73, 0x64, 0x22, 0x6c, 0x0a, 0x08, 0x55, 0x6e, + 0x69, 0x78, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x77, 0x6e, 0x65, + 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x67, 0x69, 0x64, 0x22, 0x52, 0x0a, 0x0b, 0x57, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x73, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x77, 0x6e, 0x65, 0x72, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x77, 0x6e, + 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x5f, + 0x69, 0x73, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, + 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x2f, 0x0a, 0x09, + 0x58, 0x61, 0x74, 0x74, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x06, 0x78, 0x61, 0x74, + 0x74, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x62, 0x65, 0x70, 0x2e, + 0x58, 0x61, 0x74, 0x74, 0x72, 0x52, 0x06, 0x78, 0x61, 0x74, 0x74, 0x72, 0x73, 0x22, 0x31, 0x0a, + 0x05, 0x58, 0x61, 0x74, 0x74, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x22, 0xe4, 0x01, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, + 0x6c, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, + 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, + 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, + 0x73, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x25, 0x0a, 0x0e, 0x66, 0x72, 0x6f, 0x6d, + 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x0d, 0x66, 0x72, 0x6f, 0x6d, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x72, 0x79, 0x12, + 0x1b, 0x0a, 0x09, 0x77, 0x65, 0x61, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x08, 0x77, 0x65, 0x61, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x19, 0x0a, 0x08, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x6f, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x6f, 0x22, 0x52, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x45, 0x72, 0x72, 0x6f, + 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x65, 0x0a, 0x10, 0x44, + 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, + 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x39, 0x0a, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x46, + 0x69, 0x6c, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x72, 0x6f, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x73, 0x22, 0xe5, 0x01, 0x0a, 0x1a, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x6c, + 0x6f, 0x61, 0x64, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x12, 0x44, 0x0a, 0x0b, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x46, 0x69, 0x6c, + 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, + 0x73, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x07, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x62, + 0x65, 0x70, 0x2e, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0c, 0x62, + 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x62, + 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x06, 0x0a, 0x04, 0x50, 0x69, + 0x6e, 0x67, 0x22, 0x1f, 0x0a, 0x05, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, + 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, + 0x73, 0x6f, 0x6e, 0x2a, 0xed, 0x01, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x1b, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, 0x46, + 0x49, 0x47, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, + 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, + 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x44, + 0x45, 0x58, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x02, 0x12, 0x18, 0x0a, 0x14, 0x4d, + 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x51, 0x55, + 0x45, 0x53, 0x54, 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x53, 0x50, 0x4f, 0x4e, 0x53, 0x45, 0x10, 0x04, + 0x12, 0x22, 0x0a, 0x1e, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, + 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x50, 0x52, 0x4f, 0x47, 0x52, 0x45, + 0x53, 0x53, 0x10, 0x05, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, + 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x49, 0x4e, 0x47, 0x10, 0x06, 0x12, 0x16, 0x0a, 0x12, 0x4d, + 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4c, 0x4f, 0x53, + 0x45, 0x10, 0x07, 0x2a, 0x4f, 0x0a, 0x12, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, + 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x18, 0x4d, 0x45, 0x53, + 0x53, 0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, + 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x4d, 0x45, 0x53, 0x53, 0x41, + 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x4c, + 0x5a, 0x34, 0x10, 0x01, 0x2a, 0x56, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x4d, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, + 0x4f, 0x4e, 0x5f, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x10, 0x00, 0x12, 0x15, 0x0a, + 0x11, 0x43, 0x4f, 0x4d, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x45, 0x56, + 0x45, 0x52, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x43, 0x4f, 0x4d, 0x50, 0x52, 0x45, 0x53, 0x53, + 0x49, 0x4f, 0x4e, 0x5f, 0x41, 0x4c, 0x57, 0x41, 0x59, 0x53, 0x10, 0x02, 0x2a, 0xb0, 0x01, 0x0a, + 0x0c, 0x46, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, + 0x13, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, + 0x46, 0x49, 0x4c, 0x45, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x49, + 0x4e, 0x46, 0x4f, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x4f, + 0x52, 0x59, 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1b, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x49, 0x4e, 0x46, + 0x4f, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x59, 0x4d, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x45, 0x10, 0x02, 0x1a, 0x02, 0x08, 0x01, 0x12, 0x28, 0x0a, 0x20, 0x46, 0x49, 0x4c, + 0x45, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x59, 0x4d, 0x4c, + 0x49, 0x4e, 0x4b, 0x5f, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x03, 0x1a, + 0x02, 0x08, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x49, 0x4e, 0x46, 0x4f, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x59, 0x4d, 0x4c, 0x49, 0x4e, 0x4b, 0x10, 0x04, 0x2a, + 0x76, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x13, + 0x45, 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x5f, 0x45, 0x52, + 0x52, 0x4f, 0x52, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x43, + 0x4f, 0x44, 0x45, 0x5f, 0x47, 0x45, 0x4e, 0x45, 0x52, 0x49, 0x43, 0x10, 0x01, 0x12, 0x1b, 0x0a, + 0x17, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x5f, 0x53, + 0x55, 0x43, 0x48, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x02, 0x12, 0x1b, 0x0a, 0x17, 0x45, 0x52, + 0x52, 0x4f, 0x52, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, + 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x03, 0x2a, 0x7e, 0x0a, 0x1e, 0x46, 0x69, 0x6c, 0x65, 0x44, + 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x29, 0x46, 0x49, 0x4c, + 0x45, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x50, 0x52, 0x4f, 0x47, 0x52, + 0x45, 0x53, 0x53, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, + 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x10, 0x00, 0x12, 0x2d, 0x0a, 0x29, 0x46, 0x49, 0x4c, 0x45, + 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x50, 0x52, 0x4f, 0x47, 0x52, 0x45, + 0x53, 0x53, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, + 0x4f, 0x52, 0x47, 0x45, 0x54, 0x10, 0x01, 0x42, 0x70, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x2e, 0x62, + 0x65, 0x70, 0x42, 0x08, 0x42, 0x65, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x74, + 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x62, 0x65, 0x70, 0xa2, + 0x02, 0x03, 0x42, 0x58, 0x58, 0xaa, 0x02, 0x03, 0x42, 0x65, 0x70, 0xca, 0x02, 0x03, 0x42, 0x65, + 0x70, 0xe2, 0x02, 0x0f, 0x42, 0x65, 0x70, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, + 0x61, 0x74, 0x61, 0xea, 0x02, 0x03, 0x42, 0x65, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, +} + +var ( + file_bep_bep_proto_rawDescOnce sync.Once + file_bep_bep_proto_rawDescData = file_bep_bep_proto_rawDesc +) + +func file_bep_bep_proto_rawDescGZIP() []byte { + file_bep_bep_proto_rawDescOnce.Do(func() { + file_bep_bep_proto_rawDescData = protoimpl.X.CompressGZIP(file_bep_bep_proto_rawDescData) + }) + return file_bep_bep_proto_rawDescData +} + +var file_bep_bep_proto_enumTypes = make([]protoimpl.EnumInfo, 6) +var file_bep_bep_proto_msgTypes = make([]protoimpl.MessageInfo, 22) +var file_bep_bep_proto_goTypes = []any{ + (MessageType)(0), // 0: bep.MessageType + (MessageCompression)(0), // 1: bep.MessageCompression + (Compression)(0), // 2: bep.Compression + (FileInfoType)(0), // 3: bep.FileInfoType + (ErrorCode)(0), // 4: bep.ErrorCode + (FileDownloadProgressUpdateType)(0), // 5: bep.FileDownloadProgressUpdateType + (*Hello)(nil), // 6: bep.Hello + (*Header)(nil), // 7: bep.Header + (*ClusterConfig)(nil), // 8: bep.ClusterConfig + (*Folder)(nil), // 9: bep.Folder + (*Device)(nil), // 10: bep.Device + (*Index)(nil), // 11: bep.Index + (*IndexUpdate)(nil), // 12: bep.IndexUpdate + (*FileInfo)(nil), // 13: bep.FileInfo + (*BlockInfo)(nil), // 14: bep.BlockInfo + (*Vector)(nil), // 15: bep.Vector + (*Counter)(nil), // 16: bep.Counter + (*PlatformData)(nil), // 17: bep.PlatformData + (*UnixData)(nil), // 18: bep.UnixData + (*WindowsData)(nil), // 19: bep.WindowsData + (*XattrData)(nil), // 20: bep.XattrData + (*Xattr)(nil), // 21: bep.Xattr + (*Request)(nil), // 22: bep.Request + (*Response)(nil), // 23: bep.Response + (*DownloadProgress)(nil), // 24: bep.DownloadProgress + (*FileDownloadProgressUpdate)(nil), // 25: bep.FileDownloadProgressUpdate + (*Ping)(nil), // 26: bep.Ping + (*Close)(nil), // 27: bep.Close +} +var file_bep_bep_proto_depIdxs = []int32{ + 0, // 0: bep.Header.type:type_name -> bep.MessageType + 1, // 1: bep.Header.compression:type_name -> bep.MessageCompression + 9, // 2: bep.ClusterConfig.folders:type_name -> bep.Folder + 10, // 3: bep.Folder.devices:type_name -> bep.Device + 2, // 4: bep.Device.compression:type_name -> bep.Compression + 13, // 5: bep.Index.files:type_name -> bep.FileInfo + 13, // 6: bep.IndexUpdate.files:type_name -> bep.FileInfo + 15, // 7: bep.FileInfo.version:type_name -> bep.Vector + 14, // 8: bep.FileInfo.blocks:type_name -> bep.BlockInfo + 3, // 9: bep.FileInfo.type:type_name -> bep.FileInfoType + 17, // 10: bep.FileInfo.platform:type_name -> bep.PlatformData + 16, // 11: bep.Vector.counters:type_name -> bep.Counter + 18, // 12: bep.PlatformData.unix:type_name -> bep.UnixData + 19, // 13: bep.PlatformData.windows:type_name -> bep.WindowsData + 20, // 14: bep.PlatformData.linux:type_name -> bep.XattrData + 20, // 15: bep.PlatformData.darwin:type_name -> bep.XattrData + 20, // 16: bep.PlatformData.freebsd:type_name -> bep.XattrData + 20, // 17: bep.PlatformData.netbsd:type_name -> bep.XattrData + 21, // 18: bep.XattrData.xattrs:type_name -> bep.Xattr + 4, // 19: bep.Response.code:type_name -> bep.ErrorCode + 25, // 20: bep.DownloadProgress.updates:type_name -> bep.FileDownloadProgressUpdate + 5, // 21: bep.FileDownloadProgressUpdate.update_type:type_name -> bep.FileDownloadProgressUpdateType + 15, // 22: bep.FileDownloadProgressUpdate.version:type_name -> bep.Vector + 23, // [23:23] is the sub-list for method output_type + 23, // [23:23] is the sub-list for method input_type + 23, // [23:23] is the sub-list for extension type_name + 23, // [23:23] is the sub-list for extension extendee + 0, // [0:23] is the sub-list for field type_name +} + +func init() { file_bep_bep_proto_init() } +func file_bep_bep_proto_init() { + if File_bep_bep_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_bep_bep_proto_rawDesc, + NumEnums: 6, + NumMessages: 22, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_bep_bep_proto_goTypes, + DependencyIndexes: file_bep_bep_proto_depIdxs, + EnumInfos: file_bep_bep_proto_enumTypes, + MessageInfos: file_bep_bep_proto_msgTypes, + }.Build() + File_bep_bep_proto = out.File + file_bep_bep_proto_rawDesc = nil + file_bep_bep_proto_goTypes = nil + file_bep_bep_proto_depIdxs = nil +} diff --git a/internal/gen/dbproto/structs.pb.go b/internal/gen/dbproto/structs.pb.go new file mode 100644 index 00000000000..3a803347d01 --- /dev/null +++ b/internal/gen/dbproto/structs.pb.go @@ -0,0 +1,938 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc (unknown) +// source: dbproto/structs.proto + +package dbproto + +import ( + bep "github.com/syncthing/syncthing/internal/gen/bep" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// Same as bep.FileInfo, but without blocks +type FileInfoTruncated struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Size int64 `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"` + ModifiedS int64 `protobuf:"varint,5,opt,name=modified_s,json=modifiedS,proto3" json:"modified_s,omitempty"` + ModifiedBy uint64 `protobuf:"varint,12,opt,name=modified_by,json=modifiedBy,proto3" json:"modified_by,omitempty"` + Version *bep.Vector `protobuf:"bytes,9,opt,name=version,proto3" json:"version,omitempty"` + Sequence int64 `protobuf:"varint,10,opt,name=sequence,proto3" json:"sequence,omitempty"` + SymlinkTarget string `protobuf:"bytes,17,opt,name=symlink_target,json=symlinkTarget,proto3" json:"symlink_target,omitempty"` + BlocksHash []byte `protobuf:"bytes,18,opt,name=blocks_hash,json=blocksHash,proto3" json:"blocks_hash,omitempty"` + Encrypted []byte `protobuf:"bytes,19,opt,name=encrypted,proto3" json:"encrypted,omitempty"` + Type bep.FileInfoType `protobuf:"varint,2,opt,name=type,proto3,enum=bep.FileInfoType" json:"type,omitempty"` + Permissions uint32 `protobuf:"varint,4,opt,name=permissions,proto3" json:"permissions,omitempty"` + ModifiedNs int32 `protobuf:"varint,11,opt,name=modified_ns,json=modifiedNs,proto3" json:"modified_ns,omitempty"` + BlockSize int32 `protobuf:"varint,13,opt,name=block_size,json=blockSize,proto3" json:"block_size,omitempty"` + Platform *bep.PlatformData `protobuf:"bytes,14,opt,name=platform,proto3" json:"platform,omitempty"` + // The local_flags fields stores flags that are relevant to the local + // host only. It is not part of the protocol, doesn't get sent or + // received (we make sure to zero it), nonetheless we need it on our + // struct and to be able to serialize it to/from the database. + LocalFlags uint32 `protobuf:"varint,1000,opt,name=local_flags,json=localFlags,proto3" json:"local_flags,omitempty"` + // The version_hash is an implementation detail and not part of the wire + // format. + VersionHash []byte `protobuf:"bytes,1001,opt,name=version_hash,json=versionHash,proto3" json:"version_hash,omitempty"` + // The time when the inode was last changed (i.e., permissions, xattrs + // etc changed). This is host-local, not sent over the wire. + InodeChangeNs int64 `protobuf:"varint,1002,opt,name=inode_change_ns,json=inodeChangeNs,proto3" json:"inode_change_ns,omitempty"` + // The size of the data appended to the encrypted file on disk. This is + // host-local, not sent over the wire. + EncryptionTrailerSize int32 `protobuf:"varint,1003,opt,name=encryption_trailer_size,json=encryptionTrailerSize,proto3" json:"encryption_trailer_size,omitempty"` + Deleted bool `protobuf:"varint,6,opt,name=deleted,proto3" json:"deleted,omitempty"` + Invalid bool `protobuf:"varint,7,opt,name=invalid,proto3" json:"invalid,omitempty"` + NoPermissions bool `protobuf:"varint,8,opt,name=no_permissions,json=noPermissions,proto3" json:"no_permissions,omitempty"` +} + +func (x *FileInfoTruncated) Reset() { + *x = FileInfoTruncated{} + mi := &file_dbproto_structs_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FileInfoTruncated) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FileInfoTruncated) ProtoMessage() {} + +func (x *FileInfoTruncated) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FileInfoTruncated.ProtoReflect.Descriptor instead. +func (*FileInfoTruncated) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{0} +} + +func (x *FileInfoTruncated) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *FileInfoTruncated) GetSize() int64 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *FileInfoTruncated) GetModifiedS() int64 { + if x != nil { + return x.ModifiedS + } + return 0 +} + +func (x *FileInfoTruncated) GetModifiedBy() uint64 { + if x != nil { + return x.ModifiedBy + } + return 0 +} + +func (x *FileInfoTruncated) GetVersion() *bep.Vector { + if x != nil { + return x.Version + } + return nil +} + +func (x *FileInfoTruncated) GetSequence() int64 { + if x != nil { + return x.Sequence + } + return 0 +} + +func (x *FileInfoTruncated) GetSymlinkTarget() string { + if x != nil { + return x.SymlinkTarget + } + return "" +} + +func (x *FileInfoTruncated) GetBlocksHash() []byte { + if x != nil { + return x.BlocksHash + } + return nil +} + +func (x *FileInfoTruncated) GetEncrypted() []byte { + if x != nil { + return x.Encrypted + } + return nil +} + +func (x *FileInfoTruncated) GetType() bep.FileInfoType { + if x != nil { + return x.Type + } + return bep.FileInfoType(0) +} + +func (x *FileInfoTruncated) GetPermissions() uint32 { + if x != nil { + return x.Permissions + } + return 0 +} + +func (x *FileInfoTruncated) GetModifiedNs() int32 { + if x != nil { + return x.ModifiedNs + } + return 0 +} + +func (x *FileInfoTruncated) GetBlockSize() int32 { + if x != nil { + return x.BlockSize + } + return 0 +} + +func (x *FileInfoTruncated) GetPlatform() *bep.PlatformData { + if x != nil { + return x.Platform + } + return nil +} + +func (x *FileInfoTruncated) GetLocalFlags() uint32 { + if x != nil { + return x.LocalFlags + } + return 0 +} + +func (x *FileInfoTruncated) GetVersionHash() []byte { + if x != nil { + return x.VersionHash + } + return nil +} + +func (x *FileInfoTruncated) GetInodeChangeNs() int64 { + if x != nil { + return x.InodeChangeNs + } + return 0 +} + +func (x *FileInfoTruncated) GetEncryptionTrailerSize() int32 { + if x != nil { + return x.EncryptionTrailerSize + } + return 0 +} + +func (x *FileInfoTruncated) GetDeleted() bool { + if x != nil { + return x.Deleted + } + return false +} + +func (x *FileInfoTruncated) GetInvalid() bool { + if x != nil { + return x.Invalid + } + return false +} + +func (x *FileInfoTruncated) GetNoPermissions() bool { + if x != nil { + return x.NoPermissions + } + return false +} + +type FileVersion struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Version *bep.Vector `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` + Deleted bool `protobuf:"varint,2,opt,name=deleted,proto3" json:"deleted,omitempty"` + Devices [][]byte `protobuf:"bytes,3,rep,name=devices,proto3" json:"devices,omitempty"` + InvalidDevices [][]byte `protobuf:"bytes,4,rep,name=invalid_devices,json=invalidDevices,proto3" json:"invalid_devices,omitempty"` +} + +func (x *FileVersion) Reset() { + *x = FileVersion{} + mi := &file_dbproto_structs_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FileVersion) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FileVersion) ProtoMessage() {} + +func (x *FileVersion) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FileVersion.ProtoReflect.Descriptor instead. +func (*FileVersion) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{1} +} + +func (x *FileVersion) GetVersion() *bep.Vector { + if x != nil { + return x.Version + } + return nil +} + +func (x *FileVersion) GetDeleted() bool { + if x != nil { + return x.Deleted + } + return false +} + +func (x *FileVersion) GetDevices() [][]byte { + if x != nil { + return x.Devices + } + return nil +} + +func (x *FileVersion) GetInvalidDevices() [][]byte { + if x != nil { + return x.InvalidDevices + } + return nil +} + +type VersionList struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Versions []*FileVersion `protobuf:"bytes,1,rep,name=versions,proto3" json:"versions,omitempty"` +} + +func (x *VersionList) Reset() { + *x = VersionList{} + mi := &file_dbproto_structs_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *VersionList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VersionList) ProtoMessage() {} + +func (x *VersionList) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use VersionList.ProtoReflect.Descriptor instead. +func (*VersionList) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{2} +} + +func (x *VersionList) GetVersions() []*FileVersion { + if x != nil { + return x.Versions + } + return nil +} + +// BlockList is the structure used to store block lists +type BlockList struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Blocks []*bep.BlockInfo `protobuf:"bytes,1,rep,name=blocks,proto3" json:"blocks,omitempty"` +} + +func (x *BlockList) Reset() { + *x = BlockList{} + mi := &file_dbproto_structs_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *BlockList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*BlockList) ProtoMessage() {} + +func (x *BlockList) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use BlockList.ProtoReflect.Descriptor instead. +func (*BlockList) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{3} +} + +func (x *BlockList) GetBlocks() []*bep.BlockInfo { + if x != nil { + return x.Blocks + } + return nil +} + +// IndirectionHashesOnly is used to only unmarshal the indirection hashes +// from a FileInfo +type IndirectionHashesOnly struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + BlocksHash []byte `protobuf:"bytes,18,opt,name=blocks_hash,json=blocksHash,proto3" json:"blocks_hash,omitempty"` + VersionHash []byte `protobuf:"bytes,1001,opt,name=version_hash,json=versionHash,proto3" json:"version_hash,omitempty"` +} + +func (x *IndirectionHashesOnly) Reset() { + *x = IndirectionHashesOnly{} + mi := &file_dbproto_structs_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *IndirectionHashesOnly) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IndirectionHashesOnly) ProtoMessage() {} + +func (x *IndirectionHashesOnly) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use IndirectionHashesOnly.ProtoReflect.Descriptor instead. +func (*IndirectionHashesOnly) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{4} +} + +func (x *IndirectionHashesOnly) GetBlocksHash() []byte { + if x != nil { + return x.BlocksHash + } + return nil +} + +func (x *IndirectionHashesOnly) GetVersionHash() []byte { + if x != nil { + return x.VersionHash + } + return nil +} + +// For each folder and device we keep one of these to track the current +// counts and sequence. We also keep one for the global state of the folder. +type Counts struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Files int32 `protobuf:"varint,1,opt,name=files,proto3" json:"files,omitempty"` + Directories int32 `protobuf:"varint,2,opt,name=directories,proto3" json:"directories,omitempty"` + Symlinks int32 `protobuf:"varint,3,opt,name=symlinks,proto3" json:"symlinks,omitempty"` + Deleted int32 `protobuf:"varint,4,opt,name=deleted,proto3" json:"deleted,omitempty"` + Bytes int64 `protobuf:"varint,5,opt,name=bytes,proto3" json:"bytes,omitempty"` + Sequence int64 `protobuf:"varint,6,opt,name=sequence,proto3" json:"sequence,omitempty"` // zero for the global state + DeviceId []byte `protobuf:"bytes,17,opt,name=device_id,json=deviceId,proto3" json:"device_id,omitempty"` // device ID for remote devices, or special values for local/global + LocalFlags uint32 `protobuf:"varint,18,opt,name=local_flags,json=localFlags,proto3" json:"local_flags,omitempty"` // the local flag for this count bucket +} + +func (x *Counts) Reset() { + *x = Counts{} + mi := &file_dbproto_structs_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Counts) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Counts) ProtoMessage() {} + +func (x *Counts) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Counts.ProtoReflect.Descriptor instead. +func (*Counts) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{5} +} + +func (x *Counts) GetFiles() int32 { + if x != nil { + return x.Files + } + return 0 +} + +func (x *Counts) GetDirectories() int32 { + if x != nil { + return x.Directories + } + return 0 +} + +func (x *Counts) GetSymlinks() int32 { + if x != nil { + return x.Symlinks + } + return 0 +} + +func (x *Counts) GetDeleted() int32 { + if x != nil { + return x.Deleted + } + return 0 +} + +func (x *Counts) GetBytes() int64 { + if x != nil { + return x.Bytes + } + return 0 +} + +func (x *Counts) GetSequence() int64 { + if x != nil { + return x.Sequence + } + return 0 +} + +func (x *Counts) GetDeviceId() []byte { + if x != nil { + return x.DeviceId + } + return nil +} + +func (x *Counts) GetLocalFlags() uint32 { + if x != nil { + return x.LocalFlags + } + return 0 +} + +type CountsSet struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Counts []*Counts `protobuf:"bytes,1,rep,name=counts,proto3" json:"counts,omitempty"` + Created int64 `protobuf:"varint,2,opt,name=created,proto3" json:"created,omitempty"` // unix nanos +} + +func (x *CountsSet) Reset() { + *x = CountsSet{} + mi := &file_dbproto_structs_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CountsSet) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CountsSet) ProtoMessage() {} + +func (x *CountsSet) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CountsSet.ProtoReflect.Descriptor instead. +func (*CountsSet) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{6} +} + +func (x *CountsSet) GetCounts() []*Counts { + if x != nil { + return x.Counts + } + return nil +} + +func (x *CountsSet) GetCreated() int64 { + if x != nil { + return x.Created + } + return 0 +} + +type ObservedFolder struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Time *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"` + Label string `protobuf:"bytes,2,opt,name=label,proto3" json:"label,omitempty"` + ReceiveEncrypted bool `protobuf:"varint,3,opt,name=receive_encrypted,json=receiveEncrypted,proto3" json:"receive_encrypted,omitempty"` + RemoteEncrypted bool `protobuf:"varint,4,opt,name=remote_encrypted,json=remoteEncrypted,proto3" json:"remote_encrypted,omitempty"` +} + +func (x *ObservedFolder) Reset() { + *x = ObservedFolder{} + mi := &file_dbproto_structs_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ObservedFolder) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ObservedFolder) ProtoMessage() {} + +func (x *ObservedFolder) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[7] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ObservedFolder.ProtoReflect.Descriptor instead. +func (*ObservedFolder) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{7} +} + +func (x *ObservedFolder) GetTime() *timestamppb.Timestamp { + if x != nil { + return x.Time + } + return nil +} + +func (x *ObservedFolder) GetLabel() string { + if x != nil { + return x.Label + } + return "" +} + +func (x *ObservedFolder) GetReceiveEncrypted() bool { + if x != nil { + return x.ReceiveEncrypted + } + return false +} + +func (x *ObservedFolder) GetRemoteEncrypted() bool { + if x != nil { + return x.RemoteEncrypted + } + return false +} + +type ObservedDevice struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Time *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` +} + +func (x *ObservedDevice) Reset() { + *x = ObservedDevice{} + mi := &file_dbproto_structs_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ObservedDevice) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ObservedDevice) ProtoMessage() {} + +func (x *ObservedDevice) ProtoReflect() protoreflect.Message { + mi := &file_dbproto_structs_proto_msgTypes[8] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ObservedDevice.ProtoReflect.Descriptor instead. +func (*ObservedDevice) Descriptor() ([]byte, []int) { + return file_dbproto_structs_proto_rawDescGZIP(), []int{8} +} + +func (x *ObservedDevice) GetTime() *timestamppb.Timestamp { + if x != nil { + return x.Time + } + return nil +} + +func (x *ObservedDevice) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *ObservedDevice) GetAddress() string { + if x != nil { + return x.Address + } + return "" +} + +var File_dbproto_structs_proto protoreflect.FileDescriptor + +var file_dbproto_structs_proto_rawDesc = []byte{ + 0x0a, 0x15, 0x64, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, + 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x64, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x1a, 0x0d, 0x62, 0x65, 0x70, 0x2f, 0x62, 0x65, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0xe5, 0x05, 0x0a, 0x11, 0x46, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x54, 0x72, 0x75, + 0x6e, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, + 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x1d, + 0x0a, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x73, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x09, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x53, 0x12, 0x1f, 0x0a, + 0x0b, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x04, 0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x42, 0x79, 0x12, 0x25, + 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x07, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, + 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, + 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x61, 0x72, + 0x67, 0x65, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x79, 0x6d, 0x6c, 0x69, + 0x6e, 0x6b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x6c, 0x6f, 0x63, + 0x6b, 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x62, + 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x63, + 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x65, 0x6e, + 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x46, 0x69, 0x6c, 0x65, + 0x49, 0x6e, 0x66, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x20, + 0x0a, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, + 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x6e, 0x73, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x4e, + 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, + 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x69, 0x7a, 0x65, + 0x12, 0x2d, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x0e, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x62, 0x65, 0x70, 0x2e, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, + 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, + 0x20, 0x0a, 0x0b, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0xe8, + 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x46, 0x6c, 0x61, 0x67, + 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x61, 0x73, + 0x68, 0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x48, 0x61, 0x73, 0x68, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x63, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6e, 0x73, 0x18, 0xea, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0d, 0x69, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4e, 0x73, 0x12, 0x37, + 0x0a, 0x17, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, + 0x69, 0x6c, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x15, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x69, + 0x6c, 0x65, 0x72, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x64, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x07, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x6e, + 0x6f, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x0d, 0x6e, 0x6f, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x73, 0x4a, 0x04, 0x08, 0x10, 0x10, 0x11, 0x22, 0x91, 0x01, 0x0a, 0x0b, 0x46, 0x69, 0x6c, + 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x62, 0x65, 0x70, 0x2e, + 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, + 0x18, 0x0a, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x76, + 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x07, 0x64, 0x65, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x64, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0e, 0x69, 0x6e, + 0x76, 0x61, 0x6c, 0x69, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x22, 0x3f, 0x0a, 0x0b, + 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x08, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x64, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x56, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x33, 0x0a, + 0x09, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x06, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x62, 0x65, 0x70, + 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x6c, 0x6f, 0x63, + 0x6b, 0x73, 0x22, 0x5c, 0x0a, 0x15, 0x49, 0x6e, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x48, 0x61, 0x73, 0x68, 0x65, 0x73, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x62, + 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0c, + 0x52, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x48, 0x61, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x0c, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0xe9, 0x07, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x73, 0x68, + 0x22, 0xe6, 0x01, 0x0a, 0x06, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x66, + 0x69, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x6c, 0x65, + 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, + 0x69, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, + 0x18, 0x0a, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x79, 0x74, + 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x12, + 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x64, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, + 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6c, + 0x6f, 0x63, 0x61, 0x6c, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x22, 0x4e, 0x0a, 0x09, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x73, 0x53, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, + 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x0e, 0x4f, 0x62, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x04, + 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x12, 0x2b, 0x0a, 0x11, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x5f, 0x65, 0x6e, + 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x12, + 0x29, 0x0a, 0x10, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, + 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x72, 0x65, 0x6d, 0x6f, 0x74, + 0x65, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x22, 0x6e, 0x0a, 0x0e, 0x4f, 0x62, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x04, + 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x8c, 0x01, 0x0a, 0x0b, 0x63, + 0x6f, 0x6d, 0x2e, 0x64, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0x0c, 0x53, 0x74, 0x72, 0x75, + 0x63, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x74, 0x68, 0x69, 0x6e, 0x67, + 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x64, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2, + 0x02, 0x03, 0x44, 0x58, 0x58, 0xaa, 0x02, 0x07, 0x44, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xca, + 0x02, 0x07, 0x44, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xe2, 0x02, 0x13, 0x44, 0x62, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, + 0x02, 0x07, 0x44, 0x62, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, +} + +var ( + file_dbproto_structs_proto_rawDescOnce sync.Once + file_dbproto_structs_proto_rawDescData = file_dbproto_structs_proto_rawDesc +) + +func file_dbproto_structs_proto_rawDescGZIP() []byte { + file_dbproto_structs_proto_rawDescOnce.Do(func() { + file_dbproto_structs_proto_rawDescData = protoimpl.X.CompressGZIP(file_dbproto_structs_proto_rawDescData) + }) + return file_dbproto_structs_proto_rawDescData +} + +var file_dbproto_structs_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_dbproto_structs_proto_goTypes = []any{ + (*FileInfoTruncated)(nil), // 0: dbproto.FileInfoTruncated + (*FileVersion)(nil), // 1: dbproto.FileVersion + (*VersionList)(nil), // 2: dbproto.VersionList + (*BlockList)(nil), // 3: dbproto.BlockList + (*IndirectionHashesOnly)(nil), // 4: dbproto.IndirectionHashesOnly + (*Counts)(nil), // 5: dbproto.Counts + (*CountsSet)(nil), // 6: dbproto.CountsSet + (*ObservedFolder)(nil), // 7: dbproto.ObservedFolder + (*ObservedDevice)(nil), // 8: dbproto.ObservedDevice + (*bep.Vector)(nil), // 9: bep.Vector + (bep.FileInfoType)(0), // 10: bep.FileInfoType + (*bep.PlatformData)(nil), // 11: bep.PlatformData + (*bep.BlockInfo)(nil), // 12: bep.BlockInfo + (*timestamppb.Timestamp)(nil), // 13: google.protobuf.Timestamp +} +var file_dbproto_structs_proto_depIdxs = []int32{ + 9, // 0: dbproto.FileInfoTruncated.version:type_name -> bep.Vector + 10, // 1: dbproto.FileInfoTruncated.type:type_name -> bep.FileInfoType + 11, // 2: dbproto.FileInfoTruncated.platform:type_name -> bep.PlatformData + 9, // 3: dbproto.FileVersion.version:type_name -> bep.Vector + 1, // 4: dbproto.VersionList.versions:type_name -> dbproto.FileVersion + 12, // 5: dbproto.BlockList.blocks:type_name -> bep.BlockInfo + 5, // 6: dbproto.CountsSet.counts:type_name -> dbproto.Counts + 13, // 7: dbproto.ObservedFolder.time:type_name -> google.protobuf.Timestamp + 13, // 8: dbproto.ObservedDevice.time:type_name -> google.protobuf.Timestamp + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name +} + +func init() { file_dbproto_structs_proto_init() } +func file_dbproto_structs_proto_init() { + if File_dbproto_structs_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_dbproto_structs_proto_rawDesc, + NumEnums: 0, + NumMessages: 9, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_dbproto_structs_proto_goTypes, + DependencyIndexes: file_dbproto_structs_proto_depIdxs, + MessageInfos: file_dbproto_structs_proto_msgTypes, + }.Build() + File_dbproto_structs_proto = out.File + file_dbproto_structs_proto_rawDesc = nil + file_dbproto_structs_proto_goTypes = nil + file_dbproto_structs_proto_depIdxs = nil +} diff --git a/internal/gen/discoproto/local.pb.go b/internal/gen/discoproto/local.pb.go new file mode 100644 index 00000000000..81f4d27070a --- /dev/null +++ b/internal/gen/discoproto/local.pb.go @@ -0,0 +1,155 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc (unknown) +// source: discoproto/local.proto + +package discoproto + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type Announce struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id []byte `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Addresses []string `protobuf:"bytes,2,rep,name=addresses,proto3" json:"addresses,omitempty"` + InstanceId int64 `protobuf:"varint,3,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"` +} + +func (x *Announce) Reset() { + *x = Announce{} + mi := &file_discoproto_local_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Announce) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Announce) ProtoMessage() {} + +func (x *Announce) ProtoReflect() protoreflect.Message { + mi := &file_discoproto_local_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Announce.ProtoReflect.Descriptor instead. +func (*Announce) Descriptor() ([]byte, []int) { + return file_discoproto_local_proto_rawDescGZIP(), []int{0} +} + +func (x *Announce) GetId() []byte { + if x != nil { + return x.Id + } + return nil +} + +func (x *Announce) GetAddresses() []string { + if x != nil { + return x.Addresses + } + return nil +} + +func (x *Announce) GetInstanceId() int64 { + if x != nil { + return x.InstanceId + } + return 0 +} + +var File_discoproto_local_proto protoreflect.FileDescriptor + +var file_discoproto_local_proto_rawDesc = []byte{ + 0x0a, 0x16, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x59, 0x0a, 0x08, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x1f, + 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x42, + 0x9c, 0x01, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x42, 0x0a, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x79, 0x6e, + 0x63, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x74, 0x68, 0x69, 0x6e, 0x67, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x64, 0x69, + 0x73, 0x63, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02, 0x03, 0x44, 0x58, 0x58, 0xaa, 0x02, + 0x0a, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xca, 0x02, 0x0a, 0x44, 0x69, + 0x73, 0x63, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xe2, 0x02, 0x16, 0x44, 0x69, 0x73, 0x63, 0x6f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0xea, 0x02, 0x0a, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_discoproto_local_proto_rawDescOnce sync.Once + file_discoproto_local_proto_rawDescData = file_discoproto_local_proto_rawDesc +) + +func file_discoproto_local_proto_rawDescGZIP() []byte { + file_discoproto_local_proto_rawDescOnce.Do(func() { + file_discoproto_local_proto_rawDescData = protoimpl.X.CompressGZIP(file_discoproto_local_proto_rawDescData) + }) + return file_discoproto_local_proto_rawDescData +} + +var file_discoproto_local_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_discoproto_local_proto_goTypes = []any{ + (*Announce)(nil), // 0: discoproto.Announce +} +var file_discoproto_local_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_discoproto_local_proto_init() } +func file_discoproto_local_proto_init() { + if File_discoproto_local_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_discoproto_local_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_discoproto_local_proto_goTypes, + DependencyIndexes: file_discoproto_local_proto_depIdxs, + MessageInfos: file_discoproto_local_proto_msgTypes, + }.Build() + File_discoproto_local_proto = out.File + file_discoproto_local_proto_rawDesc = nil + file_discoproto_local_proto_goTypes = nil + file_discoproto_local_proto_depIdxs = nil +} diff --git a/internal/gen/discosrv/discosrv.pb.go b/internal/gen/discosrv/discosrv.pb.go new file mode 100644 index 00000000000..2c7a57821ea --- /dev/null +++ b/internal/gen/discosrv/discosrv.pb.go @@ -0,0 +1,276 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc (unknown) +// source: discosrv/discosrv.proto + +package discosrv + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type DatabaseRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Addresses []*DatabaseAddress `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses,omitempty"` + Seen int64 `protobuf:"varint,3,opt,name=seen,proto3" json:"seen,omitempty"` // Unix nanos, last device announce +} + +func (x *DatabaseRecord) Reset() { + *x = DatabaseRecord{} + mi := &file_discosrv_discosrv_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DatabaseRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DatabaseRecord) ProtoMessage() {} + +func (x *DatabaseRecord) ProtoReflect() protoreflect.Message { + mi := &file_discosrv_discosrv_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DatabaseRecord.ProtoReflect.Descriptor instead. +func (*DatabaseRecord) Descriptor() ([]byte, []int) { + return file_discosrv_discosrv_proto_rawDescGZIP(), []int{0} +} + +func (x *DatabaseRecord) GetAddresses() []*DatabaseAddress { + if x != nil { + return x.Addresses + } + return nil +} + +func (x *DatabaseRecord) GetSeen() int64 { + if x != nil { + return x.Seen + } + return 0 +} + +type ReplicationRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` // raw 32 byte device ID + Addresses []*DatabaseAddress `protobuf:"bytes,2,rep,name=addresses,proto3" json:"addresses,omitempty"` + Seen int64 `protobuf:"varint,3,opt,name=seen,proto3" json:"seen,omitempty"` // Unix nanos, last device announce +} + +func (x *ReplicationRecord) Reset() { + *x = ReplicationRecord{} + mi := &file_discosrv_discosrv_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ReplicationRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ReplicationRecord) ProtoMessage() {} + +func (x *ReplicationRecord) ProtoReflect() protoreflect.Message { + mi := &file_discosrv_discosrv_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ReplicationRecord.ProtoReflect.Descriptor instead. +func (*ReplicationRecord) Descriptor() ([]byte, []int) { + return file_discosrv_discosrv_proto_rawDescGZIP(), []int{1} +} + +func (x *ReplicationRecord) GetKey() []byte { + if x != nil { + return x.Key + } + return nil +} + +func (x *ReplicationRecord) GetAddresses() []*DatabaseAddress { + if x != nil { + return x.Addresses + } + return nil +} + +func (x *ReplicationRecord) GetSeen() int64 { + if x != nil { + return x.Seen + } + return 0 +} + +type DatabaseAddress struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Expires int64 `protobuf:"varint,2,opt,name=expires,proto3" json:"expires,omitempty"` // Unix nanos +} + +func (x *DatabaseAddress) Reset() { + *x = DatabaseAddress{} + mi := &file_discosrv_discosrv_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DatabaseAddress) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DatabaseAddress) ProtoMessage() {} + +func (x *DatabaseAddress) ProtoReflect() protoreflect.Message { + mi := &file_discosrv_discosrv_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DatabaseAddress.ProtoReflect.Descriptor instead. +func (*DatabaseAddress) Descriptor() ([]byte, []int) { + return file_discosrv_discosrv_proto_rawDescGZIP(), []int{2} +} + +func (x *DatabaseAddress) GetAddress() string { + if x != nil { + return x.Address + } + return "" +} + +func (x *DatabaseAddress) GetExpires() int64 { + if x != nil { + return x.Expires + } + return 0 +} + +var File_discosrv_discosrv_proto protoreflect.FileDescriptor + +var file_discosrv_discosrv_proto_rawDesc = []byte{ + 0x0a, 0x17, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x73, 0x72, 0x76, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, + 0x73, 0x72, 0x76, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, + 0x73, 0x72, 0x76, 0x22, 0x5d, 0x0a, 0x0e, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x37, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, + 0x73, 0x72, 0x76, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x41, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x12, + 0x0a, 0x04, 0x73, 0x65, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x65, + 0x65, 0x6e, 0x22, 0x72, 0x0a, 0x11, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x37, 0x0a, 0x09, 0x61, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x64, + 0x69, 0x73, 0x63, 0x6f, 0x73, 0x72, 0x76, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, + 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x04, 0x73, 0x65, 0x65, 0x6e, 0x22, 0x45, 0x0a, 0x0f, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, + 0x73, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x42, 0x93, 0x01, + 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x73, 0x72, 0x76, 0x42, 0x0d, + 0x44, 0x69, 0x73, 0x63, 0x6f, 0x73, 0x72, 0x76, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, + 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x79, 0x6e, 0x63, + 0x74, 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x64, 0x69, 0x73, + 0x63, 0x6f, 0x73, 0x72, 0x76, 0xa2, 0x02, 0x03, 0x44, 0x58, 0x58, 0xaa, 0x02, 0x08, 0x44, 0x69, + 0x73, 0x63, 0x6f, 0x73, 0x72, 0x76, 0xca, 0x02, 0x08, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x73, 0x72, + 0x76, 0xe2, 0x02, 0x14, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x73, 0x72, 0x76, 0x5c, 0x47, 0x50, 0x42, + 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x08, 0x44, 0x69, 0x73, 0x63, 0x6f, + 0x73, 0x72, 0x76, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_discosrv_discosrv_proto_rawDescOnce sync.Once + file_discosrv_discosrv_proto_rawDescData = file_discosrv_discosrv_proto_rawDesc +) + +func file_discosrv_discosrv_proto_rawDescGZIP() []byte { + file_discosrv_discosrv_proto_rawDescOnce.Do(func() { + file_discosrv_discosrv_proto_rawDescData = protoimpl.X.CompressGZIP(file_discosrv_discosrv_proto_rawDescData) + }) + return file_discosrv_discosrv_proto_rawDescData +} + +var file_discosrv_discosrv_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_discosrv_discosrv_proto_goTypes = []any{ + (*DatabaseRecord)(nil), // 0: discosrv.DatabaseRecord + (*ReplicationRecord)(nil), // 1: discosrv.ReplicationRecord + (*DatabaseAddress)(nil), // 2: discosrv.DatabaseAddress +} +var file_discosrv_discosrv_proto_depIdxs = []int32{ + 2, // 0: discosrv.DatabaseRecord.addresses:type_name -> discosrv.DatabaseAddress + 2, // 1: discosrv.ReplicationRecord.addresses:type_name -> discosrv.DatabaseAddress + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_discosrv_discosrv_proto_init() } +func file_discosrv_discosrv_proto_init() { + if File_discosrv_discosrv_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_discosrv_discosrv_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_discosrv_discosrv_proto_goTypes, + DependencyIndexes: file_discosrv_discosrv_proto_depIdxs, + MessageInfos: file_discosrv_discosrv_proto_msgTypes, + }.Build() + File_discosrv_discosrv_proto = out.File + file_discosrv_discosrv_proto_rawDesc = nil + file_discosrv_discosrv_proto_goTypes = nil + file_discosrv_discosrv_proto_depIdxs = nil +} diff --git a/internal/protoutil/protoutil.go b/internal/protoutil/protoutil.go new file mode 100644 index 00000000000..93bd769111a --- /dev/null +++ b/internal/protoutil/protoutil.go @@ -0,0 +1,24 @@ +package protoutil + +import ( + "fmt" + + "google.golang.org/protobuf/proto" +) + +func MarshalTo(buf []byte, pb proto.Message) (int, error) { + if sz := proto.Size(pb); len(buf) < sz { + return 0, fmt.Errorf("buffer too small") + } else if sz == 0 { + return 0, nil + } + opts := proto.MarshalOptions{} + bs, err := opts.MarshalAppend(buf[:0], pb) + if err != nil { + return 0, err + } + if &buf[0] != &bs[0] { + panic("can't happen: slice was reallocated") + } + return len(bs), nil +} diff --git a/lib/api/api.go b/lib/api/api.go index 8cf834b636c..6205ae6203d 100644 --- a/lib/api/api.go +++ b/lib/api/api.go @@ -1748,10 +1748,10 @@ func (*service) getSystemBrowse(w http.ResponseWriter, r *http.Request) { current := qs.Get("current") // Default value or in case of error unmarshalling ends up being basic fs. - var fsType fs.FilesystemType + var fsType config.FilesystemType fsType.UnmarshalText([]byte(qs.Get("filesystem"))) - sendJSON(w, browse(fsType, current)) + sendJSON(w, browse(fsType.ToFS(), current)) } func browse(fsType fs.FilesystemType, current string) []string { @@ -1870,10 +1870,10 @@ func (*service) getHeapProf(w http.ResponseWriter, _ *http.Request) { pprof.WriteHeapProfile(w) } -func toJsonFileInfoSlice(fs []db.FileInfoTruncated) []jsonFileInfoTrunc { - res := make([]jsonFileInfoTrunc, len(fs)) +func toJsonFileInfoSlice(fs []protocol.FileInfo) []jsonFileInfo { + res := make([]jsonFileInfo, len(fs)) for i, f := range fs { - res[i] = jsonFileInfoTrunc(f) + res[i] = jsonFileInfo(f) } return res } @@ -1888,15 +1888,7 @@ func (f jsonFileInfo) MarshalJSON() ([]byte, error) { return json.Marshal(m) } -type jsonFileInfoTrunc db.FileInfoTruncated - -func (f jsonFileInfoTrunc) MarshalJSON() ([]byte, error) { - m := fileIntfJSONMap(db.FileInfoTruncated(f)) - m["numBlocks"] = nil // explicitly unknown - return json.Marshal(m) -} - -func fileIntfJSONMap(f protocol.FileIntf) map[string]interface{} { +func fileIntfJSONMap(f protocol.FileInfo) map[string]interface{} { out := map[string]interface{}{ "name": f.FileName(), "type": f.FileType().String(), diff --git a/lib/api/api_test.go b/lib/api/api_test.go index 88174c77f89..27b6b119306 100644 --- a/lib/api/api_test.go +++ b/lib/api/api_test.go @@ -25,6 +25,8 @@ import ( "time" "github.com/d4l3k/messagediff" + "github.com/thejerf/suture/v4" + "github.com/syncthing/syncthing/lib/assets" "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/config" @@ -46,7 +48,6 @@ import ( "github.com/syncthing/syncthing/lib/sync" "github.com/syncthing/syncthing/lib/tlsutil" "github.com/syncthing/syncthing/lib/ur" - "github.com/thejerf/suture/v4" ) var ( diff --git a/lib/api/tokenmanager.go b/lib/api/tokenmanager.go index adccda2e97f..96dfab4a794 100644 --- a/lib/api/tokenmanager.go +++ b/lib/api/tokenmanager.go @@ -12,6 +12,9 @@ import ( "strings" "time" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/apiproto" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/events" @@ -28,16 +31,16 @@ type tokenManager struct { timeNow func() time.Time // can be overridden for testing mut sync.Mutex - tokens *TokenSet + tokens *apiproto.TokenSet saveTimer *time.Timer } func newTokenManager(key string, miscDB *db.NamespacedKV, lifetime time.Duration, maxItems int) *tokenManager { - tokens := &TokenSet{ + tokens := &apiproto.TokenSet{ Tokens: make(map[string]int64), } if bs, ok, _ := miscDB.Bytes(key); ok { - _ = tokens.Unmarshal(bs) // best effort + _ = proto.Unmarshal(bs, tokens) // best effort } return &tokenManager{ key: key, @@ -136,7 +139,7 @@ func (m *tokenManager) scheduledSave() { m.saveTimer = nil - bs, _ := m.tokens.Marshal() // can't fail + bs, _ := proto.Marshal(m.tokens) // can't fail _ = m.miscDB.PutBytes(m.key, bs) // can fail, but what are we going to do? } diff --git a/lib/api/tokenset.pb.go b/lib/api/tokenset.pb.go deleted file mode 100644 index 80883fab24b..00000000000 --- a/lib/api/tokenset.pb.go +++ /dev/null @@ -1,411 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/api/tokenset.proto - -package api - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type TokenSet struct { - // token -> expiry time (epoch nanoseconds) - Tokens map[string]int64 `protobuf:"bytes,1,rep,name=tokens,proto3" json:"tokens" xml:"token" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` -} - -func (m *TokenSet) Reset() { *m = TokenSet{} } -func (m *TokenSet) String() string { return proto.CompactTextString(m) } -func (*TokenSet) ProtoMessage() {} -func (*TokenSet) Descriptor() ([]byte, []int) { - return fileDescriptor_9ea8707737c33b38, []int{0} -} -func (m *TokenSet) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TokenSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TokenSet.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TokenSet) XXX_Merge(src proto.Message) { - xxx_messageInfo_TokenSet.Merge(m, src) -} -func (m *TokenSet) XXX_Size() int { - return m.ProtoSize() -} -func (m *TokenSet) XXX_DiscardUnknown() { - xxx_messageInfo_TokenSet.DiscardUnknown(m) -} - -var xxx_messageInfo_TokenSet proto.InternalMessageInfo - -func init() { - proto.RegisterType((*TokenSet)(nil), "api.TokenSet") - proto.RegisterMapType((map[string]int64)(nil), "api.TokenSet.TokensEntry") -} - -func init() { proto.RegisterFile("lib/api/tokenset.proto", fileDescriptor_9ea8707737c33b38) } - -var fileDescriptor_9ea8707737c33b38 = []byte{ - // 260 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcb, 0xc9, 0x4c, 0xd2, - 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xc9, 0xcf, 0x4e, 0xcd, 0x2b, 0x4e, 0x2d, 0xd1, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x62, 0x4e, 0x2c, 0xc8, 0x54, 0x3a, 0xce, 0xc8, 0xc5, 0x11, 0x02, 0x12, 0x0f, - 0x4e, 0x2d, 0x11, 0x0a, 0xe0, 0x62, 0x83, 0xa8, 0x91, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x36, 0x92, - 0xd4, 0x4b, 0x2c, 0xc8, 0xd4, 0x83, 0x49, 0x43, 0x18, 0xc5, 0xae, 0x79, 0x25, 0x45, 0x95, 0x4e, - 0xb2, 0x27, 0xee, 0xc9, 0x33, 0xbc, 0xba, 0x27, 0x0f, 0xd5, 0xf0, 0xe9, 0x9e, 0x3c, 0x77, 0x45, - 0x6e, 0x8e, 0x95, 0x12, 0x98, 0xab, 0x14, 0x04, 0x15, 0x96, 0xca, 0xe4, 0xe2, 0x46, 0xd2, 0x25, - 0xa4, 0xc6, 0xc5, 0x9c, 0x9d, 0x5a, 0x29, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe9, 0x24, 0xf2, 0xea, - 0x9e, 0x3c, 0x88, 0xfb, 0xe9, 0x9e, 0x3c, 0x27, 0x58, 0x6f, 0x76, 0x6a, 0xa5, 0x52, 0x10, 0x48, - 0x44, 0x48, 0x8f, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x49, 0x81, 0x51, 0x83, 0xd9, - 0x49, 0xe2, 0xd5, 0x3d, 0x79, 0x88, 0x00, 0xdc, 0x1e, 0x30, 0x4f, 0x29, 0x08, 0x22, 0x6a, 0xc5, - 0x64, 0xc1, 0xe8, 0xe4, 0x71, 0xe2, 0xa1, 0x1c, 0xc3, 0x85, 0x87, 0x72, 0x0c, 0x27, 0x1e, 0xc9, - 0x31, 0x5e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x82, 0xc7, 0x72, 0x8c, 0x17, 0x1e, - 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x96, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, - 0x9c, 0x9f, 0xab, 0x5f, 0x5c, 0x99, 0x97, 0x5c, 0x92, 0x91, 0x99, 0x97, 0x8e, 0xc4, 0x82, 0x86, - 0x53, 0x12, 0x1b, 0x38, 0x7c, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x25, 0x31, 0x49, - 0x39, 0x01, 0x00, 0x00, -} - -func (m *TokenSet) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TokenSet) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TokenSet) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Tokens) > 0 { - for k := range m.Tokens { - v := m.Tokens[k] - baseI := i - i = encodeVarintTokenset(dAtA, i, uint64(v)) - i-- - dAtA[i] = 0x10 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintTokenset(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintTokenset(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func encodeVarintTokenset(dAtA []byte, offset int, v uint64) int { - offset -= sovTokenset(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *TokenSet) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Tokens) > 0 { - for k, v := range m.Tokens { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovTokenset(uint64(len(k))) + 1 + sovTokenset(uint64(v)) - n += mapEntrySize + 1 + sovTokenset(uint64(mapEntrySize)) - } - } - return n -} - -func sovTokenset(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozTokenset(x uint64) (n int) { - return sovTokenset(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *TokenSet) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTokenset - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TokenSet: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TokenSet: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Tokens", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTokenset - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTokenset - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTokenset - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Tokens == nil { - m.Tokens = make(map[string]int64) - } - var mapkey string - var mapvalue int64 - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTokenset - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTokenset - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthTokenset - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthTokenset - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTokenset - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapvalue |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - } else { - iNdEx = entryPreIndex - skippy, err := skipTokenset(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTokenset - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.Tokens[mapkey] = mapvalue - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTokenset(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTokenset - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipTokenset(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTokenset - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTokenset - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTokenset - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthTokenset - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupTokenset - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthTokenset - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthTokenset = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTokenset = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupTokenset = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/authmode.go b/lib/config/authmode.go index 0a85e72c88a..0be512f8ec6 100644 --- a/lib/config/authmode.go +++ b/lib/config/authmode.go @@ -6,6 +6,13 @@ package config +type AuthMode int32 + +const ( + AuthModeStatic AuthMode = 0 + AuthModeLDAP AuthMode = 1 +) + func (t AuthMode) String() string { switch t { case AuthModeStatic: diff --git a/lib/config/authmode.pb.go b/lib/config/authmode.pb.go deleted file mode 100644 index 5c85f185ffb..00000000000 --- a/lib/config/authmode.pb.go +++ /dev/null @@ -1,69 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/authmode.proto - -package config - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type AuthMode int32 - -const ( - AuthModeStatic AuthMode = 0 - AuthModeLDAP AuthMode = 1 -) - -var AuthMode_name = map[int32]string{ - 0: "AUTH_MODE_STATIC", - 1: "AUTH_MODE_LDAP", -} - -var AuthMode_value = map[string]int32{ - "AUTH_MODE_STATIC": 0, - "AUTH_MODE_LDAP": 1, -} - -func (AuthMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_8e30b562e1bcea1e, []int{0} -} - -func init() { - proto.RegisterEnum("config.AuthMode", AuthMode_name, AuthMode_value) -} - -func init() { proto.RegisterFile("lib/config/authmode.proto", fileDescriptor_8e30b562e1bcea1e) } - -var fileDescriptor_8e30b562e1bcea1e = []byte{ - // 234 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xc9, 0x4c, 0xd2, - 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x4f, 0x2c, 0x2d, 0xc9, 0xc8, 0xcd, 0x4f, 0x49, 0xd5, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0x08, 0x4b, 0x29, 0x17, 0xa5, 0x16, 0xe4, 0x17, - 0xeb, 0x83, 0x05, 0x93, 0x4a, 0xd3, 0xf4, 0xd3, 0xf3, 0xd3, 0xf3, 0xc1, 0x1c, 0x30, 0x0b, 0xa2, - 0x58, 0x8a, 0x33, 0xb5, 0xa2, 0x04, 0xc2, 0xd4, 0x2a, 0xe0, 0xe2, 0x70, 0x2c, 0x2d, 0xc9, 0xf0, - 0xcd, 0x4f, 0x49, 0x15, 0xd2, 0xe0, 0x12, 0x70, 0x0c, 0x0d, 0xf1, 0x88, 0xf7, 0xf5, 0x77, 0x71, - 0x8d, 0x0f, 0x0e, 0x71, 0x0c, 0xf1, 0x74, 0x16, 0x60, 0x90, 0x12, 0xea, 0x9a, 0xab, 0xc0, 0x07, - 0x53, 0x13, 0x5c, 0x92, 0x58, 0x92, 0x99, 0x2c, 0x64, 0xc2, 0xc5, 0x87, 0x50, 0xe9, 0xe3, 0xe2, - 0x18, 0x20, 0xc0, 0x28, 0xa5, 0xd0, 0x35, 0x57, 0x81, 0x07, 0xa6, 0x0e, 0x24, 0x76, 0xa9, 0x4f, - 0x15, 0x85, 0x2f, 0xc5, 0xb2, 0x62, 0x89, 0x1c, 0x83, 0x93, 0xf7, 0x89, 0x87, 0x72, 0x0c, 0x17, - 0x1e, 0xca, 0x31, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, - 0x0b, 0x1e, 0xcb, 0x31, 0x5e, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x66, 0x7a, - 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x71, 0x65, 0x5e, 0x72, 0x49, 0x46, - 0x66, 0x5e, 0x3a, 0x12, 0x0b, 0x11, 0x0a, 0x49, 0x6c, 0x60, 0x5f, 0x18, 0x03, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x48, 0x80, 0x1f, 0x0c, 0x1a, 0x01, 0x00, 0x00, -} diff --git a/lib/config/blockpullorder.go b/lib/config/blockpullorder.go index 8270c1a6bce..3f2499c7688 100644 --- a/lib/config/blockpullorder.go +++ b/lib/config/blockpullorder.go @@ -6,6 +6,14 @@ package config +type BlockPullOrder int32 + +const ( + BlockPullOrderStandard BlockPullOrder = 0 + BlockPullOrderRandom BlockPullOrder = 1 + BlockPullOrderInOrder BlockPullOrder = 2 +) + func (o BlockPullOrder) String() string { switch o { case BlockPullOrderStandard: diff --git a/lib/config/blockpullorder.pb.go b/lib/config/blockpullorder.pb.go deleted file mode 100644 index 42422adf0e1..00000000000 --- a/lib/config/blockpullorder.pb.go +++ /dev/null @@ -1,73 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/blockpullorder.proto - -package config - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type BlockPullOrder int32 - -const ( - BlockPullOrderStandard BlockPullOrder = 0 - BlockPullOrderRandom BlockPullOrder = 1 - BlockPullOrderInOrder BlockPullOrder = 2 -) - -var BlockPullOrder_name = map[int32]string{ - 0: "BLOCK_PULL_ORDER_STANDARD", - 1: "BLOCK_PULL_ORDER_RANDOM", - 2: "BLOCK_PULL_ORDER_IN_ORDER", -} - -var BlockPullOrder_value = map[string]int32{ - "BLOCK_PULL_ORDER_STANDARD": 0, - "BLOCK_PULL_ORDER_RANDOM": 1, - "BLOCK_PULL_ORDER_IN_ORDER": 2, -} - -func (BlockPullOrder) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_3c46a5289006da6c, []int{0} -} - -func init() { - proto.RegisterEnum("config.BlockPullOrder", BlockPullOrder_name, BlockPullOrder_value) -} - -func init() { proto.RegisterFile("lib/config/blockpullorder.proto", fileDescriptor_3c46a5289006da6c) } - -var fileDescriptor_3c46a5289006da6c = []byte{ - // 271 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0xc9, 0x4c, 0xd2, - 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x4f, 0xca, 0xc9, 0x4f, 0xce, 0x2e, 0x28, 0xcd, 0xc9, - 0xc9, 0x2f, 0x4a, 0x49, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0x48, 0x4a, - 0x29, 0x17, 0xa5, 0x16, 0xe4, 0x17, 0xeb, 0x83, 0x05, 0x93, 0x4a, 0xd3, 0xf4, 0xd3, 0xf3, 0xd3, - 0xf3, 0xc1, 0x1c, 0x30, 0x0b, 0xa2, 0x58, 0xeb, 0x10, 0x23, 0x17, 0x9f, 0x13, 0xc8, 0x94, 0x80, - 0xd2, 0x9c, 0x1c, 0x7f, 0x90, 0x29, 0x42, 0x96, 0x5c, 0x92, 0x4e, 0x3e, 0xfe, 0xce, 0xde, 0xf1, - 0x01, 0xa1, 0x3e, 0x3e, 0xf1, 0xfe, 0x41, 0x2e, 0xae, 0x41, 0xf1, 0xc1, 0x21, 0x8e, 0x7e, 0x2e, - 0x8e, 0x41, 0x2e, 0x02, 0x0c, 0x52, 0x52, 0x5d, 0x73, 0x15, 0xc4, 0x50, 0xb5, 0x04, 0x97, 0x24, - 0xe6, 0xa5, 0x24, 0x16, 0xa5, 0x08, 0x99, 0x72, 0x89, 0x63, 0x68, 0x0d, 0x72, 0xf4, 0x73, 0xf1, - 0xf7, 0x15, 0x60, 0x94, 0x92, 0xe8, 0x9a, 0xab, 0x20, 0x82, 0xaa, 0x31, 0x28, 0x31, 0x2f, 0x25, - 0x3f, 0x57, 0xc8, 0x02, 0x8b, 0x8d, 0x9e, 0x7e, 0x10, 0x86, 0x00, 0x93, 0x94, 0x64, 0xd7, 0x5c, - 0x05, 0x51, 0x54, 0x8d, 0x9e, 0x79, 0x60, 0x4a, 0x8a, 0x65, 0xc5, 0x12, 0x39, 0x06, 0x27, 0xef, - 0x13, 0x0f, 0xe5, 0x18, 0x2e, 0x3c, 0x94, 0x63, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, - 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x16, 0x3c, 0x96, 0x63, 0xbc, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, - 0x39, 0x86, 0x28, 0xcd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe2, - 0xca, 0xbc, 0xe4, 0x92, 0x8c, 0xcc, 0xbc, 0x74, 0x24, 0x16, 0x22, 0x4c, 0x93, 0xd8, 0xc0, 0x01, - 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x0c, 0xb7, 0x46, 0x68, 0x01, 0x00, 0x00, -} diff --git a/lib/config/compression.go b/lib/config/compression.go new file mode 100644 index 00000000000..1bdab7b443c --- /dev/null +++ b/lib/config/compression.go @@ -0,0 +1,58 @@ +// Copyright (C) 2015 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package config + +import ( + "github.com/syncthing/syncthing/lib/protocol" +) + +type Compression int32 + +const ( + CompressionMetadata Compression = 0 + CompressionNever Compression = 1 + CompressionAlways Compression = 2 +) + +var compressionMarshal = map[Compression]string{ + CompressionNever: "never", + CompressionMetadata: "metadata", + CompressionAlways: "always", +} + +var compressionUnmarshal = map[string]Compression{ + // Legacy + "false": CompressionNever, + "true": CompressionMetadata, + + // Current + "never": CompressionNever, + "metadata": CompressionMetadata, + "always": CompressionAlways, +} + +func (c Compression) MarshalText() ([]byte, error) { + return []byte(compressionMarshal[c]), nil +} + +func (c *Compression) UnmarshalText(bs []byte) error { + *c = compressionUnmarshal[string(bs)] + return nil +} + +func (c Compression) ToProtocol() protocol.Compression { + switch c { + case CompressionNever: + return protocol.CompressionNever + case CompressionAlways: + return protocol.CompressionAlways + case CompressionMetadata: + return protocol.CompressionMetadata + default: + return protocol.CompressionMetadata + } +} diff --git a/lib/protocol/compression_test.go b/lib/config/compression_test.go similarity index 98% rename from lib/protocol/compression_test.go rename to lib/config/compression_test.go index 9edb85319ec..924e6a4abd7 100644 --- a/lib/protocol/compression_test.go +++ b/lib/config/compression_test.go @@ -1,6 +1,6 @@ // Copyright (C) 2015 The Protocol Authors. -package protocol +package config import "testing" diff --git a/lib/config/config.go b/lib/config/config.go index 8a1cfbe9bcc..a16c8923d91 100644 --- a/lib/config/config.go +++ b/lib/config/config.go @@ -99,6 +99,28 @@ var ( errFolderPathEmpty = errors.New("folder has empty path") ) +type Configuration struct { + Version int `json:"version" xml:"version,attr"` + Folders []FolderConfiguration `json:"folders" xml:"folder"` + Devices []DeviceConfiguration `json:"devices" xml:"device"` + GUI GUIConfiguration `json:"gui" xml:"gui"` + LDAP LDAPConfiguration `json:"ldap" xml:"ldap"` + Options OptionsConfiguration `json:"options" xml:"options"` + IgnoredDevices []ObservedDevice `json:"remoteIgnoredDevices" xml:"remoteIgnoredDevice"` + DeprecatedPendingDevices []ObservedDevice `json:"-" xml:"pendingDevice,omitempty"` // Deprecated: Do not use. + Defaults Defaults `json:"defaults" xml:"defaults"` +} + +type Defaults struct { + Folder FolderConfiguration `json:"folder" xml:"folder"` + Device DeviceConfiguration `json:"device" xml:"device"` + Ignores Ignores `json:"ignores" xml:"ignores"` +} + +type Ignores struct { + Lines []string `json:"lines" xml:"line"` +} + func New(myID protocol.DeviceID) Configuration { var cfg Configuration cfg.Version = CurrentVersion diff --git a/lib/config/config.pb.go b/lib/config/config.pb.go deleted file mode 100644 index 57a3e9b38c0..00000000000 --- a/lib/config/config.pb.go +++ /dev/null @@ -1,1155 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/config.proto - -package config - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Configuration struct { - Version int `protobuf:"varint,1,opt,name=version,proto3,casttype=int" json:"version" xml:"version,attr"` - Folders []FolderConfiguration `protobuf:"bytes,2,rep,name=folders,proto3" json:"folders" xml:"folder"` - Devices []DeviceConfiguration `protobuf:"bytes,3,rep,name=devices,proto3" json:"devices" xml:"device"` - GUI GUIConfiguration `protobuf:"bytes,4,opt,name=gui,proto3" json:"gui" xml:"gui"` - LDAP LDAPConfiguration `protobuf:"bytes,5,opt,name=ldap,proto3" json:"ldap" xml:"ldap"` - Options OptionsConfiguration `protobuf:"bytes,6,opt,name=options,proto3" json:"options" xml:"options"` - IgnoredDevices []ObservedDevice `protobuf:"bytes,7,rep,name=ignored_devices,json=ignoredDevices,proto3" json:"remoteIgnoredDevices" xml:"remoteIgnoredDevice"` - DeprecatedPendingDevices []ObservedDevice `protobuf:"bytes,8,rep,name=pending_devices,json=pendingDevices,proto3" json:"-" xml:"pendingDevice,omitempty"` // Deprecated: Do not use. - Defaults Defaults `protobuf:"bytes,9,opt,name=defaults,proto3" json:"defaults" xml:"defaults"` -} - -func (m *Configuration) Reset() { *m = Configuration{} } -func (m *Configuration) String() string { return proto.CompactTextString(m) } -func (*Configuration) ProtoMessage() {} -func (*Configuration) Descriptor() ([]byte, []int) { - return fileDescriptor_baadf209193dc627, []int{0} -} -func (m *Configuration) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Configuration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Configuration.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Configuration) XXX_Merge(src proto.Message) { - xxx_messageInfo_Configuration.Merge(m, src) -} -func (m *Configuration) XXX_Size() int { - return m.ProtoSize() -} -func (m *Configuration) XXX_DiscardUnknown() { - xxx_messageInfo_Configuration.DiscardUnknown(m) -} - -var xxx_messageInfo_Configuration proto.InternalMessageInfo - -type Defaults struct { - Folder FolderConfiguration `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder" xml:"folder"` - Device DeviceConfiguration `protobuf:"bytes,2,opt,name=device,proto3" json:"device" xml:"device"` - Ignores Ignores `protobuf:"bytes,3,opt,name=ignores,proto3" json:"ignores" xml:"ignores"` -} - -func (m *Defaults) Reset() { *m = Defaults{} } -func (m *Defaults) String() string { return proto.CompactTextString(m) } -func (*Defaults) ProtoMessage() {} -func (*Defaults) Descriptor() ([]byte, []int) { - return fileDescriptor_baadf209193dc627, []int{1} -} -func (m *Defaults) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Defaults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Defaults.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Defaults) XXX_Merge(src proto.Message) { - xxx_messageInfo_Defaults.Merge(m, src) -} -func (m *Defaults) XXX_Size() int { - return m.ProtoSize() -} -func (m *Defaults) XXX_DiscardUnknown() { - xxx_messageInfo_Defaults.DiscardUnknown(m) -} - -var xxx_messageInfo_Defaults proto.InternalMessageInfo - -type Ignores struct { - Lines []string `protobuf:"bytes,1,rep,name=lines,proto3" json:"lines" xml:"line"` -} - -func (m *Ignores) Reset() { *m = Ignores{} } -func (m *Ignores) String() string { return proto.CompactTextString(m) } -func (*Ignores) ProtoMessage() {} -func (*Ignores) Descriptor() ([]byte, []int) { - return fileDescriptor_baadf209193dc627, []int{2} -} -func (m *Ignores) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Ignores) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Ignores.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Ignores) XXX_Merge(src proto.Message) { - xxx_messageInfo_Ignores.Merge(m, src) -} -func (m *Ignores) XXX_Size() int { - return m.ProtoSize() -} -func (m *Ignores) XXX_DiscardUnknown() { - xxx_messageInfo_Ignores.DiscardUnknown(m) -} - -var xxx_messageInfo_Ignores proto.InternalMessageInfo - -func init() { - proto.RegisterType((*Configuration)(nil), "config.Configuration") - proto.RegisterType((*Defaults)(nil), "config.Defaults") - proto.RegisterType((*Ignores)(nil), "config.Ignores") -} - -func init() { proto.RegisterFile("lib/config/config.proto", fileDescriptor_baadf209193dc627) } - -var fileDescriptor_baadf209193dc627 = []byte{ - // 709 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x4b, 0x6f, 0xd3, 0x40, - 0x10, 0xc7, 0xe3, 0xa6, 0x8d, 0x9b, 0xed, 0x0b, 0x19, 0x44, 0x5d, 0x1e, 0xde, 0xb0, 0x0a, 0x28, - 0xa0, 0x3e, 0xa4, 0x72, 0xa9, 0xb8, 0x11, 0x22, 0x4a, 0x55, 0x24, 0x2a, 0xa3, 0x22, 0xe0, 0x82, - 0x92, 0x78, 0xeb, 0xae, 0x94, 0xd8, 0x96, 0xed, 0x54, 0xed, 0x91, 0x23, 0x37, 0xc4, 0x27, 0xe0, - 0x84, 0xc4, 0x37, 0xe9, 0xad, 0x39, 0x72, 0x5a, 0xa9, 0xcd, 0xcd, 0x47, 0x1f, 0x39, 0xa1, 0x7d, - 0x39, 0xb6, 0x6a, 0xe0, 0x94, 0xcc, 0xfc, 0xff, 0xf3, 0xdb, 0xd5, 0xec, 0x8c, 0xc1, 0xea, 0x80, - 0xf4, 0xb6, 0xfa, 0xbe, 0x77, 0x44, 0x5c, 0xf9, 0xb3, 0x19, 0x84, 0x7e, 0xec, 0x1b, 0x35, 0x11, - 0xdd, 0x69, 0xe6, 0x0c, 0x47, 0xfe, 0xc0, 0xc1, 0xa1, 0x08, 0x46, 0x61, 0x37, 0x26, 0xbe, 0x27, - 0xdc, 0x05, 0x97, 0x83, 0x4f, 0x48, 0x1f, 0x97, 0xb9, 0x1e, 0xe4, 0x5c, 0xee, 0x88, 0x94, 0x59, - 0x50, 0xce, 0x32, 0x70, 0xba, 0x41, 0x99, 0xe7, 0x61, 0xce, 0xe3, 0x07, 0x4c, 0x88, 0xca, 0x6c, - 0x6b, 0x79, 0x5b, 0x2f, 0xc2, 0xe1, 0x09, 0x76, 0xa4, 0x54, 0xc7, 0xa7, 0xb1, 0xf8, 0x8b, 0x7e, - 0xe8, 0x60, 0xe9, 0x45, 0xbe, 0xda, 0xb0, 0x81, 0x7e, 0x82, 0xc3, 0x88, 0xf8, 0x9e, 0xa9, 0x35, - 0xb4, 0xd6, 0x5c, 0x7b, 0x27, 0xa1, 0x50, 0xa5, 0x52, 0x0a, 0x8d, 0xd3, 0xe1, 0xe0, 0x19, 0x92, - 0xf1, 0x7a, 0x37, 0x8e, 0x43, 0xf4, 0x9b, 0xc2, 0x2a, 0xf1, 0xe2, 0xe4, 0xa2, 0xb9, 0x98, 0xcf, - 0xdb, 0xaa, 0xca, 0x78, 0x07, 0x74, 0xd1, 0xbc, 0xc8, 0x9c, 0x69, 0x54, 0x5b, 0x0b, 0xdb, 0x77, - 0x37, 0x65, 0xb7, 0x5f, 0xf2, 0x74, 0xe1, 0x06, 0x6d, 0x78, 0x4e, 0x61, 0x85, 0x1d, 0x2a, 0x6b, - 0x52, 0x0a, 0x17, 0xf9, 0xa1, 0x22, 0x46, 0xb6, 0x12, 0x18, 0x57, 0xb4, 0x3b, 0x32, 0xab, 0x45, - 0x6e, 0x87, 0xa7, 0xff, 0xc2, 0x95, 0x35, 0x19, 0x57, 0xc4, 0xc8, 0x56, 0x82, 0x61, 0x83, 0xaa, - 0x3b, 0x22, 0xe6, 0x6c, 0x43, 0x6b, 0x2d, 0x6c, 0x9b, 0x8a, 0xb9, 0x7b, 0xb8, 0x57, 0x04, 0x3e, - 0x62, 0xc0, 0x2b, 0x0a, 0xab, 0xbb, 0x87, 0x7b, 0x09, 0x85, 0xac, 0x26, 0xa5, 0xb0, 0xce, 0x99, - 0xee, 0x88, 0xa0, 0x6f, 0xe3, 0x26, 0x93, 0x6c, 0x26, 0x18, 0x1f, 0xc0, 0x2c, 0x7b, 0x51, 0x73, - 0x8e, 0x43, 0xd7, 0x14, 0xf4, 0x75, 0xe7, 0xf9, 0x41, 0x91, 0xfa, 0x44, 0x52, 0x67, 0x99, 0x94, - 0x50, 0xc8, 0xcb, 0x52, 0x0a, 0x01, 0xe7, 0xb2, 0x80, 0x81, 0xb9, 0x6a, 0x73, 0xcd, 0x78, 0x0f, - 0x74, 0x39, 0x08, 0x66, 0x8d, 0xd3, 0xef, 0x29, 0xfa, 0x1b, 0x91, 0x2e, 0x1e, 0xd0, 0x50, 0x7d, - 0x90, 0x45, 0x29, 0x85, 0x4b, 0x9c, 0x2d, 0x63, 0x64, 0x2b, 0xc5, 0xf8, 0xa9, 0x81, 0x15, 0xe2, - 0x7a, 0x7e, 0x88, 0x9d, 0x4f, 0xaa, 0xd3, 0x3a, 0xef, 0xf4, 0xed, 0xec, 0x08, 0x39, 0x5b, 0xa2, - 0xe3, 0xed, 0x63, 0x09, 0xbf, 0x15, 0xe2, 0xa1, 0x1f, 0xe3, 0x3d, 0x51, 0xdc, 0xc9, 0x3a, 0xbe, - 0xc6, 0x4f, 0x2a, 0x11, 0x51, 0x72, 0xd1, 0xbc, 0x59, 0x92, 0x4f, 0x2f, 0x9a, 0xa5, 0x2c, 0x7b, - 0x99, 0x14, 0x62, 0xe3, 0x8b, 0x06, 0x56, 0x02, 0xec, 0x39, 0xc4, 0x73, 0xb3, 0xbb, 0xce, 0xff, - 0xf3, 0xae, 0xaf, 0x64, 0xa7, 0xcd, 0x0e, 0x0e, 0x42, 0xdc, 0xef, 0xc6, 0xd8, 0x39, 0x10, 0x00, - 0xc9, 0x4c, 0x28, 0xd4, 0x36, 0x52, 0x0a, 0xef, 0xf3, 0x4b, 0x07, 0x79, 0x6d, 0xdd, 0x1f, 0x92, - 0x18, 0x0f, 0x83, 0xf8, 0x0c, 0x99, 0x9a, 0xbd, 0x5c, 0xd0, 0x22, 0xe3, 0x00, 0xcc, 0x3b, 0xf8, - 0xa8, 0x3b, 0x1a, 0xc4, 0x91, 0x59, 0xe7, 0x4f, 0x72, 0x63, 0x3a, 0x99, 0x22, 0xdf, 0x46, 0xb2, - 0x53, 0x99, 0x33, 0xa5, 0x70, 0x59, 0xce, 0xa3, 0x48, 0x20, 0x3b, 0xd3, 0xd0, 0xe7, 0x19, 0x30, - 0xaf, 0x4a, 0x8d, 0xb7, 0xa0, 0x26, 0x56, 0x80, 0xaf, 0xe8, 0x7f, 0xd6, 0xc9, 0x92, 0xe7, 0xc8, - 0x92, 0x6b, 0xdb, 0x24, 0xf3, 0x0c, 0x2a, 0xda, 0x66, 0xce, 0x14, 0xa1, 0x65, 0xbb, 0x94, 0x41, - 0x45, 0xc9, 0xb5, 0x55, 0x92, 0x79, 0x63, 0x1f, 0xe8, 0xe2, 0x99, 0xd8, 0x86, 0x32, 0xea, 0x8a, - 0xa2, 0x8a, 0xd7, 0x8c, 0xa6, 0xd3, 0x28, 0x7d, 0xd9, 0x34, 0xca, 0x18, 0xd9, 0x4a, 0x41, 0x3b, - 0x40, 0x97, 0x55, 0xc6, 0x06, 0x98, 0x1b, 0x10, 0x0f, 0x47, 0xa6, 0xd6, 0xa8, 0xb6, 0xea, 0xed, - 0xd5, 0x84, 0x42, 0x91, 0x98, 0x2e, 0x0a, 0xf1, 0x30, 0xb2, 0x45, 0xb2, 0xbd, 0x7f, 0x7e, 0x69, - 0x55, 0xc6, 0x97, 0x56, 0xe5, 0xfc, 0xca, 0xd2, 0xc6, 0x57, 0x96, 0xf6, 0x75, 0x62, 0x55, 0xbe, - 0x4f, 0x2c, 0x6d, 0x3c, 0xb1, 0x2a, 0xbf, 0x26, 0x56, 0xe5, 0xe3, 0x63, 0x97, 0xc4, 0xc7, 0xa3, - 0xde, 0x66, 0xdf, 0x1f, 0x6e, 0x45, 0x67, 0x5e, 0x3f, 0x3e, 0x26, 0x9e, 0x9b, 0xfb, 0x37, 0xfd, - 0x9a, 0xf6, 0x6a, 0xfc, 0xd3, 0xf9, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0x7d, 0xcb, - 0x2a, 0x3d, 0x06, 0x00, 0x00, -} - -func (m *Configuration) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Configuration) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Configuration) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size, err := m.Defaults.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - if len(m.DeprecatedPendingDevices) > 0 { - for iNdEx := len(m.DeprecatedPendingDevices) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.DeprecatedPendingDevices[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - } - } - if len(m.IgnoredDevices) > 0 { - for iNdEx := len(m.IgnoredDevices) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.IgnoredDevices[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - } - } - { - size, err := m.Options.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - { - size, err := m.LDAP.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - { - size, err := m.GUI.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - if len(m.Devices) > 0 { - for iNdEx := len(m.Devices) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Devices[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - } - if len(m.Folders) > 0 { - for iNdEx := len(m.Folders) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Folders[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Version != 0 { - i = encodeVarintConfig(dAtA, i, uint64(m.Version)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *Defaults) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Defaults) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Defaults) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size, err := m.Ignores.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - { - size, err := m.Device.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - { - size, err := m.Folder.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintConfig(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *Ignores) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Ignores) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Ignores) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Lines) > 0 { - for iNdEx := len(m.Lines) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Lines[iNdEx]) - copy(dAtA[i:], m.Lines[iNdEx]) - i = encodeVarintConfig(dAtA, i, uint64(len(m.Lines[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { - offset -= sovConfig(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Configuration) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Version != 0 { - n += 1 + sovConfig(uint64(m.Version)) - } - if len(m.Folders) > 0 { - for _, e := range m.Folders { - l = e.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - } - } - if len(m.Devices) > 0 { - for _, e := range m.Devices { - l = e.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - } - } - l = m.GUI.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - l = m.LDAP.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - l = m.Options.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - if len(m.IgnoredDevices) > 0 { - for _, e := range m.IgnoredDevices { - l = e.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - } - } - if len(m.DeprecatedPendingDevices) > 0 { - for _, e := range m.DeprecatedPendingDevices { - l = e.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - } - } - l = m.Defaults.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - return n -} - -func (m *Defaults) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.Folder.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - l = m.Device.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - l = m.Ignores.ProtoSize() - n += 1 + l + sovConfig(uint64(l)) - return n -} - -func (m *Ignores) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Lines) > 0 { - for _, s := range m.Lines { - l = len(s) - n += 1 + l + sovConfig(uint64(l)) - } - } - return n -} - -func sovConfig(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozConfig(x uint64) (n int) { - return sovConfig(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Configuration) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Configuration: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Configuration: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) - } - m.Version = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Version |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Folders", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Folders = append(m.Folders, FolderConfiguration{}) - if err := m.Folders[len(m.Folders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Devices", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Devices = append(m.Devices, DeviceConfiguration{}) - if err := m.Devices[len(m.Devices)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GUI", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.GUI.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LDAP", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.LDAP.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Options", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Options.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IgnoredDevices", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.IgnoredDevices = append(m.IgnoredDevices, ObservedDevice{}) - if err := m.IgnoredDevices[len(m.IgnoredDevices)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedPendingDevices", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DeprecatedPendingDevices = append(m.DeprecatedPendingDevices, ObservedDevice{}) - if err := m.DeprecatedPendingDevices[len(m.DeprecatedPendingDevices)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Defaults", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Defaults.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Defaults) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Defaults: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Defaults: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Folder", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Folder.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Device", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Device.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ignores", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Ignores.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Ignores) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Ignores: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Ignores: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Lines", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthConfig - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Lines = append(m.Lines, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipConfig(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthConfig - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipConfig(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowConfig - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthConfig - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupConfig - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthConfig - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthConfig = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowConfig = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupConfig = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/config_test.go b/lib/config/config_test.go index 2b02967ab15..14ef5330878 100644 --- a/lib/config/config_test.go +++ b/lib/config/config_test.go @@ -100,7 +100,7 @@ func TestDefaultValues(t *testing.T) { }, Defaults: Defaults{ Folder: FolderConfiguration{ - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: FilesystemTypeBasic, Path: "~", Type: FolderTypeSendReceive, Devices: []FolderDeviceConfiguration{{DeviceID: device1}}, @@ -127,7 +127,7 @@ func TestDefaultValues(t *testing.T) { Device: DeviceConfiguration{ Addresses: []string{"dynamic"}, AllowedNetworks: []string{}, - Compression: protocol.CompressionMetadata, + Compression: CompressionMetadata, IgnoredFolders: []ObservedFolder{}, }, Ignores: Ignores{ @@ -175,7 +175,7 @@ func TestDeviceConfig(t *testing.T) { expectedFolders := []FolderConfiguration{ { ID: "test", - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: FilesystemTypeBasic, Path: "testdata", Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}}, Type: FolderTypeSendOnly, @@ -205,7 +205,7 @@ func TestDeviceConfig(t *testing.T) { DeviceID: device1, Name: "node one", Addresses: []string{"tcp://a"}, - Compression: protocol.CompressionMetadata, + Compression: CompressionMetadata, AllowedNetworks: []string{}, IgnoredFolders: []ObservedFolder{}, }, @@ -213,7 +213,7 @@ func TestDeviceConfig(t *testing.T) { DeviceID: device4, Name: "node two", Addresses: []string{"tcp://b"}, - Compression: protocol.CompressionMetadata, + Compression: CompressionMetadata, AllowedNetworks: []string{}, IgnoredFolders: []ObservedFolder{}, }, @@ -344,7 +344,7 @@ func TestDeviceAddressesDynamic(t *testing.T) { DeviceID: device4, Name: name, // Set when auto created Addresses: []string{"dynamic"}, - Compression: protocol.CompressionMetadata, + Compression: CompressionMetadata, AllowedNetworks: []string{}, IgnoredFolders: []ObservedFolder{}, }, @@ -368,21 +368,21 @@ func TestDeviceCompression(t *testing.T) { device1: { DeviceID: device1, Addresses: []string{"dynamic"}, - Compression: protocol.CompressionMetadata, + Compression: CompressionMetadata, AllowedNetworks: []string{}, IgnoredFolders: []ObservedFolder{}, }, device2: { DeviceID: device2, Addresses: []string{"dynamic"}, - Compression: protocol.CompressionMetadata, + Compression: CompressionMetadata, AllowedNetworks: []string{}, IgnoredFolders: []ObservedFolder{}, }, device3: { DeviceID: device3, Addresses: []string{"dynamic"}, - Compression: protocol.CompressionNever, + Compression: CompressionNever, AllowedNetworks: []string{}, IgnoredFolders: []ObservedFolder{}, }, @@ -390,7 +390,7 @@ func TestDeviceCompression(t *testing.T) { DeviceID: device4, Name: name, // Set when auto created Addresses: []string{"dynamic"}, - Compression: protocol.CompressionMetadata, + Compression: CompressionMetadata, AllowedNetworks: []string{}, IgnoredFolders: []ObservedFolder{}, }, @@ -433,7 +433,7 @@ func TestDeviceAddressesStatic(t *testing.T) { DeviceID: device4, Name: name, // Set when auto created Addresses: []string{"dynamic"}, - Compression: protocol.CompressionMetadata, + Compression: CompressionMetadata, AllowedNetworks: []string{}, IgnoredFolders: []ObservedFolder{}, }, @@ -556,7 +556,7 @@ func TestFolderCheckPath(t *testing.T) { for _, testcase := range testcases { cfg := FolderConfiguration{ - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: FilesystemTypeFake, MarkerName: DefaultMarkerName, } @@ -1281,7 +1281,7 @@ func adjustDeviceConfiguration(cfg *DeviceConfiguration, id protocol.DeviceID, n func adjustFolderConfiguration(cfg *FolderConfiguration, id, label string, fsType fs.FilesystemType, path string) { cfg.ID = id cfg.Label = label - cfg.FilesystemType = fsType + cfg.FilesystemType = FilesystemType(fsType) cfg.Path = path } diff --git a/lib/config/copyrangemethod.go b/lib/config/copyrangemethod.go new file mode 100644 index 00000000000..891b89a5ae2 --- /dev/null +++ b/lib/config/copyrangemethod.go @@ -0,0 +1,86 @@ +// Copyright (C) 2020 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package config + +import "github.com/syncthing/syncthing/lib/fs" + +type CopyRangeMethod int32 + +const ( + CopyRangeMethodStandard CopyRangeMethod = 0 + CopyRangeMethodIoctl CopyRangeMethod = 1 + CopyRangeMethodCopyFileRange CopyRangeMethod = 2 + CopyRangeMethodSendFile CopyRangeMethod = 3 + CopyRangeMethodDuplicateExtents CopyRangeMethod = 4 + CopyRangeMethodAllWithFallback CopyRangeMethod = 5 +) + +func (o CopyRangeMethod) String() string { + switch o { + case CopyRangeMethodStandard: + return "standard" + case CopyRangeMethodIoctl: + return "ioctl" + case CopyRangeMethodCopyFileRange: + return "copy_file_range" + case CopyRangeMethodSendFile: + return "sendfile" + case CopyRangeMethodDuplicateExtents: + return "duplicate_extents" + case CopyRangeMethodAllWithFallback: + return "all" + default: + return "unknown" + } +} + +func (o CopyRangeMethod) ToFS() fs.CopyRangeMethod { + switch o { + case CopyRangeMethodStandard: + return fs.CopyRangeMethodStandard + case CopyRangeMethodIoctl: + return fs.CopyRangeMethodIoctl + case CopyRangeMethodCopyFileRange: + return fs.CopyRangeMethodCopyFileRange + case CopyRangeMethodSendFile: + return fs.CopyRangeMethodSendFile + case CopyRangeMethodDuplicateExtents: + return fs.CopyRangeMethodDuplicateExtents + case CopyRangeMethodAllWithFallback: + return fs.CopyRangeMethodAllWithFallback + default: + return fs.CopyRangeMethodStandard + } +} + +func (o CopyRangeMethod) MarshalText() ([]byte, error) { + return []byte(o.String()), nil +} + +func (o *CopyRangeMethod) UnmarshalText(bs []byte) error { + switch string(bs) { + case "standard": + *o = CopyRangeMethodStandard + case "ioctl": + *o = CopyRangeMethodIoctl + case "copy_file_range": + *o = CopyRangeMethodCopyFileRange + case "sendfile": + *o = CopyRangeMethodSendFile + case "duplicate_extents": + *o = CopyRangeMethodDuplicateExtents + case "all": + *o = CopyRangeMethodAllWithFallback + default: + *o = CopyRangeMethodStandard + } + return nil +} + +func (o *CopyRangeMethod) ParseDefault(str string) error { + return o.UnmarshalText([]byte(str)) +} diff --git a/lib/config/deviceconfiguration.go b/lib/config/deviceconfiguration.go index 8635bcc39cf..d9172276431 100644 --- a/lib/config/deviceconfiguration.go +++ b/lib/config/deviceconfiguration.go @@ -9,10 +9,34 @@ package config import ( "fmt" "sort" + + "github.com/syncthing/syncthing/lib/protocol" ) const defaultNumConnections = 1 // number of connections to use by default; may change in the future. +type DeviceConfiguration struct { + DeviceID protocol.DeviceID `json:"deviceID" xml:"id,attr" nodefault:"true"` + Name string `json:"name" xml:"name,attr,omitempty"` + Addresses []string `json:"addresses" xml:"address,omitempty"` + Compression Compression `json:"compression" xml:"compression,attr"` + CertName string `json:"certName" xml:"certName,attr,omitempty"` + Introducer bool `json:"introducer" xml:"introducer,attr"` + SkipIntroductionRemovals bool `json:"skipIntroductionRemovals" xml:"skipIntroductionRemovals,attr"` + IntroducedBy protocol.DeviceID `json:"introducedBy" xml:"introducedBy,attr" nodefault:"true"` + Paused bool `json:"paused" xml:"paused"` + AllowedNetworks []string `json:"allowedNetworks" xml:"allowedNetwork,omitempty"` + AutoAcceptFolders bool `json:"autoAcceptFolders" xml:"autoAcceptFolders"` + MaxSendKbps int `json:"maxSendKbps" xml:"maxSendKbps"` + MaxRecvKbps int `json:"maxRecvKbps" xml:"maxRecvKbps"` + IgnoredFolders []ObservedFolder `json:"ignoredFolders" xml:"ignoredFolder"` + DeprecatedPendingFolders []ObservedFolder `json:"-" xml:"pendingFolder,omitempty"` // Deprecated: Do not use. + MaxRequestKiB int `json:"maxRequestKiB" xml:"maxRequestKiB"` + Untrusted bool `json:"untrusted" xml:"untrusted"` + RemoteGUIPort int `json:"remoteGUIPort" xml:"remoteGUIPort"` + RawNumConnections int `json:"numConnections" xml:"numConnections"` +} + func (cfg DeviceConfiguration) Copy() DeviceConfiguration { c := cfg c.Addresses = make([]string, len(cfg.Addresses)) diff --git a/lib/config/deviceconfiguration.pb.go b/lib/config/deviceconfiguration.pb.go deleted file mode 100644 index 1f5d2a1a22a..00000000000 --- a/lib/config/deviceconfiguration.pb.go +++ /dev/null @@ -1,1057 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/deviceconfiguration.proto - -package config - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - github_com_syncthing_syncthing_lib_protocol "github.com/syncthing/syncthing/lib/protocol" - protocol "github.com/syncthing/syncthing/lib/protocol" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type DeviceConfiguration struct { - DeviceID github_com_syncthing_syncthing_lib_protocol.DeviceID `protobuf:"bytes,1,opt,name=device_id,json=deviceId,proto3,customtype=github.com/syncthing/syncthing/lib/protocol.DeviceID" json:"deviceID" xml:"id,attr" nodefault:"true"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name" xml:"name,attr,omitempty"` - Addresses []string `protobuf:"bytes,3,rep,name=addresses,proto3" json:"addresses" xml:"address,omitempty"` - Compression protocol.Compression `protobuf:"varint,4,opt,name=compression,proto3,enum=protocol.Compression" json:"compression" xml:"compression,attr"` - CertName string `protobuf:"bytes,5,opt,name=cert_name,json=certName,proto3" json:"certName" xml:"certName,attr,omitempty"` - Introducer bool `protobuf:"varint,6,opt,name=introducer,proto3" json:"introducer" xml:"introducer,attr"` - SkipIntroductionRemovals bool `protobuf:"varint,7,opt,name=skip_introduction_removals,json=skipIntroductionRemovals,proto3" json:"skipIntroductionRemovals" xml:"skipIntroductionRemovals,attr"` - IntroducedBy github_com_syncthing_syncthing_lib_protocol.DeviceID `protobuf:"bytes,8,opt,name=introduced_by,json=introducedBy,proto3,customtype=github.com/syncthing/syncthing/lib/protocol.DeviceID" json:"introducedBy" xml:"introducedBy,attr" nodefault:"true"` - Paused bool `protobuf:"varint,9,opt,name=paused,proto3" json:"paused" xml:"paused"` - AllowedNetworks []string `protobuf:"bytes,10,rep,name=allowed_networks,json=allowedNetworks,proto3" json:"allowedNetworks" xml:"allowedNetwork,omitempty"` - AutoAcceptFolders bool `protobuf:"varint,11,opt,name=auto_accept_folders,json=autoAcceptFolders,proto3" json:"autoAcceptFolders" xml:"autoAcceptFolders"` - MaxSendKbps int `protobuf:"varint,12,opt,name=max_send_kbps,json=maxSendKbps,proto3,casttype=int" json:"maxSendKbps" xml:"maxSendKbps"` - MaxRecvKbps int `protobuf:"varint,13,opt,name=max_recv_kbps,json=maxRecvKbps,proto3,casttype=int" json:"maxRecvKbps" xml:"maxRecvKbps"` - IgnoredFolders []ObservedFolder `protobuf:"bytes,14,rep,name=ignored_folders,json=ignoredFolders,proto3" json:"ignoredFolders" xml:"ignoredFolder"` - DeprecatedPendingFolders []ObservedFolder `protobuf:"bytes,15,rep,name=pending_folders,json=pendingFolders,proto3" json:"-" xml:"pendingFolder,omitempty"` // Deprecated: Do not use. - MaxRequestKiB int `protobuf:"varint,16,opt,name=max_request_kib,json=maxRequestKib,proto3,casttype=int" json:"maxRequestKiB" xml:"maxRequestKiB"` - Untrusted bool `protobuf:"varint,17,opt,name=untrusted,proto3" json:"untrusted" xml:"untrusted"` - RemoteGUIPort int `protobuf:"varint,18,opt,name=remote_gui_port,json=remoteGuiPort,proto3,casttype=int" json:"remoteGUIPort" xml:"remoteGUIPort"` - RawNumConnections int `protobuf:"varint,19,opt,name=num_connections,json=numConnections,proto3,casttype=int" json:"numConnections" xml:"numConnections"` -} - -func (m *DeviceConfiguration) Reset() { *m = DeviceConfiguration{} } -func (m *DeviceConfiguration) String() string { return proto.CompactTextString(m) } -func (*DeviceConfiguration) ProtoMessage() {} -func (*DeviceConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_744b782bd13071dd, []int{0} -} -func (m *DeviceConfiguration) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DeviceConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DeviceConfiguration.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DeviceConfiguration) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeviceConfiguration.Merge(m, src) -} -func (m *DeviceConfiguration) XXX_Size() int { - return m.ProtoSize() -} -func (m *DeviceConfiguration) XXX_DiscardUnknown() { - xxx_messageInfo_DeviceConfiguration.DiscardUnknown(m) -} - -var xxx_messageInfo_DeviceConfiguration proto.InternalMessageInfo - -func init() { - proto.RegisterType((*DeviceConfiguration)(nil), "config.DeviceConfiguration") -} - -func init() { - proto.RegisterFile("lib/config/deviceconfiguration.proto", fileDescriptor_744b782bd13071dd) -} - -var fileDescriptor_744b782bd13071dd = []byte{ - // 1057 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0x8e, 0xe9, 0x6e, 0xb7, 0x99, 0x6d, 0x9b, 0xc6, 0x65, 0xbb, 0xde, 0x4a, 0x9b, 0x89, 0x42, - 0x0e, 0x41, 0xec, 0xa6, 0xa8, 0x70, 0xaa, 0x00, 0x89, 0xb4, 0x82, 0xad, 0x2a, 0xba, 0x65, 0x10, - 0x97, 0xdd, 0x83, 0x71, 0x3c, 0xd3, 0xac, 0xd5, 0x78, 0xc6, 0xd8, 0xe3, 0xb4, 0x95, 0x38, 0x72, - 0x80, 0x1b, 0xaa, 0xc4, 0x89, 0xcb, 0xc2, 0xdf, 0xe0, 0xc0, 0xb5, 0xb7, 0xe6, 0x08, 0x1c, 0x46, - 0xda, 0xf4, 0xe6, 0xa3, 0x8f, 0x9c, 0xd0, 0x8c, 0x1d, 0xc7, 0x76, 0x37, 0x2b, 0x24, 0x6e, 0x9e, - 0xef, 0x7b, 0xf3, 0x7d, 0xf3, 0x9e, 0xdf, 0x9b, 0x01, 0xed, 0xa1, 0xd3, 0xdf, 0xb2, 0x19, 0x3d, - 0x76, 0x06, 0x5b, 0x98, 0x8c, 0x1c, 0x9b, 0x24, 0x8b, 0xd0, 0xb7, 0xb8, 0xc3, 0x68, 0xd7, 0xf3, - 0x19, 0x67, 0xfa, 0x62, 0x02, 0x6e, 0x6e, 0xc8, 0x68, 0x05, 0xd9, 0x6c, 0xb8, 0xd5, 0x27, 0x5e, - 0xc2, 0x6f, 0x3e, 0xc8, 0xa9, 0xb0, 0x7e, 0x40, 0xfc, 0x11, 0xc1, 0x29, 0x55, 0x25, 0x67, 0x3c, - 0xf9, 0x6c, 0xfd, 0x55, 0x07, 0xeb, 0x7b, 0xca, 0x63, 0x37, 0xef, 0xa1, 0xff, 0xa1, 0x81, 0x6a, - 0xe2, 0x6d, 0x3a, 0xd8, 0xd0, 0x9a, 0x5a, 0x67, 0xb9, 0xf7, 0xab, 0x76, 0x29, 0x60, 0xe5, 0x6f, - 0x01, 0x3f, 0x1c, 0x38, 0xfc, 0x45, 0xd8, 0xef, 0xda, 0xcc, 0xdd, 0x0a, 0xce, 0xa9, 0xcd, 0x5f, - 0x38, 0x74, 0x90, 0xfb, 0xca, 0x9f, 0xa8, 0x9b, 0xa8, 0xef, 0xef, 0x4d, 0x04, 0x5c, 0x9a, 0x7e, - 0x47, 0x02, 0x2e, 0xe1, 0xf4, 0x3b, 0x16, 0xb0, 0x71, 0xe6, 0x0e, 0x77, 0x5a, 0x0e, 0x7e, 0x64, - 0x71, 0xee, 0xb7, 0x9a, 0x94, 0x61, 0x72, 0x6c, 0x85, 0x43, 0xbe, 0xd3, 0xe2, 0x7e, 0x48, 0x5a, - 0xd1, 0x55, 0xfb, 0x4e, 0x4a, 0xc6, 0x57, 0xed, 0x6c, 0xe3, 0x0f, 0xe3, 0xb6, 0x76, 0x31, 0x6e, - 0x67, 0xa2, 0x2f, 0xc7, 0x6d, 0x0d, 0x4d, 0x59, 0xac, 0x1f, 0x81, 0x5b, 0xd4, 0x72, 0x89, 0xf1, - 0x56, 0x53, 0xeb, 0x54, 0x7b, 0x1f, 0x45, 0x02, 0xaa, 0x75, 0x2c, 0xe0, 0x03, 0x65, 0x27, 0x17, - 0x4a, 0xf3, 0x11, 0x73, 0x1d, 0x4e, 0x5c, 0x8f, 0x9f, 0x4b, 0xa7, 0xf5, 0xd7, 0xe0, 0x48, 0xed, - 0xd4, 0x9f, 0x83, 0xaa, 0x85, 0xb1, 0x4f, 0x82, 0x80, 0x04, 0xc6, 0x42, 0x73, 0xa1, 0x53, 0xed, - 0x7d, 0x1c, 0x09, 0x38, 0x03, 0x63, 0x01, 0xef, 0x2b, 0xed, 0x14, 0x29, 0x2a, 0xd7, 0x6f, 0xa0, - 0x68, 0xb6, 0x55, 0x1f, 0x81, 0xbb, 0x36, 0x73, 0x3d, 0xb9, 0x72, 0x18, 0x35, 0x6e, 0x35, 0xb5, - 0xce, 0xea, 0xf6, 0xbd, 0x6e, 0x56, 0xc6, 0xdd, 0x19, 0xa9, 0x5c, 0xf3, 0xd1, 0xb1, 0x80, 0x1b, - 0xca, 0x37, 0x87, 0x25, 0xb5, 0x8c, 0xae, 0xda, 0x6b, 0x65, 0x10, 0xe5, 0xb7, 0xea, 0x04, 0x54, - 0x6d, 0xe2, 0x73, 0x53, 0xd5, 0xea, 0xb6, 0xaa, 0xd5, 0x13, 0xf9, 0x7b, 0x24, 0x78, 0x98, 0xd4, - 0xeb, 0x61, 0xa2, 0x9d, 0x02, 0xaf, 0xa9, 0xd9, 0xfd, 0x39, 0x1c, 0xca, 0x54, 0xf4, 0x67, 0x00, - 0x38, 0x94, 0xfb, 0x0c, 0x87, 0x36, 0xf1, 0x8d, 0xc5, 0xa6, 0xd6, 0x59, 0xea, 0xed, 0x44, 0x02, - 0xe6, 0xd0, 0x58, 0xc0, 0x7b, 0x49, 0x23, 0x64, 0x50, 0x96, 0x44, 0xad, 0x84, 0xa1, 0xdc, 0x3e, - 0xfd, 0x37, 0x0d, 0x6c, 0x06, 0x27, 0x8e, 0x67, 0x4e, 0x31, 0xd9, 0xc1, 0xa6, 0x4f, 0x5c, 0x36, - 0xb2, 0x86, 0x81, 0x71, 0x47, 0x99, 0xe1, 0x48, 0x40, 0x43, 0x46, 0xed, 0xe7, 0x82, 0x50, 0x1a, - 0x13, 0x0b, 0xf8, 0x8e, 0xb2, 0x9e, 0x17, 0x90, 0x1d, 0xe4, 0xe1, 0x1b, 0x23, 0xd0, 0x5c, 0x07, - 0xfd, 0x77, 0x0d, 0xac, 0x64, 0x67, 0xc6, 0x66, 0xff, 0xdc, 0x58, 0x52, 0x43, 0xf5, 0xf3, 0xff, - 0x1a, 0xaa, 0x48, 0xc0, 0xe5, 0x99, 0x6a, 0xef, 0x3c, 0x16, 0xb0, 0x53, 0xac, 0x21, 0xee, 0x9d, - 0xcf, 0x1f, 0xab, 0xfa, 0x8d, 0x30, 0x39, 0x54, 0x6a, 0x90, 0x0a, 0xb2, 0xfa, 0x36, 0x58, 0xf4, - 0xac, 0x30, 0x20, 0xd8, 0xa8, 0xaa, 0x6a, 0x6e, 0x46, 0x02, 0xa6, 0x48, 0x2c, 0xe0, 0xb2, 0xb2, - 0x4c, 0x96, 0x2d, 0x94, 0xe2, 0xfa, 0x77, 0x60, 0xcd, 0x1a, 0x0e, 0xd9, 0x29, 0xc1, 0x26, 0x25, - 0xfc, 0x94, 0xf9, 0x27, 0x81, 0x01, 0xd4, 0xd4, 0x7c, 0x19, 0x09, 0x58, 0x4b, 0xb9, 0xc3, 0x94, - 0xca, 0xae, 0x81, 0x22, 0x5e, 0x6c, 0x34, 0x63, 0x1e, 0x89, 0xca, 0x72, 0xfa, 0x37, 0x60, 0xdd, - 0x0a, 0x39, 0x33, 0x2d, 0xdb, 0x26, 0x1e, 0x37, 0x8f, 0xd9, 0x10, 0x13, 0x3f, 0x30, 0xee, 0xaa, - 0xe3, 0xbf, 0x1f, 0x09, 0x58, 0x97, 0xf4, 0xa7, 0x8a, 0xfd, 0x2c, 0x21, 0x67, 0xe3, 0x5b, 0x66, - 0x5a, 0xe8, 0x66, 0xb4, 0xfe, 0x14, 0xac, 0xb8, 0xd6, 0x99, 0x19, 0x10, 0x8a, 0xcd, 0x93, 0xbe, - 0x17, 0x18, 0xcb, 0x4d, 0xad, 0x73, 0xbb, 0xf7, 0x9e, 0x1c, 0x4e, 0xd7, 0x3a, 0xfb, 0x8a, 0x50, - 0x7c, 0xd0, 0xf7, 0xa4, 0x6a, 0x5d, 0xa9, 0xe6, 0xb0, 0xd6, 0x3f, 0x02, 0x2e, 0x38, 0x94, 0xa3, - 0x7c, 0xe0, 0x54, 0xd0, 0x27, 0xf6, 0x28, 0x11, 0x5c, 0x29, 0x08, 0x22, 0x62, 0x8f, 0xca, 0x82, - 0x53, 0xac, 0x20, 0x38, 0x05, 0x75, 0x0a, 0x6a, 0xce, 0x80, 0x32, 0x9f, 0xe0, 0x2c, 0xff, 0xd5, - 0xe6, 0x42, 0xe7, 0xee, 0xf6, 0x46, 0x37, 0x79, 0x18, 0xba, 0x4f, 0xd3, 0x87, 0x21, 0xc9, 0xa9, - 0xf7, 0x58, 0xf6, 0x62, 0x24, 0xe0, 0x6a, 0xba, 0x6d, 0x56, 0x98, 0xf5, 0xa4, 0xab, 0xf2, 0x70, - 0x0b, 0x95, 0xc2, 0xf4, 0x1f, 0x35, 0x50, 0xf3, 0x08, 0xc5, 0x0e, 0x1d, 0x64, 0x86, 0xb5, 0x37, - 0x1a, 0x3e, 0x91, 0x86, 0x13, 0x01, 0x8d, 0x3d, 0xe2, 0xf9, 0xc4, 0xb6, 0x38, 0xc1, 0x47, 0x89, - 0x40, 0xaa, 0x19, 0x09, 0xa8, 0x3d, 0xce, 0xee, 0x20, 0x2f, 0xcf, 0xe5, 0x5a, 0xc3, 0xd0, 0xd0, - 0x6a, 0x81, 0x0b, 0xf4, 0x5f, 0x34, 0x50, 0x4b, 0xaa, 0xf9, 0x6d, 0x48, 0x02, 0x6e, 0x9e, 0x38, - 0x7d, 0x63, 0x4d, 0xd5, 0x33, 0x98, 0x08, 0xb8, 0xf2, 0x85, 0x2c, 0x93, 0x62, 0x0e, 0x9c, 0x5e, - 0x24, 0xe0, 0x8a, 0x9b, 0x07, 0xb2, 0x84, 0x0b, 0xe8, 0xb4, 0xc8, 0xd1, 0x55, 0xbb, 0x14, 0x5e, - 0x06, 0x2e, 0xc6, 0xed, 0xa2, 0x03, 0x2a, 0xf0, 0x7d, 0xfd, 0x13, 0x50, 0x0d, 0x29, 0xf7, 0xc3, - 0x80, 0x13, 0x6c, 0xd4, 0x55, 0x4f, 0x36, 0xe5, 0x53, 0x92, 0x81, 0xb1, 0x80, 0x35, 0x75, 0x82, - 0x0c, 0x69, 0xa1, 0x19, 0xab, 0xb2, 0x93, 0x17, 0x1c, 0x27, 0xe6, 0x20, 0x74, 0x4c, 0x8f, 0xf9, - 0xdc, 0xd0, 0x67, 0xd9, 0x21, 0x45, 0x7d, 0xfe, 0xf5, 0xfe, 0x11, 0xf3, 0xb9, 0xcc, 0xce, 0xcf, - 0x03, 0x59, 0x76, 0x05, 0x34, 0x9f, 0x5d, 0x31, 0xbc, 0x0c, 0xc8, 0xec, 0x0a, 0x0e, 0x68, 0xca, - 0x87, 0x8e, 0x5c, 0xea, 0xdf, 0x6b, 0xa0, 0x46, 0x43, 0xd7, 0xb4, 0x19, 0xa5, 0x44, 0x5d, 0x83, - 0x81, 0xb1, 0xae, 0x4e, 0xf7, 0x7c, 0x22, 0x60, 0x1d, 0x59, 0xa7, 0x87, 0xa1, 0xbb, 0x3b, 0x23, - 0x65, 0xc7, 0xd1, 0x02, 0x12, 0x0b, 0xf8, 0x76, 0xf2, 0x4a, 0x17, 0xe0, 0xe9, 0x19, 0x2f, 0xc6, - 0xed, 0x9b, 0x2a, 0xa8, 0xa4, 0xd1, 0x3b, 0xb8, 0x7c, 0xd5, 0xa8, 0x8c, 0x5f, 0x35, 0x2a, 0x97, - 0x93, 0x86, 0x36, 0x9e, 0x34, 0xb4, 0x9f, 0xae, 0x1b, 0x95, 0x97, 0xd7, 0x0d, 0x6d, 0x7c, 0xdd, - 0xa8, 0xfc, 0x79, 0xdd, 0xa8, 0x3c, 0x7b, 0xf7, 0x3f, 0xdc, 0xb9, 0x49, 0xe3, 0xf6, 0x17, 0xd5, - 0xdd, 0xfb, 0xc1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x75, 0x19, 0xf5, 0x92, 0x9d, 0x09, 0x00, - 0x00, -} - -func (m *DeviceConfiguration) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DeviceConfiguration) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DeviceConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.RawNumConnections != 0 { - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(m.RawNumConnections)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x98 - } - if m.RemoteGUIPort != 0 { - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(m.RemoteGUIPort)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x90 - } - if m.Untrusted { - i-- - if m.Untrusted { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x88 - } - if m.MaxRequestKiB != 0 { - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(m.MaxRequestKiB)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x80 - } - if len(m.DeprecatedPendingFolders) > 0 { - for iNdEx := len(m.DeprecatedPendingFolders) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.DeprecatedPendingFolders[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - } - if len(m.IgnoredFolders) > 0 { - for iNdEx := len(m.IgnoredFolders) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.IgnoredFolders[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x72 - } - } - if m.MaxRecvKbps != 0 { - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(m.MaxRecvKbps)) - i-- - dAtA[i] = 0x68 - } - if m.MaxSendKbps != 0 { - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(m.MaxSendKbps)) - i-- - dAtA[i] = 0x60 - } - if m.AutoAcceptFolders { - i-- - if m.AutoAcceptFolders { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x58 - } - if len(m.AllowedNetworks) > 0 { - for iNdEx := len(m.AllowedNetworks) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.AllowedNetworks[iNdEx]) - copy(dAtA[i:], m.AllowedNetworks[iNdEx]) - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(len(m.AllowedNetworks[iNdEx]))) - i-- - dAtA[i] = 0x52 - } - } - if m.Paused { - i-- - if m.Paused { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x48 - } - { - size := m.IntroducedBy.ProtoSize() - i -= size - if _, err := m.IntroducedBy.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - if m.SkipIntroductionRemovals { - i-- - if m.SkipIntroductionRemovals { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if m.Introducer { - i-- - if m.Introducer { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x30 - } - if len(m.CertName) > 0 { - i -= len(m.CertName) - copy(dAtA[i:], m.CertName) - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(len(m.CertName))) - i-- - dAtA[i] = 0x2a - } - if m.Compression != 0 { - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(m.Compression)) - i-- - dAtA[i] = 0x20 - } - if len(m.Addresses) > 0 { - for iNdEx := len(m.Addresses) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Addresses[iNdEx]) - copy(dAtA[i:], m.Addresses[iNdEx]) - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(len(m.Addresses[iNdEx]))) - i-- - dAtA[i] = 0x1a - } - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0x12 - } - { - size := m.DeviceID.ProtoSize() - i -= size - if _, err := m.DeviceID.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDeviceconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func encodeVarintDeviceconfiguration(dAtA []byte, offset int, v uint64) int { - offset -= sovDeviceconfiguration(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *DeviceConfiguration) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.DeviceID.ProtoSize() - n += 1 + l + sovDeviceconfiguration(uint64(l)) - l = len(m.Name) - if l > 0 { - n += 1 + l + sovDeviceconfiguration(uint64(l)) - } - if len(m.Addresses) > 0 { - for _, s := range m.Addresses { - l = len(s) - n += 1 + l + sovDeviceconfiguration(uint64(l)) - } - } - if m.Compression != 0 { - n += 1 + sovDeviceconfiguration(uint64(m.Compression)) - } - l = len(m.CertName) - if l > 0 { - n += 1 + l + sovDeviceconfiguration(uint64(l)) - } - if m.Introducer { - n += 2 - } - if m.SkipIntroductionRemovals { - n += 2 - } - l = m.IntroducedBy.ProtoSize() - n += 1 + l + sovDeviceconfiguration(uint64(l)) - if m.Paused { - n += 2 - } - if len(m.AllowedNetworks) > 0 { - for _, s := range m.AllowedNetworks { - l = len(s) - n += 1 + l + sovDeviceconfiguration(uint64(l)) - } - } - if m.AutoAcceptFolders { - n += 2 - } - if m.MaxSendKbps != 0 { - n += 1 + sovDeviceconfiguration(uint64(m.MaxSendKbps)) - } - if m.MaxRecvKbps != 0 { - n += 1 + sovDeviceconfiguration(uint64(m.MaxRecvKbps)) - } - if len(m.IgnoredFolders) > 0 { - for _, e := range m.IgnoredFolders { - l = e.ProtoSize() - n += 1 + l + sovDeviceconfiguration(uint64(l)) - } - } - if len(m.DeprecatedPendingFolders) > 0 { - for _, e := range m.DeprecatedPendingFolders { - l = e.ProtoSize() - n += 1 + l + sovDeviceconfiguration(uint64(l)) - } - } - if m.MaxRequestKiB != 0 { - n += 2 + sovDeviceconfiguration(uint64(m.MaxRequestKiB)) - } - if m.Untrusted { - n += 3 - } - if m.RemoteGUIPort != 0 { - n += 2 + sovDeviceconfiguration(uint64(m.RemoteGUIPort)) - } - if m.RawNumConnections != 0 { - n += 2 + sovDeviceconfiguration(uint64(m.RawNumConnections)) - } - return n -} - -func sovDeviceconfiguration(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozDeviceconfiguration(x uint64) (n int) { - return sovDeviceconfiguration(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *DeviceConfiguration) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DeviceConfiguration: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DeviceConfiguration: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeviceID", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthDeviceconfiguration - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.DeviceID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDeviceconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDeviceconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Addresses = append(m.Addresses, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Compression", wireType) - } - m.Compression = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Compression |= protocol.Compression(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CertName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDeviceconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CertName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Introducer", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Introducer = bool(v != 0) - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SkipIntroductionRemovals", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SkipIntroductionRemovals = bool(v != 0) - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IntroducedBy", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthDeviceconfiguration - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.IntroducedBy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 9: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Paused", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Paused = bool(v != 0) - case 10: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AllowedNetworks", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDeviceconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AllowedNetworks = append(m.AllowedNetworks, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AutoAcceptFolders", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.AutoAcceptFolders = bool(v != 0) - case 12: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxSendKbps", wireType) - } - m.MaxSendKbps = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxSendKbps |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxRecvKbps", wireType) - } - m.MaxRecvKbps = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxRecvKbps |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 14: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IgnoredFolders", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDeviceconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.IgnoredFolders = append(m.IgnoredFolders, ObservedFolder{}) - if err := m.IgnoredFolders[len(m.IgnoredFolders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedPendingFolders", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDeviceconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DeprecatedPendingFolders = append(m.DeprecatedPendingFolders, ObservedFolder{}) - if err := m.DeprecatedPendingFolders[len(m.DeprecatedPendingFolders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 16: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxRequestKiB", wireType) - } - m.MaxRequestKiB = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxRequestKiB |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 17: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Untrusted", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Untrusted = bool(v != 0) - case 18: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RemoteGUIPort", wireType) - } - m.RemoteGUIPort = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RemoteGUIPort |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 19: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawNumConnections", wireType) - } - m.RawNumConnections = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RawNumConnections |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipDeviceconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDeviceconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipDeviceconfiguration(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDeviceconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthDeviceconfiguration - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupDeviceconfiguration - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthDeviceconfiguration - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthDeviceconfiguration = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDeviceconfiguration = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupDeviceconfiguration = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/filesystemtype.go b/lib/config/filesystemtype.go new file mode 100644 index 00000000000..eacfce6afc9 --- /dev/null +++ b/lib/config/filesystemtype.go @@ -0,0 +1,54 @@ +// Copyright (C) 2016 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package config + +import "github.com/syncthing/syncthing/lib/fs" + +type FilesystemType int32 + +const ( + FilesystemTypeBasic FilesystemType = 0 + FilesystemTypeFake FilesystemType = 1 +) + +func (t FilesystemType) String() string { + switch t { + case FilesystemTypeBasic: + return "basic" + case FilesystemTypeFake: + return "fake" + default: + return "unknown" + } +} + +func (t FilesystemType) ToFS() fs.FilesystemType { + switch t { + case FilesystemTypeBasic: + return fs.FilesystemTypeBasic + case FilesystemTypeFake: + return fs.FilesystemTypeFake + default: + return fs.FilesystemTypeBasic + } +} + +func (t FilesystemType) MarshalText() ([]byte, error) { + return []byte(t.String()), nil +} + +func (t *FilesystemType) UnmarshalText(bs []byte) error { + switch string(bs) { + case "basic": + *t = FilesystemTypeBasic + case "fake": + *t = FilesystemTypeFake + default: + *t = FilesystemTypeBasic + } + return nil +} diff --git a/lib/config/folderconfiguration.go b/lib/config/folderconfiguration.go index 97c1f3d8b74..d8ec913e808 100644 --- a/lib/config/folderconfiguration.go +++ b/lib/config/folderconfiguration.go @@ -33,11 +33,82 @@ var ( const ( DefaultMarkerName = ".stfolder" - EncryptionTokenName = "syncthing-encryption_password_token" + EncryptionTokenName = "syncthing-encryption_password_token" //nolint: gosec maxConcurrentWritesDefault = 2 maxConcurrentWritesLimit = 64 ) +type FolderDeviceConfiguration struct { + DeviceID protocol.DeviceID `json:"deviceID" xml:"id,attr"` + IntroducedBy protocol.DeviceID `json:"introducedBy" xml:"introducedBy,attr"` + EncryptionPassword string `json:"encryptionPassword" xml:"encryptionPassword"` +} + +type FolderConfiguration struct { + ID string `json:"id" xml:"id,attr" nodefault:"true"` + Label string `json:"label" xml:"label,attr" restart:"false"` + FilesystemType FilesystemType `json:"filesystemType" xml:"filesystemType"` + Path string `json:"path" xml:"path,attr" default:"~"` + Type FolderType `json:"type" xml:"type,attr"` + Devices []FolderDeviceConfiguration `json:"devices" xml:"device"` + RescanIntervalS int `json:"rescanIntervalS" xml:"rescanIntervalS,attr" default:"3600"` + FSWatcherEnabled bool `json:"fsWatcherEnabled" xml:"fsWatcherEnabled,attr" default:"true"` + FSWatcherDelayS float64 `json:"fsWatcherDelayS" xml:"fsWatcherDelayS,attr" default:"10"` + FSWatcherTimeoutS float64 `json:"fsWatcherTimeoutS" xml:"fsWatcherTimeoutS,attr"` + IgnorePerms bool `json:"ignorePerms" xml:"ignorePerms,attr"` + AutoNormalize bool `json:"autoNormalize" xml:"autoNormalize,attr" default:"true"` + MinDiskFree Size `json:"minDiskFree" xml:"minDiskFree" default:"1 %"` + Versioning VersioningConfiguration `json:"versioning" xml:"versioning"` + Copiers int `json:"copiers" xml:"copiers"` + PullerMaxPendingKiB int `json:"pullerMaxPendingKiB" xml:"pullerMaxPendingKiB"` + Hashers int `json:"hashers" xml:"hashers"` + Order PullOrder `json:"order" xml:"order"` + IgnoreDelete bool `json:"ignoreDelete" xml:"ignoreDelete"` + ScanProgressIntervalS int `json:"scanProgressIntervalS" xml:"scanProgressIntervalS"` + PullerPauseS int `json:"pullerPauseS" xml:"pullerPauseS"` + MaxConflicts int `json:"maxConflicts" xml:"maxConflicts" default:"10"` + DisableSparseFiles bool `json:"disableSparseFiles" xml:"disableSparseFiles"` + DisableTempIndexes bool `json:"disableTempIndexes" xml:"disableTempIndexes"` + Paused bool `json:"paused" xml:"paused"` + WeakHashThresholdPct int `json:"weakHashThresholdPct" xml:"weakHashThresholdPct"` + MarkerName string `json:"markerName" xml:"markerName"` + CopyOwnershipFromParent bool `json:"copyOwnershipFromParent" xml:"copyOwnershipFromParent"` + RawModTimeWindowS int `json:"modTimeWindowS" xml:"modTimeWindowS"` + MaxConcurrentWrites int `json:"maxConcurrentWrites" xml:"maxConcurrentWrites" default:"2"` + DisableFsync bool `json:"disableFsync" xml:"disableFsync"` + BlockPullOrder BlockPullOrder `json:"blockPullOrder" xml:"blockPullOrder"` + CopyRangeMethod CopyRangeMethod `json:"copyRangeMethod" xml:"copyRangeMethod" default:"standard"` + CaseSensitiveFS bool `json:"caseSensitiveFS" xml:"caseSensitiveFS"` + JunctionsAsDirs bool `json:"junctionsAsDirs" xml:"junctionsAsDirs"` + SyncOwnership bool `json:"syncOwnership" xml:"syncOwnership"` + SendOwnership bool `json:"sendOwnership" xml:"sendOwnership"` + SyncXattrs bool `json:"syncXattrs" xml:"syncXattrs"` + SendXattrs bool `json:"sendXattrs" xml:"sendXattrs"` + XattrFilter XattrFilter `json:"xattrFilter" xml:"xattrFilter"` + // Legacy deprecated + DeprecatedReadOnly bool `json:"-" xml:"ro,attr,omitempty"` // Deprecated: Do not use. + DeprecatedMinDiskFreePct float64 `json:"-" xml:"minDiskFreePct,omitempty"` // Deprecated: Do not use. + DeprecatedPullers int `json:"-" xml:"pullers,omitempty"` // Deprecated: Do not use. + DeprecatedScanOwnership bool `json:"-" xml:"scanOwnership,omitempty"` // Deprecated: Do not use. +} + +// Extended attribute filter. This is a list of patterns to match (glob +// style), each with an action (permit or deny). First match is used. If the +// filter is empty, all strings are permitted. If the filter is non-empty, +// the default action becomes deny. To counter this, you can use the "*" +// pattern to match all strings at the end of the filter. There are also +// limits on the size of accepted attributes. +type XattrFilter struct { + Entries []XattrFilterEntry `json:"entries" xml:"entry"` + MaxSingleEntrySize int `json:"maxSingleEntrySize" xml:"maxSingleEntrySize" default:"1024"` + MaxTotalSize int `json:"maxTotalSize" xml:"maxTotalSize" default:"4096"` +} + +type XattrFilterEntry struct { + Match string `json:"match" xml:"match,attr"` + Permit bool `json:"permit" xml:"permit,attr"` +} + func (f FolderConfiguration) Copy() FolderConfiguration { c := f c.Devices = make([]FolderDeviceConfiguration, len(f.Devices)) @@ -53,7 +124,7 @@ func (f FolderConfiguration) Filesystem(fset *db.FileSet) fs.Filesystem { // This is intentionally not a pointer method, because things like // cfg.Folders["default"].Filesystem(nil) should be valid. opts := make([]fs.Option, 0, 3) - if f.FilesystemType == fs.FilesystemTypeBasic && f.JunctionsAsDirs { + if f.FilesystemType == FilesystemTypeBasic && f.JunctionsAsDirs { opts = append(opts, new(fs.OptionJunctionsAsDirs)) } if !f.CaseSensitiveFS { @@ -62,7 +133,7 @@ func (f FolderConfiguration) Filesystem(fset *db.FileSet) fs.Filesystem { if fset != nil { opts = append(opts, fset.MtimeOption()) } - return fs.NewFilesystem(f.FilesystemType, f.Path, opts...) + return fs.NewFilesystem(f.FilesystemType.ToFS(), f.Path, opts...) } func (f FolderConfiguration) ModTimeWindow() time.Duration { @@ -300,7 +371,7 @@ func (f *FolderConfiguration) CheckAvailableSpace(req uint64) error { fs := f.Filesystem(nil) usage, err := fs.Usage(".") if err != nil { - return nil + return nil //nolint: nilerr } if err := checkAvailableSpace(req, f.MinDiskFree, usage); err != nil { return fmt.Errorf("insufficient space in folder %v (%v): %w", f.Description(), fs.URI(), err) diff --git a/lib/config/folderconfiguration.pb.go b/lib/config/folderconfiguration.pb.go deleted file mode 100644 index af6e4a4addf..00000000000 --- a/lib/config/folderconfiguration.pb.go +++ /dev/null @@ -1,2626 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/folderconfiguration.proto - -package config - -import ( - encoding_binary "encoding/binary" - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - fs "github.com/syncthing/syncthing/lib/fs" - github_com_syncthing_syncthing_lib_protocol "github.com/syncthing/syncthing/lib/protocol" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type FolderDeviceConfiguration struct { - DeviceID github_com_syncthing_syncthing_lib_protocol.DeviceID `protobuf:"bytes,1,opt,name=device_id,json=deviceId,proto3,customtype=github.com/syncthing/syncthing/lib/protocol.DeviceID" json:"deviceID" xml:"id,attr"` - IntroducedBy github_com_syncthing_syncthing_lib_protocol.DeviceID `protobuf:"bytes,2,opt,name=introduced_by,json=introducedBy,proto3,customtype=github.com/syncthing/syncthing/lib/protocol.DeviceID" json:"introducedBy" xml:"introducedBy,attr"` - EncryptionPassword string `protobuf:"bytes,3,opt,name=encryption_password,json=encryptionPassword,proto3" json:"encryptionPassword" xml:"encryptionPassword"` -} - -func (m *FolderDeviceConfiguration) Reset() { *m = FolderDeviceConfiguration{} } -func (m *FolderDeviceConfiguration) String() string { return proto.CompactTextString(m) } -func (*FolderDeviceConfiguration) ProtoMessage() {} -func (*FolderDeviceConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_44a9785876ed3afa, []int{0} -} -func (m *FolderDeviceConfiguration) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FolderDeviceConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FolderDeviceConfiguration.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FolderDeviceConfiguration) XXX_Merge(src proto.Message) { - xxx_messageInfo_FolderDeviceConfiguration.Merge(m, src) -} -func (m *FolderDeviceConfiguration) XXX_Size() int { - return m.ProtoSize() -} -func (m *FolderDeviceConfiguration) XXX_DiscardUnknown() { - xxx_messageInfo_FolderDeviceConfiguration.DiscardUnknown(m) -} - -var xxx_messageInfo_FolderDeviceConfiguration proto.InternalMessageInfo - -type FolderConfiguration struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" xml:"id,attr" nodefault:"true"` - Label string `protobuf:"bytes,2,opt,name=label,proto3" json:"label" xml:"label,attr" restart:"false"` - FilesystemType fs.FilesystemType `protobuf:"varint,3,opt,name=filesystem_type,json=filesystemType,proto3,enum=fs.FilesystemType" json:"filesystemType" xml:"filesystemType"` - Path string `protobuf:"bytes,4,opt,name=path,proto3" json:"path" xml:"path,attr" default:"~"` - Type FolderType `protobuf:"varint,5,opt,name=type,proto3,enum=config.FolderType" json:"type" xml:"type,attr"` - Devices []FolderDeviceConfiguration `protobuf:"bytes,6,rep,name=devices,proto3" json:"devices" xml:"device"` - RescanIntervalS int `protobuf:"varint,7,opt,name=rescan_interval_s,json=rescanIntervalS,proto3,casttype=int" json:"rescanIntervalS" xml:"rescanIntervalS,attr" default:"3600"` - FSWatcherEnabled bool `protobuf:"varint,8,opt,name=fs_watcher_enabled,json=fsWatcherEnabled,proto3" json:"fsWatcherEnabled" xml:"fsWatcherEnabled,attr" default:"true"` - FSWatcherDelayS float64 `protobuf:"fixed64,9,opt,name=fs_watcher_delay_s,json=fsWatcherDelayS,proto3" json:"fsWatcherDelayS" xml:"fsWatcherDelayS,attr" default:"10"` - FSWatcherTimeoutS float64 `protobuf:"fixed64,40,opt,name=fs_watcher_timeout_s,json=fsWatcherTimeoutS,proto3" json:"fsWatcherTimeoutS" xml:"fsWatcherTimeoutS,attr"` - IgnorePerms bool `protobuf:"varint,10,opt,name=ignore_perms,json=ignorePerms,proto3" json:"ignorePerms" xml:"ignorePerms,attr"` - AutoNormalize bool `protobuf:"varint,11,opt,name=auto_normalize,json=autoNormalize,proto3" json:"autoNormalize" xml:"autoNormalize,attr" default:"true"` - MinDiskFree Size `protobuf:"bytes,12,opt,name=min_disk_free,json=minDiskFree,proto3" json:"minDiskFree" xml:"minDiskFree" default:"1 %"` - Versioning VersioningConfiguration `protobuf:"bytes,13,opt,name=versioning,proto3" json:"versioning" xml:"versioning"` - Copiers int `protobuf:"varint,14,opt,name=copiers,proto3,casttype=int" json:"copiers" xml:"copiers"` - PullerMaxPendingKiB int `protobuf:"varint,15,opt,name=puller_max_pending_kib,json=pullerMaxPendingKib,proto3,casttype=int" json:"pullerMaxPendingKiB" xml:"pullerMaxPendingKiB"` - Hashers int `protobuf:"varint,16,opt,name=hashers,proto3,casttype=int" json:"hashers" xml:"hashers"` - Order PullOrder `protobuf:"varint,17,opt,name=order,proto3,enum=config.PullOrder" json:"order" xml:"order"` - IgnoreDelete bool `protobuf:"varint,18,opt,name=ignore_delete,json=ignoreDelete,proto3" json:"ignoreDelete" xml:"ignoreDelete"` - ScanProgressIntervalS int `protobuf:"varint,19,opt,name=scan_progress_interval_s,json=scanProgressIntervalS,proto3,casttype=int" json:"scanProgressIntervalS" xml:"scanProgressIntervalS"` - PullerPauseS int `protobuf:"varint,20,opt,name=puller_pause_s,json=pullerPauseS,proto3,casttype=int" json:"pullerPauseS" xml:"pullerPauseS"` - MaxConflicts int `protobuf:"varint,21,opt,name=max_conflicts,json=maxConflicts,proto3,casttype=int" json:"maxConflicts" xml:"maxConflicts" default:"10"` - DisableSparseFiles bool `protobuf:"varint,22,opt,name=disable_sparse_files,json=disableSparseFiles,proto3" json:"disableSparseFiles" xml:"disableSparseFiles"` - DisableTempIndexes bool `protobuf:"varint,23,opt,name=disable_temp_indexes,json=disableTempIndexes,proto3" json:"disableTempIndexes" xml:"disableTempIndexes"` - Paused bool `protobuf:"varint,24,opt,name=paused,proto3" json:"paused" xml:"paused"` - WeakHashThresholdPct int `protobuf:"varint,25,opt,name=weak_hash_threshold_pct,json=weakHashThresholdPct,proto3,casttype=int" json:"weakHashThresholdPct" xml:"weakHashThresholdPct"` - MarkerName string `protobuf:"bytes,26,opt,name=marker_name,json=markerName,proto3" json:"markerName" xml:"markerName"` - CopyOwnershipFromParent bool `protobuf:"varint,27,opt,name=copy_ownership_from_parent,json=copyOwnershipFromParent,proto3" json:"copyOwnershipFromParent" xml:"copyOwnershipFromParent"` - RawModTimeWindowS int `protobuf:"varint,28,opt,name=mod_time_window_s,json=modTimeWindowS,proto3,casttype=int" json:"modTimeWindowS" xml:"modTimeWindowS"` - MaxConcurrentWrites int `protobuf:"varint,29,opt,name=max_concurrent_writes,json=maxConcurrentWrites,proto3,casttype=int" json:"maxConcurrentWrites" xml:"maxConcurrentWrites" default:"2"` - DisableFsync bool `protobuf:"varint,30,opt,name=disable_fsync,json=disableFsync,proto3" json:"disableFsync" xml:"disableFsync"` - BlockPullOrder BlockPullOrder `protobuf:"varint,31,opt,name=block_pull_order,json=blockPullOrder,proto3,enum=config.BlockPullOrder" json:"blockPullOrder" xml:"blockPullOrder"` - CopyRangeMethod fs.CopyRangeMethod `protobuf:"varint,32,opt,name=copy_range_method,json=copyRangeMethod,proto3,enum=fs.CopyRangeMethod" json:"copyRangeMethod" xml:"copyRangeMethod" default:"standard"` - CaseSensitiveFS bool `protobuf:"varint,33,opt,name=case_sensitive_fs,json=caseSensitiveFs,proto3" json:"caseSensitiveFS" xml:"caseSensitiveFS"` - JunctionsAsDirs bool `protobuf:"varint,34,opt,name=follow_junctions,json=followJunctions,proto3" json:"junctionsAsDirs" xml:"junctionsAsDirs"` - SyncOwnership bool `protobuf:"varint,35,opt,name=sync_ownership,json=syncOwnership,proto3" json:"syncOwnership" xml:"syncOwnership"` - SendOwnership bool `protobuf:"varint,36,opt,name=send_ownership,json=sendOwnership,proto3" json:"sendOwnership" xml:"sendOwnership"` - SyncXattrs bool `protobuf:"varint,37,opt,name=sync_xattrs,json=syncXattrs,proto3" json:"syncXattrs" xml:"syncXattrs"` - SendXattrs bool `protobuf:"varint,38,opt,name=send_xattrs,json=sendXattrs,proto3" json:"sendXattrs" xml:"sendXattrs"` - XattrFilter XattrFilter `protobuf:"bytes,39,opt,name=xattr_filter,json=xattrFilter,proto3" json:"xattrFilter" xml:"xattrFilter"` - // Legacy deprecated - DeprecatedReadOnly bool `protobuf:"varint,9000,opt,name=read_only,json=readOnly,proto3" json:"-" xml:"ro,attr,omitempty"` // Deprecated: Do not use. - DeprecatedMinDiskFreePct float64 `protobuf:"fixed64,9001,opt,name=min_disk_free_pct,json=minDiskFreePct,proto3" json:"-" xml:"minDiskFreePct,omitempty"` // Deprecated: Do not use. - DeprecatedPullers int `protobuf:"varint,9002,opt,name=pullers,proto3,casttype=int" json:"-" xml:"pullers,omitempty"` // Deprecated: Do not use. - DeprecatedScanOwnership bool `protobuf:"varint,9003,opt,name=scan_ownership,json=scanOwnership,proto3" json:"-" xml:"scanOwnership,omitempty"` // Deprecated: Do not use. -} - -func (m *FolderConfiguration) Reset() { *m = FolderConfiguration{} } -func (m *FolderConfiguration) String() string { return proto.CompactTextString(m) } -func (*FolderConfiguration) ProtoMessage() {} -func (*FolderConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_44a9785876ed3afa, []int{1} -} -func (m *FolderConfiguration) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FolderConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FolderConfiguration.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FolderConfiguration) XXX_Merge(src proto.Message) { - xxx_messageInfo_FolderConfiguration.Merge(m, src) -} -func (m *FolderConfiguration) XXX_Size() int { - return m.ProtoSize() -} -func (m *FolderConfiguration) XXX_DiscardUnknown() { - xxx_messageInfo_FolderConfiguration.DiscardUnknown(m) -} - -var xxx_messageInfo_FolderConfiguration proto.InternalMessageInfo - -// Extended attribute filter. This is a list of patterns to match (glob -// style), each with an action (permit or deny). First match is used. If the -// filter is empty, all strings are permitted. If the filter is non-empty, -// the default action becomes deny. To counter this, you can use the "*" -// pattern to match all strings at the end of the filter. There are also -// limits on the size of accepted attributes. -type XattrFilter struct { - Entries []XattrFilterEntry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries" xml:"entry"` - MaxSingleEntrySize int `protobuf:"varint,2,opt,name=max_single_entry_size,json=maxSingleEntrySize,proto3,casttype=int" json:"maxSingleEntrySize" xml:"maxSingleEntrySize" default:"1024"` - MaxTotalSize int `protobuf:"varint,3,opt,name=max_total_size,json=maxTotalSize,proto3,casttype=int" json:"maxTotalSize" xml:"maxTotalSize" default:"4096"` -} - -func (m *XattrFilter) Reset() { *m = XattrFilter{} } -func (m *XattrFilter) String() string { return proto.CompactTextString(m) } -func (*XattrFilter) ProtoMessage() {} -func (*XattrFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_44a9785876ed3afa, []int{2} -} -func (m *XattrFilter) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *XattrFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_XattrFilter.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *XattrFilter) XXX_Merge(src proto.Message) { - xxx_messageInfo_XattrFilter.Merge(m, src) -} -func (m *XattrFilter) XXX_Size() int { - return m.ProtoSize() -} -func (m *XattrFilter) XXX_DiscardUnknown() { - xxx_messageInfo_XattrFilter.DiscardUnknown(m) -} - -var xxx_messageInfo_XattrFilter proto.InternalMessageInfo - -type XattrFilterEntry struct { - Match string `protobuf:"bytes,1,opt,name=match,proto3" json:"match" xml:"match,attr"` - Permit bool `protobuf:"varint,2,opt,name=permit,proto3" json:"permit" xml:"permit,attr"` -} - -func (m *XattrFilterEntry) Reset() { *m = XattrFilterEntry{} } -func (m *XattrFilterEntry) String() string { return proto.CompactTextString(m) } -func (*XattrFilterEntry) ProtoMessage() {} -func (*XattrFilterEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_44a9785876ed3afa, []int{3} -} -func (m *XattrFilterEntry) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *XattrFilterEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_XattrFilterEntry.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *XattrFilterEntry) XXX_Merge(src proto.Message) { - xxx_messageInfo_XattrFilterEntry.Merge(m, src) -} -func (m *XattrFilterEntry) XXX_Size() int { - return m.ProtoSize() -} -func (m *XattrFilterEntry) XXX_DiscardUnknown() { - xxx_messageInfo_XattrFilterEntry.DiscardUnknown(m) -} - -var xxx_messageInfo_XattrFilterEntry proto.InternalMessageInfo - -func init() { - proto.RegisterType((*FolderDeviceConfiguration)(nil), "config.FolderDeviceConfiguration") - proto.RegisterType((*FolderConfiguration)(nil), "config.FolderConfiguration") - proto.RegisterType((*XattrFilter)(nil), "config.XattrFilter") - proto.RegisterType((*XattrFilterEntry)(nil), "config.XattrFilterEntry") -} - -func init() { - proto.RegisterFile("lib/config/folderconfiguration.proto", fileDescriptor_44a9785876ed3afa) -} - -var fileDescriptor_44a9785876ed3afa = []byte{ - // 2460 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4d, 0x6c, 0x24, 0x47, - 0x15, 0x76, 0xdb, 0xfb, 0x63, 0x97, 0xd7, 0x5e, 0xbb, 0x6c, 0xef, 0x76, 0x9c, 0xc4, 0x35, 0xe9, - 0xcc, 0x26, 0x93, 0x90, 0x78, 0x37, 0x4e, 0x14, 0x29, 0x11, 0x01, 0x32, 0x76, 0x46, 0x2c, 0x8b, - 0xb3, 0x56, 0x8f, 0x21, 0x90, 0x20, 0x35, 0xed, 0xee, 0x9a, 0x99, 0x8e, 0x7b, 0xba, 0x87, 0xae, - 0xf6, 0xda, 0xb3, 0x87, 0x28, 0xe4, 0x80, 0x90, 0xc8, 0x01, 0x99, 0x03, 0xe2, 0x80, 0x14, 0x09, - 0x84, 0x20, 0x5c, 0x38, 0x73, 0xe1, 0xba, 0x17, 0x64, 0x9f, 0x10, 0xe2, 0x50, 0x52, 0xbc, 0xb7, - 0x39, 0xf6, 0x71, 0x4f, 0xe8, 0xbd, 0xfe, 0x99, 0xea, 0x99, 0x89, 0x84, 0xc4, 0x6d, 0xea, 0xfb, - 0x5e, 0xbd, 0xf7, 0x75, 0xd5, 0xab, 0x57, 0xaf, 0x86, 0x54, 0x7d, 0xef, 0xe0, 0xb6, 0x13, 0x06, - 0x2d, 0xaf, 0x7d, 0xbb, 0x15, 0xfa, 0x2e, 0x8f, 0xd2, 0xc1, 0x51, 0x64, 0xc7, 0x5e, 0x18, 0x6c, - 0xf6, 0xa2, 0x30, 0x0e, 0xe9, 0x95, 0x14, 0x5c, 0x7f, 0x7a, 0xcc, 0x3a, 0xee, 0xf7, 0x78, 0x6a, - 0xb4, 0xbe, 0xa6, 0x90, 0xc2, 0x7b, 0x98, 0xc3, 0xeb, 0x0a, 0xdc, 0x3b, 0xf2, 0xfd, 0x30, 0x72, - 0x79, 0x94, 0x71, 0x35, 0x85, 0x7b, 0xc0, 0x23, 0xe1, 0x85, 0x81, 0x17, 0xb4, 0x27, 0x28, 0x58, - 0x67, 0x8a, 0xe5, 0x81, 0x1f, 0x3a, 0x87, 0xa3, 0xae, 0x28, 0x18, 0xb4, 0xc4, 0x6d, 0x10, 0x24, - 0x32, 0xec, 0x99, 0x0c, 0x73, 0xc2, 0x5e, 0x3f, 0xb2, 0x83, 0x36, 0xef, 0xf2, 0xb8, 0x13, 0xba, - 0x19, 0x3b, 0xc7, 0x4f, 0xe2, 0xf4, 0xa7, 0xf1, 0xaf, 0x19, 0xf2, 0x54, 0x03, 0xbf, 0x67, 0x87, - 0x3f, 0xf0, 0x1c, 0xbe, 0xad, 0x2a, 0xa0, 0x5f, 0x6a, 0x64, 0xce, 0x45, 0xdc, 0xf2, 0x5c, 0x5d, - 0xab, 0x68, 0xb5, 0x6b, 0xf5, 0xcf, 0xb5, 0x47, 0x92, 0x4d, 0xfd, 0x47, 0xb2, 0x37, 0xda, 0x5e, - 0xdc, 0x39, 0x3a, 0xd8, 0x74, 0xc2, 0xee, 0x6d, 0xd1, 0x0f, 0x9c, 0xb8, 0xe3, 0x05, 0x6d, 0xe5, - 0x17, 0x48, 0xc0, 0x20, 0x4e, 0xe8, 0x6f, 0xa6, 0xde, 0xef, 0xee, 0x5c, 0x48, 0x36, 0x9b, 0xff, - 0x1e, 0x48, 0x36, 0xeb, 0x66, 0xbf, 0x13, 0xc9, 0x16, 0x4e, 0xba, 0xfe, 0xdb, 0x86, 0xe7, 0xbe, - 0x62, 0xc7, 0x71, 0x64, 0x0c, 0xce, 0xaa, 0x57, 0xb3, 0xdf, 0xc9, 0x59, 0xb5, 0xb0, 0xfb, 0xe5, - 0x79, 0x55, 0x3b, 0x3d, 0xaf, 0x16, 0x3e, 0xcc, 0x9c, 0x71, 0xe9, 0x9f, 0x34, 0xb2, 0xe0, 0x05, - 0x71, 0x14, 0xba, 0x47, 0x0e, 0x77, 0xad, 0x83, 0xbe, 0x3e, 0x8d, 0x82, 0x3f, 0xfd, 0xbf, 0x04, - 0x0f, 0x24, 0xbb, 0x36, 0xf4, 0x5a, 0xef, 0x27, 0x92, 0xdd, 0x4c, 0x85, 0x2a, 0x60, 0x21, 0x79, - 0x79, 0x0c, 0x05, 0xc1, 0x66, 0xc9, 0x03, 0x75, 0xc8, 0x0a, 0x0f, 0x9c, 0xa8, 0xdf, 0x83, 0x35, - 0xb6, 0x7a, 0xb6, 0x10, 0xc7, 0x61, 0xe4, 0xea, 0x33, 0x15, 0xad, 0x36, 0x57, 0xdf, 0x1a, 0x48, - 0x46, 0x87, 0xf4, 0x5e, 0xc6, 0x26, 0x92, 0xe9, 0x18, 0x76, 0x9c, 0x32, 0xcc, 0x09, 0xf6, 0xc6, - 0x3f, 0x6e, 0x91, 0x95, 0x74, 0x63, 0xcb, 0x5b, 0xda, 0x24, 0xd3, 0xd9, 0x56, 0xce, 0xd5, 0xb7, - 0x2f, 0x24, 0x9b, 0xc6, 0x4f, 0x9c, 0xf6, 0x20, 0xc2, 0x46, 0x69, 0x07, 0x2a, 0x41, 0xe8, 0xf2, - 0x96, 0x7d, 0xe4, 0xc7, 0x6f, 0x1b, 0x71, 0x74, 0xc4, 0xd5, 0x2d, 0x39, 0x3d, 0xaf, 0x4e, 0xdf, - 0xdd, 0xf9, 0x02, 0xbe, 0x6d, 0xda, 0x73, 0xe9, 0x0f, 0xc8, 0x65, 0xdf, 0x3e, 0xe0, 0x3e, 0xae, - 0xf8, 0x5c, 0xfd, 0xdb, 0x03, 0xc9, 0x52, 0x20, 0x91, 0xac, 0x82, 0x4e, 0x71, 0x94, 0xf9, 0x8d, - 0xb8, 0x88, 0xed, 0x28, 0x7e, 0xdb, 0x68, 0xd9, 0xbe, 0x40, 0xb7, 0x64, 0x48, 0x7f, 0x7a, 0x5e, - 0x9d, 0x32, 0xd3, 0xc9, 0xb4, 0x4d, 0xae, 0xb7, 0x3c, 0x9f, 0x8b, 0xbe, 0x88, 0x79, 0xd7, 0x82, - 0xfc, 0xc6, 0x45, 0x5a, 0xdc, 0xa2, 0x9b, 0x2d, 0xb1, 0xd9, 0x28, 0xa8, 0xfd, 0x7e, 0x8f, 0xd7, - 0x5f, 0x1e, 0x48, 0xb6, 0xd8, 0x2a, 0x61, 0x89, 0x64, 0xab, 0x18, 0xbd, 0x0c, 0x1b, 0xe6, 0x88, - 0x1d, 0xdd, 0x25, 0x97, 0x7a, 0x76, 0xdc, 0xd1, 0x2f, 0xa1, 0xfc, 0xb7, 0x06, 0x92, 0xe1, 0x38, - 0x91, 0xec, 0x69, 0x9c, 0x0f, 0x83, 0x4c, 0x7c, 0xb1, 0x24, 0x9f, 0x80, 0xf0, 0xb9, 0x82, 0x79, - 0x72, 0x56, 0xd5, 0x3e, 0x31, 0x71, 0x1a, 0xdd, 0x23, 0x97, 0x50, 0xec, 0xe5, 0x4c, 0x6c, 0x7a, - 0x7a, 0x37, 0xd3, 0xed, 0x40, 0xb1, 0x35, 0x08, 0x11, 0xa7, 0x12, 0xaf, 0x63, 0x08, 0x18, 0x14, - 0x69, 0x34, 0x57, 0x8c, 0x4c, 0xb4, 0xa2, 0x3f, 0x21, 0x57, 0xd3, 0x3c, 0x17, 0xfa, 0x95, 0xca, - 0x4c, 0x6d, 0x7e, 0xeb, 0xb9, 0xb2, 0xd3, 0x09, 0x87, 0xb7, 0xce, 0x20, 0xed, 0x07, 0x92, 0xe5, - 0x33, 0x13, 0xc9, 0xae, 0x61, 0xa8, 0x74, 0x6c, 0x98, 0x39, 0x41, 0x7f, 0xa3, 0x91, 0xe5, 0x88, - 0x0b, 0xc7, 0x0e, 0x2c, 0x2f, 0x88, 0x79, 0xf4, 0xc0, 0xf6, 0x2d, 0xa1, 0x5f, 0xad, 0x68, 0xb5, - 0xcb, 0xf5, 0xf6, 0x40, 0xb2, 0xeb, 0x29, 0x79, 0x37, 0xe3, 0x9a, 0x89, 0x64, 0x2f, 0xa1, 0xa7, - 0x11, 0x7c, 0x74, 0x89, 0x5e, 0x7f, 0xf3, 0xce, 0x1d, 0xe3, 0x89, 0x64, 0x33, 0x5e, 0x10, 0x0f, - 0xce, 0xaa, 0xab, 0x93, 0xcc, 0x9f, 0x9c, 0x55, 0x2f, 0x81, 0x9d, 0x39, 0x1a, 0x84, 0xfe, 0x5d, - 0x23, 0xb4, 0x25, 0xac, 0x63, 0x3b, 0x76, 0x3a, 0x3c, 0xb2, 0x78, 0x60, 0x1f, 0xf8, 0xdc, 0xd5, - 0x67, 0x2b, 0x5a, 0x6d, 0xb6, 0xfe, 0x2b, 0xed, 0x42, 0xb2, 0xa5, 0x46, 0xf3, 0x83, 0x94, 0x7d, - 0x2f, 0x25, 0x07, 0x92, 0x2d, 0xb5, 0x44, 0x19, 0x4b, 0x24, 0x7b, 0x39, 0x4d, 0x82, 0x11, 0x62, - 0x54, 0x6d, 0x9e, 0xe3, 0x6b, 0x13, 0x0d, 0x41, 0x27, 0x58, 0x9c, 0x9e, 0x57, 0xc7, 0xc2, 0x9a, - 0x63, 0x41, 0xe9, 0xdf, 0xca, 0xe2, 0x5d, 0xee, 0xdb, 0x7d, 0x4b, 0xe8, 0x73, 0x15, 0xad, 0xa6, - 0xd5, 0x3f, 0x03, 0xf1, 0xd7, 0x0b, 0x2f, 0x3b, 0x40, 0x36, 0x61, 0x9d, 0x0b, 0x37, 0x29, 0x94, - 0x48, 0xf6, 0x62, 0x59, 0x7a, 0x8a, 0x8f, 0x2a, 0x7f, 0xed, 0x0e, 0xe8, 0x5e, 0x9d, 0x64, 0xf5, - 0xe4, 0xac, 0x3a, 0xfd, 0xda, 0x9d, 0xd3, 0xf3, 0xea, 0x68, 0x38, 0x73, 0x34, 0x18, 0x14, 0xfb, - 0x55, 0x45, 0x72, 0xec, 0x75, 0x79, 0x78, 0x14, 0x5b, 0x42, 0xaf, 0xa1, 0xe8, 0xfe, 0x85, 0x64, - 0xcb, 0x85, 0x93, 0xfd, 0x94, 0x05, 0xd5, 0xcb, 0x85, 0xa3, 0x1c, 0x4c, 0x24, 0x7b, 0xa6, 0xac, - 0x3b, 0x67, 0x8a, 0x0c, 0xbf, 0x31, 0x99, 0x3a, 0x3d, 0xaf, 0x8e, 0xc7, 0x30, 0xc7, 0x23, 0xd0, - 0x9f, 0x92, 0x6b, 0x5e, 0x3b, 0x08, 0x23, 0x6e, 0xf5, 0x78, 0xd4, 0x15, 0x3a, 0xc1, 0xac, 0x78, - 0x67, 0x20, 0xd9, 0x7c, 0x8a, 0xef, 0x01, 0x9c, 0x48, 0x76, 0x23, 0xad, 0x69, 0x43, 0xac, 0x90, - 0xb0, 0x34, 0x0a, 0x9a, 0xea, 0x54, 0xfa, 0x73, 0x8d, 0x2c, 0xda, 0x47, 0x71, 0x68, 0x05, 0x61, - 0xd4, 0xb5, 0x7d, 0xef, 0x21, 0xd7, 0xe7, 0x31, 0xc8, 0x87, 0x03, 0xc9, 0x16, 0x80, 0x79, 0x3f, - 0x27, 0x8a, 0x7d, 0x2a, 0xa1, 0x5f, 0x97, 0x5f, 0x74, 0xdc, 0x2a, 0x4f, 0x2e, 0xb3, 0xec, 0x97, - 0x86, 0x64, 0xa1, 0xeb, 0x05, 0x96, 0xeb, 0x89, 0x43, 0xab, 0x15, 0x71, 0xae, 0x5f, 0xab, 0x68, - 0xb5, 0xf9, 0xad, 0x6b, 0xf9, 0xe1, 0x6f, 0x7a, 0x0f, 0x79, 0xfd, 0x9d, 0xec, 0x9c, 0xcf, 0x77, - 0xbd, 0x60, 0xc7, 0x13, 0x87, 0x8d, 0x88, 0x83, 0x22, 0x86, 0x8a, 0x14, 0x4c, 0x4d, 0x98, 0xca, - 0x2d, 0xe3, 0xc9, 0x59, 0x75, 0xe6, 0xb5, 0xca, 0x2d, 0x53, 0x9d, 0x46, 0xdb, 0x84, 0x0c, 0xbb, - 0x11, 0x7d, 0x01, 0xa3, 0xb1, 0x3c, 0xda, 0x0f, 0x0b, 0xa6, 0x5c, 0x68, 0x5e, 0xc8, 0x04, 0x28, - 0x53, 0x13, 0xc9, 0x96, 0x30, 0xfe, 0x10, 0x32, 0x4c, 0x85, 0xa7, 0xef, 0x90, 0xab, 0x4e, 0xd8, - 0xf3, 0x78, 0x24, 0xf4, 0x45, 0xac, 0x33, 0xcf, 0x43, 0xa5, 0xca, 0xa0, 0xa2, 0x19, 0xc8, 0xc6, - 0x79, 0x0d, 0x31, 0x73, 0x03, 0xfa, 0x4f, 0x8d, 0xdc, 0x80, 0x3e, 0x88, 0x47, 0x56, 0xd7, 0x3e, - 0xb1, 0x7a, 0x3c, 0x70, 0xbd, 0xa0, 0x6d, 0x1d, 0x7a, 0x07, 0xfa, 0x75, 0x74, 0xf7, 0x5b, 0x38, - 0x62, 0x2b, 0x7b, 0x68, 0xb2, 0x6b, 0x9f, 0xec, 0xa5, 0x06, 0xf7, 0xbc, 0xfa, 0x40, 0xb2, 0x95, - 0xde, 0x38, 0x9c, 0x48, 0xf6, 0x54, 0x5a, 0xea, 0xc7, 0x39, 0xa5, 0x84, 0x4d, 0x9c, 0x3a, 0x19, - 0x3e, 0x3d, 0xaf, 0x4e, 0x8a, 0x6f, 0x4e, 0xb0, 0x3d, 0x80, 0xe5, 0xe8, 0xd8, 0xa2, 0x03, 0xcb, - 0xb1, 0x34, 0x5c, 0x8e, 0x0c, 0x2a, 0x96, 0x23, 0x1b, 0x0f, 0x97, 0x23, 0x03, 0xe8, 0xbb, 0xe4, - 0x32, 0x76, 0x84, 0xfa, 0x32, 0xde, 0x38, 0xcb, 0xf9, 0x8e, 0x41, 0xfc, 0xfb, 0x40, 0xd4, 0x75, - 0xb8, 0x92, 0xd1, 0x26, 0x91, 0x6c, 0x1e, 0xbd, 0xe1, 0xc8, 0x30, 0x53, 0x94, 0xde, 0x23, 0x0b, - 0xd9, 0x81, 0x72, 0xb9, 0xcf, 0x63, 0xae, 0x53, 0x4c, 0xf6, 0x17, 0xb0, 0xff, 0x41, 0x62, 0x07, - 0xf1, 0x44, 0x32, 0xaa, 0x1c, 0xa9, 0x14, 0x34, 0xcc, 0x92, 0x0d, 0x3d, 0x21, 0x3a, 0xde, 0x26, - 0xbd, 0x28, 0x6c, 0x47, 0x5c, 0x08, 0xf5, 0x5a, 0x59, 0xc1, 0xef, 0x83, 0x16, 0x61, 0x0d, 0x6c, - 0xf6, 0x32, 0x13, 0xf5, 0x72, 0x49, 0x2f, 0xdd, 0x89, 0x6c, 0xf1, 0xed, 0x93, 0x27, 0xd3, 0x26, - 0x59, 0xcc, 0xf2, 0xa2, 0x67, 0x1f, 0x09, 0x6e, 0x09, 0x7d, 0x15, 0xe3, 0xbd, 0x0a, 0xdf, 0x91, - 0x32, 0x7b, 0x40, 0x34, 0x8b, 0xef, 0x50, 0xc1, 0xc2, 0x7b, 0xc9, 0x94, 0x72, 0xb2, 0x00, 0x59, - 0x06, 0x8b, 0xea, 0x7b, 0x4e, 0x2c, 0xf4, 0x35, 0xf4, 0xf9, 0x1d, 0xf0, 0xd9, 0xb5, 0x4f, 0xb6, - 0x73, 0x7c, 0x78, 0xea, 0x14, 0xb0, 0x5c, 0xa7, 0xb3, 0x00, 0x69, 0x59, 0x36, 0x4b, 0xb3, 0xa9, - 0x4b, 0x56, 0x5d, 0x4f, 0xc0, 0xfd, 0x61, 0x89, 0x9e, 0x1d, 0x09, 0x6e, 0x61, 0x9b, 0xa2, 0xdf, - 0xc0, 0x9d, 0xc0, 0xc6, 0x30, 0xe3, 0x9b, 0x48, 0x63, 0x03, 0x54, 0x34, 0x86, 0xe3, 0x94, 0x61, - 0x4e, 0xb0, 0x57, 0xa3, 0xc4, 0xbc, 0xdb, 0xb3, 0xbc, 0xc0, 0xe5, 0x27, 0x5c, 0xe8, 0x37, 0xc7, - 0xa2, 0xec, 0xf3, 0x6e, 0xef, 0x6e, 0xca, 0x8e, 0x46, 0x51, 0xa8, 0x61, 0x14, 0x05, 0xa4, 0x5b, - 0xe4, 0x0a, 0x6e, 0x80, 0xab, 0xeb, 0xe8, 0x77, 0x7d, 0x20, 0x59, 0x86, 0x14, 0x7d, 0x48, 0x3a, - 0x34, 0xcc, 0x0c, 0xa7, 0x31, 0xb9, 0x79, 0xcc, 0xed, 0x43, 0x0b, 0xb2, 0xda, 0x8a, 0x3b, 0x11, - 0x17, 0x9d, 0xd0, 0x77, 0xad, 0x9e, 0x13, 0xeb, 0x4f, 0xe1, 0x82, 0x43, 0x79, 0x5f, 0x05, 0x93, - 0xef, 0xda, 0xa2, 0xb3, 0x9f, 0x1b, 0xec, 0x39, 0x71, 0x22, 0xd9, 0x3a, 0xba, 0x9c, 0x44, 0x16, - 0x9b, 0x3a, 0x71, 0x2a, 0xdd, 0x26, 0xf3, 0x5d, 0x3b, 0x3a, 0xe4, 0x91, 0x15, 0xd8, 0x5d, 0xae, - 0xaf, 0x63, 0x0b, 0x68, 0x40, 0x39, 0x4b, 0xe1, 0xf7, 0xed, 0x2e, 0x2f, 0xca, 0xd9, 0x10, 0x32, - 0x4c, 0x85, 0xa7, 0x7d, 0xb2, 0x0e, 0x4f, 0x2d, 0x2b, 0x3c, 0x0e, 0x78, 0x24, 0x3a, 0x5e, 0xcf, - 0x6a, 0x45, 0x61, 0xd7, 0xea, 0xd9, 0x11, 0x0f, 0x62, 0xfd, 0x69, 0x5c, 0x82, 0x6f, 0x0e, 0x24, - 0xbb, 0x09, 0x56, 0xf7, 0x73, 0xa3, 0x46, 0x14, 0x76, 0xf7, 0xd0, 0x24, 0x91, 0xec, 0xd9, 0xbc, - 0xe2, 0x4d, 0xe2, 0x0d, 0xf3, 0xeb, 0x66, 0xd2, 0x5f, 0x68, 0x64, 0xb9, 0x1b, 0xba, 0x78, 0x5f, - 0x5b, 0xc7, 0x5e, 0xe0, 0x86, 0xc7, 0x96, 0xd0, 0x9f, 0xc1, 0x05, 0xfb, 0x08, 0xee, 0x6c, 0xd3, - 0x3e, 0xde, 0x0d, 0x5d, 0xb8, 0x39, 0x3f, 0x40, 0x16, 0xee, 0xec, 0xc5, 0x6e, 0x09, 0x29, 0x1a, - 0xe5, 0x32, 0x9c, 0xaf, 0x1c, 0xdc, 0xca, 0x63, 0x5e, 0xcc, 0x11, 0x1f, 0xf4, 0x53, 0x8d, 0xac, - 0x65, 0xc7, 0xc4, 0x39, 0x8a, 0x40, 0x9b, 0x75, 0x1c, 0x79, 0x31, 0x17, 0xfa, 0xb3, 0x28, 0xe6, - 0xfb, 0x50, 0x7a, 0xd3, 0x84, 0xcf, 0xf8, 0x0f, 0x90, 0x4e, 0x24, 0xbb, 0xa5, 0x9c, 0x9a, 0x12, - 0xa7, 0x1c, 0x9e, 0x2d, 0xe5, 0xec, 0x68, 0x5b, 0xe6, 0x24, 0x4f, 0x50, 0xc4, 0xf2, 0xdc, 0x6e, - 0xc1, 0xbb, 0x4e, 0xdf, 0x18, 0x16, 0xb1, 0x8c, 0x68, 0x00, 0x5e, 0x1c, 0x7e, 0x15, 0x34, 0xcc, - 0x92, 0x0d, 0xf5, 0xc9, 0x12, 0xbe, 0xb7, 0x2d, 0xa8, 0x05, 0x56, 0x5a, 0x5f, 0x19, 0xd6, 0xd7, - 0x1b, 0x79, 0x7d, 0xad, 0x03, 0x3f, 0x2c, 0xb2, 0xf8, 0x04, 0x39, 0x28, 0x61, 0xc5, 0xca, 0x96, - 0x61, 0xc3, 0x1c, 0xb1, 0xa3, 0x9f, 0x6b, 0x64, 0x19, 0x53, 0x08, 0x9f, 0xeb, 0x56, 0xfa, 0x5e, - 0xd7, 0x2b, 0x18, 0x6f, 0x05, 0x9e, 0x3b, 0xdb, 0x61, 0xaf, 0x6f, 0x02, 0xb7, 0x8b, 0x54, 0xfd, - 0x1e, 0x34, 0x8c, 0x4e, 0x19, 0x4c, 0x24, 0xab, 0x15, 0x69, 0xa4, 0xe0, 0xca, 0x32, 0x8a, 0xd8, - 0x0e, 0x5c, 0x3b, 0x72, 0xe1, 0xfe, 0x9f, 0xcd, 0x07, 0xe6, 0xa8, 0x23, 0xfa, 0x47, 0x90, 0x63, - 0x43, 0x01, 0xe5, 0x81, 0xf0, 0x62, 0xef, 0x01, 0xac, 0xa8, 0xfe, 0x1c, 0x2e, 0xe7, 0x09, 0x74, - 0xaf, 0xdb, 0xb6, 0xe0, 0xcd, 0x9c, 0x6b, 0x60, 0xf7, 0xea, 0x94, 0xa1, 0x44, 0xb2, 0xb5, 0x54, - 0x4c, 0x19, 0x87, 0x1e, 0x68, 0xcc, 0x76, 0x1c, 0x82, 0x9e, 0x75, 0x24, 0x88, 0x39, 0x62, 0x23, - 0xe8, 0x1f, 0x34, 0xb2, 0xd4, 0x0a, 0x7d, 0x3f, 0x3c, 0xb6, 0x3e, 0x3e, 0x0a, 0x1c, 0x68, 0x47, - 0x84, 0x6e, 0x0c, 0x55, 0x7e, 0x2f, 0x07, 0xdf, 0x15, 0x3b, 0x5e, 0x24, 0x40, 0xe5, 0xc7, 0x65, - 0xa8, 0x50, 0x39, 0x82, 0xa3, 0xca, 0x51, 0xdb, 0x71, 0x08, 0x54, 0x8e, 0x04, 0x31, 0xaf, 0xa7, - 0x8a, 0x0a, 0x98, 0xde, 0x27, 0x8b, 0x90, 0x51, 0xc3, 0xea, 0xa0, 0x3f, 0x8f, 0x12, 0xe1, 0x15, - 0xb8, 0x00, 0x4c, 0x71, 0xae, 0x13, 0xc9, 0x56, 0xd2, 0xcb, 0x4f, 0x45, 0x0d, 0xb3, 0x6c, 0x85, - 0x0e, 0x79, 0xe0, 0x2a, 0x0e, 0xab, 0x8a, 0x43, 0x1e, 0xb8, 0x13, 0x1c, 0xaa, 0x28, 0x38, 0x54, - 0xc7, 0x50, 0x04, 0x51, 0xe1, 0x09, 0x74, 0xa3, 0x42, 0xbf, 0x85, 0xde, 0xb0, 0x08, 0x02, 0xfc, - 0x23, 0x44, 0x8b, 0x22, 0x38, 0x84, 0x0c, 0x53, 0xe1, 0xd1, 0x09, 0xa8, 0xca, 0x9c, 0xbc, 0xa0, - 0x38, 0xe1, 0x81, 0x3b, 0xea, 0xa4, 0x80, 0xc0, 0x49, 0x31, 0x80, 0xc6, 0x1e, 0xe7, 0xc3, 0xdd, - 0x17, 0xf3, 0x48, 0x7f, 0x11, 0x7b, 0xd0, 0x95, 0xfc, 0xc4, 0xa1, 0x55, 0x03, 0xa9, 0x7a, 0x2d, - 0x6f, 0x7c, 0x4f, 0x86, 0x60, 0x22, 0xd9, 0x32, 0xfa, 0x57, 0x30, 0xc3, 0x54, 0x2d, 0xe8, 0x21, - 0x99, 0x8b, 0xb8, 0xed, 0x5a, 0x61, 0xe0, 0xf7, 0xf5, 0x3f, 0x37, 0x50, 0xe5, 0xee, 0x85, 0x64, - 0x74, 0x87, 0xf7, 0x22, 0xee, 0xd8, 0x31, 0x77, 0x4d, 0x6e, 0xbb, 0xf7, 0x03, 0xbf, 0x3f, 0x90, - 0x4c, 0x7b, 0xb5, 0xf8, 0xc7, 0x27, 0x0a, 0xb1, 0x59, 0x7f, 0x25, 0xec, 0x7a, 0x70, 0x73, 0xc6, - 0x7d, 0xfc, 0xc7, 0x67, 0x0c, 0xd5, 0x35, 0x73, 0x36, 0xca, 0x1c, 0xd0, 0x9f, 0x91, 0xe5, 0x52, - 0x07, 0x8f, 0xb7, 0xd9, 0x5f, 0x1a, 0xf8, 0xa2, 0x7a, 0xef, 0x42, 0x32, 0x7d, 0x18, 0x74, 0x77, - 0xd8, 0x87, 0xef, 0x39, 0x71, 0x1e, 0x7a, 0x63, 0xb4, 0x8d, 0xdf, 0x73, 0x62, 0x45, 0x81, 0xae, - 0x99, 0x8b, 0x65, 0x92, 0xfe, 0x98, 0x5c, 0x4d, 0xbb, 0x17, 0xa1, 0x7f, 0xd9, 0xc0, 0xca, 0xfb, - 0x2d, 0xb8, 0x06, 0x86, 0x81, 0xd2, 0xae, 0x54, 0x94, 0x3f, 0x2e, 0x9b, 0xa2, 0xb8, 0xce, 0xca, - 0xad, 0xae, 0x99, 0xb9, 0x3f, 0x7a, 0x48, 0x16, 0xb1, 0xaf, 0x1b, 0xe6, 0xdd, 0x5f, 0xd3, 0xf5, - 0xdb, 0xbe, 0x90, 0xec, 0xe6, 0x30, 0x42, 0xd3, 0xb1, 0x83, 0x22, 0xb9, 0xf2, 0x38, 0xcf, 0x16, - 0x5d, 0x5d, 0x41, 0x95, 0x3f, 0x64, 0xa1, 0xc4, 0x19, 0x9f, 0xcd, 0x90, 0x79, 0x65, 0xbb, 0xe9, - 0x47, 0xe4, 0x2a, 0x0f, 0xe2, 0xc8, 0xe3, 0x42, 0xd7, 0xf0, 0x3f, 0x10, 0x7d, 0x42, 0x52, 0xbc, - 0x17, 0xc4, 0x51, 0xbf, 0xfe, 0x62, 0xfe, 0xd7, 0x47, 0x36, 0xa1, 0xe8, 0x79, 0x61, 0x8c, 0xdb, - 0x76, 0x19, 0x7f, 0x99, 0xb9, 0x01, 0xfd, 0x5d, 0x76, 0x79, 0x09, 0x2f, 0x68, 0xfb, 0xdc, 0x42, - 0xd6, 0x12, 0xf0, 0xe8, 0x9b, 0xc6, 0x25, 0x6c, 0x41, 0x5f, 0xd4, 0xb5, 0x4f, 0x9a, 0xc8, 0x63, - 0x94, 0xa6, 0xfa, 0xf2, 0x1b, 0xa7, 0x4a, 0x7d, 0xdf, 0xd6, 0x1b, 0xca, 0x23, 0x62, 0x82, 0x1f, - 0x78, 0x00, 0x82, 0x95, 0x39, 0x81, 0xa3, 0x0f, 0xc9, 0x22, 0x48, 0x8b, 0xc3, 0x18, 0x1a, 0x68, - 0xd0, 0x34, 0x83, 0x9a, 0xf6, 0xb3, 0xfe, 0x73, 0x1f, 0x88, 0x4c, 0xcd, 0x73, 0xb9, 0x9a, 0x02, - 0x54, 0x74, 0xbc, 0x71, 0xe7, 0xad, 0x37, 0x15, 0x1d, 0xa5, 0xb9, 0xa0, 0x00, 0x78, 0xb3, 0x84, - 0x1a, 0xbf, 0xd7, 0xc8, 0xd2, 0xe8, 0xf2, 0xc2, 0x73, 0xa3, 0x0b, 0xef, 0xf1, 0xec, 0x6f, 0xc4, - 0x6f, 0xc0, 0xdb, 0x02, 0x01, 0xa5, 0x4f, 0x8a, 0x9d, 0x4e, 0xf1, 0xd2, 0x26, 0xc3, 0xa1, 0x99, - 0x1a, 0xd2, 0x06, 0xb9, 0x02, 0x0f, 0x77, 0x2f, 0xc6, 0xf5, 0x9d, 0xad, 0x6f, 0x62, 0x7f, 0x88, - 0x48, 0x71, 0x84, 0xd3, 0x61, 0xe1, 0x65, 0x5e, 0x19, 0x9b, 0x99, 0x6d, 0xfd, 0xde, 0xa3, 0xaf, - 0x36, 0xa6, 0xce, 0xbf, 0xda, 0x98, 0x7a, 0x74, 0xb1, 0xa1, 0x9d, 0x5f, 0x6c, 0x68, 0xbf, 0x7e, - 0xbc, 0x31, 0xf5, 0xc5, 0xe3, 0x0d, 0xed, 0xfc, 0xf1, 0xc6, 0xd4, 0xbf, 0x1f, 0x6f, 0x4c, 0x7d, - 0xf8, 0xd2, 0xff, 0xf0, 0xaf, 0x6f, 0x9a, 0x47, 0x07, 0x57, 0xf0, 0xdf, 0xdf, 0xd7, 0xff, 0x1b, - 0x00, 0x00, 0xff, 0xff, 0x68, 0x19, 0x36, 0x63, 0x1b, 0x18, 0x00, 0x00, -} - -func (m *FolderDeviceConfiguration) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FolderDeviceConfiguration) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FolderDeviceConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.EncryptionPassword) > 0 { - i -= len(m.EncryptionPassword) - copy(dAtA[i:], m.EncryptionPassword) - i = encodeVarintFolderconfiguration(dAtA, i, uint64(len(m.EncryptionPassword))) - i-- - dAtA[i] = 0x1a - } - { - size := m.IntroducedBy.ProtoSize() - i -= size - if _, err := m.IntroducedBy.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintFolderconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - { - size := m.DeviceID.ProtoSize() - i -= size - if _, err := m.DeviceID.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintFolderconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *FolderConfiguration) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FolderConfiguration) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FolderConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.DeprecatedScanOwnership { - i-- - if m.DeprecatedScanOwnership { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xd8 - } - if m.DeprecatedPullers != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.DeprecatedPullers)) - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xd0 - } - if m.DeprecatedMinDiskFreePct != 0 { - i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.DeprecatedMinDiskFreePct)))) - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xc9 - } - if m.DeprecatedReadOnly { - i-- - if m.DeprecatedReadOnly { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xc0 - } - if m.FSWatcherTimeoutS != 0 { - i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.FSWatcherTimeoutS)))) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xc1 - } - { - size, err := m.XattrFilter.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintFolderconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xba - if m.SendXattrs { - i-- - if m.SendXattrs { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xb0 - } - if m.SyncXattrs { - i-- - if m.SyncXattrs { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xa8 - } - if m.SendOwnership { - i-- - if m.SendOwnership { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xa0 - } - if m.SyncOwnership { - i-- - if m.SyncOwnership { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x98 - } - if m.JunctionsAsDirs { - i-- - if m.JunctionsAsDirs { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x90 - } - if m.CaseSensitiveFS { - i-- - if m.CaseSensitiveFS { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x88 - } - if m.CopyRangeMethod != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.CopyRangeMethod)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x80 - } - if m.BlockPullOrder != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.BlockPullOrder)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xf8 - } - if m.DisableFsync { - i-- - if m.DisableFsync { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xf0 - } - if m.MaxConcurrentWrites != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.MaxConcurrentWrites)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xe8 - } - if m.RawModTimeWindowS != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.RawModTimeWindowS)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xe0 - } - if m.CopyOwnershipFromParent { - i-- - if m.CopyOwnershipFromParent { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xd8 - } - if len(m.MarkerName) > 0 { - i -= len(m.MarkerName) - copy(dAtA[i:], m.MarkerName) - i = encodeVarintFolderconfiguration(dAtA, i, uint64(len(m.MarkerName))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xd2 - } - if m.WeakHashThresholdPct != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.WeakHashThresholdPct)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xc8 - } - if m.Paused { - i-- - if m.Paused { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xc0 - } - if m.DisableTempIndexes { - i-- - if m.DisableTempIndexes { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb8 - } - if m.DisableSparseFiles { - i-- - if m.DisableSparseFiles { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb0 - } - if m.MaxConflicts != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.MaxConflicts)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa8 - } - if m.PullerPauseS != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.PullerPauseS)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa0 - } - if m.ScanProgressIntervalS != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.ScanProgressIntervalS)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x98 - } - if m.IgnoreDelete { - i-- - if m.IgnoreDelete { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x90 - } - if m.Order != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.Order)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x88 - } - if m.Hashers != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.Hashers)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x80 - } - if m.PullerMaxPendingKiB != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.PullerMaxPendingKiB)) - i-- - dAtA[i] = 0x78 - } - if m.Copiers != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.Copiers)) - i-- - dAtA[i] = 0x70 - } - { - size, err := m.Versioning.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintFolderconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x6a - { - size, err := m.MinDiskFree.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintFolderconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x62 - if m.AutoNormalize { - i-- - if m.AutoNormalize { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x58 - } - if m.IgnorePerms { - i-- - if m.IgnorePerms { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x50 - } - if m.FSWatcherDelayS != 0 { - i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.FSWatcherDelayS)))) - i-- - dAtA[i] = 0x49 - } - if m.FSWatcherEnabled { - i-- - if m.FSWatcherEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x40 - } - if m.RescanIntervalS != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.RescanIntervalS)) - i-- - dAtA[i] = 0x38 - } - if len(m.Devices) > 0 { - for iNdEx := len(m.Devices) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Devices[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintFolderconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } - } - if m.Type != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.Type)) - i-- - dAtA[i] = 0x28 - } - if len(m.Path) > 0 { - i -= len(m.Path) - copy(dAtA[i:], m.Path) - i = encodeVarintFolderconfiguration(dAtA, i, uint64(len(m.Path))) - i-- - dAtA[i] = 0x22 - } - if m.FilesystemType != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.FilesystemType)) - i-- - dAtA[i] = 0x18 - } - if len(m.Label) > 0 { - i -= len(m.Label) - copy(dAtA[i:], m.Label) - i = encodeVarintFolderconfiguration(dAtA, i, uint64(len(m.Label))) - i-- - dAtA[i] = 0x12 - } - if len(m.ID) > 0 { - i -= len(m.ID) - copy(dAtA[i:], m.ID) - i = encodeVarintFolderconfiguration(dAtA, i, uint64(len(m.ID))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *XattrFilter) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *XattrFilter) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *XattrFilter) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.MaxTotalSize != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.MaxTotalSize)) - i-- - dAtA[i] = 0x18 - } - if m.MaxSingleEntrySize != 0 { - i = encodeVarintFolderconfiguration(dAtA, i, uint64(m.MaxSingleEntrySize)) - i-- - dAtA[i] = 0x10 - } - if len(m.Entries) > 0 { - for iNdEx := len(m.Entries) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Entries[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintFolderconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *XattrFilterEntry) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *XattrFilterEntry) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *XattrFilterEntry) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Permit { - i-- - if m.Permit { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - if len(m.Match) > 0 { - i -= len(m.Match) - copy(dAtA[i:], m.Match) - i = encodeVarintFolderconfiguration(dAtA, i, uint64(len(m.Match))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintFolderconfiguration(dAtA []byte, offset int, v uint64) int { - offset -= sovFolderconfiguration(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *FolderDeviceConfiguration) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.DeviceID.ProtoSize() - n += 1 + l + sovFolderconfiguration(uint64(l)) - l = m.IntroducedBy.ProtoSize() - n += 1 + l + sovFolderconfiguration(uint64(l)) - l = len(m.EncryptionPassword) - if l > 0 { - n += 1 + l + sovFolderconfiguration(uint64(l)) - } - return n -} - -func (m *FolderConfiguration) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ID) - if l > 0 { - n += 1 + l + sovFolderconfiguration(uint64(l)) - } - l = len(m.Label) - if l > 0 { - n += 1 + l + sovFolderconfiguration(uint64(l)) - } - if m.FilesystemType != 0 { - n += 1 + sovFolderconfiguration(uint64(m.FilesystemType)) - } - l = len(m.Path) - if l > 0 { - n += 1 + l + sovFolderconfiguration(uint64(l)) - } - if m.Type != 0 { - n += 1 + sovFolderconfiguration(uint64(m.Type)) - } - if len(m.Devices) > 0 { - for _, e := range m.Devices { - l = e.ProtoSize() - n += 1 + l + sovFolderconfiguration(uint64(l)) - } - } - if m.RescanIntervalS != 0 { - n += 1 + sovFolderconfiguration(uint64(m.RescanIntervalS)) - } - if m.FSWatcherEnabled { - n += 2 - } - if m.FSWatcherDelayS != 0 { - n += 9 - } - if m.IgnorePerms { - n += 2 - } - if m.AutoNormalize { - n += 2 - } - l = m.MinDiskFree.ProtoSize() - n += 1 + l + sovFolderconfiguration(uint64(l)) - l = m.Versioning.ProtoSize() - n += 1 + l + sovFolderconfiguration(uint64(l)) - if m.Copiers != 0 { - n += 1 + sovFolderconfiguration(uint64(m.Copiers)) - } - if m.PullerMaxPendingKiB != 0 { - n += 1 + sovFolderconfiguration(uint64(m.PullerMaxPendingKiB)) - } - if m.Hashers != 0 { - n += 2 + sovFolderconfiguration(uint64(m.Hashers)) - } - if m.Order != 0 { - n += 2 + sovFolderconfiguration(uint64(m.Order)) - } - if m.IgnoreDelete { - n += 3 - } - if m.ScanProgressIntervalS != 0 { - n += 2 + sovFolderconfiguration(uint64(m.ScanProgressIntervalS)) - } - if m.PullerPauseS != 0 { - n += 2 + sovFolderconfiguration(uint64(m.PullerPauseS)) - } - if m.MaxConflicts != 0 { - n += 2 + sovFolderconfiguration(uint64(m.MaxConflicts)) - } - if m.DisableSparseFiles { - n += 3 - } - if m.DisableTempIndexes { - n += 3 - } - if m.Paused { - n += 3 - } - if m.WeakHashThresholdPct != 0 { - n += 2 + sovFolderconfiguration(uint64(m.WeakHashThresholdPct)) - } - l = len(m.MarkerName) - if l > 0 { - n += 2 + l + sovFolderconfiguration(uint64(l)) - } - if m.CopyOwnershipFromParent { - n += 3 - } - if m.RawModTimeWindowS != 0 { - n += 2 + sovFolderconfiguration(uint64(m.RawModTimeWindowS)) - } - if m.MaxConcurrentWrites != 0 { - n += 2 + sovFolderconfiguration(uint64(m.MaxConcurrentWrites)) - } - if m.DisableFsync { - n += 3 - } - if m.BlockPullOrder != 0 { - n += 2 + sovFolderconfiguration(uint64(m.BlockPullOrder)) - } - if m.CopyRangeMethod != 0 { - n += 2 + sovFolderconfiguration(uint64(m.CopyRangeMethod)) - } - if m.CaseSensitiveFS { - n += 3 - } - if m.JunctionsAsDirs { - n += 3 - } - if m.SyncOwnership { - n += 3 - } - if m.SendOwnership { - n += 3 - } - if m.SyncXattrs { - n += 3 - } - if m.SendXattrs { - n += 3 - } - l = m.XattrFilter.ProtoSize() - n += 2 + l + sovFolderconfiguration(uint64(l)) - if m.FSWatcherTimeoutS != 0 { - n += 10 - } - if m.DeprecatedReadOnly { - n += 4 - } - if m.DeprecatedMinDiskFreePct != 0 { - n += 11 - } - if m.DeprecatedPullers != 0 { - n += 3 + sovFolderconfiguration(uint64(m.DeprecatedPullers)) - } - if m.DeprecatedScanOwnership { - n += 4 - } - return n -} - -func (m *XattrFilter) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Entries) > 0 { - for _, e := range m.Entries { - l = e.ProtoSize() - n += 1 + l + sovFolderconfiguration(uint64(l)) - } - } - if m.MaxSingleEntrySize != 0 { - n += 1 + sovFolderconfiguration(uint64(m.MaxSingleEntrySize)) - } - if m.MaxTotalSize != 0 { - n += 1 + sovFolderconfiguration(uint64(m.MaxTotalSize)) - } - return n -} - -func (m *XattrFilterEntry) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Match) - if l > 0 { - n += 1 + l + sovFolderconfiguration(uint64(l)) - } - if m.Permit { - n += 2 - } - return n -} - -func sovFolderconfiguration(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozFolderconfiguration(x uint64) (n int) { - return sovFolderconfiguration(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *FolderDeviceConfiguration) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FolderDeviceConfiguration: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FolderDeviceConfiguration: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeviceID", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.DeviceID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IntroducedBy", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.IntroducedBy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EncryptionPassword", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EncryptionPassword = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipFolderconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthFolderconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *FolderConfiguration) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FolderConfiguration: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FolderConfiguration: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Label", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Label = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field FilesystemType", wireType) - } - m.FilesystemType = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.FilesystemType |= fs.FilesystemType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Path", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Path = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) - } - m.Type = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Type |= FolderType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Devices", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Devices = append(m.Devices, FolderDeviceConfiguration{}) - if err := m.Devices[len(m.Devices)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RescanIntervalS", wireType) - } - m.RescanIntervalS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RescanIntervalS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field FSWatcherEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.FSWatcherEnabled = bool(v != 0) - case 9: - if wireType != 1 { - return fmt.Errorf("proto: wrong wireType = %d for field FSWatcherDelayS", wireType) - } - var v uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - m.FSWatcherDelayS = float64(math.Float64frombits(v)) - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IgnorePerms", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.IgnorePerms = bool(v != 0) - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AutoNormalize", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.AutoNormalize = bool(v != 0) - case 12: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MinDiskFree", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.MinDiskFree.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 13: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Versioning", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Versioning.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 14: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Copiers", wireType) - } - m.Copiers = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Copiers |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 15: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PullerMaxPendingKiB", wireType) - } - m.PullerMaxPendingKiB = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.PullerMaxPendingKiB |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 16: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Hashers", wireType) - } - m.Hashers = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Hashers |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 17: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Order", wireType) - } - m.Order = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Order |= PullOrder(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 18: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IgnoreDelete", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.IgnoreDelete = bool(v != 0) - case 19: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ScanProgressIntervalS", wireType) - } - m.ScanProgressIntervalS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ScanProgressIntervalS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 20: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PullerPauseS", wireType) - } - m.PullerPauseS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.PullerPauseS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 21: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxConflicts", wireType) - } - m.MaxConflicts = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxConflicts |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 22: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DisableSparseFiles", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DisableSparseFiles = bool(v != 0) - case 23: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DisableTempIndexes", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DisableTempIndexes = bool(v != 0) - case 24: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Paused", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Paused = bool(v != 0) - case 25: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field WeakHashThresholdPct", wireType) - } - m.WeakHashThresholdPct = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.WeakHashThresholdPct |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 26: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MarkerName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MarkerName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 27: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CopyOwnershipFromParent", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.CopyOwnershipFromParent = bool(v != 0) - case 28: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawModTimeWindowS", wireType) - } - m.RawModTimeWindowS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RawModTimeWindowS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 29: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxConcurrentWrites", wireType) - } - m.MaxConcurrentWrites = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxConcurrentWrites |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 30: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DisableFsync", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DisableFsync = bool(v != 0) - case 31: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockPullOrder", wireType) - } - m.BlockPullOrder = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BlockPullOrder |= BlockPullOrder(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 32: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CopyRangeMethod", wireType) - } - m.CopyRangeMethod = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CopyRangeMethod |= fs.CopyRangeMethod(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 33: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CaseSensitiveFS", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.CaseSensitiveFS = bool(v != 0) - case 34: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field JunctionsAsDirs", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.JunctionsAsDirs = bool(v != 0) - case 35: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SyncOwnership", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SyncOwnership = bool(v != 0) - case 36: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SendOwnership", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SendOwnership = bool(v != 0) - case 37: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SyncXattrs", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SyncXattrs = bool(v != 0) - case 38: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SendXattrs", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SendXattrs = bool(v != 0) - case 39: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field XattrFilter", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.XattrFilter.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 40: - if wireType != 1 { - return fmt.Errorf("proto: wrong wireType = %d for field FSWatcherTimeoutS", wireType) - } - var v uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - m.FSWatcherTimeoutS = float64(math.Float64frombits(v)) - case 9000: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedReadOnly", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DeprecatedReadOnly = bool(v != 0) - case 9001: - if wireType != 1 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedMinDiskFreePct", wireType) - } - var v uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - m.DeprecatedMinDiskFreePct = float64(math.Float64frombits(v)) - case 9002: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedPullers", wireType) - } - m.DeprecatedPullers = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeprecatedPullers |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9003: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedScanOwnership", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DeprecatedScanOwnership = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipFolderconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthFolderconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *XattrFilter) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: XattrFilter: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: XattrFilter: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Entries", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Entries = append(m.Entries, XattrFilterEntry{}) - if err := m.Entries[len(m.Entries)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxSingleEntrySize", wireType) - } - m.MaxSingleEntrySize = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxSingleEntrySize |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxTotalSize", wireType) - } - m.MaxTotalSize = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxTotalSize |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipFolderconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthFolderconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *XattrFilterEntry) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: XattrFilterEntry: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: XattrFilterEntry: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Match", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthFolderconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthFolderconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Match = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Permit", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Permit = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipFolderconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthFolderconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipFolderconfiguration(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFolderconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthFolderconfiguration - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupFolderconfiguration - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthFolderconfiguration - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthFolderconfiguration = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowFolderconfiguration = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupFolderconfiguration = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/foldertype.go b/lib/config/foldertype.go index 4f58f85b883..58d1821e66d 100644 --- a/lib/config/foldertype.go +++ b/lib/config/foldertype.go @@ -6,6 +6,15 @@ package config +type FolderType int32 + +const ( + FolderTypeSendReceive FolderType = 0 + FolderTypeSendOnly FolderType = 1 + FolderTypeReceiveOnly FolderType = 2 + FolderTypeReceiveEncrypted FolderType = 3 +) + func (t FolderType) String() string { switch t { case FolderTypeSendReceive: diff --git a/lib/config/foldertype.pb.go b/lib/config/foldertype.pb.go deleted file mode 100644 index e65848464b8..00000000000 --- a/lib/config/foldertype.pb.go +++ /dev/null @@ -1,77 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/foldertype.proto - -package config - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type FolderType int32 - -const ( - FolderTypeSendReceive FolderType = 0 - FolderTypeSendOnly FolderType = 1 - FolderTypeReceiveOnly FolderType = 2 - FolderTypeReceiveEncrypted FolderType = 3 -) - -var FolderType_name = map[int32]string{ - 0: "FOLDER_TYPE_SEND_RECEIVE", - 1: "FOLDER_TYPE_SEND_ONLY", - 2: "FOLDER_TYPE_RECEIVE_ONLY", - 3: "FOLDER_TYPE_RECEIVE_ENCRYPTED", -} - -var FolderType_value = map[string]int32{ - "FOLDER_TYPE_SEND_RECEIVE": 0, - "FOLDER_TYPE_SEND_ONLY": 1, - "FOLDER_TYPE_RECEIVE_ONLY": 2, - "FOLDER_TYPE_RECEIVE_ENCRYPTED": 3, -} - -func (FolderType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_ea6ddb20c0633575, []int{0} -} - -func init() { - proto.RegisterEnum("config.FolderType", FolderType_name, FolderType_value) -} - -func init() { proto.RegisterFile("lib/config/foldertype.proto", fileDescriptor_ea6ddb20c0633575) } - -var fileDescriptor_ea6ddb20c0633575 = []byte{ - // 287 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xce, 0xc9, 0x4c, 0xd2, - 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x4f, 0xcb, 0xcf, 0x49, 0x49, 0x2d, 0x2a, 0xa9, 0x2c, - 0x48, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0x48, 0x48, 0x29, 0x17, 0xa5, 0x16, - 0xe4, 0x17, 0xeb, 0x83, 0x05, 0x93, 0x4a, 0xd3, 0xf4, 0xd3, 0xf3, 0xd3, 0xf3, 0xc1, 0x1c, 0x30, - 0x0b, 0xa2, 0x58, 0xeb, 0x17, 0x23, 0x17, 0x97, 0x1b, 0xd8, 0x84, 0x90, 0xca, 0x82, 0x54, 0x21, - 0x73, 0x2e, 0x09, 0x37, 0x7f, 0x1f, 0x17, 0xd7, 0xa0, 0xf8, 0x90, 0xc8, 0x00, 0xd7, 0xf8, 0x60, - 0x57, 0x3f, 0x97, 0xf8, 0x20, 0x57, 0x67, 0x57, 0xcf, 0x30, 0x57, 0x01, 0x06, 0x29, 0xc9, 0xae, - 0xb9, 0x0a, 0xa2, 0x08, 0xd5, 0xc1, 0xa9, 0x79, 0x29, 0x41, 0xa9, 0xc9, 0xa9, 0x99, 0x65, 0xa9, - 0x42, 0x86, 0x5c, 0xa2, 0x18, 0x1a, 0xfd, 0xfd, 0x7c, 0x22, 0x05, 0x18, 0xa5, 0xc4, 0xba, 0xe6, - 0x2a, 0x08, 0xa1, 0xea, 0xf2, 0xcf, 0xcb, 0xa9, 0x44, 0xb7, 0x0b, 0x6a, 0x0d, 0x44, 0x17, 0x13, - 0xba, 0x5d, 0x50, 0x7b, 0xc0, 0x1a, 0x1d, 0xb9, 0x64, 0xb1, 0x69, 0x74, 0xf5, 0x73, 0x0e, 0x8a, - 0x0c, 0x08, 0x71, 0x75, 0x11, 0x60, 0x96, 0x92, 0xeb, 0x9a, 0xab, 0x20, 0x85, 0xa1, 0xdb, 0x35, - 0x2f, 0xb9, 0xa8, 0xb2, 0xa0, 0x24, 0x35, 0x45, 0x8a, 0x65, 0xc5, 0x12, 0x39, 0x06, 0x27, 0xef, - 0x13, 0x0f, 0xe5, 0x18, 0x2e, 0x3c, 0x94, 0x63, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, - 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x16, 0x3c, 0x96, 0x63, 0xbc, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, - 0x39, 0x86, 0x28, 0xcd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe2, - 0xca, 0xbc, 0xe4, 0x92, 0x8c, 0xcc, 0xbc, 0x74, 0x24, 0x16, 0x22, 0x1e, 0x92, 0xd8, 0xc0, 0x01, - 0x6a, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x87, 0xbe, 0x2d, 0x9c, 0x01, 0x00, 0x00, -} diff --git a/lib/config/guiconfiguration.go b/lib/config/guiconfiguration.go index 538bcef9207..749f6f349c9 100644 --- a/lib/config/guiconfiguration.go +++ b/lib/config/guiconfiguration.go @@ -18,6 +18,23 @@ import ( "github.com/syncthing/syncthing/lib/rand" ) +type GUIConfiguration struct { + Enabled bool `json:"enabled" xml:"enabled,attr" default:"true"` + RawAddress string `json:"address" xml:"address" default:"127.0.0.1:8384"` + RawUnixSocketPermissions string `json:"unixSocketPermissions" xml:"unixSocketPermissions,omitempty"` + User string `json:"user" xml:"user,omitempty"` + Password string `json:"password" xml:"password,omitempty"` + AuthMode AuthMode `json:"authMode" xml:"authMode,omitempty"` + RawUseTLS bool `json:"useTLS" xml:"tls,attr"` + APIKey string `json:"apiKey" xml:"apikey,omitempty"` + InsecureAdminAccess bool `json:"insecureAdminAccess" xml:"insecureAdminAccess,omitempty"` + Theme string `json:"theme" xml:"theme" default:"default"` + Debugging bool `json:"debugging" xml:"debugging,attr"` + InsecureSkipHostCheck bool `json:"insecureSkipHostcheck" xml:"insecureSkipHostcheck,omitempty"` + InsecureAllowFrameLoading bool `json:"insecureAllowFrameLoading" xml:"insecureAllowFrameLoading,omitempty"` + SendBasicAuthPrompt bool `json:"sendBasicAuthPrompt" xml:"sendBasicAuthPrompt,attr"` +} + func (c GUIConfiguration) IsAuthEnabled() bool { // This function should match isAuthEnabled() in syncthingController.js return c.AuthMode == AuthModeLDAP || (len(c.User) > 0 && len(c.Password) > 0) diff --git a/lib/config/guiconfiguration.pb.go b/lib/config/guiconfiguration.pb.go deleted file mode 100644 index 23155203e32..00000000000 --- a/lib/config/guiconfiguration.pb.go +++ /dev/null @@ -1,840 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/guiconfiguration.proto - -package config - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type GUIConfiguration struct { - Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled" xml:"enabled,attr" default:"true"` - RawAddress string `protobuf:"bytes,2,opt,name=address,proto3" json:"address" xml:"address" default:"127.0.0.1:8384"` - RawUnixSocketPermissions string `protobuf:"bytes,3,opt,name=unix_socket_permissions,json=unixSocketPermissions,proto3" json:"unixSocketPermissions" xml:"unixSocketPermissions,omitempty"` - User string `protobuf:"bytes,4,opt,name=user,proto3" json:"user" xml:"user,omitempty"` - Password string `protobuf:"bytes,5,opt,name=password,proto3" json:"password" xml:"password,omitempty"` - AuthMode AuthMode `protobuf:"varint,6,opt,name=auth_mode,json=authMode,proto3,enum=config.AuthMode" json:"authMode" xml:"authMode,omitempty"` - RawUseTLS bool `protobuf:"varint,7,opt,name=use_tls,json=useTls,proto3" json:"useTLS" xml:"tls,attr"` - APIKey string `protobuf:"bytes,8,opt,name=api_key,json=apiKey,proto3" json:"apiKey" xml:"apikey,omitempty"` - InsecureAdminAccess bool `protobuf:"varint,9,opt,name=insecure_admin_access,json=insecureAdminAccess,proto3" json:"insecureAdminAccess" xml:"insecureAdminAccess,omitempty"` - Theme string `protobuf:"bytes,10,opt,name=theme,proto3" json:"theme" xml:"theme" default:"default"` - Debugging bool `protobuf:"varint,11,opt,name=debugging,proto3" json:"debugging" xml:"debugging,attr"` - InsecureSkipHostCheck bool `protobuf:"varint,12,opt,name=insecure_skip_host_check,json=insecureSkipHostCheck,proto3" json:"insecureSkipHostcheck" xml:"insecureSkipHostcheck,omitempty"` - InsecureAllowFrameLoading bool `protobuf:"varint,13,opt,name=insecure_allow_frame_loading,json=insecureAllowFrameLoading,proto3" json:"insecureAllowFrameLoading" xml:"insecureAllowFrameLoading,omitempty"` - SendBasicAuthPrompt bool `protobuf:"varint,14,opt,name=send_basic_auth_prompt,json=sendBasicAuthPrompt,proto3" json:"sendBasicAuthPrompt" xml:"sendBasicAuthPrompt,attr"` -} - -func (m *GUIConfiguration) Reset() { *m = GUIConfiguration{} } -func (m *GUIConfiguration) String() string { return proto.CompactTextString(m) } -func (*GUIConfiguration) ProtoMessage() {} -func (*GUIConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_2a9586d611855d64, []int{0} -} -func (m *GUIConfiguration) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GUIConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GUIConfiguration.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *GUIConfiguration) XXX_Merge(src proto.Message) { - xxx_messageInfo_GUIConfiguration.Merge(m, src) -} -func (m *GUIConfiguration) XXX_Size() int { - return m.ProtoSize() -} -func (m *GUIConfiguration) XXX_DiscardUnknown() { - xxx_messageInfo_GUIConfiguration.DiscardUnknown(m) -} - -var xxx_messageInfo_GUIConfiguration proto.InternalMessageInfo - -func init() { - proto.RegisterType((*GUIConfiguration)(nil), "config.GUIConfiguration") -} - -func init() { proto.RegisterFile("lib/config/guiconfiguration.proto", fileDescriptor_2a9586d611855d64) } - -var fileDescriptor_2a9586d611855d64 = []byte{ - // 888 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x16, 0x5b, 0x47, 0xb2, 0xb6, 0x89, 0x60, 0xb0, 0x4d, 0xca, 0x04, 0x0d, 0xd7, 0x51, 0xd8, - 0xc2, 0x01, 0x02, 0x39, 0x71, 0x5a, 0x24, 0xf0, 0xa1, 0x80, 0x1c, 0x20, 0x4d, 0x60, 0x17, 0x30, - 0xe8, 0xfa, 0x92, 0x0b, 0xb1, 0x22, 0xd7, 0xd2, 0x42, 0xfc, 0x2b, 0x77, 0x09, 0x5b, 0x87, 0xf6, - 0x01, 0x7a, 0x2a, 0xdc, 0x73, 0x81, 0x3e, 0x43, 0x2f, 0x7d, 0x85, 0xdc, 0xa4, 0x53, 0xd1, 0xd3, - 0x02, 0x91, 0xd1, 0x0b, 0x8f, 0x3c, 0xe6, 0x54, 0xec, 0xf2, 0x47, 0xa2, 0x4c, 0x37, 0xb9, 0xed, - 0x7c, 0xf3, 0xcd, 0x7c, 0x33, 0xc3, 0x19, 0x10, 0xdc, 0x73, 0xc9, 0x60, 0xdb, 0x0e, 0xfc, 0x13, - 0x32, 0xdc, 0x1e, 0xc6, 0x24, 0x7b, 0xc5, 0x11, 0x62, 0x24, 0xf0, 0x7b, 0x61, 0x14, 0xb0, 0x40, - 0x6d, 0x66, 0xe0, 0x9d, 0xdb, 0x4b, 0x54, 0x14, 0xb3, 0x91, 0x17, 0x38, 0x38, 0xa3, 0xdc, 0x69, - 0xe3, 0x33, 0x96, 0x3d, 0xbb, 0xff, 0xde, 0x00, 0x1b, 0xdf, 0x1d, 0xbf, 0x7a, 0xbe, 0x9c, 0x48, - 0x1d, 0x80, 0x16, 0xf6, 0xd1, 0xc0, 0xc5, 0x8e, 0xa6, 0x6c, 0x2a, 0x5b, 0xeb, 0x7b, 0x2f, 0x13, - 0x0e, 0x0b, 0x28, 0xe5, 0xf0, 0xde, 0x99, 0xe7, 0xee, 0x76, 0x73, 0xfb, 0x21, 0x62, 0x2c, 0xea, - 0x6e, 0x3a, 0xf8, 0x04, 0xc5, 0x2e, 0xdb, 0xed, 0xb2, 0x28, 0xc6, 0xdd, 0x64, 0x6a, 0x5c, 0x5f, - 0xf6, 0xbf, 0x9b, 0x1a, 0x6b, 0xc2, 0x61, 0x16, 0x59, 0xd4, 0x9f, 0x40, 0x0b, 0x39, 0x4e, 0x84, - 0x29, 0xd5, 0x3e, 0xda, 0x54, 0xb6, 0xda, 0x7b, 0xf6, 0x9c, 0x43, 0x60, 0xa2, 0xd3, 0x7e, 0x86, - 0x0a, 0xc5, 0x9c, 0x90, 0x72, 0xf8, 0x95, 0x54, 0xcc, 0xed, 0x25, 0xb1, 0xc7, 0x3b, 0x4f, 0x7b, - 0x8f, 0x7a, 0x8f, 0x7a, 0x8f, 0x77, 0x9f, 0x3d, 0x79, 0xf6, 0x75, 0xf7, 0xdd, 0xd4, 0xe8, 0x54, - 0xa1, 0xf3, 0x99, 0xb1, 0x94, 0xd4, 0x2c, 0x52, 0xaa, 0x7f, 0x2b, 0xe0, 0xf3, 0xd8, 0x27, 0x67, - 0x16, 0x0d, 0xec, 0x31, 0x66, 0x56, 0x88, 0x23, 0x8f, 0x50, 0x4a, 0x02, 0x9f, 0x6a, 0x1f, 0xcb, - 0x7a, 0x7e, 0x57, 0xe6, 0x1c, 0x6a, 0x26, 0x3a, 0x3d, 0xf6, 0xc9, 0xd9, 0x91, 0x64, 0x1d, 0x2e, - 0x48, 0x09, 0x87, 0x37, 0xe3, 0x3a, 0x47, 0xca, 0xe1, 0x97, 0xb2, 0xd8, 0x5a, 0xef, 0xc3, 0xc0, - 0x23, 0x0c, 0x7b, 0x21, 0x9b, 0x88, 0x11, 0xc1, 0xf7, 0x70, 0xce, 0x67, 0xc6, 0x95, 0x05, 0x98, - 0xf5, 0xf2, 0xea, 0x0b, 0xb0, 0x16, 0x53, 0x1c, 0x69, 0x6b, 0xb2, 0x89, 0x9d, 0x84, 0x43, 0x69, - 0xa7, 0x1c, 0x7e, 0x96, 0x95, 0x45, 0x71, 0x54, 0xad, 0xa2, 0x53, 0x85, 0x4c, 0xc9, 0x57, 0x5f, - 0x83, 0xf5, 0x10, 0x51, 0x7a, 0x1a, 0x44, 0x8e, 0x76, 0x4d, 0xe6, 0xfa, 0x36, 0xe1, 0xb0, 0xc4, - 0x52, 0x0e, 0x35, 0x99, 0xaf, 0x00, 0xaa, 0x39, 0xd5, 0xcb, 0xb0, 0x59, 0xc6, 0xaa, 0x1e, 0x68, - 0x8b, 0x8d, 0xb4, 0xc4, 0x4a, 0x6a, 0xcd, 0x4d, 0x65, 0xab, 0xb3, 0xb3, 0xd1, 0xcb, 0x56, 0xb5, - 0xd7, 0x8f, 0xd9, 0xe8, 0xfb, 0xc0, 0xc1, 0x99, 0x1c, 0xca, 0xad, 0x52, 0xae, 0x00, 0x56, 0xe4, - 0x2e, 0xc3, 0x66, 0x19, 0xab, 0x62, 0xd0, 0x8a, 0x29, 0xb6, 0x98, 0x4b, 0xb5, 0x96, 0x5c, 0xe7, - 0x83, 0x39, 0x87, 0x6d, 0x31, 0x58, 0x8a, 0x7f, 0x38, 0x38, 0x4a, 0x38, 0x6c, 0xc6, 0xf2, 0x95, - 0x72, 0xd8, 0x91, 0x2a, 0xcc, 0xa5, 0xd9, 0x5a, 0x27, 0x53, 0x63, 0xbd, 0x30, 0xd2, 0xa9, 0x91, - 0xf3, 0xce, 0x67, 0xc6, 0x22, 0xdc, 0x94, 0xa0, 0x4b, 0x85, 0x0c, 0x0a, 0x89, 0x35, 0xc6, 0x13, - 0x6d, 0x5d, 0x0e, 0x4c, 0xc8, 0x34, 0xfb, 0x87, 0xaf, 0xf6, 0xf1, 0x44, 0x68, 0xa0, 0x90, 0xec, - 0xe3, 0x49, 0xca, 0xe1, 0xad, 0xac, 0x93, 0x90, 0x8c, 0xf1, 0xa4, 0xda, 0xc7, 0xc6, 0x2a, 0x78, - 0x3e, 0x33, 0xf2, 0x0c, 0x66, 0x1e, 0xaf, 0xfe, 0xa6, 0x80, 0x9b, 0xc4, 0xa7, 0xd8, 0x8e, 0x23, - 0x6c, 0x21, 0xc7, 0x23, 0xbe, 0x85, 0x6c, 0x5b, 0xdc, 0x51, 0x5b, 0x36, 0x67, 0x25, 0x1c, 0x7e, - 0x5a, 0x10, 0xfa, 0xc2, 0xdf, 0x97, 0xee, 0x94, 0xc3, 0xfb, 0x52, 0xb8, 0xc6, 0x57, 0xad, 0xe2, - 0xee, 0xff, 0x32, 0xcc, 0xba, 0xe4, 0xea, 0x3e, 0xb8, 0xc6, 0x46, 0xd8, 0xc3, 0x1a, 0x90, 0xad, - 0x7f, 0x93, 0x70, 0x98, 0x01, 0x29, 0x87, 0x77, 0xb3, 0x99, 0x0a, 0x6b, 0xe9, 0x74, 0xf3, 0x87, - 0xb8, 0xd9, 0x56, 0xfe, 0x36, 0xb3, 0x10, 0xf5, 0x18, 0xb4, 0x1d, 0x3c, 0x88, 0x87, 0x43, 0xe2, - 0x0f, 0xb5, 0x4f, 0x64, 0x57, 0x4f, 0x13, 0x0e, 0x17, 0x60, 0xb9, 0xcd, 0x25, 0x52, 0x7e, 0xae, - 0x4e, 0x15, 0x32, 0x17, 0x41, 0xea, 0x5f, 0x0a, 0xd0, 0xca, 0xc9, 0xd1, 0x31, 0x09, 0xad, 0x51, - 0x40, 0x99, 0x65, 0x8f, 0xb0, 0x3d, 0xd6, 0xae, 0x4b, 0x99, 0x9f, 0xc5, 0x5d, 0x17, 0x9c, 0xa3, - 0x31, 0x09, 0x5f, 0x06, 0x94, 0x49, 0x42, 0x79, 0xd7, 0xb5, 0xde, 0x95, 0xbb, 0x7e, 0x0f, 0x27, - 0x9d, 0x1a, 0xf5, 0x22, 0xe6, 0x25, 0xf8, 0xb9, 0x80, 0xd5, 0x3f, 0x15, 0xf0, 0xc5, 0xe2, 0x9b, - 0xbb, 0x6e, 0x70, 0x6a, 0x9d, 0x44, 0xc8, 0xc3, 0x96, 0x1b, 0x20, 0x47, 0x0c, 0xe9, 0x86, 0xac, - 0xfe, 0xc7, 0x84, 0xc3, 0xdb, 0xe5, 0xd7, 0x11, 0xb4, 0x17, 0x82, 0x75, 0x90, 0x91, 0x52, 0x0e, - 0x1f, 0x54, 0x17, 0x60, 0x95, 0x51, 0xed, 0xe2, 0xfe, 0x07, 0xf0, 0xcc, 0xab, 0xe5, 0xd4, 0x5f, - 0x14, 0x70, 0x8b, 0x62, 0xdf, 0xb1, 0x06, 0x88, 0x12, 0xdb, 0x92, 0x17, 0x1f, 0x46, 0x81, 0x17, - 0x32, 0xad, 0x23, 0xcb, 0x3d, 0x16, 0x9b, 0x2a, 0x18, 0x7b, 0x82, 0x20, 0x0e, 0xff, 0x50, 0xba, - 0x53, 0x0e, 0x75, 0x59, 0x68, 0x8d, 0xaf, 0xfc, 0xce, 0xda, 0x55, 0x4e, 0xb3, 0x2e, 0xe5, 0xde, - 0xfe, 0x9b, 0xb7, 0x7a, 0x63, 0xf6, 0x56, 0x6f, 0xbc, 0x99, 0xeb, 0xca, 0x6c, 0xae, 0x2b, 0xbf, - 0x5e, 0xe8, 0x8d, 0x3f, 0x2e, 0x74, 0x65, 0x76, 0xa1, 0x37, 0xfe, 0xb9, 0xd0, 0x1b, 0xaf, 0x1f, - 0x0c, 0x09, 0x1b, 0xc5, 0x83, 0x9e, 0x1d, 0x78, 0xdb, 0x74, 0xe2, 0xdb, 0x6c, 0x44, 0xfc, 0xe1, - 0xd2, 0x6b, 0xf1, 0x3b, 0x1d, 0x34, 0xe5, 0xbf, 0xf3, 0xc9, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xfe, 0x19, 0xb2, 0x3c, 0x8e, 0x07, 0x00, 0x00, -} - -func (m *GUIConfiguration) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *GUIConfiguration) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GUIConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.SendBasicAuthPrompt { - i-- - if m.SendBasicAuthPrompt { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x70 - } - if m.InsecureAllowFrameLoading { - i-- - if m.InsecureAllowFrameLoading { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x68 - } - if m.InsecureSkipHostCheck { - i-- - if m.InsecureSkipHostCheck { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x60 - } - if m.Debugging { - i-- - if m.Debugging { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x58 - } - if len(m.Theme) > 0 { - i -= len(m.Theme) - copy(dAtA[i:], m.Theme) - i = encodeVarintGuiconfiguration(dAtA, i, uint64(len(m.Theme))) - i-- - dAtA[i] = 0x52 - } - if m.InsecureAdminAccess { - i-- - if m.InsecureAdminAccess { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x48 - } - if len(m.APIKey) > 0 { - i -= len(m.APIKey) - copy(dAtA[i:], m.APIKey) - i = encodeVarintGuiconfiguration(dAtA, i, uint64(len(m.APIKey))) - i-- - dAtA[i] = 0x42 - } - if m.RawUseTLS { - i-- - if m.RawUseTLS { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if m.AuthMode != 0 { - i = encodeVarintGuiconfiguration(dAtA, i, uint64(m.AuthMode)) - i-- - dAtA[i] = 0x30 - } - if len(m.Password) > 0 { - i -= len(m.Password) - copy(dAtA[i:], m.Password) - i = encodeVarintGuiconfiguration(dAtA, i, uint64(len(m.Password))) - i-- - dAtA[i] = 0x2a - } - if len(m.User) > 0 { - i -= len(m.User) - copy(dAtA[i:], m.User) - i = encodeVarintGuiconfiguration(dAtA, i, uint64(len(m.User))) - i-- - dAtA[i] = 0x22 - } - if len(m.RawUnixSocketPermissions) > 0 { - i -= len(m.RawUnixSocketPermissions) - copy(dAtA[i:], m.RawUnixSocketPermissions) - i = encodeVarintGuiconfiguration(dAtA, i, uint64(len(m.RawUnixSocketPermissions))) - i-- - dAtA[i] = 0x1a - } - if len(m.RawAddress) > 0 { - i -= len(m.RawAddress) - copy(dAtA[i:], m.RawAddress) - i = encodeVarintGuiconfiguration(dAtA, i, uint64(len(m.RawAddress))) - i-- - dAtA[i] = 0x12 - } - if m.Enabled { - i-- - if m.Enabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintGuiconfiguration(dAtA []byte, offset int, v uint64) int { - offset -= sovGuiconfiguration(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *GUIConfiguration) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Enabled { - n += 2 - } - l = len(m.RawAddress) - if l > 0 { - n += 1 + l + sovGuiconfiguration(uint64(l)) - } - l = len(m.RawUnixSocketPermissions) - if l > 0 { - n += 1 + l + sovGuiconfiguration(uint64(l)) - } - l = len(m.User) - if l > 0 { - n += 1 + l + sovGuiconfiguration(uint64(l)) - } - l = len(m.Password) - if l > 0 { - n += 1 + l + sovGuiconfiguration(uint64(l)) - } - if m.AuthMode != 0 { - n += 1 + sovGuiconfiguration(uint64(m.AuthMode)) - } - if m.RawUseTLS { - n += 2 - } - l = len(m.APIKey) - if l > 0 { - n += 1 + l + sovGuiconfiguration(uint64(l)) - } - if m.InsecureAdminAccess { - n += 2 - } - l = len(m.Theme) - if l > 0 { - n += 1 + l + sovGuiconfiguration(uint64(l)) - } - if m.Debugging { - n += 2 - } - if m.InsecureSkipHostCheck { - n += 2 - } - if m.InsecureAllowFrameLoading { - n += 2 - } - if m.SendBasicAuthPrompt { - n += 2 - } - return n -} - -func sovGuiconfiguration(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozGuiconfiguration(x uint64) (n int) { - return sovGuiconfiguration(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *GUIConfiguration) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: GUIConfiguration: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GUIConfiguration: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Enabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Enabled = bool(v != 0) - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RawAddress", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGuiconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGuiconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RawAddress = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RawUnixSocketPermissions", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGuiconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGuiconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RawUnixSocketPermissions = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field User", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGuiconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGuiconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.User = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Password", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGuiconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGuiconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Password = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AuthMode", wireType) - } - m.AuthMode = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.AuthMode |= AuthMode(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawUseTLS", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.RawUseTLS = bool(v != 0) - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field APIKey", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGuiconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGuiconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.APIKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 9: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InsecureAdminAccess", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.InsecureAdminAccess = bool(v != 0) - case 10: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Theme", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGuiconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGuiconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Theme = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Debugging", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Debugging = bool(v != 0) - case 12: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InsecureSkipHostCheck", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.InsecureSkipHostCheck = bool(v != 0) - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InsecureAllowFrameLoading", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.InsecureAllowFrameLoading = bool(v != 0) - case 14: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SendBasicAuthPrompt", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SendBasicAuthPrompt = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipGuiconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGuiconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipGuiconfiguration(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGuiconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthGuiconfiguration - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupGuiconfiguration - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthGuiconfiguration - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthGuiconfiguration = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGuiconfiguration = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupGuiconfiguration = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/ldapconfiguration.go b/lib/config/ldapconfiguration.go index f1f83cc2c50..4579f6230af 100644 --- a/lib/config/ldapconfiguration.go +++ b/lib/config/ldapconfiguration.go @@ -6,6 +6,15 @@ package config +type LDAPConfiguration struct { + Address string `json:"address" xml:"address,omitempty"` + BindDN string `json:"bindDN" xml:"bindDN,omitempty"` + Transport LDAPTransport `json:"transport" xml:"transport,omitempty"` + InsecureSkipVerify bool `json:"insecureSkipVerify" xml:"insecureSkipVerify,omitempty" default:"false"` + SearchBaseDN string `json:"searchBaseDN" xml:"searchBaseDN,omitempty"` + SearchFilter string `json:"searchFilter" xml:"searchFilter,omitempty"` +} + func (c LDAPConfiguration) Copy() LDAPConfiguration { return c } diff --git a/lib/config/ldapconfiguration.pb.go b/lib/config/ldapconfiguration.pb.go deleted file mode 100644 index 5828438f162..00000000000 --- a/lib/config/ldapconfiguration.pb.go +++ /dev/null @@ -1,526 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/ldapconfiguration.proto - -package config - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type LDAPConfiguration struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address" xml:"address,omitempty"` - BindDN string `protobuf:"bytes,2,opt,name=bind_dn,json=bindDn,proto3" json:"bindDN" xml:"bindDN,omitempty"` - Transport LDAPTransport `protobuf:"varint,3,opt,name=transport,proto3,enum=config.LDAPTransport" json:"transport" xml:"transport,omitempty"` - InsecureSkipVerify bool `protobuf:"varint,4,opt,name=insecure_skip_verify,json=insecureSkipVerify,proto3" json:"insecureSkipVerify" xml:"insecureSkipVerify,omitempty" default:"false"` - SearchBaseDN string `protobuf:"bytes,5,opt,name=search_base_dn,json=searchBaseDn,proto3" json:"searchBaseDN" xml:"searchBaseDN,omitempty"` - SearchFilter string `protobuf:"bytes,6,opt,name=search_filter,json=searchFilter,proto3" json:"searchFilter" xml:"searchFilter,omitempty"` -} - -func (m *LDAPConfiguration) Reset() { *m = LDAPConfiguration{} } -func (m *LDAPConfiguration) String() string { return proto.CompactTextString(m) } -func (*LDAPConfiguration) ProtoMessage() {} -func (*LDAPConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_9681ad7e41c73956, []int{0} -} -func (m *LDAPConfiguration) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *LDAPConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_LDAPConfiguration.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *LDAPConfiguration) XXX_Merge(src proto.Message) { - xxx_messageInfo_LDAPConfiguration.Merge(m, src) -} -func (m *LDAPConfiguration) XXX_Size() int { - return m.ProtoSize() -} -func (m *LDAPConfiguration) XXX_DiscardUnknown() { - xxx_messageInfo_LDAPConfiguration.DiscardUnknown(m) -} - -var xxx_messageInfo_LDAPConfiguration proto.InternalMessageInfo - -func init() { - proto.RegisterType((*LDAPConfiguration)(nil), "config.LDAPConfiguration") -} - -func init() { - proto.RegisterFile("lib/config/ldapconfiguration.proto", fileDescriptor_9681ad7e41c73956) -} - -var fileDescriptor_9681ad7e41c73956 = []byte{ - // 500 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xb6, 0x81, 0xba, 0xc4, 0x2a, 0x15, 0x35, 0x50, 0x4c, 0x55, 0xf9, 0x22, 0xcb, 0x43, 0x90, - 0x50, 0x22, 0x95, 0xad, 0x4c, 0x35, 0x15, 0x03, 0x20, 0x84, 0x5c, 0xe8, 0xc0, 0x12, 0xf9, 0xc7, - 0x39, 0x39, 0xd5, 0x39, 0x5b, 0x77, 0xe7, 0xaa, 0xe1, 0xaf, 0x80, 0xfe, 0x05, 0xdd, 0xf8, 0x57, - 0xba, 0xc5, 0x23, 0xd3, 0x49, 0x4d, 0x36, 0x8f, 0x1e, 0x99, 0x50, 0xce, 0x4e, 0x63, 0xa7, 0x51, - 0xb7, 0xf7, 0xbe, 0xef, 0xbd, 0xef, 0x7d, 0x77, 0x4f, 0x4f, 0x35, 0x23, 0xe4, 0xf5, 0xfc, 0x18, - 0x87, 0x68, 0xd0, 0x8b, 0x02, 0x37, 0x29, 0xc3, 0x94, 0xb8, 0x0c, 0xc5, 0xb8, 0x9b, 0x90, 0x98, - 0xc5, 0x9a, 0x52, 0x82, 0x7b, 0xc6, 0x4a, 0x2d, 0x23, 0x2e, 0xa6, 0x49, 0x4c, 0x58, 0x59, 0xb7, - 0xd7, 0x82, 0x17, 0x55, 0x68, 0xfe, 0x56, 0xd4, 0x9d, 0xcf, 0xc7, 0x47, 0x5f, 0xdf, 0xd7, 0xe5, - 0xb4, 0xef, 0xea, 0xa6, 0x1b, 0x04, 0x04, 0x52, 0xaa, 0xcb, 0x6d, 0xb9, 0xd3, 0xb2, 0xdf, 0xe5, - 0x1c, 0x2c, 0xa0, 0x82, 0x83, 0x97, 0x17, 0xa3, 0xe8, 0xd0, 0xac, 0xf2, 0x37, 0xf1, 0x08, 0x31, - 0x38, 0x4a, 0xd8, 0xd8, 0xcc, 0x27, 0xd6, 0xce, 0x1d, 0xd4, 0x59, 0x34, 0x6a, 0xb1, 0xba, 0xe9, - 0x21, 0x1c, 0xf4, 0x03, 0xac, 0x3f, 0x10, 0xb2, 0xa7, 0x53, 0x0e, 0x14, 0x1b, 0xe1, 0xe0, 0xf8, - 0x4b, 0xce, 0x81, 0xe2, 0x89, 0xa8, 0xe0, 0x60, 0x57, 0xe8, 0x97, 0x69, 0x53, 0xfe, 0xe9, 0x2a, - 0x58, 0x4c, 0xac, 0xaa, 0xef, 0x32, 0xb3, 0x2a, 0x2d, 0xa7, 0x44, 0xb0, 0x76, 0xae, 0xb6, 0x6e, - 0xdf, 0xae, 0x3f, 0x6c, 0xcb, 0x9d, 0xed, 0x83, 0x17, 0xdd, 0xf2, 0x63, 0xba, 0xf3, 0x57, 0x7f, - 0x5b, 0x90, 0xf6, 0x51, 0xce, 0xc1, 0xb2, 0xb6, 0xe0, 0xe0, 0x95, 0xb0, 0x70, 0x8b, 0x34, 0x5d, - 0x3c, 0x5b, 0x83, 0x3b, 0xcb, 0x76, 0xed, 0x8f, 0xac, 0x3e, 0x47, 0x98, 0x42, 0x3f, 0x25, 0xb0, - 0x4f, 0xcf, 0x50, 0xd2, 0x3f, 0x87, 0x04, 0x85, 0x63, 0xfd, 0x51, 0x5b, 0xee, 0x3c, 0xb6, 0xd3, - 0x9c, 0x03, 0x6d, 0xc1, 0x9f, 0x9c, 0xa1, 0xe4, 0x54, 0xb0, 0x05, 0x07, 0x07, 0x62, 0xea, 0x5d, - 0xaa, 0x36, 0xbe, 0x1d, 0xc0, 0xd0, 0x4d, 0x23, 0x76, 0x68, 0x86, 0x6e, 0x44, 0xe1, 0xdc, 0xce, - 0xfe, 0x7d, 0x0d, 0xff, 0x26, 0xd6, 0x86, 0xa8, 0x74, 0xd6, 0x8c, 0xd4, 0xae, 0x64, 0x75, 0x9b, - 0x42, 0x97, 0xf8, 0xc3, 0xbe, 0xe7, 0x52, 0x38, 0x5f, 0xcd, 0x86, 0x58, 0xcd, 0xcf, 0x29, 0x07, - 0x5b, 0x27, 0x82, 0xb1, 0x5d, 0x0a, 0xc5, 0x82, 0xb6, 0x68, 0x2d, 0x2f, 0x38, 0xd8, 0x17, 0x6e, - 0xeb, 0x60, 0xf3, 0x9b, 0x76, 0xd7, 0x53, 0xc5, 0xc4, 0x6a, 0x28, 0x5d, 0x66, 0x56, 0x63, 0x92, - 0x53, 0x67, 0xb1, 0x16, 0xab, 0x4f, 0x2a, 0x87, 0x21, 0x8a, 0x18, 0x24, 0xba, 0x22, 0x0c, 0x7e, - 0x5c, 0x1a, 0xfa, 0x20, 0xf0, 0x15, 0x43, 0x25, 0xb8, 0xd6, 0xd0, 0x2a, 0xe5, 0x34, 0x74, 0xec, - 0x4f, 0xd7, 0x37, 0x86, 0x94, 0xdd, 0x18, 0xd2, 0xf5, 0xd4, 0x90, 0xb3, 0xa9, 0x21, 0xff, 0x9a, - 0x19, 0xd2, 0xd5, 0xcc, 0x90, 0xb3, 0x99, 0x21, 0xfd, 0x9d, 0x19, 0xd2, 0x8f, 0xd7, 0x03, 0xc4, - 0x86, 0xa9, 0xd7, 0xf5, 0xe3, 0x51, 0x8f, 0x8e, 0xb1, 0xcf, 0x86, 0x08, 0x0f, 0x6a, 0xd1, 0xf2, - 0xfe, 0x3c, 0x45, 0xdc, 0xd9, 0xdb, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x64, 0x4b, 0x05, - 0xc0, 0x03, 0x00, 0x00, -} - -func (m *LDAPConfiguration) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *LDAPConfiguration) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *LDAPConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.SearchFilter) > 0 { - i -= len(m.SearchFilter) - copy(dAtA[i:], m.SearchFilter) - i = encodeVarintLdapconfiguration(dAtA, i, uint64(len(m.SearchFilter))) - i-- - dAtA[i] = 0x32 - } - if len(m.SearchBaseDN) > 0 { - i -= len(m.SearchBaseDN) - copy(dAtA[i:], m.SearchBaseDN) - i = encodeVarintLdapconfiguration(dAtA, i, uint64(len(m.SearchBaseDN))) - i-- - dAtA[i] = 0x2a - } - if m.InsecureSkipVerify { - i-- - if m.InsecureSkipVerify { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x20 - } - if m.Transport != 0 { - i = encodeVarintLdapconfiguration(dAtA, i, uint64(m.Transport)) - i-- - dAtA[i] = 0x18 - } - if len(m.BindDN) > 0 { - i -= len(m.BindDN) - copy(dAtA[i:], m.BindDN) - i = encodeVarintLdapconfiguration(dAtA, i, uint64(len(m.BindDN))) - i-- - dAtA[i] = 0x12 - } - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintLdapconfiguration(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintLdapconfiguration(dAtA []byte, offset int, v uint64) int { - offset -= sovLdapconfiguration(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *LDAPConfiguration) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Address) - if l > 0 { - n += 1 + l + sovLdapconfiguration(uint64(l)) - } - l = len(m.BindDN) - if l > 0 { - n += 1 + l + sovLdapconfiguration(uint64(l)) - } - if m.Transport != 0 { - n += 1 + sovLdapconfiguration(uint64(m.Transport)) - } - if m.InsecureSkipVerify { - n += 2 - } - l = len(m.SearchBaseDN) - if l > 0 { - n += 1 + l + sovLdapconfiguration(uint64(l)) - } - l = len(m.SearchFilter) - if l > 0 { - n += 1 + l + sovLdapconfiguration(uint64(l)) - } - return n -} - -func sovLdapconfiguration(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozLdapconfiguration(x uint64) (n int) { - return sovLdapconfiguration(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *LDAPConfiguration) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: LDAPConfiguration: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: LDAPConfiguration: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthLdapconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthLdapconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BindDN", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthLdapconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthLdapconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.BindDN = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Transport", wireType) - } - m.Transport = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Transport |= LDAPTransport(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InsecureSkipVerify", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.InsecureSkipVerify = bool(v != 0) - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SearchBaseDN", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthLdapconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthLdapconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SearchBaseDN = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SearchFilter", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthLdapconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthLdapconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SearchFilter = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipLdapconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthLdapconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipLdapconfiguration(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLdapconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthLdapconfiguration - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupLdapconfiguration - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthLdapconfiguration - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthLdapconfiguration = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowLdapconfiguration = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupLdapconfiguration = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/ldaptransport.go b/lib/config/ldaptransport.go index 573d6178542..56dfe22bca4 100644 --- a/lib/config/ldaptransport.go +++ b/lib/config/ldaptransport.go @@ -6,6 +6,14 @@ package config +type LDAPTransport int32 + +const ( + LDAPTransportPlain LDAPTransport = 0 + LDAPTransportTLS LDAPTransport = 2 + LDAPTransportStartTLS LDAPTransport = 3 +) + func (t LDAPTransport) String() string { switch t { case LDAPTransportPlain: diff --git a/lib/config/ldaptransport.pb.go b/lib/config/ldaptransport.pb.go deleted file mode 100644 index 237d185cb0f..00000000000 --- a/lib/config/ldaptransport.pb.go +++ /dev/null @@ -1,75 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/ldaptransport.proto - -package config - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type LDAPTransport int32 - -const ( - LDAPTransportPlain LDAPTransport = 0 - LDAPTransportTLS LDAPTransport = 2 - LDAPTransportStartTLS LDAPTransport = 3 -) - -var LDAPTransport_name = map[int32]string{ - 0: "LDAP_TRANSPORT_PLAIN", - 2: "LDAP_TRANSPORT_TLS", - 3: "LDAP_TRANSPORT_START_TLS", -} - -var LDAPTransport_value = map[string]int32{ - "LDAP_TRANSPORT_PLAIN": 0, - "LDAP_TRANSPORT_TLS": 2, - "LDAP_TRANSPORT_START_TLS": 3, -} - -func (LDAPTransport) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_79795fc8505b82bf, []int{0} -} - -func init() { - proto.RegisterEnum("config.LDAPTransport", LDAPTransport_name, LDAPTransport_value) -} - -func init() { proto.RegisterFile("lib/config/ldaptransport.proto", fileDescriptor_79795fc8505b82bf) } - -var fileDescriptor_79795fc8505b82bf = []byte{ - // 273 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcb, 0xc9, 0x4c, 0xd2, - 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0xcf, 0x49, 0x49, 0x2c, 0x28, 0x29, 0x4a, 0xcc, 0x2b, - 0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xc8, 0x49, 0x29, - 0x17, 0xa5, 0x16, 0xe4, 0x17, 0xeb, 0x83, 0x05, 0x93, 0x4a, 0xd3, 0xf4, 0xd3, 0xf3, 0xd3, 0xf3, - 0xc1, 0x1c, 0x30, 0x0b, 0xa2, 0x58, 0x8a, 0x33, 0xb5, 0x02, 0xaa, 0x4f, 0xeb, 0x23, 0x23, 0x17, - 0xaf, 0x8f, 0x8b, 0x63, 0x40, 0x08, 0xcc, 0x3c, 0x21, 0x37, 0x2e, 0x11, 0x90, 0x40, 0x7c, 0x48, - 0x90, 0xa3, 0x5f, 0x70, 0x80, 0x7f, 0x50, 0x48, 0x7c, 0x80, 0x8f, 0xa3, 0xa7, 0x9f, 0x00, 0x83, - 0x94, 0x4e, 0xd7, 0x5c, 0x05, 0x21, 0x14, 0xc5, 0x01, 0x39, 0x89, 0x99, 0x79, 0x97, 0xfa, 0x54, - 0xb1, 0x88, 0x0a, 0x39, 0x70, 0x09, 0xa1, 0x99, 0x13, 0xe2, 0x13, 0x2c, 0xc0, 0x24, 0xa5, 0xd1, - 0x35, 0x57, 0x41, 0x00, 0x45, 0x7d, 0x88, 0x4f, 0xf0, 0xa5, 0x3e, 0x55, 0x0c, 0x31, 0xa1, 0x00, - 0x2e, 0x09, 0x34, 0x13, 0x82, 0x43, 0x1c, 0xa1, 0xe6, 0x30, 0x4b, 0x19, 0x75, 0xcd, 0x55, 0x10, - 0x45, 0xd1, 0x13, 0x5c, 0x92, 0x08, 0x33, 0x0c, 0xbb, 0x84, 0x14, 0xcb, 0x8a, 0x25, 0x72, 0x0c, - 0x4e, 0xde, 0x27, 0x1e, 0xca, 0x31, 0x5c, 0x78, 0x28, 0xc7, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, - 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x2c, 0x78, 0x2c, 0xc7, 0x78, 0xe1, 0xb1, 0x1c, 0xc3, - 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x9a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, - 0xfa, 0xc5, 0x95, 0x79, 0xc9, 0x25, 0x19, 0x99, 0x79, 0xe9, 0x48, 0x2c, 0x44, 0x64, 0x24, 0xb1, - 0x81, 0xc3, 0xd1, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x56, 0xde, 0x17, 0xa1, 0x01, 0x00, - 0x00, -} diff --git a/lib/config/migrations.go b/lib/config/migrations.go index 82f54d5667b..4a4ecdf3774 100644 --- a/lib/config/migrations.go +++ b/lib/config/migrations.go @@ -114,7 +114,7 @@ func migrateToConfigV35(cfg *Configuration) { for i, fcfg := range cfg.Folders { params := fcfg.Versioning.Params if params["fsType"] != "" { - var fsType fs.FilesystemType + var fsType FilesystemType _ = fsType.UnmarshalText([]byte(params["fsType"])) cfg.Folders[i].Versioning.FSType = fsType } @@ -228,7 +228,7 @@ func migrateToConfigV23(cfg *Configuration) { func migrateToConfigV22(cfg *Configuration) { for i := range cfg.Folders { - cfg.Folders[i].FilesystemType = fs.FilesystemTypeBasic + cfg.Folders[i].FilesystemType = FilesystemTypeBasic // Migrate to templated external versioner commands if cfg.Folders[i].Versioning.Type == "external" { cfg.Folders[i].Versioning.Params["command"] += " %FOLDER_PATH% %FILE_PATH%" @@ -238,7 +238,7 @@ func migrateToConfigV22(cfg *Configuration) { func migrateToConfigV21(cfg *Configuration) { for _, folder := range cfg.Folders { - if folder.FilesystemType != fs.FilesystemTypeBasic { + if folder.FilesystemType != FilesystemTypeBasic { continue } switch folder.Versioning.Type { diff --git a/lib/config/observed.go b/lib/config/observed.go new file mode 100644 index 00000000000..5feead4b574 --- /dev/null +++ b/lib/config/observed.go @@ -0,0 +1,26 @@ +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package config + +import ( + "time" + + "github.com/syncthing/syncthing/lib/protocol" +) + +type ObservedFolder struct { + Time time.Time `json:"time" xml:"time,attr"` + ID string `json:"id" xml:"id,attr"` + Label string `json:"label" xml:"label,attr"` +} + +type ObservedDevice struct { + Time time.Time `json:"time" xml:"time,attr"` + ID protocol.DeviceID `json:"deviceID" xml:"id,attr"` + Name string `json:"name" xml:"name,attr"` + Address string `json:"address" xml:"address,attr"` +} diff --git a/lib/config/observed.pb.go b/lib/config/observed.pb.go deleted file mode 100644 index daccc131757..00000000000 --- a/lib/config/observed.pb.go +++ /dev/null @@ -1,716 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/observed.proto - -package config - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - github_com_syncthing_syncthing_lib_protocol "github.com/syncthing/syncthing/lib/protocol" - _ "github.com/syncthing/syncthing/proto/ext" - _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf -var _ = time.Kitchen - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type ObservedFolder struct { - Time time.Time `protobuf:"bytes,1,opt,name=time,proto3,stdtime" json:"time" xml:"time,attr"` - ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id" xml:"id,attr"` - Label string `protobuf:"bytes,3,opt,name=label,proto3" json:"label" xml:"label,attr"` -} - -func (m *ObservedFolder) Reset() { *m = ObservedFolder{} } -func (m *ObservedFolder) String() string { return proto.CompactTextString(m) } -func (*ObservedFolder) ProtoMessage() {} -func (*ObservedFolder) Descriptor() ([]byte, []int) { - return fileDescriptor_49f68ff7b178722f, []int{0} -} -func (m *ObservedFolder) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ObservedFolder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ObservedFolder.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ObservedFolder) XXX_Merge(src proto.Message) { - xxx_messageInfo_ObservedFolder.Merge(m, src) -} -func (m *ObservedFolder) XXX_Size() int { - return m.ProtoSize() -} -func (m *ObservedFolder) XXX_DiscardUnknown() { - xxx_messageInfo_ObservedFolder.DiscardUnknown(m) -} - -var xxx_messageInfo_ObservedFolder proto.InternalMessageInfo - -type ObservedDevice struct { - Time time.Time `protobuf:"bytes,1,opt,name=time,proto3,stdtime" json:"time" xml:"time,attr"` - ID github_com_syncthing_syncthing_lib_protocol.DeviceID `protobuf:"bytes,2,opt,name=id,proto3,customtype=github.com/syncthing/syncthing/lib/protocol.DeviceID" json:"deviceID" xml:"id,attr"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name" xml:"name,attr"` - Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address" xml:"address,attr"` -} - -func (m *ObservedDevice) Reset() { *m = ObservedDevice{} } -func (m *ObservedDevice) String() string { return proto.CompactTextString(m) } -func (*ObservedDevice) ProtoMessage() {} -func (*ObservedDevice) Descriptor() ([]byte, []int) { - return fileDescriptor_49f68ff7b178722f, []int{1} -} -func (m *ObservedDevice) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ObservedDevice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ObservedDevice.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ObservedDevice) XXX_Merge(src proto.Message) { - xxx_messageInfo_ObservedDevice.Merge(m, src) -} -func (m *ObservedDevice) XXX_Size() int { - return m.ProtoSize() -} -func (m *ObservedDevice) XXX_DiscardUnknown() { - xxx_messageInfo_ObservedDevice.DiscardUnknown(m) -} - -var xxx_messageInfo_ObservedDevice proto.InternalMessageInfo - -func init() { - proto.RegisterType((*ObservedFolder)(nil), "config.ObservedFolder") - proto.RegisterType((*ObservedDevice)(nil), "config.ObservedDevice") -} - -func init() { proto.RegisterFile("lib/config/observed.proto", fileDescriptor_49f68ff7b178722f) } - -var fileDescriptor_49f68ff7b178722f = []byte{ - // 440 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0x3f, 0x6f, 0xd4, 0x30, - 0x00, 0xc5, 0xe3, 0xf4, 0x68, 0x39, 0x53, 0xfe, 0x28, 0xd3, 0x71, 0x83, 0x5d, 0x9d, 0x32, 0x1c, - 0x02, 0x25, 0xfc, 0x9b, 0x10, 0x42, 0xe2, 0x74, 0x42, 0x3a, 0x75, 0x40, 0x8a, 0x98, 0x98, 0x48, - 0x62, 0x37, 0xb5, 0x94, 0x9c, 0xab, 0xc4, 0xad, 0xca, 0xc6, 0xc8, 0xd8, 0xf2, 0x09, 0xf8, 0x38, - 0xb7, 0x5d, 0x46, 0xc4, 0x60, 0xd4, 0xcb, 0x96, 0x31, 0x12, 0x3b, 0x8a, 0x9d, 0xf8, 0x6e, 0x42, - 0x4c, 0x6c, 0x7e, 0x4f, 0xcf, 0x3f, 0xf9, 0xbd, 0x28, 0xf0, 0x61, 0xca, 0x22, 0x3f, 0xe6, 0xcb, - 0x13, 0x96, 0xf8, 0x3c, 0x2a, 0x68, 0x7e, 0x41, 0x89, 0x77, 0x96, 0x73, 0xc1, 0x9d, 0x7d, 0x6d, - 0x8f, 0x71, 0xc2, 0x79, 0x92, 0x52, 0x5f, 0xb9, 0xd1, 0xf9, 0x89, 0x2f, 0x58, 0x46, 0x0b, 0x11, - 0x66, 0x67, 0x3a, 0x38, 0x1e, 0xd2, 0x4b, 0xa1, 0x8f, 0x93, 0xdf, 0x00, 0xde, 0x7b, 0xdf, 0x61, - 0xde, 0xf1, 0x94, 0xd0, 0xdc, 0xf9, 0x04, 0x07, 0xed, 0x85, 0x11, 0x38, 0x02, 0xd3, 0x3b, 0xcf, - 0xc7, 0x9e, 0xa6, 0x79, 0x3d, 0xcd, 0xfb, 0xd0, 0xd3, 0x66, 0x4f, 0x57, 0x12, 0x5b, 0xb5, 0xc4, - 0x2a, 0xdf, 0x48, 0x7c, 0xff, 0x32, 0x4b, 0x5f, 0x4d, 0x5a, 0xf1, 0x24, 0x14, 0x22, 0x9f, 0x5c, - 0xfd, 0xc2, 0xa0, 0x5e, 0xbb, 0x43, 0xe3, 0x04, 0x2a, 0xe9, 0xbc, 0x81, 0x36, 0x23, 0x23, 0xfb, - 0x08, 0x4c, 0x87, 0x33, 0x6f, 0x23, 0xb1, 0xbd, 0x98, 0xd7, 0x12, 0xdb, 0x8c, 0x34, 0x12, 0xdf, - 0x55, 0x0c, 0x46, 0x34, 0xa1, 0x5e, 0xbb, 0x07, 0xdd, 0xf9, 0x5b, 0xe9, 0xda, 0x8b, 0x79, 0x60, - 0x33, 0xe2, 0xbc, 0x85, 0xb7, 0xd2, 0x30, 0xa2, 0xe9, 0x68, 0x4f, 0x21, 0x1e, 0xd7, 0x12, 0x6b, - 0xa3, 0x91, 0xf8, 0x81, 0xba, 0xaf, 0x94, 0x41, 0xc0, 0xad, 0x0c, 0x74, 0x70, 0x72, 0xbd, 0xb7, - 0xed, 0x3d, 0xa7, 0x17, 0x2c, 0xa6, 0xff, 0xa1, 0xf7, 0x35, 0x30, 0xc5, 0x0f, 0x67, 0x5f, 0x40, - 0x4b, 0xf9, 0x29, 0xf1, 0xcb, 0x84, 0x89, 0xd3, 0xf3, 0xc8, 0x8b, 0x79, 0xe6, 0x17, 0x9f, 0x97, - 0xb1, 0x38, 0x65, 0xcb, 0x64, 0xe7, 0xd4, 0x7e, 0x70, 0xf5, 0x88, 0x98, 0xa7, 0x9e, 0x7e, 0xeb, - 0x62, 0x6e, 0x56, 0xbb, 0x4d, 0x3a, 0xe7, 0x6f, 0xdb, 0x35, 0x6b, 0xd7, 0xe4, 0xbe, 0x96, 0x2e, - 0xd8, 0xd9, 0xf2, 0x35, 0x1c, 0x2c, 0xc3, 0x8c, 0x76, 0x53, 0x4e, 0xdb, 0x56, 0xad, 0x36, 0xad, - 0x5a, 0x61, 0x78, 0x43, 0xa3, 0x02, 0x95, 0x72, 0x8e, 0xe1, 0x41, 0x48, 0x48, 0x4e, 0x8b, 0x62, - 0x34, 0x50, 0x80, 0x67, 0xb5, 0xc4, 0xbd, 0xd5, 0x48, 0xec, 0x28, 0x46, 0xa7, 0x0d, 0xe6, 0x70, - 0xd7, 0x08, 0xfa, 0xf8, 0xec, 0x78, 0x75, 0x83, 0xac, 0xf2, 0x06, 0x59, 0xab, 0x0d, 0x02, 0xe5, - 0x06, 0x81, 0xab, 0x0a, 0x59, 0xdf, 0x2b, 0x04, 0xca, 0x0a, 0x59, 0x3f, 0x2a, 0x64, 0x7d, 0x7c, - 0xf4, 0x0f, 0x53, 0xe9, 0x9f, 0x20, 0xda, 0x57, 0x93, 0xbd, 0xf8, 0x13, 0x00, 0x00, 0xff, 0xff, - 0xd0, 0xf0, 0x82, 0x78, 0x30, 0x03, 0x00, 0x00, -} - -func (m *ObservedFolder) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ObservedFolder) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ObservedFolder) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Label) > 0 { - i -= len(m.Label) - copy(dAtA[i:], m.Label) - i = encodeVarintObserved(dAtA, i, uint64(len(m.Label))) - i-- - dAtA[i] = 0x1a - } - if len(m.ID) > 0 { - i -= len(m.ID) - copy(dAtA[i:], m.ID) - i = encodeVarintObserved(dAtA, i, uint64(len(m.ID))) - i-- - dAtA[i] = 0x12 - } - n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err1 != nil { - return 0, err1 - } - i -= n1 - i = encodeVarintObserved(dAtA, i, uint64(n1)) - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *ObservedDevice) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ObservedDevice) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ObservedDevice) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintObserved(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0x22 - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintObserved(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0x1a - } - { - size := m.ID.ProtoSize() - i -= size - if _, err := m.ID.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintObserved(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err2 != nil { - return 0, err2 - } - i -= n2 - i = encodeVarintObserved(dAtA, i, uint64(n2)) - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func encodeVarintObserved(dAtA []byte, offset int, v uint64) int { - offset -= sovObserved(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *ObservedFolder) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) - n += 1 + l + sovObserved(uint64(l)) - l = len(m.ID) - if l > 0 { - n += 1 + l + sovObserved(uint64(l)) - } - l = len(m.Label) - if l > 0 { - n += 1 + l + sovObserved(uint64(l)) - } - return n -} - -func (m *ObservedDevice) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) - n += 1 + l + sovObserved(uint64(l)) - l = m.ID.ProtoSize() - n += 1 + l + sovObserved(uint64(l)) - l = len(m.Name) - if l > 0 { - n += 1 + l + sovObserved(uint64(l)) - } - l = len(m.Address) - if l > 0 { - n += 1 + l + sovObserved(uint64(l)) - } - return n -} - -func sovObserved(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozObserved(x uint64) (n int) { - return sovObserved(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *ObservedFolder) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ObservedFolder: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ObservedFolder: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthObserved - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthObserved - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthObserved - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthObserved - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Label", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthObserved - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthObserved - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Label = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipObserved(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthObserved - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ObservedDevice) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ObservedDevice: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ObservedDevice: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthObserved - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthObserved - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthObserved - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthObserved - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthObserved - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthObserved - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowObserved - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthObserved - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthObserved - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipObserved(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthObserved - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipObserved(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowObserved - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowObserved - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowObserved - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthObserved - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupObserved - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthObserved - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthObserved = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowObserved = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupObserved = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/optionsconfiguration.go b/lib/config/optionsconfiguration.go index 1491682b5fe..6d732f306ae 100644 --- a/lib/config/optionsconfiguration.go +++ b/lib/config/optionsconfiguration.go @@ -16,6 +16,81 @@ import ( "github.com/syncthing/syncthing/lib/structutil" ) +type OptionsConfiguration struct { + RawListenAddresses []string `json:"listenAddresses" xml:"listenAddress" default:"default"` + RawGlobalAnnServers []string `json:"globalAnnounceServers" xml:"globalAnnounceServer" default:"default"` + GlobalAnnEnabled bool `json:"globalAnnounceEnabled" xml:"globalAnnounceEnabled" default:"true"` + LocalAnnEnabled bool `json:"localAnnounceEnabled" xml:"localAnnounceEnabled" default:"true"` + LocalAnnPort int `json:"localAnnouncePort" xml:"localAnnouncePort" default:"21027"` + LocalAnnMCAddr string `json:"localAnnounceMCAddr" xml:"localAnnounceMCAddr" default:"[ff12::8384]:21027"` + MaxSendKbps int `json:"maxSendKbps" xml:"maxSendKbps"` + MaxRecvKbps int `json:"maxRecvKbps" xml:"maxRecvKbps"` + ReconnectIntervalS int `json:"reconnectionIntervalS" xml:"reconnectionIntervalS" default:"60"` + RelaysEnabled bool `json:"relaysEnabled" xml:"relaysEnabled" default:"true"` + RelayReconnectIntervalM int `json:"relayReconnectIntervalM" xml:"relayReconnectIntervalM" default:"10"` + StartBrowser bool `json:"startBrowser" xml:"startBrowser" default:"true"` + NATEnabled bool `json:"natEnabled" xml:"natEnabled" default:"true"` + NATLeaseM int `json:"natLeaseMinutes" xml:"natLeaseMinutes" default:"60"` + NATRenewalM int `json:"natRenewalMinutes" xml:"natRenewalMinutes" default:"30"` + NATTimeoutS int `json:"natTimeoutSeconds" xml:"natTimeoutSeconds" default:"10"` + URAccepted int `json:"urAccepted" xml:"urAccepted"` + URSeen int `json:"urSeen" xml:"urSeen"` + URUniqueID string `json:"urUniqueId" xml:"urUniqueID"` + URURL string `json:"urURL" xml:"urURL" default:"https://data.syncthing.net/newdata"` + URPostInsecurely bool `json:"urPostInsecurely" xml:"urPostInsecurely" default:"false"` + URInitialDelayS int `json:"urInitialDelayS" xml:"urInitialDelayS" default:"1800"` + AutoUpgradeIntervalH int `json:"autoUpgradeIntervalH" xml:"autoUpgradeIntervalH" default:"12"` + UpgradeToPreReleases bool `json:"upgradeToPreReleases" xml:"upgradeToPreReleases"` + KeepTemporariesH int `json:"keepTemporariesH" xml:"keepTemporariesH" default:"24"` + CacheIgnoredFiles bool `json:"cacheIgnoredFiles" xml:"cacheIgnoredFiles" default:"false"` + ProgressUpdateIntervalS int `json:"progressUpdateIntervalS" xml:"progressUpdateIntervalS" default:"5"` + LimitBandwidthInLan bool `json:"limitBandwidthInLan" xml:"limitBandwidthInLan" default:"false"` + MinHomeDiskFree Size `json:"minHomeDiskFree" xml:"minHomeDiskFree" default:"1 %"` + ReleasesURL string `json:"releasesURL" xml:"releasesURL" default:"https://upgrades.syncthing.net/meta.json"` + AlwaysLocalNets []string `json:"alwaysLocalNets" xml:"alwaysLocalNet"` + OverwriteRemoteDevNames bool `json:"overwriteRemoteDeviceNamesOnConnect" xml:"overwriteRemoteDeviceNamesOnConnect" default:"false"` + TempIndexMinBlocks int `json:"tempIndexMinBlocks" xml:"tempIndexMinBlocks" default:"10"` + UnackedNotificationIDs []string `json:"unackedNotificationIDs" xml:"unackedNotificationID"` + TrafficClass int `json:"trafficClass" xml:"trafficClass"` + DeprecatedDefaultFolderPath string `json:"-" xml:"defaultFolderPath,omitempty"` // Deprecated: Do not use. + SetLowPriority bool `json:"setLowPriority" xml:"setLowPriority" default:"true"` + RawMaxFolderConcurrency int `json:"maxFolderConcurrency" xml:"maxFolderConcurrency"` + CRURL string `json:"crURL" xml:"crashReportingURL" default:"https://crash.syncthing.net/newcrash"` + CREnabled bool `json:"crashReportingEnabled" xml:"crashReportingEnabled" default:"true"` + StunKeepaliveStartS int `json:"stunKeepaliveStartS" xml:"stunKeepaliveStartS" default:"180"` + StunKeepaliveMinS int `json:"stunKeepaliveMinS" xml:"stunKeepaliveMinS" default:"20"` + RawStunServers []string `json:"stunServers" xml:"stunServer" default:"default"` + DatabaseTuning Tuning `json:"databaseTuning" xml:"databaseTuning" restart:"true"` + RawMaxCIRequestKiB int `json:"maxConcurrentIncomingRequestKiB" xml:"maxConcurrentIncomingRequestKiB"` + AnnounceLANAddresses bool `json:"announceLANAddresses" xml:"announceLANAddresses" default:"true"` + SendFullIndexOnUpgrade bool `json:"sendFullIndexOnUpgrade" xml:"sendFullIndexOnUpgrade"` + FeatureFlags []string `json:"featureFlags" xml:"featureFlag"` + // The number of connections at which we stop trying to connect to more + // devices, zero meaning no limit. Does not affect incoming connections. + ConnectionLimitEnough int `json:"connectionLimitEnough" xml:"connectionLimitEnough"` + // The maximum number of connections which we will allow in total, zero + // meaning no limit. Affects incoming connections and prevents + // attempting outgoing connections. + ConnectionLimitMax int `json:"connectionLimitMax" xml:"connectionLimitMax"` + // When set, this allows TLS 1.2 on sync connections, where we otherwise + // default to TLS 1.3+ only. + InsecureAllowOldTLSVersions bool `json:"insecureAllowOldTLSVersions" xml:"insecureAllowOldTLSVersions"` + ConnectionPriorityTCPLAN int `json:"connectionPriorityTcpLan" xml:"connectionPriorityTcpLan" default:"10"` + ConnectionPriorityQUICLAN int `json:"connectionPriorityQuicLan" xml:"connectionPriorityQuicLan" default:"20"` + ConnectionPriorityTCPWAN int `json:"connectionPriorityTcpWan" xml:"connectionPriorityTcpWan" default:"30"` + ConnectionPriorityQUICWAN int `json:"connectionPriorityQuicWan" xml:"connectionPriorityQuicWan" default:"40"` + ConnectionPriorityRelay int `json:"connectionPriorityRelay" xml:"connectionPriorityRelay" default:"50"` + ConnectionPriorityUpgradeThreshold int `json:"connectionPriorityUpgradeThreshold" xml:"connectionPriorityUpgradeThreshold" default:"0"` + // Legacy deprecated + DeprecatedUPnPEnabled bool `json:"-" xml:"upnpEnabled,omitempty"` // Deprecated: Do not use. + DeprecatedUPnPLeaseM int `json:"-" xml:"upnpLeaseMinutes,omitempty"` // Deprecated: Do not use. + DeprecatedUPnPRenewalM int `json:"-" xml:"upnpRenewalMinutes,omitempty"` // Deprecated: Do not use. + DeprecatedUPnPTimeoutS int `json:"-" xml:"upnpTimeoutSeconds,omitempty"` // Deprecated: Do not use. + DeprecatedRelayServers []string `json:"-" xml:"relayServer,omitempty"` // Deprecated: Do not use. + DeprecatedMinHomeDiskFreePct float64 `json:"-" xml:"minHomeDiskFreePct,omitempty"` // Deprecated: Do not use. + DeprecatedMaxConcurrentScans int `json:"-" xml:"maxConcurrentScans,omitempty"` // Deprecated: Do not use. +} + func (opts OptionsConfiguration) Copy() OptionsConfiguration { optsCopy := opts optsCopy.RawListenAddresses = make([]string, len(opts.RawListenAddresses)) diff --git a/lib/config/optionsconfiguration.pb.go b/lib/config/optionsconfiguration.pb.go deleted file mode 100644 index 2d9d0360c7c..00000000000 --- a/lib/config/optionsconfiguration.pb.go +++ /dev/null @@ -1,2735 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/optionsconfiguration.proto - -package config - -import ( - encoding_binary "encoding/binary" - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type OptionsConfiguration struct { - RawListenAddresses []string `protobuf:"bytes,1,rep,name=listen_addresses,json=listenAddresses,proto3" json:"listenAddresses" xml:"listenAddress" default:"default"` - RawGlobalAnnServers []string `protobuf:"bytes,2,rep,name=global_discovery_servers,json=globalDiscoveryServers,proto3" json:"globalAnnounceServers" xml:"globalAnnounceServer" default:"default"` - GlobalAnnEnabled bool `protobuf:"varint,3,opt,name=global_discovery_enabled,json=globalDiscoveryEnabled,proto3" json:"globalAnnounceEnabled" xml:"globalAnnounceEnabled" default:"true"` - LocalAnnEnabled bool `protobuf:"varint,4,opt,name=local_discovery_enabled,json=localDiscoveryEnabled,proto3" json:"localAnnounceEnabled" xml:"localAnnounceEnabled" default:"true"` - LocalAnnPort int `protobuf:"varint,5,opt,name=local_announce_port,json=localAnnouncePort,proto3,casttype=int" json:"localAnnouncePort" xml:"localAnnouncePort" default:"21027"` - LocalAnnMCAddr string `protobuf:"bytes,6,opt,name=local_announce_multicast_address,json=localAnnounceMulticastAddress,proto3" json:"localAnnounceMCAddr" xml:"localAnnounceMCAddr" default:"[ff12::8384]:21027"` - MaxSendKbps int `protobuf:"varint,7,opt,name=max_send_kbps,json=maxSendKbps,proto3,casttype=int" json:"maxSendKbps" xml:"maxSendKbps"` - MaxRecvKbps int `protobuf:"varint,8,opt,name=max_recv_kbps,json=maxRecvKbps,proto3,casttype=int" json:"maxRecvKbps" xml:"maxRecvKbps"` - ReconnectIntervalS int `protobuf:"varint,9,opt,name=reconnection_interval_s,json=reconnectionIntervalS,proto3,casttype=int" json:"reconnectionIntervalS" xml:"reconnectionIntervalS" default:"60"` - RelaysEnabled bool `protobuf:"varint,10,opt,name=relays_enabled,json=relaysEnabled,proto3" json:"relaysEnabled" xml:"relaysEnabled" default:"true"` - RelayReconnectIntervalM int `protobuf:"varint,11,opt,name=relays_reconnect_interval_m,json=relaysReconnectIntervalM,proto3,casttype=int" json:"relayReconnectIntervalM" xml:"relayReconnectIntervalM" default:"10"` - StartBrowser bool `protobuf:"varint,12,opt,name=start_browser,json=startBrowser,proto3" json:"startBrowser" xml:"startBrowser" default:"true"` - NATEnabled bool `protobuf:"varint,14,opt,name=nat_traversal_enabled,json=natTraversalEnabled,proto3" json:"natEnabled" xml:"natEnabled" default:"true"` - NATLeaseM int `protobuf:"varint,15,opt,name=nat_traversal_lease_m,json=natTraversalLeaseM,proto3,casttype=int" json:"natLeaseMinutes" xml:"natLeaseMinutes" default:"60"` - NATRenewalM int `protobuf:"varint,16,opt,name=nat_traversal_renewal_m,json=natTraversalRenewalM,proto3,casttype=int" json:"natRenewalMinutes" xml:"natRenewalMinutes" default:"30"` - NATTimeoutS int `protobuf:"varint,17,opt,name=nat_traversal_timeout_s,json=natTraversalTimeoutS,proto3,casttype=int" json:"natTimeoutSeconds" xml:"natTimeoutSeconds" default:"10"` - URAccepted int `protobuf:"varint,18,opt,name=usage_reporting_accepted,json=usageReportingAccepted,proto3,casttype=int" json:"urAccepted" xml:"urAccepted"` - URSeen int `protobuf:"varint,19,opt,name=usage_reporting_seen,json=usageReportingSeen,proto3,casttype=int" json:"urSeen" xml:"urSeen"` - URUniqueID string `protobuf:"bytes,20,opt,name=usage_reporting_unique_id,json=usageReportingUniqueId,proto3" json:"urUniqueId" xml:"urUniqueID"` - URURL string `protobuf:"bytes,21,opt,name=usage_reporting_url,json=usageReportingUrl,proto3" json:"urURL" xml:"urURL" default:"https://data.syncthing.net/newdata"` - URPostInsecurely bool `protobuf:"varint,22,opt,name=usage_reporting_post_insecurely,json=usageReportingPostInsecurely,proto3" json:"urPostInsecurely" xml:"urPostInsecurely" default:"false"` - URInitialDelayS int `protobuf:"varint,23,opt,name=usage_reporting_initial_delay_s,json=usageReportingInitialDelayS,proto3,casttype=int" json:"urInitialDelayS" xml:"urInitialDelayS" default:"1800"` - AutoUpgradeIntervalH int `protobuf:"varint,25,opt,name=auto_upgrade_interval_h,json=autoUpgradeIntervalH,proto3,casttype=int" json:"autoUpgradeIntervalH" xml:"autoUpgradeIntervalH" default:"12"` - UpgradeToPreReleases bool `protobuf:"varint,26,opt,name=upgrade_to_pre_releases,json=upgradeToPreReleases,proto3" json:"upgradeToPreReleases" xml:"upgradeToPreReleases"` - KeepTemporariesH int `protobuf:"varint,27,opt,name=keep_temporaries_h,json=keepTemporariesH,proto3,casttype=int" json:"keepTemporariesH" xml:"keepTemporariesH" default:"24"` - CacheIgnoredFiles bool `protobuf:"varint,28,opt,name=cache_ignored_files,json=cacheIgnoredFiles,proto3" json:"cacheIgnoredFiles" xml:"cacheIgnoredFiles" default:"false"` - ProgressUpdateIntervalS int `protobuf:"varint,29,opt,name=progress_update_interval_s,json=progressUpdateIntervalS,proto3,casttype=int" json:"progressUpdateIntervalS" xml:"progressUpdateIntervalS" default:"5"` - LimitBandwidthInLan bool `protobuf:"varint,30,opt,name=limit_bandwidth_in_lan,json=limitBandwidthInLan,proto3" json:"limitBandwidthInLan" xml:"limitBandwidthInLan" default:"false"` - MinHomeDiskFree Size `protobuf:"bytes,31,opt,name=min_home_disk_free,json=minHomeDiskFree,proto3" json:"minHomeDiskFree" xml:"minHomeDiskFree" default:"1 %"` - ReleasesURL string `protobuf:"bytes,32,opt,name=releases_url,json=releasesUrl,proto3" json:"releasesURL" xml:"releasesURL" default:"https://upgrades.syncthing.net/meta.json"` - AlwaysLocalNets []string `protobuf:"bytes,33,rep,name=always_local_nets,json=alwaysLocalNets,proto3" json:"alwaysLocalNets" xml:"alwaysLocalNet"` - OverwriteRemoteDevNames bool `protobuf:"varint,34,opt,name=overwrite_remote_device_names_on_connect,json=overwriteRemoteDeviceNamesOnConnect,proto3" json:"overwriteRemoteDeviceNamesOnConnect" xml:"overwriteRemoteDeviceNamesOnConnect" default:"false"` - TempIndexMinBlocks int `protobuf:"varint,35,opt,name=temp_index_min_blocks,json=tempIndexMinBlocks,proto3,casttype=int" json:"tempIndexMinBlocks" xml:"tempIndexMinBlocks" default:"10"` - UnackedNotificationIDs []string `protobuf:"bytes,36,rep,name=unacked_notification_ids,json=unackedNotificationIds,proto3" json:"unackedNotificationIDs" xml:"unackedNotificationID"` - TrafficClass int `protobuf:"varint,37,opt,name=traffic_class,json=trafficClass,proto3,casttype=int" json:"trafficClass" xml:"trafficClass"` - DeprecatedDefaultFolderPath string `protobuf:"bytes,38,opt,name=default_folder_path,json=defaultFolderPath,proto3" json:"-" xml:"defaultFolderPath,omitempty"` // Deprecated: Do not use. - SetLowPriority bool `protobuf:"varint,39,opt,name=set_low_priority,json=setLowPriority,proto3" json:"setLowPriority" xml:"setLowPriority" default:"true"` - RawMaxFolderConcurrency int `protobuf:"varint,40,opt,name=max_folder_concurrency,json=maxFolderConcurrency,proto3,casttype=int" json:"maxFolderConcurrency" xml:"maxFolderConcurrency"` - CRURL string `protobuf:"bytes,41,opt,name=crash_reporting_url,json=crashReportingUrl,proto3" json:"crURL" xml:"crashReportingURL" default:"https://crash.syncthing.net/newcrash"` - CREnabled bool `protobuf:"varint,42,opt,name=crash_reporting_enabled,json=crashReportingEnabled,proto3" json:"crashReportingEnabled" xml:"crashReportingEnabled" default:"true"` - StunKeepaliveStartS int `protobuf:"varint,43,opt,name=stun_keepalive_start_s,json=stunKeepaliveStartS,proto3,casttype=int" json:"stunKeepaliveStartS" xml:"stunKeepaliveStartS" default:"180"` - StunKeepaliveMinS int `protobuf:"varint,44,opt,name=stun_keepalive_min_s,json=stunKeepaliveMinS,proto3,casttype=int" json:"stunKeepaliveMinS" xml:"stunKeepaliveMinS" default:"20"` - RawStunServers []string `protobuf:"bytes,45,rep,name=stun_servers,json=stunServers,proto3" json:"stunServers" xml:"stunServer" default:"default"` - DatabaseTuning Tuning `protobuf:"varint,46,opt,name=database_tuning,json=databaseTuning,proto3,enum=config.Tuning" json:"databaseTuning" xml:"databaseTuning" restart:"true"` - RawMaxCIRequestKiB int `protobuf:"varint,47,opt,name=max_concurrent_incoming_request_kib,json=maxConcurrentIncomingRequestKib,proto3,casttype=int" json:"maxConcurrentIncomingRequestKiB" xml:"maxConcurrentIncomingRequestKiB"` - AnnounceLANAddresses bool `protobuf:"varint,48,opt,name=announce_lan_addresses,json=announceLanAddresses,proto3" json:"announceLANAddresses" xml:"announceLANAddresses" default:"true"` - SendFullIndexOnUpgrade bool `protobuf:"varint,49,opt,name=send_full_index_on_upgrade,json=sendFullIndexOnUpgrade,proto3" json:"sendFullIndexOnUpgrade" xml:"sendFullIndexOnUpgrade"` - FeatureFlags []string `protobuf:"bytes,50,rep,name=feature_flags,json=featureFlags,proto3" json:"featureFlags" xml:"featureFlag"` - // The number of connections at which we stop trying to connect to more - // devices, zero meaning no limit. Does not affect incoming connections. - ConnectionLimitEnough int `protobuf:"varint,51,opt,name=connection_limit_enough,json=connectionLimitEnough,proto3,casttype=int" json:"connectionLimitEnough" xml:"connectionLimitEnough"` - // The maximum number of connections which we will allow in total, zero - // meaning no limit. Affects incoming connections and prevents - // attempting outgoing connections. - ConnectionLimitMax int `protobuf:"varint,52,opt,name=connection_limit_max,json=connectionLimitMax,proto3,casttype=int" json:"connectionLimitMax" xml:"connectionLimitMax"` - // When set, this allows TLS 1.2 on sync connections, where we otherwise - // default to TLS 1.3+ only. - InsecureAllowOldTLSVersions bool `protobuf:"varint,53,opt,name=insecure_allow_old_tls_versions,json=insecureAllowOldTlsVersions,proto3" json:"insecureAllowOldTLSVersions" xml:"insecureAllowOldTLSVersions"` - ConnectionPriorityTCPLAN int `protobuf:"varint,54,opt,name=connection_priority_tcp_lan,json=connectionPriorityTcpLan,proto3,casttype=int" json:"connectionPriorityTcpLan" xml:"connectionPriorityTcpLan" default:"10"` - ConnectionPriorityQUICLAN int `protobuf:"varint,55,opt,name=connection_priority_quic_lan,json=connectionPriorityQuicLan,proto3,casttype=int" json:"connectionPriorityQuicLan" xml:"connectionPriorityQuicLan" default:"20"` - ConnectionPriorityTCPWAN int `protobuf:"varint,56,opt,name=connection_priority_tcp_wan,json=connectionPriorityTcpWan,proto3,casttype=int" json:"connectionPriorityTcpWan" xml:"connectionPriorityTcpWan" default:"30"` - ConnectionPriorityQUICWAN int `protobuf:"varint,57,opt,name=connection_priority_quic_wan,json=connectionPriorityQuicWan,proto3,casttype=int" json:"connectionPriorityQuicWan" xml:"connectionPriorityQuicWan" default:"40"` - ConnectionPriorityRelay int `protobuf:"varint,58,opt,name=connection_priority_relay,json=connectionPriorityRelay,proto3,casttype=int" json:"connectionPriorityRelay" xml:"connectionPriorityRelay" default:"50"` - ConnectionPriorityUpgradeThreshold int `protobuf:"varint,59,opt,name=connection_priority_upgrade_threshold,json=connectionPriorityUpgradeThreshold,proto3,casttype=int" json:"connectionPriorityUpgradeThreshold" xml:"connectionPriorityUpgradeThreshold" default:"0"` - // Legacy deprecated - DeprecatedUPnPEnabled bool `protobuf:"varint,9000,opt,name=upnp_enabled,json=upnpEnabled,proto3" json:"-" xml:"upnpEnabled,omitempty"` // Deprecated: Do not use. - DeprecatedUPnPLeaseM int `protobuf:"varint,9001,opt,name=upnp_lease_m,json=upnpLeaseM,proto3,casttype=int" json:"-" xml:"upnpLeaseMinutes,omitempty"` // Deprecated: Do not use. - DeprecatedUPnPRenewalM int `protobuf:"varint,9002,opt,name=upnp_renewal_m,json=upnpRenewalM,proto3,casttype=int" json:"-" xml:"upnpRenewalMinutes,omitempty"` // Deprecated: Do not use. - DeprecatedUPnPTimeoutS int `protobuf:"varint,9003,opt,name=upnp_timeout_s,json=upnpTimeoutS,proto3,casttype=int" json:"-" xml:"upnpTimeoutSeconds,omitempty"` // Deprecated: Do not use. - DeprecatedRelayServers []string `protobuf:"bytes,9004,rep,name=relay_servers,json=relayServers,proto3" json:"-" xml:"relayServer,omitempty"` // Deprecated: Do not use. - DeprecatedMinHomeDiskFreePct float64 `protobuf:"fixed64,9005,opt,name=min_home_disk_free_pct,json=minHomeDiskFreePct,proto3" json:"-" xml:"minHomeDiskFreePct,omitempty"` // Deprecated: Do not use. - DeprecatedMaxConcurrentScans int `protobuf:"varint,9006,opt,name=max_concurrent_scans,json=maxConcurrentScans,proto3,casttype=int" json:"-" xml:"maxConcurrentScans,omitempty"` // Deprecated: Do not use. -} - -func (m *OptionsConfiguration) Reset() { *m = OptionsConfiguration{} } -func (m *OptionsConfiguration) String() string { return proto.CompactTextString(m) } -func (*OptionsConfiguration) ProtoMessage() {} -func (*OptionsConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_d09882599506ca03, []int{0} -} -func (m *OptionsConfiguration) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *OptionsConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_OptionsConfiguration.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *OptionsConfiguration) XXX_Merge(src proto.Message) { - xxx_messageInfo_OptionsConfiguration.Merge(m, src) -} -func (m *OptionsConfiguration) XXX_Size() int { - return m.ProtoSize() -} -func (m *OptionsConfiguration) XXX_DiscardUnknown() { - xxx_messageInfo_OptionsConfiguration.DiscardUnknown(m) -} - -var xxx_messageInfo_OptionsConfiguration proto.InternalMessageInfo - -func init() { - proto.RegisterType((*OptionsConfiguration)(nil), "config.OptionsConfiguration") -} - -func init() { - proto.RegisterFile("lib/config/optionsconfiguration.proto", fileDescriptor_d09882599506ca03) -} - -var fileDescriptor_d09882599506ca03 = []byte{ - // 3521 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x5a, 0x5d, 0x6c, 0x1d, 0x47, - 0x15, 0xce, 0x26, 0x4d, 0xda, 0x6c, 0x1c, 0x27, 0x1e, 0x3b, 0xf6, 0x26, 0x4e, 0xbd, 0xee, 0xcd, - 0x4d, 0xeb, 0xb6, 0x69, 0x62, 0x3b, 0x3f, 0x4d, 0x8d, 0x50, 0xf1, 0x4f, 0x4d, 0xdd, 0xd8, 0x8e, - 0x3b, 0xb6, 0x6b, 0x54, 0x84, 0x56, 0xe3, 0xbd, 0x73, 0xed, 0xad, 0xf7, 0xee, 0xde, 0xec, 0xce, - 0xfa, 0xa7, 0x45, 0x50, 0x15, 0x41, 0x79, 0xa3, 0x5c, 0x15, 0x90, 0x40, 0xaa, 0x8a, 0x00, 0x89, - 0x52, 0x8a, 0x90, 0x90, 0x90, 0x40, 0x42, 0x54, 0x48, 0x48, 0x15, 0x3c, 0xf8, 0x3e, 0x21, 0x24, - 0xca, 0xa2, 0x3a, 0x7d, 0xba, 0x0f, 0x3c, 0xdc, 0x47, 0xf3, 0x82, 0x66, 0xf6, 0x6f, 0x76, 0x77, - 0xd6, 0xce, 0xdb, 0xdd, 0xf3, 0x9d, 0x39, 0x73, 0xbe, 0xf9, 0x39, 0x73, 0xce, 0xcc, 0x95, 0x2f, - 0x9b, 0xc6, 0xea, 0x35, 0xdd, 0xb6, 0xaa, 0xc6, 0xda, 0x35, 0xbb, 0x4e, 0x0c, 0xdb, 0x72, 0x83, - 0x2f, 0xcf, 0x41, 0xf4, 0xeb, 0x6a, 0xdd, 0xb1, 0x89, 0x0d, 0x4e, 0x04, 0xc2, 0x0b, 0x7d, 0x9c, - 0x3a, 0xf1, 0x2c, 0xc3, 0x5a, 0x0b, 0x14, 0x2e, 0x9c, 0xe3, 0x00, 0xd7, 0x78, 0x1d, 0x87, 0xe2, - 0x93, 0x78, 0x9b, 0x04, 0x3f, 0x4b, 0xef, 0x2d, 0xca, 0x3d, 0x77, 0x83, 0x1e, 0x26, 0xf9, 0x1e, - 0xc0, 0x7b, 0x92, 0x7c, 0xd6, 0x34, 0x5c, 0x82, 0x2d, 0x0d, 0x55, 0x2a, 0x0e, 0x76, 0x5d, 0xec, - 0x2a, 0xd2, 0xe0, 0xb1, 0xa1, 0x93, 0x13, 0xee, 0x9e, 0xaf, 0x02, 0x88, 0xb6, 0x66, 0x19, 0x3c, - 0x1e, 0xa1, 0x2d, 0x5f, 0x3d, 0x63, 0xa6, 0x45, 0x6d, 0x5f, 0xbd, 0xbc, 0x5d, 0x33, 0xc7, 0x4a, - 0x29, 0x79, 0x69, 0xb0, 0x82, 0xab, 0xc8, 0x33, 0xc9, 0x58, 0x29, 0xfc, 0x51, 0xda, 0xdf, 0x2d, - 0x3f, 0x1c, 0xfe, 0x6e, 0x34, 0xcb, 0x02, 0xe3, 0x30, 0x6b, 0x1a, 0xfc, 0x57, 0x92, 0x95, 0x35, - 0xd3, 0x5e, 0x45, 0xa6, 0x56, 0x31, 0x5c, 0xdd, 0xde, 0xc4, 0xce, 0x8e, 0xe6, 0x62, 0x67, 0x13, - 0x3b, 0xae, 0x72, 0x94, 0x39, 0xfa, 0x3b, 0x69, 0xcf, 0x57, 0xbb, 0x21, 0xda, 0xfa, 0x32, 0xd3, - 0x1b, 0xb7, 0xac, 0xc5, 0x00, 0x6f, 0xf9, 0xea, 0xb9, 0xb5, 0x48, 0x66, 0x7b, 0x96, 0x8e, 0x43, - 0xa0, 0xed, 0xab, 0x57, 0x98, 0xc3, 0x22, 0x54, 0xe0, 0x77, 0x6b, 0xb7, 0xdc, 0x23, 0x52, 0x6d, - 0xef, 0x96, 0xc5, 0x1d, 0xa4, 0x89, 0x8a, 0x7c, 0x83, 0xbd, 0x41, 0xc3, 0xa9, 0x88, 0x54, 0x28, - 0x07, 0x9f, 0x8b, 0x08, 0x63, 0x0b, 0xad, 0x9a, 0xb8, 0xa2, 0x1c, 0x1b, 0x94, 0x86, 0x1e, 0x99, - 0xf8, 0x80, 0x12, 0x3e, 0x1b, 0x5b, 0x7c, 0x21, 0x00, 0xf3, 0x6c, 0x43, 0xa0, 0xed, 0xab, 0x4f, - 0x09, 0xd8, 0x86, 0x28, 0x47, 0x97, 0x38, 0x1e, 0xa6, 0x5c, 0x0b, 0xcc, 0x14, 0x01, 0xfb, 0xbb, - 0xe5, 0x87, 0x68, 0xd3, 0x46, 0xb3, 0x9c, 0x73, 0x2a, 0x47, 0x33, 0x94, 0x83, 0x4f, 0x25, 0xb9, - 0xcf, 0xb4, 0x75, 0x21, 0xcb, 0x87, 0x18, 0xcb, 0x9f, 0x51, 0x96, 0x67, 0x66, 0xa9, 0x4e, 0x8a, - 0x64, 0x8f, 0x19, 0x8a, 0x32, 0x1c, 0x9f, 0x0c, 0x96, 0xa0, 0x00, 0x14, 0x50, 0x14, 0x1b, 0x29, - 0x90, 0x73, 0x04, 0xb3, 0xfe, 0xc0, 0x73, 0xac, 0x41, 0x8e, 0xde, 0xdf, 0x25, 0xb9, 0x3b, 0xa0, - 0x87, 0x42, 0x5b, 0x5a, 0xdd, 0x76, 0x88, 0x72, 0x7c, 0x50, 0x1a, 0x3a, 0x3e, 0xf1, 0x63, 0x4a, - 0xad, 0x23, 0x32, 0xb5, 0x60, 0x3b, 0xa4, 0xe5, 0xab, 0x5d, 0xa9, 0xae, 0xa9, 0xb0, 0xed, 0xab, - 0x4f, 0xe4, 0x49, 0x51, 0x84, 0x63, 0x34, 0x3a, 0x32, 0x3c, 0xfa, 0x6c, 0x69, 0xdf, 0x57, 0x8f, - 0x19, 0x16, 0x69, 0xed, 0x96, 0x05, 0x66, 0x44, 0xc2, 0xfd, 0xdd, 0xf2, 0x71, 0xd6, 0xb4, 0xd1, - 0x2c, 0xa7, 0x3c, 0x81, 0x79, 0x5d, 0xf0, 0xad, 0xa3, 0xf2, 0x60, 0x86, 0x4d, 0xcd, 0x33, 0x89, - 0xa1, 0x23, 0x97, 0x44, 0x71, 0x43, 0x39, 0x31, 0x28, 0x0d, 0x9d, 0x9c, 0xf8, 0x03, 0xa5, 0xd6, - 0x19, 0x19, 0x9c, 0x9b, 0xa4, 0x3b, 0xb9, 0xe5, 0xab, 0xdd, 0x29, 0xa3, 0x81, 0xb8, 0xed, 0xab, - 0xb7, 0xf2, 0xf4, 0x02, 0x8c, 0x23, 0xf8, 0xd5, 0x6a, 0x75, 0x64, 0x74, 0x6c, 0xec, 0xf6, 0xf5, - 0xdb, 0x37, 0xbe, 0x36, 0x16, 0xb0, 0x6d, 0xed, 0x96, 0x85, 0x06, 0xc5, 0xe2, 0xfd, 0xdd, 0x32, - 0xc8, 0x1b, 0x69, 0x34, 0xcb, 0x19, 0x37, 0xe1, 0xa3, 0xe9, 0xc6, 0x11, 0xc3, 0x30, 0x18, 0x81, - 0xbb, 0xf2, 0xe9, 0x1a, 0xda, 0xd6, 0x5c, 0x6c, 0x55, 0xb4, 0x8d, 0xd5, 0xba, 0xab, 0x3c, 0xcc, - 0x26, 0xf3, 0xe9, 0x96, 0xaf, 0x9e, 0xaa, 0xa1, 0xed, 0x45, 0x6c, 0x55, 0xee, 0xac, 0xd6, 0x69, - 0x70, 0xe9, 0x62, 0xb4, 0x38, 0x59, 0x34, 0x3f, 0x90, 0x57, 0x8c, 0x0c, 0x3a, 0x58, 0xdf, 0x0c, - 0x0c, 0x3e, 0x92, 0x32, 0x08, 0xb1, 0xbe, 0x99, 0x35, 0x18, 0xc9, 0x52, 0x06, 0x23, 0x21, 0xf8, - 0xbd, 0x24, 0xf7, 0x39, 0x58, 0xb7, 0x2d, 0x0b, 0xeb, 0x34, 0xbc, 0x6b, 0x86, 0x45, 0xb0, 0xb3, - 0x89, 0x4c, 0xcd, 0x55, 0x4e, 0x32, 0xdb, 0xdf, 0x60, 0x41, 0x3d, 0x52, 0x99, 0x09, 0xe1, 0x45, - 0x1a, 0x3b, 0xf8, 0x86, 0x31, 0xd0, 0xf6, 0xd5, 0x21, 0xd6, 0xb7, 0x10, 0xe5, 0x66, 0xe9, 0xd6, - 0x70, 0xe4, 0xd2, 0xfe, 0x6e, 0xf9, 0xe8, 0xad, 0x61, 0x16, 0xdf, 0x73, 0xfd, 0x40, 0x71, 0x2f, - 0xa0, 0x2a, 0x77, 0x3a, 0xd8, 0x44, 0x3b, 0x6e, 0x1c, 0x03, 0x64, 0x16, 0x03, 0x9e, 0x6f, 0xf9, - 0xea, 0xe9, 0x00, 0x49, 0x36, 0x7a, 0x29, 0x74, 0x88, 0x93, 0x66, 0x77, 0x78, 0xb4, 0x63, 0x61, - 0xba, 0x31, 0x78, 0xeb, 0xa8, 0xdc, 0x1f, 0x76, 0x14, 0x3b, 0x92, 0x0c, 0x52, 0x4d, 0x39, 0xc5, - 0x06, 0xe9, 0x2f, 0x74, 0x0d, 0xf7, 0x41, 0xaa, 0x97, 0xa3, 0x30, 0xd7, 0xf2, 0xd5, 0x3e, 0x47, - 0x0c, 0xc5, 0x81, 0xb6, 0x00, 0xe7, 0xbc, 0x1c, 0x19, 0xe6, 0xb6, 0x6c, 0xa1, 0xbd, 0x62, 0x88, - 0x0e, 0xf2, 0x08, 0x1d, 0xe4, 0x22, 0x37, 0xa1, 0x12, 0xf0, 0xcc, 0x23, 0x60, 0x55, 0x3e, 0xed, - 0x12, 0xe4, 0x10, 0x6d, 0xd5, 0xb1, 0xb7, 0x5c, 0xec, 0x28, 0x1d, 0x6c, 0xac, 0xbf, 0xd8, 0xf2, - 0xd5, 0x0e, 0x06, 0x4c, 0x04, 0xf2, 0xb6, 0xaf, 0x3e, 0xc6, 0xe8, 0xf0, 0xc2, 0xc2, 0x91, 0x4e, - 0x35, 0x05, 0xbf, 0x90, 0xe4, 0x73, 0x16, 0x22, 0x1a, 0x71, 0x10, 0x3d, 0xd5, 0x90, 0x19, 0x4f, - 0x6c, 0x27, 0xeb, 0xec, 0xde, 0x9e, 0xaf, 0xca, 0xf3, 0xe3, 0x4b, 0x49, 0x58, 0x97, 0x2d, 0x44, - 0x92, 0x39, 0x56, 0x59, 0xc7, 0x89, 0x48, 0x10, 0xc2, 0xf9, 0x06, 0xa9, 0x2f, 0x2e, 0x5c, 0x73, - 0x5d, 0xc0, 0x6e, 0x0b, 0x91, 0xa5, 0xc8, 0x9d, 0x68, 0x41, 0xfc, 0x31, 0xe7, 0xa7, 0x89, 0x91, - 0x8b, 0xb5, 0x9a, 0x72, 0x86, 0x2d, 0x85, 0xef, 0xd0, 0xa5, 0x70, 0x72, 0x7e, 0x7c, 0x69, 0x96, - 0x8a, 0xe9, 0xe4, 0x9f, 0xb1, 0x10, 0x09, 0x3e, 0x0c, 0xcb, 0x23, 0x2c, 0xf9, 0x29, 0x45, 0xce, - 0xf2, 0x72, 0xe1, 0xde, 0x68, 0xed, 0x96, 0x73, 0xed, 0xf3, 0xa2, 0x78, 0x07, 0x25, 0x1d, 0x43, - 0xc0, 0x7b, 0x1f, 0xc8, 0xc0, 0xdf, 0x24, 0xb9, 0x2f, 0xed, 0xbc, 0x83, 0x2d, 0xbc, 0xc5, 0x56, - 0xf2, 0x59, 0xe6, 0x7e, 0x83, 0xba, 0x7f, 0x6a, 0x7e, 0x7c, 0x09, 0x06, 0x00, 0x25, 0xd0, 0x65, - 0x21, 0x12, 0x7d, 0xc6, 0x14, 0xca, 0x11, 0x85, 0x34, 0xc2, 0x91, 0xb8, 0xce, 0x93, 0x10, 0xd8, - 0x10, 0x09, 0x29, 0x91, 0xeb, 0x94, 0x08, 0xef, 0x02, 0xec, 0xe1, 0xa9, 0x44, 0x52, 0x01, 0x19, - 0x62, 0xd4, 0xb0, 0xed, 0x11, 0xcd, 0x55, 0xba, 0xd2, 0x64, 0x96, 0x02, 0x60, 0x31, 0x24, 0x13, - 0x7d, 0xd2, 0x95, 0x5e, 0x49, 0x91, 0x49, 0x23, 0x45, 0xdb, 0x4f, 0x60, 0x43, 0x24, 0x8c, 0xb7, - 0x1c, 0xef, 0x42, 0x9a, 0x4c, 0x24, 0x05, 0x3f, 0x91, 0x64, 0xc5, 0x73, 0xd1, 0x1a, 0xd6, 0x1c, - 0x4c, 0xcf, 0x7d, 0xc3, 0x5a, 0xd3, 0x90, 0xae, 0xe3, 0x3a, 0xc1, 0x15, 0x05, 0x30, 0x36, 0x88, - 0xee, 0x80, 0x65, 0x38, 0x1e, 0x4a, 0xe9, 0x0e, 0xf0, 0x9c, 0xe8, 0xab, 0xed, 0xab, 0x67, 0x19, - 0x89, 0x44, 0xc4, 0x39, 0xcc, 0x2b, 0xa6, 0xbe, 0xe8, 0x8a, 0x4f, 0x4c, 0xc2, 0x5e, 0xe6, 0x02, - 0x8c, 0x3c, 0x88, 0xe4, 0xe0, 0x0d, 0xb9, 0x27, 0xeb, 0x9c, 0x8b, 0xb1, 0xa5, 0x74, 0x33, 0xc7, - 0x66, 0xf6, 0x7c, 0xf5, 0xc4, 0x32, 0x5c, 0xc4, 0xd8, 0x6a, 0xf9, 0xea, 0x09, 0xcf, 0xa1, 0xbf, - 0xda, 0xbe, 0xda, 0x11, 0x3a, 0x44, 0x3f, 0x39, 0x67, 0x22, 0x85, 0xf8, 0x57, 0xa3, 0x59, 0x0e, - 0x9b, 0x43, 0x90, 0x76, 0x80, 0xca, 0xc0, 0x0f, 0x24, 0xf9, 0x7c, 0xb6, 0x77, 0xcf, 0x32, 0xee, - 0x79, 0x58, 0x33, 0x2a, 0x4a, 0x0f, 0x4b, 0x22, 0x5e, 0x0d, 0xc6, 0x66, 0x99, 0x89, 0x67, 0xa6, - 0x82, 0xb1, 0x09, 0xbf, 0xf8, 0xb1, 0x89, 0x14, 0x4a, 0xc1, 0xa0, 0x44, 0x9f, 0x6d, 0xfe, 0x2b, - 0x1c, 0x94, 0x08, 0xcb, 0x0e, 0x4a, 0xa4, 0x05, 0x3e, 0x96, 0xe4, 0xee, 0x9c, 0x5f, 0x8e, 0xa9, - 0x9c, 0x63, 0x1e, 0x7d, 0x8f, 0xae, 0xbd, 0xe3, 0xcb, 0x70, 0x19, 0xce, 0xb6, 0x7c, 0xf5, 0xb8, - 0xe7, 0x2c, 0xc3, 0xd9, 0xb6, 0xaf, 0xde, 0x8e, 0x1c, 0x81, 0xb3, 0xdc, 0xea, 0x5a, 0x27, 0xa4, - 0xee, 0x8e, 0x5d, 0xbb, 0x56, 0x41, 0x04, 0x5d, 0x75, 0x77, 0x2c, 0x9d, 0xac, 0xd3, 0x62, 0xcd, - 0xc2, 0xe4, 0x9a, 0x85, 0xb7, 0xa8, 0x94, 0x3a, 0x1c, 0x1a, 0x89, 0x7e, 0xec, 0xef, 0x96, 0x1f, - 0xa0, 0x61, 0xa3, 0x59, 0x0e, 0xbc, 0x80, 0x5d, 0x19, 0x1e, 0x8e, 0x09, 0xfe, 0x23, 0xc9, 0x6a, - 0x96, 0x42, 0xdd, 0x76, 0xe9, 0x09, 0xe7, 0x62, 0xdd, 0x73, 0xb0, 0xb9, 0xa3, 0xf4, 0xb2, 0xf0, - 0xfb, 0x23, 0x56, 0x41, 0x2c, 0xc3, 0x05, 0xdb, 0x25, 0x33, 0x31, 0xd8, 0xf2, 0xd5, 0xb3, 0x9e, - 0x93, 0x96, 0xb5, 0x7d, 0xf5, 0xf1, 0x90, 0x64, 0x1a, 0xe0, 0xf8, 0x56, 0x91, 0xe9, 0xb2, 0x90, - 0x9c, 0x6f, 0x2d, 0x90, 0xd1, 0xcc, 0x93, 0xb5, 0xa0, 0xf5, 0x42, 0xd6, 0x05, 0x78, 0x31, 0x4d, - 0x2b, 0x8d, 0x82, 0x7f, 0x0b, 0x18, 0x1a, 0x96, 0x41, 0x0c, 0x5a, 0x47, 0xd0, 0xf3, 0x4e, 0x73, - 0x95, 0x3e, 0xb6, 0x8a, 0x7f, 0xc8, 0xaa, 0x87, 0x65, 0x38, 0x13, 0xa0, 0x53, 0x14, 0xa4, 0x01, - 0xe3, 0x8c, 0xe7, 0xa4, 0x44, 0x71, 0xb8, 0xc8, 0xc8, 0xf9, 0x60, 0x71, 0x7b, 0x38, 0x15, 0xc0, - 0xb3, 0x16, 0xf2, 0x22, 0x7a, 0x02, 0xd1, 0x56, 0xb4, 0x60, 0xc8, 0xb8, 0x00, 0xfb, 0xd3, 0x04, - 0x53, 0x20, 0x78, 0x5b, 0x92, 0xfb, 0x90, 0x47, 0x6c, 0xcd, 0xab, 0xaf, 0x39, 0xa8, 0x82, 0x93, - 0xdc, 0x64, 0x5d, 0x39, 0xcf, 0x78, 0x2d, 0xd0, 0x0a, 0x88, 0xaa, 0x2c, 0x07, 0x1a, 0xd1, 0xb1, - 0xfe, 0x62, 0x5c, 0x2c, 0x88, 0x40, 0x9e, 0xcd, 0x28, 0x9f, 0xa8, 0x8d, 0x8c, 0x42, 0xa1, 0x35, - 0x50, 0x93, 0xfb, 0x22, 0x1f, 0x88, 0xad, 0xd5, 0x1d, 0x3a, 0xe2, 0xec, 0x68, 0x74, 0x95, 0x0b, - 0x6c, 0x09, 0xdd, 0xa2, 0x8e, 0x84, 0x2a, 0x4b, 0xf6, 0x82, 0x83, 0x61, 0x88, 0xb7, 0x7d, 0xf5, - 0x42, 0x30, 0xa2, 0x02, 0xb0, 0x04, 0x85, 0x6d, 0xc0, 0xa6, 0x0c, 0x36, 0x30, 0xae, 0x6b, 0x04, - 0xd7, 0xea, 0xb6, 0x83, 0x1c, 0x03, 0xbb, 0xda, 0xba, 0xd2, 0xcf, 0x28, 0xbf, 0x48, 0xd7, 0x25, - 0x45, 0x97, 0x12, 0x90, 0xd2, 0xbd, 0xc4, 0x7a, 0xc9, 0x02, 0x7c, 0x69, 0x74, 0x83, 0xa7, 0x3a, - 0x7a, 0x03, 0xe6, 0xac, 0x80, 0x1d, 0xb9, 0x5b, 0x47, 0xfa, 0x3a, 0xd6, 0x8c, 0x35, 0xcb, 0x76, - 0x70, 0x45, 0xab, 0x1a, 0x26, 0x76, 0x95, 0x8b, 0x8c, 0xe2, 0x0c, 0x3d, 0x60, 0x18, 0x3c, 0x13, - 0xa0, 0xd3, 0x14, 0x8c, 0x07, 0x3a, 0x87, 0xe4, 0xb6, 0x44, 0xbc, 0xd4, 0x61, 0xde, 0x0c, 0xf8, - 0xbe, 0x24, 0x5f, 0xa8, 0x3b, 0xf6, 0x1a, 0xad, 0x2d, 0x34, 0xaf, 0x5e, 0x41, 0x04, 0xf3, 0xf9, - 0xfa, 0xa3, 0x8c, 0xfb, 0x12, 0x4d, 0x37, 0x23, 0xad, 0x65, 0xa6, 0xc4, 0xe7, 0xe6, 0x41, 0xcd, - 0x5b, 0x80, 0x73, 0xee, 0xdc, 0xe4, 0x06, 0x42, 0xba, 0x09, 0x8b, 0x2c, 0x82, 0xb7, 0x24, 0xb9, - 0xd7, 0x34, 0x6a, 0x06, 0xd1, 0x56, 0x91, 0x55, 0xd9, 0x32, 0x2a, 0x64, 0x5d, 0x33, 0x2c, 0xcd, - 0x44, 0x96, 0x32, 0xc0, 0x86, 0x64, 0x8e, 0xd5, 0x72, 0x54, 0x63, 0x22, 0x52, 0x98, 0xb1, 0x66, - 0x91, 0x95, 0xd4, 0xdf, 0x79, 0xec, 0x80, 0x61, 0x11, 0x99, 0x02, 0x6f, 0x4a, 0x32, 0xa8, 0x19, - 0x96, 0xb6, 0x6e, 0xd7, 0xb0, 0x56, 0x31, 0xdc, 0x0d, 0xad, 0xea, 0x60, 0xac, 0xa8, 0x83, 0xd2, - 0xd0, 0xa9, 0xd1, 0x8e, 0xab, 0xc1, 0x45, 0xd7, 0xd5, 0x45, 0xe3, 0x75, 0x3c, 0xf1, 0xc2, 0x27, - 0xbe, 0x7a, 0x84, 0xee, 0xea, 0x9a, 0x61, 0xbd, 0x68, 0xd7, 0xf0, 0x94, 0xe1, 0x6e, 0x4c, 0x3b, - 0x18, 0xc7, 0xab, 0x23, 0x23, 0xe7, 0xf7, 0xc1, 0xe0, 0x65, 0xea, 0xc8, 0xb1, 0x91, 0xc1, 0xcb, - 0x30, 0xdb, 0x1c, 0xdc, 0x97, 0xe4, 0x8e, 0x68, 0xbd, 0xb3, 0x53, 0x60, 0x90, 0x9d, 0x02, 0x7f, - 0x66, 0x19, 0x48, 0xb4, 0x68, 0x83, 0xb3, 0xe0, 0x94, 0x93, 0x7c, 0xb6, 0x7d, 0x75, 0x2a, 0x2a, - 0x00, 0x22, 0x99, 0xe0, 0x5c, 0x08, 0x77, 0x80, 0x9b, 0x09, 0xf1, 0x35, 0x4c, 0xd0, 0xd5, 0xd7, - 0x5c, 0xdb, 0xa2, 0xa1, 0x34, 0x65, 0x36, 0xfd, 0xb9, 0xbf, 0x5b, 0x1e, 0x7a, 0x50, 0x53, 0x34, - 0x5d, 0xe1, 0xfc, 0x85, 0x89, 0x1d, 0xc7, 0x04, 0x2b, 0x72, 0x17, 0x32, 0xb7, 0x68, 0x31, 0x14, - 0x14, 0xf7, 0x16, 0x26, 0xae, 0xf2, 0x18, 0xbb, 0x53, 0xa3, 0x35, 0xe8, 0x99, 0x00, 0x64, 0x45, - 0xf2, 0x3c, 0x26, 0x74, 0xe1, 0xf7, 0x04, 0x11, 0x26, 0x25, 0x2f, 0xc1, 0xac, 0x22, 0xf8, 0x9f, - 0x24, 0x0f, 0xd9, 0x9b, 0xd8, 0xd9, 0x72, 0x0c, 0x42, 0x03, 0x47, 0xcd, 0x26, 0x58, 0xab, 0xe0, - 0x4d, 0x43, 0xc7, 0x9a, 0x85, 0x6a, 0xd8, 0xd5, 0x6c, 0x4b, 0x0b, 0xeb, 0x12, 0xa5, 0x94, 0xdc, - 0xf6, 0xf4, 0xdd, 0x8d, 0x1a, 0x41, 0xd6, 0x66, 0x0a, 0x6f, 0xce, 0x53, 0xf5, 0x96, 0xaf, 0x5e, - 0xb2, 0x73, 0x90, 0xa1, 0x63, 0x86, 0xde, 0xb5, 0x26, 0x03, 0x53, 0x6d, 0x5f, 0x7d, 0x8e, 0x39, - 0xf8, 0x00, 0xba, 0xc5, 0x8b, 0x92, 0x16, 0x55, 0x05, 0x7e, 0xc0, 0x07, 0xf1, 0x02, 0x7c, 0x53, - 0x3e, 0x47, 0xc3, 0x98, 0x66, 0x58, 0x15, 0xbc, 0xad, 0xd1, 0x95, 0xbc, 0x6a, 0xda, 0xfa, 0x86, - 0xab, 0x5c, 0x62, 0x5b, 0x9a, 0x2e, 0x1a, 0x40, 0x15, 0x66, 0x28, 0x3e, 0x67, 0x58, 0x13, 0x0c, - 0x8d, 0x2f, 0x51, 0xf3, 0x90, 0x30, 0x71, 0x0d, 0xd2, 0x51, 0x28, 0xb0, 0x04, 0xfe, 0x45, 0xb3, - 0x4f, 0x0b, 0xe9, 0x1b, 0xb8, 0xa2, 0x59, 0x36, 0x31, 0xaa, 0x86, 0x8e, 0x82, 0xeb, 0x80, 0x8a, - 0xab, 0x94, 0xd9, 0xfc, 0xbe, 0x4f, 0x87, 0xbb, 0x77, 0x39, 0x50, 0x9a, 0xe7, 0x74, 0x66, 0xa6, - 0xe8, 0x68, 0xf7, 0x7a, 0x42, 0xa4, 0xed, 0xab, 0xfd, 0x41, 0x68, 0x17, 0xc1, 0xec, 0xea, 0x50, - 0x88, 0xb4, 0x77, 0xcb, 0x05, 0x16, 0x1b, 0xcd, 0x72, 0x81, 0x17, 0x50, 0xd8, 0xa2, 0xe2, 0x02, - 0x28, 0x9f, 0x26, 0x0e, 0xaa, 0x56, 0x0d, 0x5d, 0xd3, 0x4d, 0xe4, 0xba, 0xca, 0x65, 0x36, 0xac, - 0xcf, 0xd0, 0xf2, 0x35, 0x04, 0x26, 0xa9, 0xbc, 0xed, 0xab, 0x20, 0x18, 0x50, 0x4e, 0x18, 0xdf, - 0x9b, 0xa4, 0x54, 0xc1, 0x1b, 0x72, 0x77, 0x38, 0xc4, 0x5a, 0xd5, 0x36, 0x2b, 0xd8, 0xd1, 0xea, - 0x88, 0xac, 0x2b, 0x8f, 0xb3, 0x5d, 0x7f, 0x67, 0xcf, 0x57, 0xfb, 0xa7, 0x70, 0xdd, 0xc1, 0x3a, - 0x22, 0xb8, 0x32, 0x15, 0x28, 0x4e, 0x33, 0xbd, 0x05, 0x44, 0xd6, 0x5b, 0xbe, 0x2a, 0x3d, 0x13, - 0x17, 0xcb, 0x95, 0x2c, 0x7c, 0xc5, 0xae, 0x19, 0x74, 0x92, 0xc8, 0x4e, 0x49, 0x91, 0x60, 0x57, - 0x0e, 0x07, 0x1b, 0xf2, 0x59, 0x17, 0x13, 0xcd, 0xb4, 0xb7, 0xb4, 0xba, 0x63, 0xd8, 0x8e, 0x41, - 0x76, 0x94, 0x27, 0xd8, 0xa6, 0x18, 0x6f, 0xf9, 0x6a, 0xa7, 0x8b, 0xc9, 0xac, 0xbd, 0xb5, 0x10, - 0x22, 0x71, 0x64, 0x4b, 0x8b, 0x0b, 0xcb, 0xf2, 0x4c, 0x73, 0xf0, 0x81, 0x24, 0xf7, 0xd6, 0xd0, - 0x76, 0x44, 0x53, 0xb7, 0x2d, 0xdd, 0x73, 0x1c, 0x6c, 0xe9, 0x3b, 0xca, 0x10, 0x1b, 0x47, 0x97, - 0xdd, 0x7d, 0xa0, 0xad, 0x39, 0xb4, 0x1d, 0xf8, 0x38, 0x99, 0xa8, 0xd0, 0x23, 0xbf, 0x26, 0x90, - 0xc7, 0x47, 0xbe, 0x08, 0x8c, 0x86, 0x9c, 0x5d, 0x56, 0x88, 0xed, 0x42, 0xa1, 0x55, 0xf0, 0xa9, - 0x24, 0x77, 0xeb, 0x0e, 0x72, 0xd7, 0x33, 0x29, 0xf9, 0x93, 0x6c, 0x5a, 0x3e, 0x64, 0x29, 0xf9, - 0x64, 0x94, 0x92, 0xeb, 0x61, 0x4a, 0x3e, 0x1d, 0x9c, 0xcd, 0xb4, 0x59, 0x92, 0x1c, 0x0b, 0xc3, - 0x30, 0xd3, 0xc9, 0xa7, 0xd9, 0x4c, 0x4c, 0xd7, 0x72, 0x57, 0xce, 0x08, 0x4d, 0xd6, 0xf5, 0x30, - 0x59, 0x2f, 0x3f, 0x88, 0x19, 0x9a, 0xae, 0x4f, 0x06, 0xe9, 0x7a, 0xc6, 0x98, 0x63, 0x82, 0x9f, - 0x4a, 0x72, 0x5f, 0x96, 0x5e, 0x74, 0x4b, 0xf2, 0x14, 0x9b, 0x7f, 0x63, 0xcf, 0x57, 0x4f, 0x4e, - 0x42, 0xee, 0x82, 0x3f, 0x6d, 0x25, 0x7b, 0xc1, 0x2f, 0x44, 0x8b, 0x96, 0x46, 0xa3, 0x59, 0x4e, - 0x6c, 0x43, 0xb1, 0x65, 0xf0, 0x6d, 0x49, 0xee, 0x75, 0x89, 0x67, 0x69, 0x34, 0x73, 0x42, 0xa6, - 0xb1, 0x89, 0xb5, 0xe0, 0xee, 0xc8, 0x55, 0x9e, 0x8e, 0xf3, 0xd1, 0x6e, 0xaa, 0x71, 0x27, 0x52, - 0x58, 0xa4, 0xf8, 0x62, 0x9c, 0x25, 0x09, 0xb0, 0x74, 0x6e, 0xcd, 0x05, 0xb4, 0x63, 0x23, 0xb7, - 0x87, 0xa1, 0xc8, 0x1a, 0x2d, 0x59, 0x33, 0x6e, 0xd0, 0xb8, 0xea, 0x2a, 0x57, 0x98, 0x13, 0x2f, - 0xd1, 0x44, 0x2d, 0xd5, 0x6c, 0xce, 0xb0, 0x92, 0xd4, 0x3e, 0x87, 0xf0, 0x39, 0x62, 0x2a, 0xa0, - 0x8e, 0x0e, 0xc3, 0xbc, 0x1d, 0x9a, 0x95, 0x77, 0xb0, 0xde, 0xa3, 0x77, 0xa7, 0x67, 0x58, 0x0c, - 0xad, 0xec, 0xf9, 0x6a, 0x27, 0x44, 0x5b, 0x8b, 0xc4, 0xe3, 0x5e, 0x9c, 0x4e, 0xb9, 0xc9, 0x67, - 0x7c, 0x37, 0x94, 0xc8, 0x0e, 0x7d, 0x15, 0xcb, 0x58, 0x84, 0xbc, 0x3d, 0xb0, 0x29, 0x9f, 0xa1, - 0x55, 0xe0, 0x2a, 0x72, 0xb1, 0x16, 0x3c, 0x01, 0x2a, 0x57, 0x07, 0xa5, 0xa1, 0xce, 0xd1, 0xce, - 0x28, 0x2d, 0x5a, 0x62, 0x52, 0x76, 0x99, 0xd7, 0x19, 0xa9, 0x06, 0xb2, 0x38, 0x72, 0xa4, 0xc5, - 0xa5, 0x41, 0x07, 0xb3, 0x29, 0x0d, 0x97, 0xc7, 0x9b, 0xcd, 0xb2, 0x04, 0x33, 0x4d, 0xc1, 0xbb, - 0x47, 0xe5, 0x4b, 0x34, 0x6a, 0xc4, 0xe1, 0x82, 0xd6, 0x94, 0xba, 0x5d, 0xa3, 0x4b, 0xd6, 0xc1, - 0xf7, 0x3c, 0xec, 0x12, 0x6d, 0xc3, 0x58, 0x55, 0xae, 0xb1, 0xe9, 0xf8, 0xab, 0x14, 0x3e, 0x1d, - 0xce, 0xa1, 0xed, 0xc9, 0x19, 0x18, 0xe0, 0x77, 0x8c, 0x89, 0x96, 0xaf, 0xaa, 0x35, 0xb4, 0x1d, - 0x6f, 0x71, 0x32, 0x13, 0xda, 0x48, 0x54, 0xe2, 0x53, 0xf0, 0x10, 0x3d, 0xae, 0x1e, 0x3b, 0xd4, - 0xe4, 0xe1, 0x2a, 0xe1, 0x63, 0x64, 0xc6, 0x5d, 0x78, 0x48, 0xb3, 0x55, 0xf0, 0xb9, 0x24, 0xf7, - 0xc6, 0x2f, 0x22, 0x26, 0xe2, 0xdf, 0x50, 0x87, 0xd9, 0x06, 0xfe, 0x88, 0x8e, 0x44, 0x4f, 0xf4, - 0xa2, 0x30, 0x3b, 0x3e, 0xcf, 0x3f, 0xa3, 0xf6, 0x20, 0x81, 0x3c, 0x4e, 0xa4, 0x45, 0xa0, 0xe8, - 0x21, 0x4b, 0x68, 0xa4, 0x40, 0xce, 0x6d, 0x7d, 0xa1, 0x53, 0x30, 0x69, 0x85, 0xb8, 0x37, 0xd8, - 0x4d, 0xf9, 0x02, 0x7b, 0xf4, 0xa8, 0x7a, 0xa6, 0x19, 0x66, 0x35, 0xb6, 0x15, 0x95, 0xa8, 0xca, - 0x08, 0x63, 0x3a, 0x46, 0xb3, 0x06, 0xaa, 0x35, 0xed, 0x99, 0x26, 0xcb, 0x47, 0xee, 0x5a, 0x61, - 0x51, 0xd9, 0xf6, 0xd5, 0x8b, 0xe1, 0x91, 0x25, 0x82, 0x4b, 0xb0, 0xa0, 0x1d, 0x78, 0x49, 0x3e, - 0x5d, 0xc5, 0x88, 0x78, 0x0e, 0xd6, 0xaa, 0x26, 0x5a, 0x73, 0x95, 0x51, 0xb6, 0xef, 0x2e, 0xd3, - 0x93, 0x3e, 0x04, 0xa6, 0xa9, 0x3c, 0x7e, 0x20, 0xe1, 0x84, 0x25, 0x98, 0x52, 0x01, 0x5b, 0x72, - 0x1f, 0xf7, 0x2e, 0x12, 0xd4, 0x38, 0xd8, 0xb2, 0xbd, 0xb5, 0x75, 0xe5, 0x3a, 0x5b, 0xb4, 0xcf, - 0xb3, 0xf0, 0x1a, 0xab, 0xcc, 0x52, 0x8d, 0x17, 0x98, 0x42, 0x9c, 0xf5, 0x08, 0xd1, 0x38, 0xa3, - 0x10, 0x37, 0x06, 0x1b, 0x72, 0x4f, 0xae, 0xe3, 0x1a, 0xda, 0x56, 0x6e, 0xb0, 0x5e, 0x9f, 0xa3, - 0xc9, 0x60, 0xa6, 0xe1, 0x1c, 0xda, 0x6e, 0xfb, 0xaa, 0x22, 0xea, 0x72, 0x0e, 0x6d, 0xc7, 0xfd, - 0x09, 0x9a, 0x81, 0xb7, 0x8f, 0xca, 0x6a, 0x74, 0xd9, 0xa3, 0x21, 0x93, 0xa6, 0x14, 0xb6, 0x59, - 0xd1, 0x88, 0xe9, 0x6a, 0x34, 0x7e, 0x18, 0xb6, 0xe5, 0x2a, 0x37, 0xd9, 0x7c, 0x7d, 0x4c, 0x57, - 0x66, 0x7f, 0x74, 0xb5, 0x32, 0x4e, 0x55, 0xef, 0x9a, 0x95, 0xa5, 0xd9, 0xc5, 0x57, 0x42, 0xbd, - 0x96, 0xaf, 0xf6, 0x1b, 0xc5, 0x70, 0x9c, 0xef, 0x1c, 0xa0, 0x43, 0xd7, 0xe7, 0x81, 0x36, 0x0e, - 0x86, 0x1b, 0xcd, 0xf2, 0x41, 0x0e, 0xc2, 0x7c, 0x5b, 0xd3, 0x8d, 0x40, 0xd0, 0x94, 0xe4, 0x7e, - 0x6e, 0xdc, 0xa3, 0xc4, 0x4a, 0x23, 0x7a, 0x9d, 0x95, 0xb3, 0xb7, 0xd8, 0xf0, 0xbf, 0x43, 0x47, - 0x41, 0x99, 0x8c, 0xf5, 0xa2, 0x34, 0x69, 0x69, 0x72, 0x61, 0x76, 0x7c, 0xbe, 0xe5, 0xab, 0x8a, - 0x9e, 0xc7, 0xf4, 0x7a, 0x50, 0xf0, 0x3e, 0x9d, 0x99, 0xa1, 0xb4, 0xc2, 0x01, 0x49, 0x7b, 0xa3, - 0x59, 0x2e, 0xec, 0x13, 0x16, 0xf6, 0x08, 0xfe, 0x21, 0xc9, 0x17, 0x45, 0x94, 0xee, 0x79, 0x86, - 0xce, 0x38, 0x3d, 0xcb, 0x38, 0xbd, 0x4b, 0x39, 0x9d, 0xcf, 0xdb, 0x7f, 0x79, 0x79, 0x66, 0x32, - 0x20, 0x75, 0x3e, 0xdf, 0xc5, 0xcb, 0x9e, 0xa1, 0x07, 0xac, 0xae, 0x14, 0xb0, 0x0a, 0x35, 0x0e, - 0x38, 0x3a, 0x1b, 0xcd, 0x72, 0x71, 0xb7, 0xb0, 0xb8, 0xd3, 0x03, 0xe7, 0x6a, 0x0b, 0x59, 0xca, - 0xed, 0xc3, 0xe6, 0x6a, 0xe5, 0x80, 0xb9, 0x5a, 0x39, 0x6c, 0xae, 0x56, 0x52, 0xa4, 0xae, 0xa7, - 0x48, 0x5d, 0x2f, 0x9e, 0xab, 0x95, 0xc2, 0xb9, 0x5a, 0x39, 0x6c, 0xae, 0x28, 0xa7, 0xe7, 0x0e, - 0x9d, 0xab, 0x95, 0x83, 0xe6, 0x6a, 0xe5, 0xd0, 0xb9, 0x4a, 0xd3, 0xba, 0x91, 0xa2, 0x75, 0xe3, - 0x80, 0xb9, 0x5a, 0x29, 0x9e, 0x2b, 0x4a, 0xac, 0x21, 0xc9, 0xe7, 0x45, 0xc4, 0xd8, 0x6b, 0xa3, - 0x32, 0xc6, 0x58, 0xbd, 0xd2, 0xf2, 0xd5, 0xbe, 0xbc, 0x09, 0xf6, 0x52, 0x99, 0xe4, 0xaa, 0x62, - 0x9c, 0xbf, 0xb4, 0x4a, 0xf9, 0x7c, 0x73, 0x18, 0x16, 0xd9, 0x04, 0x7f, 0x92, 0xe4, 0xcb, 0x22, - 0xa7, 0xe2, 0x1b, 0xcc, 0x75, 0x07, 0xbb, 0xeb, 0xb6, 0x59, 0x51, 0xbe, 0xc0, 0x1c, 0x7c, 0xad, - 0xe5, 0xab, 0x02, 0x07, 0xc2, 0x73, 0x67, 0x29, 0xd2, 0x6e, 0xfb, 0xea, 0x8d, 0x02, 0x5f, 0xb3, - 0xaa, 0x9c, 0xdb, 0xbc, 0xd7, 0xd2, 0x30, 0x7c, 0x80, 0xc6, 0xe0, 0xeb, 0x72, 0x87, 0x57, 0xb7, - 0xea, 0x71, 0xf6, 0xff, 0xcb, 0x69, 0x16, 0xa3, 0xbf, 0xb2, 0xe7, 0xab, 0xe7, 0x92, 0xc2, 0x73, - 0x79, 0xc1, 0x5a, 0x48, 0x4a, 0x01, 0x56, 0x72, 0x86, 0xd5, 0x78, 0xdd, 0xaa, 0x87, 0x00, 0x57, - 0x6c, 0x36, 0x9a, 0x65, 0x71, 0x63, 0x45, 0x82, 0xa7, 0xb8, 0x26, 0xe0, 0xe7, 0x52, 0xd8, 0x7d, - 0xf4, 0xf4, 0xf9, 0xc1, 0x34, 0x1b, 0xa5, 0x37, 0x59, 0xf2, 0x92, 0x36, 0x11, 0x3f, 0x83, 0xb2, - 0xee, 0x07, 0xe3, 0xee, 0xf9, 0xe7, 0x4b, 0xce, 0x87, 0x24, 0x4b, 0xbb, 0x50, 0xac, 0x45, 0xb3, - 0x11, 0x51, 0x2f, 0x8a, 0x04, 0xe5, 0xa4, 0x15, 0xf8, 0xad, 0x24, 0x77, 0x32, 0x37, 0x93, 0x47, - 0xce, 0x5f, 0x05, 0x8e, 0x7e, 0x97, 0x5d, 0x66, 0xa4, 0x4d, 0x70, 0x0f, 0x9e, 0xcc, 0xd5, 0x52, - 0xec, 0x6a, 0xfa, 0x89, 0x52, 0xe8, 0xec, 0xc5, 0x83, 0xf4, 0x1a, 0xcd, 0x72, 0x41, 0x5f, 0x8a, - 0x04, 0x3b, 0xf8, 0x96, 0x89, 0xcb, 0xc9, 0x53, 0xe6, 0x87, 0xc5, 0x2e, 0x73, 0xcf, 0x9a, 0x19, - 0x97, 0xd3, 0x0f, 0x91, 0xc5, 0x2e, 0x17, 0xe9, 0xe5, 0x5d, 0x8e, 0x34, 0x23, 0x97, 0xe3, 0x97, - 0xcb, 0xaa, 0x1c, 0xfc, 0x65, 0x22, 0xae, 0x75, 0x7e, 0x3d, 0xcd, 0x92, 0xae, 0x2f, 0xa5, 0xfd, - 0x65, 0xfb, 0x2e, 0x29, 0x7a, 0xb8, 0xc5, 0xe8, 0x24, 0x48, 0xfa, 0xe6, 0xa3, 0x83, 0x43, 0x5c, - 0x76, 0xd3, 0x9c, 0xbf, 0xe4, 0xd5, 0xea, 0x3a, 0x51, 0x3e, 0xa2, 0x43, 0x24, 0x4d, 0xcc, 0xed, - 0xf9, 0xea, 0xc5, 0xa4, 0xc7, 0xb9, 0xf4, 0x15, 0xed, 0x82, 0x4e, 0xd2, 0xe3, 0x54, 0xcb, 0xe1, - 0xe9, 0xee, 0x41, 0x5e, 0x81, 0x16, 0x76, 0x3d, 0x99, 0xb2, 0xc6, 0xd5, 0x91, 0xe5, 0x2a, 0xbf, - 0x09, 0x66, 0x69, 0x29, 0xe3, 0x02, 0x5f, 0x0e, 0x2c, 0x52, 0xc5, 0x8c, 0x0b, 0x39, 0x3c, 0x3f, - 0x55, 0xcc, 0x93, 0x9c, 0xde, 0xc4, 0x9d, 0x4f, 0x3e, 0x1b, 0x38, 0xd2, 0xfc, 0x6c, 0xe0, 0xc8, - 0x27, 0x7b, 0x03, 0x52, 0x73, 0x6f, 0x40, 0x7a, 0xe7, 0xfe, 0xc0, 0x91, 0xf7, 0xef, 0x0f, 0x48, - 0xcd, 0xfb, 0x03, 0x47, 0xfe, 0x79, 0x7f, 0xe0, 0xc8, 0xab, 0x4f, 0xae, 0x19, 0x64, 0xdd, 0x5b, - 0xbd, 0xaa, 0xdb, 0xb5, 0x6b, 0xf1, 0x65, 0x03, 0xf7, 0x2b, 0xf9, 0x0f, 0xe8, 0xea, 0x09, 0xf6, - 0xa7, 0xcf, 0xeb, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x24, 0x93, 0x46, 0x60, 0x2a, 0x00, - 0x00, -} - -func (m *OptionsConfiguration) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *OptionsConfiguration) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OptionsConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.DeprecatedMaxConcurrentScans != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.DeprecatedMaxConcurrentScans)) - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xf0 - } - if m.DeprecatedMinHomeDiskFreePct != 0 { - i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.DeprecatedMinHomeDiskFreePct)))) - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xe9 - } - if len(m.DeprecatedRelayServers) > 0 { - for iNdEx := len(m.DeprecatedRelayServers) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.DeprecatedRelayServers[iNdEx]) - copy(dAtA[i:], m.DeprecatedRelayServers[iNdEx]) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.DeprecatedRelayServers[iNdEx]))) - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xe2 - } - } - if m.DeprecatedUPnPTimeoutS != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.DeprecatedUPnPTimeoutS)) - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xd8 - } - if m.DeprecatedUPnPRenewalM != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.DeprecatedUPnPRenewalM)) - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xd0 - } - if m.DeprecatedUPnPLeaseM != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.DeprecatedUPnPLeaseM)) - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xc8 - } - if m.DeprecatedUPnPEnabled { - i-- - if m.DeprecatedUPnPEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x4 - i-- - dAtA[i] = 0xb2 - i-- - dAtA[i] = 0xc0 - } - if m.ConnectionPriorityUpgradeThreshold != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ConnectionPriorityUpgradeThreshold)) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xd8 - } - if m.ConnectionPriorityRelay != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ConnectionPriorityRelay)) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xd0 - } - if m.ConnectionPriorityQUICWAN != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ConnectionPriorityQUICWAN)) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xc8 - } - if m.ConnectionPriorityTCPWAN != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ConnectionPriorityTCPWAN)) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xc0 - } - if m.ConnectionPriorityQUICLAN != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ConnectionPriorityQUICLAN)) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xb8 - } - if m.ConnectionPriorityTCPLAN != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ConnectionPriorityTCPLAN)) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xb0 - } - if m.InsecureAllowOldTLSVersions { - i-- - if m.InsecureAllowOldTLSVersions { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xa8 - } - if m.ConnectionLimitMax != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ConnectionLimitMax)) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xa0 - } - if m.ConnectionLimitEnough != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ConnectionLimitEnough)) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0x98 - } - if len(m.FeatureFlags) > 0 { - for iNdEx := len(m.FeatureFlags) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.FeatureFlags[iNdEx]) - copy(dAtA[i:], m.FeatureFlags[iNdEx]) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.FeatureFlags[iNdEx]))) - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0x92 - } - } - if m.SendFullIndexOnUpgrade { - i-- - if m.SendFullIndexOnUpgrade { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0x88 - } - if m.AnnounceLANAddresses { - i-- - if m.AnnounceLANAddresses { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0x80 - } - if m.RawMaxCIRequestKiB != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.RawMaxCIRequestKiB)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xf8 - } - if m.DatabaseTuning != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.DatabaseTuning)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xf0 - } - if len(m.RawStunServers) > 0 { - for iNdEx := len(m.RawStunServers) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.RawStunServers[iNdEx]) - copy(dAtA[i:], m.RawStunServers[iNdEx]) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.RawStunServers[iNdEx]))) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xea - } - } - if m.StunKeepaliveMinS != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.StunKeepaliveMinS)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xe0 - } - if m.StunKeepaliveStartS != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.StunKeepaliveStartS)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xd8 - } - if m.CREnabled { - i-- - if m.CREnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xd0 - } - if len(m.CRURL) > 0 { - i -= len(m.CRURL) - copy(dAtA[i:], m.CRURL) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.CRURL))) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xca - } - if m.RawMaxFolderConcurrency != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.RawMaxFolderConcurrency)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xc0 - } - if m.SetLowPriority { - i-- - if m.SetLowPriority { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xb8 - } - if len(m.DeprecatedDefaultFolderPath) > 0 { - i -= len(m.DeprecatedDefaultFolderPath) - copy(dAtA[i:], m.DeprecatedDefaultFolderPath) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.DeprecatedDefaultFolderPath))) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xb2 - } - if m.TrafficClass != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.TrafficClass)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xa8 - } - if len(m.UnackedNotificationIDs) > 0 { - for iNdEx := len(m.UnackedNotificationIDs) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.UnackedNotificationIDs[iNdEx]) - copy(dAtA[i:], m.UnackedNotificationIDs[iNdEx]) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.UnackedNotificationIDs[iNdEx]))) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xa2 - } - } - if m.TempIndexMinBlocks != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.TempIndexMinBlocks)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x98 - } - if m.OverwriteRemoteDevNames { - i-- - if m.OverwriteRemoteDevNames { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x90 - } - if len(m.AlwaysLocalNets) > 0 { - for iNdEx := len(m.AlwaysLocalNets) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.AlwaysLocalNets[iNdEx]) - copy(dAtA[i:], m.AlwaysLocalNets[iNdEx]) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.AlwaysLocalNets[iNdEx]))) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x8a - } - } - if len(m.ReleasesURL) > 0 { - i -= len(m.ReleasesURL) - copy(dAtA[i:], m.ReleasesURL) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.ReleasesURL))) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x82 - } - { - size, err := m.MinHomeDiskFree.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xfa - if m.LimitBandwidthInLan { - i-- - if m.LimitBandwidthInLan { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xf0 - } - if m.ProgressUpdateIntervalS != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ProgressUpdateIntervalS)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xe8 - } - if m.CacheIgnoredFiles { - i-- - if m.CacheIgnoredFiles { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xe0 - } - if m.KeepTemporariesH != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.KeepTemporariesH)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xd8 - } - if m.UpgradeToPreReleases { - i-- - if m.UpgradeToPreReleases { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xd0 - } - if m.AutoUpgradeIntervalH != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.AutoUpgradeIntervalH)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xc8 - } - if m.URInitialDelayS != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.URInitialDelayS)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb8 - } - if m.URPostInsecurely { - i-- - if m.URPostInsecurely { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb0 - } - if len(m.URURL) > 0 { - i -= len(m.URURL) - copy(dAtA[i:], m.URURL) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.URURL))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xaa - } - if len(m.URUniqueID) > 0 { - i -= len(m.URUniqueID) - copy(dAtA[i:], m.URUniqueID) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.URUniqueID))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa2 - } - if m.URSeen != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.URSeen)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x98 - } - if m.URAccepted != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.URAccepted)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x90 - } - if m.NATTimeoutS != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.NATTimeoutS)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x88 - } - if m.NATRenewalM != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.NATRenewalM)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x80 - } - if m.NATLeaseM != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.NATLeaseM)) - i-- - dAtA[i] = 0x78 - } - if m.NATEnabled { - i-- - if m.NATEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x70 - } - if m.StartBrowser { - i-- - if m.StartBrowser { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x60 - } - if m.RelayReconnectIntervalM != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.RelayReconnectIntervalM)) - i-- - dAtA[i] = 0x58 - } - if m.RelaysEnabled { - i-- - if m.RelaysEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x50 - } - if m.ReconnectIntervalS != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.ReconnectIntervalS)) - i-- - dAtA[i] = 0x48 - } - if m.MaxRecvKbps != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.MaxRecvKbps)) - i-- - dAtA[i] = 0x40 - } - if m.MaxSendKbps != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.MaxSendKbps)) - i-- - dAtA[i] = 0x38 - } - if len(m.LocalAnnMCAddr) > 0 { - i -= len(m.LocalAnnMCAddr) - copy(dAtA[i:], m.LocalAnnMCAddr) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.LocalAnnMCAddr))) - i-- - dAtA[i] = 0x32 - } - if m.LocalAnnPort != 0 { - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(m.LocalAnnPort)) - i-- - dAtA[i] = 0x28 - } - if m.LocalAnnEnabled { - i-- - if m.LocalAnnEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x20 - } - if m.GlobalAnnEnabled { - i-- - if m.GlobalAnnEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x18 - } - if len(m.RawGlobalAnnServers) > 0 { - for iNdEx := len(m.RawGlobalAnnServers) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.RawGlobalAnnServers[iNdEx]) - copy(dAtA[i:], m.RawGlobalAnnServers[iNdEx]) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.RawGlobalAnnServers[iNdEx]))) - i-- - dAtA[i] = 0x12 - } - } - if len(m.RawListenAddresses) > 0 { - for iNdEx := len(m.RawListenAddresses) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.RawListenAddresses[iNdEx]) - copy(dAtA[i:], m.RawListenAddresses[iNdEx]) - i = encodeVarintOptionsconfiguration(dAtA, i, uint64(len(m.RawListenAddresses[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func encodeVarintOptionsconfiguration(dAtA []byte, offset int, v uint64) int { - offset -= sovOptionsconfiguration(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *OptionsConfiguration) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.RawListenAddresses) > 0 { - for _, s := range m.RawListenAddresses { - l = len(s) - n += 1 + l + sovOptionsconfiguration(uint64(l)) - } - } - if len(m.RawGlobalAnnServers) > 0 { - for _, s := range m.RawGlobalAnnServers { - l = len(s) - n += 1 + l + sovOptionsconfiguration(uint64(l)) - } - } - if m.GlobalAnnEnabled { - n += 2 - } - if m.LocalAnnEnabled { - n += 2 - } - if m.LocalAnnPort != 0 { - n += 1 + sovOptionsconfiguration(uint64(m.LocalAnnPort)) - } - l = len(m.LocalAnnMCAddr) - if l > 0 { - n += 1 + l + sovOptionsconfiguration(uint64(l)) - } - if m.MaxSendKbps != 0 { - n += 1 + sovOptionsconfiguration(uint64(m.MaxSendKbps)) - } - if m.MaxRecvKbps != 0 { - n += 1 + sovOptionsconfiguration(uint64(m.MaxRecvKbps)) - } - if m.ReconnectIntervalS != 0 { - n += 1 + sovOptionsconfiguration(uint64(m.ReconnectIntervalS)) - } - if m.RelaysEnabled { - n += 2 - } - if m.RelayReconnectIntervalM != 0 { - n += 1 + sovOptionsconfiguration(uint64(m.RelayReconnectIntervalM)) - } - if m.StartBrowser { - n += 2 - } - if m.NATEnabled { - n += 2 - } - if m.NATLeaseM != 0 { - n += 1 + sovOptionsconfiguration(uint64(m.NATLeaseM)) - } - if m.NATRenewalM != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.NATRenewalM)) - } - if m.NATTimeoutS != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.NATTimeoutS)) - } - if m.URAccepted != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.URAccepted)) - } - if m.URSeen != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.URSeen)) - } - l = len(m.URUniqueID) - if l > 0 { - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - l = len(m.URURL) - if l > 0 { - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - if m.URPostInsecurely { - n += 3 - } - if m.URInitialDelayS != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.URInitialDelayS)) - } - if m.AutoUpgradeIntervalH != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.AutoUpgradeIntervalH)) - } - if m.UpgradeToPreReleases { - n += 3 - } - if m.KeepTemporariesH != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.KeepTemporariesH)) - } - if m.CacheIgnoredFiles { - n += 3 - } - if m.ProgressUpdateIntervalS != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ProgressUpdateIntervalS)) - } - if m.LimitBandwidthInLan { - n += 3 - } - l = m.MinHomeDiskFree.ProtoSize() - n += 2 + l + sovOptionsconfiguration(uint64(l)) - l = len(m.ReleasesURL) - if l > 0 { - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - if len(m.AlwaysLocalNets) > 0 { - for _, s := range m.AlwaysLocalNets { - l = len(s) - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - } - if m.OverwriteRemoteDevNames { - n += 3 - } - if m.TempIndexMinBlocks != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.TempIndexMinBlocks)) - } - if len(m.UnackedNotificationIDs) > 0 { - for _, s := range m.UnackedNotificationIDs { - l = len(s) - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - } - if m.TrafficClass != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.TrafficClass)) - } - l = len(m.DeprecatedDefaultFolderPath) - if l > 0 { - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - if m.SetLowPriority { - n += 3 - } - if m.RawMaxFolderConcurrency != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.RawMaxFolderConcurrency)) - } - l = len(m.CRURL) - if l > 0 { - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - if m.CREnabled { - n += 3 - } - if m.StunKeepaliveStartS != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.StunKeepaliveStartS)) - } - if m.StunKeepaliveMinS != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.StunKeepaliveMinS)) - } - if len(m.RawStunServers) > 0 { - for _, s := range m.RawStunServers { - l = len(s) - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - } - if m.DatabaseTuning != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.DatabaseTuning)) - } - if m.RawMaxCIRequestKiB != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.RawMaxCIRequestKiB)) - } - if m.AnnounceLANAddresses { - n += 3 - } - if m.SendFullIndexOnUpgrade { - n += 3 - } - if len(m.FeatureFlags) > 0 { - for _, s := range m.FeatureFlags { - l = len(s) - n += 2 + l + sovOptionsconfiguration(uint64(l)) - } - } - if m.ConnectionLimitEnough != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ConnectionLimitEnough)) - } - if m.ConnectionLimitMax != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ConnectionLimitMax)) - } - if m.InsecureAllowOldTLSVersions { - n += 3 - } - if m.ConnectionPriorityTCPLAN != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ConnectionPriorityTCPLAN)) - } - if m.ConnectionPriorityQUICLAN != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ConnectionPriorityQUICLAN)) - } - if m.ConnectionPriorityTCPWAN != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ConnectionPriorityTCPWAN)) - } - if m.ConnectionPriorityQUICWAN != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ConnectionPriorityQUICWAN)) - } - if m.ConnectionPriorityRelay != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ConnectionPriorityRelay)) - } - if m.ConnectionPriorityUpgradeThreshold != 0 { - n += 2 + sovOptionsconfiguration(uint64(m.ConnectionPriorityUpgradeThreshold)) - } - if m.DeprecatedUPnPEnabled { - n += 4 - } - if m.DeprecatedUPnPLeaseM != 0 { - n += 3 + sovOptionsconfiguration(uint64(m.DeprecatedUPnPLeaseM)) - } - if m.DeprecatedUPnPRenewalM != 0 { - n += 3 + sovOptionsconfiguration(uint64(m.DeprecatedUPnPRenewalM)) - } - if m.DeprecatedUPnPTimeoutS != 0 { - n += 3 + sovOptionsconfiguration(uint64(m.DeprecatedUPnPTimeoutS)) - } - if len(m.DeprecatedRelayServers) > 0 { - for _, s := range m.DeprecatedRelayServers { - l = len(s) - n += 3 + l + sovOptionsconfiguration(uint64(l)) - } - } - if m.DeprecatedMinHomeDiskFreePct != 0 { - n += 11 - } - if m.DeprecatedMaxConcurrentScans != 0 { - n += 3 + sovOptionsconfiguration(uint64(m.DeprecatedMaxConcurrentScans)) - } - return n -} - -func sovOptionsconfiguration(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozOptionsconfiguration(x uint64) (n int) { - return sovOptionsconfiguration(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *OptionsConfiguration) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: OptionsConfiguration: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OptionsConfiguration: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RawListenAddresses", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RawListenAddresses = append(m.RawListenAddresses, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RawGlobalAnnServers", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RawGlobalAnnServers = append(m.RawGlobalAnnServers, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field GlobalAnnEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.GlobalAnnEnabled = bool(v != 0) - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LocalAnnEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.LocalAnnEnabled = bool(v != 0) - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LocalAnnPort", wireType) - } - m.LocalAnnPort = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LocalAnnPort |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LocalAnnMCAddr", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LocalAnnMCAddr = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxSendKbps", wireType) - } - m.MaxSendKbps = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxSendKbps |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxRecvKbps", wireType) - } - m.MaxRecvKbps = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxRecvKbps |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ReconnectIntervalS", wireType) - } - m.ReconnectIntervalS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ReconnectIntervalS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RelaysEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.RelaysEnabled = bool(v != 0) - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RelayReconnectIntervalM", wireType) - } - m.RelayReconnectIntervalM = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RelayReconnectIntervalM |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 12: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StartBrowser", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.StartBrowser = bool(v != 0) - case 14: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NATEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.NATEnabled = bool(v != 0) - case 15: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NATLeaseM", wireType) - } - m.NATLeaseM = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NATLeaseM |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 16: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NATRenewalM", wireType) - } - m.NATRenewalM = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NATRenewalM |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 17: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NATTimeoutS", wireType) - } - m.NATTimeoutS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NATTimeoutS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 18: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field URAccepted", wireType) - } - m.URAccepted = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.URAccepted |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 19: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field URSeen", wireType) - } - m.URSeen = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.URSeen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 20: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field URUniqueID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.URUniqueID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 21: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field URURL", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.URURL = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 22: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field URPostInsecurely", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.URPostInsecurely = bool(v != 0) - case 23: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field URInitialDelayS", wireType) - } - m.URInitialDelayS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.URInitialDelayS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 25: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AutoUpgradeIntervalH", wireType) - } - m.AutoUpgradeIntervalH = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.AutoUpgradeIntervalH |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 26: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field UpgradeToPreReleases", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.UpgradeToPreReleases = bool(v != 0) - case 27: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field KeepTemporariesH", wireType) - } - m.KeepTemporariesH = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.KeepTemporariesH |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 28: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CacheIgnoredFiles", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.CacheIgnoredFiles = bool(v != 0) - case 29: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ProgressUpdateIntervalS", wireType) - } - m.ProgressUpdateIntervalS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ProgressUpdateIntervalS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 30: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LimitBandwidthInLan", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.LimitBandwidthInLan = bool(v != 0) - case 31: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MinHomeDiskFree", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.MinHomeDiskFree.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 32: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ReleasesURL", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ReleasesURL = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 33: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AlwaysLocalNets", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AlwaysLocalNets = append(m.AlwaysLocalNets, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 34: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field OverwriteRemoteDevNames", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.OverwriteRemoteDevNames = bool(v != 0) - case 35: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TempIndexMinBlocks", wireType) - } - m.TempIndexMinBlocks = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TempIndexMinBlocks |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 36: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field UnackedNotificationIDs", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.UnackedNotificationIDs = append(m.UnackedNotificationIDs, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 37: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TrafficClass", wireType) - } - m.TrafficClass = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TrafficClass |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 38: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedDefaultFolderPath", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DeprecatedDefaultFolderPath = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 39: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SetLowPriority", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SetLowPriority = bool(v != 0) - case 40: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawMaxFolderConcurrency", wireType) - } - m.RawMaxFolderConcurrency = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RawMaxFolderConcurrency |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 41: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CRURL", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CRURL = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 42: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CREnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.CREnabled = bool(v != 0) - case 43: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StunKeepaliveStartS", wireType) - } - m.StunKeepaliveStartS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.StunKeepaliveStartS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 44: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StunKeepaliveMinS", wireType) - } - m.StunKeepaliveMinS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.StunKeepaliveMinS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 45: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RawStunServers", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RawStunServers = append(m.RawStunServers, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 46: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DatabaseTuning", wireType) - } - m.DatabaseTuning = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DatabaseTuning |= Tuning(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 47: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawMaxCIRequestKiB", wireType) - } - m.RawMaxCIRequestKiB = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RawMaxCIRequestKiB |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 48: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AnnounceLANAddresses", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.AnnounceLANAddresses = bool(v != 0) - case 49: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SendFullIndexOnUpgrade", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SendFullIndexOnUpgrade = bool(v != 0) - case 50: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FeatureFlags", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FeatureFlags = append(m.FeatureFlags, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 51: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionLimitEnough", wireType) - } - m.ConnectionLimitEnough = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectionLimitEnough |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 52: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionLimitMax", wireType) - } - m.ConnectionLimitMax = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectionLimitMax |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 53: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InsecureAllowOldTLSVersions", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.InsecureAllowOldTLSVersions = bool(v != 0) - case 54: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionPriorityTCPLAN", wireType) - } - m.ConnectionPriorityTCPLAN = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectionPriorityTCPLAN |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 55: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionPriorityQUICLAN", wireType) - } - m.ConnectionPriorityQUICLAN = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectionPriorityQUICLAN |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 56: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionPriorityTCPWAN", wireType) - } - m.ConnectionPriorityTCPWAN = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectionPriorityTCPWAN |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 57: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionPriorityQUICWAN", wireType) - } - m.ConnectionPriorityQUICWAN = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectionPriorityQUICWAN |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 58: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionPriorityRelay", wireType) - } - m.ConnectionPriorityRelay = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectionPriorityRelay |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 59: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionPriorityUpgradeThreshold", wireType) - } - m.ConnectionPriorityUpgradeThreshold = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectionPriorityUpgradeThreshold |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9000: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedUPnPEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DeprecatedUPnPEnabled = bool(v != 0) - case 9001: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedUPnPLeaseM", wireType) - } - m.DeprecatedUPnPLeaseM = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeprecatedUPnPLeaseM |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9002: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedUPnPRenewalM", wireType) - } - m.DeprecatedUPnPRenewalM = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeprecatedUPnPRenewalM |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9003: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedUPnPTimeoutS", wireType) - } - m.DeprecatedUPnPTimeoutS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeprecatedUPnPTimeoutS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9004: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedRelayServers", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOptionsconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DeprecatedRelayServers = append(m.DeprecatedRelayServers, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 9005: - if wireType != 1 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedMinHomeDiskFreePct", wireType) - } - var v uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - m.DeprecatedMinHomeDiskFreePct = float64(math.Float64frombits(v)) - case 9006: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedMaxConcurrentScans", wireType) - } - m.DeprecatedMaxConcurrentScans = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeprecatedMaxConcurrentScans |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipOptionsconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOptionsconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipOptionsconfiguration(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowOptionsconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthOptionsconfiguration - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupOptionsconfiguration - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthOptionsconfiguration - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthOptionsconfiguration = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowOptionsconfiguration = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupOptionsconfiguration = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/pullorder.go b/lib/config/pullorder.go index 1e64b0fac32..416865ad2d4 100644 --- a/lib/config/pullorder.go +++ b/lib/config/pullorder.go @@ -6,6 +6,17 @@ package config +type PullOrder int32 + +const ( + PullOrderRandom PullOrder = 0 + PullOrderAlphabetic PullOrder = 1 + PullOrderSmallestFirst PullOrder = 2 + PullOrderLargestFirst PullOrder = 3 + PullOrderOldestFirst PullOrder = 4 + PullOrderNewestFirst PullOrder = 5 +) + func (o PullOrder) String() string { switch o { case PullOrderRandom: diff --git a/lib/config/pullorder.pb.go b/lib/config/pullorder.pb.go deleted file mode 100644 index 10a1cafeec7..00000000000 --- a/lib/config/pullorder.pb.go +++ /dev/null @@ -1,87 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/pullorder.proto - -package config - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type PullOrder int32 - -const ( - PullOrderRandom PullOrder = 0 - PullOrderAlphabetic PullOrder = 1 - PullOrderSmallestFirst PullOrder = 2 - PullOrderLargestFirst PullOrder = 3 - PullOrderOldestFirst PullOrder = 4 - PullOrderNewestFirst PullOrder = 5 -) - -var PullOrder_name = map[int32]string{ - 0: "PULL_ORDER_RANDOM", - 1: "PULL_ORDER_ALPHABETIC", - 2: "PULL_ORDER_SMALLEST_FIRST", - 3: "PULL_ORDER_LARGEST_FIRST", - 4: "PULL_ORDER_OLDEST_FIRST", - 5: "PULL_ORDER_NEWEST_FIRST", -} - -var PullOrder_value = map[string]int32{ - "PULL_ORDER_RANDOM": 0, - "PULL_ORDER_ALPHABETIC": 1, - "PULL_ORDER_SMALLEST_FIRST": 2, - "PULL_ORDER_LARGEST_FIRST": 3, - "PULL_ORDER_OLDEST_FIRST": 4, - "PULL_ORDER_NEWEST_FIRST": 5, -} - -func (PullOrder) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_2fa3f5222a7755bf, []int{0} -} - -func init() { - proto.RegisterEnum("config.PullOrder", PullOrder_name, PullOrder_value) -} - -func init() { proto.RegisterFile("lib/config/pullorder.proto", fileDescriptor_2fa3f5222a7755bf) } - -var fileDescriptor_2fa3f5222a7755bf = []byte{ - // 347 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xd1, 0xbf, 0x4a, 0xc3, 0x40, - 0x1c, 0xc0, 0xf1, 0xa4, 0xd6, 0x82, 0xb7, 0x58, 0x53, 0x6b, 0xdb, 0x1b, 0x8e, 0x80, 0x93, 0x1d, - 0x1a, 0x50, 0x44, 0x1c, 0x53, 0x9b, 0x6a, 0xf1, 0xda, 0x94, 0xa4, 0x22, 0xb8, 0x94, 0x24, 0x4d, - 0xd3, 0xc0, 0x35, 0x17, 0xf2, 0x07, 0xf1, 0x15, 0x32, 0xf9, 0x02, 0x01, 0x07, 0x07, 0x1f, 0xa5, - 0x63, 0xc1, 0xc5, 0xb5, 0xcd, 0x8b, 0x88, 0x29, 0x26, 0x41, 0x70, 0xfb, 0xdd, 0x8f, 0xef, 0xe7, - 0x96, 0x1f, 0x80, 0xc4, 0xd6, 0x05, 0x83, 0x3a, 0x73, 0xdb, 0x12, 0xdc, 0x90, 0x10, 0xea, 0xcd, - 0x4c, 0xaf, 0xe3, 0x7a, 0x34, 0xa0, 0x5c, 0x65, 0xb7, 0x87, 0xa7, 0x9e, 0xe9, 0x52, 0x5f, 0x48, - 0x97, 0x7a, 0x38, 0x17, 0x2c, 0x6a, 0xd1, 0xf4, 0x91, 0x4e, 0xbb, 0xb8, 0xfd, 0x59, 0x02, 0x07, - 0xe3, 0x90, 0x10, 0xf9, 0xe7, 0x03, 0xae, 0x0d, 0x8e, 0xc6, 0x0f, 0x18, 0x4f, 0x65, 0xa5, 0x27, - 0x29, 0x53, 0x45, 0x1c, 0xf5, 0xe4, 0x61, 0x95, 0x81, 0xb5, 0x28, 0xe6, 0x0f, 0xb3, 0x4a, 0xd1, - 0x9c, 0x19, 0x5d, 0x72, 0xe7, 0xa0, 0x5e, 0x68, 0x45, 0x3c, 0xbe, 0x13, 0xbb, 0xd2, 0x64, 0x70, - 0x53, 0x65, 0x61, 0x23, 0x8a, 0xf9, 0x5a, 0xd6, 0x8b, 0xc4, 0x5d, 0x68, 0xba, 0x19, 0xd8, 0x06, - 0x77, 0x0d, 0x5a, 0x05, 0xa3, 0x0e, 0x45, 0x8c, 0x25, 0x75, 0x32, 0xed, 0x0f, 0x14, 0x75, 0x52, - 0x2d, 0x41, 0x18, 0xc5, 0xfc, 0x49, 0xe6, 0xd4, 0xa5, 0x46, 0x88, 0xe9, 0x07, 0x7d, 0xdb, 0xf3, - 0x03, 0xee, 0x0a, 0x34, 0x0b, 0x14, 0x8b, 0xca, 0x6d, 0x2e, 0xf7, 0x60, 0x2b, 0x8a, 0xf9, 0x7a, - 0x26, 0xb1, 0xe6, 0x59, 0x19, 0xbc, 0x04, 0x8d, 0x02, 0x94, 0x71, 0x2f, 0x77, 0x65, 0xd8, 0x8c, - 0x62, 0xfe, 0x38, 0x73, 0x32, 0x99, 0xfd, 0xc3, 0x46, 0xd2, 0x63, 0xce, 0xf6, 0xff, 0xb0, 0x91, - 0xf9, 0xfc, 0xcb, 0x60, 0xf9, 0xe3, 0x1d, 0x31, 0xdd, 0xfb, 0xd5, 0x06, 0x31, 0xeb, 0x0d, 0x62, - 0x56, 0x5b, 0xc4, 0xae, 0xb7, 0x88, 0x7d, 0x4d, 0x10, 0xf3, 0x96, 0x20, 0x76, 0x9d, 0x20, 0xe6, - 0x2b, 0x41, 0xcc, 0xd3, 0x99, 0x65, 0x07, 0x8b, 0x50, 0xef, 0x18, 0x74, 0x29, 0xf8, 0x2f, 0x8e, - 0x11, 0x2c, 0x6c, 0xc7, 0x2a, 0x4c, 0xf9, 0x7d, 0xf5, 0x4a, 0x7a, 0xa9, 0x8b, 0xef, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x09, 0x68, 0xa0, 0x7d, 0xf4, 0x01, 0x00, 0x00, -} diff --git a/lib/config/size.go b/lib/config/size.go index b3c27ef9b0e..6ae1100d55a 100644 --- a/lib/config/size.go +++ b/lib/config/size.go @@ -14,6 +14,11 @@ import ( "github.com/syncthing/syncthing/lib/fs" ) +type Size struct { + Value float64 `json:"value" xml:",chardata"` + Unit string `json:"unit" xml:"unit,attr"` +} + func ParseSize(s string) (Size, error) { s = strings.TrimSpace(s) if s == "" { diff --git a/lib/config/size.pb.go b/lib/config/size.pb.go deleted file mode 100644 index 51fbbc69cad..00000000000 --- a/lib/config/size.pb.go +++ /dev/null @@ -1,336 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/size.proto - -package config - -import ( - encoding_binary "encoding/binary" - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Size struct { - Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value" xml:",chardata"` - Unit string `protobuf:"bytes,2,opt,name=unit,proto3" json:"unit" xml:"unit,attr"` -} - -func (m *Size) Reset() { *m = Size{} } -func (*Size) ProtoMessage() {} -func (*Size) Descriptor() ([]byte, []int) { - return fileDescriptor_4d75cb8f619bd299, []int{0} -} -func (m *Size) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Size) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Size.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Size) XXX_Merge(src proto.Message) { - xxx_messageInfo_Size.Merge(m, src) -} -func (m *Size) XXX_Size() int { - return m.ProtoSize() -} -func (m *Size) XXX_DiscardUnknown() { - xxx_messageInfo_Size.DiscardUnknown(m) -} - -var xxx_messageInfo_Size proto.InternalMessageInfo - -func init() { - proto.RegisterType((*Size)(nil), "config.Size") -} - -func init() { proto.RegisterFile("lib/config/size.proto", fileDescriptor_4d75cb8f619bd299) } - -var fileDescriptor_4d75cb8f619bd299 = []byte{ - // 251 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0xc9, 0x4c, 0xd2, - 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2f, 0xce, 0xac, 0x4a, 0xd5, 0x2b, 0x28, 0xca, 0x2f, - 0xc9, 0x17, 0x62, 0x83, 0x08, 0x49, 0x29, 0x17, 0xa5, 0x16, 0xe4, 0x17, 0xeb, 0x83, 0x05, 0x93, - 0x4a, 0xd3, 0xf4, 0xd3, 0xf3, 0xd3, 0xf3, 0xc1, 0x1c, 0x30, 0x0b, 0xa2, 0x58, 0x8a, 0x33, 0xb5, - 0xa2, 0x04, 0xc2, 0x54, 0xea, 0x66, 0xe4, 0x62, 0x09, 0xce, 0xac, 0x4a, 0x15, 0xb2, 0xe7, 0x62, - 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd4, 0x60, 0x74, 0xd2, 0x7c, 0x75, 0x4f, - 0x1e, 0x22, 0xf0, 0xe9, 0x9e, 0x3c, 0x7f, 0x45, 0x6e, 0x8e, 0x95, 0x92, 0x4e, 0x72, 0x46, 0x62, - 0x51, 0x4a, 0x62, 0x49, 0xa2, 0xd2, 0xab, 0xf3, 0x2a, 0x9c, 0x70, 0x5e, 0x10, 0x44, 0x99, 0x90, - 0x0d, 0x17, 0x4b, 0x69, 0x5e, 0x66, 0x89, 0x04, 0x93, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xc6, 0xab, - 0x7b, 0xf2, 0x60, 0x3e, 0x5c, 0x3b, 0x88, 0xa3, 0x93, 0x58, 0x52, 0x52, 0x04, 0xd6, 0x0e, 0xe7, - 0x05, 0x81, 0x55, 0x59, 0xb1, 0xcc, 0x58, 0x20, 0xcf, 0xe0, 0xe4, 0x7d, 0xe2, 0xa1, 0x1c, 0xc3, - 0x85, 0x87, 0x72, 0x0c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, - 0xc3, 0x82, 0xc7, 0x72, 0x8c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x99, - 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x5f, 0x5c, 0x99, 0x97, 0x5c, 0x92, - 0x91, 0x99, 0x97, 0x8e, 0xc4, 0x42, 0x84, 0x4e, 0x12, 0x1b, 0xd8, 0x87, 0xc6, 0x80, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x65, 0x1e, 0xa3, 0x25, 0x32, 0x01, 0x00, 0x00, -} - -func (m *Size) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Size) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Size) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Unit) > 0 { - i -= len(m.Unit) - copy(dAtA[i:], m.Unit) - i = encodeVarintSize(dAtA, i, uint64(len(m.Unit))) - i-- - dAtA[i] = 0x12 - } - if m.Value != 0 { - i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Value)))) - i-- - dAtA[i] = 0x9 - } - return len(dAtA) - i, nil -} - -func encodeVarintSize(dAtA []byte, offset int, v uint64) int { - offset -= sovSize(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Size) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Value != 0 { - n += 9 - } - l = len(m.Unit) - if l > 0 { - n += 1 + l + sovSize(uint64(l)) - } - return n -} - -func sovSize(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozSize(x uint64) (n int) { - return sovSize(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Size) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSize - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Size: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Size: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 1 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - var v uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - m.Value = float64(math.Float64frombits(v)) - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Unit", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSize - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthSize - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSize - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Unit = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipSize(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSize - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipSize(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSize - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSize - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSize - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthSize - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupSize - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthSize - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthSize = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowSize = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupSize = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/tuning.go b/lib/config/tuning.go index 50296d7fe58..c2fa9df435e 100644 --- a/lib/config/tuning.go +++ b/lib/config/tuning.go @@ -6,6 +6,14 @@ package config +type Tuning int32 + +const ( + TuningAuto Tuning = 0 + TuningSmall Tuning = 1 + TuningLarge Tuning = 2 +) + func (t Tuning) String() string { switch t { case TuningAuto: diff --git a/lib/config/tuning.pb.go b/lib/config/tuning.pb.go deleted file mode 100644 index ff1934fc423..00000000000 --- a/lib/config/tuning.pb.go +++ /dev/null @@ -1,71 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/tuning.proto - -package config - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Tuning int32 - -const ( - TuningAuto Tuning = 0 - TuningSmall Tuning = 1 - TuningLarge Tuning = 2 -) - -var Tuning_name = map[int32]string{ - 0: "TUNING_AUTO", - 1: "TUNING_SMALL", - 2: "TUNING_LARGE", -} - -var Tuning_value = map[string]int32{ - "TUNING_AUTO": 0, - "TUNING_SMALL": 1, - "TUNING_LARGE": 2, -} - -func (Tuning) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_204cfa1615fdfefd, []int{0} -} - -func init() { - proto.RegisterEnum("config.Tuning", Tuning_name, Tuning_value) -} - -func init() { proto.RegisterFile("lib/config/tuning.proto", fileDescriptor_204cfa1615fdfefd) } - -var fileDescriptor_204cfa1615fdfefd = []byte{ - // 228 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcf, 0xc9, 0x4c, 0xd2, - 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2f, 0x29, 0xcd, 0xcb, 0xcc, 0x4b, 0xd7, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0x08, 0x4a, 0x29, 0x17, 0xa5, 0x16, 0xe4, 0x17, 0xeb, 0x83, - 0x05, 0x93, 0x4a, 0xd3, 0xf4, 0xd3, 0xf3, 0xd3, 0xf3, 0xc1, 0x1c, 0x30, 0x0b, 0xa2, 0x58, 0xab, - 0x94, 0x8b, 0x2d, 0x04, 0xac, 0x59, 0x48, 0x9e, 0x8b, 0x3b, 0x24, 0xd4, 0xcf, 0xd3, 0xcf, 0x3d, - 0xde, 0x31, 0x34, 0xc4, 0x5f, 0x80, 0x41, 0x8a, 0xaf, 0x6b, 0xae, 0x02, 0x17, 0x44, 0xd2, 0xb1, - 0xb4, 0x24, 0x5f, 0x48, 0x91, 0x8b, 0x07, 0xaa, 0x20, 0xd8, 0xd7, 0xd1, 0xc7, 0x47, 0x80, 0x51, - 0x8a, 0xbf, 0x6b, 0xae, 0x02, 0x37, 0x44, 0x45, 0x70, 0x6e, 0x62, 0x4e, 0x0e, 0x92, 0x12, 0x1f, - 0xc7, 0x20, 0x77, 0x57, 0x01, 0x26, 0x64, 0x25, 0x3e, 0x89, 0x45, 0xe9, 0xa9, 0x52, 0x2c, 0x2b, - 0x96, 0xc8, 0x31, 0x38, 0x79, 0x9f, 0x78, 0x28, 0xc7, 0x70, 0xe1, 0xa1, 0x1c, 0xc3, 0x89, 0x47, - 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0xb0, 0xe0, 0xb1, 0x1c, 0xe3, 0x85, - 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x69, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, - 0x25, 0xe7, 0xe7, 0xea, 0x17, 0x57, 0xe6, 0x25, 0x97, 0x64, 0x64, 0xe6, 0xa5, 0x23, 0xb1, 0x10, - 0xbe, 0x4f, 0x62, 0x03, 0x7b, 0xc5, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x69, 0xc8, 0xbc, - 0x12, 0x01, 0x00, 0x00, -} diff --git a/lib/config/versioningconfiguration.go b/lib/config/versioningconfiguration.go index 05355e746f8..1aa4cb06e3d 100644 --- a/lib/config/versioningconfiguration.go +++ b/lib/config/versioningconfiguration.go @@ -11,17 +11,29 @@ import ( "encoding/xml" "sort" - "github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/structutil" ) +// VersioningConfiguration is used in the code and for JSON serialization +type VersioningConfiguration struct { + Type string `json:"type" xml:"type,attr"` + Params map[string]string `json:"params" xml:"parameter" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + CleanupIntervalS int `json:"cleanupIntervalS" xml:"cleanupIntervalS" default:"3600"` + FSPath string `json:"fsPath" xml:"fsPath"` + FSType FilesystemType `json:"fsType" xml:"fsType"` +} + +func (c *VersioningConfiguration) Reset() { + *c = VersioningConfiguration{} +} + // internalVersioningConfiguration is used in XML serialization type internalVersioningConfiguration struct { - Type string `xml:"type,attr,omitempty"` - Params []internalParam `xml:"param"` - CleanupIntervalS int `xml:"cleanupIntervalS" default:"3600"` - FSPath string `xml:"fsPath"` - FSType fs.FilesystemType `xml:"fsType"` + Type string `xml:"type,attr,omitempty"` + Params []internalParam `xml:"param"` + CleanupIntervalS int `xml:"cleanupIntervalS" default:"3600"` + FSPath string `xml:"fsPath"` + FSType FilesystemType `xml:"fsType"` } type internalParam struct { diff --git a/lib/config/versioningconfiguration.pb.go b/lib/config/versioningconfiguration.pb.go deleted file mode 100644 index 16d8807ed5f..00000000000 --- a/lib/config/versioningconfiguration.pb.go +++ /dev/null @@ -1,591 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/config/versioningconfiguration.proto - -package config - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - fs "github.com/syncthing/syncthing/lib/fs" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// VersioningConfiguration is used in the code and for JSON serialization -type VersioningConfiguration struct { - Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type" xml:"type,attr"` - Params map[string]string `protobuf:"bytes,2,rep,name=parameters,proto3" json:"params" xml:"parameter" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - CleanupIntervalS int `protobuf:"varint,3,opt,name=cleanup_interval_s,json=cleanupIntervalS,proto3,casttype=int" json:"cleanupIntervalS" xml:"cleanupIntervalS" default:"3600"` - FSPath string `protobuf:"bytes,4,opt,name=fs_path,json=fsPath,proto3" json:"fsPath" xml:"fsPath"` - FSType fs.FilesystemType `protobuf:"varint,5,opt,name=fs_type,json=fsType,proto3,enum=fs.FilesystemType" json:"fsType" xml:"fsType"` -} - -func (m *VersioningConfiguration) Reset() { *m = VersioningConfiguration{} } -func (m *VersioningConfiguration) String() string { return proto.CompactTextString(m) } -func (*VersioningConfiguration) ProtoMessage() {} -func (*VersioningConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_95ba6bdb22ffea81, []int{0} -} -func (m *VersioningConfiguration) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *VersioningConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_VersioningConfiguration.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *VersioningConfiguration) XXX_Merge(src proto.Message) { - xxx_messageInfo_VersioningConfiguration.Merge(m, src) -} -func (m *VersioningConfiguration) XXX_Size() int { - return m.ProtoSize() -} -func (m *VersioningConfiguration) XXX_DiscardUnknown() { - xxx_messageInfo_VersioningConfiguration.DiscardUnknown(m) -} - -var xxx_messageInfo_VersioningConfiguration proto.InternalMessageInfo - -func init() { - proto.RegisterType((*VersioningConfiguration)(nil), "config.VersioningConfiguration") - proto.RegisterMapType((map[string]string)(nil), "config.VersioningConfiguration.ParametersEntry") -} - -func init() { - proto.RegisterFile("lib/config/versioningconfiguration.proto", fileDescriptor_95ba6bdb22ffea81) -} - -var fileDescriptor_95ba6bdb22ffea81 = []byte{ - // 514 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0x4f, 0x6b, 0xdb, 0x4e, - 0x10, 0x95, 0xfc, 0xef, 0x87, 0x95, 0x1f, 0x4d, 0x59, 0x0a, 0x15, 0x3e, 0x68, 0x8d, 0x70, 0x8b, - 0x0a, 0x45, 0x0e, 0x09, 0x94, 0x62, 0x0a, 0x05, 0x97, 0xa6, 0x94, 0xf6, 0x10, 0x94, 0xd0, 0x43, - 0x7b, 0x30, 0x6b, 0x77, 0x65, 0x2f, 0x91, 0x57, 0x42, 0xbb, 0x36, 0x51, 0x3f, 0x45, 0xe8, 0x27, - 0xe8, 0xc7, 0xf1, 0xcd, 0x3e, 0xf6, 0xb4, 0x10, 0xfb, 0xa6, 0xa3, 0x8e, 0xe9, 0xa5, 0xec, 0xae, - 0xa2, 0x9a, 0x94, 0xde, 0xe6, 0xcd, 0x7b, 0xf3, 0x66, 0x46, 0xb3, 0xb2, 0xbc, 0x88, 0x8c, 0xfb, - 0x93, 0x98, 0x86, 0x64, 0xda, 0x5f, 0xe2, 0x94, 0x91, 0x98, 0x12, 0x3a, 0xd5, 0x89, 0x45, 0x8a, - 0x38, 0x89, 0xa9, 0x9f, 0xa4, 0x31, 0x8f, 0x41, 0x4b, 0x27, 0x3b, 0x40, 0x56, 0x84, 0xac, 0xcf, - 0xb3, 0x04, 0x33, 0xcd, 0x75, 0xda, 0xf8, 0x8a, 0xeb, 0xd0, 0xfd, 0xd5, 0xb0, 0x1e, 0x7f, 0xaa, - 0x8c, 0xde, 0xec, 0x1b, 0x81, 0x57, 0x56, 0x43, 0x56, 0xd9, 0x66, 0xd7, 0xf4, 0xda, 0x43, 0x2f, - 0x17, 0x50, 0xe1, 0x42, 0xc0, 0xc3, 0xab, 0x79, 0x34, 0x70, 0x25, 0x78, 0x8e, 0x38, 0x4f, 0xdd, - 0x7c, 0xdd, 0x6b, 0x57, 0x28, 0x50, 0x2a, 0x70, 0x6d, 0x5a, 0x56, 0x82, 0x52, 0x34, 0xc7, 0x1c, - 0xa7, 0xcc, 0xae, 0x75, 0xeb, 0xde, 0xc1, 0x71, 0xdf, 0xd7, 0x63, 0xf9, 0xff, 0xe8, 0xe9, 0x9f, - 0x55, 0x15, 0x6f, 0x29, 0x4f, 0xb3, 0xe1, 0xeb, 0x95, 0x80, 0xc6, 0x56, 0xc0, 0x96, 0x22, 0x58, - 0x2e, 0x60, 0x4b, 0x99, 0xb2, 0x6a, 0x8a, 0xaa, 0x87, 0x5b, 0xac, 0x7b, 0x25, 0xf9, 0x7d, 0xd3, - 0x2b, 0x0b, 0x82, 0xbd, 0x19, 0xc0, 0x37, 0x0b, 0x4c, 0x22, 0x8c, 0xe8, 0x22, 0x19, 0x11, 0xca, - 0x71, 0xba, 0x44, 0xd1, 0x88, 0xd9, 0xf5, 0xae, 0xe9, 0x35, 0x87, 0x1f, 0x73, 0x01, 0x1f, 0x96, - 0xec, 0xfb, 0x92, 0x3c, 0x2f, 0x04, 0x7c, 0xa2, 0x9a, 0xdc, 0x27, 0xdc, 0xee, 0x57, 0x1c, 0xa2, - 0x45, 0xc4, 0x07, 0xee, 0xc9, 0x8b, 0xa3, 0x23, 0xf7, 0x56, 0xc0, 0x3a, 0xa1, 0xfc, 0x76, 0xdd, - 0x6b, 0x48, 0x1c, 0xfc, 0xe5, 0x04, 0xde, 0x59, 0xff, 0x85, 0x6c, 0x94, 0x20, 0x3e, 0xb3, 0x1b, - 0xea, 0x7b, 0xfa, 0x72, 0xab, 0xd3, 0xf3, 0x33, 0xc4, 0x67, 0x72, 0xab, 0x90, 0xc9, 0xa8, 0x10, - 0xf0, 0x7f, 0xd5, 0x50, 0x43, 0x57, 0x2e, 0xa2, 0x35, 0x41, 0xa9, 0x00, 0x5f, 0x94, 0x91, 0x3a, - 0x4c, 0xb3, 0x6b, 0x7a, 0x0f, 0x8e, 0x81, 0x1f, 0x32, 0xff, 0x94, 0x44, 0x98, 0x65, 0x8c, 0xe3, - 0xf9, 0x45, 0x96, 0xe0, 0x3b, 0x73, 0x19, 0x6b, 0xf3, 0x0b, 0x7d, 0xb8, 0x3b, 0x73, 0x09, 0x4b, - 0x73, 0x19, 0x06, 0xa5, 0xa2, 0x33, 0xb7, 0x0e, 0xef, 0x5d, 0x00, 0x3c, 0xb5, 0xea, 0x97, 0x38, - 0x2b, 0x1f, 0xc1, 0xa3, 0x5c, 0x40, 0x09, 0x0b, 0x01, 0xdb, 0xca, 0xea, 0x12, 0x67, 0x6e, 0x20, - 0x33, 0xc0, 0xb7, 0x9a, 0x4b, 0x14, 0x2d, 0xb0, 0x5d, 0x53, 0x4a, 0x3b, 0x17, 0x50, 0x27, 0x0a, - 0x01, 0x0f, 0x94, 0x56, 0x21, 0x37, 0xd0, 0xd9, 0x41, 0xed, 0xa5, 0x39, 0xfc, 0xb0, 0xba, 0x71, - 0x8c, 0xcd, 0x8d, 0x63, 0xac, 0xb6, 0x8e, 0xb9, 0xd9, 0x3a, 0xe6, 0xf5, 0xce, 0x31, 0x7e, 0xec, - 0x1c, 0x73, 0xb3, 0x73, 0x8c, 0x9f, 0x3b, 0xc7, 0xf8, 0xfc, 0x6c, 0x4a, 0xf8, 0x6c, 0x31, 0xf6, - 0x27, 0xf1, 0xbc, 0xcf, 0x32, 0x3a, 0xe1, 0x33, 0x42, 0xa7, 0x7b, 0xd1, 0x9f, 0xff, 0x61, 0xdc, - 0x52, 0x2f, 0xfa, 0xe4, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x04, 0xd0, 0xd5, 0x24, 0x03, - 0x00, 0x00, -} - -func (m *VersioningConfiguration) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *VersioningConfiguration) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *VersioningConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.FSType != 0 { - i = encodeVarintVersioningconfiguration(dAtA, i, uint64(m.FSType)) - i-- - dAtA[i] = 0x28 - } - if len(m.FSPath) > 0 { - i -= len(m.FSPath) - copy(dAtA[i:], m.FSPath) - i = encodeVarintVersioningconfiguration(dAtA, i, uint64(len(m.FSPath))) - i-- - dAtA[i] = 0x22 - } - if m.CleanupIntervalS != 0 { - i = encodeVarintVersioningconfiguration(dAtA, i, uint64(m.CleanupIntervalS)) - i-- - dAtA[i] = 0x18 - } - if len(m.Params) > 0 { - for k := range m.Params { - v := m.Params[k] - baseI := i - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintVersioningconfiguration(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintVersioningconfiguration(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintVersioningconfiguration(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x12 - } - } - if len(m.Type) > 0 { - i -= len(m.Type) - copy(dAtA[i:], m.Type) - i = encodeVarintVersioningconfiguration(dAtA, i, uint64(len(m.Type))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintVersioningconfiguration(dAtA []byte, offset int, v uint64) int { - offset -= sovVersioningconfiguration(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *VersioningConfiguration) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Type) - if l > 0 { - n += 1 + l + sovVersioningconfiguration(uint64(l)) - } - if len(m.Params) > 0 { - for k, v := range m.Params { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovVersioningconfiguration(uint64(len(k))) + 1 + len(v) + sovVersioningconfiguration(uint64(len(v))) - n += mapEntrySize + 1 + sovVersioningconfiguration(uint64(mapEntrySize)) - } - } - if m.CleanupIntervalS != 0 { - n += 1 + sovVersioningconfiguration(uint64(m.CleanupIntervalS)) - } - l = len(m.FSPath) - if l > 0 { - n += 1 + l + sovVersioningconfiguration(uint64(l)) - } - if m.FSType != 0 { - n += 1 + sovVersioningconfiguration(uint64(m.FSType)) - } - return n -} - -func sovVersioningconfiguration(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozVersioningconfiguration(x uint64) (n int) { - return sovVersioningconfiguration(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *VersioningConfiguration) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: VersioningConfiguration: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: VersioningConfiguration: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthVersioningconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthVersioningconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Type = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthVersioningconfiguration - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthVersioningconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Params == nil { - m.Params = make(map[string]string) - } - var mapkey string - var mapvalue string - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthVersioningconfiguration - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthVersioningconfiguration - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var stringLenmapvalue uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapvalue |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapvalue := int(stringLenmapvalue) - if intStringLenmapvalue < 0 { - return ErrInvalidLengthVersioningconfiguration - } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue < 0 { - return ErrInvalidLengthVersioningconfiguration - } - if postStringIndexmapvalue > l { - return io.ErrUnexpectedEOF - } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipVersioningconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthVersioningconfiguration - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.Params[mapkey] = mapvalue - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CleanupIntervalS", wireType) - } - m.CleanupIntervalS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CleanupIntervalS |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FSPath", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthVersioningconfiguration - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthVersioningconfiguration - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FSPath = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field FSType", wireType) - } - m.FSType = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.FSType |= fs.FilesystemType(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipVersioningconfiguration(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthVersioningconfiguration - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipVersioningconfiguration(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVersioningconfiguration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthVersioningconfiguration - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupVersioningconfiguration - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthVersioningconfiguration - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthVersioningconfiguration = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowVersioningconfiguration = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupVersioningconfiguration = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/config/wrapper.go b/lib/config/wrapper.go index dcb3a9dea4b..645f56d5ef3 100644 --- a/lib/config/wrapper.go +++ b/lib/config/wrapper.go @@ -17,12 +17,13 @@ import ( "sync/atomic" "time" + "github.com/thejerf/suture/v4" + "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/osutil" "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sliceutil" "github.com/syncthing/syncthing/lib/sync" - "github.com/thejerf/suture/v4" ) const ( diff --git a/lib/connections/limiter.go b/lib/connections/limiter.go index 4fa4578dcd7..316bf0bc973 100644 --- a/lib/connections/limiter.go +++ b/lib/connections/limiter.go @@ -12,10 +12,11 @@ import ( "io" "sync/atomic" + "golang.org/x/time/rate" + "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" - "golang.org/x/time/rate" ) // limiter manages a read and write rate limit, reacting to config changes diff --git a/lib/connections/limiter_test.go b/lib/connections/limiter_test.go index 65aae57fe36..9b12a2c7e01 100644 --- a/lib/connections/limiter_test.go +++ b/lib/connections/limiter_test.go @@ -15,10 +15,11 @@ import ( "sync/atomic" "testing" + "golang.org/x/time/rate" + "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/protocol" - "golang.org/x/time/rate" ) var ( diff --git a/lib/connections/service.go b/lib/connections/service.go index 1aaf3633c7d..be432d37e9b 100644 --- a/lib/connections/service.go +++ b/lib/connections/service.go @@ -28,6 +28,9 @@ import ( stdsync "sync" "time" + "github.com/thejerf/suture/v4" + "golang.org/x/time/rate" + "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/connections/registry" @@ -45,9 +48,6 @@ import ( // Registers NAT service providers _ "github.com/syncthing/syncthing/lib/pmp" _ "github.com/syncthing/syncthing/lib/upnp" - - "github.com/thejerf/suture/v4" - "golang.org/x/time/rate" ) var ( @@ -445,7 +445,7 @@ func (s *service) handleHellos(ctx context.Context) error { // connections are limited. rd, wr := s.limiter.getLimiters(remoteID, c, c.IsLocal()) - protoConn := protocol.NewConnection(remoteID, rd, wr, c, s.model, c, deviceCfg.Compression, s.cfg.FolderPasswords(remoteID), s.keyGen) + protoConn := protocol.NewConnection(remoteID, rd, wr, c, s.model, c, deviceCfg.Compression.ToProtocol(), s.cfg.FolderPasswords(remoteID), s.keyGen) s.accountAddedConnection(protoConn, hello, s.cfg.Options().ConnectionPriorityUpgradeThreshold) go func() { <-protoConn.Closed() @@ -1284,6 +1284,7 @@ func (r nextDialRegistry) redialDevice(device protocol.DeviceID, now time.Time) } dev.attempts++ dev.nextDial = make(map[string]time.Time) + r[device] = dev return } if dev.attempts >= dialCoolDownMaxAttempts && now.Before(dev.coolDownIntervalStart.Add(dialCoolDownDelay)) { diff --git a/lib/connections/structs.go b/lib/connections/structs.go index 21fe7a9f664..b9f3dc65cfa 100644 --- a/lib/connections/structs.go +++ b/lib/connections/structs.go @@ -15,14 +15,14 @@ import ( "net/url" "time" + "github.com/thejerf/suture/v4" + "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/connections/registry" "github.com/syncthing/syncthing/lib/nat" "github.com/syncthing/syncthing/lib/osutil" "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/stats" - - "github.com/thejerf/suture/v4" ) type tlsConn interface { diff --git a/lib/db/benchmark_test.go b/lib/db/benchmark_test.go index 13838fa3b84..6497eb829be 100644 --- a/lib/db/benchmark_test.go +++ b/lib/db/benchmark_test.go @@ -185,7 +185,7 @@ func BenchmarkNeedHalf(b *testing.B) { for i := 0; i < b.N; i++ { count := 0 snap := snapshot(b, benchS) - snap.WithNeed(protocol.LocalDeviceID, func(fi protocol.FileIntf) bool { + snap.WithNeed(protocol.LocalDeviceID, func(fi protocol.FileInfo) bool { count++ return true }) @@ -209,7 +209,7 @@ func BenchmarkNeedHalfRemote(b *testing.B) { for i := 0; i < b.N; i++ { count := 0 snap := snapshot(b, fset) - snap.WithNeed(remoteDevice0, func(fi protocol.FileIntf) bool { + snap.WithNeed(remoteDevice0, func(fi protocol.FileInfo) bool { count++ return true }) @@ -230,7 +230,7 @@ func BenchmarkHave(b *testing.B) { for i := 0; i < b.N; i++ { count := 0 snap := snapshot(b, benchS) - snap.WithHave(protocol.LocalDeviceID, func(fi protocol.FileIntf) bool { + snap.WithHave(protocol.LocalDeviceID, func(fi protocol.FileInfo) bool { count++ return true }) @@ -251,7 +251,7 @@ func BenchmarkGlobal(b *testing.B) { for i := 0; i < b.N; i++ { count := 0 snap := snapshot(b, benchS) - snap.WithGlobal(func(fi protocol.FileIntf) bool { + snap.WithGlobal(func(fi protocol.FileInfo) bool { count++ return true }) @@ -272,7 +272,7 @@ func BenchmarkNeedHalfTruncated(b *testing.B) { for i := 0; i < b.N; i++ { count := 0 snap := snapshot(b, benchS) - snap.WithNeedTruncated(protocol.LocalDeviceID, func(fi protocol.FileIntf) bool { + snap.WithNeedTruncated(protocol.LocalDeviceID, func(fi protocol.FileInfo) bool { count++ return true }) @@ -293,7 +293,7 @@ func BenchmarkHaveTruncated(b *testing.B) { for i := 0; i < b.N; i++ { count := 0 snap := snapshot(b, benchS) - snap.WithHaveTruncated(protocol.LocalDeviceID, func(fi protocol.FileIntf) bool { + snap.WithHaveTruncated(protocol.LocalDeviceID, func(fi protocol.FileInfo) bool { count++ return true }) @@ -314,7 +314,7 @@ func BenchmarkGlobalTruncated(b *testing.B) { for i := 0; i < b.N; i++ { count := 0 snap := snapshot(b, benchS) - snap.WithGlobalTruncated(func(fi protocol.FileIntf) bool { + snap.WithGlobalTruncated(func(fi protocol.FileInfo) bool { count++ return true }) diff --git a/lib/db/db_test.go b/lib/db/db_test.go index e50c370fdd1..910e6767c0a 100644 --- a/lib/db/db_test.go +++ b/lib/db/db_test.go @@ -30,107 +30,10 @@ func genBlocks(n int) []protocol.BlockInfo { return b } -func TestIgnoredFiles(t *testing.T) { - ldb, err := openJSONS("testdata/v0.14.48-ignoredfiles.db.jsons") - if err != nil { - t.Fatal(err) - } - db := newLowlevel(t, ldb) - defer db.Close() - if err := UpdateSchema(db); err != nil { - t.Fatal(err) - } - - fs := newFileSet(t, "test", db) - - // The contents of the database are like this: - // - // fs := newFileSet(t, "test", db) - // fs.Update(protocol.LocalDeviceID, []protocol.FileInfo{ - // { // invalid (ignored) file - // Name: "foo", - // Type: protocol.FileInfoTypeFile, - // Invalid: true, - // Version: protocol.Vector{Counters: []protocol.Counter{{ID: 1, Value: 1000}}}, - // }, - // { // regular file - // Name: "bar", - // Type: protocol.FileInfoTypeFile, - // Version: protocol.Vector{Counters: []protocol.Counter{{ID: 1, Value: 1001}}}, - // }, - // }) - // fs.Update(protocol.DeviceID{42}, []protocol.FileInfo{ - // { // invalid file - // Name: "baz", - // Type: protocol.FileInfoTypeFile, - // Invalid: true, - // Version: protocol.Vector{Counters: []protocol.Counter{{ID: 42, Value: 1000}}}, - // }, - // { // regular file - // Name: "quux", - // Type: protocol.FileInfoTypeFile, - // Version: protocol.Vector{Counters: []protocol.Counter{{ID: 42, Value: 1002}}}, - // }, - // }) - - // Local files should have the "ignored" bit in addition to just being - // generally invalid if we want to look at the simulation of that bit. - - snap := snapshot(t, fs) - defer snap.Release() - fi, ok := snap.Get(protocol.LocalDeviceID, "foo") - if !ok { - t.Fatal("foo should exist") - } - if !fi.IsInvalid() { - t.Error("foo should be invalid") - } - if !fi.IsIgnored() { - t.Error("foo should be ignored") - } - - fi, ok = snap.Get(protocol.LocalDeviceID, "bar") - if !ok { - t.Fatal("bar should exist") - } - if fi.IsInvalid() { - t.Error("bar should not be invalid") - } - if fi.IsIgnored() { - t.Error("bar should not be ignored") - } - - // Remote files have the invalid bit as usual, and the IsInvalid() method - // should pick this up too. - - fi, ok = snap.Get(protocol.DeviceID{42}, "baz") - if !ok { - t.Fatal("baz should exist") - } - if !fi.IsInvalid() { - t.Error("baz should be invalid") - } - if !fi.IsInvalid() { - t.Error("baz should be invalid") - } - - fi, ok = snap.Get(protocol.DeviceID{42}, "quux") - if !ok { - t.Fatal("quux should exist") - } - if fi.IsInvalid() { - t.Error("quux should not be invalid") - } - if fi.IsInvalid() { - t.Error("quux should not be invalid") - } -} - const myID = 1 var ( remoteDevice0, remoteDevice1 protocol.DeviceID - update0to3Folder = "UpdateSchema0to3" invalid = "invalid" slashPrefixed = "/notgood" haveUpdate0to3 map[protocol.DeviceID][]protocol.FileInfo @@ -157,142 +60,6 @@ func init() { } } -func TestUpdate0to3(t *testing.T) { - ldb, err := openJSONS("testdata/v0.14.45-update0to3.db.jsons") - if err != nil { - t.Fatal(err) - } - - db := newLowlevel(t, ldb) - defer db.Close() - updater := schemaUpdater{db} - - folder := []byte(update0to3Folder) - - if err := updater.updateSchema0to1(0); err != nil { - t.Fatal(err) - } - - trans, err := db.newReadOnlyTransaction() - if err != nil { - t.Fatal(err) - } - defer trans.Release() - if _, ok, err := trans.getFile(folder, protocol.LocalDeviceID[:], []byte(slashPrefixed)); err != nil { - t.Fatal(err) - } else if ok { - t.Error("File prefixed by '/' was not removed during transition to schema 1") - } - - var key []byte - - key, err = db.keyer.GenerateGlobalVersionKey(nil, folder, []byte(invalid)) - if err != nil { - t.Fatal(err) - } - if _, err := db.Get(key); err != nil { - t.Error("Invalid file wasn't added to global list") - } - - if err := updater.updateSchema1to2(1); err != nil { - t.Fatal(err) - } - - found := false - trans, err = db.newReadOnlyTransaction() - if err != nil { - t.Fatal(err) - } - defer trans.Release() - _ = trans.withHaveSequence(folder, 0, func(fi protocol.FileIntf) bool { - f := fi.(protocol.FileInfo) - l.Infoln(f) - if found { - t.Error("Unexpected additional file via sequence", f.FileName()) - return true - } - if e := haveUpdate0to3[protocol.LocalDeviceID][0]; f.IsEquivalentOptional(e, protocol.FileInfoComparison{IgnorePerms: true, IgnoreBlocks: true}) { - found = true - } else { - t.Errorf("Wrong file via sequence, got %v, expected %v", f, e) - } - return true - }) - if !found { - t.Error("Local file wasn't added to sequence bucket", err) - } - - if err := updater.updateSchema2to3(2); err != nil { - t.Fatal(err) - } - - need := map[string]protocol.FileInfo{ - haveUpdate0to3[remoteDevice0][0].Name: haveUpdate0to3[remoteDevice0][0], - haveUpdate0to3[remoteDevice1][0].Name: haveUpdate0to3[remoteDevice1][0], - haveUpdate0to3[remoteDevice0][2].Name: haveUpdate0to3[remoteDevice0][2], - } - - trans, err = db.newReadOnlyTransaction() - if err != nil { - t.Fatal(err) - } - defer trans.Release() - - key, err = trans.keyer.GenerateNeedFileKey(nil, folder, nil) - if err != nil { - t.Fatal(err) - } - dbi, err := trans.NewPrefixIterator(key) - if err != nil { - t.Fatal(err) - } - defer dbi.Release() - - for dbi.Next() { - name := trans.keyer.NameFromGlobalVersionKey(dbi.Key()) - key, err = trans.keyer.GenerateGlobalVersionKey(key, folder, name) - bs, err := trans.Get(key) - if err != nil { - t.Fatal(err) - } - var vl VersionListDeprecated - if err := vl.Unmarshal(bs); err != nil { - t.Fatal(err) - } - key, err = trans.keyer.GenerateDeviceFileKey(key, folder, vl.Versions[0].Device, name) - if err != nil { - t.Fatal(err) - } - fi, ok, err := trans.getFileTrunc(key, false) - if err != nil { - t.Fatal(err) - } - if !ok { - device := "" - if dev, err := protocol.DeviceIDFromBytes(vl.Versions[0].Device); err != nil { - device = dev.String() - } - t.Fatal("surprise missing global file", string(name), device) - } - e, ok := need[fi.FileName()] - if !ok { - t.Error("Got unexpected needed file:", fi.FileName()) - } - f := fi.(protocol.FileInfo) - delete(need, f.Name) - if !f.IsEquivalentOptional(e, protocol.FileInfoComparison{IgnorePerms: true, IgnoreBlocks: true}) { - t.Errorf("Wrong needed file, got %v, expected %v", f, e) - } - } - if dbi.Error() != nil { - t.Fatal(err) - } - - for n := range need { - t.Errorf(`Missing needed file "%v"`, n) - } -} - // TestRepairSequence checks that a few hand-crafted messed-up sequence entries get fixed. func TestRepairSequence(t *testing.T) { db := newLowlevelMemory(t) @@ -446,11 +213,10 @@ func TestRepairSequence(t *testing.T) { } defer it.Release() for it.Next() { - intf, ok, err := ro.getFileTrunc(it.Value(), false) + fi, ok, err := ro.getFileTrunc(it.Value(), false) if err != nil { t.Fatal(err) } - fi := intf.(protocol.FileInfo) seq := ro.keyer.SequenceFromSequenceKey(it.Key()) if !ok { t.Errorf("Sequence entry %v points at nothing", seq) @@ -531,81 +297,6 @@ func TestCheckGlobals(t *testing.T) { } } -func TestUpdateTo10(t *testing.T) { - ldb, err := openJSONS("./testdata/v1.4.0-updateTo10.json") - if err != nil { - t.Fatal(err) - } - db := newLowlevel(t, ldb) - defer db.Close() - - UpdateSchema(db) - - folder := "test" - - meta, err := db.getMetaAndCheck(folder) - if err != nil { - t.Fatal(err) - } - - empty := Counts{} - - c := meta.Counts(protocol.LocalDeviceID, needFlag) - if c.Files != 1 { - t.Error("Expected 1 needed file locally, got", c.Files) - } - c.Files = 0 - if c.Deleted != 1 { - t.Error("Expected 1 needed deletion locally, got", c.Deleted) - } - c.Deleted = 0 - if !c.Equal(empty) { - t.Error("Expected all counts to be zero, got", c) - } - c = meta.Counts(remoteDevice0, needFlag) - if !c.Equal(empty) { - t.Error("Expected all counts to be zero, got", c) - } - - trans, err := db.newReadOnlyTransaction() - if err != nil { - t.Fatal(err) - } - defer trans.Release() - // a - vl, err := trans.getGlobalVersions(nil, []byte(folder), []byte("a")) - if err != nil { - t.Fatal(err) - } - for _, v := range vl.RawVersions { - if !v.Deleted { - t.Error("Unexpected undeleted global version for a") - } - } - // b - vl, err = trans.getGlobalVersions(nil, []byte(folder), []byte("b")) - if err != nil { - t.Fatal(err) - } - if !vl.RawVersions[0].Deleted { - t.Error("vl.Versions[0] not deleted for b") - } - if vl.RawVersions[1].Deleted { - t.Error("vl.Versions[1] deleted for b") - } - // c - vl, err = trans.getGlobalVersions(nil, []byte(folder), []byte("c")) - if err != nil { - t.Fatal(err) - } - if vl.RawVersions[0].Deleted { - t.Error("vl.Versions[0] deleted for c") - } - if !vl.RawVersions[1].Deleted { - t.Error("vl.Versions[1] not deleted for c") - } -} - func TestDropDuplicates(t *testing.T) { names := []string{ "foo", @@ -769,7 +460,7 @@ func TestUpdateTo14(t *testing.T) { if err != nil { t.Fatal(err) } - fiBs := mustMarshal(&fileWOBlocks) + fiBs := mustMarshal(fileWOBlocks.ToWire(true)) if err := trans.Put(key, fiBs); err != nil { t.Fatal(err) } @@ -799,9 +490,9 @@ func TestUpdateTo14(t *testing.T) { if vl, err := ro.getGlobalVersions(nil, folder, name); err != nil { t.Fatal(err) - } else if fv, ok := vl.GetGlobal(); !ok { + } else if fv, ok := vlGetGlobal(vl); !ok { t.Error("missing global") - } else if !fv.IsInvalid() { + } else if !fvIsInvalid(fv) { t.Error("global not marked as invalid") } } @@ -874,8 +565,8 @@ func TestCheckLocalNeed(t *testing.T) { t.Errorf("Expected 2 needed files locally, got %v in meta", c.Files) } needed := make([]protocol.FileInfo, 0, 2) - snap.WithNeed(protocol.LocalDeviceID, func(fi protocol.FileIntf) bool { - needed = append(needed, fi.(protocol.FileInfo)) + snap.WithNeed(protocol.LocalDeviceID, func(fi protocol.FileInfo) bool { + needed = append(needed, fi) return true }) if l := len(needed); l != 2 { @@ -939,7 +630,7 @@ func TestDuplicateNeedCount(t *testing.T) { fs = newFileSet(t, folder, db) found := false for _, c := range fs.meta.counts.Counts { - if bytes.Equal(protocol.LocalDeviceID[:], c.DeviceID) && c.LocalFlags == needFlag { + if protocol.LocalDeviceID == c.DeviceID && c.LocalFlags == needFlag { if found { t.Fatal("second need count for local device encountered") } diff --git a/lib/db/lowlevel.go b/lib/db/lowlevel.go index ee97b35f684..368f7ff99eb 100644 --- a/lib/db/lowlevel.go +++ b/lib/db/lowlevel.go @@ -19,6 +19,10 @@ import ( "time" "github.com/greatroar/blobloom" + "github.com/thejerf/suture/v4" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/dbproto" "github.com/syncthing/syncthing/lib/db/backend" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/fs" @@ -26,7 +30,6 @@ import ( "github.com/syncthing/syncthing/lib/stringutil" "github.com/syncthing/syncthing/lib/svcutil" "github.com/syncthing/syncthing/lib/sync" - "github.com/thejerf/suture/v4" ) const ( @@ -521,8 +524,8 @@ func (db *Lowlevel) checkGlobals(folderStr string) (int, error) { var dk []byte ro := t.readOnlyTransaction for dbi.Next() { - var vl VersionList - if err := vl.Unmarshal(dbi.Value()); err != nil || vl.Empty() { + var vl dbproto.VersionList + if err := proto.Unmarshal(dbi.Value(), &vl); err != nil || len(vl.Versions) == 0 { if err := t.Delete(dbi.Key()); err != nil && !backend.IsNotFound(err) { return 0, err } @@ -535,9 +538,9 @@ func (db *Lowlevel) checkGlobals(folderStr string) (int, error) { // we find those and clear them out. name := db.keyer.NameFromGlobalVersionKey(dbi.Key()) - newVL := &VersionList{} + newVL := &dbproto.VersionList{} var changed, changedHere bool - for _, fv := range vl.RawVersions { + for _, fv := range vl.Versions { changedHere, err = checkGlobalsFilterDevices(dk, folder, name, fv.Devices, newVL, ro) if err != nil { return 0, err @@ -551,7 +554,7 @@ func (db *Lowlevel) checkGlobals(folderStr string) (int, error) { changed = changed || changedHere } - if newVL.Empty() { + if len(newVL.Versions) == 0 { if err := t.Delete(dbi.Key()); err != nil && !backend.IsNotFound(err) { return 0, err } @@ -572,7 +575,7 @@ func (db *Lowlevel) checkGlobals(folderStr string) (int, error) { return fixed, t.Commit() } -func checkGlobalsFilterDevices(dk, folder, name []byte, devices [][]byte, vl *VersionList, t readOnlyTransaction) (bool, error) { +func checkGlobalsFilterDevices(dk, folder, name []byte, devices [][]byte, vl *dbproto.VersionList, t readOnlyTransaction) (bool, error) { var changed bool var err error for _, device := range devices { @@ -588,7 +591,7 @@ func checkGlobalsFilterDevices(dk, folder, name []byte, devices [][]byte, vl *Ve changed = true continue } - _, _, _, _, _, _, err = vl.update(folder, device, f, t) + _, _, _, _, _, _, err = vlUpdate(vl, folder, device, f, t) if err != nil { return false, err } @@ -610,7 +613,7 @@ func (db *Lowlevel) getIndexID(device, folder []byte) (protocol.IndexID, error) var id protocol.IndexID if err := id.Unmarshal(cur); err != nil { - return 0, nil + return 0, nil //nolint: nilerr } return id, nil @@ -816,11 +819,11 @@ func (db *Lowlevel) gcIndirect(ctx context.Context) (err error) { default: } - var hashes IndirectionHashesOnly - if err := hashes.Unmarshal(it.Value()); err != nil { + var hashes dbproto.IndirectionHashesOnly + if err := proto.Unmarshal(it.Value(), &hashes); err != nil { return err } - db.recordIndirectionHashes(hashes) + db.recordIndirectionHashes(&hashes) } it.Release() if err := it.Error(); err != nil { @@ -924,10 +927,10 @@ func (db *Lowlevel) gcIndirect(ctx context.Context) (err error) { } func (db *Lowlevel) recordIndirectionHashesForFile(f *protocol.FileInfo) { - db.recordIndirectionHashes(IndirectionHashesOnly{BlocksHash: f.BlocksHash, VersionHash: f.VersionHash}) + db.recordIndirectionHashes(&dbproto.IndirectionHashesOnly{BlocksHash: f.BlocksHash, VersionHash: f.VersionHash}) } -func (db *Lowlevel) recordIndirectionHashes(hs IndirectionHashesOnly) { +func (db *Lowlevel) recordIndirectionHashes(hs *dbproto.IndirectionHashesOnly) { // must be called with gcMut held (at least read-held) if db.blockFilter != nil && len(hs.BlocksHash) > 0 { db.blockFilter.add(hs.BlocksHash) @@ -966,7 +969,7 @@ func (b *bloomFilter) hash(id []byte) uint64 { } var h maphash.Hash h.SetSeed(b.seed) - h.Write(id) + _, _ = h.Write(id) return h.Sum64() } @@ -1035,7 +1038,7 @@ func (db *Lowlevel) getMetaAndCheckGCLocked(folder string) (*metadataTracker, er func (db *Lowlevel) loadMetadataTracker(folder string) (*metadataTracker, error) { meta := newMetadataTracker(db.keyer, db.evLogger) if err := meta.fromDB(db, []byte(folder)); err != nil { - if err == errMetaInconsistent { + if errors.Is(err, errMetaInconsistent) { l.Infof("Stored folder metadata for %q is inconsistent; recalculating", folder) } else { l.Infof("No stored folder metadata for %q; recalculating", folder) @@ -1071,7 +1074,7 @@ func (db *Lowlevel) recalcMeta(folderStr string) (*metadataTracker, error) { defer t.close() var deviceID protocol.DeviceID - err = t.withAllFolderTruncated(folder, func(device []byte, f FileInfoTruncated) bool { + err = t.withAllFolderTruncated(folder, func(device []byte, f protocol.FileInfo) bool { copy(deviceID[:], device) meta.addFile(deviceID, f) return true @@ -1080,7 +1083,7 @@ func (db *Lowlevel) recalcMeta(folderStr string) (*metadataTracker, error) { return nil, err } - err = t.withGlobal(folder, nil, true, func(f protocol.FileIntf) bool { + err = t.withGlobal(folder, nil, true, func(f protocol.FileInfo) bool { meta.addFile(protocol.GlobalDeviceID, f) return true }) @@ -1089,7 +1092,7 @@ func (db *Lowlevel) recalcMeta(folderStr string) (*metadataTracker, error) { } meta.emptyNeeded(protocol.LocalDeviceID) - err = t.withNeed(folder, protocol.LocalDeviceID[:], true, func(f protocol.FileIntf) bool { + err = t.withNeed(folder, protocol.LocalDeviceID[:], true, func(f protocol.FileInfo) bool { meta.addNeeded(protocol.LocalDeviceID, f) return true }) @@ -1098,7 +1101,7 @@ func (db *Lowlevel) recalcMeta(folderStr string) (*metadataTracker, error) { } for _, device := range meta.devices() { meta.emptyNeeded(device) - err = t.withNeed(folder, device[:], true, func(f protocol.FileIntf) bool { + err = t.withNeed(folder, device[:], true, func(f protocol.FileInfo) bool { meta.addNeeded(device, f) return true }) @@ -1132,7 +1135,7 @@ func (db *Lowlevel) verifyLocalSequence(curSeq int64, folder string) (bool, erro return false, err } ok := true - if err := t.withHaveSequence([]byte(folder), curSeq+1, func(fi protocol.FileIntf) bool { + if err := t.withHaveSequence([]byte(folder), curSeq+1, func(_ protocol.FileInfo) bool { ok = false // we got something, which we should not have return false }); err != nil { @@ -1204,8 +1207,7 @@ func (db *Lowlevel) repairSequenceGCLocked(folderStr string, meta *metadataTrack } return 0, err } - fi := intf.(protocol.FileInfo) - if sk, err = t.keyer.GenerateSequenceKey(sk, folder, fi.Sequence); err != nil { + if sk, err = t.keyer.GenerateSequenceKey(sk, folder, intf.Sequence); err != nil { return 0, err } switch dk, err = t.Get(sk); { @@ -1216,14 +1218,14 @@ func (db *Lowlevel) repairSequenceGCLocked(folderStr string, meta *metadataTrack fallthrough case !bytes.Equal(it.Key(), dk): fixed++ - fi.Sequence = meta.nextLocalSeq() - if sk, err = t.keyer.GenerateSequenceKey(sk, folder, fi.Sequence); err != nil { + intf.Sequence = meta.nextLocalSeq() + if sk, err = t.keyer.GenerateSequenceKey(sk, folder, intf.Sequence); err != nil { return 0, err } if err := t.Put(sk, it.Key()); err != nil { return 0, err } - if err := t.putFile(it.Key(), fi); err != nil { + if err := t.putFile(it.Key(), intf); err != nil { return 0, err } } @@ -1307,9 +1309,8 @@ func (db *Lowlevel) checkLocalNeed(folder []byte) (int, error) { } } next() - t.withNeedIteratingGlobal(folder, protocol.LocalDeviceID[:], true, func(fi protocol.FileIntf) bool { - f := fi.(FileInfoTruncated) - for !needDone && needName < f.Name { + itErr := t.withNeedIteratingGlobal(folder, protocol.LocalDeviceID[:], true, func(fi protocol.FileInfo) bool { + for !needDone && needName < fi.Name { repaired++ if err = t.Delete(dbi.Key()); err != nil && !backend.IsNotFound(err) { return false @@ -1317,24 +1318,27 @@ func (db *Lowlevel) checkLocalNeed(folder []byte) (int, error) { l.Debugln("check local need: removing", needName) next() } - if needName == f.Name { + if needName == fi.Name { next() } else { repaired++ - key, err = t.keyer.GenerateNeedFileKey(key, folder, []byte(f.Name)) + key, err = t.keyer.GenerateNeedFileKey(key, folder, []byte(fi.Name)) if err != nil { return false } if err = t.Put(key, nil); err != nil { return false } - l.Debugln("check local need: adding", f.Name) + l.Debugln("check local need: adding", fi.Name) } return true }) if err != nil { return 0, err } + if itErr != nil { + return 0, itErr + } for !needDone { repaired++ diff --git a/lib/db/meta.go b/lib/db/meta.go index 17552b500ca..ece2b07ad14 100644 --- a/lib/db/meta.go +++ b/lib/db/meta.go @@ -7,12 +7,14 @@ package db import ( - "bytes" "errors" "fmt" "math/bits" "time" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/dbproto" "github.com/syncthing/syncthing/lib/db/backend" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/protocol" @@ -56,24 +58,34 @@ func newMetadataTracker(keyer keyer, evLogger events.Logger) *metadataTracker { // Unmarshal loads a metadataTracker from the corresponding protobuf // representation func (m *metadataTracker) Unmarshal(bs []byte) error { - if err := m.counts.Unmarshal(bs); err != nil { + var dbc dbproto.CountsSet + if err := proto.Unmarshal(bs, &dbc); err != nil { return err } + m.counts.Created = dbc.Created + m.counts.Counts = make([]Counts, len(dbc.Counts)) + for i, c := range dbc.Counts { + m.counts.Counts[i] = countsFromWire(c) + } // Initialize the index map + m.indexes = make(map[metaKey]int) for i, c := range m.counts.Counts { - dev, err := protocol.DeviceIDFromBytes(c.DeviceID) - if err != nil { - return err - } - m.indexes[metaKey{dev, c.LocalFlags}] = i + m.indexes[metaKey{c.DeviceID, c.LocalFlags}] = i } return nil } // Marshal returns the protobuf representation of the metadataTracker func (m *metadataTracker) Marshal() ([]byte, error) { - return m.counts.Marshal() + dbc := &dbproto.CountsSet{ + Counts: make([]*dbproto.Counts, len(m.counts.Counts)), + Created: m.Created().UnixNano(), + } + for i, c := range m.counts.Counts { + dbc.Counts[i] = c.toWire() + } + return proto.Marshal(dbc) } func (m *metadataTracker) CommitHook(folder []byte) backend.CommitHook { @@ -142,7 +154,7 @@ func (m *metadataTracker) countsPtr(dev protocol.DeviceID, flag uint32) *Counts idx, ok := m.indexes[key] if !ok { idx = len(m.counts.Counts) - m.counts.Counts = append(m.counts.Counts, Counts{DeviceID: dev[:], LocalFlags: flag}) + m.counts.Counts = append(m.counts.Counts, Counts{DeviceID: dev, LocalFlags: flag}) m.indexes[key] = idx // Need bucket must be initialized when a device first occurs in // the metadatatracker, even if there's no change to the need @@ -160,19 +172,19 @@ func (m *metadataTracker) countsPtr(dev protocol.DeviceID, flag uint32) *Counts // allNeeded makes sure there is a counts in case the device needs everything. func (m *countsMap) allNeededCounts(dev protocol.DeviceID) Counts { - counts := Counts{} + var counts Counts if idx, ok := m.indexes[metaKey{protocol.GlobalDeviceID, 0}]; ok { counts = m.counts.Counts[idx] counts.Deleted = 0 // Don't need deletes if having nothing } - counts.DeviceID = dev[:] + counts.DeviceID = dev counts.LocalFlags = needFlag return counts } // addFile adds a file to the counts, adjusting the sequence number as // appropriate -func (m *metadataTracker) addFile(dev protocol.DeviceID, f protocol.FileIntf) { +func (m *metadataTracker) addFile(dev protocol.DeviceID, f protocol.FileInfo) { m.mut.Lock() defer m.mut.Unlock() @@ -181,7 +193,7 @@ func (m *metadataTracker) addFile(dev protocol.DeviceID, f protocol.FileIntf) { m.updateFileLocked(dev, f, m.addFileLocked) } -func (m *metadataTracker) updateFileLocked(dev protocol.DeviceID, f protocol.FileIntf, fn func(protocol.DeviceID, uint32, protocol.FileIntf)) { +func (m *metadataTracker) updateFileLocked(dev protocol.DeviceID, f protocol.FileInfo, fn func(protocol.DeviceID, uint32, protocol.FileInfo)) { m.dirty = true if f.IsInvalid() && (f.FileLocalFlags() == 0 || dev == protocol.GlobalDeviceID) { @@ -209,7 +221,7 @@ func (m *metadataTracker) emptyNeeded(dev protocol.DeviceID) { m.dirty = true empty := Counts{ - DeviceID: dev[:], + DeviceID: dev, LocalFlags: needFlag, } key := metaKey{dev, needFlag} @@ -222,7 +234,7 @@ func (m *metadataTracker) emptyNeeded(dev protocol.DeviceID) { } // addNeeded adds a file to the needed counts -func (m *metadataTracker) addNeeded(dev protocol.DeviceID, f protocol.FileIntf) { +func (m *metadataTracker) addNeeded(dev protocol.DeviceID, f protocol.FileInfo) { m.mut.Lock() defer m.mut.Unlock() @@ -237,7 +249,7 @@ func (m *metadataTracker) Sequence(dev protocol.DeviceID) int64 { return m.countsPtr(dev, 0).Sequence } -func (m *metadataTracker) updateSeqLocked(dev protocol.DeviceID, f protocol.FileIntf) { +func (m *metadataTracker) updateSeqLocked(dev protocol.DeviceID, f protocol.FileInfo) { if dev == protocol.GlobalDeviceID { return } @@ -246,7 +258,7 @@ func (m *metadataTracker) updateSeqLocked(dev protocol.DeviceID, f protocol.File } } -func (m *metadataTracker) addFileLocked(dev protocol.DeviceID, flag uint32, f protocol.FileIntf) { +func (m *metadataTracker) addFileLocked(dev protocol.DeviceID, flag uint32, f protocol.FileInfo) { cp := m.countsPtr(dev, flag) switch { @@ -263,7 +275,7 @@ func (m *metadataTracker) addFileLocked(dev protocol.DeviceID, flag uint32, f pr } // removeFile removes a file from the counts -func (m *metadataTracker) removeFile(dev protocol.DeviceID, f protocol.FileIntf) { +func (m *metadataTracker) removeFile(dev protocol.DeviceID, f protocol.FileInfo) { m.mut.Lock() defer m.mut.Unlock() @@ -271,7 +283,7 @@ func (m *metadataTracker) removeFile(dev protocol.DeviceID, f protocol.FileIntf) } // removeNeeded removes a file from the needed counts -func (m *metadataTracker) removeNeeded(dev protocol.DeviceID, f protocol.FileIntf) { +func (m *metadataTracker) removeNeeded(dev protocol.DeviceID, f protocol.FileInfo) { m.mut.Lock() defer m.mut.Unlock() @@ -280,7 +292,7 @@ func (m *metadataTracker) removeNeeded(dev protocol.DeviceID, f protocol.FileInt m.removeFileLocked(dev, needFlag, f) } -func (m *metadataTracker) removeFileLocked(dev protocol.DeviceID, flag uint32, f protocol.FileIntf) { +func (m *metadataTracker) removeFileLocked(dev protocol.DeviceID, flag uint32, f protocol.FileInfo) { cp := m.countsPtr(dev, flag) switch { @@ -325,7 +337,7 @@ func (m *metadataTracker) resetAll(dev protocol.DeviceID) { m.mut.Lock() m.dirty = true for i, c := range m.counts.Counts { - if bytes.Equal(c.DeviceID, dev[:]) { + if c.DeviceID == dev { if c.LocalFlags != needFlag { m.counts.Counts[i] = Counts{ DeviceID: c.DeviceID, @@ -346,7 +358,7 @@ func (m *metadataTracker) resetCounts(dev protocol.DeviceID) { m.dirty = true for i, c := range m.counts.Counts { - if bytes.Equal(c.DeviceID, dev[:]) { + if c.DeviceID == dev { m.counts.Counts[i] = Counts{ DeviceID: c.DeviceID, Sequence: c.Sequence, @@ -419,14 +431,10 @@ func (m *countsMap) devices() []protocol.DeviceID { for _, dev := range m.counts.Counts { if dev.Sequence > 0 { - id, err := protocol.DeviceIDFromBytes(dev.DeviceID) - if err != nil { - panic(err) - } - if id == protocol.GlobalDeviceID || id == protocol.LocalDeviceID { + if dev.DeviceID == protocol.GlobalDeviceID || dev.DeviceID == protocol.LocalDeviceID { continue } - devs = append(devs, id) + devs = append(devs, dev.DeviceID) } } diff --git a/lib/db/observed.go b/lib/db/observed.go index 2eacbe8baa4..1f549221e3a 100644 --- a/lib/db/observed.go +++ b/lib/db/observed.go @@ -10,21 +10,56 @@ import ( "fmt" "time" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/timestamppb" + + "github.com/syncthing/syncthing/internal/gen/dbproto" "github.com/syncthing/syncthing/lib/protocol" ) +type ObservedFolder struct { + Time time.Time + Label string + ReceiveEncrypted bool + RemoteEncrypted bool +} + +func (o *ObservedFolder) toWire() *dbproto.ObservedFolder { + return &dbproto.ObservedFolder{ + Time: timestamppb.New(o.Time), + Label: o.Label, + ReceiveEncrypted: o.ReceiveEncrypted, + RemoteEncrypted: o.RemoteEncrypted, + } +} + +func (o *ObservedFolder) fromWire(w *dbproto.ObservedFolder) { + o.Time = w.GetTime().AsTime() + o.Label = w.GetLabel() + o.ReceiveEncrypted = w.GetReceiveEncrypted() + o.RemoteEncrypted = w.GetRemoteEncrypted() +} + +type ObservedDevice struct { + Time time.Time + Name string + Address string +} + +func (o *ObservedDevice) fromWire(w *dbproto.ObservedDevice) { + o.Time = w.GetTime().AsTime() + o.Name = w.GetName() + o.Address = w.GetAddress() +} + func (db *Lowlevel) AddOrUpdatePendingDevice(device protocol.DeviceID, name, address string) error { key := db.keyer.GeneratePendingDeviceKey(nil, device[:]) - od := ObservedDevice{ - Time: time.Now().Truncate(time.Second), + od := &dbproto.ObservedDevice{ + Time: timestamppb.New(time.Now().Truncate(time.Second)), Name: name, Address: address, } - bs, err := od.Marshal() - if err != nil { - return err - } - return db.Put(key, bs) + return db.Put(key, mustMarshal(od)) } func (db *Lowlevel) RemovePendingDevice(device protocol.DeviceID) error { @@ -44,13 +79,15 @@ func (db *Lowlevel) PendingDevices() (map[protocol.DeviceID]ObservedDevice, erro for iter.Next() { keyDev := db.keyer.DeviceFromPendingDeviceKey(iter.Key()) deviceID, err := protocol.DeviceIDFromBytes(keyDev) + var protoD dbproto.ObservedDevice var od ObservedDevice if err != nil { goto deleteKey } - if err = od.Unmarshal(iter.Value()); err != nil { + if err = proto.Unmarshal(iter.Value(), &protoD); err != nil { goto deleteKey } + od.fromWire(&protoD) res[deviceID] = od continue deleteKey: @@ -70,11 +107,7 @@ func (db *Lowlevel) AddOrUpdatePendingFolder(id string, of ObservedFolder, devic if err != nil { return err } - bs, err := of.Marshal() - if err != nil { - return err - } - return db.Put(key, bs) + return db.Put(key, mustMarshal(of.toWire())) } // RemovePendingFolderForDevice removes entries for specific folder / device combinations. @@ -139,6 +172,7 @@ func (db *Lowlevel) PendingFoldersForDevice(device protocol.DeviceID) (map[strin for iter.Next() { keyDev, ok := db.keyer.DeviceFromPendingFolderKey(iter.Key()) deviceID, err := protocol.DeviceIDFromBytes(keyDev) + var protoF dbproto.ObservedFolder var of ObservedFolder var folderID string if !ok || err != nil { @@ -147,7 +181,7 @@ func (db *Lowlevel) PendingFoldersForDevice(device protocol.DeviceID) (map[strin if folderID = string(db.keyer.FolderFromPendingFolderKey(iter.Key())); len(folderID) < 1 { goto deleteKey } - if err = of.Unmarshal(iter.Value()); err != nil { + if err = proto.Unmarshal(iter.Value(), &protoF); err != nil { goto deleteKey } if _, ok := res[folderID]; !ok { @@ -155,6 +189,7 @@ func (db *Lowlevel) PendingFoldersForDevice(device protocol.DeviceID) (map[strin OfferedBy: map[protocol.DeviceID]ObservedFolder{}, } } + of.fromWire(&protoF) res[folderID].OfferedBy[deviceID] = of continue deleteKey: diff --git a/lib/db/schemaupdater.go b/lib/db/schemaupdater.go index c5ccb8cfd65..3a9c4abb288 100644 --- a/lib/db/schemaupdater.go +++ b/lib/db/schemaupdater.go @@ -7,12 +7,11 @@ package db import ( - "bytes" "fmt" - "sort" - "strings" - "github.com/syncthing/syncthing/lib/db/backend" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" "github.com/syncthing/syncthing/lib/protocol" ) @@ -65,6 +64,12 @@ func (db *schemaUpdater) updateSchema() error { return err } + if prevVersion > 0 && prevVersion < 14 { + // This is a database version that is too old to be upgraded directly. + // The user will have to upgrade to an older version first. + return fmt.Errorf("database version %d is too old to be upgraded directly; step via Syncthing v1.27.0 to upgrade", prevVersion) + } + if prevVersion > dbVersion { err := &databaseDowngradeError{} if minSyncthingVersion, ok, dbErr := miscDB.String("dbMinSyncthingVersion"); dbErr != nil { @@ -89,16 +94,6 @@ func (db *schemaUpdater) updateSchema() error { } migrations := []migration{ - {1, 1, "v0.14.0", db.updateSchema0to1}, - {2, 2, "v0.14.46", db.updateSchema1to2}, - {3, 3, "v0.14.48", db.updateSchema2to3}, - {5, 5, "v0.14.49", db.updateSchemaTo5}, - {6, 6, "v0.14.50", db.updateSchema5to6}, - {7, 7, "v0.14.53", db.updateSchema6to7}, - {9, 9, "v1.4.0", db.updateSchemaTo9}, - {10, 10, "v1.6.0", db.updateSchemaTo10}, - {11, 11, "v1.6.0", db.updateSchemaTo11}, - {13, 13, "v1.7.0", db.updateSchemaTo13}, {14, 14, "v1.9.0", db.updateSchemaTo14}, {14, 16, "v1.9.0", db.checkRepairMigration}, {14, 17, "v1.9.0", db.migration17}, @@ -143,571 +138,6 @@ func (*schemaUpdater) writeVersions(m migration, miscDB *NamespacedKV) error { return nil } -func (db *schemaUpdater) updateSchema0to1(_ int) error { - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - dbi, err := t.NewPrefixIterator([]byte{KeyTypeDevice}) - if err != nil { - return err - } - defer dbi.Release() - - symlinkConv := 0 - changedFolders := make(map[string]struct{}) - ignAdded := 0 - var gk []byte - ro := t.readOnlyTransaction - - for dbi.Next() { - folder, ok := db.keyer.FolderFromDeviceFileKey(dbi.Key()) - if !ok { - // not having the folder in the index is bad; delete and continue - if err := t.Delete(dbi.Key()); err != nil { - return err - } - continue - } - device, ok := db.keyer.DeviceFromDeviceFileKey(dbi.Key()) - if !ok { - // not having the device in the index is bad; delete and continue - if err := t.Delete(dbi.Key()); err != nil { - return err - } - continue - } - name := db.keyer.NameFromDeviceFileKey(dbi.Key()) - - // Remove files with absolute path (see #4799) - if strings.HasPrefix(string(name), "/") { - if _, ok := changedFolders[string(folder)]; !ok { - changedFolders[string(folder)] = struct{}{} - } - if err := t.Delete(dbi.Key()); err != nil { - return err - } - gk, err = db.keyer.GenerateGlobalVersionKey(gk, folder, name) - if err != nil { - return err - } - fl, err := getGlobalVersionsByKeyBefore11(gk, ro) - if backend.IsNotFound(err) { - // Shouldn't happen, but not critical. - continue - } else if err != nil { - return err - } - _, _ = fl.pop(device) - if len(fl.Versions) == 0 { - err = t.Delete(gk) - } else { - err = t.Put(gk, mustMarshal(&fl)) - } - if err != nil { - return err - } - continue - } - - // Change SYMLINK_FILE and SYMLINK_DIRECTORY types to the current SYMLINK - // type (previously SYMLINK_UNKNOWN). It does this for all devices, both - // local and remote, and does not reset delta indexes. It shouldn't really - // matter what the symlink type is, but this cleans it up for a possible - // future when SYMLINK_FILE and SYMLINK_DIRECTORY are no longer understood. - var f protocol.FileInfo - if err := f.Unmarshal(dbi.Value()); err != nil { - // probably can't happen - continue - } - if f.Type == protocol.FileInfoTypeSymlinkDirectory || f.Type == protocol.FileInfoTypeSymlinkFile { - f.Type = protocol.FileInfoTypeSymlink - bs, err := f.Marshal() - if err != nil { - panic("can't happen: " + err.Error()) - } - if err := t.Put(dbi.Key(), bs); err != nil { - return err - } - symlinkConv++ - } - - // Add invalid files to global list - if f.IsInvalid() { - gk, err = db.keyer.GenerateGlobalVersionKey(gk, folder, name) - if err != nil { - return err - } - - fl, err := getGlobalVersionsByKeyBefore11(gk, ro) - if err != nil && !backend.IsNotFound(err) { - return err - } - i := sort.Search(len(fl.Versions), func(j int) bool { - return fl.Versions[j].Invalid - }) - for ; i < len(fl.Versions); i++ { - ordering := fl.Versions[i].Version.Compare(f.Version) - shouldInsert := ordering == protocol.Equal - if !shouldInsert { - shouldInsert, err = shouldInsertBefore(ordering, folder, fl.Versions[i].Device, true, f, ro) - if err != nil { - return err - } - } - if shouldInsert { - nv := FileVersionDeprecated{ - Device: device, - Version: f.Version, - Invalid: true, - } - fl.insertAt(i, nv) - if err := t.Put(gk, mustMarshal(&fl)); err != nil { - return err - } - if _, ok := changedFolders[string(folder)]; !ok { - changedFolders[string(folder)] = struct{}{} - } - ignAdded++ - break - } - - } - } - if err := t.Checkpoint(); err != nil { - return err - } - } - dbi.Release() - if err != dbi.Error() { - return err - } - - return t.Commit() -} - -// updateSchema1to2 introduces a sequenceKey->deviceKey bucket for local items -// to allow iteration in sequence order (simplifies sending indexes). -func (db *schemaUpdater) updateSchema1to2(_ int) error { - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - var sk []byte - var dk []byte - for _, folderStr := range db.ListFolders() { - folder := []byte(folderStr) - var putErr error - err := t.withHave(folder, protocol.LocalDeviceID[:], nil, true, func(f protocol.FileIntf) bool { - sk, putErr = db.keyer.GenerateSequenceKey(sk, folder, f.SequenceNo()) - if putErr != nil { - return false - } - dk, putErr = db.keyer.GenerateDeviceFileKey(dk, folder, protocol.LocalDeviceID[:], []byte(f.FileName())) - if putErr != nil { - return false - } - putErr = t.Put(sk, dk) - return putErr == nil - }) - if putErr != nil { - return putErr - } - if err != nil { - return err - } - } - return t.Commit() -} - -// updateSchema2to3 introduces a needKey->nil bucket for locally needed files. -func (db *schemaUpdater) updateSchema2to3(_ int) error { - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - var nk []byte - var dk []byte - for _, folderStr := range db.ListFolders() { - folder := []byte(folderStr) - var putErr error - err := withGlobalBefore11(folder, true, func(f protocol.FileIntf) bool { - name := []byte(f.FileName()) - dk, putErr = db.keyer.GenerateDeviceFileKey(dk, folder, protocol.LocalDeviceID[:], name) - if putErr != nil { - return false - } - var v protocol.Vector - haveFile, ok, err := t.getFileTrunc(dk, true) - if err != nil { - putErr = err - return false - } - if ok { - v = haveFile.FileVersion() - } - fv := FileVersionDeprecated{ - Version: f.FileVersion(), - Invalid: f.IsInvalid(), - Deleted: f.IsDeleted(), - } - if !needDeprecated(fv, ok, v) { - return true - } - nk, putErr = t.keyer.GenerateNeedFileKey(nk, folder, []byte(f.FileName())) - if putErr != nil { - return false - } - putErr = t.Put(nk, nil) - return putErr == nil - }, t.readOnlyTransaction) - if putErr != nil { - return putErr - } - if err != nil { - return err - } - } - return t.Commit() -} - -// updateSchemaTo5 resets the need bucket due to bugs existing in the v0.14.49 -// release candidates (dbVersion 3 and 4) -// https://github.com/syncthing/syncthing/issues/5007 -// https://github.com/syncthing/syncthing/issues/5053 -func (db *schemaUpdater) updateSchemaTo5(prevVersion int) error { - if prevVersion != 3 && prevVersion != 4 { - return nil - } - - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - var nk []byte - for _, folderStr := range db.ListFolders() { - nk, err = db.keyer.GenerateNeedFileKey(nk, []byte(folderStr), nil) - if err != nil { - return err - } - if err := t.deleteKeyPrefix(nk[:keyPrefixLen+keyFolderLen]); err != nil { - return err - } - } - if err := t.Commit(); err != nil { - return err - } - - return db.updateSchema2to3(2) -} - -func (db *schemaUpdater) updateSchema5to6(_ int) error { - // For every local file with the Invalid bit set, clear the Invalid bit and - // set LocalFlags = FlagLocalIgnored. - - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - var dk []byte - - for _, folderStr := range db.ListFolders() { - folder := []byte(folderStr) - var iterErr error - err := t.withHave(folder, protocol.LocalDeviceID[:], nil, false, func(f protocol.FileIntf) bool { - if !f.IsInvalid() { - return true - } - - fi := f.(protocol.FileInfo) - fi.RawInvalid = false - fi.LocalFlags = protocol.FlagLocalIgnored - bs, _ := fi.Marshal() - - dk, iterErr = db.keyer.GenerateDeviceFileKey(dk, folder, protocol.LocalDeviceID[:], []byte(fi.Name)) - if iterErr != nil { - return false - } - if iterErr = t.Put(dk, bs); iterErr != nil { - return false - } - iterErr = t.Checkpoint() - return iterErr == nil - }) - if iterErr != nil { - return iterErr - } - if err != nil { - return err - } - } - return t.Commit() -} - -// updateSchema6to7 checks whether all currently locally needed files are really -// needed and removes them if not. -func (db *schemaUpdater) updateSchema6to7(_ int) error { - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - var gk []byte - var nk []byte - - for _, folderStr := range db.ListFolders() { - folder := []byte(folderStr) - var delErr error - err := withNeedLocalBefore11(folder, false, func(f protocol.FileIntf) bool { - name := []byte(f.FileName()) - gk, delErr = db.keyer.GenerateGlobalVersionKey(gk, folder, name) - if delErr != nil { - return false - } - svl, err := t.Get(gk) - if err != nil { - // If there is no global list, we hardly need it. - key, err := t.keyer.GenerateNeedFileKey(nk, folder, name) - if err != nil { - delErr = err - return false - } - delErr = t.Delete(key) - return delErr == nil - } - var fl VersionListDeprecated - err = fl.Unmarshal(svl) - if err != nil { - // This can't happen, but it's ignored everywhere else too, - // so lets not act on it. - return true - } - globalFV := FileVersionDeprecated{ - Version: f.FileVersion(), - Invalid: f.IsInvalid(), - Deleted: f.IsDeleted(), - } - - if localFV, haveLocalFV := fl.Get(protocol.LocalDeviceID[:]); !needDeprecated(globalFV, haveLocalFV, localFV.Version) { - key, err := t.keyer.GenerateNeedFileKey(nk, folder, name) - if err != nil { - delErr = err - return false - } - delErr = t.Delete(key) - } - return delErr == nil - }, t.readOnlyTransaction) - if delErr != nil { - return delErr - } - if err != nil { - return err - } - if err := t.Checkpoint(); err != nil { - return err - } - } - return t.Commit() -} - -func (db *schemaUpdater) updateSchemaTo9(_ int) error { - // Loads and rewrites all files with blocks, to deduplicate block lists. - - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - if err := rewriteFiles(t); err != nil { - return err - } - - db.recordTime(indirectGCTimeKey) - - return t.Commit() -} - -func rewriteFiles(t readWriteTransaction) error { - it, err := t.NewPrefixIterator([]byte{KeyTypeDevice}) - if err != nil { - return err - } - defer it.Release() - for it.Next() { - intf, err := t.unmarshalTrunc(it.Value(), false) - if backend.IsNotFound(err) { - // Unmarshal error due to missing parts (block list), probably - // due to a bad migration in a previous RC. Drop this key, as - // getFile would anyway return this as a "not found" in the - // normal flow of things. - if err := t.Delete(it.Key()); err != nil { - return err - } - continue - } else if err != nil { - return err - } - fi := intf.(protocol.FileInfo) - if fi.Blocks == nil { - continue - } - if err := t.putFile(it.Key(), fi); err != nil { - return err - } - if err := t.Checkpoint(); err != nil { - return err - } - } - it.Release() - return it.Error() -} - -func (db *schemaUpdater) updateSchemaTo10(_ int) error { - // Rewrites global lists to include a Deleted flag. - - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - var buf []byte - - for _, folderStr := range db.ListFolders() { - folder := []byte(folderStr) - - buf, err = t.keyer.GenerateGlobalVersionKey(buf, folder, nil) - if err != nil { - return err - } - buf = globalVersionKey(buf).WithoutName() - dbi, err := t.NewPrefixIterator(buf) - if err != nil { - return err - } - defer dbi.Release() - - for dbi.Next() { - var vl VersionListDeprecated - if err := vl.Unmarshal(dbi.Value()); err != nil { - return err - } - - changed := false - name := t.keyer.NameFromGlobalVersionKey(dbi.Key()) - - for i, fv := range vl.Versions { - buf, err = t.keyer.GenerateDeviceFileKey(buf, folder, fv.Device, name) - if err != nil { - return err - } - f, ok, err := t.getFileTrunc(buf, true) - if !ok { - return errEntryFromGlobalMissing - } - if err != nil { - return err - } - if f.IsDeleted() { - vl.Versions[i].Deleted = true - changed = true - } - } - - if changed { - if err := t.Put(dbi.Key(), mustMarshal(&vl)); err != nil { - return err - } - if err := t.Checkpoint(); err != nil { - return err - } - } - } - dbi.Release() - } - - // Trigger metadata recalc - if err := t.deleteKeyPrefix([]byte{KeyTypeFolderMeta}); err != nil { - return err - } - - return t.Commit() -} - -func (db *schemaUpdater) updateSchemaTo11(_ int) error { - // Populates block list map for every folder. - - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - var dk []byte - for _, folderStr := range db.ListFolders() { - folder := []byte(folderStr) - var putErr error - err := t.withHave(folder, protocol.LocalDeviceID[:], nil, true, func(fi protocol.FileIntf) bool { - f := fi.(FileInfoTruncated) - if f.IsDirectory() || f.IsDeleted() || f.IsSymlink() || f.IsInvalid() || f.BlocksHash == nil { - return true - } - - name := []byte(f.FileName()) - dk, putErr = db.keyer.GenerateBlockListMapKey(dk, folder, f.BlocksHash, name) - if putErr != nil { - return false - } - - if putErr = t.Put(dk, nil); putErr != nil { - return false - } - putErr = t.Checkpoint() - return putErr == nil - }) - if putErr != nil { - return putErr - } - if err != nil { - return err - } - } - return t.Commit() -} - -func (db *schemaUpdater) updateSchemaTo13(prev int) error { - // Loads and rewrites all files, to deduplicate version vectors. - - t, err := db.newReadWriteTransaction() - if err != nil { - return err - } - defer t.close() - - if prev < 12 { - if err := rewriteFiles(t); err != nil { - return err - } - } - - if err := rewriteGlobals(t); err != nil { - return err - } - - return t.Commit() -} - func (db *schemaUpdater) updateSchemaTo14(_ int) error { // Checks for missing blocks and marks those entries as requiring a // rehash/being invalid. The db is checked/repaired afterwards, i.e. @@ -737,10 +167,11 @@ func (db *schemaUpdater) updateSchemaTo14(_ int) error { } defer it.Release() for it.Next() { - var fi protocol.FileInfo - if err := fi.Unmarshal(it.Value()); err != nil { + var bepf bep.FileInfo + if err := proto.Unmarshal(it.Value(), &bepf); err != nil { return err } + fi := protocol.FileInfoFromDB(&bepf) if len(fi.Blocks) > 0 || len(fi.BlocksHash) == 0 { continue } @@ -808,12 +239,11 @@ func (db *schemaUpdater) migration17(prev int) error { return db.updateLocalFiles(folder, fs, meta) }) var innerErr error - err = t.withHave(folder, protocol.LocalDeviceID[:], nil, false, func(fi protocol.FileIntf) bool { + err = t.withHave(folder, protocol.LocalDeviceID[:], nil, false, func(fi protocol.FileInfo) bool { if fi.IsInvalid() && fi.FileLocalFlags() == 0 { - f := fi.(protocol.FileInfo) - f.SetMustRescan() - f.Version = protocol.Vector{} - batch.Append(f) + fi.SetMustRescan() + fi.Version = protocol.Vector{} + batch.Append(fi) innerErr = batch.FlushIfFull() return innerErr == nil } @@ -839,263 +269,3 @@ func (db *schemaUpdater) dropAllIndexIDsMigration(_ int) error { func (db *schemaUpdater) dropOutgoingIndexIDsMigration(_ int) error { return db.dropOtherDeviceIndexIDs() } - -func rewriteGlobals(t readWriteTransaction) error { - it, err := t.NewPrefixIterator([]byte{KeyTypeGlobal}) - if err != nil { - return err - } - defer it.Release() - - for it.Next() { - var vl VersionListDeprecated - if err := vl.Unmarshal(it.Value()); err != nil { - // If we crashed during an earlier migration, some version - // lists might already be in the new format: Skip those. - var nvl VersionList - if nerr := nvl.Unmarshal(it.Value()); nerr == nil { - continue - } - return err - } - if len(vl.Versions) == 0 { - if err := t.Delete(it.Key()); err != nil { - return err - } - } - - newVl := convertVersionList(vl) - if err := t.Put(it.Key(), mustMarshal(&newVl)); err != nil { - return err - } - if err := t.Checkpoint(); err != nil { - return err - } - } - return it.Error() -} - -func convertVersionList(vl VersionListDeprecated) VersionList { - var newVl VersionList - var newPos, oldPos int - var lastVersion protocol.Vector - - for _, fv := range vl.Versions { - if fv.Invalid { - break - } - oldPos++ - if len(newVl.RawVersions) > 0 && lastVersion.Equal(fv.Version) { - newVl.RawVersions[newPos].Devices = append(newVl.RawVersions[newPos].Devices, fv.Device) - continue - } - newPos = len(newVl.RawVersions) - newVl.RawVersions = append(newVl.RawVersions, newFileVersion(fv.Device, fv.Version, false, fv.Deleted)) - lastVersion = fv.Version - } - - if oldPos == len(vl.Versions) { - return newVl - } - - if len(newVl.RawVersions) == 0 { - fv := vl.Versions[oldPos] - newVl.RawVersions = []FileVersion{newFileVersion(fv.Device, fv.Version, true, fv.Deleted)} - oldPos++ - } - newPos = 0 -outer: - for _, fv := range vl.Versions[oldPos:] { - for _, nfv := range newVl.RawVersions[newPos:] { - switch nfv.Version.Compare(fv.Version) { - case protocol.Equal: - newVl.RawVersions[newPos].InvalidDevices = append(newVl.RawVersions[newPos].InvalidDevices, fv.Device) - continue outer - case protocol.Lesser: - newVl.insertAt(newPos, newFileVersion(fv.Device, fv.Version, true, fv.Deleted)) - continue outer - case protocol.ConcurrentLesser, protocol.ConcurrentGreater: - // The version is invalid, i.e. it looses anyway, - // no need to check/get the conflicting file. - } - newPos++ - } - // Couldn't insert into any existing versions - newVl.RawVersions = append(newVl.RawVersions, newFileVersion(fv.Device, fv.Version, true, fv.Deleted)) - newPos++ - } - - return newVl -} - -func getGlobalVersionsByKeyBefore11(key []byte, t readOnlyTransaction) (VersionListDeprecated, error) { - bs, err := t.Get(key) - if err != nil { - return VersionListDeprecated{}, err - } - - var vl VersionListDeprecated - if err := vl.Unmarshal(bs); err != nil { - return VersionListDeprecated{}, err - } - - return vl, nil -} - -func withGlobalBefore11(folder []byte, truncate bool, fn Iterator, t readOnlyTransaction) error { - key, err := t.keyer.GenerateGlobalVersionKey(nil, folder, nil) - if err != nil { - return err - } - dbi, err := t.NewPrefixIterator(key) - if err != nil { - return err - } - defer dbi.Release() - - var dk []byte - for dbi.Next() { - name := t.keyer.NameFromGlobalVersionKey(dbi.Key()) - - var vl VersionListDeprecated - if err := vl.Unmarshal(dbi.Value()); err != nil { - return err - } - - dk, err = t.keyer.GenerateDeviceFileKey(dk, folder, vl.Versions[0].Device, name) - if err != nil { - return err - } - - f, ok, err := t.getFileTrunc(dk, truncate) - if err != nil { - return err - } - if !ok { - continue - } - - if !fn(f) { - return nil - } - } - if err != nil { - return err - } - return dbi.Error() -} - -func withNeedLocalBefore11(folder []byte, truncate bool, fn Iterator, t readOnlyTransaction) error { - key, err := t.keyer.GenerateNeedFileKey(nil, folder, nil) - if err != nil { - return err - } - dbi, err := t.NewPrefixIterator(key.WithoutName()) - if err != nil { - return err - } - defer dbi.Release() - - var keyBuf []byte - var f protocol.FileIntf - var ok bool - for dbi.Next() { - keyBuf, f, ok, err = getGlobalBefore11(keyBuf, folder, t.keyer.NameFromGlobalVersionKey(dbi.Key()), truncate, t) - if err != nil { - return err - } - if !ok { - continue - } - if !fn(f) { - return nil - } - } - return dbi.Error() -} - -func getGlobalBefore11(keyBuf, folder, file []byte, truncate bool, t readOnlyTransaction) ([]byte, protocol.FileIntf, bool, error) { - keyBuf, err := t.keyer.GenerateGlobalVersionKey(keyBuf, folder, file) - if err != nil { - return nil, nil, false, err - } - bs, err := t.Get(keyBuf) - if backend.IsNotFound(err) { - return keyBuf, nil, false, nil - } else if err != nil { - return nil, nil, false, err - } - var vl VersionListDeprecated - if err := vl.Unmarshal(bs); err != nil { - return nil, nil, false, err - } - if len(vl.Versions) == 0 { - return nil, nil, false, nil - } - keyBuf, err = t.keyer.GenerateDeviceFileKey(keyBuf, folder, vl.Versions[0].Device, file) - if err != nil { - return nil, nil, false, err - } - fi, ok, err := t.getFileTrunc(keyBuf, truncate) - if err != nil || !ok { - return keyBuf, nil, false, err - } - return keyBuf, fi, true, nil -} - -func (vl *VersionListDeprecated) String() string { - var b bytes.Buffer - var id protocol.DeviceID - b.WriteString("{") - for i, v := range vl.Versions { - if i > 0 { - b.WriteString(", ") - } - copy(id[:], v.Device) - fmt.Fprintf(&b, "{%v, %v}", v.Version, id) - } - b.WriteString("}") - return b.String() -} - -func (vl *VersionListDeprecated) pop(device []byte) (FileVersionDeprecated, int) { - for i, v := range vl.Versions { - if bytes.Equal(v.Device, device) { - vl.Versions = append(vl.Versions[:i], vl.Versions[i+1:]...) - return v, i - } - } - return FileVersionDeprecated{}, -1 -} - -func (vl *VersionListDeprecated) Get(device []byte) (FileVersionDeprecated, bool) { - for _, v := range vl.Versions { - if bytes.Equal(v.Device, device) { - return v, true - } - } - - return FileVersionDeprecated{}, false -} - -func (vl *VersionListDeprecated) insertAt(i int, v FileVersionDeprecated) { - vl.Versions = append(vl.Versions, FileVersionDeprecated{}) - copy(vl.Versions[i+1:], vl.Versions[i:]) - vl.Versions[i] = v -} - -func needDeprecated(global FileVersionDeprecated, haveLocal bool, localVersion protocol.Vector) bool { - // We never need an invalid file. - if global.Invalid { - return false - } - // We don't need a deleted file if we don't have it. - if global.Deleted && !haveLocal { - return false - } - // We don't need the global file if we already have the same version. - if haveLocal && localVersion.GreaterEqual(global.Version) { - return false - } - return true -} diff --git a/lib/db/set.go b/lib/db/set.go index fb4a9fda5ce..06e91e14b63 100644 --- a/lib/db/set.go +++ b/lib/db/set.go @@ -13,8 +13,10 @@ package db import ( + "bytes" "fmt" + "github.com/syncthing/syncthing/internal/gen/dbproto" "github.com/syncthing/syncthing/lib/db/backend" "github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/osutil" @@ -33,7 +35,7 @@ type FileSet struct { // The Iterator is called with either a protocol.FileInfo or a // FileInfoTruncated (depending on the method) and returns true to // continue iteration, false to stop. -type Iterator func(f protocol.FileIntf) bool +type Iterator func(f protocol.FileInfo) bool func NewFileSet(folder string, db *Lowlevel) (*FileSet, error) { select { @@ -292,26 +294,24 @@ func (s *Snapshot) GetGlobal(file string) (protocol.FileInfo, bool) { if !ok { return protocol.FileInfo{}, false } - f := fi.(protocol.FileInfo) - f.Name = osutil.NativeFilename(f.Name) - return f, true + fi.Name = osutil.NativeFilename(fi.Name) + return fi, true } -func (s *Snapshot) GetGlobalTruncated(file string) (FileInfoTruncated, bool) { +func (s *Snapshot) GetGlobalTruncated(file string) (protocol.FileInfo, bool) { opStr := fmt.Sprintf("%s GetGlobalTruncated(%v)", s.folder, file) l.Debugf(opStr) _, fi, ok, err := s.t.getGlobal(nil, []byte(s.folder), []byte(osutil.NormalizedFilename(file)), true) if backend.IsClosed(err) { - return FileInfoTruncated{}, false + return protocol.FileInfo{}, false } else if err != nil { s.fatalError(err, opStr) } if !ok { - return FileInfoTruncated{}, false + return protocol.FileInfo{}, false } - f := fi.(FileInfoTruncated) - f.Name = osutil.NativeFilename(f.Name) - return f, true + fi.Name = osutil.NativeFilename(fi.Name) + return fi, true } func (s *Snapshot) Availability(file string) []protocol.DeviceID { @@ -326,16 +326,16 @@ func (s *Snapshot) Availability(file string) []protocol.DeviceID { return av } -func (s *Snapshot) DebugGlobalVersions(file string) VersionList { +func (s *Snapshot) DebugGlobalVersions(file string) *DebugVersionList { opStr := fmt.Sprintf("%s DebugGlobalVersions(%v)", s.folder, file) l.Debugf(opStr) vl, err := s.t.getGlobalVersions(nil, []byte(s.folder), []byte(osutil.NormalizedFilename(file))) if backend.IsClosed(err) || backend.IsNotFound(err) { - return VersionList{} + return nil } else if err != nil { s.fatalError(err, opStr) } - return vl + return &DebugVersionList{vl} } func (s *Snapshot) Sequence(device protocol.DeviceID) int64 { @@ -503,17 +503,9 @@ func normalizeFilenamesAndDropDuplicates(fs []protocol.FileInfo) []protocol.File } func nativeFileIterator(fn Iterator) Iterator { - return func(fi protocol.FileIntf) bool { - switch f := fi.(type) { - case protocol.FileInfo: - f.Name = osutil.NativeFilename(f.Name) - return fn(f) - case FileInfoTruncated: - f.Name = osutil.NativeFilename(f.Name) - return fn(f) - default: - panic("unknown interface type") - } + return func(fi protocol.FileInfo) bool { + fi.Name = osutil.NativeFilename(fi.Name) + return fn(fi) } } @@ -522,3 +514,40 @@ func fatalError(err error, opStr string, db *Lowlevel) { l.Warnf("Fatal error: %v: %v", opStr, err) panic(ldbPathRe.ReplaceAllString(err.Error(), "$1 x: ")) } + +// DebugFileVersion is the database-internal representation of a file +// version, with a nicer string representation, used only by API debug +// methods. +type DebugVersionList struct { + *dbproto.VersionList +} + +func (vl DebugVersionList) String() string { + var b bytes.Buffer + var id protocol.DeviceID + b.WriteString("[") + for i, v := range vl.Versions { + if i > 0 { + b.WriteString(", ") + } + fmt.Fprintf(&b, "{Version:%v, Deleted:%v, Devices:[", protocol.VectorFromWire(v.Version), v.Deleted) + for j, dev := range v.Devices { + if j > 0 { + b.WriteString(", ") + } + copy(id[:], dev) + fmt.Fprint(&b, id.Short()) + } + b.WriteString("], Invalid:[") + for j, dev := range v.InvalidDevices { + if j > 0 { + b.WriteString(", ") + } + copy(id[:], dev) + fmt.Fprint(&b, id.Short()) + } + fmt.Fprint(&b, "]}") + } + b.WriteString("]") + return b.String() +} diff --git a/lib/db/set_test.go b/lib/db/set_test.go index 49ddcba9dc0..459d9531e89 100644 --- a/lib/db/set_test.go +++ b/lib/db/set_test.go @@ -16,6 +16,7 @@ import ( "time" "github.com/d4l3k/messagediff" + "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/db/backend" "github.com/syncthing/syncthing/lib/events" @@ -48,21 +49,19 @@ func globalList(t testing.TB, s *db.FileSet) []protocol.FileInfo { var fs []protocol.FileInfo snap := snapshot(t, s) defer snap.Release() - snap.WithGlobal(func(fi protocol.FileIntf) bool { - f := fi.(protocol.FileInfo) - fs = append(fs, f) + snap.WithGlobal(func(fi protocol.FileInfo) bool { + fs = append(fs, fi) return true }) return fs } -func globalListPrefixed(t testing.TB, s *db.FileSet, prefix string) []db.FileInfoTruncated { - var fs []db.FileInfoTruncated +func globalListPrefixed(t testing.TB, s *db.FileSet, prefix string) []protocol.FileInfo { + var fs []protocol.FileInfo snap := snapshot(t, s) defer snap.Release() - snap.WithPrefixedGlobalTruncated(prefix, func(fi protocol.FileIntf) bool { - f := fi.(db.FileInfoTruncated) - fs = append(fs, f) + snap.WithPrefixedGlobalTruncated(prefix, func(fi protocol.FileInfo) bool { + fs = append(fs, fi) return true }) return fs @@ -72,21 +71,19 @@ func haveList(t testing.TB, s *db.FileSet, n protocol.DeviceID) []protocol.FileI var fs []protocol.FileInfo snap := snapshot(t, s) defer snap.Release() - snap.WithHave(n, func(fi protocol.FileIntf) bool { - f := fi.(protocol.FileInfo) - fs = append(fs, f) + snap.WithHave(n, func(fi protocol.FileInfo) bool { + fs = append(fs, fi) return true }) return fs } -func haveListPrefixed(t testing.TB, s *db.FileSet, n protocol.DeviceID, prefix string) []db.FileInfoTruncated { - var fs []db.FileInfoTruncated +func haveListPrefixed(t testing.TB, s *db.FileSet, n protocol.DeviceID, prefix string) []protocol.FileInfo { + var fs []protocol.FileInfo snap := snapshot(t, s) defer snap.Release() - snap.WithPrefixedHaveTruncated(n, prefix, func(fi protocol.FileIntf) bool { - f := fi.(db.FileInfoTruncated) - fs = append(fs, f) + snap.WithPrefixedHaveTruncated(n, prefix, func(fi protocol.FileInfo) bool { + fs = append(fs, fi) return true }) return fs @@ -96,9 +93,8 @@ func needList(t testing.TB, s *db.FileSet, n protocol.DeviceID) []protocol.FileI var fs []protocol.FileInfo snap := snapshot(t, s) defer snap.Release() - snap.WithNeed(n, func(fi protocol.FileIntf) bool { - f := fi.(protocol.FileInfo) - fs = append(fs, f) + snap.WithNeed(n, func(fi protocol.FileInfo) bool { + fs = append(fs, fi) return true }) return fs @@ -1011,9 +1007,9 @@ func TestWithHaveSequence(t *testing.T) { i := 2 snap := snapshot(t, s) defer snap.Release() - snap.WithHaveSequence(int64(i), func(fi protocol.FileIntf) bool { - if f := fi.(protocol.FileInfo); !f.IsEquivalent(localHave[i-1], 0) { - t.Fatalf("Got %v\nExpected %v", f, localHave[i-1]) + snap.WithHaveSequence(int64(i), func(fi protocol.FileInfo) bool { + if !fi.IsEquivalent(localHave[i-1], 0) { + t.Fatalf("Got %v\nExpected %v", fi, localHave[i-1]) } i++ return true @@ -1062,7 +1058,7 @@ loop: default: } snap := snapshot(t, s) - snap.WithHaveSequence(prevSeq+1, func(fi protocol.FileIntf) bool { + snap.WithHaveSequence(prevSeq+1, func(fi protocol.FileInfo) bool { if fi.SequenceNo() < prevSeq+1 { t.Fatal("Skipped ", prevSeq+1, fi.SequenceNo()) } @@ -1540,8 +1536,8 @@ func TestSequenceIndex(t *testing.T) { // Start a routine to walk the sequence index and inspect the result. - seen := make(map[string]protocol.FileIntf) - latest := make([]protocol.FileIntf, 0, len(local)) + seen := make(map[string]protocol.FileInfo) + latest := make([]protocol.FileInfo, 0, len(local)) var seq int64 t0 := time.Now() @@ -1552,7 +1548,7 @@ func TestSequenceIndex(t *testing.T) { // update has happened since our last iteration. latest = latest[:0] snap := snapshot(t, s) - snap.WithHaveSequence(seq+1, func(f protocol.FileIntf) bool { + snap.WithHaveSequence(seq+1, func(f protocol.FileInfo) bool { seen[f.FileName()] = f latest = append(latest, f) seq = f.SequenceNo() @@ -1657,7 +1653,7 @@ func TestUpdateWithOneFileTwice(t *testing.T) { snap := snapshot(t, s) defer snap.Release() count := 0 - snap.WithHaveSequence(0, func(f protocol.FileIntf) bool { + snap.WithHaveSequence(0, func(_ protocol.FileInfo) bool { count++ return true }) diff --git a/lib/db/structs.go b/lib/db/structs.go index a79224a3961..69d602112cf 100644 --- a/lib/db/structs.go +++ b/lib/db/structs.go @@ -10,172 +10,52 @@ import ( "bytes" "fmt" "strings" - "time" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/dbproto" "github.com/syncthing/syncthing/lib/protocol" ) -func (f FileInfoTruncated) String() string { - switch f.Type { - case protocol.FileInfoTypeDirectory: - return fmt.Sprintf("Directory{Name:%q, Sequence:%d, Permissions:0%o, ModTime:%v, Version:%v, Deleted:%v, Invalid:%v, LocalFlags:0x%x, NoPermissions:%v}", - f.Name, f.Sequence, f.Permissions, f.ModTime(), f.Version, f.Deleted, f.RawInvalid, f.LocalFlags, f.NoPermissions) - case protocol.FileInfoTypeFile: - return fmt.Sprintf("File{Name:%q, Sequence:%d, Permissions:0%o, ModTime:%v, Version:%v, Length:%d, Deleted:%v, Invalid:%v, LocalFlags:0x%x, NoPermissions:%v, BlockSize:%d}", - f.Name, f.Sequence, f.Permissions, f.ModTime(), f.Version, f.Size, f.Deleted, f.RawInvalid, f.LocalFlags, f.NoPermissions, f.RawBlockSize) - case protocol.FileInfoTypeSymlink, protocol.FileInfoTypeSymlinkDirectory, protocol.FileInfoTypeSymlinkFile: - return fmt.Sprintf("Symlink{Name:%q, Type:%v, Sequence:%d, Version:%v, Deleted:%v, Invalid:%v, LocalFlags:0x%x, NoPermissions:%v, SymlinkTarget:%q}", - f.Name, f.Type, f.Sequence, f.Version, f.Deleted, f.RawInvalid, f.LocalFlags, f.NoPermissions, f.SymlinkTarget) - default: - panic("mystery file type detected") - } -} - -func (f FileInfoTruncated) IsDeleted() bool { - return f.Deleted -} - -func (f FileInfoTruncated) IsInvalid() bool { - return f.RawInvalid || f.LocalFlags&protocol.LocalInvalidFlags != 0 -} - -func (f FileInfoTruncated) IsUnsupported() bool { - return f.LocalFlags&protocol.FlagLocalUnsupported != 0 -} - -func (f FileInfoTruncated) IsIgnored() bool { - return f.LocalFlags&protocol.FlagLocalIgnored != 0 -} - -func (f FileInfoTruncated) MustRescan() bool { - return f.LocalFlags&protocol.FlagLocalMustRescan != 0 -} - -func (f FileInfoTruncated) IsReceiveOnlyChanged() bool { - return f.LocalFlags&protocol.FlagLocalReceiveOnly != 0 -} - -func (f FileInfoTruncated) IsDirectory() bool { - return f.Type == protocol.FileInfoTypeDirectory -} - -func (f FileInfoTruncated) IsSymlink() bool { - switch f.Type { - case protocol.FileInfoTypeSymlink, protocol.FileInfoTypeSymlinkDirectory, protocol.FileInfoTypeSymlinkFile: - return true - default: - return false - } -} - -func (f FileInfoTruncated) ShouldConflict() bool { - return f.LocalFlags&protocol.LocalConflictFlags != 0 -} - -func (f FileInfoTruncated) HasPermissionBits() bool { - return !f.NoPermissions -} - -func (f FileInfoTruncated) FileSize() int64 { - if f.Deleted { - return 0 - } - if f.IsDirectory() || f.IsSymlink() { - return protocol.SyntheticDirectorySize - } - return f.Size -} - -func (f FileInfoTruncated) BlockSize() int { - if f.RawBlockSize == 0 { - return protocol.MinBlockSize - } - return int(f.RawBlockSize) -} - -func (f FileInfoTruncated) FileName() string { - return f.Name -} - -func (f FileInfoTruncated) FileLocalFlags() uint32 { - return f.LocalFlags -} - -func (f FileInfoTruncated) ModTime() time.Time { - return time.Unix(f.ModifiedS, int64(f.ModifiedNs)) -} - -func (f FileInfoTruncated) SequenceNo() int64 { - return f.Sequence -} - -func (f FileInfoTruncated) FileVersion() protocol.Vector { - return f.Version -} - -func (f FileInfoTruncated) FileType() protocol.FileInfoType { - return f.Type -} - -func (f FileInfoTruncated) FilePermissions() uint32 { - return f.Permissions -} - -func (f FileInfoTruncated) FileModifiedBy() protocol.ShortID { - return f.ModifiedBy -} - -func (f FileInfoTruncated) PlatformData() protocol.PlatformData { - return f.Platform -} - -func (f FileInfoTruncated) InodeChangeTime() time.Time { - return time.Unix(0, f.InodeChangeNs) +type CountsSet struct { + Counts []Counts + Created int64 // unix nanos } -func (f FileInfoTruncated) FileBlocksHash() []byte { - return f.BlocksHash +type Counts struct { + Files int + Directories int + Symlinks int + Deleted int + Bytes int64 + Sequence int64 // zero for the global state + DeviceID protocol.DeviceID // device ID for remote devices, or special values for local/global + LocalFlags uint32 // the local flag for this count bucket } -func (f FileInfoTruncated) ConvertToIgnoredFileInfo() protocol.FileInfo { - file := f.copyToFileInfo() - file.SetIgnored() - return file -} - -func (f FileInfoTruncated) ConvertToDeletedFileInfo(by protocol.ShortID) protocol.FileInfo { - file := f.copyToFileInfo() - file.SetDeleted(by) - return file -} - -// ConvertDeletedToFileInfo converts a deleted truncated file info to a regular file info -func (f FileInfoTruncated) ConvertDeletedToFileInfo() protocol.FileInfo { - if !f.Deleted { - panic("ConvertDeletedToFileInfo must only be called on deleted items") +func (c Counts) toWire() *dbproto.Counts { + return &dbproto.Counts{ + Files: int32(c.Files), + Directories: int32(c.Directories), + Symlinks: int32(c.Symlinks), + Deleted: int32(c.Deleted), + Bytes: c.Bytes, + Sequence: c.Sequence, + DeviceId: c.DeviceID[:], + LocalFlags: c.LocalFlags, } - return f.copyToFileInfo() } -// copyToFileInfo just copies all members of FileInfoTruncated to protocol.FileInfo -func (f FileInfoTruncated) copyToFileInfo() protocol.FileInfo { - return protocol.FileInfo{ - Name: f.Name, - Size: f.Size, - ModifiedS: f.ModifiedS, - ModifiedBy: f.ModifiedBy, - Version: f.Version, - Sequence: f.Sequence, - SymlinkTarget: f.SymlinkTarget, - BlocksHash: f.BlocksHash, - Type: f.Type, - Permissions: f.Permissions, - ModifiedNs: f.ModifiedNs, - RawBlockSize: f.RawBlockSize, - LocalFlags: f.LocalFlags, - Deleted: f.Deleted, - RawInvalid: f.RawInvalid, - NoPermissions: f.NoPermissions, +func countsFromWire(w *dbproto.Counts) Counts { + return Counts{ + Files: int(w.Files), + Directories: int(w.Directories), + Symlinks: int(w.Symlinks), + Deleted: int(w.Deleted), + Bytes: w.Bytes, + Sequence: w.Sequence, + DeviceID: protocol.DeviceID(w.DeviceId), + LocalFlags: w.LocalFlags, } } @@ -187,7 +67,7 @@ func (c Counts) Add(other Counts) Counts { Deleted: c.Deleted + other.Deleted, Bytes: c.Bytes + other.Bytes, Sequence: c.Sequence + other.Sequence, - DeviceID: protocol.EmptyDeviceID[:], + DeviceID: protocol.EmptyDeviceID, LocalFlags: c.LocalFlags | other.LocalFlags, } } @@ -197,7 +77,6 @@ func (c Counts) TotalItems() int { } func (c Counts) String() string { - dev, _ := protocol.DeviceIDFromBytes(c.DeviceID) var flags strings.Builder if c.LocalFlags&needFlag != 0 { flags.WriteString("Need") @@ -220,7 +99,7 @@ func (c Counts) String() string { if flags.Len() == 0 { flags.WriteString("---") } - return fmt.Sprintf("{Device:%v, Files:%d, Dirs:%d, Symlinks:%d, Del:%d, Bytes:%d, Seq:%d, Flags:%s}", dev, c.Files, c.Directories, c.Symlinks, c.Deleted, c.Bytes, c.Sequence, flags.String()) + return fmt.Sprintf("{Device:%v, Files:%d, Dirs:%d, Symlinks:%d, Del:%d, Bytes:%d, Seq:%d, Flags:%s}", c.DeviceID, c.Files, c.Directories, c.Symlinks, c.Deleted, c.Bytes, c.Sequence, flags.String()) } // Equal compares the numbers only, not sequence/dev/flags. @@ -228,80 +107,50 @@ func (c Counts) Equal(o Counts) bool { return c.Files == o.Files && c.Directories == o.Directories && c.Symlinks == o.Symlinks && c.Deleted == o.Deleted && c.Bytes == o.Bytes } -func (vl VersionList) String() string { - var b bytes.Buffer - var id protocol.DeviceID - b.WriteString("{") - for i, v := range vl.RawVersions { - if i > 0 { - b.WriteString(", ") - } - fmt.Fprintf(&b, "{Version:%v, Deleted:%v, Devices:{", v.Version, v.Deleted) - for j, dev := range v.Devices { - if j > 0 { - b.WriteString(", ") - } - copy(id[:], dev) - fmt.Fprint(&b, id.Short()) - } - b.WriteString("}, Invalid:{") - for j, dev := range v.InvalidDevices { - if j > 0 { - b.WriteString(", ") - } - copy(id[:], dev) - fmt.Fprint(&b, id.Short()) - } - fmt.Fprint(&b, "}}") - } - b.WriteString("}") - return b.String() -} - // update brings the VersionList up to date with file. It returns the updated // VersionList, a device that has the global/newest version, a device that previously // had the global/newest version, a boolean indicating if the global version has // changed and if any error occurred (only possible in db interaction). -func (vl *VersionList) update(folder, device []byte, file protocol.FileIntf, t readOnlyTransaction) (FileVersion, FileVersion, FileVersion, bool, bool, bool, error) { - if len(vl.RawVersions) == 0 { +func vlUpdate(vl *dbproto.VersionList, folder, device []byte, file protocol.FileInfo, t readOnlyTransaction) (*dbproto.FileVersion, *dbproto.FileVersion, *dbproto.FileVersion, bool, bool, bool, error) { + if len(vl.Versions) == 0 { nv := newFileVersion(device, file.FileVersion(), file.IsInvalid(), file.IsDeleted()) - vl.RawVersions = append(vl.RawVersions, nv) - return nv, FileVersion{}, FileVersion{}, false, false, true, nil + vl.Versions = append(vl.Versions, nv) + return nv, nil, nil, false, false, true, nil } // Get the current global (before updating) - oldFV, haveOldGlobal := vl.GetGlobal() - oldFV = oldFV.copy() + oldFV, haveOldGlobal := vlGetGlobal(vl) + oldFV = fvCopy(oldFV) // Remove ourselves first - removedFV, haveRemoved, _ := vl.pop(device) + removedFV, haveRemoved, _ := vlPop(vl, device) // Find position and insert the file - err := vl.insert(folder, device, file, t) + err := vlInsert(vl, folder, device, file, t) if err != nil { - return FileVersion{}, FileVersion{}, FileVersion{}, false, false, false, err + return nil, nil, nil, false, false, false, err } - newFV, _ := vl.GetGlobal() // We just inserted something above, can't be empty + newFV, _ := vlGetGlobal(vl) // We just inserted something above, can't be empty if !haveOldGlobal { - return newFV, FileVersion{}, removedFV, false, haveRemoved, true, nil + return newFV, nil, removedFV, false, haveRemoved, true, nil } globalChanged := true - if oldFV.IsInvalid() == newFV.IsInvalid() && oldFV.Version.Equal(newFV.Version) { + if fvIsInvalid(oldFV) == fvIsInvalid(newFV) && protocol.VectorFromWire(oldFV.Version).Equal(protocol.VectorFromWire(newFV.Version)) { globalChanged = false } return newFV, oldFV, removedFV, true, haveRemoved, globalChanged, nil } -func (vl *VersionList) insert(folder, device []byte, file protocol.FileIntf, t readOnlyTransaction) error { +func vlInsert(vl *dbproto.VersionList, folder, device []byte, file protocol.FileInfo, t readOnlyTransaction) error { var added bool var err error i := 0 - for ; i < len(vl.RawVersions); i++ { + for ; i < len(vl.Versions); i++ { // Insert our new version - added, err = vl.checkInsertAt(i, folder, device, file, t) + added, err = vlCheckInsertAt(vl, i, folder, device, file, t) if err != nil { return err } @@ -309,80 +158,76 @@ func (vl *VersionList) insert(folder, device []byte, file protocol.FileIntf, t r break } } - if i == len(vl.RawVersions) { + if i == len(vl.Versions) { // Append to the end - vl.RawVersions = append(vl.RawVersions, newFileVersion(device, file.FileVersion(), file.IsInvalid(), file.IsDeleted())) + vl.Versions = append(vl.Versions, newFileVersion(device, file.FileVersion(), file.IsInvalid(), file.IsDeleted())) } return nil } -func (vl *VersionList) insertAt(i int, v FileVersion) { - vl.RawVersions = append(vl.RawVersions, FileVersion{}) - copy(vl.RawVersions[i+1:], vl.RawVersions[i:]) - vl.RawVersions[i] = v +func vlInsertAt(vl *dbproto.VersionList, i int, v *dbproto.FileVersion) { + vl.Versions = append(vl.Versions, &dbproto.FileVersion{}) + copy(vl.Versions[i+1:], vl.Versions[i:]) + vl.Versions[i] = v } // pop removes the given device from the VersionList and returns the FileVersion // before removing the device, whether it was found/removed at all and whether // the global changed in the process. -func (vl *VersionList) pop(device []byte) (FileVersion, bool, bool) { - invDevice, i, j, ok := vl.findDevice(device) +func vlPop(vl *dbproto.VersionList, device []byte) (*dbproto.FileVersion, bool, bool) { + invDevice, i, j, ok := vlFindDevice(vl, device) if !ok { - return FileVersion{}, false, false + return nil, false, false } - globalPos := vl.findGlobal() + globalPos := vlFindGlobal(vl) - if vl.RawVersions[i].deviceCount() == 1 { - fv := vl.RawVersions[i] - vl.popVersionAt(i) + fv := vl.Versions[i] + if fvDeviceCount(fv) == 1 { + vlPopVersionAt(vl, i) return fv, true, globalPos == i } - oldFV := vl.RawVersions[i].copy() + oldFV := fvCopy(fv) if invDevice { - vl.RawVersions[i].InvalidDevices = popDeviceAt(vl.RawVersions[i].InvalidDevices, j) + vl.Versions[i].InvalidDevices = popDeviceAt(vl.Versions[i].InvalidDevices, j) return oldFV, true, false } - vl.RawVersions[i].Devices = popDeviceAt(vl.RawVersions[i].Devices, j) + vl.Versions[i].Devices = popDeviceAt(vl.Versions[i].Devices, j) // If the last valid device of the previous global was removed above, // the global changed. - return oldFV, true, len(vl.RawVersions[i].Devices) == 0 && globalPos == i + return oldFV, true, len(vl.Versions[i].Devices) == 0 && globalPos == i } // Get returns a FileVersion that contains the given device and whether it has // been found at all. -func (vl *VersionList) Get(device []byte) (FileVersion, bool) { - _, i, _, ok := vl.findDevice(device) +func vlGet(vl *dbproto.VersionList, device []byte) (*dbproto.FileVersion, bool) { + _, i, _, ok := vlFindDevice(vl, device) if !ok { - return FileVersion{}, false + return &dbproto.FileVersion{}, false } - return vl.RawVersions[i], true + return vl.Versions[i], true } // GetGlobal returns the current global FileVersion. The returned FileVersion // may be invalid, if all FileVersions are invalid. Returns false only if // VersionList is empty. -func (vl *VersionList) GetGlobal() (FileVersion, bool) { - i := vl.findGlobal() +func vlGetGlobal(vl *dbproto.VersionList) (*dbproto.FileVersion, bool) { + i := vlFindGlobal(vl) if i == -1 { - return FileVersion{}, false + return nil, false } - return vl.RawVersions[i], true -} - -func (vl *VersionList) Empty() bool { - return len(vl.RawVersions) == 0 + return vl.Versions[i], true } // findGlobal returns the first version that isn't invalid, or if all versions are // invalid just the first version (i.e. 0) or -1, if there's no versions at all. -func (vl *VersionList) findGlobal() int { - for i, fv := range vl.RawVersions { - if !fv.IsInvalid() { +func vlFindGlobal(vl *dbproto.VersionList) int { + for i := range vl.Versions { + if !fvIsInvalid(vl.Versions[i]) { return i } } - if len(vl.RawVersions) == 0 { + if len(vl.Versions) == 0 { return -1 } return 0 @@ -391,8 +236,8 @@ func (vl *VersionList) findGlobal() int { // findDevice returns whether the device is in InvalidVersions or Versions and // in InvalidDevices or Devices (true for invalid), the positions in the version // and device slices and whether it has been found at all. -func (vl *VersionList) findDevice(device []byte) (bool, int, int, bool) { - for i, v := range vl.RawVersions { +func vlFindDevice(vl *dbproto.VersionList, device []byte) (bool, int, int, bool) { + for i, v := range vl.Versions { if j := deviceIndex(v.Devices, device); j != -1 { return false, i, j, true } @@ -403,30 +248,31 @@ func (vl *VersionList) findDevice(device []byte) (bool, int, int, bool) { return false, -1, -1, false } -func (vl *VersionList) popVersionAt(i int) { - vl.RawVersions = append(vl.RawVersions[:i], vl.RawVersions[i+1:]...) +func vlPopVersionAt(vl *dbproto.VersionList, i int) { + vl.Versions = append(vl.Versions[:i], vl.Versions[i+1:]...) } // checkInsertAt determines if the given device and associated file should be // inserted into the FileVersion at position i or into a new FileVersion at // position i. -func (vl *VersionList) checkInsertAt(i int, folder, device []byte, file protocol.FileIntf, t readOnlyTransaction) (bool, error) { - ordering := vl.RawVersions[i].Version.Compare(file.FileVersion()) +func vlCheckInsertAt(vl *dbproto.VersionList, i int, folder, device []byte, file protocol.FileInfo, t readOnlyTransaction) (bool, error) { + fv := vl.Versions[i] + ordering := protocol.VectorFromWire(fv.Version).Compare(file.FileVersion()) if ordering == protocol.Equal { if !file.IsInvalid() { - vl.RawVersions[i].Devices = append(vl.RawVersions[i].Devices, device) + fv.Devices = append(fv.Devices, device) } else { - vl.RawVersions[i].InvalidDevices = append(vl.RawVersions[i].InvalidDevices, device) + fv.InvalidDevices = append(fv.InvalidDevices, device) } return true, nil } - existingDevice, _ := vl.RawVersions[i].FirstDevice() - insert, err := shouldInsertBefore(ordering, folder, existingDevice, vl.RawVersions[i].IsInvalid(), file, t) + existingDevice, _ := fvFirstDevice(fv) + insert, err := shouldInsertBefore(ordering, folder, existingDevice, fvIsInvalid(fv), file, t) if err != nil { return false, err } if insert { - vl.insertAt(i, newFileVersion(device, file.FileVersion(), file.IsInvalid(), file.IsDeleted())) + vlInsertAt(vl, i, newFileVersion(device, file.FileVersion(), file.IsInvalid(), file.IsDeleted())) return true, nil } return false, nil @@ -435,7 +281,7 @@ func (vl *VersionList) checkInsertAt(i int, folder, device []byte, file protocol // shouldInsertBefore determines whether the file comes before an existing // entry, given the version ordering (existing compared to new one), existing // device and if the existing version is invalid. -func shouldInsertBefore(ordering protocol.Ordering, folder, existingDevice []byte, existingInvalid bool, file protocol.FileIntf, t readOnlyTransaction) (bool, error) { +func shouldInsertBefore(ordering protocol.Ordering, folder, existingDevice []byte, existingInvalid bool, file protocol.FileInfo, t readOnlyTransaction) (bool, error) { switch ordering { case protocol.Lesser: // The version at this point in the list is lesser @@ -461,10 +307,7 @@ func shouldInsertBefore(ordering protocol.Ordering, folder, existingDevice []byt if !ok { return true, nil } - if err != nil { - return false, err - } - if protocol.WinsConflict(file, of) { + if file.WinsConflict(of) { return true, nil } } @@ -484,9 +327,9 @@ func popDeviceAt(devices [][]byte, i int) [][]byte { return append(devices[:i], devices[i+1:]...) } -func newFileVersion(device []byte, version protocol.Vector, invalid, deleted bool) FileVersion { - fv := FileVersion{ - Version: version, +func newFileVersion(device []byte, version protocol.Vector, invalid, deleted bool) *dbproto.FileVersion { + fv := &dbproto.FileVersion{ + Version: version.ToWire(), Deleted: deleted, } if invalid { @@ -497,7 +340,7 @@ func newFileVersion(device []byte, version protocol.Vector, invalid, deleted boo return fv } -func (fv FileVersion) FirstDevice() ([]byte, bool) { +func fvFirstDevice(fv *dbproto.FileVersion) ([]byte, bool) { if len(fv.Devices) != 0 { return fv.Devices[0], true } @@ -507,18 +350,14 @@ func (fv FileVersion) FirstDevice() ([]byte, bool) { return nil, false } -func (fv FileVersion) IsInvalid() bool { - return len(fv.Devices) == 0 +func fvIsInvalid(fv *dbproto.FileVersion) bool { + return fv == nil || len(fv.Devices) == 0 } -func (fv FileVersion) deviceCount() int { +func fvDeviceCount(fv *dbproto.FileVersion) int { return len(fv.Devices) + len(fv.InvalidDevices) } -func (fv FileVersion) copy() FileVersion { - n := fv - n.Version = fv.Version.Copy() - n.Devices = append([][]byte{}, fv.Devices...) - n.InvalidDevices = append([][]byte{}, fv.InvalidDevices...) - return n +func fvCopy(fv *dbproto.FileVersion) *dbproto.FileVersion { + return proto.Clone(fv).(*dbproto.FileVersion) } diff --git a/lib/db/structs.pb.go b/lib/db/structs.pb.go deleted file mode 100644 index a4d80af1f07..00000000000 --- a/lib/db/structs.pb.go +++ /dev/null @@ -1,3478 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/db/structs.proto - -package db - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - github_com_syncthing_syncthing_lib_protocol "github.com/syncthing/syncthing/lib/protocol" - protocol "github.com/syncthing/syncthing/lib/protocol" - _ "github.com/syncthing/syncthing/proto/ext" - _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf -var _ = time.Kitchen - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type FileVersion struct { - Version protocol.Vector `protobuf:"bytes,1,opt,name=version,proto3" json:"version" xml:"version"` - Deleted bool `protobuf:"varint,2,opt,name=deleted,proto3" json:"deleted" xml:"deleted"` - Devices [][]byte `protobuf:"bytes,3,rep,name=devices,proto3" json:"devices" xml:"device"` - InvalidDevices [][]byte `protobuf:"bytes,4,rep,name=invalid_devices,json=invalidDevices,proto3" json:"invalidDevices" xml:"invalidDevice"` -} - -func (m *FileVersion) Reset() { *m = FileVersion{} } -func (m *FileVersion) String() string { return proto.CompactTextString(m) } -func (*FileVersion) ProtoMessage() {} -func (*FileVersion) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{0} -} -func (m *FileVersion) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FileVersion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FileVersion.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FileVersion) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileVersion.Merge(m, src) -} -func (m *FileVersion) XXX_Size() int { - return m.ProtoSize() -} -func (m *FileVersion) XXX_DiscardUnknown() { - xxx_messageInfo_FileVersion.DiscardUnknown(m) -} - -var xxx_messageInfo_FileVersion proto.InternalMessageInfo - -type VersionList struct { - RawVersions []FileVersion `protobuf:"bytes,1,rep,name=versions,proto3" json:"versions" xml:"version"` -} - -func (m *VersionList) Reset() { *m = VersionList{} } -func (*VersionList) ProtoMessage() {} -func (*VersionList) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{1} -} -func (m *VersionList) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *VersionList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_VersionList.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *VersionList) XXX_Merge(src proto.Message) { - xxx_messageInfo_VersionList.Merge(m, src) -} -func (m *VersionList) XXX_Size() int { - return m.ProtoSize() -} -func (m *VersionList) XXX_DiscardUnknown() { - xxx_messageInfo_VersionList.DiscardUnknown(m) -} - -var xxx_messageInfo_VersionList proto.InternalMessageInfo - -// Must be the same as FileInfo but without the blocks field -type FileInfoTruncated struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name" xml:"name"` - Size int64 `protobuf:"varint,3,opt,name=size,proto3" json:"size" xml:"size"` - ModifiedS int64 `protobuf:"varint,5,opt,name=modified_s,json=modifiedS,proto3" json:"modifiedS" xml:"modifiedS"` - ModifiedBy github_com_syncthing_syncthing_lib_protocol.ShortID `protobuf:"varint,12,opt,name=modified_by,json=modifiedBy,proto3,customtype=github.com/syncthing/syncthing/lib/protocol.ShortID" json:"modifiedBy" xml:"modifiedBy"` - Version protocol.Vector `protobuf:"bytes,9,opt,name=version,proto3" json:"version" xml:"version"` - Sequence int64 `protobuf:"varint,10,opt,name=sequence,proto3" json:"sequence" xml:"sequence"` - // repeated BlockInfo Blocks = 16 - SymlinkTarget string `protobuf:"bytes,17,opt,name=symlink_target,json=symlinkTarget,proto3" json:"symlinkTarget" xml:"symlinkTarget"` - BlocksHash []byte `protobuf:"bytes,18,opt,name=blocks_hash,json=blocksHash,proto3" json:"blocksHash" xml:"blocksHash"` - Encrypted []byte `protobuf:"bytes,19,opt,name=encrypted,proto3" json:"encrypted" xml:"encrypted"` - Type protocol.FileInfoType `protobuf:"varint,2,opt,name=type,proto3,enum=protocol.FileInfoType" json:"type" xml:"type"` - Permissions uint32 `protobuf:"varint,4,opt,name=permissions,proto3" json:"permissions" xml:"permissions"` - ModifiedNs int `protobuf:"varint,11,opt,name=modified_ns,json=modifiedNs,proto3,casttype=int" json:"modifiedNs" xml:"modifiedNs"` - RawBlockSize int `protobuf:"varint,13,opt,name=block_size,json=blockSize,proto3,casttype=int" json:"blockSize" xml:"blockSize"` - Platform protocol.PlatformData `protobuf:"bytes,14,opt,name=platform,proto3" json:"platform" xml:"platform"` - // see bep.proto - LocalFlags uint32 `protobuf:"varint,1000,opt,name=local_flags,json=localFlags,proto3" json:"localFlags" xml:"localFlags"` - VersionHash []byte `protobuf:"bytes,1001,opt,name=version_hash,json=versionHash,proto3" json:"versionHash" xml:"versionHash"` - InodeChangeNs int64 `protobuf:"varint,1002,opt,name=inode_change_ns,json=inodeChangeNs,proto3" json:"inodeChangeNs" xml:"inodeChangeNs"` - Deleted bool `protobuf:"varint,6,opt,name=deleted,proto3" json:"deleted" xml:"deleted"` - RawInvalid bool `protobuf:"varint,7,opt,name=invalid,proto3" json:"invalid" xml:"invalid"` - NoPermissions bool `protobuf:"varint,8,opt,name=no_permissions,json=noPermissions,proto3" json:"noPermissions" xml:"noPermissions"` -} - -func (m *FileInfoTruncated) Reset() { *m = FileInfoTruncated{} } -func (*FileInfoTruncated) ProtoMessage() {} -func (*FileInfoTruncated) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{2} -} -func (m *FileInfoTruncated) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FileInfoTruncated) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FileInfoTruncated.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FileInfoTruncated) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileInfoTruncated.Merge(m, src) -} -func (m *FileInfoTruncated) XXX_Size() int { - return m.ProtoSize() -} -func (m *FileInfoTruncated) XXX_DiscardUnknown() { - xxx_messageInfo_FileInfoTruncated.DiscardUnknown(m) -} - -var xxx_messageInfo_FileInfoTruncated proto.InternalMessageInfo - -// BlockList is the structure used to store block lists -type BlockList struct { - Blocks []protocol.BlockInfo `protobuf:"bytes,1,rep,name=blocks,proto3" json:"blocks" xml:"block"` -} - -func (m *BlockList) Reset() { *m = BlockList{} } -func (m *BlockList) String() string { return proto.CompactTextString(m) } -func (*BlockList) ProtoMessage() {} -func (*BlockList) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{3} -} -func (m *BlockList) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *BlockList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_BlockList.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *BlockList) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlockList.Merge(m, src) -} -func (m *BlockList) XXX_Size() int { - return m.ProtoSize() -} -func (m *BlockList) XXX_DiscardUnknown() { - xxx_messageInfo_BlockList.DiscardUnknown(m) -} - -var xxx_messageInfo_BlockList proto.InternalMessageInfo - -// IndirectionHashesOnly is used to only unmarshal the indirection hashes -// from a FileInfo -type IndirectionHashesOnly struct { - BlocksHash []byte `protobuf:"bytes,18,opt,name=blocks_hash,json=blocksHash,proto3" json:"blocksHash" xml:"blocksHash"` - VersionHash []byte `protobuf:"bytes,1001,opt,name=version_hash,json=versionHash,proto3" json:"versionHash" xml:"versionHash"` -} - -func (m *IndirectionHashesOnly) Reset() { *m = IndirectionHashesOnly{} } -func (m *IndirectionHashesOnly) String() string { return proto.CompactTextString(m) } -func (*IndirectionHashesOnly) ProtoMessage() {} -func (*IndirectionHashesOnly) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{4} -} -func (m *IndirectionHashesOnly) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *IndirectionHashesOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_IndirectionHashesOnly.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *IndirectionHashesOnly) XXX_Merge(src proto.Message) { - xxx_messageInfo_IndirectionHashesOnly.Merge(m, src) -} -func (m *IndirectionHashesOnly) XXX_Size() int { - return m.ProtoSize() -} -func (m *IndirectionHashesOnly) XXX_DiscardUnknown() { - xxx_messageInfo_IndirectionHashesOnly.DiscardUnknown(m) -} - -var xxx_messageInfo_IndirectionHashesOnly proto.InternalMessageInfo - -// For each folder and device we keep one of these to track the current -// counts and sequence. We also keep one for the global state of the folder. -type Counts struct { - Files int `protobuf:"varint,1,opt,name=files,proto3,casttype=int" json:"files" xml:"files"` - Directories int `protobuf:"varint,2,opt,name=directories,proto3,casttype=int" json:"directories" xml:"directories"` - Symlinks int `protobuf:"varint,3,opt,name=symlinks,proto3,casttype=int" json:"symlinks" xml:"symlinks"` - Deleted int `protobuf:"varint,4,opt,name=deleted,proto3,casttype=int" json:"deleted" xml:"deleted"` - Bytes int64 `protobuf:"varint,5,opt,name=bytes,proto3" json:"bytes" xml:"bytes"` - Sequence int64 `protobuf:"varint,6,opt,name=sequence,proto3" json:"sequence" xml:"sequence"` - DeviceID []byte `protobuf:"bytes,17,opt,name=device_id,json=deviceId,proto3" json:"deviceId" xml:"deviceId"` - LocalFlags uint32 `protobuf:"varint,18,opt,name=local_flags,json=localFlags,proto3" json:"localFlags" xml:"localFlags"` -} - -func (m *Counts) Reset() { *m = Counts{} } -func (*Counts) ProtoMessage() {} -func (*Counts) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{5} -} -func (m *Counts) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Counts) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Counts.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Counts) XXX_Merge(src proto.Message) { - xxx_messageInfo_Counts.Merge(m, src) -} -func (m *Counts) XXX_Size() int { - return m.ProtoSize() -} -func (m *Counts) XXX_DiscardUnknown() { - xxx_messageInfo_Counts.DiscardUnknown(m) -} - -var xxx_messageInfo_Counts proto.InternalMessageInfo - -type CountsSet struct { - Counts []Counts `protobuf:"bytes,1,rep,name=counts,proto3" json:"counts" xml:"count"` - Created int64 `protobuf:"varint,2,opt,name=created,proto3" json:"created" xml:"created"` -} - -func (m *CountsSet) Reset() { *m = CountsSet{} } -func (m *CountsSet) String() string { return proto.CompactTextString(m) } -func (*CountsSet) ProtoMessage() {} -func (*CountsSet) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{6} -} -func (m *CountsSet) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CountsSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CountsSet.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CountsSet) XXX_Merge(src proto.Message) { - xxx_messageInfo_CountsSet.Merge(m, src) -} -func (m *CountsSet) XXX_Size() int { - return m.ProtoSize() -} -func (m *CountsSet) XXX_DiscardUnknown() { - xxx_messageInfo_CountsSet.DiscardUnknown(m) -} - -var xxx_messageInfo_CountsSet proto.InternalMessageInfo - -type FileVersionDeprecated struct { - Version protocol.Vector `protobuf:"bytes,1,opt,name=version,proto3" json:"version" xml:"version"` - Device []byte `protobuf:"bytes,2,opt,name=device,proto3" json:"device" xml:"device"` - Invalid bool `protobuf:"varint,3,opt,name=invalid,proto3" json:"invalid" xml:"invalid"` - Deleted bool `protobuf:"varint,4,opt,name=deleted,proto3" json:"deleted" xml:"deleted"` -} - -func (m *FileVersionDeprecated) Reset() { *m = FileVersionDeprecated{} } -func (m *FileVersionDeprecated) String() string { return proto.CompactTextString(m) } -func (*FileVersionDeprecated) ProtoMessage() {} -func (*FileVersionDeprecated) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{7} -} -func (m *FileVersionDeprecated) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FileVersionDeprecated) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FileVersionDeprecated.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FileVersionDeprecated) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileVersionDeprecated.Merge(m, src) -} -func (m *FileVersionDeprecated) XXX_Size() int { - return m.ProtoSize() -} -func (m *FileVersionDeprecated) XXX_DiscardUnknown() { - xxx_messageInfo_FileVersionDeprecated.DiscardUnknown(m) -} - -var xxx_messageInfo_FileVersionDeprecated proto.InternalMessageInfo - -type VersionListDeprecated struct { - Versions []FileVersionDeprecated `protobuf:"bytes,1,rep,name=versions,proto3" json:"versions" xml:"version"` -} - -func (m *VersionListDeprecated) Reset() { *m = VersionListDeprecated{} } -func (*VersionListDeprecated) ProtoMessage() {} -func (*VersionListDeprecated) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{8} -} -func (m *VersionListDeprecated) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *VersionListDeprecated) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_VersionListDeprecated.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *VersionListDeprecated) XXX_Merge(src proto.Message) { - xxx_messageInfo_VersionListDeprecated.Merge(m, src) -} -func (m *VersionListDeprecated) XXX_Size() int { - return m.ProtoSize() -} -func (m *VersionListDeprecated) XXX_DiscardUnknown() { - xxx_messageInfo_VersionListDeprecated.DiscardUnknown(m) -} - -var xxx_messageInfo_VersionListDeprecated proto.InternalMessageInfo - -type ObservedFolder struct { - Time time.Time `protobuf:"bytes,1,opt,name=time,proto3,stdtime" json:"time" xml:"time"` - Label string `protobuf:"bytes,2,opt,name=label,proto3" json:"label" xml:"label"` - ReceiveEncrypted bool `protobuf:"varint,3,opt,name=receive_encrypted,json=receiveEncrypted,proto3" json:"receiveEncrypted" xml:"receiveEncrypted"` - RemoteEncrypted bool `protobuf:"varint,4,opt,name=remote_encrypted,json=remoteEncrypted,proto3" json:"remoteEncrypted" xml:"remoteEncrypted"` -} - -func (m *ObservedFolder) Reset() { *m = ObservedFolder{} } -func (m *ObservedFolder) String() string { return proto.CompactTextString(m) } -func (*ObservedFolder) ProtoMessage() {} -func (*ObservedFolder) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{9} -} -func (m *ObservedFolder) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ObservedFolder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ObservedFolder.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ObservedFolder) XXX_Merge(src proto.Message) { - xxx_messageInfo_ObservedFolder.Merge(m, src) -} -func (m *ObservedFolder) XXX_Size() int { - return m.ProtoSize() -} -func (m *ObservedFolder) XXX_DiscardUnknown() { - xxx_messageInfo_ObservedFolder.DiscardUnknown(m) -} - -var xxx_messageInfo_ObservedFolder proto.InternalMessageInfo - -type ObservedDevice struct { - Time time.Time `protobuf:"bytes,1,opt,name=time,proto3,stdtime" json:"time" xml:"time"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name" xml:"name"` - Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address" xml:"address"` -} - -func (m *ObservedDevice) Reset() { *m = ObservedDevice{} } -func (m *ObservedDevice) String() string { return proto.CompactTextString(m) } -func (*ObservedDevice) ProtoMessage() {} -func (*ObservedDevice) Descriptor() ([]byte, []int) { - return fileDescriptor_5465d80e8cba02e3, []int{10} -} -func (m *ObservedDevice) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ObservedDevice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ObservedDevice.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ObservedDevice) XXX_Merge(src proto.Message) { - xxx_messageInfo_ObservedDevice.Merge(m, src) -} -func (m *ObservedDevice) XXX_Size() int { - return m.ProtoSize() -} -func (m *ObservedDevice) XXX_DiscardUnknown() { - xxx_messageInfo_ObservedDevice.DiscardUnknown(m) -} - -var xxx_messageInfo_ObservedDevice proto.InternalMessageInfo - -func init() { - proto.RegisterType((*FileVersion)(nil), "db.FileVersion") - proto.RegisterType((*VersionList)(nil), "db.VersionList") - proto.RegisterType((*FileInfoTruncated)(nil), "db.FileInfoTruncated") - proto.RegisterType((*BlockList)(nil), "db.BlockList") - proto.RegisterType((*IndirectionHashesOnly)(nil), "db.IndirectionHashesOnly") - proto.RegisterType((*Counts)(nil), "db.Counts") - proto.RegisterType((*CountsSet)(nil), "db.CountsSet") - proto.RegisterType((*FileVersionDeprecated)(nil), "db.FileVersionDeprecated") - proto.RegisterType((*VersionListDeprecated)(nil), "db.VersionListDeprecated") - proto.RegisterType((*ObservedFolder)(nil), "db.ObservedFolder") - proto.RegisterType((*ObservedDevice)(nil), "db.ObservedDevice") -} - -func init() { proto.RegisterFile("lib/db/structs.proto", fileDescriptor_5465d80e8cba02e3) } - -var fileDescriptor_5465d80e8cba02e3 = []byte{ - // 1543 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x6f, 0xdb, 0x46, - 0x16, 0x37, 0x2d, 0xd9, 0x92, 0x46, 0xf2, 0x17, 0xb3, 0x36, 0xb4, 0xde, 0x5d, 0x51, 0x3b, 0x71, - 0x00, 0xed, 0x07, 0x64, 0xc0, 0x41, 0x8c, 0x45, 0x80, 0x6d, 0x10, 0xc6, 0x75, 0xe2, 0x20, 0x75, - 0xd2, 0x71, 0x90, 0x14, 0xed, 0x41, 0xe0, 0xc7, 0x58, 0x26, 0x42, 0x91, 0x2a, 0x49, 0xdb, 0x51, - 0x6e, 0xbd, 0x14, 0xe8, 0x2d, 0x08, 0x7a, 0x28, 0x8a, 0xa2, 0x08, 0x50, 0xa0, 0x7f, 0x42, 0xff, - 0x82, 0xa2, 0xc8, 0xd1, 0xc7, 0xa2, 0x07, 0x16, 0xb1, 0x2f, 0xad, 0x8e, 0x3a, 0xf6, 0x54, 0xcc, - 0x9b, 0xe1, 0x70, 0x64, 0x23, 0x45, 0x92, 0xfa, 0xc6, 0xf7, 0x7b, 0xbf, 0x79, 0x12, 0xdf, 0xfc, - 0xde, 0x07, 0xd1, 0x5f, 0x7c, 0xcf, 0x5e, 0x75, 0xed, 0xd5, 0x38, 0x89, 0xf6, 0x9d, 0x24, 0x6e, - 0xf7, 0xa3, 0x30, 0x09, 0xf5, 0x49, 0xd7, 0x5e, 0xbe, 0x18, 0xd1, 0x7e, 0x18, 0xaf, 0x02, 0x60, - 0xef, 0xef, 0xae, 0x76, 0xc3, 0x6e, 0x08, 0x06, 0x3c, 0x71, 0xe2, 0xb2, 0xd1, 0x0d, 0xc3, 0xae, - 0x4f, 0x73, 0x56, 0xe2, 0xf5, 0x68, 0x9c, 0x58, 0xbd, 0xbe, 0x20, 0x2c, 0xb1, 0xf8, 0xf0, 0xe8, - 0x84, 0xfe, 0xaa, 0x4d, 0x33, 0xbc, 0x42, 0x1f, 0x27, 0xfc, 0x11, 0x7f, 0x3d, 0x89, 0xaa, 0x9b, - 0x9e, 0x4f, 0x1f, 0xd0, 0x28, 0xf6, 0xc2, 0x40, 0xbf, 0x83, 0x4a, 0x07, 0xfc, 0xb1, 0xae, 0x35, - 0xb5, 0x56, 0x75, 0x6d, 0xbe, 0x9d, 0x05, 0x68, 0x3f, 0xa0, 0x4e, 0x12, 0x46, 0x66, 0xf3, 0x45, - 0x6a, 0x4c, 0x0c, 0x53, 0x23, 0x23, 0x8e, 0x52, 0x63, 0xe6, 0x71, 0xcf, 0xbf, 0x8a, 0x85, 0x8d, - 0x49, 0xe6, 0xd1, 0xd7, 0x51, 0xc9, 0xa5, 0x3e, 0x4d, 0xa8, 0x5b, 0x9f, 0x6c, 0x6a, 0xad, 0xb2, - 0xf9, 0x77, 0x76, 0x4e, 0x40, 0xf2, 0x9c, 0xb0, 0x31, 0xc9, 0x3c, 0xfa, 0x15, 0x76, 0xee, 0xc0, - 0x73, 0x68, 0x5c, 0x2f, 0x34, 0x0b, 0xad, 0x9a, 0xf9, 0x37, 0x7e, 0x0e, 0xa0, 0x51, 0x6a, 0xd4, - 0xc4, 0x39, 0x66, 0xc3, 0x31, 0x70, 0xe8, 0x04, 0xcd, 0x79, 0xc1, 0x81, 0xe5, 0x7b, 0x6e, 0x27, - 0x3b, 0x5e, 0x84, 0xe3, 0xff, 0x1a, 0xa6, 0xc6, 0xac, 0x70, 0x6d, 0xc8, 0x28, 0x17, 0x20, 0xca, - 0x18, 0x8c, 0xc9, 0x29, 0x1a, 0xfe, 0x44, 0x43, 0x55, 0x91, 0x9c, 0x3b, 0x5e, 0x9c, 0xe8, 0x3e, - 0x2a, 0x8b, 0xb7, 0x8b, 0xeb, 0x5a, 0xb3, 0xd0, 0xaa, 0xae, 0xcd, 0xb5, 0x5d, 0xbb, 0xad, 0xe4, - 0xd0, 0xbc, 0xc6, 0x12, 0x74, 0x9c, 0x1a, 0x55, 0x62, 0x1d, 0x0a, 0x2c, 0x1e, 0xa6, 0x86, 0x3c, - 0x77, 0x26, 0x61, 0xcf, 0x8e, 0x56, 0x54, 0x2e, 0x91, 0xcc, 0xab, 0xc5, 0x2f, 0x9e, 0x1b, 0x13, - 0xf8, 0x9b, 0x1a, 0x5a, 0x60, 0x3f, 0xb0, 0x15, 0xec, 0x86, 0xf7, 0xa3, 0xfd, 0xc0, 0xb1, 0x58, - 0x92, 0xfe, 0x8d, 0x8a, 0x81, 0xd5, 0xa3, 0x70, 0x4f, 0x15, 0x73, 0x69, 0x98, 0x1a, 0x60, 0x8f, - 0x52, 0x03, 0x41, 0x74, 0x66, 0x60, 0x02, 0x18, 0xe3, 0xc6, 0xde, 0x13, 0x5a, 0x2f, 0x34, 0xb5, - 0x56, 0x81, 0x73, 0x99, 0x2d, 0xb9, 0xcc, 0xc0, 0x04, 0x30, 0xfd, 0x1a, 0x42, 0xbd, 0xd0, 0xf5, - 0x76, 0x3d, 0xea, 0x76, 0xe2, 0xfa, 0x14, 0x9c, 0x68, 0x0e, 0x53, 0xa3, 0x92, 0xa1, 0x3b, 0xa3, - 0xd4, 0x98, 0x83, 0x63, 0x12, 0xc1, 0x24, 0xf7, 0xea, 0xdf, 0x69, 0xa8, 0x2a, 0x23, 0xd8, 0x83, - 0x7a, 0xad, 0xa9, 0xb5, 0x8a, 0xe6, 0xe7, 0x1a, 0x4b, 0xcb, 0x4f, 0xa9, 0x71, 0xb9, 0xeb, 0x25, - 0x7b, 0xfb, 0x76, 0xdb, 0x09, 0x7b, 0xab, 0xf1, 0x20, 0x70, 0x92, 0x3d, 0x2f, 0xe8, 0x2a, 0x4f, - 0xaa, 0x68, 0xdb, 0x3b, 0x7b, 0x61, 0x94, 0x6c, 0x6d, 0x0c, 0x53, 0x43, 0xfe, 0x29, 0x73, 0x30, - 0x4a, 0x8d, 0xf9, 0xb1, 0xdf, 0x37, 0x07, 0xf8, 0xcb, 0xa3, 0x95, 0xb7, 0x09, 0x4c, 0x94, 0xb0, - 0xaa, 0xf8, 0x2b, 0x7f, 0x5e, 0xfc, 0x57, 0x51, 0x39, 0xa6, 0x1f, 0xef, 0xd3, 0xc0, 0xa1, 0x75, - 0x04, 0x59, 0x6c, 0x30, 0x15, 0x64, 0xd8, 0x28, 0x35, 0x66, 0x79, 0xee, 0x05, 0x80, 0x89, 0xf4, - 0xe9, 0x77, 0xd1, 0x6c, 0x3c, 0xe8, 0xf9, 0x5e, 0xf0, 0xa8, 0x93, 0x58, 0x51, 0x97, 0x26, 0xf5, - 0x05, 0xb8, 0xe5, 0xd6, 0x30, 0x35, 0x66, 0x84, 0xe7, 0x3e, 0x38, 0xa4, 0x8e, 0xc7, 0x50, 0x4c, - 0xc6, 0x59, 0xfa, 0x0d, 0x54, 0xb5, 0xfd, 0xd0, 0x79, 0x14, 0x77, 0xf6, 0xac, 0x78, 0xaf, 0xae, - 0x37, 0xb5, 0x56, 0xcd, 0xc4, 0x2c, 0xad, 0x1c, 0xbe, 0x65, 0xc5, 0x7b, 0x32, 0xad, 0x39, 0x84, - 0x89, 0xe2, 0xd7, 0xdf, 0x41, 0x15, 0x1a, 0x38, 0xd1, 0xa0, 0xcf, 0x0a, 0xfa, 0x02, 0x84, 0x00, - 0x61, 0x48, 0x50, 0x0a, 0x43, 0x22, 0x98, 0xe4, 0x5e, 0xdd, 0x44, 0xc5, 0x64, 0xd0, 0xa7, 0xd0, - 0x0b, 0x66, 0xd7, 0x96, 0xf2, 0xe4, 0x4a, 0x71, 0x0f, 0xfa, 0x94, 0xab, 0x93, 0xf1, 0xa4, 0x3a, - 0x99, 0x81, 0x09, 0x60, 0xfa, 0x26, 0xaa, 0xf6, 0x69, 0xd4, 0xf3, 0x62, 0x5e, 0x82, 0xc5, 0xa6, - 0xd6, 0x9a, 0x31, 0x57, 0x86, 0xa9, 0xa1, 0xc2, 0xa3, 0xd4, 0x58, 0x80, 0x93, 0x0a, 0x86, 0x89, - 0xca, 0xd0, 0x6f, 0x2b, 0x1a, 0x0d, 0xe2, 0x7a, 0xb5, 0xa9, 0xb5, 0xa6, 0xa0, 0x4f, 0x48, 0x41, - 0x6c, 0xc7, 0x67, 0x74, 0xb6, 0x1d, 0xe3, 0xdf, 0x52, 0xa3, 0xe0, 0x05, 0x09, 0x51, 0x68, 0xfa, - 0x2e, 0xe2, 0x59, 0xea, 0x40, 0x8d, 0xcd, 0x40, 0xa8, 0x9b, 0xc7, 0xa9, 0x51, 0x23, 0xd6, 0xa1, - 0xc9, 0x1c, 0x3b, 0xde, 0x13, 0xca, 0x12, 0x65, 0x67, 0x86, 0x4c, 0x94, 0x44, 0xb2, 0xc0, 0xcf, - 0x8e, 0x56, 0xc6, 0x8e, 0x91, 0xfc, 0x90, 0xfe, 0x00, 0x95, 0xfb, 0xbe, 0x95, 0xec, 0x86, 0x51, - 0xaf, 0x3e, 0x0b, 0x02, 0x55, 0x72, 0x78, 0x4f, 0x78, 0x36, 0xac, 0xc4, 0x32, 0xb1, 0x90, 0xa9, - 0xe4, 0x4b, 0xb5, 0x65, 0x00, 0x26, 0xd2, 0xa7, 0x6f, 0xa0, 0xaa, 0x1f, 0x3a, 0x96, 0xdf, 0xd9, - 0xf5, 0xad, 0x6e, 0x5c, 0xff, 0xa5, 0x04, 0x49, 0x05, 0x75, 0x00, 0xbe, 0xc9, 0x60, 0x99, 0x8c, - 0x1c, 0xc2, 0x44, 0xf1, 0xeb, 0xb7, 0x50, 0x4d, 0x48, 0x9f, 0x6b, 0xec, 0xd7, 0x12, 0x28, 0x04, - 0xee, 0x46, 0x38, 0x84, 0xca, 0x16, 0xd4, 0x8a, 0xe1, 0x32, 0x53, 0x19, 0xfa, 0xfb, 0xac, 0x8f, - 0x87, 0x2e, 0xed, 0x38, 0x7b, 0x56, 0xd0, 0xa5, 0xec, 0x7e, 0x86, 0x25, 0xa8, 0x20, 0xd0, 0x3f, - 0xf8, 0x6e, 0x80, 0x6b, 0x5b, 0xed, 0xe3, 0x0a, 0x8a, 0xc9, 0x38, 0x4b, 0x9d, 0x44, 0xd3, 0x6f, - 0x32, 0x89, 0x08, 0x2a, 0x89, 0x81, 0x50, 0x2f, 0xc1, 0xb9, 0xff, 0x1d, 0xa7, 0x06, 0x22, 0xd6, - 0xe1, 0x16, 0x47, 0x59, 0x14, 0x41, 0x90, 0x51, 0x84, 0xcd, 0xda, 0xba, 0xc2, 0x24, 0x19, 0x8f, - 0x15, 0x77, 0x10, 0x76, 0x54, 0x15, 0x97, 0x21, 0x34, 0xbc, 0x5c, 0x10, 0xde, 0x1b, 0xd3, 0x31, - 0x7f, 0xb9, 0x31, 0x14, 0x93, 0x71, 0x96, 0x98, 0x12, 0x0f, 0x51, 0x05, 0x54, 0x03, 0x63, 0xea, - 0x36, 0x9a, 0xe6, 0x85, 0x2b, 0x86, 0xd4, 0x85, 0x5c, 0x28, 0x40, 0x62, 0xd5, 0x66, 0xfe, 0x43, - 0xa8, 0x44, 0x50, 0x47, 0xa9, 0x51, 0xcd, 0x45, 0x89, 0x89, 0x80, 0xf1, 0xb7, 0x1a, 0x5a, 0xdc, - 0x0a, 0x5c, 0x2f, 0xa2, 0x4e, 0x22, 0xae, 0x88, 0xc6, 0x77, 0x03, 0x7f, 0x70, 0x3e, 0x5d, 0xe5, - 0xdc, 0x74, 0x83, 0xbf, 0x2a, 0xa2, 0xe9, 0x1b, 0xe1, 0x7e, 0x90, 0xc4, 0xfa, 0x15, 0x34, 0xb5, - 0xeb, 0xf9, 0x34, 0x86, 0xe9, 0x38, 0x65, 0x1a, 0xc3, 0xd4, 0xe0, 0x80, 0x7c, 0x49, 0xb0, 0x64, - 0x39, 0x73, 0xa7, 0xfe, 0x1e, 0xaa, 0xf2, 0xf7, 0x0c, 0x23, 0x8f, 0xc6, 0xd0, 0xa8, 0xa6, 0xcc, - 0xff, 0xb0, 0x7f, 0xa2, 0xc0, 0xf2, 0x9f, 0x28, 0x98, 0x0c, 0xa4, 0x12, 0xf5, 0xeb, 0xa8, 0x2c, - 0xda, 0x70, 0x0c, 0xa3, 0x77, 0xca, 0xbc, 0x04, 0x23, 0x40, 0x60, 0xf9, 0x08, 0x10, 0x80, 0x8c, - 0x22, 0x29, 0xfa, 0xff, 0x73, 0xe1, 0x16, 0x21, 0xc2, 0xc5, 0x3f, 0x12, 0x6e, 0x76, 0x5e, 0xea, - 0xb7, 0x8d, 0xa6, 0xec, 0x41, 0x42, 0xb3, 0x39, 0x5e, 0x67, 0x79, 0x00, 0x20, 0xbf, 0x6c, 0x66, - 0x61, 0xc2, 0xd1, 0xb1, 0xa1, 0x35, 0xfd, 0x86, 0x43, 0x6b, 0x07, 0x55, 0xf8, 0xda, 0xd5, 0xf1, - 0x5c, 0x98, 0x57, 0x35, 0x73, 0xfd, 0x38, 0x35, 0xca, 0x7c, 0x95, 0x82, 0x21, 0x5e, 0xe6, 0x84, - 0x2d, 0x57, 0x06, 0xca, 0x00, 0x56, 0x2d, 0x92, 0x49, 0x24, 0x8f, 0x49, 0x4c, 0xed, 0x4d, 0xfa, - 0xdb, 0xb4, 0x26, 0x51, 0x20, 0x9f, 0x6a, 0xa8, 0xc2, 0xe5, 0xb1, 0x43, 0x13, 0xfd, 0x3a, 0x9a, - 0x76, 0xc0, 0x10, 0x15, 0x82, 0xd8, 0x1a, 0xc7, 0xdd, 0x79, 0x61, 0x70, 0x86, 0xcc, 0x15, 0x98, - 0x98, 0x08, 0x98, 0x35, 0x15, 0x27, 0xa2, 0x56, 0xb6, 0xde, 0x16, 0x78, 0x53, 0x11, 0x90, 0xbc, - 0x1b, 0x61, 0x63, 0x92, 0x79, 0xf0, 0x67, 0x93, 0x68, 0x51, 0x59, 0x18, 0x37, 0x68, 0x3f, 0xa2, - 0x7c, 0xa7, 0x3b, 0xdf, 0xf5, 0x7b, 0x0d, 0x4d, 0xf3, 0x3c, 0xc2, 0xdf, 0xab, 0x99, 0xcb, 0xec, - 0x95, 0x38, 0x72, 0x66, 0x89, 0x16, 0x38, 0x7b, 0xa7, 0xac, 0xe1, 0x15, 0xf2, 0x46, 0xf9, 0xaa, - 0x16, 0x97, 0x37, 0xb5, 0xf5, 0x71, 0x9d, 0xbe, 0x6e, 0x83, 0xc5, 0x87, 0x68, 0x51, 0x59, 0xaf, - 0x95, 0x54, 0x7c, 0x70, 0x66, 0xd1, 0xfe, 0xeb, 0xa9, 0x45, 0x3b, 0x27, 0x9b, 0xff, 0xcc, 0xe6, - 0xdd, 0x2b, 0x77, 0xec, 0x33, 0x4b, 0xf5, 0x0f, 0x93, 0x68, 0xf6, 0xae, 0x1d, 0xd3, 0xe8, 0x80, - 0xba, 0x9b, 0xa1, 0xef, 0xd2, 0x48, 0xdf, 0x46, 0x45, 0xf6, 0x09, 0x25, 0x52, 0xbf, 0xdc, 0xe6, - 0xdf, 0x57, 0xed, 0xec, 0xfb, 0xaa, 0x7d, 0x3f, 0xfb, 0xbe, 0x32, 0x1b, 0xe2, 0xf7, 0x80, 0x9f, - 0xef, 0x29, 0x5e, 0x8f, 0xe2, 0xa7, 0x3f, 0x1b, 0x1a, 0x01, 0x9c, 0x15, 0x9f, 0x6f, 0xd9, 0xd4, - 0x87, 0xf4, 0x57, 0x78, 0xf1, 0x01, 0x20, 0x05, 0x05, 0x16, 0x26, 0x1c, 0xd5, 0x3f, 0x42, 0x0b, - 0x11, 0x75, 0xa8, 0x77, 0x40, 0x3b, 0xf9, 0x9e, 0xc5, 0x6f, 0xa1, 0x3d, 0x4c, 0x8d, 0x79, 0xe1, - 0x7c, 0x57, 0x59, 0xb7, 0x96, 0x20, 0xcc, 0x69, 0x07, 0x26, 0x67, 0xb8, 0xfa, 0x43, 0x34, 0x1f, - 0xd1, 0x5e, 0x98, 0xa8, 0xb1, 0xf9, 0x4d, 0xfd, 0x77, 0x98, 0x1a, 0x73, 0xdc, 0xa7, 0x86, 0x5e, - 0x14, 0xa1, 0xc7, 0x70, 0x4c, 0x4e, 0x33, 0xf1, 0xf7, 0x5a, 0x9e, 0x48, 0x5e, 0xc0, 0xe7, 0x9e, - 0xc8, 0xec, 0x53, 0x67, 0xf2, 0x35, 0x3e, 0x75, 0xd6, 0x51, 0xc9, 0x72, 0xdd, 0x88, 0xc6, 0xbc, - 0xe5, 0x56, 0xb8, 0x10, 0x05, 0x24, 0x65, 0x21, 0x6c, 0x4c, 0x32, 0x8f, 0x79, 0xf3, 0xc5, 0xcb, - 0xc6, 0xc4, 0xd1, 0xcb, 0xc6, 0xc4, 0x8b, 0xe3, 0x86, 0x76, 0x74, 0xdc, 0xd0, 0x9e, 0x9e, 0x34, - 0x26, 0x9e, 0x9f, 0x34, 0xb4, 0xa3, 0x93, 0xc6, 0xc4, 0x8f, 0x27, 0x8d, 0x89, 0x0f, 0x2f, 0xbd, - 0xc6, 0xf7, 0x85, 0x6b, 0xdb, 0xd3, 0xf0, 0x9a, 0x97, 0x7f, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x52, - 0x5f, 0x14, 0xfe, 0xde, 0x0f, 0x00, 0x00, -} - -func (m *FileVersion) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FileVersion) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FileVersion) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.InvalidDevices) > 0 { - for iNdEx := len(m.InvalidDevices) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.InvalidDevices[iNdEx]) - copy(dAtA[i:], m.InvalidDevices[iNdEx]) - i = encodeVarintStructs(dAtA, i, uint64(len(m.InvalidDevices[iNdEx]))) - i-- - dAtA[i] = 0x22 - } - } - if len(m.Devices) > 0 { - for iNdEx := len(m.Devices) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Devices[iNdEx]) - copy(dAtA[i:], m.Devices[iNdEx]) - i = encodeVarintStructs(dAtA, i, uint64(len(m.Devices[iNdEx]))) - i-- - dAtA[i] = 0x1a - } - } - if m.Deleted { - i-- - if m.Deleted { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - { - size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStructs(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *VersionList) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *VersionList) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *VersionList) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.RawVersions) > 0 { - for iNdEx := len(m.RawVersions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.RawVersions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStructs(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *FileInfoTruncated) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FileInfoTruncated) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FileInfoTruncated) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.InodeChangeNs != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.InodeChangeNs)) - i-- - dAtA[i] = 0x3e - i-- - dAtA[i] = 0xd0 - } - if len(m.VersionHash) > 0 { - i -= len(m.VersionHash) - copy(dAtA[i:], m.VersionHash) - i = encodeVarintStructs(dAtA, i, uint64(len(m.VersionHash))) - i-- - dAtA[i] = 0x3e - i-- - dAtA[i] = 0xca - } - if m.LocalFlags != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.LocalFlags)) - i-- - dAtA[i] = 0x3e - i-- - dAtA[i] = 0xc0 - } - if len(m.Encrypted) > 0 { - i -= len(m.Encrypted) - copy(dAtA[i:], m.Encrypted) - i = encodeVarintStructs(dAtA, i, uint64(len(m.Encrypted))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x9a - } - if len(m.BlocksHash) > 0 { - i -= len(m.BlocksHash) - copy(dAtA[i:], m.BlocksHash) - i = encodeVarintStructs(dAtA, i, uint64(len(m.BlocksHash))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x92 - } - if len(m.SymlinkTarget) > 0 { - i -= len(m.SymlinkTarget) - copy(dAtA[i:], m.SymlinkTarget) - i = encodeVarintStructs(dAtA, i, uint64(len(m.SymlinkTarget))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x8a - } - { - size, err := m.Platform.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStructs(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x72 - if m.RawBlockSize != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.RawBlockSize)) - i-- - dAtA[i] = 0x68 - } - if m.ModifiedBy != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.ModifiedBy)) - i-- - dAtA[i] = 0x60 - } - if m.ModifiedNs != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.ModifiedNs)) - i-- - dAtA[i] = 0x58 - } - if m.Sequence != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Sequence)) - i-- - dAtA[i] = 0x50 - } - { - size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStructs(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - if m.NoPermissions { - i-- - if m.NoPermissions { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x40 - } - if m.RawInvalid { - i-- - if m.RawInvalid { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if m.Deleted { - i-- - if m.Deleted { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x30 - } - if m.ModifiedS != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.ModifiedS)) - i-- - dAtA[i] = 0x28 - } - if m.Permissions != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Permissions)) - i-- - dAtA[i] = 0x20 - } - if m.Size != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Size)) - i-- - dAtA[i] = 0x18 - } - if m.Type != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Type)) - i-- - dAtA[i] = 0x10 - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintStructs(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *BlockList) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *BlockList) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *BlockList) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Blocks) > 0 { - for iNdEx := len(m.Blocks) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Blocks[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStructs(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *IndirectionHashesOnly) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *IndirectionHashesOnly) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *IndirectionHashesOnly) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.VersionHash) > 0 { - i -= len(m.VersionHash) - copy(dAtA[i:], m.VersionHash) - i = encodeVarintStructs(dAtA, i, uint64(len(m.VersionHash))) - i-- - dAtA[i] = 0x3e - i-- - dAtA[i] = 0xca - } - if len(m.BlocksHash) > 0 { - i -= len(m.BlocksHash) - copy(dAtA[i:], m.BlocksHash) - i = encodeVarintStructs(dAtA, i, uint64(len(m.BlocksHash))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x92 - } - return len(dAtA) - i, nil -} - -func (m *Counts) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Counts) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Counts) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.LocalFlags != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.LocalFlags)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x90 - } - if len(m.DeviceID) > 0 { - i -= len(m.DeviceID) - copy(dAtA[i:], m.DeviceID) - i = encodeVarintStructs(dAtA, i, uint64(len(m.DeviceID))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x8a - } - if m.Sequence != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Sequence)) - i-- - dAtA[i] = 0x30 - } - if m.Bytes != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Bytes)) - i-- - dAtA[i] = 0x28 - } - if m.Deleted != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Deleted)) - i-- - dAtA[i] = 0x20 - } - if m.Symlinks != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Symlinks)) - i-- - dAtA[i] = 0x18 - } - if m.Directories != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Directories)) - i-- - dAtA[i] = 0x10 - } - if m.Files != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Files)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *CountsSet) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CountsSet) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CountsSet) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Created != 0 { - i = encodeVarintStructs(dAtA, i, uint64(m.Created)) - i-- - dAtA[i] = 0x10 - } - if len(m.Counts) > 0 { - for iNdEx := len(m.Counts) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Counts[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStructs(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *FileVersionDeprecated) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FileVersionDeprecated) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FileVersionDeprecated) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Deleted { - i-- - if m.Deleted { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x20 - } - if m.Invalid { - i-- - if m.Invalid { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x18 - } - if len(m.Device) > 0 { - i -= len(m.Device) - copy(dAtA[i:], m.Device) - i = encodeVarintStructs(dAtA, i, uint64(len(m.Device))) - i-- - dAtA[i] = 0x12 - } - { - size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStructs(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *VersionListDeprecated) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *VersionListDeprecated) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *VersionListDeprecated) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Versions) > 0 { - for iNdEx := len(m.Versions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Versions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStructs(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *ObservedFolder) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ObservedFolder) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ObservedFolder) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.RemoteEncrypted { - i-- - if m.RemoteEncrypted { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x20 - } - if m.ReceiveEncrypted { - i-- - if m.ReceiveEncrypted { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x18 - } - if len(m.Label) > 0 { - i -= len(m.Label) - copy(dAtA[i:], m.Label) - i = encodeVarintStructs(dAtA, i, uint64(len(m.Label))) - i-- - dAtA[i] = 0x12 - } - n5, err5 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err5 != nil { - return 0, err5 - } - i -= n5 - i = encodeVarintStructs(dAtA, i, uint64(n5)) - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *ObservedDevice) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ObservedDevice) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ObservedDevice) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintStructs(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0x1a - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintStructs(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0x12 - } - n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err6 != nil { - return 0, err6 - } - i -= n6 - i = encodeVarintStructs(dAtA, i, uint64(n6)) - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func encodeVarintStructs(dAtA []byte, offset int, v uint64) int { - offset -= sovStructs(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *FileVersion) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.Version.ProtoSize() - n += 1 + l + sovStructs(uint64(l)) - if m.Deleted { - n += 2 - } - if len(m.Devices) > 0 { - for _, b := range m.Devices { - l = len(b) - n += 1 + l + sovStructs(uint64(l)) - } - } - if len(m.InvalidDevices) > 0 { - for _, b := range m.InvalidDevices { - l = len(b) - n += 1 + l + sovStructs(uint64(l)) - } - } - return n -} - -func (m *VersionList) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.RawVersions) > 0 { - for _, e := range m.RawVersions { - l = e.ProtoSize() - n += 1 + l + sovStructs(uint64(l)) - } - } - return n -} - -func (m *FileInfoTruncated) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovStructs(uint64(l)) - } - if m.Type != 0 { - n += 1 + sovStructs(uint64(m.Type)) - } - if m.Size != 0 { - n += 1 + sovStructs(uint64(m.Size)) - } - if m.Permissions != 0 { - n += 1 + sovStructs(uint64(m.Permissions)) - } - if m.ModifiedS != 0 { - n += 1 + sovStructs(uint64(m.ModifiedS)) - } - if m.Deleted { - n += 2 - } - if m.RawInvalid { - n += 2 - } - if m.NoPermissions { - n += 2 - } - l = m.Version.ProtoSize() - n += 1 + l + sovStructs(uint64(l)) - if m.Sequence != 0 { - n += 1 + sovStructs(uint64(m.Sequence)) - } - if m.ModifiedNs != 0 { - n += 1 + sovStructs(uint64(m.ModifiedNs)) - } - if m.ModifiedBy != 0 { - n += 1 + sovStructs(uint64(m.ModifiedBy)) - } - if m.RawBlockSize != 0 { - n += 1 + sovStructs(uint64(m.RawBlockSize)) - } - l = m.Platform.ProtoSize() - n += 1 + l + sovStructs(uint64(l)) - l = len(m.SymlinkTarget) - if l > 0 { - n += 2 + l + sovStructs(uint64(l)) - } - l = len(m.BlocksHash) - if l > 0 { - n += 2 + l + sovStructs(uint64(l)) - } - l = len(m.Encrypted) - if l > 0 { - n += 2 + l + sovStructs(uint64(l)) - } - if m.LocalFlags != 0 { - n += 2 + sovStructs(uint64(m.LocalFlags)) - } - l = len(m.VersionHash) - if l > 0 { - n += 2 + l + sovStructs(uint64(l)) - } - if m.InodeChangeNs != 0 { - n += 2 + sovStructs(uint64(m.InodeChangeNs)) - } - return n -} - -func (m *BlockList) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Blocks) > 0 { - for _, e := range m.Blocks { - l = e.ProtoSize() - n += 1 + l + sovStructs(uint64(l)) - } - } - return n -} - -func (m *IndirectionHashesOnly) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.BlocksHash) - if l > 0 { - n += 2 + l + sovStructs(uint64(l)) - } - l = len(m.VersionHash) - if l > 0 { - n += 2 + l + sovStructs(uint64(l)) - } - return n -} - -func (m *Counts) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Files != 0 { - n += 1 + sovStructs(uint64(m.Files)) - } - if m.Directories != 0 { - n += 1 + sovStructs(uint64(m.Directories)) - } - if m.Symlinks != 0 { - n += 1 + sovStructs(uint64(m.Symlinks)) - } - if m.Deleted != 0 { - n += 1 + sovStructs(uint64(m.Deleted)) - } - if m.Bytes != 0 { - n += 1 + sovStructs(uint64(m.Bytes)) - } - if m.Sequence != 0 { - n += 1 + sovStructs(uint64(m.Sequence)) - } - l = len(m.DeviceID) - if l > 0 { - n += 2 + l + sovStructs(uint64(l)) - } - if m.LocalFlags != 0 { - n += 2 + sovStructs(uint64(m.LocalFlags)) - } - return n -} - -func (m *CountsSet) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Counts) > 0 { - for _, e := range m.Counts { - l = e.ProtoSize() - n += 1 + l + sovStructs(uint64(l)) - } - } - if m.Created != 0 { - n += 1 + sovStructs(uint64(m.Created)) - } - return n -} - -func (m *FileVersionDeprecated) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.Version.ProtoSize() - n += 1 + l + sovStructs(uint64(l)) - l = len(m.Device) - if l > 0 { - n += 1 + l + sovStructs(uint64(l)) - } - if m.Invalid { - n += 2 - } - if m.Deleted { - n += 2 - } - return n -} - -func (m *VersionListDeprecated) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Versions) > 0 { - for _, e := range m.Versions { - l = e.ProtoSize() - n += 1 + l + sovStructs(uint64(l)) - } - } - return n -} - -func (m *ObservedFolder) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) - n += 1 + l + sovStructs(uint64(l)) - l = len(m.Label) - if l > 0 { - n += 1 + l + sovStructs(uint64(l)) - } - if m.ReceiveEncrypted { - n += 2 - } - if m.RemoteEncrypted { - n += 2 - } - return n -} - -func (m *ObservedDevice) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) - n += 1 + l + sovStructs(uint64(l)) - l = len(m.Name) - if l > 0 { - n += 1 + l + sovStructs(uint64(l)) - } - l = len(m.Address) - if l > 0 { - n += 1 + l + sovStructs(uint64(l)) - } - return n -} - -func sovStructs(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozStructs(x uint64) (n int) { - return sovStructs(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *FileVersion) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FileVersion: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FileVersion: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Deleted", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Deleted = bool(v != 0) - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Devices", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Devices = append(m.Devices, make([]byte, postIndex-iNdEx)) - copy(m.Devices[len(m.Devices)-1], dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InvalidDevices", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.InvalidDevices = append(m.InvalidDevices, make([]byte, postIndex-iNdEx)) - copy(m.InvalidDevices[len(m.InvalidDevices)-1], dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *VersionList) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: VersionList: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: VersionList: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RawVersions", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RawVersions = append(m.RawVersions, FileVersion{}) - if err := m.RawVersions[len(m.RawVersions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *FileInfoTruncated) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FileInfoTruncated: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FileInfoTruncated: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) - } - m.Type = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Type |= protocol.FileInfoType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Size", wireType) - } - m.Size = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Size |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Permissions", wireType) - } - m.Permissions = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Permissions |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ModifiedS", wireType) - } - m.ModifiedS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ModifiedS |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Deleted", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Deleted = bool(v != 0) - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawInvalid", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.RawInvalid = bool(v != 0) - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NoPermissions", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.NoPermissions = bool(v != 0) - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Sequence", wireType) - } - m.Sequence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Sequence |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ModifiedNs", wireType) - } - m.ModifiedNs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ModifiedNs |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 12: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ModifiedBy", wireType) - } - m.ModifiedBy = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ModifiedBy |= github_com_syncthing_syncthing_lib_protocol.ShortID(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawBlockSize", wireType) - } - m.RawBlockSize = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RawBlockSize |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 14: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Platform", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Platform.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 17: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SymlinkTarget", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SymlinkTarget = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 18: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlocksHash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.BlocksHash = append(m.BlocksHash[:0], dAtA[iNdEx:postIndex]...) - if m.BlocksHash == nil { - m.BlocksHash = []byte{} - } - iNdEx = postIndex - case 19: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Encrypted", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Encrypted = append(m.Encrypted[:0], dAtA[iNdEx:postIndex]...) - if m.Encrypted == nil { - m.Encrypted = []byte{} - } - iNdEx = postIndex - case 1000: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LocalFlags", wireType) - } - m.LocalFlags = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LocalFlags |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 1001: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VersionHash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.VersionHash = append(m.VersionHash[:0], dAtA[iNdEx:postIndex]...) - if m.VersionHash == nil { - m.VersionHash = []byte{} - } - iNdEx = postIndex - case 1002: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InodeChangeNs", wireType) - } - m.InodeChangeNs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.InodeChangeNs |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *BlockList) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: BlockList: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: BlockList: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Blocks", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Blocks = append(m.Blocks, protocol.BlockInfo{}) - if err := m.Blocks[len(m.Blocks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *IndirectionHashesOnly) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: IndirectionHashesOnly: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: IndirectionHashesOnly: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 18: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlocksHash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.BlocksHash = append(m.BlocksHash[:0], dAtA[iNdEx:postIndex]...) - if m.BlocksHash == nil { - m.BlocksHash = []byte{} - } - iNdEx = postIndex - case 1001: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VersionHash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.VersionHash = append(m.VersionHash[:0], dAtA[iNdEx:postIndex]...) - if m.VersionHash == nil { - m.VersionHash = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Counts) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Counts: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Counts: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Files", wireType) - } - m.Files = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Files |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Directories", wireType) - } - m.Directories = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Directories |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Symlinks", wireType) - } - m.Symlinks = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Symlinks |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Deleted", wireType) - } - m.Deleted = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Deleted |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Bytes", wireType) - } - m.Bytes = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Bytes |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Sequence", wireType) - } - m.Sequence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Sequence |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 17: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeviceID", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DeviceID = append(m.DeviceID[:0], dAtA[iNdEx:postIndex]...) - if m.DeviceID == nil { - m.DeviceID = []byte{} - } - iNdEx = postIndex - case 18: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LocalFlags", wireType) - } - m.LocalFlags = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LocalFlags |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *CountsSet) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CountsSet: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CountsSet: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Counts", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Counts = append(m.Counts, Counts{}) - if err := m.Counts[len(m.Counts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Created", wireType) - } - m.Created = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Created |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *FileVersionDeprecated) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FileVersionDeprecated: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FileVersionDeprecated: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Device", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Device = append(m.Device[:0], dAtA[iNdEx:postIndex]...) - if m.Device == nil { - m.Device = []byte{} - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Invalid", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Invalid = bool(v != 0) - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Deleted", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Deleted = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *VersionListDeprecated) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: VersionListDeprecated: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: VersionListDeprecated: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Versions", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Versions = append(m.Versions, FileVersionDeprecated{}) - if err := m.Versions[len(m.Versions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ObservedFolder) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ObservedFolder: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ObservedFolder: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Label", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Label = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ReceiveEncrypted", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.ReceiveEncrypted = bool(v != 0) - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RemoteEncrypted", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.RemoteEncrypted = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ObservedDevice) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ObservedDevice: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ObservedDevice: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStructs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStructs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStructs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipStructs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStructs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipStructs(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowStructs - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowStructs - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowStructs - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthStructs - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupStructs - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthStructs - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthStructs = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowStructs = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupStructs = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/db/testdata/.gitignore b/lib/db/testdata/.gitignore deleted file mode 100644 index 07a7b4e19d3..00000000000 --- a/lib/db/testdata/.gitignore +++ /dev/null @@ -1 +0,0 @@ -index.db diff --git a/lib/db/testdata/v0.14.45-update0to3.db.jsons b/lib/db/testdata/v0.14.45-update0to3.db.jsons deleted file mode 100644 index 87ef52417a1..00000000000 --- a/lib/db/testdata/v0.14.45-update0to3.db.jsons +++ /dev/null @@ -1,22 +0,0 @@ -{"k":"AAAAAAAAAAABL25vdGdvb2Q=","v":"Cggvbm90Z29vZEoHCgUIARDoB1ACggEiGiAAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHw=="} -{"k":"AAAAAAAAAAABYQ==","v":"CgFhSgcKBQgBEOgHUAGCASIaIAABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4f"} -{"k":"AAAAAAAAAAACYg==","v":"CgFiSgcKBQgBEOkHggEiGiAAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eH4IBJBABGiABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fIA=="} -{"k":"AAAAAAAAAAACYw==","v":"CgFjOAFKBwoFCAEQ6geCASIaIAABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fggEkEAEaIAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gggEkEAIaIAIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhggEkEAMaIAMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiggEkEAQaIAQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIj"} -{"k":"AAAAAAAAAAACZA==","v":"CgFkSgcKBQgBEOsHggEiGiAAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eH4IBJBABGiABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fIIIBJBACGiACAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gIYIBJBADGiADBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIoIBJBAEGiAEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiI4IBJBAFGiAFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJIIBJBAGGiAGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJQ=="} -{"k":"AAAAAAAAAAADYw==","v":"CgFjSgcKBQgBEOoHggEiGiAAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eH4IBJBABGiABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fIIIBJBACGiACAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gIYIBJBADGiADBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIoIBJBAEGiAEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiI4IBJBAFGiAFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJIIBJBAGGiAGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJQ=="} -{"k":"AAAAAAAAAAADZA==","v":"CgFkOAFKBwoFCAEQ6weCASIaIAABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fggEkEAEaIAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gggEkEAIaIAIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhggEkEAMaIAMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiggEkEAQaIAQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIj"} -{"k":"AAAAAAAAAAADaW52YWxpZA==","v":"CgdpbnZhbGlkOAFKBwoFCAEQ7AeCASIaIAABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fggEkEAEaIAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gggEkEAIaIAIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhggEkEAMaIAMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiggEkEAQaIAQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIj"} -{"k":"AQAAAAAvbm90Z29vZA==","v":"CisKBwoFCAEQ6AcSIP//////////////////////////////////////////"} -{"k":"AQAAAABh","v":"CisKBwoFCAEQ6AcSIP//////////////////////////////////////////"} -{"k":"AQAAAABi","v":"CisKBwoFCAEQ6QcSIAIj5b8/Vx850vCTKUE+HcWcQZUIgmhv//rEL3j3A/At"} -{"k":"AQAAAABj","v":"CisKBwoFCAEQ6gcSIEeUA//e9Ja19eW8nAoVIh5wBzFkUJ+jB2GvYwlPb5RcCi0KBwoFCAEQ6gcSIAIj5b8/Vx850vCTKUE+HcWcQZUIgmhv//rEL3j3A/AtGAE="} -{"k":"AQAAAABk","v":"CisKBwoFCAEQ6wcSIAIj5b8/Vx850vCTKUE+HcWcQZUIgmhv//rEL3j3A/AtCi0KBwoFCAEQ6wcSIEeUA//e9Ja19eW8nAoVIh5wBzFkUJ+jB2GvYwlPb5RcGAE="} -{"k":"AQAAAABpbnZhbGlk","v":"Ci0KBwoFCAEQ7AcSIEeUA//e9Ja19eW8nAoVIh5wBzFkUJ+jB2GvYwlPb5RcGAE="} -{"k":"AgAAAAAAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHy9ub3Rnb29k","v":"AAAAAA=="} -{"k":"AgAAAAAAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eH2E=","v":"AAAAAA=="} -{"k":"BgAAAAAAAAAA","v":"VXBkYXRlU2NoZW1hMHRvMw=="} -{"k":"BwAAAAAAAAAA","v":""} -{"k":"BwAAAAEAAAAA","v":"//////////////////////////////////////////8="} -{"k":"BwAAAAIAAAAA","v":"AiPlvz9XHznS8JMpQT4dxZxBlQiCaG//+sQvePcD8C0="} -{"k":"BwAAAAMAAAAA","v":"R5QD/970lrX15bycChUiHnAHMWRQn6MHYa9jCU9vlFw="} -{"k":"CQAAAAA=","v":"CicIAjACigEg//////////////////////////////////////////8KJwgFMAKKASD4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+AolCAKKASACI+W/P1cfOdLwkylBPh3FnEGVCIJob//6xC949wPwLQolCAGKASBHlAP/3vSWtfXlvJwKFSIecAcxZFCfowdhr2MJT2+UXBCyn6iaw4HGlxU="} diff --git a/lib/db/testdata/v0.14.48-ignoredfiles.db.jsons b/lib/db/testdata/v0.14.48-ignoredfiles.db.jsons deleted file mode 100644 index 0b335e34a33..00000000000 --- a/lib/db/testdata/v0.14.48-ignoredfiles.db.jsons +++ /dev/null @@ -1,15 +0,0 @@ -{"k":"AAAAAAAAAAABYmFy","v":"CgNiYXJKBwoFCAEQ6QdQAg=="} -{"k":"AAAAAAAAAAABZm9v","v":"CgNmb284AUoHCgUIARDoB1AB"} -{"k":"AAAAAAAAAAACYmF6","v":"CgNiYXo4AUoHCgUIKhDoBw=="} -{"k":"AAAAAAAAAAACcXV1eA==","v":"CgRxdXV4SgcKBQgqEOoH"} -{"k":"AQAAAABiYXI=","v":"CisKBwoFCAEQ6QcSIP//////////////////////////////////////////"} -{"k":"AQAAAABiYXo=","v":"Ci0KBwoFCCoQ6AcSICoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAE="} -{"k":"AQAAAABmb28=","v":"Ci0KBwoFCAEQ6AcSIP//////////////////////////////////////////GAE="} -{"k":"AQAAAABxdXV4","v":"CisKBwoFCCoQ6gcSICoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"} -{"k":"BgAAAAAAAAAA","v":"dGVzdA=="} -{"k":"BwAAAAAAAAAA","v":""} -{"k":"BwAAAAEAAAAA","v":"//////////////////////////////////////////8="} -{"k":"BwAAAAIAAAAA","v":"KgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="} -{"k":"CQAAAAA=","v":"CicIATACigEg//////////////////////////////////////////8KJwgCMAKKASD4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+AolCAGKASAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABCoudnCuM+vlxU="} -{"k":"CwAAAAAAAAAAAAAAAQ==","v":"AAAAAAAAAAABZm9v"} -{"k":"CwAAAAAAAAAAAAAAAg==","v":"AAAAAAAAAAABYmFy"} diff --git a/lib/db/testdata/v1.4.0-updateTo10.json b/lib/db/testdata/v1.4.0-updateTo10.json deleted file mode 100644 index 68bd96c86ff..00000000000 --- a/lib/db/testdata/v1.4.0-updateTo10.json +++ /dev/null @@ -1,24 +0,0 @@ -{"k":"AAAAAAAAAAABYQ==","v":"CgFhMAFKBwoFCAEQ6AdQAQ=="} -{"k":"AAAAAAAAAAABYg==","v":"CgFiSgcKBQgBEOgHUAKCASIaIAABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fggEkEAEaIAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gkgEgC8XkepY1E4woWwAAyi81YItXr5CMuwY6mfvf2iLupTo="} -{"k":"AAAAAAAAAAABYw==","v":"CgFjMAFKBwoFCAEQ6AdQAw=="} -{"k":"AAAAAAAAAAACYQ==","v":"CgFhMAFKBwoFCAEQ6AdQAQ=="} -{"k":"AAAAAAAAAAACYg==","v":"CgFiMAFKFQoFCAEQ6AcKDAi5vtz687f5kQIQAVACggEiGiAAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eH4IBJBABGiABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fIJIBIAvF5HqWNROMKFsAAMovNWCLV6+QjLsGOpn739oi7qU6"} -{"k":"AAAAAAAAAAACYw==","v":"CgFjShUKBQgBEOgHCgwIub7c+vO3+ZECEAFQA4IBIhogAAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh+SASBjDc0pZsQzZpESVEi7sltP9BKknHMtssirwbhYG9cQ3Q=="} -{"k":"AQAAAABh","v":"CisKBwoFCAEQ6AcSIAIj5b8/Vx850vCTKUE+HcWcQZUIgmhv//rEL3j3A/AtCisKBwoFCAEQ6AcSIP//////////////////////////////////////////"} -{"k":"AQAAAABi","v":"CjkKFQoFCAEQ6AcKDAi5vtz687f5kQIQARIgAiPlvz9XHznS8JMpQT4dxZxBlQiCaG//+sQvePcD8C0KKwoHCgUIARDoBxIg//////////////////////////////////////////8="} -{"k":"AQAAAABj","v":"CjkKFQoFCAEQ6AcKDAi5vtz687f5kQIQARIgAiPlvz9XHznS8JMpQT4dxZxBlQiCaG//+sQvePcD8C0KKwoHCgUIARDoBxIg//////////////////////////////////////////8="} -{"k":"AgAAAAAAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eH2I=","v":"AAAAAA=="} -{"k":"AgAAAAABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fIGI=","v":"AAAAAQ=="} -{"k":"BgAAAAAAAAAA","v":"dGVzdA=="} -{"k":"BwAAAAAAAAAA","v":""} -{"k":"BwAAAAEAAAAA","v":"//////////////////////////////////////////8="} -{"k":"BwAAAAIAAAAA","v":"AiPlvz9XHznS8JMpQT4dxZxBlQiCaG//+sQvePcD8C0="} -{"k":"CQAAAAA=","v":"CikIASACMAOKASD//////////////////////////////////////////wonCAEgAooBIPj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4CikIASACMAOKASACI+W/P1cfOdLwkylBPh3FnEGVCIJob//6xC949wPwLRDE7Jrik+mdhhY="} -{"k":"CmRiTWluU3luY3RoaW5nVmVyc2lvbg==","v":"djEuNC4w"} -{"k":"CmRiVmVyc2lvbg==","v":"AAAAAAAAAAk="} -{"k":"Cmxhc3RJbmRpcmVjdEdDVGltZQ==","v":"AAAAAF6yy/Q="} -{"k":"CwAAAAAAAAAAAAAAAQ==","v":"AAAAAAAAAAABYQ=="} -{"k":"CwAAAAAAAAAAAAAAAg==","v":"AAAAAAAAAAABYg=="} -{"k":"CwAAAAAAAAAAAAAAAw==","v":"AAAAAAAAAAABYw=="} -{"k":"DAAAAABi","v":""} -{"k":"DAAAAABj","v":""} diff --git a/lib/db/transactions.go b/lib/db/transactions.go index 5919cb44e60..9efeff21efb 100644 --- a/lib/db/transactions.go +++ b/lib/db/transactions.go @@ -11,10 +11,15 @@ import ( "errors" "fmt" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" + "github.com/syncthing/syncthing/internal/gen/dbproto" "github.com/syncthing/syncthing/lib/db/backend" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/osutil" "github.com/syncthing/syncthing/lib/protocol" + "github.com/syncthing/syncthing/lib/sliceutil" ) var ( @@ -63,48 +68,49 @@ func (t readOnlyTransaction) getFileByKey(key []byte) (protocol.FileInfo, bool, if err != nil || !ok { return protocol.FileInfo{}, false, err } - return f.(protocol.FileInfo), true, nil + return f, true, nil } -func (t readOnlyTransaction) getFileTrunc(key []byte, trunc bool) (protocol.FileIntf, bool, error) { +func (t readOnlyTransaction) getFileTrunc(key []byte, trunc bool) (protocol.FileInfo, bool, error) { bs, err := t.Get(key) if backend.IsNotFound(err) { - return nil, false, nil + return protocol.FileInfo{}, false, nil } if err != nil { - return nil, false, err + return protocol.FileInfo{}, false, err } f, err := t.unmarshalTrunc(bs, trunc) if backend.IsNotFound(err) { - return nil, false, nil + return protocol.FileInfo{}, false, nil } if err != nil { - return nil, false, err + return protocol.FileInfo{}, false, err } return f, true, nil } -func (t readOnlyTransaction) unmarshalTrunc(bs []byte, trunc bool) (protocol.FileIntf, error) { +func (t readOnlyTransaction) unmarshalTrunc(bs []byte, trunc bool) (protocol.FileInfo, error) { if trunc { - var tf FileInfoTruncated - err := tf.Unmarshal(bs) + var bfi dbproto.FileInfoTruncated + err := proto.Unmarshal(bs, &bfi) if err != nil { - return nil, err + return protocol.FileInfo{}, err } - if err := t.fillTruncated(&tf); err != nil { - return nil, err + if err := t.fillTruncated(&bfi); err != nil { + return protocol.FileInfo{}, err } - return tf, nil + return protocol.FileInfoFromDBTruncated(&bfi), nil } - var fi protocol.FileInfo - if err := fi.Unmarshal(bs); err != nil { - return nil, err + var bfi bep.FileInfo + err := proto.Unmarshal(bs, &bfi) + if err != nil { + return protocol.FileInfo{}, err } - if err := t.fillFileInfo(&fi); err != nil { - return nil, err + if err := t.fillFileInfo(&bfi); err != nil { + return protocol.FileInfo{}, err } - return fi, nil + return protocol.FileInfoFromDB(&bfi), nil } type blocksIndirectionError struct { @@ -121,7 +127,7 @@ func (e *blocksIndirectionError) Unwrap() error { // fillFileInfo follows the (possible) indirection of blocks and version // vector and fills it out. -func (t readOnlyTransaction) fillFileInfo(fi *protocol.FileInfo) error { +func (t readOnlyTransaction) fillFileInfo(fi *bep.FileInfo) error { var key []byte if len(fi.Blocks) == 0 && len(fi.BlocksHash) != 0 { @@ -131,8 +137,8 @@ func (t readOnlyTransaction) fillFileInfo(fi *protocol.FileInfo) error { if err != nil { return &blocksIndirectionError{err} } - var bl BlockList - if err := bl.Unmarshal(bs); err != nil { + var bl dbproto.BlockList + if err := proto.Unmarshal(bs, &bl); err != nil { return err } fi.Blocks = bl.Blocks @@ -144,11 +150,11 @@ func (t readOnlyTransaction) fillFileInfo(fi *protocol.FileInfo) error { if err != nil { return fmt.Errorf("filling Version: %w", err) } - var v protocol.Vector - if err := v.Unmarshal(bs); err != nil { + var v bep.Vector + if err := proto.Unmarshal(bs, &v); err != nil { return err } - fi.Version = v + fi.Version = &v } return nil @@ -156,7 +162,7 @@ func (t readOnlyTransaction) fillFileInfo(fi *protocol.FileInfo) error { // fillTruncated follows the (possible) indirection of version vector and // fills it. -func (t readOnlyTransaction) fillTruncated(fi *FileInfoTruncated) error { +func (t readOnlyTransaction) fillTruncated(fi *dbproto.FileInfoTruncated) error { var key []byte if len(fi.VersionHash) == 0 { @@ -168,73 +174,72 @@ func (t readOnlyTransaction) fillTruncated(fi *FileInfoTruncated) error { if err != nil { return err } - var v protocol.Vector - if err := v.Unmarshal(bs); err != nil { + var v bep.Vector + if err := proto.Unmarshal(bs, &v); err != nil { return err } - fi.Version = v + fi.Version = &v return nil } -func (t readOnlyTransaction) getGlobalVersions(keyBuf, folder, file []byte) (VersionList, error) { +func (t readOnlyTransaction) getGlobalVersions(keyBuf, folder, file []byte) (*dbproto.VersionList, error) { var err error keyBuf, err = t.keyer.GenerateGlobalVersionKey(keyBuf, folder, file) if err != nil { - return VersionList{}, err + return nil, err } return t.getGlobalVersionsByKey(keyBuf) } -func (t readOnlyTransaction) getGlobalVersionsByKey(key []byte) (VersionList, error) { +func (t readOnlyTransaction) getGlobalVersionsByKey(key []byte) (*dbproto.VersionList, error) { bs, err := t.Get(key) if err != nil { - return VersionList{}, err + return nil, err } - var vl VersionList - if err := vl.Unmarshal(bs); err != nil { - return VersionList{}, err + var vl dbproto.VersionList + if err := proto.Unmarshal(bs, &vl); err != nil { + return nil, err } - return vl, nil + return &vl, nil } -func (t readOnlyTransaction) getGlobal(keyBuf, folder, file []byte, truncate bool) ([]byte, protocol.FileIntf, bool, error) { +func (t readOnlyTransaction) getGlobal(keyBuf, folder, file []byte, truncate bool) ([]byte, protocol.FileInfo, bool, error) { vl, err := t.getGlobalVersions(keyBuf, folder, file) if backend.IsNotFound(err) { - return keyBuf, nil, false, nil + return keyBuf, protocol.FileInfo{}, false, nil } else if err != nil { - return nil, nil, false, err + return nil, protocol.FileInfo{}, false, err } - var fi protocol.FileIntf - keyBuf, fi, err = t.getGlobalFromVersionList(keyBuf, folder, file, truncate, vl) + keyBuf, fi, err := t.getGlobalFromVersionList(keyBuf, folder, file, truncate, vl) return keyBuf, fi, true, err } -func (t readOnlyTransaction) getGlobalFromVersionList(keyBuf, folder, file []byte, truncate bool, vl VersionList) ([]byte, protocol.FileIntf, error) { - fv, ok := vl.GetGlobal() +func (t readOnlyTransaction) getGlobalFromVersionList(keyBuf, folder, file []byte, truncate bool, vl *dbproto.VersionList) ([]byte, protocol.FileInfo, error) { + fv, ok := vlGetGlobal(vl) if !ok { - return keyBuf, nil, errEmptyGlobal + return keyBuf, protocol.FileInfo{}, errEmptyGlobal } keyBuf, fi, err := t.getGlobalFromFileVersion(keyBuf, folder, file, truncate, fv) return keyBuf, fi, err } -func (t readOnlyTransaction) getGlobalFromFileVersion(keyBuf, folder, file []byte, truncate bool, fv FileVersion) ([]byte, protocol.FileIntf, error) { - dev, ok := fv.FirstDevice() +func (t readOnlyTransaction) getGlobalFromFileVersion(keyBuf, folder, file []byte, truncate bool, fv *dbproto.FileVersion) ([]byte, protocol.FileInfo, error) { + dev, ok := fvFirstDevice(fv) if !ok { - return keyBuf, nil, errEmptyFileVersion + return keyBuf, protocol.FileInfo{}, errEmptyFileVersion } keyBuf, err := t.keyer.GenerateDeviceFileKey(keyBuf, folder, dev, file) if err != nil { - return keyBuf, nil, err + return keyBuf, protocol.FileInfo{}, err } fi, ok, err := t.getFileTrunc(keyBuf, truncate) if err != nil { - return keyBuf, nil, err + return keyBuf, protocol.FileInfo{}, err } if !ok { - return keyBuf, nil, errEntryFromGlobalMissing + return keyBuf, protocol.FileInfo{}, errEntryFromGlobalMissing } return keyBuf, fi, nil } @@ -357,13 +362,13 @@ func (t *readOnlyTransaction) withGlobal(folder, prefix []byte, truncate bool, f return nil } - var vl VersionList - if err := vl.Unmarshal(dbi.Value()); err != nil { + var vl dbproto.VersionList + if err := proto.Unmarshal(dbi.Value(), &vl); err != nil { return err } - var f protocol.FileIntf - dk, f, err = t.getGlobalFromVersionList(dk, folder, name, truncate, vl) + var f protocol.FileInfo + dk, f, err = t.getGlobalFromVersionList(dk, folder, name, truncate, &vl) if err != nil { return err } @@ -432,7 +437,7 @@ func (t *readOnlyTransaction) availability(folder, file []byte) ([]protocol.Devi return nil, err } - fv, ok := vl.GetGlobal() + fv, ok := vlGetGlobal(vl) if !ok { return nil, nil } @@ -472,32 +477,32 @@ func (t *readOnlyTransaction) withNeedIteratingGlobal(folder, device []byte, tru return err } for dbi.Next() { - var vl VersionList - if err := vl.Unmarshal(dbi.Value()); err != nil { + var vl dbproto.VersionList + if err := proto.Unmarshal(dbi.Value(), &vl); err != nil { return err } - globalFV, ok := vl.GetGlobal() + globalFV, ok := vlGetGlobal(&vl) if !ok { return errEmptyGlobal } - haveFV, have := vl.Get(device) + haveFV, have := vlGet(&vl, device) - if !Need(globalFV, have, haveFV.Version) { + if !Need(globalFV, have, protocol.VectorFromWire(haveFV.Version)) { continue } name := t.keyer.NameFromGlobalVersionKey(dbi.Key()) - var gf protocol.FileIntf + var gf protocol.FileInfo dk, gf, err = t.getGlobalFromFileVersion(dk, folder, name, truncate, globalFV) if err != nil { return err } if shouldDebug() { - if globalDev, ok := globalFV.FirstDevice(); ok { + if globalDev, ok := fvFirstDevice(globalFV); ok { globalID, _ := protocol.DeviceIDFromBytes(globalDev) - l.Debugf("need folder=%q device=%v name=%q have=%v invalid=%v haveV=%v haveDeleted=%v globalV=%v globalDeleted=%v globalDev=%v", folder, devID, name, have, haveFV.IsInvalid(), haveFV.Version, haveFV.Deleted, gf.FileVersion(), globalFV.Deleted, globalID) + l.Debugf("need folder=%q device=%v name=%q have=%v invalid=%v haveV=%v haveDeleted=%v globalV=%v globalDeleted=%v globalDev=%v", folder, devID, name, have, fvIsInvalid(haveFV), haveFV.Version, haveFV.Deleted, gf.FileVersion(), globalFV.Deleted, globalID) } } if !fn(gf) { @@ -519,7 +524,7 @@ func (t *readOnlyTransaction) withNeedLocal(folder []byte, truncate bool, fn Ite defer dbi.Release() var keyBuf []byte - var f protocol.FileIntf + var f protocol.FileInfo var ok bool for dbi.Next() { keyBuf, f, ok, err = t.getGlobal(keyBuf, folder, t.keyer.NameFromGlobalVersionKey(dbi.Key()), truncate) @@ -589,7 +594,8 @@ func (t readWriteTransaction) putFile(fkey []byte, fi protocol.FileInfo) error { bkey = t.keyer.GenerateBlockListKey(bkey, fi.BlocksHash) if _, err := t.Get(bkey); backend.IsNotFound(err) { // Marshal the block list and save it - blocksBs := mustMarshal(&BlockList{Blocks: fi.Blocks}) + blocks := sliceutil.Map(fi.Blocks, protocol.BlockInfo.ToWire) + blocksBs := mustMarshal(&dbproto.BlockList{Blocks: blocks}) if err := t.Put(bkey, blocksBs); err != nil { return err } @@ -605,7 +611,7 @@ func (t readWriteTransaction) putFile(fkey []byte, fi protocol.FileInfo) error { bkey = t.keyer.GenerateVersionKey(bkey, fi.VersionHash) if _, err := t.Get(bkey); backend.IsNotFound(err) { // Marshal the version vector and save it - versionBs := mustMarshal(&fi.Version) + versionBs := mustMarshal(fi.Version.ToWire()) if err := t.Put(bkey, versionBs); err != nil { return err } @@ -619,7 +625,7 @@ func (t readWriteTransaction) putFile(fkey []byte, fi protocol.FileInfo) error { t.indirectionTracker.recordIndirectionHashesForFile(&fi) - fiBs := mustMarshal(&fi) + fiBs := mustMarshal(fi.ToWire(true)) return t.Put(fkey, fiBs) } @@ -638,8 +644,11 @@ func (t readWriteTransaction) updateGlobal(gk, keyBuf, folder, device []byte, fi if err != nil && !backend.IsNotFound(err) { return nil, err } + if fl == nil { + fl = &dbproto.VersionList{} + } - globalFV, oldGlobalFV, removedFV, haveOldGlobal, haveRemoved, globalChanged, err := fl.update(folder, device, file, t.readOnlyTransaction) + globalFV, oldGlobalFV, removedFV, haveOldGlobal, haveRemoved, globalChanged, err := vlUpdate(fl, folder, device, file, t.readOnlyTransaction) if err != nil { return nil, err } @@ -647,20 +656,20 @@ func (t readWriteTransaction) updateGlobal(gk, keyBuf, folder, device []byte, fi name := []byte(file.Name) l.Debugf(`new global for "%v" after update: %v`, file.Name, fl) - if err := t.Put(gk, mustMarshal(&fl)); err != nil { + if err := t.Put(gk, mustMarshal(fl)); err != nil { return nil, err } // Only load those from db if actually needed var gotGlobal, gotOldGlobal bool - var global, oldGlobal protocol.FileIntf + var global, oldGlobal protocol.FileInfo // Check the need of the device that was updated // Must happen before updating global meta: If this is the first // item from this device, it will be initialized with the global state. - needBefore := haveOldGlobal && Need(oldGlobalFV, haveRemoved, removedFV.Version) + needBefore := haveOldGlobal && Need(oldGlobalFV, haveRemoved, protocol.VectorFromWire(removedFV.GetVersion())) needNow := Need(globalFV, true, file.Version) if needBefore { if keyBuf, oldGlobal, err = t.getGlobalFromFileVersion(keyBuf, folder, name, true, oldGlobalFV); err != nil { @@ -709,7 +718,7 @@ func (t readWriteTransaction) updateGlobal(gk, keyBuf, folder, device []byte, fi // Add the new global to the global size counter if !gotGlobal { - if globalFV.Version.Equal(file.Version) { + if protocol.VectorFromWire(globalFV.Version).Equal(file.Version) { // The inserted file is the global file global = file } else { @@ -718,15 +727,15 @@ func (t readWriteTransaction) updateGlobal(gk, keyBuf, folder, device []byte, fi return nil, err } } - gotGlobal = true } meta.addFile(protocol.GlobalDeviceID, global) // check for local (if not already done before) if !bytes.Equal(device, protocol.LocalDeviceID[:]) { - localFV, haveLocal := fl.Get(protocol.LocalDeviceID[:]) - needBefore := haveOldGlobal && Need(oldGlobalFV, haveLocal, localFV.Version) - needNow := Need(globalFV, haveLocal, localFV.Version) + localFV, haveLocal := vlGet(fl, protocol.LocalDeviceID[:]) + localVersion := protocol.VectorFromWire(localFV.Version) + needBefore := haveOldGlobal && Need(oldGlobalFV, haveLocal, localVersion) + needNow := Need(globalFV, haveLocal, localVersion) if needBefore { meta.removeNeeded(protocol.LocalDeviceID, oldGlobal) if !needNow { @@ -750,11 +759,12 @@ func (t readWriteTransaction) updateGlobal(gk, keyBuf, folder, device []byte, fi // Already handled above continue } - fv, have := fl.Get(dev[:]) - if haveOldGlobal && Need(oldGlobalFV, have, fv.Version) { + fv, have := vlGet(fl, dev[:]) + fvVersion := protocol.VectorFromWire(fv.Version) + if haveOldGlobal && Need(oldGlobalFV, have, fvVersion) { meta.removeNeeded(dev, oldGlobal) } - if Need(globalFV, have, fv.Version) { + if Need(globalFV, have, fvVersion) { meta.addNeeded(dev, global) } } @@ -778,11 +788,12 @@ func (t readWriteTransaction) updateLocalNeed(keyBuf, folder, name []byte, add b return keyBuf, err } -func Need(global FileVersion, haveLocal bool, localVersion protocol.Vector) bool { +func Need(global *dbproto.FileVersion, haveLocal bool, localVersion protocol.Vector) bool { // We never need an invalid file or a file without a valid version (just // another way of expressing "invalid", really, until we fix that // part...). - if global.IsInvalid() || global.Version.IsEmpty() { + globalVersion := protocol.VectorFromWire(global.Version) + if fvIsInvalid(global) || globalVersion.IsEmpty() { return false } // We don't need a deleted file if we don't have it. @@ -790,7 +801,7 @@ func Need(global FileVersion, haveLocal bool, localVersion protocol.Vector) bool return false } // We don't need the global file if we already have the same version. - if haveLocal && localVersion.GreaterEqual(global.Version) { + if haveLocal && localVersion.GreaterEqual(globalVersion) { return false } return true @@ -816,8 +827,8 @@ func (t readWriteTransaction) removeFromGlobal(gk, keyBuf, folder, device, file return nil, err } - oldGlobalFV, haveOldGlobal := fl.GetGlobal() - oldGlobalFV = oldGlobalFV.copy() + oldGlobalFV, haveOldGlobal := vlGetGlobal(fl) + oldGlobalFV = fvCopy(oldGlobalFV) if !haveOldGlobal { // Shouldn't ever happen, but doesn't hurt to handle. @@ -825,18 +836,18 @@ func (t readWriteTransaction) removeFromGlobal(gk, keyBuf, folder, device, file return keyBuf, t.Delete(gk) } - removedFV, haveRemoved, globalChanged := fl.pop(device) + removedFV, haveRemoved, globalChanged := vlPop(fl, device) if !haveRemoved { // There is no version for the given device return keyBuf, nil } - var global protocol.FileIntf + var global protocol.FileInfo var gotGlobal bool - globalFV, haveGlobal := fl.GetGlobal() + globalFV, haveGlobal := vlGetGlobal(fl) // Add potential needs of the removed device - if haveGlobal && !globalFV.IsInvalid() && Need(globalFV, false, protocol.Vector{}) && !Need(oldGlobalFV, haveRemoved, removedFV.Version) { + if haveGlobal && !fvIsInvalid(globalFV) && Need(globalFV, false, protocol.Vector{}) && !Need(oldGlobalFV, haveRemoved, protocol.VectorFromWire(removedFV.Version)) { keyBuf, global, err = t.getGlobalFromVersionList(keyBuf, folder, file, true, fl) if err != nil { return nil, err @@ -853,13 +864,13 @@ func (t readWriteTransaction) removeFromGlobal(gk, keyBuf, folder, device, file // Global hasn't changed, abort early if !globalChanged { l.Debugf("new global after remove: %v", fl) - if err := t.Put(gk, mustMarshal(&fl)); err != nil { + if err := t.Put(gk, mustMarshal(fl)); err != nil { return nil, err } return keyBuf, nil } - var oldGlobal protocol.FileIntf + var oldGlobal protocol.FileInfo keyBuf, oldGlobal, err = t.getGlobalFromFileVersion(keyBuf, folder, file, true, oldGlobalFV) if err != nil { return nil, err @@ -868,11 +879,12 @@ func (t readWriteTransaction) removeFromGlobal(gk, keyBuf, folder, device, file // Remove potential device needs shouldRemoveNeed := func(dev protocol.DeviceID) bool { - fv, have := fl.Get(dev[:]) - if !Need(oldGlobalFV, have, fv.Version) { + fv, have := vlGet(fl, dev[:]) + fvVersion := protocol.VectorFromWire(fv.Version) + if !Need(oldGlobalFV, have, fvVersion) { return false // Didn't need it before } - return !haveGlobal || !Need(globalFV, have, fv.Version) + return !haveGlobal || !Need(globalFV, have, fvVersion) } if shouldRemoveNeed(protocol.LocalDeviceID) { meta.removeNeeded(protocol.LocalDeviceID, oldGlobal) @@ -890,7 +902,7 @@ func (t readWriteTransaction) removeFromGlobal(gk, keyBuf, folder, device, file } // Nothing left, i.e. nothing to add to the global counter below. - if fl.Empty() { + if len(fl.Versions) == 0 { if err := t.Delete(gk); err != nil { return nil, err } @@ -907,7 +919,7 @@ func (t readWriteTransaction) removeFromGlobal(gk, keyBuf, folder, device, file meta.addFile(protocol.GlobalDeviceID, global) l.Debugf(`new global for "%s" after remove: %v`, file, fl) - if err := t.Put(gk, mustMarshal(&fl)); err != nil { + if err := t.Put(gk, mustMarshal(fl)); err != nil { return nil, err } @@ -935,7 +947,7 @@ func (t readWriteTransaction) deleteKeyPrefixMatching(prefix []byte, match func( return dbi.Error() } -func (t *readWriteTransaction) withAllFolderTruncated(folder []byte, fn func(device []byte, f FileInfoTruncated) bool) error { +func (t *readWriteTransaction) withAllFolderTruncated(folder []byte, fn func(device []byte, f protocol.FileInfo) bool) error { key, err := t.keyer.GenerateDeviceFileKey(nil, folder, nil, nil) if err != nil { return err @@ -957,11 +969,10 @@ func (t *readWriteTransaction) withAllFolderTruncated(folder []byte, fn func(dev continue } - intf, err := t.unmarshalTrunc(dbi.Value(), true) + f, err := t.unmarshalTrunc(dbi.Value(), true) if err != nil { return err } - f := intf.(FileInfoTruncated) switch f.Name { case "", ".", "..", "/": // A few obviously invalid filenames @@ -988,12 +999,8 @@ func (t *readWriteTransaction) withAllFolderTruncated(folder []byte, fn func(dev return dbi.Error() } -type marshaller interface { - Marshal() ([]byte, error) -} - -func mustMarshal(f marshaller) []byte { - bs, err := f.Marshal() +func mustMarshal(f proto.Message) []byte { + bs, err := proto.Marshal(f) if err != nil { panic(err) } diff --git a/lib/db/util.go b/lib/db/util.go index f0320ad9b43..9251f3fdce0 100644 --- a/lib/db/util.go +++ b/lib/db/util.go @@ -6,7 +6,10 @@ package db -import "github.com/syncthing/syncthing/lib/protocol" +import ( + "github.com/syncthing/syncthing/lib/protocol" + "google.golang.org/protobuf/proto" +) // How many files to send in each Index/IndexUpdate message. const ( @@ -44,7 +47,7 @@ func (b *FileInfoBatch) Append(f protocol.FileInfo) { b.infos = make([]protocol.FileInfo, 0, MaxBatchSizeFiles) } b.infos = append(b.infos, f) - b.size += f.ProtoSize() + b.size += proto.Size(f.ToWire(true)) } func (b *FileInfoBatch) Full() bool { diff --git a/lib/discover/cache.go b/lib/discover/cache.go index 29dfdedf149..01727382e82 100644 --- a/lib/discover/cache.go +++ b/lib/discover/cache.go @@ -10,9 +10,8 @@ import ( stdsync "sync" "time" - "github.com/thejerf/suture/v4" - "github.com/syncthing/syncthing/lib/protocol" + "github.com/thejerf/suture/v4" ) // A cachedFinder is a Finder with associated cache timeouts. diff --git a/lib/discover/global.go b/lib/discover/global.go index febb3910fb5..94d4994eecc 100644 --- a/lib/discover/global.go +++ b/lib/discover/global.go @@ -21,11 +21,12 @@ import ( stdsync "sync" "time" + "golang.org/x/net/http2" + "github.com/syncthing/syncthing/lib/connections/registry" "github.com/syncthing/syncthing/lib/dialer" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/protocol" - "golang.org/x/net/http2" ) type globalClient struct { diff --git a/lib/discover/local.go b/lib/discover/local.go index a64c218a19b..b40c495cd65 100644 --- a/lib/discover/local.go +++ b/lib/discover/local.go @@ -7,6 +7,7 @@ package discover import ( + "bytes" "context" "encoding/binary" "encoding/hex" @@ -17,12 +18,15 @@ import ( "strconv" "time" + "github.com/thejerf/suture/v4" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/discoproto" "github.com/syncthing/syncthing/lib/beacon" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rand" "github.com/syncthing/syncthing/lib/svcutil" - "github.com/thejerf/suture/v4" ) type localClient struct { @@ -121,12 +125,12 @@ func (c *localClient) announcementPkt(instanceID int64, msg []byte) ([]byte, boo return msg, false } - pkt := Announce{ - ID: c.myID, + pkt := &discoproto.Announce{ + Id: c.myID[:], Addresses: addrs, - InstanceID: instanceID, + InstanceId: instanceID, } - bs, _ := pkt.Marshal() + bs, _ := proto.Marshal(pkt) if pktLen := 4 + len(bs); cap(msg) < pktLen { msg = make([]byte, 0, pktLen) @@ -193,18 +197,19 @@ func (c *localClient) recvAnnouncements(ctx context.Context) error { continue } - var pkt Announce - err := pkt.Unmarshal(buf[4:]) + var pkt discoproto.Announce + err := proto.Unmarshal(buf[:4], &pkt) if err != nil && err != io.EOF { l.Debugf("discover: Failed to unmarshal local announcement from %s:\n%s", addr, hex.Dump(buf)) continue } - l.Debugf("discover: Received local announcement from %s for %s", addr, pkt.ID) + id, _ := protocol.DeviceIDFromBytes(pkt.Id) + l.Debugf("discover: Received local announcement from %s for %s", addr, id) var newDevice bool - if pkt.ID != c.myID { - newDevice = c.registerDevice(addr, pkt) + if !bytes.Equal(pkt.Id, c.myID[:]) { + newDevice = c.registerDevice(addr, &pkt) } if newDevice { @@ -218,18 +223,24 @@ func (c *localClient) recvAnnouncements(ctx context.Context) error { } } -func (c *localClient) registerDevice(src net.Addr, device Announce) bool { +func (c *localClient) registerDevice(src net.Addr, device *discoproto.Announce) bool { // Remember whether we already had a valid cache entry for this device. // If the instance ID has changed the remote device has restarted since // we last heard from it, so we should treat it as a new device. - ce, existsAlready := c.Get(device.ID) - isNewDevice := !existsAlready || time.Since(ce.when) > CacheLifeTime || ce.instanceID != device.InstanceID + id, err := protocol.DeviceIDFromBytes(device.Id) + if err != nil { + l.Debugf("discover: Failed to parse device ID %x: %v", device.Id, err) + return false + } + + ce, existsAlready := c.Get(id) + isNewDevice := !existsAlready || time.Since(ce.when) > CacheLifeTime || ce.instanceID != device.InstanceId // Any empty or unspecified addresses should be set to the source address // of the announcement. We also skip any addresses we can't parse. - l.Debugln("discover: Registering addresses for", device.ID) + l.Debugln("discover: Registering addresses for", id) var validAddresses []string for _, addr := range device.Addresses { u, err := url.Parse(addr) @@ -272,16 +283,16 @@ func (c *localClient) registerDevice(src net.Addr, device Announce) bool { } } - c.Set(device.ID, CacheEntry{ + c.Set(id, CacheEntry{ Addresses: validAddresses, when: time.Now(), found: true, - instanceID: device.InstanceID, + instanceID: device.InstanceId, }) if isNewDevice { c.evLogger.Log(events.DeviceDiscovered, map[string]interface{}{ - "device": device.ID.String(), + "device": id.String(), "addrs": validAddresses, }) } diff --git a/lib/discover/local.pb.go b/lib/discover/local.pb.go deleted file mode 100644 index 7a30d4cdc17..00000000000 --- a/lib/discover/local.pb.go +++ /dev/null @@ -1,399 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/discover/local.proto - -package discover - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_syncthing_syncthing_lib_protocol "github.com/syncthing/syncthing/lib/protocol" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Announce struct { - ID github_com_syncthing_syncthing_lib_protocol.DeviceID `protobuf:"bytes,1,opt,name=id,proto3,customtype=github.com/syncthing/syncthing/lib/protocol.DeviceID" json:"id" xml:"id"` - Addresses []string `protobuf:"bytes,2,rep,name=addresses,proto3" json:"addresses" xml:"address"` - InstanceID int64 `protobuf:"varint,3,opt,name=instance_id,json=instanceId,proto3" json:"instanceId" xml:"instanceId"` -} - -func (m *Announce) Reset() { *m = Announce{} } -func (m *Announce) String() string { return proto.CompactTextString(m) } -func (*Announce) ProtoMessage() {} -func (*Announce) Descriptor() ([]byte, []int) { - return fileDescriptor_18afca46562fdaf4, []int{0} -} -func (m *Announce) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Announce) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Announce.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Announce) XXX_Merge(src proto.Message) { - xxx_messageInfo_Announce.Merge(m, src) -} -func (m *Announce) XXX_Size() int { - return m.ProtoSize() -} -func (m *Announce) XXX_DiscardUnknown() { - xxx_messageInfo_Announce.DiscardUnknown(m) -} - -var xxx_messageInfo_Announce proto.InternalMessageInfo - -func init() { - proto.RegisterType((*Announce)(nil), "discover.Announce") -} - -func init() { proto.RegisterFile("lib/discover/local.proto", fileDescriptor_18afca46562fdaf4) } - -var fileDescriptor_18afca46562fdaf4 = []byte{ - // 334 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x31, 0x6b, 0xe3, 0x30, - 0x18, 0x86, 0x2d, 0x05, 0x8e, 0x44, 0x77, 0x07, 0x87, 0x27, 0x93, 0x41, 0x0a, 0xbe, 0x0c, 0x81, - 0x42, 0x3c, 0xb4, 0x53, 0x29, 0x85, 0x1a, 0x2f, 0x1e, 0xba, 0x64, 0xec, 0xd0, 0x10, 0x4b, 0xaa, - 0x23, 0x70, 0xa4, 0x60, 0x39, 0x21, 0xfd, 0x07, 0x1d, 0x4b, 0xb6, 0x6e, 0xfd, 0x39, 0x19, 0x3d, - 0x96, 0x0e, 0x82, 0xd8, 0x5b, 0xc6, 0xfc, 0x82, 0x12, 0x25, 0x69, 0x32, 0x76, 0x7b, 0xf5, 0xe8, - 0x95, 0x78, 0xf8, 0x3e, 0xe4, 0x65, 0x22, 0x09, 0x98, 0xd0, 0x54, 0xcd, 0x79, 0x1e, 0x64, 0x8a, - 0x8e, 0xb2, 0xfe, 0x34, 0x57, 0x85, 0x72, 0x9b, 0x47, 0xda, 0xfe, 0x9f, 0xf3, 0xa9, 0xd2, 0x81, - 0xc5, 0xc9, 0xec, 0x29, 0x48, 0x55, 0xaa, 0xec, 0xc1, 0xa6, 0x7d, 0xbd, 0xdd, 0xe2, 0x8b, 0x62, - 0x1f, 0xfd, 0x37, 0x88, 0x9a, 0x77, 0x52, 0xaa, 0x99, 0xa4, 0xdc, 0x95, 0x08, 0x0a, 0xe6, 0x81, - 0x0e, 0xe8, 0xfd, 0x09, 0x1f, 0x57, 0x86, 0x38, 0x9f, 0x86, 0x5c, 0xa5, 0xa2, 0x18, 0xcf, 0x92, - 0x3e, 0x55, 0x93, 0x40, 0x3f, 0x4b, 0x5a, 0x8c, 0x85, 0x4c, 0xcf, 0xd2, 0xce, 0xc9, 0x7e, 0x45, - 0x55, 0xd6, 0x8f, 0xf8, 0x5c, 0x50, 0x1e, 0x47, 0x95, 0x21, 0x30, 0x8e, 0x36, 0x86, 0x40, 0xc1, - 0xb6, 0x86, 0x34, 0x17, 0x93, 0xec, 0xda, 0x17, 0xcc, 0x7f, 0x29, 0xbb, 0x60, 0x59, 0x76, 0x61, - 0x1c, 0x0d, 0xa0, 0x60, 0xee, 0x0d, 0x6a, 0x8d, 0x18, 0xcb, 0xb9, 0xd6, 0x5c, 0x7b, 0xb0, 0xd3, - 0xe8, 0xb5, 0x42, 0xbc, 0x31, 0xe4, 0x04, 0xb7, 0x86, 0xfc, 0xb5, 0x6f, 0x0f, 0xc4, 0x1f, 0x9c, - 0xee, 0xdc, 0x21, 0xfa, 0x2d, 0xa4, 0x2e, 0x46, 0x92, 0xf2, 0xa1, 0x60, 0x5e, 0xa3, 0x03, 0x7a, - 0x8d, 0xf0, 0xb6, 0x32, 0x04, 0xc5, 0x07, 0x6c, 0x15, 0xd0, 0xb1, 0x14, 0xef, 0x54, 0xfe, 0xed, - 0x55, 0xbe, 0x91, 0xbf, 0x2c, 0xbb, 0x67, 0xfd, 0xc1, 0x59, 0x3b, 0xbc, 0x5f, 0xad, 0xb1, 0x53, - 0xae, 0xb1, 0xb3, 0xaa, 0x30, 0x28, 0x2b, 0x0c, 0x5e, 0x6b, 0xec, 0xbc, 0xd7, 0x18, 0x94, 0x35, - 0x76, 0x3e, 0x6a, 0xec, 0x3c, 0x5c, 0xfc, 0x60, 0x38, 0xc7, 0xd5, 0x24, 0xbf, 0xec, 0x98, 0x2e, - 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xe8, 0x9a, 0xd0, 0xc7, 0x01, 0x00, 0x00, -} - -func (m *Announce) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Announce) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Announce) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.InstanceID != 0 { - i = encodeVarintLocal(dAtA, i, uint64(m.InstanceID)) - i-- - dAtA[i] = 0x18 - } - if len(m.Addresses) > 0 { - for iNdEx := len(m.Addresses) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Addresses[iNdEx]) - copy(dAtA[i:], m.Addresses[iNdEx]) - i = encodeVarintLocal(dAtA, i, uint64(len(m.Addresses[iNdEx]))) - i-- - dAtA[i] = 0x12 - } - } - { - size := m.ID.ProtoSize() - i -= size - if _, err := m.ID.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintLocal(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func encodeVarintLocal(dAtA []byte, offset int, v uint64) int { - offset -= sovLocal(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Announce) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.ID.ProtoSize() - n += 1 + l + sovLocal(uint64(l)) - if len(m.Addresses) > 0 { - for _, s := range m.Addresses { - l = len(s) - n += 1 + l + sovLocal(uint64(l)) - } - } - if m.InstanceID != 0 { - n += 1 + sovLocal(uint64(m.InstanceID)) - } - return n -} - -func sovLocal(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozLocal(x uint64) (n int) { - return sovLocal(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Announce) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLocal - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Announce: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Announce: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLocal - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthLocal - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthLocal - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLocal - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthLocal - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthLocal - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Addresses = append(m.Addresses, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InstanceID", wireType) - } - m.InstanceID = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLocal - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.InstanceID |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipLocal(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthLocal - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipLocal(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLocal - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLocal - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLocal - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthLocal - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupLocal - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthLocal - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthLocal = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowLocal = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupLocal = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/discover/local_test.go b/lib/discover/local_test.go index 7fe0649dc9f..a191e4718ae 100644 --- a/lib/discover/local_test.go +++ b/lib/discover/local_test.go @@ -13,6 +13,7 @@ import ( "net" "testing" + "github.com/syncthing/syncthing/internal/gen/discoproto" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/protocol" ) @@ -50,40 +51,40 @@ func TestLocalInstanceIDShouldTriggerNew(t *testing.T) { lc := c.(*localClient) src := &net.UDPAddr{IP: []byte{10, 20, 30, 40}, Port: 50} - new := lc.registerDevice(src, Announce{ - ID: protocol.DeviceID{10, 20, 30, 40, 50, 60, 70, 80, 90}, + new := lc.registerDevice(src, &discoproto.Announce{ + Id: padDeviceID(10), Addresses: []string{"tcp://0.0.0.0:22000"}, - InstanceID: 1234567890, + InstanceId: 1234567890, }) if !new { t.Fatal("first register should be new") } - new = lc.registerDevice(src, Announce{ - ID: protocol.DeviceID{10, 20, 30, 40, 50, 60, 70, 80, 90}, + new = lc.registerDevice(src, &discoproto.Announce{ + Id: padDeviceID(10), Addresses: []string{"tcp://0.0.0.0:22000"}, - InstanceID: 1234567890, + InstanceId: 1234567890, }) if new { t.Fatal("second register should not be new") } - new = lc.registerDevice(src, Announce{ - ID: protocol.DeviceID{42, 10, 20, 30, 40, 50, 60, 70, 80, 90}, + new = lc.registerDevice(src, &discoproto.Announce{ + Id: padDeviceID(42), Addresses: []string{"tcp://0.0.0.0:22000"}, - InstanceID: 1234567890, + InstanceId: 1234567890, }) if !new { t.Fatal("new device ID should be new") } - new = lc.registerDevice(src, Announce{ - ID: protocol.DeviceID{10, 20, 30, 40, 50, 60, 70, 80, 90}, + new = lc.registerDevice(src, &discoproto.Announce{ + Id: padDeviceID(10), Addresses: []string{"tcp://0.0.0.0:22000"}, - InstanceID: 91234567890, + InstanceId: 91234567890, }) if !new { @@ -91,6 +92,12 @@ func TestLocalInstanceIDShouldTriggerNew(t *testing.T) { } } +func padDeviceID(bs ...byte) []byte { + var padded [32]byte + copy(padded[:], bs) + return padded[:] +} + func TestFilterUndialable(t *testing.T) { addrs := []string{ "quic://[2001:db8::1]:22000", // OK diff --git a/lib/fs/basicfs_platformdata_unix.go b/lib/fs/basicfs_platformdata_unix.go index 91c8f47afdd..f87296f6698 100644 --- a/lib/fs/basicfs_platformdata_unix.go +++ b/lib/fs/basicfs_platformdata_unix.go @@ -9,9 +9,7 @@ package fs -import ( - "github.com/syncthing/syncthing/lib/protocol" -) +import "github.com/syncthing/syncthing/lib/protocol" func (f *BasicFilesystem) PlatformData(name string, scanOwnership, scanXattrs bool, xattrFilter XattrFilter) (protocol.PlatformData, error) { return unixPlatformData(f, name, f.userCache, f.groupCache, scanOwnership, scanXattrs, xattrFilter) diff --git a/lib/fs/basicfs_watch_errors_others.go b/lib/fs/basicfs_watch_errors_others.go index 384997466a7..3944061b55f 100644 --- a/lib/fs/basicfs_watch_errors_others.go +++ b/lib/fs/basicfs_watch_errors_others.go @@ -9,6 +9,6 @@ package fs -func reachedMaxUserWatches(err error) bool { +func reachedMaxUserWatches(_ error) bool { return false } diff --git a/lib/fs/basicfs_xattr_unsupported.go b/lib/fs/basicfs_xattr_unsupported.go index e7a97598504..6ade64f14f1 100644 --- a/lib/fs/basicfs_xattr_unsupported.go +++ b/lib/fs/basicfs_xattr_unsupported.go @@ -9,9 +9,7 @@ package fs -import ( - "github.com/syncthing/syncthing/lib/protocol" -) +import "github.com/syncthing/syncthing/lib/protocol" func (f *BasicFilesystem) GetXattr(path string, xattrFilter XattrFilter) ([]protocol.Xattr, error) { return nil, ErrXattrsNotSupported diff --git a/lib/fs/copyrangemethod.go b/lib/fs/copyrangemethod.go index 25b0c391411..15011167131 100644 --- a/lib/fs/copyrangemethod.go +++ b/lib/fs/copyrangemethod.go @@ -6,6 +6,17 @@ package fs +type CopyRangeMethod int32 + +const ( + CopyRangeMethodStandard CopyRangeMethod = 0 + CopyRangeMethodIoctl CopyRangeMethod = 1 + CopyRangeMethodCopyFileRange CopyRangeMethod = 2 + CopyRangeMethodSendFile CopyRangeMethod = 3 + CopyRangeMethodDuplicateExtents CopyRangeMethod = 4 + CopyRangeMethodAllWithFallback CopyRangeMethod = 5 +) + func (o CopyRangeMethod) String() string { switch o { case CopyRangeMethodStandard: @@ -24,31 +35,3 @@ func (o CopyRangeMethod) String() string { return "unknown" } } - -func (o CopyRangeMethod) MarshalText() ([]byte, error) { - return []byte(o.String()), nil -} - -func (o *CopyRangeMethod) UnmarshalText(bs []byte) error { - switch string(bs) { - case "standard": - *o = CopyRangeMethodStandard - case "ioctl": - *o = CopyRangeMethodIoctl - case "copy_file_range": - *o = CopyRangeMethodCopyFileRange - case "sendfile": - *o = CopyRangeMethodSendFile - case "duplicate_extents": - *o = CopyRangeMethodDuplicateExtents - case "all": - *o = CopyRangeMethodAllWithFallback - default: - *o = CopyRangeMethodStandard - } - return nil -} - -func (o *CopyRangeMethod) ParseDefault(str string) error { - return o.UnmarshalText([]byte(str)) -} diff --git a/lib/fs/copyrangemethod.pb.go b/lib/fs/copyrangemethod.pb.go deleted file mode 100644 index f35b4e7e853..00000000000 --- a/lib/fs/copyrangemethod.pb.go +++ /dev/null @@ -1,90 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/fs/copyrangemethod.proto - -package fs - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type CopyRangeMethod int32 - -const ( - CopyRangeMethodStandard CopyRangeMethod = 0 - CopyRangeMethodIoctl CopyRangeMethod = 1 - CopyRangeMethodCopyFileRange CopyRangeMethod = 2 - CopyRangeMethodSendFile CopyRangeMethod = 3 - CopyRangeMethodDuplicateExtents CopyRangeMethod = 4 - CopyRangeMethodAllWithFallback CopyRangeMethod = 5 -) - -var CopyRangeMethod_name = map[int32]string{ - 0: "COPY_RANGE_METHOD_STANDARD", - 1: "COPY_RANGE_METHOD_IOCTL", - 2: "COPY_RANGE_METHOD_COPY_FILE_RANGE", - 3: "COPY_RANGE_METHOD_SEND_FILE", - 4: "COPY_RANGE_METHOD_DUPLICATE_EXTENTS", - 5: "COPY_RANGE_METHOD_ALL_WITH_FALLBACK", -} - -var CopyRangeMethod_value = map[string]int32{ - "COPY_RANGE_METHOD_STANDARD": 0, - "COPY_RANGE_METHOD_IOCTL": 1, - "COPY_RANGE_METHOD_COPY_FILE_RANGE": 2, - "COPY_RANGE_METHOD_SEND_FILE": 3, - "COPY_RANGE_METHOD_DUPLICATE_EXTENTS": 4, - "COPY_RANGE_METHOD_ALL_WITH_FALLBACK": 5, -} - -func (CopyRangeMethod) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_78e1061c3022e87e, []int{0} -} - -func init() { - proto.RegisterEnum("fs.CopyRangeMethod", CopyRangeMethod_name, CopyRangeMethod_value) -} - -func init() { proto.RegisterFile("lib/fs/copyrangemethod.proto", fileDescriptor_78e1061c3022e87e) } - -var fileDescriptor_78e1061c3022e87e = []byte{ - // 391 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xbd, 0x8e, 0xd3, 0x40, - 0x14, 0x85, 0xed, 0xdd, 0x85, 0xc2, 0x0d, 0x96, 0x85, 0xb4, 0x68, 0x76, 0x35, 0x18, 0x22, 0x1a, - 0x8a, 0x75, 0x81, 0xa8, 0xa0, 0x99, 0xb5, 0xc7, 0x59, 0x6b, 0x27, 0x4e, 0x94, 0x18, 0x05, 0x68, - 0x2c, 0xff, 0xc5, 0xb6, 0x98, 0x78, 0x2c, 0x7b, 0x22, 0x91, 0x57, 0x70, 0xc5, 0x0b, 0x58, 0xa2, - 0xa0, 0xa0, 0xe1, 0x3d, 0x52, 0xa6, 0xa4, 0x4d, 0xfc, 0x22, 0x28, 0x93, 0x06, 0x39, 0xe9, 0xee, - 0x3d, 0x9a, 0xef, 0xd3, 0x91, 0xe6, 0x2a, 0xb7, 0x34, 0x0f, 0x8d, 0x45, 0x6d, 0x44, 0xac, 0x5c, - 0x57, 0x41, 0x91, 0x26, 0xcb, 0x84, 0x67, 0x2c, 0xbe, 0x2b, 0x2b, 0xc6, 0x99, 0x76, 0xb1, 0xa8, - 0xc1, 0xa0, 0x4a, 0x4a, 0x56, 0x1b, 0x22, 0x08, 0x57, 0x0b, 0x23, 0x65, 0x29, 0x13, 0x8b, 0x98, - 0x8e, 0x0f, 0xdf, 0xfe, 0xb9, 0x54, 0x9e, 0x99, 0xac, 0x5c, 0x4f, 0x0f, 0x8a, 0x91, 0x50, 0x68, - 0x1f, 0x14, 0x60, 0x8e, 0x27, 0x5f, 0xfc, 0x29, 0x72, 0x87, 0xd8, 0x1f, 0x61, 0xef, 0x61, 0x6c, - 0xf9, 0x33, 0x0f, 0xb9, 0x16, 0x9a, 0x5a, 0xaa, 0x04, 0x6e, 0x9a, 0x56, 0xbf, 0xee, 0x41, 0x33, - 0x1e, 0x14, 0x71, 0x50, 0xc5, 0xda, 0x7b, 0xe5, 0xfa, 0x14, 0x76, 0xc6, 0xa6, 0x47, 0x54, 0x19, - 0xbc, 0x68, 0x5a, 0xfd, 0x79, 0x8f, 0x74, 0x58, 0xc4, 0xa9, 0x36, 0x54, 0x5e, 0x9d, 0x62, 0x22, - 0xb1, 0x1d, 0x82, 0x8f, 0xb1, 0x7a, 0x01, 0xf4, 0xa6, 0xd5, 0x6f, 0x7b, 0x82, 0xc3, 0x6a, 0xe7, - 0x34, 0x11, 0x91, 0xf6, 0x51, 0xb9, 0x39, 0x53, 0x1e, 0xbb, 0x96, 0x10, 0xa9, 0x97, 0xe7, 0xdb, - 0x27, 0x45, 0x7c, 0x50, 0x68, 0x44, 0x19, 0x9c, 0xd2, 0xd6, 0xa7, 0x09, 0x71, 0x4c, 0xe4, 0x61, - 0x1f, 0x7f, 0xf6, 0xb0, 0xeb, 0xcd, 0xd4, 0x2b, 0x30, 0x68, 0x5a, 0xfd, 0x65, 0xcf, 0x62, 0xad, - 0x4a, 0x9a, 0x47, 0x01, 0x4f, 0xf0, 0x77, 0x9e, 0x14, 0xbc, 0xd6, 0x1e, 0xcf, 0xd9, 0x10, 0x21, - 0xfe, 0xdc, 0xf1, 0x1e, 0x7c, 0x1b, 0x11, 0x72, 0x8f, 0xcc, 0x47, 0xf5, 0x09, 0x78, 0xdd, 0xb4, - 0x3a, 0xec, 0xd9, 0x10, 0xa5, 0xf3, 0x9c, 0x67, 0x76, 0x40, 0x69, 0x18, 0x44, 0xdf, 0xc0, 0xd5, - 0xef, 0x5f, 0x50, 0xba, 0x1f, 0x6e, 0x76, 0x50, 0xda, 0xee, 0xa0, 0xb4, 0xd9, 0x43, 0x79, 0xbb, - 0x87, 0xf2, 0x8f, 0x0e, 0x4a, 0x3f, 0x3b, 0x28, 0x6f, 0x3b, 0x28, 0xfd, 0xed, 0xa0, 0xf4, 0xf5, - 0x4d, 0x9a, 0xf3, 0x6c, 0x15, 0xde, 0x45, 0x6c, 0x69, 0xd4, 0xeb, 0x22, 0xe2, 0x59, 0x5e, 0xa4, - 0xff, 0x4d, 0xc7, 0xbb, 0x09, 0x9f, 0x8a, 0xff, 0x7f, 0xf7, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xb6, - 0x5d, 0x2e, 0x16, 0x48, 0x02, 0x00, 0x00, -} diff --git a/lib/fs/types.go b/lib/fs/types.go index 658adb91820..243ea60c870 100644 --- a/lib/fs/types.go +++ b/lib/fs/types.go @@ -6,6 +6,13 @@ package fs +type FilesystemType int32 + +const ( + FilesystemTypeBasic FilesystemType = 0 + FilesystemTypeFake FilesystemType = 1 +) + func (t FilesystemType) String() string { switch t { case FilesystemTypeBasic: @@ -16,19 +23,3 @@ func (t FilesystemType) String() string { return "unknown" } } - -func (t FilesystemType) MarshalText() ([]byte, error) { - return []byte(t.String()), nil -} - -func (t *FilesystemType) UnmarshalText(bs []byte) error { - switch string(bs) { - case "basic": - *t = FilesystemTypeBasic - case "fake": - *t = FilesystemTypeFake - default: - *t = FilesystemTypeBasic - } - return nil -} diff --git a/lib/fs/types.pb.go b/lib/fs/types.pb.go deleted file mode 100644 index fdf705440f4..00000000000 --- a/lib/fs/types.pb.go +++ /dev/null @@ -1,68 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/fs/types.proto - -package fs - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type FilesystemType int32 - -const ( - FilesystemTypeBasic FilesystemType = 0 - FilesystemTypeFake FilesystemType = 1 -) - -var FilesystemType_name = map[int32]string{ - 0: "FILESYSTEM_TYPE_BASIC", - 1: "FILESYSTEM_TYPE_FAKE", -} - -var FilesystemType_value = map[string]int32{ - "FILESYSTEM_TYPE_BASIC": 0, - "FILESYSTEM_TYPE_FAKE": 1, -} - -func (FilesystemType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_b556f45c4309ad5d, []int{0} -} - -func init() { - proto.RegisterEnum("fs.FilesystemType", FilesystemType_name, FilesystemType_value) -} - -func init() { proto.RegisterFile("lib/fs/types.proto", fileDescriptor_b556f45c4309ad5d) } - -var fileDescriptor_b556f45c4309ad5d = []byte{ - // 228 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xca, 0xc9, 0x4c, 0xd2, - 0x4f, 0x2b, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, - 0x4a, 0x2b, 0x96, 0x52, 0x2e, 0x4a, 0x2d, 0xc8, 0x2f, 0xd6, 0x07, 0x0b, 0x24, 0x95, 0xa6, 0xe9, - 0xa7, 0xe7, 0xa7, 0xe7, 0x83, 0x39, 0x60, 0x16, 0x44, 0xa1, 0x56, 0x0d, 0x17, 0x9f, 0x5b, 0x66, - 0x4e, 0x6a, 0x71, 0x65, 0x71, 0x49, 0x6a, 0x6e, 0x48, 0x65, 0x41, 0xaa, 0x90, 0x11, 0x97, 0xa8, - 0x9b, 0xa7, 0x8f, 0x6b, 0x70, 0x64, 0x70, 0x88, 0xab, 0x6f, 0x7c, 0x48, 0x64, 0x80, 0x6b, 0xbc, - 0x93, 0x63, 0xb0, 0xa7, 0xb3, 0x00, 0x83, 0x94, 0x78, 0xd7, 0x5c, 0x05, 0x61, 0x54, 0xe5, 0x4e, - 0x89, 0xc5, 0x99, 0xc9, 0x42, 0x06, 0x5c, 0x22, 0xe8, 0x7a, 0xdc, 0x1c, 0xbd, 0x5d, 0x05, 0x18, - 0xa5, 0xc4, 0xba, 0xe6, 0x2a, 0x08, 0xa1, 0x6a, 0x71, 0x4b, 0xcc, 0x4e, 0x95, 0x62, 0x59, 0xb1, - 0x44, 0x8e, 0xc1, 0xc9, 0xfd, 0xc4, 0x43, 0x39, 0x86, 0x0b, 0x0f, 0xe5, 0x18, 0x4e, 0x3c, 0x92, - 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x05, 0x8f, 0xe5, 0x18, 0x2f, 0x3c, - 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x35, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, - 0x39, 0x3f, 0x57, 0xbf, 0xb8, 0x32, 0x2f, 0xb9, 0x24, 0x23, 0x33, 0x2f, 0x1d, 0x89, 0x05, 0xf1, - 0x7b, 0x12, 0x1b, 0xd8, 0x37, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x30, 0x9a, 0x86, - 0x0c, 0x01, 0x00, 0x00, -} diff --git a/lib/model/fakeconns_test.go b/lib/model/fakeconns_test.go index aebb326aeda..c51a87af4dc 100644 --- a/lib/model/fakeconns_test.go +++ b/lib/model/fakeconns_test.go @@ -90,7 +90,7 @@ func (f *fakeConnection) addFileLocked(name string, flags uint32, ftype protocol file.Permissions = flags if ftype == protocol.FileInfoTypeFile { file.Size = int64(len(data)) - file.RawBlockSize = blockSize + file.RawBlockSize = int32(blockSize) file.Blocks = blocks } default: // Symlink diff --git a/lib/model/folder.go b/lib/model/folder.go index 108861f16a7..f8b8c501f06 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -372,7 +372,7 @@ func (f *folder) pull() (success bool, err error) { if err != nil { return false, err } - snap.WithNeed(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool { + snap.WithNeed(protocol.LocalDeviceID, func(intf protocol.FileInfo) bool { abort = false return false }) @@ -702,7 +702,7 @@ func (f *folder) scanSubdirsChangedAndNew(subDirs []string, batch *scanBatch) (i } func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch) (int, error) { - var toIgnore []db.FileInfoTruncated + var toIgnore []protocol.FileInfo ignoredParent := "" changes := 0 snap, err := f.dbSnapshot() @@ -714,24 +714,23 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch for _, sub := range subDirs { var iterError error - snap.WithPrefixedHaveTruncated(protocol.LocalDeviceID, sub, func(fi protocol.FileIntf) bool { + snap.WithPrefixedHaveTruncated(protocol.LocalDeviceID, sub, func(fi protocol.FileInfo) bool { select { case <-f.ctx.Done(): return false default: } - file := fi.(db.FileInfoTruncated) - if err := batch.FlushIfFull(); err != nil { iterError = err return false } - if ignoredParent != "" && !fs.IsParent(file.Name, ignoredParent) { + if ignoredParent != "" && !fs.IsParent(fi.Name, ignoredParent) { for _, file := range toIgnore { l.Debugln("marking file as ignored", file) - nf := file.ConvertToIgnoredFileInfo() + nf := file + nf.SetIgnored() if batch.Update(nf, snap) { changes++ } @@ -744,38 +743,39 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch ignoredParent = "" } - switch ignored := f.ignores.Match(file.Name).IsIgnored(); { - case file.IsIgnored() && ignored: + switch ignored := f.ignores.Match(fi.Name).IsIgnored(); { + case fi.IsIgnored() && ignored: return true - case !file.IsIgnored() && ignored: + case !fi.IsIgnored() && ignored: // File was not ignored at last pass but has been ignored. - if file.IsDirectory() { + if fi.IsDirectory() { // Delay ignoring as a child might be unignored. - toIgnore = append(toIgnore, file) + toIgnore = append(toIgnore, fi) if ignoredParent == "" { // If the parent wasn't ignored already, set // this path as the "highest" ignored parent - ignoredParent = file.Name + ignoredParent = fi.Name } return true } - l.Debugln("marking file as ignored", file) - nf := file.ConvertToIgnoredFileInfo() + l.Debugln("marking file as ignored", fi) + nf := fi + nf.SetIgnored() if batch.Update(nf, snap) { changes++ } - case file.IsIgnored() && !ignored: + case fi.IsIgnored() && !ignored: // Successfully scanned items are already un-ignored during // the scan, so check whether it is deleted. fallthrough - case !file.IsIgnored() && !file.IsDeleted() && !file.IsUnsupported(): + case !fi.IsIgnored() && !fi.IsDeleted() && !fi.IsUnsupported(): // The file is not ignored, deleted or unsupported. Lets check if // it's still here. Simply stat:ing it won't do as there are // tons of corner cases (e.g. parent dir->symlink, missing // permissions) - if !osutil.IsDeleted(f.mtimefs, file.Name) { + if !osutil.IsDeleted(f.mtimefs, fi.Name) { if ignoredParent != "" { // Don't ignore parents of this not ignored item toIgnore = toIgnore[:0] @@ -783,9 +783,10 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch } return true } - nf := file.ConvertToDeletedFileInfo(f.shortID) + nf := fi + nf.SetDeleted(f.shortID) nf.LocalFlags = f.localFlags - if file.ShouldConflict() { + if fi.ShouldConflict() { // We do not want to override the global version with // the deleted file. Setting to an empty version makes // sure the file gets in sync on the following pull. @@ -795,30 +796,30 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch if batch.Update(nf, snap) { changes++ } - case file.IsDeleted() && file.IsReceiveOnlyChanged(): + case fi.IsDeleted() && fi.IsReceiveOnlyChanged(): switch f.Type { case config.FolderTypeReceiveOnly, config.FolderTypeReceiveEncrypted: - switch gf, ok := snap.GetGlobal(file.Name); { + switch gf, ok := snap.GetGlobal(fi.Name); { case !ok: case gf.IsReceiveOnlyChanged(): - l.Debugln("removing deleted, receive-only item that is globally receive-only from db", file) - batch.Remove(file.Name) + l.Debugln("removing deleted, receive-only item that is globally receive-only from db", fi) + batch.Remove(fi.Name) changes++ case gf.IsDeleted(): // Our item is deleted and the global item is deleted too. We just // pretend it is a normal deleted file (nobody cares about that). - l.Debugf("%v scanning: Marking globally deleted item as not locally changed: %v", f, file.Name) - file.LocalFlags &^= protocol.FlagLocalReceiveOnly - if batch.Update(file.ConvertDeletedToFileInfo(), snap) { + l.Debugf("%v scanning: Marking globally deleted item as not locally changed: %v", f, fi.Name) + fi.LocalFlags &^= protocol.FlagLocalReceiveOnly + if batch.Update(fi, snap) { changes++ } } default: // No need to bump the version for a file that was and is // deleted and just the folder type/local flags changed. - file.LocalFlags &^= protocol.FlagLocalReceiveOnly - l.Debugln("removing receive-only flag on deleted item", file) - if batch.Update(file.ConvertDeletedToFileInfo(), snap) { + fi.LocalFlags &^= protocol.FlagLocalReceiveOnly + l.Debugln("removing receive-only flag on deleted item", fi) + if batch.Update(fi, snap) { changes++ } } @@ -835,8 +836,9 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch if iterError == nil && len(toIgnore) > 0 { for _, file := range toIgnore { - l.Debugln("marking file as ignored", f) - nf := file.ConvertToIgnoredFileInfo() + l.Debugln("marking file as ignored", file) + nf := file + nf.SetIgnored() if batch.Update(nf, snap) { changes++ } @@ -863,9 +865,7 @@ func (f *folder) findRename(snap *db.Snapshot, file protocol.FileInfo, alreadyUs found := false nf := protocol.FileInfo{} - snap.WithBlocksHash(file.BlocksHash, func(ifi protocol.FileIntf) bool { - fi := ifi.(protocol.FileInfo) - + snap.WithBlocksHash(file.BlocksHash, func(fi protocol.FileInfo) bool { select { case <-f.ctx.Done(): return false diff --git a/lib/model/folder_recvenc.go b/lib/model/folder_recvenc.go index e10be6adfd6..2892be116b1 100644 --- a/lib/model/folder_recvenc.go +++ b/lib/model/folder_recvenc.go @@ -56,26 +56,25 @@ func (f *receiveEncryptedFolder) revert() error { defer snap.Release() var iterErr error var dirs []string - snap.WithHaveTruncated(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool { + snap.WithHaveTruncated(protocol.LocalDeviceID, func(fi protocol.FileInfo) bool { if iterErr = batch.FlushIfFull(); iterErr != nil { return false } - fit := intf.(db.FileInfoTruncated) - if !fit.IsReceiveOnlyChanged() || intf.IsDeleted() { + if !fi.IsReceiveOnlyChanged() || fi.IsDeleted() { return true } - if fit.IsDirectory() { - dirs = append(dirs, fit.Name) + if fi.IsDirectory() { + dirs = append(dirs, fi.Name) return true } - if err := f.inWritableDir(f.mtimefs.Remove, fit.Name); err != nil && !fs.IsNotExist(err) { - f.newScanError(fit.Name, fmt.Errorf("deleting unexpected item: %w", err)) + if err := f.inWritableDir(f.mtimefs.Remove, fi.Name); err != nil && !fs.IsNotExist(err) { + f.newScanError(fi.Name, fmt.Errorf("deleting unexpected item: %w", err)) } - fi := fit.ConvertToDeletedFileInfo(f.shortID) + fi.SetDeleted(f.shortID) // Set version to zero, such that we pull the global version in case // this is a valid filename that was erroneously changed locally. // Should already be zero from scanning, but lets be safe. diff --git a/lib/model/folder_recvonly.go b/lib/model/folder_recvonly.go index ec76704f3fe..501a61e3447 100644 --- a/lib/model/folder_recvonly.go +++ b/lib/model/folder_recvonly.go @@ -92,8 +92,7 @@ func (f *receiveOnlyFolder) revert() error { return err } defer snap.Release() - snap.WithHave(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool { - fi := intf.(protocol.FileInfo) + snap.WithHave(protocol.LocalDeviceID, func(fi protocol.FileInfo) bool { if !fi.IsReceiveOnlyChanged() { // We're only interested in files that have changed locally in // receive only mode. @@ -216,7 +215,7 @@ func (q *deleteQueue) flush(snap *db.Snapshot) ([]string, error) { for _, dir := range q.dirs { if err := q.handler.deleteDirOnDisk(dir, snap, q.scanChan); err == nil { deleted = append(deleted, dir) - } else if err != nil && firstError == nil { + } else if firstError == nil { firstError = err } } diff --git a/lib/model/folder_recvonly_test.go b/lib/model/folder_recvonly_test.go index b3c9800b3d4..534677ed204 100644 --- a/lib/model/folder_recvonly_test.go +++ b/lib/model/folder_recvonly_test.go @@ -391,11 +391,10 @@ func TestRecvOnlyRemoteUndoChanges(t *testing.T) { files := make([]protocol.FileInfo, 0, 2) snap := fsetSnapshot(t, f.fset) - snap.WithHave(protocol.LocalDeviceID, func(fi protocol.FileIntf) bool { - if n := fi.FileName(); n != file && n != knownFile { + snap.WithHave(protocol.LocalDeviceID, func(f protocol.FileInfo) bool { + if f.Name != file && f.Name != knownFile { return true } - f := fi.(protocol.FileInfo) f.LocalFlags = 0 f.Version = protocol.Vector{}.Update(device1.Short()) files = append(files, f) @@ -576,7 +575,7 @@ func setupKnownFiles(t *testing.T, ffs fs.Filesystem, data []byte) []protocol.Fi Permissions: 0o644, Size: fi.Size(), ModifiedS: fi.ModTime().Unix(), - ModifiedNs: int(fi.ModTime().UnixNano() % 1e9), + ModifiedNs: int32(fi.ModTime().Nanosecond()), Version: protocol.Vector{Counters: []protocol.Counter{{ID: 42, Value: 42}}}, Sequence: 42, Blocks: blocks, diff --git a/lib/model/folder_sendonly.go b/lib/model/folder_sendonly.go index bf7dfc9842f..4d5d36b19b5 100644 --- a/lib/model/folder_sendonly.go +++ b/lib/model/folder_sendonly.go @@ -48,24 +48,22 @@ func (f *sendOnlyFolder) pull() (bool, error) { return false, err } defer snap.Release() - snap.WithNeed(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool { + snap.WithNeed(protocol.LocalDeviceID, func(file protocol.FileInfo) bool { batch.FlushIfFull() - file := intf.(protocol.FileInfo) - - if f.ignores.Match(intf.FileName()).IsIgnored() { + if f.ignores.Match(file.FileName()).IsIgnored() { file.SetIgnored() batch.Append(file) l.Debugln(f, "Handling ignored file", file) return true } - curFile, ok := snap.Get(protocol.LocalDeviceID, intf.FileName()) + curFile, ok := snap.Get(protocol.LocalDeviceID, file.FileName()) if !ok { - if intf.IsInvalid() { + if file.IsInvalid() { // Global invalid file just exists for need accounting batch.Append(file) - } else if intf.IsDeleted() { + } else if file.IsDeleted() { l.Debugln("Should never get a deleted file as needed when we don't have it") f.evLogger.Log(events.Failure, "got deleted file that doesn't exist locally as needed when pulling on send-only") } @@ -111,8 +109,7 @@ func (f *sendOnlyFolder) override() error { return err } defer snap.Release() - snap.WithNeed(protocol.LocalDeviceID, func(fi protocol.FileIntf) bool { - need := fi.(protocol.FileInfo) + snap.WithNeed(protocol.LocalDeviceID, func(need protocol.FileInfo) bool { _ = batch.FlushIfFull() have, ok := snap.Get(protocol.LocalDeviceID, need.Name) diff --git a/lib/model/folder_sendrecv.go b/lib/model/folder_sendrecv.go index 7834ee7c744..ceb74d130d2 100644 --- a/lib/model/folder_sendrecv.go +++ b/lib/model/folder_sendrecv.go @@ -326,22 +326,20 @@ func (f *sendReceiveFolder) processNeeded(snap *db.Snapshot, dbUpdateChan chan<- // Regular files to pull goes into the file queue, everything else // (directories, symlinks and deletes) goes into the "process directly" // pile. - snap.WithNeed(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool { + snap.WithNeed(protocol.LocalDeviceID, func(file protocol.FileInfo) bool { select { case <-f.ctx.Done(): return false default: } - if f.IgnoreDelete && intf.IsDeleted() { - l.Debugln(f, "ignore file deletion (config)", intf.FileName()) + if f.IgnoreDelete && file.IsDeleted() { + l.Debugln(f, "ignore file deletion (config)", file.FileName()) return true } changed++ - file := intf.(protocol.FileInfo) - switch { case f.ignores.Match(file.Name).IsIgnored(): file.SetIgnored() @@ -1021,13 +1019,13 @@ func (f *sendReceiveFolder) renameFile(cur, source, target protocol.FileInfo, sn if f.versioner != nil { err = f.CheckAvailableSpace(uint64(source.Size)) if err == nil { - err = osutil.Copy(f.CopyRangeMethod, f.mtimefs, f.mtimefs, source.Name, tempName) + err = osutil.Copy(f.CopyRangeMethod.ToFS(), f.mtimefs, f.mtimefs, source.Name, tempName) if err == nil { err = f.inWritableDir(f.versioner.Archive, source.Name) } } } else { - err = osutil.RenameOrCopy(f.CopyRangeMethod, f.mtimefs, f.mtimefs, source.Name, tempName) + err = osutil.RenameOrCopy(f.CopyRangeMethod.ToFS(), f.mtimefs, f.mtimefs, source.Name, tempName) } if err != nil { return err @@ -1387,11 +1385,11 @@ func (f *sendReceiveFolder) copierRoutine(in <-chan copyBlocksState, pullChan ch } } - if f.CopyRangeMethod != fs.CopyRangeMethodStandard { + if f.CopyRangeMethod != config.CopyRangeMethodStandard { err = f.withLimiter(func() error { dstFd.mut.Lock() defer dstFd.mut.Unlock() - return fs.CopyRange(f.CopyRangeMethod, fd, dstFd.fd, srcOffset, block.Offset, int64(block.Size)) + return fs.CopyRange(f.CopyRangeMethod.ToFS(), fd, dstFd.fd, srcOffset, block.Offset, int64(block.Size)) }) } else { err = f.limitedWriteAt(dstFd, buf, block.Offset) @@ -1651,7 +1649,7 @@ func (f *sendReceiveFolder) performFinish(file, curFile protocol.FileInfo, hasCu // Replace the original content with the new one. If it didn't work, // leave the temp file in place for reuse. - if err := osutil.RenameOrCopy(f.CopyRangeMethod, f.mtimefs, f.mtimefs, tempName, file.Name); err != nil { + if err := osutil.RenameOrCopy(f.CopyRangeMethod.ToFS(), f.mtimefs, f.mtimefs, tempName, file.Name); err != nil { return fmt.Errorf("replacing file: %w", err) } diff --git a/lib/model/folder_sendrecv_test.go b/lib/model/folder_sendrecv_test.go index 2c9d128668e..c8e528208d0 100644 --- a/lib/model/folder_sendrecv_test.go +++ b/lib/model/folder_sendrecv_test.go @@ -363,7 +363,7 @@ func TestWeakHash(t *testing.T) { Blocks: existing, Size: size, ModifiedS: info.ModTime().Unix(), - ModifiedNs: info.ModTime().Nanosecond(), + ModifiedNs: int32(info.ModTime().Nanosecond()), } desiredFile := protocol.FileInfo{ Name: "weakhash", @@ -812,7 +812,7 @@ func TestCopyOwner(t *testing.T) { m, f, wcfgCancel := setupSendReceiveFolder(t) defer wcfgCancel() - f.folder.FolderConfiguration = newFolderConfiguration(m.cfg, f.ID, f.Label, fs.FilesystemTypeFake, "/TestCopyOwner") + f.folder.FolderConfiguration = newFolderConfiguration(m.cfg, f.ID, f.Label, config.FilesystemTypeFake, "/TestCopyOwner") f.folder.FolderConfiguration.CopyOwnershipFromParent = true f.fset = newFileSet(t, f.ID, m.db) @@ -1101,11 +1101,11 @@ func TestPullCaseOnlyPerformFinish(t *testing.T) { hasCur := false snap := dbSnapshot(t, m, f.ID) defer snap.Release() - snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileIntf) bool { + snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileInfo) bool { if hasCur { t.Fatal("got more than one file") } - cur = i.(protocol.FileInfo) + cur = i hasCur = true return true }) @@ -1166,11 +1166,11 @@ func testPullCaseOnlyDirOrSymlink(t *testing.T, dir bool) { hasCur := false snap := dbSnapshot(t, m, f.ID) defer snap.Release() - snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileIntf) bool { + snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileInfo) bool { if hasCur { t.Fatal("got more than one file") } - cur = i.(protocol.FileInfo) + cur = i hasCur = true return true }) diff --git a/lib/model/indexhandler.go b/lib/model/indexhandler.go index f72315310d6..23fe49ac6d7 100644 --- a/lib/model/indexhandler.go +++ b/lib/model/indexhandler.go @@ -292,7 +292,7 @@ func (s *indexHandler) sendIndexTo(ctx context.Context, fset *db.FileSet) error } defer snap.Release() previousWasDelete := false - snap.WithHaveSequence(s.localPrevSequence+1, func(fi protocol.FileIntf) bool { + snap.WithHaveSequence(s.localPrevSequence+1, func(fi protocol.FileInfo) bool { // This is to make sure that renames (which is an add followed by a delete) land in the same batch. // Even if the batch is full, we allow a last delete to slip in, we do this by making sure that // the batch ends with a non-delete, or that the last item in the batch is already a delete @@ -329,7 +329,7 @@ func (s *indexHandler) sendIndexTo(ctx context.Context, fset *db.FileSet) error return false } - f = fi.(protocol.FileInfo) + f = fi // If this is a folder receiving encrypted files only, we // mustn't ever send locally changed file infos. Those aren't diff --git a/lib/model/mocks/folderSummaryService.go b/lib/model/mocks/folderSummaryService.go index 4dca3505f84..85340bee305 100644 --- a/lib/model/mocks/folderSummaryService.go +++ b/lib/model/mocks/folderSummaryService.go @@ -9,10 +9,6 @@ import ( ) type FolderSummaryService struct { - OnEventRequestStub func() - onEventRequestMutex sync.RWMutex - onEventRequestArgsForCall []struct { - } ServeStub func(context.Context) error serveMutex sync.RWMutex serveArgsForCall []struct { @@ -41,30 +37,6 @@ type FolderSummaryService struct { invocationsMutex sync.RWMutex } -func (fake *FolderSummaryService) OnEventRequest() { - fake.onEventRequestMutex.Lock() - fake.onEventRequestArgsForCall = append(fake.onEventRequestArgsForCall, struct { - }{}) - stub := fake.OnEventRequestStub - fake.recordInvocation("OnEventRequest", []interface{}{}) - fake.onEventRequestMutex.Unlock() - if stub != nil { - fake.OnEventRequestStub() - } -} - -func (fake *FolderSummaryService) OnEventRequestCallCount() int { - fake.onEventRequestMutex.RLock() - defer fake.onEventRequestMutex.RUnlock() - return len(fake.onEventRequestArgsForCall) -} - -func (fake *FolderSummaryService) OnEventRequestCalls(stub func()) { - fake.onEventRequestMutex.Lock() - defer fake.onEventRequestMutex.Unlock() - fake.OnEventRequestStub = stub -} - func (fake *FolderSummaryService) Serve(arg1 context.Context) error { fake.serveMutex.Lock() ret, specificReturn := fake.serveReturnsOnCall[len(fake.serveArgsForCall)] @@ -193,8 +165,6 @@ func (fake *FolderSummaryService) SummaryReturnsOnCall(i int, result1 *model.Fol func (fake *FolderSummaryService) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.onEventRequestMutex.RLock() - defer fake.onEventRequestMutex.RUnlock() fake.serveMutex.RLock() defer fake.serveMutex.RUnlock() fake.summaryMutex.RLock() diff --git a/lib/model/mocks/model.go b/lib/model/mocks/model.go index 52c28df53ff..3855f7e9951 100644 --- a/lib/model/mocks/model.go +++ b/lib/model/mocks/model.go @@ -328,7 +328,7 @@ type Model struct { result2 []string result3 error } - LocalChangedFolderFilesStub func(string, int, int) ([]db.FileInfoTruncated, error) + LocalChangedFolderFilesStub func(string, int, int) ([]protocol.FileInfo, error) localChangedFolderFilesMutex sync.RWMutex localChangedFolderFilesArgsForCall []struct { arg1 string @@ -336,14 +336,14 @@ type Model struct { arg3 int } localChangedFolderFilesReturns struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error } localChangedFolderFilesReturnsOnCall map[int]struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error } - NeedFolderFilesStub func(string, int, int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, error) + NeedFolderFilesStub func(string, int, int) ([]protocol.FileInfo, []protocol.FileInfo, []protocol.FileInfo, error) needFolderFilesMutex sync.RWMutex needFolderFilesArgsForCall []struct { arg1 string @@ -351,15 +351,15 @@ type Model struct { arg3 int } needFolderFilesReturns struct { - result1 []db.FileInfoTruncated - result2 []db.FileInfoTruncated - result3 []db.FileInfoTruncated + result1 []protocol.FileInfo + result2 []protocol.FileInfo + result3 []protocol.FileInfo result4 error } needFolderFilesReturnsOnCall map[int]struct { - result1 []db.FileInfoTruncated - result2 []db.FileInfoTruncated - result3 []db.FileInfoTruncated + result1 []protocol.FileInfo + result2 []protocol.FileInfo + result3 []protocol.FileInfo result4 error } OnHelloStub func(protocol.DeviceID, net.Addr, protocol.Hello) error @@ -405,7 +405,7 @@ type Model struct { result1 map[string]db.PendingFolder result2 error } - RemoteNeedFolderFilesStub func(string, protocol.DeviceID, int, int) ([]db.FileInfoTruncated, error) + RemoteNeedFolderFilesStub func(string, protocol.DeviceID, int, int) ([]protocol.FileInfo, error) remoteNeedFolderFilesMutex sync.RWMutex remoteNeedFolderFilesArgsForCall []struct { arg1 string @@ -414,11 +414,11 @@ type Model struct { arg4 int } remoteNeedFolderFilesReturns struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error } remoteNeedFolderFilesReturnsOnCall map[int]struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error } RequestStub func(protocol.Connection, *protocol.Request) (protocol.RequestResponse, error) @@ -2095,7 +2095,7 @@ func (fake *Model) LoadIgnoresReturnsOnCall(i int, result1 []string, result2 []s }{result1, result2, result3} } -func (fake *Model) LocalChangedFolderFiles(arg1 string, arg2 int, arg3 int) ([]db.FileInfoTruncated, error) { +func (fake *Model) LocalChangedFolderFiles(arg1 string, arg2 int, arg3 int) ([]protocol.FileInfo, error) { fake.localChangedFolderFilesMutex.Lock() ret, specificReturn := fake.localChangedFolderFilesReturnsOnCall[len(fake.localChangedFolderFilesArgsForCall)] fake.localChangedFolderFilesArgsForCall = append(fake.localChangedFolderFilesArgsForCall, struct { @@ -2122,7 +2122,7 @@ func (fake *Model) LocalChangedFolderFilesCallCount() int { return len(fake.localChangedFolderFilesArgsForCall) } -func (fake *Model) LocalChangedFolderFilesCalls(stub func(string, int, int) ([]db.FileInfoTruncated, error)) { +func (fake *Model) LocalChangedFolderFilesCalls(stub func(string, int, int) ([]protocol.FileInfo, error)) { fake.localChangedFolderFilesMutex.Lock() defer fake.localChangedFolderFilesMutex.Unlock() fake.LocalChangedFolderFilesStub = stub @@ -2135,33 +2135,33 @@ func (fake *Model) LocalChangedFolderFilesArgsForCall(i int) (string, int, int) return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3 } -func (fake *Model) LocalChangedFolderFilesReturns(result1 []db.FileInfoTruncated, result2 error) { +func (fake *Model) LocalChangedFolderFilesReturns(result1 []protocol.FileInfo, result2 error) { fake.localChangedFolderFilesMutex.Lock() defer fake.localChangedFolderFilesMutex.Unlock() fake.LocalChangedFolderFilesStub = nil fake.localChangedFolderFilesReturns = struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error }{result1, result2} } -func (fake *Model) LocalChangedFolderFilesReturnsOnCall(i int, result1 []db.FileInfoTruncated, result2 error) { +func (fake *Model) LocalChangedFolderFilesReturnsOnCall(i int, result1 []protocol.FileInfo, result2 error) { fake.localChangedFolderFilesMutex.Lock() defer fake.localChangedFolderFilesMutex.Unlock() fake.LocalChangedFolderFilesStub = nil if fake.localChangedFolderFilesReturnsOnCall == nil { fake.localChangedFolderFilesReturnsOnCall = make(map[int]struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error }) } fake.localChangedFolderFilesReturnsOnCall[i] = struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error }{result1, result2} } -func (fake *Model) NeedFolderFiles(arg1 string, arg2 int, arg3 int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, error) { +func (fake *Model) NeedFolderFiles(arg1 string, arg2 int, arg3 int) ([]protocol.FileInfo, []protocol.FileInfo, []protocol.FileInfo, error) { fake.needFolderFilesMutex.Lock() ret, specificReturn := fake.needFolderFilesReturnsOnCall[len(fake.needFolderFilesArgsForCall)] fake.needFolderFilesArgsForCall = append(fake.needFolderFilesArgsForCall, struct { @@ -2188,7 +2188,7 @@ func (fake *Model) NeedFolderFilesCallCount() int { return len(fake.needFolderFilesArgsForCall) } -func (fake *Model) NeedFolderFilesCalls(stub func(string, int, int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, error)) { +func (fake *Model) NeedFolderFilesCalls(stub func(string, int, int) ([]protocol.FileInfo, []protocol.FileInfo, []protocol.FileInfo, error)) { fake.needFolderFilesMutex.Lock() defer fake.needFolderFilesMutex.Unlock() fake.NeedFolderFilesStub = stub @@ -2201,34 +2201,34 @@ func (fake *Model) NeedFolderFilesArgsForCall(i int) (string, int, int) { return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3 } -func (fake *Model) NeedFolderFilesReturns(result1 []db.FileInfoTruncated, result2 []db.FileInfoTruncated, result3 []db.FileInfoTruncated, result4 error) { +func (fake *Model) NeedFolderFilesReturns(result1 []protocol.FileInfo, result2 []protocol.FileInfo, result3 []protocol.FileInfo, result4 error) { fake.needFolderFilesMutex.Lock() defer fake.needFolderFilesMutex.Unlock() fake.NeedFolderFilesStub = nil fake.needFolderFilesReturns = struct { - result1 []db.FileInfoTruncated - result2 []db.FileInfoTruncated - result3 []db.FileInfoTruncated + result1 []protocol.FileInfo + result2 []protocol.FileInfo + result3 []protocol.FileInfo result4 error }{result1, result2, result3, result4} } -func (fake *Model) NeedFolderFilesReturnsOnCall(i int, result1 []db.FileInfoTruncated, result2 []db.FileInfoTruncated, result3 []db.FileInfoTruncated, result4 error) { +func (fake *Model) NeedFolderFilesReturnsOnCall(i int, result1 []protocol.FileInfo, result2 []protocol.FileInfo, result3 []protocol.FileInfo, result4 error) { fake.needFolderFilesMutex.Lock() defer fake.needFolderFilesMutex.Unlock() fake.NeedFolderFilesStub = nil if fake.needFolderFilesReturnsOnCall == nil { fake.needFolderFilesReturnsOnCall = make(map[int]struct { - result1 []db.FileInfoTruncated - result2 []db.FileInfoTruncated - result3 []db.FileInfoTruncated + result1 []protocol.FileInfo + result2 []protocol.FileInfo + result3 []protocol.FileInfo result4 error }) } fake.needFolderFilesReturnsOnCall[i] = struct { - result1 []db.FileInfoTruncated - result2 []db.FileInfoTruncated - result3 []db.FileInfoTruncated + result1 []protocol.FileInfo + result2 []protocol.FileInfo + result3 []protocol.FileInfo result4 error }{result1, result2, result3, result4} } @@ -2448,7 +2448,7 @@ func (fake *Model) PendingFoldersReturnsOnCall(i int, result1 map[string]db.Pend }{result1, result2} } -func (fake *Model) RemoteNeedFolderFiles(arg1 string, arg2 protocol.DeviceID, arg3 int, arg4 int) ([]db.FileInfoTruncated, error) { +func (fake *Model) RemoteNeedFolderFiles(arg1 string, arg2 protocol.DeviceID, arg3 int, arg4 int) ([]protocol.FileInfo, error) { fake.remoteNeedFolderFilesMutex.Lock() ret, specificReturn := fake.remoteNeedFolderFilesReturnsOnCall[len(fake.remoteNeedFolderFilesArgsForCall)] fake.remoteNeedFolderFilesArgsForCall = append(fake.remoteNeedFolderFilesArgsForCall, struct { @@ -2476,7 +2476,7 @@ func (fake *Model) RemoteNeedFolderFilesCallCount() int { return len(fake.remoteNeedFolderFilesArgsForCall) } -func (fake *Model) RemoteNeedFolderFilesCalls(stub func(string, protocol.DeviceID, int, int) ([]db.FileInfoTruncated, error)) { +func (fake *Model) RemoteNeedFolderFilesCalls(stub func(string, protocol.DeviceID, int, int) ([]protocol.FileInfo, error)) { fake.remoteNeedFolderFilesMutex.Lock() defer fake.remoteNeedFolderFilesMutex.Unlock() fake.RemoteNeedFolderFilesStub = stub @@ -2489,28 +2489,28 @@ func (fake *Model) RemoteNeedFolderFilesArgsForCall(i int) (string, protocol.Dev return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3, argsForCall.arg4 } -func (fake *Model) RemoteNeedFolderFilesReturns(result1 []db.FileInfoTruncated, result2 error) { +func (fake *Model) RemoteNeedFolderFilesReturns(result1 []protocol.FileInfo, result2 error) { fake.remoteNeedFolderFilesMutex.Lock() defer fake.remoteNeedFolderFilesMutex.Unlock() fake.RemoteNeedFolderFilesStub = nil fake.remoteNeedFolderFilesReturns = struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error }{result1, result2} } -func (fake *Model) RemoteNeedFolderFilesReturnsOnCall(i int, result1 []db.FileInfoTruncated, result2 error) { +func (fake *Model) RemoteNeedFolderFilesReturnsOnCall(i int, result1 []protocol.FileInfo, result2 error) { fake.remoteNeedFolderFilesMutex.Lock() defer fake.remoteNeedFolderFilesMutex.Unlock() fake.RemoteNeedFolderFilesStub = nil if fake.remoteNeedFolderFilesReturnsOnCall == nil { fake.remoteNeedFolderFilesReturnsOnCall = make(map[int]struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error }) } fake.remoteNeedFolderFilesReturnsOnCall[i] = struct { - result1 []db.FileInfoTruncated + result1 []protocol.FileInfo result2 error }{result1, result2} } diff --git a/lib/model/model.go b/lib/model/model.go index d5e64734168..a77bda7435a 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -94,9 +94,9 @@ type Model interface { RestoreFolderVersions(folder string, versions map[string]time.Time) (map[string]error, error) DBSnapshot(folder string) (*db.Snapshot, error) - NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, error) - RemoteNeedFolderFiles(folder string, device protocol.DeviceID, page, perpage int) ([]db.FileInfoTruncated, error) - LocalChangedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, error) + NeedFolderFiles(folder string, page, perpage int) ([]protocol.FileInfo, []protocol.FileInfo, []protocol.FileInfo, error) + RemoteNeedFolderFiles(folder string, device protocol.DeviceID, page, perpage int) ([]protocol.FileInfo, error) + LocalChangedFolderFiles(folder string, page, perpage int) ([]protocol.FileInfo, error) FolderProgressBytesCompleted(folder string) int64 CurrentFolderFile(folder string, file string) (protocol.FileInfo, bool, error) @@ -944,7 +944,7 @@ func (m *model) folderCompletion(device protocol.DeviceID, folder string) (Folde need := snap.NeedSize(device) need.Bytes -= downloaded - // This might might be more than it really is, because some blocks can be of a smaller size. + // This might be more than it really is, because some blocks can be of a smaller size. if need.Bytes < 0 { need.Bytes = 0 } @@ -973,7 +973,7 @@ func (m *model) FolderProgressBytesCompleted(folder string) int64 { // NeedFolderFiles returns paginated list of currently needed files in // progress, queued, and to be queued on next puller iteration. -func (m *model) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, error) { +func (m *model) NeedFolderFiles(folder string, page, perpage int) ([]protocol.FileInfo, []protocol.FileInfo, []protocol.FileInfo, error) { m.mut.RLock() rf, rfOk := m.folderFiles[folder] runner, runnerOk := m.folderRunners.Get(folder) @@ -989,7 +989,7 @@ func (m *model) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfo return nil, nil, nil, err } defer snap.Release() - var progress, queued, rest []db.FileInfoTruncated + var progress, queued, rest []protocol.FileInfo var seen map[string]struct{} p := newPager(page, perpage) @@ -997,8 +997,8 @@ func (m *model) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfo if runnerOk { progressNames, queuedNames, skipped := runner.Jobs(page, perpage) - progress = make([]db.FileInfoTruncated, len(progressNames)) - queued = make([]db.FileInfoTruncated, len(queuedNames)) + progress = make([]protocol.FileInfo, len(progressNames)) + queued = make([]protocol.FileInfo, len(queuedNames)) seen = make(map[string]struct{}, len(progressNames)+len(queuedNames)) for i, name := range progressNames { @@ -1022,8 +1022,8 @@ func (m *model) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfo p.toSkip -= skipped } - rest = make([]db.FileInfoTruncated, 0, perpage) - snap.WithNeedTruncated(protocol.LocalDeviceID, func(f protocol.FileIntf) bool { + rest = make([]protocol.FileInfo, 0, perpage) + snap.WithNeedTruncated(protocol.LocalDeviceID, func(f protocol.FileInfo) bool { if cfg.IgnoreDelete && f.IsDeleted() { return true } @@ -1031,9 +1031,8 @@ func (m *model) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfo if p.skip() { return true } - ft := f.(db.FileInfoTruncated) - if _, ok := seen[ft.Name]; !ok { - rest = append(rest, ft) + if _, ok := seen[f.Name]; !ok { + rest = append(rest, f) p.get-- } return p.get > 0 @@ -1044,7 +1043,7 @@ func (m *model) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfo // RemoteNeedFolderFiles returns paginated list of currently needed files for a // remote device to become synced with a folder. -func (m *model) RemoteNeedFolderFiles(folder string, device protocol.DeviceID, page, perpage int) ([]db.FileInfoTruncated, error) { +func (m *model) RemoteNeedFolderFiles(folder string, device protocol.DeviceID, page, perpage int) ([]protocol.FileInfo, error) { m.mut.RLock() rf, ok := m.folderFiles[folder] m.mut.RUnlock() @@ -1059,19 +1058,19 @@ func (m *model) RemoteNeedFolderFiles(folder string, device protocol.DeviceID, p } defer snap.Release() - files := make([]db.FileInfoTruncated, 0, perpage) + files := make([]protocol.FileInfo, 0, perpage) p := newPager(page, perpage) - snap.WithNeedTruncated(device, func(f protocol.FileIntf) bool { + snap.WithNeedTruncated(device, func(f protocol.FileInfo) bool { if p.skip() { return true } - files = append(files, f.(db.FileInfoTruncated)) + files = append(files, f) return !p.done() }) return files, nil } -func (m *model) LocalChangedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, error) { +func (m *model) LocalChangedFolderFiles(folder string, page, perpage int) ([]protocol.FileInfo, error) { m.mut.RLock() rf, ok := m.folderFiles[folder] m.mut.RUnlock() @@ -1091,17 +1090,16 @@ func (m *model) LocalChangedFolderFiles(folder string, page, perpage int) ([]db. } p := newPager(page, perpage) - files := make([]db.FileInfoTruncated, 0, perpage) + files := make([]protocol.FileInfo, 0, perpage) - snap.WithHaveTruncated(protocol.LocalDeviceID, func(f protocol.FileIntf) bool { + snap.WithHaveTruncated(protocol.LocalDeviceID, func(f protocol.FileInfo) bool { if !f.IsReceiveOnlyChanged() { return true } if p.skip() { return true } - ft := f.(db.FileInfoTruncated) - files = append(files, ft) + files = append(files, f) return !p.done() }) @@ -1751,7 +1749,7 @@ func (*model) handleDeintroductions(introducerCfg config.DeviceConfiguration, fo // AutoAcceptFolders set to true. func (m *model) handleAutoAccepts(deviceID protocol.DeviceID, folder protocol.Folder, ccDeviceInfos *clusterConfigDeviceInfo, cfg config.FolderConfiguration, haveCfg bool, defaultFolderCfg config.FolderConfiguration) (config.FolderConfiguration, bool) { if !haveCfg { - defaultPathFs := fs.NewFilesystem(defaultFolderCfg.FilesystemType, defaultFolderCfg.Path) + defaultPathFs := fs.NewFilesystem(defaultFolderCfg.FilesystemType.ToFS(), defaultFolderCfg.Path) var pathAlternatives []string if alt := fs.SanitizePath(folder.Label); alt != "" { pathAlternatives = append(pathAlternatives, alt) @@ -2634,7 +2632,7 @@ func (m *model) generateClusterConfigRLocked(device protocol.DeviceID) (*protoco ID: deviceCfg.DeviceID, Name: deviceCfg.Name, Addresses: deviceCfg.Addresses, - Compression: deviceCfg.Compression, + Compression: deviceCfg.Compression.ToProtocol(), CertName: deviceCfg.CertName, Introducer: deviceCfg.Introducer, } @@ -2773,9 +2771,7 @@ func (m *model) GlobalDirectoryTree(folder, prefix string, levels int, dirsOnly return nil, err } defer snap.Release() - snap.WithPrefixedGlobalTruncated(prefix, func(fi protocol.FileIntf) bool { - f := fi.(db.FileInfoTruncated) - + snap.WithPrefixedGlobalTruncated(prefix, func(f protocol.FileInfo) bool { // Don't include the prefix itself. if f.IsInvalid() || f.IsDeleted() || strings.HasPrefix(prefix, f.Name) { return true @@ -3471,7 +3467,7 @@ func writeEncryptionToken(token []byte, cfg config.FolderConfiguration) error { }) } -func newFolderConfiguration(w config.Wrapper, id, label string, fsType fs.FilesystemType, path string) config.FolderConfiguration { +func newFolderConfiguration(w config.Wrapper, id, label string, fsType config.FilesystemType, path string) config.FolderConfiguration { fcfg := w.DefaultFolder() fcfg.ID = id fcfg.Label = label diff --git a/lib/model/model_test.go b/lib/model/model_test.go index 88a7faa67a9..4935bf1634c 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -391,7 +391,7 @@ func TestClusterConfig(t *testing.T) { } cfg.Folders = []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata1", Devices: []config.FolderDeviceConfiguration{ @@ -400,7 +400,7 @@ func TestClusterConfig(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder2", Path: "testdata2", Paused: true, // should still be included @@ -410,7 +410,7 @@ func TestClusterConfig(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder3", Path: "testdata3", Devices: []config.FolderDeviceConfiguration{ @@ -499,7 +499,7 @@ func TestIntroducer(t *testing.T) { }, Folders: []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -507,7 +507,7 @@ func TestIntroducer(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder2", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -560,7 +560,7 @@ func TestIntroducer(t *testing.T) { }, Folders: []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -569,7 +569,7 @@ func TestIntroducer(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder2", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -615,7 +615,7 @@ func TestIntroducer(t *testing.T) { }, Folders: []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -624,7 +624,7 @@ func TestIntroducer(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder2", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -667,7 +667,7 @@ func TestIntroducer(t *testing.T) { }, Folders: []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -676,7 +676,7 @@ func TestIntroducer(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder2", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -719,7 +719,7 @@ func TestIntroducer(t *testing.T) { }, Folders: []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -728,7 +728,7 @@ func TestIntroducer(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder2", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -775,7 +775,7 @@ func TestIntroducer(t *testing.T) { }, Folders: []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -784,7 +784,7 @@ func TestIntroducer(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder2", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -826,7 +826,7 @@ func TestIntroducer(t *testing.T) { }, Folders: []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -835,7 +835,7 @@ func TestIntroducer(t *testing.T) { }, }, { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder2", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -873,7 +873,7 @@ func TestIssue4897(t *testing.T) { }, Folders: []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: "testdata", Devices: []config.FolderDeviceConfiguration{ @@ -1030,7 +1030,7 @@ func TestAutoAcceptNewFolderPremutationsNoPanic(t *testing.T) { for _, dev2folder := range premutations { cfg := defaultAutoAcceptCfg.Copy() if localFolder.Label != "" { - fcfg := newFolderConfiguration(defaultCfgWrapper, localFolder.ID, localFolder.Label, fs.FilesystemTypeFake, localFolder.ID) + fcfg := newFolderConfiguration(defaultCfgWrapper, localFolder.ID, localFolder.Label, config.FilesystemTypeFake, localFolder.ID) fcfg.Paused = localFolderPaused cfg.Folders = append(cfg.Folders, fcfg) } @@ -1075,7 +1075,7 @@ func TestAutoAcceptExistingFolder(t *testing.T) { tcfg := defaultAutoAcceptCfg.Copy() tcfg.Folders = []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: id, Path: idOther, // To check that path does not get changed. }, @@ -1101,7 +1101,7 @@ func TestAutoAcceptNewAndExistingFolder(t *testing.T) { tcfg := defaultAutoAcceptCfg.Copy() tcfg.Folders = []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: id1, Path: id1, // from previous test case, to verify that path doesn't get changed. }, @@ -1127,7 +1127,7 @@ func TestAutoAcceptAlreadyShared(t *testing.T) { tcfg := defaultAutoAcceptCfg.Copy() tcfg.Folders = []config.FolderConfiguration{ { - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: id, Path: id, Devices: []config.FolderDeviceConfiguration{ @@ -1226,7 +1226,7 @@ func TestAutoAcceptPausedWhenFolderConfigChanged(t *testing.T) { idOther := srand.String(8) // To check that path does not get changed. tcfg := defaultAutoAcceptCfg.Copy() - fcfg := newFolderConfiguration(defaultCfgWrapper, id, "", fs.FilesystemTypeFake, idOther) + fcfg := newFolderConfiguration(defaultCfgWrapper, id, "", config.FilesystemTypeFake, idOther) fcfg.Paused = true // The order of devices here is wrong (cfg.clean() sorts them), which will cause the folder to restart. // Because of the restart, folder gets removed from m.deviceFolder, which means that generateClusterConfig will not panic. @@ -1272,7 +1272,7 @@ func TestAutoAcceptPausedWhenFolderConfigNotChanged(t *testing.T) { idOther := srand.String(8) // To check that path does not get changed. tcfg := defaultAutoAcceptCfg.Copy() - fcfg := newFolderConfiguration(defaultCfgWrapper, id, "", fs.FilesystemTypeFake, idOther) + fcfg := newFolderConfiguration(defaultCfgWrapper, id, "", config.FilesystemTypeFake, idOther) fcfg.Paused = true // The new folder is exactly the same as the one constructed by handleAutoAccept, which means // the folder will not be restarted (even if it's paused), yet handleAutoAccept used to add the folder @@ -1521,7 +1521,7 @@ func TestIgnores(t *testing.T) { // Invalid path, treated like no patterns at all. fcfg := config.FolderConfiguration{ ID: "fresh", Path: "XXX", - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, } ignores := ignore.New(fcfg.Filesystem(nil), ignore.WithCache(m.cfg.Options().CacheIgnoredFiles)) m.mut.Lock() @@ -1609,7 +1609,7 @@ func waitForState(t *testing.T, sub events.Subscription, folder, expected string func TestROScanRecovery(t *testing.T) { fcfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "default", Path: srand.String(32), Type: config.FolderTypeSendOnly, @@ -1656,7 +1656,7 @@ func TestROScanRecovery(t *testing.T) { func TestRWScanRecovery(t *testing.T) { fcfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "default", Path: srand.String(32), Type: config.FolderTypeSendReceive, @@ -2522,7 +2522,7 @@ func TestVersionRestore(t *testing.T) { // We verify that the content matches at the expected filenames // after the restore operation. - fcfg := newFolderConfiguration(defaultCfgWrapper, "default", "default", fs.FilesystemTypeFake, srand.String(32)) + fcfg := newFolderConfiguration(defaultCfgWrapper, "default", "default", config.FilesystemTypeFake, srand.String(32)) fcfg.Versioning.Type = "simple" fcfg.FSWatcherEnabled = false filesystem := fcfg.Filesystem(nil) @@ -2744,7 +2744,7 @@ func TestIssue4094(t *testing.T) { folderPath := "nonexistent" cfg := defaultCfgWrapper.RawCopy() fcfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, ID: "folder1", Path: folderPath, Paused: true, @@ -2861,7 +2861,7 @@ func TestFolderRestartZombies(t *testing.T) { waiter, err := wrapper.Modify(func(cfg *config.Configuration) { cfg.Options.RawMaxFolderConcurrency = -1 _, i, _ := cfg.Folder("default") - cfg.Folders[i].FilesystemType = fs.FilesystemTypeFake + cfg.Folders[i].FilesystemType = config.FilesystemTypeFake }) must(t, err) waiter.Wait() @@ -3204,7 +3204,7 @@ func TestRenameSequenceOrder(t *testing.T) { count := 0 snap := dbSnapshot(t, m, "default") - snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileIntf) bool { + snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileInfo) bool { count++ return true }) @@ -3236,7 +3236,7 @@ func TestRenameSequenceOrder(t *testing.T) { var firstExpectedSequence int64 var secondExpectedSequence int64 failed := false - snap.WithHaveSequence(0, func(i protocol.FileIntf) bool { + snap.WithHaveSequence(0, func(i protocol.FileInfo) bool { t.Log(i) if i.FileName() == "17" { firstExpectedSequence = i.SequenceNo() + 1 @@ -3270,7 +3270,7 @@ func TestRenameSameFile(t *testing.T) { count := 0 snap := dbSnapshot(t, m, "default") - snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileIntf) bool { + snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileInfo) bool { count++ return true }) @@ -3293,7 +3293,7 @@ func TestRenameSameFile(t *testing.T) { prevSeq := int64(0) seen := false - snap.WithHaveSequence(0, func(i protocol.FileIntf) bool { + snap.WithHaveSequence(0, func(i protocol.FileInfo) bool { if i.SequenceNo() <= prevSeq { t.Fatalf("non-increasing sequences: %d <= %d", i.SequenceNo(), prevSeq) } @@ -3333,7 +3333,7 @@ func TestRenameEmptyFile(t *testing.T) { } count := 0 - snap.WithBlocksHash(empty.BlocksHash, func(_ protocol.FileIntf) bool { + snap.WithBlocksHash(empty.BlocksHash, func(_ protocol.FileInfo) bool { count++ return true }) @@ -3343,7 +3343,7 @@ func TestRenameEmptyFile(t *testing.T) { } count = 0 - snap.WithBlocksHash(file.BlocksHash, func(_ protocol.FileIntf) bool { + snap.WithBlocksHash(file.BlocksHash, func(_ protocol.FileInfo) bool { count++ return true }) @@ -3362,7 +3362,7 @@ func TestRenameEmptyFile(t *testing.T) { defer snap.Release() count = 0 - snap.WithBlocksHash(empty.BlocksHash, func(_ protocol.FileIntf) bool { + snap.WithBlocksHash(empty.BlocksHash, func(_ protocol.FileInfo) bool { count++ return true }) @@ -3372,7 +3372,7 @@ func TestRenameEmptyFile(t *testing.T) { } count = 0 - snap.WithBlocksHash(file.BlocksHash, func(i protocol.FileIntf) bool { + snap.WithBlocksHash(file.BlocksHash, func(i protocol.FileInfo) bool { count++ if i.FileName() != "new-file" { t.Fatalf("unexpected file name %s, expected new-file", i.FileName()) @@ -3408,7 +3408,7 @@ func TestBlockListMap(t *testing.T) { } var paths []string - snap.WithBlocksHash(fi.BlocksHash, func(fi protocol.FileIntf) bool { + snap.WithBlocksHash(fi.BlocksHash, func(fi protocol.FileInfo) bool { paths = append(paths, fi.FileName()) return true }) @@ -3441,7 +3441,7 @@ func TestBlockListMap(t *testing.T) { defer snap.Release() paths = paths[:0] - snap.WithBlocksHash(fi.BlocksHash, func(fi protocol.FileIntf) bool { + snap.WithBlocksHash(fi.BlocksHash, func(fi protocol.FileInfo) bool { paths = append(paths, fi.FileName()) return true }) @@ -3468,7 +3468,7 @@ func TestScanRenameCaseOnly(t *testing.T) { snap := dbSnapshot(t, m, fcfg.ID) defer snap.Release() found := false - snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileIntf) bool { + snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileInfo) bool { if found { t.Fatal("got more than one file") } @@ -3487,7 +3487,7 @@ func TestScanRenameCaseOnly(t *testing.T) { snap = dbSnapshot(t, m, fcfg.ID) defer snap.Release() found = false - snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileIntf) bool { + snap.WithHave(protocol.LocalDeviceID, func(i protocol.FileInfo) bool { if i.FileName() == name { if i.IsDeleted() { return true diff --git a/lib/model/sharedpullerstate.go b/lib/model/sharedpullerstate.go index 384d05d6cbb..70b82dc3143 100644 --- a/lib/model/sharedpullerstate.go +++ b/lib/model/sharedpullerstate.go @@ -12,6 +12,9 @@ import ( "io" "time" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/protoutil" "github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/osutil" "github.com/syncthing/syncthing/lib/protocol" @@ -386,7 +389,7 @@ func writeEncryptionTrailer(file protocol.FileInfo, writer io.WriterAt) (int64, trailerSize := encryptionTrailerSize(wireFile) bs := make([]byte, trailerSize) - n, err := wireFile.MarshalTo(bs) + n, err := protoutil.MarshalTo(bs, wireFile.ToWire(false)) if err != nil { return 0, err } @@ -401,7 +404,7 @@ func writeEncryptionTrailer(file protocol.FileInfo, writer io.WriterAt) (int64, } func encryptionTrailerSize(file protocol.FileInfo) int64 { - return int64(file.ProtoSize()) + 4 + return int64(proto.Size(file.ToWire(false))) + 4 // XXX: Inefficient } // Progress returns the momentarily progress for the puller diff --git a/lib/model/testutils_test.go b/lib/model/testutils_test.go index 63834c3d513..1e203f9fd23 100644 --- a/lib/model/testutils_test.go +++ b/lib/model/testutils_test.go @@ -75,7 +75,7 @@ func init() { }, Defaults: config.Defaults{ Folder: config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeFake, + FilesystemType: config.FilesystemTypeFake, Path: rand.String(32), }, }, @@ -102,7 +102,7 @@ func newDefaultCfgWrapper() (config.Wrapper, config.FolderConfiguration, context } func newFolderConfig() config.FolderConfiguration { - cfg := newFolderConfiguration(defaultCfgWrapper, "default", "default", fs.FilesystemTypeFake, rand.String(32)+"?content=true") + cfg := newFolderConfiguration(defaultCfgWrapper, "default", "default", config.FilesystemTypeFake, rand.String(32)+"?content=true") cfg.FSWatcherEnabled = false cfg.Devices = append(cfg.Devices, config.FolderDeviceConfiguration{DeviceID: device1}) return cfg diff --git a/lib/osutil/osutil.go b/lib/osutil/osutil.go index e2c2ba1ff6b..572bfe919cd 100644 --- a/lib/osutil/osutil.go +++ b/lib/osutil/osutil.go @@ -73,7 +73,7 @@ func RenameOrCopy(method fs.CopyRangeMethod, src, dst fs.Filesystem, from, to st // Copy copies the file content from source to destination. // Tries hard to succeed on various systems by temporarily tweaking directory // permissions and removing the destination file when necessary. -func Copy(method fs.CopyRangeMethod, src, dst fs.Filesystem, from, to string) (err error) { +func Copy(method fs.CopyRangeMethod, src, dst fs.Filesystem, from, to string) error { return withPreparedTarget(dst, from, to, func() error { return copyFileContents(method, src, dst, from, to) }) diff --git a/lib/protocol/LICENSE b/lib/protocol/LICENSE deleted file mode 100644 index 6f6960a7544..00000000000 --- a/lib/protocol/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (C) 2014-2015 The Protocol Authors - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -- The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/lib/protocol/benchmark_test.go b/lib/protocol/benchmark_test.go index 089760a27cc..e8811a2924f 100644 --- a/lib/protocol/benchmark_test.go +++ b/lib/protocol/benchmark_test.go @@ -1,4 +1,8 @@ -// Copyright (C) 2016 The Protocol Authors. +// Copyright (C) 2016 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/protocol/bep.pb.go b/lib/protocol/bep.pb.go deleted file mode 100644 index af9cdadf2f2..00000000000 --- a/lib/protocol/bep.pb.go +++ /dev/null @@ -1,6989 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/protocol/bep.proto - -package protocol - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type MessageType int32 - -const ( - MessageTypeClusterConfig MessageType = 0 - MessageTypeIndex MessageType = 1 - MessageTypeIndexUpdate MessageType = 2 - MessageTypeRequest MessageType = 3 - MessageTypeResponse MessageType = 4 - MessageTypeDownloadProgress MessageType = 5 - MessageTypePing MessageType = 6 - MessageTypeClose MessageType = 7 -) - -var MessageType_name = map[int32]string{ - 0: "MESSAGE_TYPE_CLUSTER_CONFIG", - 1: "MESSAGE_TYPE_INDEX", - 2: "MESSAGE_TYPE_INDEX_UPDATE", - 3: "MESSAGE_TYPE_REQUEST", - 4: "MESSAGE_TYPE_RESPONSE", - 5: "MESSAGE_TYPE_DOWNLOAD_PROGRESS", - 6: "MESSAGE_TYPE_PING", - 7: "MESSAGE_TYPE_CLOSE", -} - -var MessageType_value = map[string]int32{ - "MESSAGE_TYPE_CLUSTER_CONFIG": 0, - "MESSAGE_TYPE_INDEX": 1, - "MESSAGE_TYPE_INDEX_UPDATE": 2, - "MESSAGE_TYPE_REQUEST": 3, - "MESSAGE_TYPE_RESPONSE": 4, - "MESSAGE_TYPE_DOWNLOAD_PROGRESS": 5, - "MESSAGE_TYPE_PING": 6, - "MESSAGE_TYPE_CLOSE": 7, -} - -func (x MessageType) String() string { - return proto.EnumName(MessageType_name, int32(x)) -} - -func (MessageType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{0} -} - -type MessageCompression int32 - -const ( - MessageCompressionNone MessageCompression = 0 - MessageCompressionLZ4 MessageCompression = 1 -) - -var MessageCompression_name = map[int32]string{ - 0: "MESSAGE_COMPRESSION_NONE", - 1: "MESSAGE_COMPRESSION_LZ4", -} - -var MessageCompression_value = map[string]int32{ - "MESSAGE_COMPRESSION_NONE": 0, - "MESSAGE_COMPRESSION_LZ4": 1, -} - -func (x MessageCompression) String() string { - return proto.EnumName(MessageCompression_name, int32(x)) -} - -func (MessageCompression) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{1} -} - -type Compression int32 - -const ( - CompressionMetadata Compression = 0 - CompressionNever Compression = 1 - CompressionAlways Compression = 2 -) - -var Compression_name = map[int32]string{ - 0: "COMPRESSION_METADATA", - 1: "COMPRESSION_NEVER", - 2: "COMPRESSION_ALWAYS", -} - -var Compression_value = map[string]int32{ - "COMPRESSION_METADATA": 0, - "COMPRESSION_NEVER": 1, - "COMPRESSION_ALWAYS": 2, -} - -func (x Compression) String() string { - return proto.EnumName(Compression_name, int32(x)) -} - -func (Compression) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{2} -} - -type FileInfoType int32 - -const ( - FileInfoTypeFile FileInfoType = 0 - FileInfoTypeDirectory FileInfoType = 1 - FileInfoTypeSymlinkFile FileInfoType = 2 // Deprecated: Do not use. - FileInfoTypeSymlinkDirectory FileInfoType = 3 // Deprecated: Do not use. - FileInfoTypeSymlink FileInfoType = 4 -) - -var FileInfoType_name = map[int32]string{ - 0: "FILE_INFO_TYPE_FILE", - 1: "FILE_INFO_TYPE_DIRECTORY", - 2: "FILE_INFO_TYPE_SYMLINK_FILE", - 3: "FILE_INFO_TYPE_SYMLINK_DIRECTORY", - 4: "FILE_INFO_TYPE_SYMLINK", -} - -var FileInfoType_value = map[string]int32{ - "FILE_INFO_TYPE_FILE": 0, - "FILE_INFO_TYPE_DIRECTORY": 1, - "FILE_INFO_TYPE_SYMLINK_FILE": 2, - "FILE_INFO_TYPE_SYMLINK_DIRECTORY": 3, - "FILE_INFO_TYPE_SYMLINK": 4, -} - -func (x FileInfoType) String() string { - return proto.EnumName(FileInfoType_name, int32(x)) -} - -func (FileInfoType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{3} -} - -type ErrorCode int32 - -const ( - ErrorCodeNoError ErrorCode = 0 - ErrorCodeGeneric ErrorCode = 1 - ErrorCodeNoSuchFile ErrorCode = 2 - ErrorCodeInvalidFile ErrorCode = 3 -) - -var ErrorCode_name = map[int32]string{ - 0: "ERROR_CODE_NO_ERROR", - 1: "ERROR_CODE_GENERIC", - 2: "ERROR_CODE_NO_SUCH_FILE", - 3: "ERROR_CODE_INVALID_FILE", -} - -var ErrorCode_value = map[string]int32{ - "ERROR_CODE_NO_ERROR": 0, - "ERROR_CODE_GENERIC": 1, - "ERROR_CODE_NO_SUCH_FILE": 2, - "ERROR_CODE_INVALID_FILE": 3, -} - -func (x ErrorCode) String() string { - return proto.EnumName(ErrorCode_name, int32(x)) -} - -func (ErrorCode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{4} -} - -type FileDownloadProgressUpdateType int32 - -const ( - FileDownloadProgressUpdateTypeAppend FileDownloadProgressUpdateType = 0 - FileDownloadProgressUpdateTypeForget FileDownloadProgressUpdateType = 1 -) - -var FileDownloadProgressUpdateType_name = map[int32]string{ - 0: "FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND", - 1: "FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_FORGET", -} - -var FileDownloadProgressUpdateType_value = map[string]int32{ - "FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND": 0, - "FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_FORGET": 1, -} - -func (x FileDownloadProgressUpdateType) String() string { - return proto.EnumName(FileDownloadProgressUpdateType_name, int32(x)) -} - -func (FileDownloadProgressUpdateType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{5} -} - -type Hello struct { - DeviceName string `protobuf:"bytes,1,opt,name=device_name,json=deviceName,proto3" json:"deviceName" xml:"deviceName"` - ClientName string `protobuf:"bytes,2,opt,name=client_name,json=clientName,proto3" json:"clientName" xml:"clientName"` - ClientVersion string `protobuf:"bytes,3,opt,name=client_version,json=clientVersion,proto3" json:"clientVersion" xml:"clientVersion"` - NumConnections int `protobuf:"varint,4,opt,name=num_connections,json=numConnections,proto3,casttype=int" json:"numConnections" xml:"numConnections"` - Timestamp int64 `protobuf:"varint,5,opt,name=timestamp,proto3" json:"timestamp" xml:"timestamp"` -} - -func (m *Hello) Reset() { *m = Hello{} } -func (m *Hello) String() string { return proto.CompactTextString(m) } -func (*Hello) ProtoMessage() {} -func (*Hello) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{0} -} -func (m *Hello) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Hello) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Hello.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Hello) XXX_Merge(src proto.Message) { - xxx_messageInfo_Hello.Merge(m, src) -} -func (m *Hello) XXX_Size() int { - return m.ProtoSize() -} -func (m *Hello) XXX_DiscardUnknown() { - xxx_messageInfo_Hello.DiscardUnknown(m) -} - -var xxx_messageInfo_Hello proto.InternalMessageInfo - -type Header struct { - Type MessageType `protobuf:"varint,1,opt,name=type,proto3,enum=protocol.MessageType" json:"type" xml:"type"` - Compression MessageCompression `protobuf:"varint,2,opt,name=compression,proto3,enum=protocol.MessageCompression" json:"compression" xml:"compression"` -} - -func (m *Header) Reset() { *m = Header{} } -func (m *Header) String() string { return proto.CompactTextString(m) } -func (*Header) ProtoMessage() {} -func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{1} -} -func (m *Header) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Header.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Header) XXX_Merge(src proto.Message) { - xxx_messageInfo_Header.Merge(m, src) -} -func (m *Header) XXX_Size() int { - return m.ProtoSize() -} -func (m *Header) XXX_DiscardUnknown() { - xxx_messageInfo_Header.DiscardUnknown(m) -} - -var xxx_messageInfo_Header proto.InternalMessageInfo - -type ClusterConfig struct { - Folders []Folder `protobuf:"bytes,1,rep,name=folders,proto3" json:"folders" xml:"folder"` - Secondary bool `protobuf:"varint,2,opt,name=secondary,proto3" json:"secondary" xml:"secondary"` -} - -func (m *ClusterConfig) Reset() { *m = ClusterConfig{} } -func (m *ClusterConfig) String() string { return proto.CompactTextString(m) } -func (*ClusterConfig) ProtoMessage() {} -func (*ClusterConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{2} -} -func (m *ClusterConfig) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ClusterConfig.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ClusterConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClusterConfig.Merge(m, src) -} -func (m *ClusterConfig) XXX_Size() int { - return m.ProtoSize() -} -func (m *ClusterConfig) XXX_DiscardUnknown() { - xxx_messageInfo_ClusterConfig.DiscardUnknown(m) -} - -var xxx_messageInfo_ClusterConfig proto.InternalMessageInfo - -type Folder struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" xml:"id"` - Label string `protobuf:"bytes,2,opt,name=label,proto3" json:"label" xml:"label"` - ReadOnly bool `protobuf:"varint,3,opt,name=read_only,json=readOnly,proto3" json:"readOnly" xml:"readOnly"` - IgnorePermissions bool `protobuf:"varint,4,opt,name=ignore_permissions,json=ignorePermissions,proto3" json:"ignorePermissions" xml:"ignorePermissions"` - IgnoreDelete bool `protobuf:"varint,5,opt,name=ignore_delete,json=ignoreDelete,proto3" json:"ignoreDelete" xml:"ignoreDelete"` - DisableTempIndexes bool `protobuf:"varint,6,opt,name=disable_temp_indexes,json=disableTempIndexes,proto3" json:"disableTempIndexes" xml:"disableTempIndexes"` - Paused bool `protobuf:"varint,7,opt,name=paused,proto3" json:"paused" xml:"paused"` - Devices []Device `protobuf:"bytes,16,rep,name=devices,proto3" json:"devices" xml:"device"` -} - -func (m *Folder) Reset() { *m = Folder{} } -func (m *Folder) String() string { return proto.CompactTextString(m) } -func (*Folder) ProtoMessage() {} -func (*Folder) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{3} -} -func (m *Folder) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Folder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Folder.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Folder) XXX_Merge(src proto.Message) { - xxx_messageInfo_Folder.Merge(m, src) -} -func (m *Folder) XXX_Size() int { - return m.ProtoSize() -} -func (m *Folder) XXX_DiscardUnknown() { - xxx_messageInfo_Folder.DiscardUnknown(m) -} - -var xxx_messageInfo_Folder proto.InternalMessageInfo - -type Device struct { - ID DeviceID `protobuf:"bytes,1,opt,name=id,proto3,customtype=DeviceID" json:"id" xml:"id"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name" xml:"name"` - Addresses []string `protobuf:"bytes,3,rep,name=addresses,proto3" json:"addresses" xml:"address"` - Compression Compression `protobuf:"varint,4,opt,name=compression,proto3,enum=protocol.Compression" json:"compression" xml:"compression"` - CertName string `protobuf:"bytes,5,opt,name=cert_name,json=certName,proto3" json:"certName" xml:"certName"` - MaxSequence int64 `protobuf:"varint,6,opt,name=max_sequence,json=maxSequence,proto3" json:"maxSequence" xml:"maxSequence"` - Introducer bool `protobuf:"varint,7,opt,name=introducer,proto3" json:"introducer" xml:"introducer"` - IndexID IndexID `protobuf:"varint,8,opt,name=index_id,json=indexId,proto3,customtype=IndexID" json:"indexId" xml:"indexId"` - SkipIntroductionRemovals bool `protobuf:"varint,9,opt,name=skip_introduction_removals,json=skipIntroductionRemovals,proto3" json:"skipIntroductionRemovals" xml:"skipIntroductionRemovals"` - EncryptionPasswordToken []byte `protobuf:"bytes,10,opt,name=encryption_password_token,json=encryptionPasswordToken,proto3" json:"encryptionPasswordToken" xml:"encryptionPasswordToken"` -} - -func (m *Device) Reset() { *m = Device{} } -func (m *Device) String() string { return proto.CompactTextString(m) } -func (*Device) ProtoMessage() {} -func (*Device) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{4} -} -func (m *Device) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Device) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Device.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Device) XXX_Merge(src proto.Message) { - xxx_messageInfo_Device.Merge(m, src) -} -func (m *Device) XXX_Size() int { - return m.ProtoSize() -} -func (m *Device) XXX_DiscardUnknown() { - xxx_messageInfo_Device.DiscardUnknown(m) -} - -var xxx_messageInfo_Device proto.InternalMessageInfo - -type Index struct { - Folder string `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder" xml:"folder"` - Files []FileInfo `protobuf:"bytes,2,rep,name=files,proto3" json:"files" xml:"file"` - LastSequence int64 `protobuf:"varint,3,opt,name=last_sequence,json=lastSequence,proto3" json:"lastSequence" xml:"lastSequence"` -} - -func (m *Index) Reset() { *m = Index{} } -func (m *Index) String() string { return proto.CompactTextString(m) } -func (*Index) ProtoMessage() {} -func (*Index) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{5} -} -func (m *Index) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Index) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Index.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Index) XXX_Merge(src proto.Message) { - xxx_messageInfo_Index.Merge(m, src) -} -func (m *Index) XXX_Size() int { - return m.ProtoSize() -} -func (m *Index) XXX_DiscardUnknown() { - xxx_messageInfo_Index.DiscardUnknown(m) -} - -var xxx_messageInfo_Index proto.InternalMessageInfo - -type IndexUpdate struct { - Folder string `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder" xml:"folder"` - Files []FileInfo `protobuf:"bytes,2,rep,name=files,proto3" json:"files" xml:"file"` - LastSequence int64 `protobuf:"varint,3,opt,name=last_sequence,json=lastSequence,proto3" json:"lastSequence" xml:"lastSequence"` - PrevSequence int64 `protobuf:"varint,4,opt,name=prev_sequence,json=prevSequence,proto3" json:"prevSequence" xml:"prevSequence"` -} - -func (m *IndexUpdate) Reset() { *m = IndexUpdate{} } -func (m *IndexUpdate) String() string { return proto.CompactTextString(m) } -func (*IndexUpdate) ProtoMessage() {} -func (*IndexUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{6} -} -func (m *IndexUpdate) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *IndexUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_IndexUpdate.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *IndexUpdate) XXX_Merge(src proto.Message) { - xxx_messageInfo_IndexUpdate.Merge(m, src) -} -func (m *IndexUpdate) XXX_Size() int { - return m.ProtoSize() -} -func (m *IndexUpdate) XXX_DiscardUnknown() { - xxx_messageInfo_IndexUpdate.DiscardUnknown(m) -} - -var xxx_messageInfo_IndexUpdate proto.InternalMessageInfo - -type FileInfo struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name" xml:"name"` - Size int64 `protobuf:"varint,3,opt,name=size,proto3" json:"size" xml:"size"` - ModifiedS int64 `protobuf:"varint,5,opt,name=modified_s,json=modifiedS,proto3" json:"modifiedS" xml:"modifiedS"` - ModifiedBy ShortID `protobuf:"varint,12,opt,name=modified_by,json=modifiedBy,proto3,customtype=ShortID" json:"modifiedBy" xml:"modifiedBy"` - Version Vector `protobuf:"bytes,9,opt,name=version,proto3" json:"version" xml:"version"` - Sequence int64 `protobuf:"varint,10,opt,name=sequence,proto3" json:"sequence" xml:"sequence"` - Blocks []BlockInfo `protobuf:"bytes,16,rep,name=blocks,proto3" json:"blocks" xml:"block"` - SymlinkTarget string `protobuf:"bytes,17,opt,name=symlink_target,json=symlinkTarget,proto3" json:"symlinkTarget" xml:"symlinkTarget"` - BlocksHash []byte `protobuf:"bytes,18,opt,name=blocks_hash,json=blocksHash,proto3" json:"blocksHash" xml:"blocksHash"` - Encrypted []byte `protobuf:"bytes,19,opt,name=encrypted,proto3" json:"encrypted" xml:"encrypted"` - Type FileInfoType `protobuf:"varint,2,opt,name=type,proto3,enum=protocol.FileInfoType" json:"type" xml:"type"` - Permissions uint32 `protobuf:"varint,4,opt,name=permissions,proto3" json:"permissions" xml:"permissions"` - ModifiedNs int `protobuf:"varint,11,opt,name=modified_ns,json=modifiedNs,proto3,casttype=int" json:"modifiedNs" xml:"modifiedNs"` - RawBlockSize int `protobuf:"varint,13,opt,name=block_size,json=blockSize,proto3,casttype=int" json:"blockSize" xml:"blockSize"` - Platform PlatformData `protobuf:"bytes,14,opt,name=platform,proto3" json:"platform" xml:"platform"` - // The local_flags fields stores flags that are relevant to the local - // host only. It is not part of the protocol, doesn't get sent or - // received (we make sure to zero it), nonetheless we need it on our - // struct and to be able to serialize it to/from the database. - LocalFlags uint32 `protobuf:"varint,1000,opt,name=local_flags,json=localFlags,proto3" json:"localFlags" xml:"localFlags"` - // The version_hash is an implementation detail and not part of the wire - // format. - VersionHash []byte `protobuf:"bytes,1001,opt,name=version_hash,json=versionHash,proto3" json:"versionHash" xml:"versionHash"` - // The time when the inode was last changed (i.e., permissions, xattrs - // etc changed). This is host-local, not sent over the wire. - InodeChangeNs int64 `protobuf:"varint,1002,opt,name=inode_change_ns,json=inodeChangeNs,proto3" json:"inodeChangeNs" xml:"inodeChangeNs"` - // The size of the data appended to the encrypted file on disk. This is - // host-local, not sent over the wire. - EncryptionTrailerSize int `protobuf:"varint,1003,opt,name=encryption_trailer_size,json=encryptionTrailerSize,proto3,casttype=int" json:"encryptionTrailerSize" xml:"encryptionTrailerSize"` - Deleted bool `protobuf:"varint,6,opt,name=deleted,proto3" json:"deleted" xml:"deleted"` - RawInvalid bool `protobuf:"varint,7,opt,name=invalid,proto3" json:"invalid" xml:"invalid"` - NoPermissions bool `protobuf:"varint,8,opt,name=no_permissions,json=noPermissions,proto3" json:"noPermissions" xml:"noPermissions"` -} - -func (m *FileInfo) Reset() { *m = FileInfo{} } -func (*FileInfo) ProtoMessage() {} -func (*FileInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{7} -} -func (m *FileInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FileInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FileInfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FileInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileInfo.Merge(m, src) -} -func (m *FileInfo) XXX_Size() int { - return m.ProtoSize() -} -func (m *FileInfo) XXX_DiscardUnknown() { - xxx_messageInfo_FileInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_FileInfo proto.InternalMessageInfo - -type BlockInfo struct { - Hash []byte `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash" xml:"hash"` - Offset int64 `protobuf:"varint,1,opt,name=offset,proto3" json:"offset" xml:"offset"` - Size int `protobuf:"varint,2,opt,name=size,proto3,casttype=int" json:"size" xml:"size"` - WeakHash uint32 `protobuf:"varint,4,opt,name=weak_hash,json=weakHash,proto3" json:"weakHash" xml:"weakHash"` -} - -func (m *BlockInfo) Reset() { *m = BlockInfo{} } -func (*BlockInfo) ProtoMessage() {} -func (*BlockInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{8} -} -func (m *BlockInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *BlockInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_BlockInfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *BlockInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlockInfo.Merge(m, src) -} -func (m *BlockInfo) XXX_Size() int { - return m.ProtoSize() -} -func (m *BlockInfo) XXX_DiscardUnknown() { - xxx_messageInfo_BlockInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_BlockInfo proto.InternalMessageInfo - -type Vector struct { - Counters []Counter `protobuf:"bytes,1,rep,name=counters,proto3" json:"counters" xml:"counter"` -} - -func (m *Vector) Reset() { *m = Vector{} } -func (m *Vector) String() string { return proto.CompactTextString(m) } -func (*Vector) ProtoMessage() {} -func (*Vector) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{9} -} -func (m *Vector) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Vector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Vector.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Vector) XXX_Merge(src proto.Message) { - xxx_messageInfo_Vector.Merge(m, src) -} -func (m *Vector) XXX_Size() int { - return m.ProtoSize() -} -func (m *Vector) XXX_DiscardUnknown() { - xxx_messageInfo_Vector.DiscardUnknown(m) -} - -var xxx_messageInfo_Vector proto.InternalMessageInfo - -type Counter struct { - ID ShortID `protobuf:"varint,1,opt,name=id,proto3,customtype=ShortID" json:"id" xml:"id"` - Value uint64 `protobuf:"varint,2,opt,name=value,proto3" json:"value" xml:"value"` -} - -func (m *Counter) Reset() { *m = Counter{} } -func (m *Counter) String() string { return proto.CompactTextString(m) } -func (*Counter) ProtoMessage() {} -func (*Counter) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{10} -} -func (m *Counter) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Counter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Counter.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Counter) XXX_Merge(src proto.Message) { - xxx_messageInfo_Counter.Merge(m, src) -} -func (m *Counter) XXX_Size() int { - return m.ProtoSize() -} -func (m *Counter) XXX_DiscardUnknown() { - xxx_messageInfo_Counter.DiscardUnknown(m) -} - -var xxx_messageInfo_Counter proto.InternalMessageInfo - -type PlatformData struct { - Unix *UnixData `protobuf:"bytes,1,opt,name=unix,proto3" json:"unix" xml:"unix"` - Windows *WindowsData `protobuf:"bytes,2,opt,name=windows,proto3" json:"windows" xml:"windows"` - Linux *XattrData `protobuf:"bytes,3,opt,name=linux,proto3" json:"linux" xml:"linux"` - Darwin *XattrData `protobuf:"bytes,4,opt,name=darwin,proto3" json:"darwin" xml:"darwin"` - FreeBSD *XattrData `protobuf:"bytes,5,opt,name=freebsd,proto3" json:"freebsd" xml:"freebsd"` - NetBSD *XattrData `protobuf:"bytes,6,opt,name=netbsd,proto3" json:"netbsd" xml:"netbsd"` -} - -func (m *PlatformData) Reset() { *m = PlatformData{} } -func (m *PlatformData) String() string { return proto.CompactTextString(m) } -func (*PlatformData) ProtoMessage() {} -func (*PlatformData) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{11} -} -func (m *PlatformData) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *PlatformData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_PlatformData.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *PlatformData) XXX_Merge(src proto.Message) { - xxx_messageInfo_PlatformData.Merge(m, src) -} -func (m *PlatformData) XXX_Size() int { - return m.ProtoSize() -} -func (m *PlatformData) XXX_DiscardUnknown() { - xxx_messageInfo_PlatformData.DiscardUnknown(m) -} - -var xxx_messageInfo_PlatformData proto.InternalMessageInfo - -type UnixData struct { - // The owner name and group name are set when known (i.e., could be - // resolved on the source device), while the UID and GID are always set - // as they come directly from the stat() call. - OwnerName string `protobuf:"bytes,1,opt,name=owner_name,json=ownerName,proto3" json:"ownerName" xml:"ownerName"` - GroupName string `protobuf:"bytes,2,opt,name=group_name,json=groupName,proto3" json:"groupName" xml:"groupName"` - UID int `protobuf:"varint,3,opt,name=uid,proto3,casttype=int" json:"uid" xml:"uid"` - GID int `protobuf:"varint,4,opt,name=gid,proto3,casttype=int" json:"gid" xml:"gid"` -} - -func (m *UnixData) Reset() { *m = UnixData{} } -func (m *UnixData) String() string { return proto.CompactTextString(m) } -func (*UnixData) ProtoMessage() {} -func (*UnixData) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{12} -} -func (m *UnixData) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *UnixData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_UnixData.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *UnixData) XXX_Merge(src proto.Message) { - xxx_messageInfo_UnixData.Merge(m, src) -} -func (m *UnixData) XXX_Size() int { - return m.ProtoSize() -} -func (m *UnixData) XXX_DiscardUnknown() { - xxx_messageInfo_UnixData.DiscardUnknown(m) -} - -var xxx_messageInfo_UnixData proto.InternalMessageInfo - -type WindowsData struct { - // Windows file objects have a single owner, which may be a user or a - // group. We keep the name of that account, and a flag to indicate what - // type it is. - OwnerName string `protobuf:"bytes,1,opt,name=owner_name,json=ownerName,proto3" json:"ownerName" xml:"ownerName"` - OwnerIsGroup bool `protobuf:"varint,2,opt,name=owner_is_group,json=ownerIsGroup,proto3" json:"ownerIsGroup" xml:"ownerIsGroup"` -} - -func (m *WindowsData) Reset() { *m = WindowsData{} } -func (m *WindowsData) String() string { return proto.CompactTextString(m) } -func (*WindowsData) ProtoMessage() {} -func (*WindowsData) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{13} -} -func (m *WindowsData) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *WindowsData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_WindowsData.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *WindowsData) XXX_Merge(src proto.Message) { - xxx_messageInfo_WindowsData.Merge(m, src) -} -func (m *WindowsData) XXX_Size() int { - return m.ProtoSize() -} -func (m *WindowsData) XXX_DiscardUnknown() { - xxx_messageInfo_WindowsData.DiscardUnknown(m) -} - -var xxx_messageInfo_WindowsData proto.InternalMessageInfo - -type XattrData struct { - Xattrs []Xattr `protobuf:"bytes,1,rep,name=xattrs,proto3" json:"xattrs" xml:"xattr"` -} - -func (m *XattrData) Reset() { *m = XattrData{} } -func (m *XattrData) String() string { return proto.CompactTextString(m) } -func (*XattrData) ProtoMessage() {} -func (*XattrData) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{14} -} -func (m *XattrData) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *XattrData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_XattrData.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *XattrData) XXX_Merge(src proto.Message) { - xxx_messageInfo_XattrData.Merge(m, src) -} -func (m *XattrData) XXX_Size() int { - return m.ProtoSize() -} -func (m *XattrData) XXX_DiscardUnknown() { - xxx_messageInfo_XattrData.DiscardUnknown(m) -} - -var xxx_messageInfo_XattrData proto.InternalMessageInfo - -type Xattr struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name" xml:"name"` - Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value" xml:"value"` -} - -func (m *Xattr) Reset() { *m = Xattr{} } -func (m *Xattr) String() string { return proto.CompactTextString(m) } -func (*Xattr) ProtoMessage() {} -func (*Xattr) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{15} -} -func (m *Xattr) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Xattr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Xattr.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Xattr) XXX_Merge(src proto.Message) { - xxx_messageInfo_Xattr.Merge(m, src) -} -func (m *Xattr) XXX_Size() int { - return m.ProtoSize() -} -func (m *Xattr) XXX_DiscardUnknown() { - xxx_messageInfo_Xattr.DiscardUnknown(m) -} - -var xxx_messageInfo_Xattr proto.InternalMessageInfo - -type Request struct { - ID int `protobuf:"varint,1,opt,name=id,proto3,casttype=int" json:"id" xml:"id"` - Folder string `protobuf:"bytes,2,opt,name=folder,proto3" json:"folder" xml:"folder"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name" xml:"name"` - Offset int64 `protobuf:"varint,4,opt,name=offset,proto3" json:"offset" xml:"offset"` - Size int `protobuf:"varint,5,opt,name=size,proto3,casttype=int" json:"size" xml:"size"` - Hash []byte `protobuf:"bytes,6,opt,name=hash,proto3" json:"hash" xml:"hash"` - FromTemporary bool `protobuf:"varint,7,opt,name=from_temporary,json=fromTemporary,proto3" json:"fromTemporary" xml:"fromTemporary"` - WeakHash uint32 `protobuf:"varint,8,opt,name=weak_hash,json=weakHash,proto3" json:"weakHash" xml:"weakHash"` - BlockNo int `protobuf:"varint,9,opt,name=block_no,json=blockNo,proto3,casttype=int" json:"blockNo" xml:"blockNo"` -} - -func (m *Request) Reset() { *m = Request{} } -func (m *Request) String() string { return proto.CompactTextString(m) } -func (*Request) ProtoMessage() {} -func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{16} -} -func (m *Request) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Request.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Request) XXX_Merge(src proto.Message) { - xxx_messageInfo_Request.Merge(m, src) -} -func (m *Request) XXX_Size() int { - return m.ProtoSize() -} -func (m *Request) XXX_DiscardUnknown() { - xxx_messageInfo_Request.DiscardUnknown(m) -} - -var xxx_messageInfo_Request proto.InternalMessageInfo - -type Response struct { - ID int `protobuf:"varint,1,opt,name=id,proto3,casttype=int" json:"id" xml:"id"` - Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data" xml:"data"` - Code ErrorCode `protobuf:"varint,3,opt,name=code,proto3,enum=protocol.ErrorCode" json:"code" xml:"code"` -} - -func (m *Response) Reset() { *m = Response{} } -func (m *Response) String() string { return proto.CompactTextString(m) } -func (*Response) ProtoMessage() {} -func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{17} -} -func (m *Response) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Response.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Response) XXX_Merge(src proto.Message) { - xxx_messageInfo_Response.Merge(m, src) -} -func (m *Response) XXX_Size() int { - return m.ProtoSize() -} -func (m *Response) XXX_DiscardUnknown() { - xxx_messageInfo_Response.DiscardUnknown(m) -} - -var xxx_messageInfo_Response proto.InternalMessageInfo - -type DownloadProgress struct { - Folder string `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder" xml:"folder"` - Updates []FileDownloadProgressUpdate `protobuf:"bytes,2,rep,name=updates,proto3" json:"updates" xml:"update"` -} - -func (m *DownloadProgress) Reset() { *m = DownloadProgress{} } -func (m *DownloadProgress) String() string { return proto.CompactTextString(m) } -func (*DownloadProgress) ProtoMessage() {} -func (*DownloadProgress) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{18} -} -func (m *DownloadProgress) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DownloadProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DownloadProgress.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DownloadProgress) XXX_Merge(src proto.Message) { - xxx_messageInfo_DownloadProgress.Merge(m, src) -} -func (m *DownloadProgress) XXX_Size() int { - return m.ProtoSize() -} -func (m *DownloadProgress) XXX_DiscardUnknown() { - xxx_messageInfo_DownloadProgress.DiscardUnknown(m) -} - -var xxx_messageInfo_DownloadProgress proto.InternalMessageInfo - -type FileDownloadProgressUpdate struct { - UpdateType FileDownloadProgressUpdateType `protobuf:"varint,1,opt,name=update_type,json=updateType,proto3,enum=protocol.FileDownloadProgressUpdateType" json:"updateType" xml:"updateType"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name" xml:"name"` - Version Vector `protobuf:"bytes,3,opt,name=version,proto3" json:"version" xml:"version"` - BlockIndexes []int `protobuf:"varint,4,rep,name=block_indexes,json=blockIndexes,proto3,casttype=int" json:"blockIndexes" xml:"blockIndexe"` - BlockSize int `protobuf:"varint,5,opt,name=block_size,json=blockSize,proto3,casttype=int" json:"blockSize" xml:"blockSize"` -} - -func (m *FileDownloadProgressUpdate) Reset() { *m = FileDownloadProgressUpdate{} } -func (m *FileDownloadProgressUpdate) String() string { return proto.CompactTextString(m) } -func (*FileDownloadProgressUpdate) ProtoMessage() {} -func (*FileDownloadProgressUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{19} -} -func (m *FileDownloadProgressUpdate) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FileDownloadProgressUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FileDownloadProgressUpdate.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FileDownloadProgressUpdate) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileDownloadProgressUpdate.Merge(m, src) -} -func (m *FileDownloadProgressUpdate) XXX_Size() int { - return m.ProtoSize() -} -func (m *FileDownloadProgressUpdate) XXX_DiscardUnknown() { - xxx_messageInfo_FileDownloadProgressUpdate.DiscardUnknown(m) -} - -var xxx_messageInfo_FileDownloadProgressUpdate proto.InternalMessageInfo - -type Ping struct { -} - -func (m *Ping) Reset() { *m = Ping{} } -func (m *Ping) String() string { return proto.CompactTextString(m) } -func (*Ping) ProtoMessage() {} -func (*Ping) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{20} -} -func (m *Ping) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Ping) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Ping.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Ping) XXX_Merge(src proto.Message) { - xxx_messageInfo_Ping.Merge(m, src) -} -func (m *Ping) XXX_Size() int { - return m.ProtoSize() -} -func (m *Ping) XXX_DiscardUnknown() { - xxx_messageInfo_Ping.DiscardUnknown(m) -} - -var xxx_messageInfo_Ping proto.InternalMessageInfo - -type Close struct { - Reason string `protobuf:"bytes,1,opt,name=reason,proto3" json:"reason" xml:"reason"` -} - -func (m *Close) Reset() { *m = Close{} } -func (m *Close) String() string { return proto.CompactTextString(m) } -func (*Close) ProtoMessage() {} -func (*Close) Descriptor() ([]byte, []int) { - return fileDescriptor_311ef540e10d9705, []int{21} -} -func (m *Close) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Close) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Close.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Close) XXX_Merge(src proto.Message) { - xxx_messageInfo_Close.Merge(m, src) -} -func (m *Close) XXX_Size() int { - return m.ProtoSize() -} -func (m *Close) XXX_DiscardUnknown() { - xxx_messageInfo_Close.DiscardUnknown(m) -} - -var xxx_messageInfo_Close proto.InternalMessageInfo - -func init() { - proto.RegisterEnum("protocol.MessageType", MessageType_name, MessageType_value) - proto.RegisterEnum("protocol.MessageCompression", MessageCompression_name, MessageCompression_value) - proto.RegisterEnum("protocol.Compression", Compression_name, Compression_value) - proto.RegisterEnum("protocol.FileInfoType", FileInfoType_name, FileInfoType_value) - proto.RegisterEnum("protocol.ErrorCode", ErrorCode_name, ErrorCode_value) - proto.RegisterEnum("protocol.FileDownloadProgressUpdateType", FileDownloadProgressUpdateType_name, FileDownloadProgressUpdateType_value) - proto.RegisterType((*Hello)(nil), "protocol.Hello") - proto.RegisterType((*Header)(nil), "protocol.Header") - proto.RegisterType((*ClusterConfig)(nil), "protocol.ClusterConfig") - proto.RegisterType((*Folder)(nil), "protocol.Folder") - proto.RegisterType((*Device)(nil), "protocol.Device") - proto.RegisterType((*Index)(nil), "protocol.Index") - proto.RegisterType((*IndexUpdate)(nil), "protocol.IndexUpdate") - proto.RegisterType((*FileInfo)(nil), "protocol.FileInfo") - proto.RegisterType((*BlockInfo)(nil), "protocol.BlockInfo") - proto.RegisterType((*Vector)(nil), "protocol.Vector") - proto.RegisterType((*Counter)(nil), "protocol.Counter") - proto.RegisterType((*PlatformData)(nil), "protocol.PlatformData") - proto.RegisterType((*UnixData)(nil), "protocol.UnixData") - proto.RegisterType((*WindowsData)(nil), "protocol.WindowsData") - proto.RegisterType((*XattrData)(nil), "protocol.XattrData") - proto.RegisterType((*Xattr)(nil), "protocol.Xattr") - proto.RegisterType((*Request)(nil), "protocol.Request") - proto.RegisterType((*Response)(nil), "protocol.Response") - proto.RegisterType((*DownloadProgress)(nil), "protocol.DownloadProgress") - proto.RegisterType((*FileDownloadProgressUpdate)(nil), "protocol.FileDownloadProgressUpdate") - proto.RegisterType((*Ping)(nil), "protocol.Ping") - proto.RegisterType((*Close)(nil), "protocol.Close") -} - -func init() { proto.RegisterFile("lib/protocol/bep.proto", fileDescriptor_311ef540e10d9705) } - -var fileDescriptor_311ef540e10d9705 = []byte{ - // 3292 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0x4d, 0x6c, 0x23, 0x47, - 0x76, 0x16, 0x7f, 0x45, 0x95, 0x7e, 0x86, 0xaa, 0xf9, 0xa3, 0x39, 0x63, 0x35, 0x53, 0x3b, 0x9b, - 0xc8, 0xda, 0xec, 0x78, 0xad, 0xf5, 0x6e, 0x1c, 0xdb, 0xb1, 0x21, 0xfe, 0x48, 0xc3, 0xb5, 0x86, - 0x94, 0x8b, 0x9a, 0xf1, 0x7a, 0x80, 0x80, 0x68, 0xb1, 0x4b, 0x54, 0x63, 0xc8, 0x6e, 0xa6, 0xbb, - 0xa9, 0x9f, 0x45, 0x2e, 0xc1, 0x02, 0x8b, 0x40, 0x87, 0x20, 0xd8, 0x53, 0x10, 0xac, 0x90, 0xc5, - 0x5e, 0x72, 0x0b, 0x90, 0x43, 0x2e, 0x7b, 0xca, 0x71, 0x6e, 0x19, 0x2c, 0x10, 0x20, 0xc8, 0xa1, - 0x01, 0xcf, 0x5c, 0x12, 0xe6, 0xc6, 0x63, 0x0e, 0x41, 0x50, 0xaf, 0xaa, 0xab, 0xab, 0xf5, 0xe3, - 0x68, 0xec, 0x5b, 0x6e, 0xac, 0xef, 0x7d, 0xef, 0x55, 0x75, 0xbd, 0x57, 0xef, 0xbd, 0x2a, 0x09, - 0xdd, 0x19, 0xd8, 0x7b, 0xef, 0x8e, 0x3c, 0x37, 0x70, 0x7b, 0xee, 0xe0, 0xdd, 0x3d, 0x36, 0x7a, - 0x08, 0x03, 0x5c, 0x88, 0xb0, 0xf2, 0x1c, 0x3b, 0x0e, 0x04, 0x58, 0xfe, 0x8e, 0xc7, 0x46, 0xae, - 0x2f, 0xe8, 0x7b, 0xe3, 0xfd, 0x77, 0xfb, 0x6e, 0xdf, 0x85, 0x01, 0xfc, 0x12, 0x24, 0xf2, 0x3f, - 0x69, 0x94, 0x7b, 0xc4, 0x06, 0x03, 0x17, 0xd7, 0xd0, 0xbc, 0xc5, 0x0e, 0xed, 0x1e, 0xeb, 0x3a, - 0xe6, 0x90, 0x95, 0x52, 0x95, 0xd4, 0xea, 0x5c, 0x95, 0x4c, 0x42, 0x03, 0x09, 0xb8, 0x65, 0x0e, - 0xd9, 0x34, 0x34, 0x8a, 0xc7, 0xc3, 0xc1, 0x87, 0x24, 0x86, 0x08, 0xd5, 0xe4, 0xdc, 0x48, 0x6f, - 0x60, 0x33, 0x27, 0x10, 0x46, 0xd2, 0xb1, 0x11, 0x01, 0x27, 0x8c, 0xc4, 0x10, 0xa1, 0x9a, 0x1c, - 0xb7, 0xd1, 0x92, 0x34, 0x72, 0xc8, 0x3c, 0xdf, 0x76, 0x9d, 0x52, 0x06, 0xec, 0xac, 0x4e, 0x42, - 0x63, 0x51, 0x48, 0x9e, 0x0a, 0xc1, 0x34, 0x34, 0x6e, 0x6a, 0xa6, 0x24, 0x4a, 0x68, 0x92, 0x85, - 0x9f, 0xa1, 0x1b, 0xce, 0x78, 0xd8, 0xed, 0xb9, 0x8e, 0xc3, 0x7a, 0x81, 0xed, 0x3a, 0x7e, 0x29, - 0x5b, 0x49, 0xad, 0xe6, 0xaa, 0xef, 0x4d, 0x42, 0x63, 0xc9, 0x19, 0x0f, 0x6b, 0xb1, 0x64, 0x1a, - 0x1a, 0xb7, 0xc0, 0x64, 0x12, 0x26, 0xff, 0x1d, 0x1a, 0x19, 0xdb, 0x09, 0xe8, 0x39, 0x3a, 0xfe, - 0x04, 0xcd, 0x05, 0xf6, 0x90, 0xf9, 0x81, 0x39, 0x1c, 0x95, 0x72, 0x95, 0xd4, 0x6a, 0xa6, 0x5a, - 0x99, 0x84, 0x46, 0x0c, 0x4e, 0x43, 0xe3, 0x06, 0x18, 0x54, 0x08, 0xa1, 0xb1, 0x94, 0xfc, 0x63, - 0x0a, 0xe5, 0x1f, 0x31, 0xd3, 0x62, 0x1e, 0xde, 0x40, 0xd9, 0xe0, 0x64, 0x24, 0xb6, 0x7e, 0x69, - 0xfd, 0xf6, 0xc3, 0xc8, 0xa9, 0x0f, 0x1f, 0x33, 0xdf, 0x37, 0xfb, 0x6c, 0xf7, 0x64, 0xc4, 0xaa, - 0x77, 0x26, 0xa1, 0x01, 0xb4, 0x69, 0x68, 0x20, 0x61, 0xf7, 0x64, 0xc4, 0x08, 0x05, 0x0c, 0x5b, - 0x68, 0xbe, 0xe7, 0x0e, 0x47, 0x1e, 0xf3, 0x61, 0xdf, 0xd2, 0x60, 0xe9, 0xfe, 0x05, 0x4b, 0xb5, - 0x98, 0x53, 0x7d, 0x30, 0x09, 0x0d, 0x5d, 0x69, 0x1a, 0x1a, 0xcb, 0x62, 0x4f, 0x63, 0x8c, 0x50, - 0x9d, 0x41, 0x7e, 0x95, 0x42, 0x8b, 0xb5, 0xc1, 0xd8, 0x0f, 0x98, 0x57, 0x73, 0x9d, 0x7d, 0xbb, - 0x8f, 0x3f, 0x43, 0xb3, 0xfb, 0xee, 0xc0, 0x62, 0x9e, 0x5f, 0x4a, 0x55, 0x32, 0xab, 0xf3, 0xeb, - 0xc5, 0x78, 0xce, 0x4d, 0x10, 0x54, 0x8d, 0x17, 0xa1, 0x31, 0x33, 0x09, 0x8d, 0x88, 0x38, 0x0d, - 0x8d, 0x05, 0x98, 0x47, 0x8c, 0x09, 0x8d, 0x04, 0x7c, 0x4b, 0x7d, 0xd6, 0x73, 0x1d, 0xcb, 0xf4, - 0x4e, 0xe0, 0x13, 0x0a, 0x62, 0x4b, 0x15, 0xa8, 0xb6, 0x54, 0x21, 0x84, 0xc6, 0x52, 0xf2, 0xdb, - 0x2c, 0xca, 0x8b, 0x49, 0xf1, 0x43, 0x94, 0xb6, 0x2d, 0x19, 0xcb, 0x2b, 0xaf, 0x42, 0x23, 0xdd, - 0xac, 0x4f, 0x42, 0x23, 0x6d, 0x5b, 0xd3, 0xd0, 0x28, 0x80, 0x09, 0xdb, 0x22, 0xbf, 0x7c, 0xf9, - 0x20, 0xdd, 0xac, 0xd3, 0xb4, 0x6d, 0xe1, 0x87, 0x28, 0x37, 0x30, 0xf7, 0xd8, 0x40, 0x46, 0x6e, - 0x69, 0x12, 0x1a, 0x02, 0x98, 0x86, 0xc6, 0x3c, 0xf0, 0x61, 0x44, 0xa8, 0x40, 0xf1, 0x47, 0x68, - 0xce, 0x63, 0xa6, 0xd5, 0x75, 0x9d, 0xc1, 0x09, 0x44, 0x69, 0xa1, 0xba, 0x32, 0x09, 0x8d, 0x02, - 0x07, 0xdb, 0xce, 0x80, 0xaf, 0x74, 0x09, 0xd4, 0x22, 0x80, 0x50, 0x25, 0xc3, 0x5d, 0x84, 0xed, - 0xbe, 0xe3, 0x7a, 0xac, 0x3b, 0x62, 0xde, 0xd0, 0x86, 0xbd, 0x15, 0x91, 0x59, 0xa8, 0xfe, 0x60, - 0x12, 0x1a, 0xcb, 0x42, 0xba, 0x13, 0x0b, 0xa7, 0xa1, 0x71, 0x57, 0xac, 0xfa, 0xbc, 0x84, 0xd0, - 0x8b, 0x6c, 0xfc, 0x19, 0x5a, 0x94, 0x13, 0x58, 0x6c, 0xc0, 0x02, 0x06, 0xf1, 0x59, 0xa8, 0xfe, - 0xfe, 0x24, 0x34, 0x16, 0x84, 0xa0, 0x0e, 0xf8, 0x34, 0x34, 0xb0, 0x66, 0x56, 0x80, 0x84, 0x26, - 0x38, 0xd8, 0x42, 0xb7, 0x2c, 0xdb, 0x37, 0xf7, 0x06, 0xac, 0x1b, 0xb0, 0xe1, 0xa8, 0x6b, 0x3b, - 0x16, 0x3b, 0x66, 0x7e, 0x29, 0x0f, 0x36, 0xd7, 0x27, 0xa1, 0x81, 0xa5, 0x7c, 0x97, 0x0d, 0x47, - 0x4d, 0x21, 0x9d, 0x86, 0x46, 0x49, 0x24, 0x8c, 0x0b, 0x22, 0x42, 0x2f, 0xe1, 0xe3, 0x75, 0x94, - 0x1f, 0x99, 0x63, 0x9f, 0x59, 0xa5, 0x59, 0xb0, 0x5b, 0x9e, 0x84, 0x86, 0x44, 0x54, 0xc0, 0x88, - 0x21, 0xa1, 0x12, 0xe7, 0xc1, 0x27, 0x52, 0x90, 0x5f, 0x2a, 0x9e, 0x0f, 0xbe, 0x3a, 0x08, 0xe2, - 0xe0, 0x93, 0x44, 0x65, 0x4b, 0x8c, 0x09, 0x8d, 0x04, 0xe4, 0x9f, 0xf3, 0x28, 0x2f, 0x94, 0x70, - 0x55, 0x05, 0xcf, 0x42, 0x75, 0x9d, 0x1b, 0xf8, 0xf7, 0xd0, 0x28, 0x08, 0x59, 0xb3, 0x7e, 0x55, - 0x30, 0xfd, 0xe5, 0xcb, 0x07, 0x29, 0x2d, 0xa0, 0xd6, 0x50, 0x56, 0xcb, 0x84, 0x70, 0x78, 0x1d, - 0x91, 0x03, 0xc5, 0xe1, 0x75, 0x20, 0xfb, 0x01, 0x86, 0x3f, 0x46, 0x73, 0xa6, 0x65, 0xf1, 0x43, - 0xc6, 0xfc, 0x52, 0xa6, 0x92, 0xe1, 0x31, 0xcb, 0xe3, 0x5e, 0x81, 0xd3, 0xd0, 0x58, 0x04, 0x2d, - 0x89, 0x10, 0x1a, 0xcb, 0xf0, 0x9f, 0x26, 0x8f, 0x7e, 0xf6, 0x7c, 0x12, 0xf9, 0x76, 0x67, 0x9e, - 0x47, 0x7a, 0x8f, 0x79, 0x32, 0xaf, 0xe7, 0xc4, 0x81, 0xe2, 0x91, 0xce, 0x41, 0x99, 0xd5, 0x45, - 0xa4, 0x47, 0x00, 0xa1, 0x4a, 0x86, 0xb7, 0xd0, 0xc2, 0xd0, 0x3c, 0xee, 0xfa, 0xec, 0xcf, 0xc6, - 0xcc, 0xe9, 0x31, 0x88, 0x99, 0x8c, 0x58, 0xc5, 0xd0, 0x3c, 0xee, 0x48, 0x58, 0xad, 0x42, 0xc3, - 0x08, 0xd5, 0x19, 0xb8, 0x8a, 0x90, 0xed, 0x04, 0x9e, 0x6b, 0x8d, 0x7b, 0xcc, 0x93, 0x21, 0x02, - 0xe5, 0x25, 0x46, 0x55, 0x79, 0x89, 0x21, 0x42, 0x35, 0x39, 0xee, 0xa3, 0x02, 0xc4, 0x6e, 0xd7, - 0xb6, 0x4a, 0x85, 0x4a, 0x6a, 0x35, 0x5b, 0xdd, 0x96, 0xce, 0x9d, 0x85, 0x28, 0x04, 0xdf, 0x46, - 0x3f, 0x79, 0xcc, 0x00, 0xbb, 0x69, 0xa9, 0xdd, 0x97, 0x63, 0x9e, 0x37, 0x22, 0xda, 0xdf, 0xc6, - 0x3f, 0x69, 0xc4, 0xc7, 0x7f, 0x8e, 0xca, 0xfe, 0x73, 0x9b, 0x9f, 0x14, 0x31, 0x37, 0x2f, 0x18, - 0x5d, 0x8f, 0x0d, 0xdd, 0x43, 0x73, 0xe0, 0x97, 0xe6, 0x60, 0xf1, 0x9f, 0x4c, 0x42, 0xa3, 0xc4, - 0x59, 0x4d, 0x8d, 0x44, 0x25, 0x67, 0x1a, 0x1a, 0x2b, 0x22, 0xcf, 0x5d, 0x41, 0x20, 0xf4, 0x4a, - 0x5d, 0x7c, 0x8c, 0xde, 0x62, 0x4e, 0xcf, 0x3b, 0x19, 0xc1, 0xb4, 0x23, 0xd3, 0xf7, 0x8f, 0x5c, - 0xcf, 0xea, 0x06, 0xee, 0x73, 0xe6, 0x94, 0x10, 0x04, 0xf5, 0xc7, 0x93, 0xd0, 0xb8, 0x1b, 0x93, - 0x76, 0x24, 0x67, 0x97, 0x53, 0xa6, 0xa1, 0xf1, 0x36, 0xcc, 0x7d, 0x85, 0x9c, 0xd0, 0xab, 0x34, - 0xc9, 0xbf, 0xa4, 0x50, 0x0e, 0x36, 0x83, 0x9f, 0x66, 0x91, 0xd4, 0x65, 0x0a, 0x86, 0xd3, 0x2c, - 0x90, 0x0b, 0xe9, 0x5f, 0xe2, 0xb8, 0x81, 0x72, 0xfb, 0xf6, 0x80, 0xf9, 0xa5, 0x34, 0x9c, 0x65, - 0xac, 0x15, 0x12, 0x7b, 0xc0, 0x9a, 0xce, 0xbe, 0x5b, 0xbd, 0x27, 0x4f, 0xb3, 0x20, 0xaa, 0xb3, - 0xc4, 0x47, 0x84, 0x0a, 0x90, 0xe7, 0xbe, 0x81, 0xe9, 0x07, 0x71, 0xcc, 0x65, 0x20, 0xe6, 0x20, - 0xf7, 0x71, 0x81, 0x16, 0x74, 0x58, 0x26, 0xf6, 0x18, 0x24, 0x34, 0xc1, 0x21, 0xbf, 0x49, 0xa3, - 0x79, 0xf8, 0xa2, 0x27, 0x23, 0xcb, 0x0c, 0xd8, 0xff, 0x97, 0xef, 0xe2, 0xc6, 0x46, 0x1e, 0x3b, - 0x8c, 0x8d, 0x65, 0x63, 0x63, 0x5c, 0x70, 0xc1, 0x98, 0x0e, 0x12, 0x9a, 0xe0, 0x90, 0x5f, 0x2c, - 0xa2, 0x42, 0xf4, 0x29, 0x2a, 0xef, 0xa5, 0xae, 0x91, 0xf7, 0xd6, 0x50, 0xd6, 0xb7, 0x7f, 0x16, - 0x7d, 0x09, 0x70, 0xf9, 0x58, 0x71, 0xf9, 0x80, 0x50, 0xc0, 0xf0, 0xa7, 0x08, 0x0d, 0x5d, 0xcb, - 0xde, 0xb7, 0x99, 0xd5, 0xf5, 0xf5, 0x7e, 0x2b, 0x42, 0x3b, 0xaa, 0x39, 0x50, 0x08, 0xa1, 0xb1, - 0x94, 0xa7, 0x49, 0x65, 0x60, 0xef, 0xa4, 0xb4, 0x00, 0x09, 0xe0, 0xe3, 0x28, 0x01, 0x74, 0x0e, - 0x5c, 0x2f, 0x80, 0x53, 0xaf, 0xa6, 0xa9, 0x9e, 0xa8, 0x8c, 0x12, 0x43, 0x84, 0x1f, 0x78, 0x49, - 0xa6, 0x1a, 0x15, 0x6f, 0xa3, 0xd9, 0xa8, 0x69, 0xe5, 0x07, 0x3c, 0x51, 0x8b, 0x9e, 0xb2, 0x5e, - 0xe0, 0x7a, 0xd5, 0x4a, 0x54, 0x8b, 0x0e, 0x55, 0x13, 0x2b, 0xf2, 0xca, 0x61, 0xd4, 0xbe, 0x46, - 0x12, 0xfc, 0x21, 0x2a, 0x28, 0xd7, 0x20, 0xf8, 0x56, 0xc8, 0xb9, 0x7e, 0xec, 0x96, 0x25, 0xd9, - 0x07, 0x45, 0x2e, 0x51, 0x32, 0xfc, 0x13, 0x94, 0xdf, 0x1b, 0xb8, 0xbd, 0xe7, 0x51, 0x51, 0xbc, - 0x19, 0x2f, 0xa4, 0xca, 0x71, 0x88, 0xb8, 0xb7, 0xe5, 0x5a, 0x24, 0x55, 0x75, 0x39, 0x30, 0x24, - 0x54, 0xc2, 0xbc, 0x23, 0xf7, 0x4f, 0x86, 0x03, 0xdb, 0x79, 0xde, 0x0d, 0x4c, 0xaf, 0xcf, 0x82, - 0xd2, 0x72, 0xdc, 0x91, 0x4b, 0xc9, 0x2e, 0x08, 0x54, 0x47, 0x9e, 0x40, 0x09, 0x4d, 0xb2, 0xf8, - 0x3d, 0x41, 0x98, 0xee, 0x1e, 0x98, 0xfe, 0x41, 0x09, 0x43, 0x3a, 0x82, 0x44, 0x2e, 0xe0, 0x47, - 0xa6, 0x7f, 0xa0, 0xb6, 0x3d, 0x86, 0x08, 0xd5, 0xe4, 0xbc, 0x4f, 0x94, 0x29, 0x88, 0x59, 0xa5, - 0x9b, 0x60, 0x02, 0x42, 0x41, 0x81, 0x2a, 0x14, 0x14, 0x42, 0x68, 0x2c, 0xc5, 0x55, 0xd9, 0x6f, - 0x8b, 0x2e, 0xf9, 0xce, 0xc5, 0x03, 0x79, 0x8d, 0x86, 0x7b, 0x13, 0xcd, 0x9f, 0x6f, 0xde, 0x16, - 0x45, 0x61, 0x1b, 0x25, 0xda, 0x36, 0x51, 0xd8, 0x46, 0x7a, 0xc3, 0xa6, 0x33, 0xf0, 0x4f, 0xb4, - 0xb0, 0x74, 0xfc, 0xd2, 0x3c, 0x5c, 0x4f, 0xde, 0xd1, 0xe3, 0xb0, 0xe5, 0x5f, 0x88, 0xc3, 0x56, - 0x7c, 0x2d, 0xd1, 0x68, 0x78, 0x1f, 0x89, 0x5d, 0xea, 0xc2, 0xa9, 0x5a, 0x04, 0x53, 0x5b, 0xaf, - 0x42, 0x63, 0x81, 0x9a, 0x47, 0xe0, 0xfa, 0x8e, 0xfd, 0x33, 0xc6, 0x37, 0x6a, 0x2f, 0x1a, 0xa8, - 0x8d, 0x52, 0x48, 0x64, 0xf8, 0x97, 0x2f, 0x1f, 0x24, 0xd4, 0x68, 0xac, 0x84, 0x9f, 0xa2, 0xc2, - 0x68, 0x60, 0x06, 0xfb, 0xae, 0x37, 0x2c, 0x2d, 0x41, 0xb0, 0x6b, 0x7b, 0xb8, 0x23, 0x25, 0x75, - 0x33, 0x30, 0xab, 0x44, 0x86, 0x99, 0xe2, 0xab, 0xc8, 0x8d, 0x00, 0x42, 0x95, 0x0c, 0xd7, 0xd1, - 0xfc, 0xc0, 0xed, 0x99, 0x83, 0xee, 0xfe, 0xc0, 0xec, 0xfb, 0xa5, 0xff, 0x98, 0x85, 0x4d, 0x85, - 0xe8, 0x00, 0x7c, 0x93, 0xc3, 0x6a, 0x33, 0x62, 0x88, 0x50, 0x4d, 0x8e, 0x1f, 0xa1, 0x05, 0x79, - 0x8c, 0x44, 0x8c, 0xfd, 0xe7, 0x2c, 0x44, 0x08, 0xf8, 0x46, 0x0a, 0x64, 0x94, 0x2d, 0xeb, 0xa7, - 0x4f, 0x84, 0x99, 0xce, 0xc0, 0x9f, 0xa3, 0x1b, 0xb6, 0xe3, 0x5a, 0xac, 0xdb, 0x3b, 0x30, 0x9d, - 0x3e, 0xe3, 0xfe, 0x99, 0xcc, 0xc2, 0x69, 0x84, 0xf8, 0x07, 0x59, 0x0d, 0x44, 0xe0, 0xa3, 0x9b, - 0xb2, 0x49, 0xd0, 0x50, 0x42, 0x93, 0x2c, 0x7c, 0x8c, 0xb4, 0xea, 0xd9, 0x0d, 0x3c, 0xd3, 0x1e, - 0x30, 0x4f, 0xf8, 0xeb, 0xbf, 0x66, 0xc1, 0x61, 0x9f, 0x4e, 0x42, 0xe3, 0x76, 0xcc, 0xd9, 0x15, - 0x14, 0xe9, 0xac, 0x7b, 0xe7, 0x2a, 0xb3, 0x26, 0x55, 0x11, 0x71, 0xb9, 0x32, 0xfe, 0x31, 0x6f, - 0x96, 0x79, 0x43, 0x6f, 0xc9, 0xce, 0xfd, 0xbe, 0x68, 0x8b, 0x01, 0x52, 0xa9, 0x48, 0x8e, 0xa1, - 0x2f, 0x86, 0x5f, 0x98, 0xa2, 0x59, 0xdb, 0x39, 0x34, 0x07, 0x76, 0xd4, 0x99, 0x7f, 0xf0, 0x2a, - 0x34, 0x10, 0x35, 0x8f, 0x9a, 0x02, 0x15, 0x8d, 0x12, 0xfc, 0xd4, 0x1a, 0x25, 0x18, 0xf3, 0x46, - 0x49, 0x63, 0xd2, 0x88, 0xc7, 0xd3, 0x8a, 0xe3, 0x26, 0x2e, 0x3f, 0x05, 0x30, 0x0d, 0xdb, 0xea, - 0xb8, 0xc9, 0x8b, 0x8f, 0xd8, 0xd6, 0x04, 0x4a, 0x68, 0x92, 0xf5, 0x61, 0xf6, 0x6f, 0x7e, 0x6d, - 0xcc, 0x90, 0xaf, 0x52, 0x68, 0x4e, 0xa5, 0x38, 0x5e, 0x5d, 0xc0, 0xff, 0x19, 0x70, 0x3f, 0x9c, - 0xe6, 0x03, 0xe1, 0x77, 0x71, 0x9a, 0x0f, 0xc0, 0xe1, 0x80, 0xf1, 0xba, 0xee, 0xee, 0xef, 0xfb, - 0x2c, 0x80, 0xba, 0x95, 0x11, 0x75, 0x5d, 0x20, 0xaa, 0xae, 0x8b, 0x21, 0xa1, 0x12, 0xc7, 0xef, - 0xc9, 0xea, 0x95, 0x06, 0xb7, 0xbd, 0x7d, 0x79, 0xf5, 0x8a, 0x9c, 0x22, 0x8a, 0xd8, 0x47, 0x68, - 0xee, 0x88, 0x99, 0xcf, 0x45, 0x5c, 0x8a, 0x94, 0x01, 0x79, 0x9d, 0x83, 0x32, 0x26, 0xc5, 0xe9, - 0x88, 0x00, 0x42, 0x95, 0x4c, 0x7e, 0xe3, 0x33, 0x94, 0x17, 0xe5, 0x04, 0xef, 0xa0, 0x42, 0xcf, - 0x1d, 0x3b, 0x41, 0x7c, 0xf7, 0x5e, 0xd6, 0x9b, 0x7e, 0x90, 0x54, 0x7f, 0x2f, 0x3a, 0x80, 0x11, - 0x55, 0xf9, 0x48, 0x02, 0xbc, 0x5b, 0x97, 0x22, 0xf2, 0xf3, 0x14, 0x9a, 0x95, 0x8a, 0xf8, 0x91, - 0xba, 0x03, 0x65, 0xab, 0x1f, 0x9c, 0xab, 0x92, 0x5f, 0x7f, 0x9f, 0xd6, 0x2b, 0xa4, 0xbc, 0x5a, - 0x1f, 0x9a, 0x83, 0xb1, 0xd8, 0xa8, 0xac, 0xb8, 0x5a, 0x03, 0xa0, 0x8a, 0x0e, 0x8c, 0x08, 0x15, - 0x28, 0xf9, 0x79, 0x16, 0x2d, 0xe8, 0x49, 0x84, 0xa7, 0xeb, 0xb1, 0x63, 0x1f, 0xc3, 0x62, 0x12, - 0xfd, 0xd3, 0x13, 0xc7, 0x3e, 0x86, 0x34, 0x53, 0x7e, 0x11, 0x1a, 0x29, 0xee, 0x00, 0xce, 0x53, - 0x0e, 0xe0, 0x03, 0x42, 0x01, 0xc3, 0x9f, 0xa3, 0xd9, 0x23, 0xdb, 0xb1, 0xdc, 0x23, 0x1f, 0x96, - 0x31, 0xaf, 0x5f, 0x90, 0xbe, 0x10, 0x02, 0xb0, 0x54, 0x91, 0x96, 0x22, 0xb6, 0xda, 0x2e, 0x39, - 0x26, 0x34, 0x92, 0xe0, 0x2d, 0x94, 0x1b, 0xd8, 0xce, 0xf8, 0x18, 0x02, 0x2c, 0x51, 0x66, 0x7f, - 0x6a, 0x06, 0x81, 0x07, 0xe6, 0xee, 0x4b, 0x73, 0x82, 0x19, 0xbf, 0x25, 0xf0, 0x11, 0xa1, 0x02, - 0xc5, 0x9f, 0xa1, 0xbc, 0x65, 0x7a, 0x47, 0xb6, 0xb8, 0xbb, 0x5d, 0x61, 0x69, 0x45, 0x5a, 0x92, - 0xd4, 0xf8, 0x1e, 0x0b, 0x43, 0x42, 0x25, 0x8e, 0x19, 0x9a, 0xdd, 0xf7, 0x18, 0xdb, 0xf3, 0x2d, - 0x68, 0x92, 0xae, 0xb0, 0xf6, 0x63, 0x6e, 0x8d, 0xdf, 0x76, 0x36, 0x3d, 0xc6, 0xaa, 0x1d, 0xb8, - 0xed, 0x48, 0x35, 0xf5, 0xc5, 0x72, 0x0c, 0xb7, 0x1d, 0x49, 0xa3, 0x11, 0x09, 0x77, 0x51, 0xde, - 0x61, 0x01, 0x9f, 0x25, 0x7f, 0xf5, 0x2c, 0xeb, 0x72, 0x96, 0x7c, 0x8b, 0x05, 0x62, 0x12, 0xa9, - 0xa4, 0x56, 0x2f, 0x86, 0x7c, 0x0a, 0xc9, 0xa1, 0x92, 0x41, 0x7e, 0x91, 0x46, 0x85, 0xc8, 0xbf, - 0xbc, 0xf9, 0x73, 0x8f, 0x1c, 0xe6, 0xe9, 0x2f, 0x94, 0x50, 0xf1, 0x01, 0x95, 0xb7, 0x50, 0x51, - 0xc8, 0x14, 0x42, 0x68, 0x2c, 0xe5, 0x06, 0xfa, 0x9e, 0x3b, 0x1e, 0xe9, 0xaf, 0x93, 0x60, 0x00, - 0xd0, 0x84, 0x01, 0x85, 0x10, 0x1a, 0x4b, 0xf1, 0x47, 0x28, 0x33, 0xb6, 0x2d, 0x70, 0x75, 0xae, - 0xfa, 0xce, 0xab, 0xd0, 0xc8, 0x3c, 0x81, 0x13, 0xc0, 0xd1, 0x69, 0x68, 0xcc, 0x89, 0x80, 0xb3, - 0x2d, 0xad, 0x7c, 0x72, 0x06, 0xe5, 0x72, 0xae, 0xdc, 0xb7, 0x2d, 0xf9, 0xf4, 0x08, 0xca, 0x5b, - 0x42, 0xb9, 0xaf, 0x29, 0xf7, 0x93, 0xca, 0x5b, 0x5c, 0x99, 0x63, 0xbf, 0x4a, 0xa1, 0x79, 0x2d, - 0x42, 0xbf, 0xfd, 0x5e, 0x6c, 0xa3, 0x25, 0x61, 0xc0, 0xf6, 0xbb, 0xf0, 0x81, 0xf2, 0xa9, 0x0d, - 0x9a, 0x7f, 0x90, 0x34, 0xfd, 0x2d, 0x8e, 0xab, 0xe6, 0x5f, 0x07, 0x09, 0x4d, 0x70, 0x48, 0x07, - 0xcd, 0x29, 0x87, 0xe3, 0x4d, 0x94, 0x3f, 0xe6, 0x83, 0x28, 0x21, 0xdd, 0x38, 0x17, 0x15, 0x71, - 0xdb, 0x29, 0x68, 0xea, 0x40, 0xc0, 0x90, 0x50, 0x09, 0x93, 0x1e, 0xca, 0x01, 0xff, 0x8d, 0x6e, - 0x13, 0x89, 0x3c, 0xb3, 0xf0, 0x7f, 0xe7, 0x99, 0xbf, 0xc8, 0xa2, 0x59, 0xca, 0x9b, 0x66, 0x3f, - 0xc0, 0x3f, 0x52, 0xd9, 0x2e, 0x57, 0xfd, 0xee, 0x55, 0xe9, 0x2d, 0xf6, 0x4e, 0xf4, 0xc8, 0x13, - 0x5f, 0x07, 0xd3, 0xd7, 0xbe, 0x0e, 0x46, 0x9f, 0x94, 0xb9, 0xc6, 0x27, 0xc5, 0x65, 0x29, 0xfb, - 0xc6, 0x65, 0x29, 0x77, 0xfd, 0xb2, 0x14, 0x55, 0xca, 0xfc, 0x35, 0x2a, 0x65, 0x1b, 0x2d, 0xed, - 0x7b, 0xee, 0x10, 0x9e, 0x02, 0x5d, 0xcf, 0xf4, 0x4e, 0x64, 0x57, 0x00, 0xa5, 0x9b, 0x4b, 0x76, - 0x23, 0x81, 0x2a, 0xdd, 0x09, 0x94, 0xd0, 0x24, 0x2b, 0x59, 0x13, 0x0b, 0x6f, 0x56, 0x13, 0xf1, - 0x27, 0xa8, 0x20, 0x3a, 0x5e, 0xc7, 0x85, 0x6b, 0x57, 0xae, 0xfa, 0x1d, 0x9e, 0xca, 0x00, 0x6b, - 0xb9, 0x2a, 0x95, 0xc9, 0xb1, 0xfa, 0xec, 0x88, 0x40, 0xfe, 0x21, 0x85, 0x0a, 0x94, 0xf9, 0x23, - 0xd7, 0xf1, 0xd9, 0x37, 0x0d, 0x82, 0x35, 0x94, 0xb5, 0xcc, 0xc0, 0x94, 0x61, 0x07, 0xbb, 0xc7, - 0xc7, 0x6a, 0xf7, 0xf8, 0x80, 0x50, 0xc0, 0xf0, 0xa7, 0x28, 0xdb, 0x73, 0x2d, 0xe1, 0xfc, 0x25, - 0x3d, 0x69, 0x36, 0x3c, 0xcf, 0xf5, 0x6a, 0xae, 0x25, 0xaf, 0x1d, 0x9c, 0xa4, 0x0c, 0xf0, 0x01, - 0xa1, 0x80, 0x91, 0xbf, 0x4f, 0xa1, 0x62, 0xdd, 0x3d, 0x72, 0x06, 0xae, 0x69, 0xed, 0x78, 0x6e, - 0xdf, 0x63, 0xbe, 0xff, 0x8d, 0x5e, 0x25, 0xba, 0x68, 0x76, 0x0c, 0x6f, 0x1a, 0xd1, 0xbb, 0xc4, - 0x83, 0xe4, 0x35, 0xe8, 0xfc, 0x24, 0xe2, 0x01, 0x24, 0x7e, 0x4f, 0x95, 0xca, 0xca, 0xbe, 0x18, - 0x13, 0x1a, 0x09, 0xc8, 0x6f, 0x32, 0xa8, 0x7c, 0xb5, 0x21, 0x3c, 0x44, 0xf3, 0x82, 0xd9, 0xd5, - 0xfe, 0xf4, 0xb1, 0x7a, 0x9d, 0x35, 0xc0, 0xe5, 0x0c, 0x2e, 0x05, 0x63, 0x35, 0x56, 0x97, 0x82, - 0x18, 0x22, 0x54, 0x93, 0xbf, 0xd1, 0x73, 0xac, 0x76, 0x95, 0xcf, 0x7c, 0xfb, 0xab, 0x7c, 0x07, - 0x2d, 0x8a, 0x10, 0x8d, 0xde, 0xcd, 0xb3, 0x95, 0xcc, 0x6a, 0xae, 0xfa, 0x90, 0x67, 0xdb, 0x3d, - 0xd1, 0xac, 0x46, 0x2f, 0xe6, 0xcb, 0x71, 0xb0, 0x0a, 0x30, 0x8a, 0xb6, 0xe2, 0x0c, 0x4d, 0x70, - 0xf1, 0x66, 0xe2, 0xa6, 0x27, 0x8e, 0xfa, 0x1f, 0x5c, 0xf3, 0x66, 0xa7, 0xdd, 0xe4, 0x48, 0x1e, - 0x65, 0x77, 0x6c, 0xa7, 0x4f, 0x3e, 0x42, 0xb9, 0xda, 0xc0, 0xf5, 0x21, 0xe3, 0x78, 0xcc, 0xf4, - 0x5d, 0x47, 0x0f, 0x25, 0x81, 0x28, 0x57, 0x8b, 0x21, 0xa1, 0x12, 0x5f, 0xfb, 0x6d, 0x06, 0xcd, - 0x6b, 0x7f, 0xa9, 0xc2, 0x7f, 0x82, 0xee, 0x3d, 0x6e, 0x74, 0x3a, 0x1b, 0x5b, 0x8d, 0xee, 0xee, - 0x97, 0x3b, 0x8d, 0x6e, 0x6d, 0xfb, 0x49, 0x67, 0xb7, 0x41, 0xbb, 0xb5, 0x76, 0x6b, 0xb3, 0xb9, - 0x55, 0x9c, 0x29, 0xdf, 0x3f, 0x3d, 0xab, 0x94, 0x34, 0x8d, 0xe4, 0x9f, 0x94, 0xfe, 0x10, 0xe1, - 0x84, 0x7a, 0xb3, 0x55, 0x6f, 0xfc, 0xb4, 0x98, 0x2a, 0xdf, 0x3a, 0x3d, 0xab, 0x14, 0x35, 0x2d, - 0xf1, 0xd2, 0xf8, 0xc7, 0xe8, 0xad, 0x8b, 0xec, 0xee, 0x93, 0x9d, 0xfa, 0xc6, 0x6e, 0xa3, 0x98, - 0x2e, 0x97, 0x4f, 0xcf, 0x2a, 0x77, 0xce, 0x2b, 0xc9, 0x10, 0xfc, 0x01, 0xba, 0x95, 0x50, 0xa5, - 0x8d, 0xcf, 0x9f, 0x34, 0x3a, 0xbb, 0xc5, 0x4c, 0xf9, 0xce, 0xe9, 0x59, 0x05, 0x6b, 0x5a, 0x51, - 0x99, 0x58, 0x47, 0xb7, 0xcf, 0x69, 0x74, 0x76, 0xda, 0xad, 0x4e, 0xa3, 0x98, 0x2d, 0xdf, 0x3d, - 0x3d, 0xab, 0xdc, 0x4c, 0xa8, 0xc8, 0xac, 0x52, 0x43, 0x2b, 0x09, 0x9d, 0x7a, 0xfb, 0x8b, 0xd6, - 0x76, 0x7b, 0xa3, 0xde, 0xdd, 0xa1, 0xed, 0x2d, 0xda, 0xe8, 0x74, 0x8a, 0xb9, 0xb2, 0x71, 0x7a, - 0x56, 0xb9, 0xa7, 0x29, 0x5f, 0x38, 0xe1, 0x6b, 0x68, 0x39, 0x61, 0x64, 0xa7, 0xd9, 0xda, 0x2a, - 0xe6, 0xcb, 0x37, 0x4f, 0xcf, 0x2a, 0x37, 0x34, 0x3d, 0xee, 0xcb, 0x0b, 0xfb, 0x57, 0xdb, 0x6e, - 0x77, 0x1a, 0xc5, 0xd9, 0x0b, 0xfb, 0x07, 0x0e, 0x5f, 0xfb, 0xbb, 0x14, 0xc2, 0x17, 0xff, 0x38, - 0x88, 0x3f, 0x40, 0xa5, 0xc8, 0x48, 0xad, 0xfd, 0x78, 0x87, 0xaf, 0xb3, 0xd9, 0x6e, 0x75, 0x5b, - 0xed, 0x56, 0xa3, 0x38, 0x93, 0xd8, 0x55, 0x4d, 0xab, 0xe5, 0x3a, 0x0c, 0xb7, 0xd1, 0xdd, 0xcb, - 0x34, 0xb7, 0x9f, 0xbd, 0x5f, 0x4c, 0x95, 0xd7, 0x4f, 0xcf, 0x2a, 0xb7, 0x2f, 0x2a, 0x6e, 0x3f, - 0x7b, 0xff, 0x77, 0x7f, 0xf5, 0xdd, 0xcb, 0x05, 0x6b, 0xbc, 0x01, 0xd2, 0x97, 0xf6, 0x1e, 0xba, - 0xa5, 0x1b, 0x7e, 0xdc, 0xd8, 0xdd, 0xa8, 0x6f, 0xec, 0x6e, 0x14, 0x67, 0x84, 0x0f, 0x34, 0xea, - 0x63, 0x16, 0x98, 0x90, 0x76, 0xbf, 0x87, 0x96, 0x13, 0x5f, 0xd1, 0x78, 0xda, 0xa0, 0x51, 0x44, - 0xe9, 0xeb, 0x67, 0x87, 0xcc, 0xc3, 0xdf, 0x47, 0x58, 0x27, 0x6f, 0x6c, 0x7f, 0xb1, 0xf1, 0x65, - 0xa7, 0x98, 0x2e, 0xdf, 0x3e, 0x3d, 0xab, 0x2c, 0x6b, 0xec, 0x8d, 0xc1, 0x91, 0x79, 0xe2, 0xaf, - 0xfd, 0x53, 0x1a, 0x2d, 0xe8, 0xef, 0x46, 0xf8, 0xfb, 0xe8, 0xe6, 0x66, 0x73, 0x9b, 0x47, 0xe2, - 0x66, 0x5b, 0x78, 0x80, 0x0f, 0x8b, 0x33, 0x62, 0x3a, 0x9d, 0xca, 0x7f, 0xe3, 0x3f, 0x42, 0xa5, - 0x73, 0xf4, 0x7a, 0x93, 0x36, 0x6a, 0xbb, 0x6d, 0xfa, 0x65, 0x31, 0x55, 0x7e, 0x8b, 0x6f, 0x98, - 0xae, 0x53, 0xb7, 0x3d, 0x48, 0x41, 0x27, 0xf8, 0x13, 0x74, 0xef, 0x9c, 0x62, 0xe7, 0xcb, 0xc7, - 0xdb, 0xcd, 0xd6, 0x67, 0x62, 0xbe, 0x74, 0xf9, 0xed, 0xd3, 0xb3, 0xca, 0x5d, 0x5d, 0xb7, 0x23, - 0x9e, 0xe2, 0x38, 0x54, 0x48, 0xe1, 0x47, 0xa8, 0x72, 0x85, 0x7e, 0xbc, 0x80, 0x4c, 0x99, 0x9c, - 0x9e, 0x55, 0xee, 0x5f, 0x62, 0x44, 0xad, 0xa3, 0x90, 0xc2, 0x3f, 0x44, 0x77, 0x2e, 0xb7, 0x14, - 0x9d, 0x8b, 0x4b, 0xf4, 0xd7, 0xfe, 0x35, 0x85, 0xe6, 0x54, 0xd5, 0xe3, 0x9b, 0xd6, 0xa0, 0xb4, - 0xcd, 0x93, 0x44, 0xbd, 0xd1, 0x6d, 0xb5, 0xbb, 0x30, 0x8a, 0x36, 0x4d, 0xf1, 0x5a, 0x2e, 0xfc, - 0xe4, 0x31, 0xae, 0xd1, 0xb7, 0x1a, 0xad, 0x06, 0x6d, 0xd6, 0x22, 0x8f, 0x2a, 0xf6, 0x16, 0x73, - 0x98, 0x67, 0xf7, 0xf0, 0xfb, 0xe8, 0x6e, 0xd2, 0x78, 0xe7, 0x49, 0xed, 0x51, 0xb4, 0x4b, 0xb0, - 0x40, 0x6d, 0x82, 0xce, 0xb8, 0x77, 0x00, 0x8e, 0xf9, 0x51, 0x42, 0xab, 0xd9, 0x7a, 0xba, 0xb1, - 0xdd, 0xac, 0x0b, 0xad, 0x4c, 0xb9, 0x74, 0x7a, 0x56, 0xb9, 0xa5, 0xb4, 0xe4, 0x03, 0x07, 0x57, - 0x5b, 0xfb, 0x5d, 0x0a, 0xad, 0x7c, 0x7d, 0xf1, 0xc2, 0x5f, 0xa0, 0x77, 0x60, 0xbf, 0x2e, 0xa4, - 0x02, 0x99, 0xb7, 0xc4, 0x1e, 0x6e, 0xec, 0xec, 0x34, 0x5a, 0xf5, 0xe2, 0x4c, 0x79, 0xf5, 0xf4, - 0xac, 0xf2, 0xe0, 0xeb, 0x4d, 0x6e, 0x8c, 0x46, 0xcc, 0xb1, 0xae, 0x69, 0x78, 0xb3, 0x4d, 0xb7, - 0x1a, 0xbb, 0xc5, 0xd4, 0x75, 0x0c, 0x6f, 0xba, 0x5e, 0x9f, 0x05, 0xd5, 0xc7, 0x2f, 0xbe, 0x5a, - 0x99, 0x79, 0xf9, 0xd5, 0xca, 0xcc, 0x8b, 0x57, 0x2b, 0xa9, 0x97, 0xaf, 0x56, 0x52, 0x7f, 0xfd, - 0x7a, 0x65, 0xe6, 0xd7, 0xaf, 0x57, 0x52, 0x2f, 0x5f, 0xaf, 0xcc, 0xfc, 0xdb, 0xeb, 0x95, 0x99, - 0x67, 0xdf, 0xeb, 0xdb, 0xc1, 0xc1, 0x78, 0xef, 0x61, 0xcf, 0x1d, 0xbe, 0xeb, 0x9f, 0x38, 0xbd, - 0xe0, 0xc0, 0x76, 0xfa, 0xda, 0x2f, 0xfd, 0x1f, 0x58, 0xf6, 0xf2, 0xf0, 0xeb, 0x87, 0xff, 0x1b, - 0x00, 0x00, 0xff, 0xff, 0xa6, 0x37, 0xc7, 0xbf, 0xd7, 0x22, 0x00, 0x00, -} - -func (m *Hello) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Hello) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Hello) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Timestamp != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Timestamp)) - i-- - dAtA[i] = 0x28 - } - if m.NumConnections != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.NumConnections)) - i-- - dAtA[i] = 0x20 - } - if len(m.ClientVersion) > 0 { - i -= len(m.ClientVersion) - copy(dAtA[i:], m.ClientVersion) - i = encodeVarintBep(dAtA, i, uint64(len(m.ClientVersion))) - i-- - dAtA[i] = 0x1a - } - if len(m.ClientName) > 0 { - i -= len(m.ClientName) - copy(dAtA[i:], m.ClientName) - i = encodeVarintBep(dAtA, i, uint64(len(m.ClientName))) - i-- - dAtA[i] = 0x12 - } - if len(m.DeviceName) > 0 { - i -= len(m.DeviceName) - copy(dAtA[i:], m.DeviceName) - i = encodeVarintBep(dAtA, i, uint64(len(m.DeviceName))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *Header) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Header) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Compression != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Compression)) - i-- - dAtA[i] = 0x10 - } - if m.Type != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Type)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *ClusterConfig) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ClusterConfig) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ClusterConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Secondary { - i-- - if m.Secondary { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - if len(m.Folders) > 0 { - for iNdEx := len(m.Folders) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Folders[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *Folder) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Folder) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Folder) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Devices) > 0 { - for iNdEx := len(m.Devices) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Devices[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x82 - } - } - if m.Paused { - i-- - if m.Paused { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if m.DisableTempIndexes { - i-- - if m.DisableTempIndexes { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x30 - } - if m.IgnoreDelete { - i-- - if m.IgnoreDelete { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x28 - } - if m.IgnorePermissions { - i-- - if m.IgnorePermissions { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x20 - } - if m.ReadOnly { - i-- - if m.ReadOnly { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x18 - } - if len(m.Label) > 0 { - i -= len(m.Label) - copy(dAtA[i:], m.Label) - i = encodeVarintBep(dAtA, i, uint64(len(m.Label))) - i-- - dAtA[i] = 0x12 - } - if len(m.ID) > 0 { - i -= len(m.ID) - copy(dAtA[i:], m.ID) - i = encodeVarintBep(dAtA, i, uint64(len(m.ID))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *Device) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Device) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Device) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.EncryptionPasswordToken) > 0 { - i -= len(m.EncryptionPasswordToken) - copy(dAtA[i:], m.EncryptionPasswordToken) - i = encodeVarintBep(dAtA, i, uint64(len(m.EncryptionPasswordToken))) - i-- - dAtA[i] = 0x52 - } - if m.SkipIntroductionRemovals { - i-- - if m.SkipIntroductionRemovals { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x48 - } - if m.IndexID != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.IndexID)) - i-- - dAtA[i] = 0x40 - } - if m.Introducer { - i-- - if m.Introducer { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if m.MaxSequence != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.MaxSequence)) - i-- - dAtA[i] = 0x30 - } - if len(m.CertName) > 0 { - i -= len(m.CertName) - copy(dAtA[i:], m.CertName) - i = encodeVarintBep(dAtA, i, uint64(len(m.CertName))) - i-- - dAtA[i] = 0x2a - } - if m.Compression != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Compression)) - i-- - dAtA[i] = 0x20 - } - if len(m.Addresses) > 0 { - for iNdEx := len(m.Addresses) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Addresses[iNdEx]) - copy(dAtA[i:], m.Addresses[iNdEx]) - i = encodeVarintBep(dAtA, i, uint64(len(m.Addresses[iNdEx]))) - i-- - dAtA[i] = 0x1a - } - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintBep(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0x12 - } - { - size := m.ID.ProtoSize() - i -= size - if _, err := m.ID.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *Index) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Index) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Index) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.LastSequence != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.LastSequence)) - i-- - dAtA[i] = 0x18 - } - if len(m.Files) > 0 { - for iNdEx := len(m.Files) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Files[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Folder) > 0 { - i -= len(m.Folder) - copy(dAtA[i:], m.Folder) - i = encodeVarintBep(dAtA, i, uint64(len(m.Folder))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *IndexUpdate) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *IndexUpdate) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *IndexUpdate) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.PrevSequence != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.PrevSequence)) - i-- - dAtA[i] = 0x20 - } - if m.LastSequence != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.LastSequence)) - i-- - dAtA[i] = 0x18 - } - if len(m.Files) > 0 { - for iNdEx := len(m.Files) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Files[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Folder) > 0 { - i -= len(m.Folder) - copy(dAtA[i:], m.Folder) - i = encodeVarintBep(dAtA, i, uint64(len(m.Folder))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *FileInfo) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FileInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FileInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.EncryptionTrailerSize != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.EncryptionTrailerSize)) - i-- - dAtA[i] = 0x3e - i-- - dAtA[i] = 0xd8 - } - if m.InodeChangeNs != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.InodeChangeNs)) - i-- - dAtA[i] = 0x3e - i-- - dAtA[i] = 0xd0 - } - if len(m.VersionHash) > 0 { - i -= len(m.VersionHash) - copy(dAtA[i:], m.VersionHash) - i = encodeVarintBep(dAtA, i, uint64(len(m.VersionHash))) - i-- - dAtA[i] = 0x3e - i-- - dAtA[i] = 0xca - } - if m.LocalFlags != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.LocalFlags)) - i-- - dAtA[i] = 0x3e - i-- - dAtA[i] = 0xc0 - } - if len(m.Encrypted) > 0 { - i -= len(m.Encrypted) - copy(dAtA[i:], m.Encrypted) - i = encodeVarintBep(dAtA, i, uint64(len(m.Encrypted))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x9a - } - if len(m.BlocksHash) > 0 { - i -= len(m.BlocksHash) - copy(dAtA[i:], m.BlocksHash) - i = encodeVarintBep(dAtA, i, uint64(len(m.BlocksHash))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x92 - } - if len(m.SymlinkTarget) > 0 { - i -= len(m.SymlinkTarget) - copy(dAtA[i:], m.SymlinkTarget) - i = encodeVarintBep(dAtA, i, uint64(len(m.SymlinkTarget))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x8a - } - if len(m.Blocks) > 0 { - for iNdEx := len(m.Blocks) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Blocks[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x82 - } - } - { - size, err := m.Platform.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x72 - if m.RawBlockSize != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.RawBlockSize)) - i-- - dAtA[i] = 0x68 - } - if m.ModifiedBy != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.ModifiedBy)) - i-- - dAtA[i] = 0x60 - } - if m.ModifiedNs != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.ModifiedNs)) - i-- - dAtA[i] = 0x58 - } - if m.Sequence != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Sequence)) - i-- - dAtA[i] = 0x50 - } - { - size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - if m.NoPermissions { - i-- - if m.NoPermissions { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x40 - } - if m.RawInvalid { - i-- - if m.RawInvalid { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if m.Deleted { - i-- - if m.Deleted { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x30 - } - if m.ModifiedS != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.ModifiedS)) - i-- - dAtA[i] = 0x28 - } - if m.Permissions != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Permissions)) - i-- - dAtA[i] = 0x20 - } - if m.Size != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Size)) - i-- - dAtA[i] = 0x18 - } - if m.Type != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Type)) - i-- - dAtA[i] = 0x10 - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintBep(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *BlockInfo) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *BlockInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *BlockInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.WeakHash != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.WeakHash)) - i-- - dAtA[i] = 0x20 - } - if len(m.Hash) > 0 { - i -= len(m.Hash) - copy(dAtA[i:], m.Hash) - i = encodeVarintBep(dAtA, i, uint64(len(m.Hash))) - i-- - dAtA[i] = 0x1a - } - if m.Size != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Size)) - i-- - dAtA[i] = 0x10 - } - if m.Offset != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Offset)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *Vector) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Vector) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Vector) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Counters) > 0 { - for iNdEx := len(m.Counters) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Counters[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *Counter) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Counter) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Counter) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Value != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Value)) - i-- - dAtA[i] = 0x10 - } - if m.ID != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.ID)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *PlatformData) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *PlatformData) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *PlatformData) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.NetBSD != nil { - { - size, err := m.NetBSD.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } - if m.FreeBSD != nil { - { - size, err := m.FreeBSD.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - if m.Darwin != nil { - { - size, err := m.Darwin.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if m.Linux != nil { - { - size, err := m.Linux.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.Windows != nil { - { - size, err := m.Windows.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Unix != nil { - { - size, err := m.Unix.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *UnixData) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *UnixData) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *UnixData) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.GID != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.GID)) - i-- - dAtA[i] = 0x20 - } - if m.UID != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.UID)) - i-- - dAtA[i] = 0x18 - } - if len(m.GroupName) > 0 { - i -= len(m.GroupName) - copy(dAtA[i:], m.GroupName) - i = encodeVarintBep(dAtA, i, uint64(len(m.GroupName))) - i-- - dAtA[i] = 0x12 - } - if len(m.OwnerName) > 0 { - i -= len(m.OwnerName) - copy(dAtA[i:], m.OwnerName) - i = encodeVarintBep(dAtA, i, uint64(len(m.OwnerName))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *WindowsData) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *WindowsData) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *WindowsData) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.OwnerIsGroup { - i-- - if m.OwnerIsGroup { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - if len(m.OwnerName) > 0 { - i -= len(m.OwnerName) - copy(dAtA[i:], m.OwnerName) - i = encodeVarintBep(dAtA, i, uint64(len(m.OwnerName))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *XattrData) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *XattrData) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *XattrData) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Xattrs) > 0 { - for iNdEx := len(m.Xattrs) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Xattrs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *Xattr) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Xattr) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Xattr) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Value) > 0 { - i -= len(m.Value) - copy(dAtA[i:], m.Value) - i = encodeVarintBep(dAtA, i, uint64(len(m.Value))) - i-- - dAtA[i] = 0x12 - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintBep(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *Request) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Request) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Request) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.BlockNo != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.BlockNo)) - i-- - dAtA[i] = 0x48 - } - if m.WeakHash != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.WeakHash)) - i-- - dAtA[i] = 0x40 - } - if m.FromTemporary { - i-- - if m.FromTemporary { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if len(m.Hash) > 0 { - i -= len(m.Hash) - copy(dAtA[i:], m.Hash) - i = encodeVarintBep(dAtA, i, uint64(len(m.Hash))) - i-- - dAtA[i] = 0x32 - } - if m.Size != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Size)) - i-- - dAtA[i] = 0x28 - } - if m.Offset != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Offset)) - i-- - dAtA[i] = 0x20 - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintBep(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0x1a - } - if len(m.Folder) > 0 { - i -= len(m.Folder) - copy(dAtA[i:], m.Folder) - i = encodeVarintBep(dAtA, i, uint64(len(m.Folder))) - i-- - dAtA[i] = 0x12 - } - if m.ID != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.ID)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *Response) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Response) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Response) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Code != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.Code)) - i-- - dAtA[i] = 0x18 - } - if len(m.Data) > 0 { - i -= len(m.Data) - copy(dAtA[i:], m.Data) - i = encodeVarintBep(dAtA, i, uint64(len(m.Data))) - i-- - dAtA[i] = 0x12 - } - if m.ID != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.ID)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *DownloadProgress) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DownloadProgress) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DownloadProgress) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Updates) > 0 { - for iNdEx := len(m.Updates) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Updates[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Folder) > 0 { - i -= len(m.Folder) - copy(dAtA[i:], m.Folder) - i = encodeVarintBep(dAtA, i, uint64(len(m.Folder))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *FileDownloadProgressUpdate) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FileDownloadProgressUpdate) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FileDownloadProgressUpdate) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.BlockSize != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.BlockSize)) - i-- - dAtA[i] = 0x28 - } - if len(m.BlockIndexes) > 0 { - for iNdEx := len(m.BlockIndexes) - 1; iNdEx >= 0; iNdEx-- { - i = encodeVarintBep(dAtA, i, uint64(m.BlockIndexes[iNdEx])) - i-- - dAtA[i] = 0x20 - } - } - { - size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintBep(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintBep(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0x12 - } - if m.UpdateType != 0 { - i = encodeVarintBep(dAtA, i, uint64(m.UpdateType)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *Ping) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Ping) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Ping) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *Close) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Close) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Close) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Reason) > 0 { - i -= len(m.Reason) - copy(dAtA[i:], m.Reason) - i = encodeVarintBep(dAtA, i, uint64(len(m.Reason))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintBep(dAtA []byte, offset int, v uint64) int { - offset -= sovBep(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Hello) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.DeviceName) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - l = len(m.ClientName) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - l = len(m.ClientVersion) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.NumConnections != 0 { - n += 1 + sovBep(uint64(m.NumConnections)) - } - if m.Timestamp != 0 { - n += 1 + sovBep(uint64(m.Timestamp)) - } - return n -} - -func (m *Header) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Type != 0 { - n += 1 + sovBep(uint64(m.Type)) - } - if m.Compression != 0 { - n += 1 + sovBep(uint64(m.Compression)) - } - return n -} - -func (m *ClusterConfig) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Folders) > 0 { - for _, e := range m.Folders { - l = e.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - } - if m.Secondary { - n += 2 - } - return n -} - -func (m *Folder) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ID) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - l = len(m.Label) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.ReadOnly { - n += 2 - } - if m.IgnorePermissions { - n += 2 - } - if m.IgnoreDelete { - n += 2 - } - if m.DisableTempIndexes { - n += 2 - } - if m.Paused { - n += 2 - } - if len(m.Devices) > 0 { - for _, e := range m.Devices { - l = e.ProtoSize() - n += 2 + l + sovBep(uint64(l)) - } - } - return n -} - -func (m *Device) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.ID.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - l = len(m.Name) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if len(m.Addresses) > 0 { - for _, s := range m.Addresses { - l = len(s) - n += 1 + l + sovBep(uint64(l)) - } - } - if m.Compression != 0 { - n += 1 + sovBep(uint64(m.Compression)) - } - l = len(m.CertName) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.MaxSequence != 0 { - n += 1 + sovBep(uint64(m.MaxSequence)) - } - if m.Introducer { - n += 2 - } - if m.IndexID != 0 { - n += 1 + sovBep(uint64(m.IndexID)) - } - if m.SkipIntroductionRemovals { - n += 2 - } - l = len(m.EncryptionPasswordToken) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - return n -} - -func (m *Index) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Folder) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if len(m.Files) > 0 { - for _, e := range m.Files { - l = e.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - } - if m.LastSequence != 0 { - n += 1 + sovBep(uint64(m.LastSequence)) - } - return n -} - -func (m *IndexUpdate) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Folder) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if len(m.Files) > 0 { - for _, e := range m.Files { - l = e.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - } - if m.LastSequence != 0 { - n += 1 + sovBep(uint64(m.LastSequence)) - } - if m.PrevSequence != 0 { - n += 1 + sovBep(uint64(m.PrevSequence)) - } - return n -} - -func (m *FileInfo) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.Type != 0 { - n += 1 + sovBep(uint64(m.Type)) - } - if m.Size != 0 { - n += 1 + sovBep(uint64(m.Size)) - } - if m.Permissions != 0 { - n += 1 + sovBep(uint64(m.Permissions)) - } - if m.ModifiedS != 0 { - n += 1 + sovBep(uint64(m.ModifiedS)) - } - if m.Deleted { - n += 2 - } - if m.RawInvalid { - n += 2 - } - if m.NoPermissions { - n += 2 - } - l = m.Version.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - if m.Sequence != 0 { - n += 1 + sovBep(uint64(m.Sequence)) - } - if m.ModifiedNs != 0 { - n += 1 + sovBep(uint64(m.ModifiedNs)) - } - if m.ModifiedBy != 0 { - n += 1 + sovBep(uint64(m.ModifiedBy)) - } - if m.RawBlockSize != 0 { - n += 1 + sovBep(uint64(m.RawBlockSize)) - } - l = m.Platform.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - if len(m.Blocks) > 0 { - for _, e := range m.Blocks { - l = e.ProtoSize() - n += 2 + l + sovBep(uint64(l)) - } - } - l = len(m.SymlinkTarget) - if l > 0 { - n += 2 + l + sovBep(uint64(l)) - } - l = len(m.BlocksHash) - if l > 0 { - n += 2 + l + sovBep(uint64(l)) - } - l = len(m.Encrypted) - if l > 0 { - n += 2 + l + sovBep(uint64(l)) - } - if m.LocalFlags != 0 { - n += 2 + sovBep(uint64(m.LocalFlags)) - } - l = len(m.VersionHash) - if l > 0 { - n += 2 + l + sovBep(uint64(l)) - } - if m.InodeChangeNs != 0 { - n += 2 + sovBep(uint64(m.InodeChangeNs)) - } - if m.EncryptionTrailerSize != 0 { - n += 2 + sovBep(uint64(m.EncryptionTrailerSize)) - } - return n -} - -func (m *BlockInfo) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Offset != 0 { - n += 1 + sovBep(uint64(m.Offset)) - } - if m.Size != 0 { - n += 1 + sovBep(uint64(m.Size)) - } - l = len(m.Hash) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.WeakHash != 0 { - n += 1 + sovBep(uint64(m.WeakHash)) - } - return n -} - -func (m *Vector) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Counters) > 0 { - for _, e := range m.Counters { - l = e.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - } - return n -} - -func (m *Counter) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ID != 0 { - n += 1 + sovBep(uint64(m.ID)) - } - if m.Value != 0 { - n += 1 + sovBep(uint64(m.Value)) - } - return n -} - -func (m *PlatformData) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Unix != nil { - l = m.Unix.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - if m.Windows != nil { - l = m.Windows.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - if m.Linux != nil { - l = m.Linux.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - if m.Darwin != nil { - l = m.Darwin.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - if m.FreeBSD != nil { - l = m.FreeBSD.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - if m.NetBSD != nil { - l = m.NetBSD.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - return n -} - -func (m *UnixData) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.OwnerName) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - l = len(m.GroupName) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.UID != 0 { - n += 1 + sovBep(uint64(m.UID)) - } - if m.GID != 0 { - n += 1 + sovBep(uint64(m.GID)) - } - return n -} - -func (m *WindowsData) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.OwnerName) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.OwnerIsGroup { - n += 2 - } - return n -} - -func (m *XattrData) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Xattrs) > 0 { - for _, e := range m.Xattrs { - l = e.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - } - return n -} - -func (m *Xattr) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - l = len(m.Value) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - return n -} - -func (m *Request) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ID != 0 { - n += 1 + sovBep(uint64(m.ID)) - } - l = len(m.Folder) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - l = len(m.Name) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.Offset != 0 { - n += 1 + sovBep(uint64(m.Offset)) - } - if m.Size != 0 { - n += 1 + sovBep(uint64(m.Size)) - } - l = len(m.Hash) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.FromTemporary { - n += 2 - } - if m.WeakHash != 0 { - n += 1 + sovBep(uint64(m.WeakHash)) - } - if m.BlockNo != 0 { - n += 1 + sovBep(uint64(m.BlockNo)) - } - return n -} - -func (m *Response) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ID != 0 { - n += 1 + sovBep(uint64(m.ID)) - } - l = len(m.Data) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if m.Code != 0 { - n += 1 + sovBep(uint64(m.Code)) - } - return n -} - -func (m *DownloadProgress) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Folder) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - if len(m.Updates) > 0 { - for _, e := range m.Updates { - l = e.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - } - } - return n -} - -func (m *FileDownloadProgressUpdate) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.UpdateType != 0 { - n += 1 + sovBep(uint64(m.UpdateType)) - } - l = len(m.Name) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - l = m.Version.ProtoSize() - n += 1 + l + sovBep(uint64(l)) - if len(m.BlockIndexes) > 0 { - for _, e := range m.BlockIndexes { - n += 1 + sovBep(uint64(e)) - } - } - if m.BlockSize != 0 { - n += 1 + sovBep(uint64(m.BlockSize)) - } - return n -} - -func (m *Ping) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *Close) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Reason) - if l > 0 { - n += 1 + l + sovBep(uint64(l)) - } - return n -} - -func sovBep(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozBep(x uint64) (n int) { - return sovBep(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Hello) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Hello: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Hello: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeviceName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DeviceName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientVersion", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientVersion = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NumConnections", wireType) - } - m.NumConnections = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NumConnections |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) - } - m.Timestamp = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Timestamp |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Header) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Header: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Header: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) - } - m.Type = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Type |= MessageType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Compression", wireType) - } - m.Compression = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Compression |= MessageCompression(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ClusterConfig) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ClusterConfig: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ClusterConfig: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Folders", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Folders = append(m.Folders, Folder{}) - if err := m.Folders[len(m.Folders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Secondary", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Secondary = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Folder) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Folder: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Folder: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Label", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Label = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ReadOnly", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.ReadOnly = bool(v != 0) - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IgnorePermissions", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.IgnorePermissions = bool(v != 0) - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IgnoreDelete", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.IgnoreDelete = bool(v != 0) - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DisableTempIndexes", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DisableTempIndexes = bool(v != 0) - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Paused", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Paused = bool(v != 0) - case 16: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Devices", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Devices = append(m.Devices, Device{}) - if err := m.Devices[len(m.Devices)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Device) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Device: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Device: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Addresses = append(m.Addresses, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Compression", wireType) - } - m.Compression = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Compression |= Compression(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CertName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CertName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxSequence", wireType) - } - m.MaxSequence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxSequence |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Introducer", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Introducer = bool(v != 0) - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IndexID", wireType) - } - m.IndexID = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.IndexID |= IndexID(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SkipIntroductionRemovals", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SkipIntroductionRemovals = bool(v != 0) - case 10: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EncryptionPasswordToken", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EncryptionPasswordToken = append(m.EncryptionPasswordToken[:0], dAtA[iNdEx:postIndex]...) - if m.EncryptionPasswordToken == nil { - m.EncryptionPasswordToken = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Index) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Index: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Index: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Folder", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Folder = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Files", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Files = append(m.Files, FileInfo{}) - if err := m.Files[len(m.Files)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LastSequence", wireType) - } - m.LastSequence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LastSequence |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *IndexUpdate) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: IndexUpdate: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: IndexUpdate: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Folder", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Folder = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Files", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Files = append(m.Files, FileInfo{}) - if err := m.Files[len(m.Files)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LastSequence", wireType) - } - m.LastSequence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LastSequence |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PrevSequence", wireType) - } - m.PrevSequence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.PrevSequence |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *FileInfo) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FileInfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FileInfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) - } - m.Type = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Type |= FileInfoType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Size", wireType) - } - m.Size = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Size |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Permissions", wireType) - } - m.Permissions = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Permissions |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ModifiedS", wireType) - } - m.ModifiedS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ModifiedS |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Deleted", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Deleted = bool(v != 0) - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawInvalid", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.RawInvalid = bool(v != 0) - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NoPermissions", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.NoPermissions = bool(v != 0) - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Sequence", wireType) - } - m.Sequence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Sequence |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ModifiedNs", wireType) - } - m.ModifiedNs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ModifiedNs |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 12: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ModifiedBy", wireType) - } - m.ModifiedBy = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ModifiedBy |= ShortID(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RawBlockSize", wireType) - } - m.RawBlockSize = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RawBlockSize |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 14: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Platform", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Platform.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 16: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Blocks", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Blocks = append(m.Blocks, BlockInfo{}) - if err := m.Blocks[len(m.Blocks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 17: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SymlinkTarget", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SymlinkTarget = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 18: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlocksHash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.BlocksHash = append(m.BlocksHash[:0], dAtA[iNdEx:postIndex]...) - if m.BlocksHash == nil { - m.BlocksHash = []byte{} - } - iNdEx = postIndex - case 19: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Encrypted", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Encrypted = append(m.Encrypted[:0], dAtA[iNdEx:postIndex]...) - if m.Encrypted == nil { - m.Encrypted = []byte{} - } - iNdEx = postIndex - case 1000: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LocalFlags", wireType) - } - m.LocalFlags = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LocalFlags |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 1001: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VersionHash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.VersionHash = append(m.VersionHash[:0], dAtA[iNdEx:postIndex]...) - if m.VersionHash == nil { - m.VersionHash = []byte{} - } - iNdEx = postIndex - case 1002: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InodeChangeNs", wireType) - } - m.InodeChangeNs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.InodeChangeNs |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 1003: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EncryptionTrailerSize", wireType) - } - m.EncryptionTrailerSize = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.EncryptionTrailerSize |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *BlockInfo) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: BlockInfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: BlockInfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Offset", wireType) - } - m.Offset = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Offset |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Size", wireType) - } - m.Size = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Size |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) - if m.Hash == nil { - m.Hash = []byte{} - } - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field WeakHash", wireType) - } - m.WeakHash = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.WeakHash |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Vector) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Vector: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Vector: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Counters", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Counters = append(m.Counters, Counter{}) - if err := m.Counters[len(m.Counters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Counter) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Counter: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Counter: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - m.ID = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ID |= ShortID(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - m.Value = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Value |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *PlatformData) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: PlatformData: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: PlatformData: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Unix", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Unix == nil { - m.Unix = &UnixData{} - } - if err := m.Unix.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Windows", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Windows == nil { - m.Windows = &WindowsData{} - } - if err := m.Windows.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Linux", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Linux == nil { - m.Linux = &XattrData{} - } - if err := m.Linux.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Darwin", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Darwin == nil { - m.Darwin = &XattrData{} - } - if err := m.Darwin.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FreeBSD", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.FreeBSD == nil { - m.FreeBSD = &XattrData{} - } - if err := m.FreeBSD.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NetBSD", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.NetBSD == nil { - m.NetBSD = &XattrData{} - } - if err := m.NetBSD.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *UnixData) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: UnixData: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UnixData: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OwnerName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OwnerName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GroupName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.GroupName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field UID", wireType) - } - m.UID = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.UID |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field GID", wireType) - } - m.GID = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.GID |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *WindowsData) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: WindowsData: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: WindowsData: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OwnerName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OwnerName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field OwnerIsGroup", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.OwnerIsGroup = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *XattrData) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: XattrData: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: XattrData: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Xattrs", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Xattrs = append(m.Xattrs, Xattr{}) - if err := m.Xattrs[len(m.Xattrs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Xattr) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Xattr: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Xattr: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Value = append(m.Value[:0], dAtA[iNdEx:postIndex]...) - if m.Value == nil { - m.Value = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Request) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Request: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Request: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - m.ID = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ID |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Folder", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Folder = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Offset", wireType) - } - m.Offset = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Offset |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Size", wireType) - } - m.Size = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Size |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) - if m.Hash == nil { - m.Hash = []byte{} - } - iNdEx = postIndex - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field FromTemporary", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.FromTemporary = bool(v != 0) - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field WeakHash", wireType) - } - m.WeakHash = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.WeakHash |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockNo", wireType) - } - m.BlockNo = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BlockNo |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Response) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Response: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Response: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) - } - m.ID = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ID |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) - if m.Data == nil { - m.Data = []byte{} - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType) - } - m.Code = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Code |= ErrorCode(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DownloadProgress) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DownloadProgress: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DownloadProgress: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Folder", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Folder = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Updates", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Updates = append(m.Updates, FileDownloadProgressUpdate{}) - if err := m.Updates[len(m.Updates)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *FileDownloadProgressUpdate) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FileDownloadProgressUpdate: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FileDownloadProgressUpdate: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field UpdateType", wireType) - } - m.UpdateType = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.UpdateType |= FileDownloadProgressUpdateType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType == 0 { - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.BlockIndexes = append(m.BlockIndexes, v) - } else if wireType == 2 { - var packedLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - packedLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if packedLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var elementCount int - var count int - for _, integer := range dAtA[iNdEx:postIndex] { - if integer < 128 { - count++ - } - } - elementCount = count - if elementCount != 0 && len(m.BlockIndexes) == 0 { - m.BlockIndexes = make([]int, 0, elementCount) - } - for iNdEx < postIndex { - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.BlockIndexes = append(m.BlockIndexes, v) - } - } else { - return fmt.Errorf("proto: wrong wireType = %d for field BlockIndexes", wireType) - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockSize", wireType) - } - m.BlockSize = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BlockSize |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Ping) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Ping: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Ping: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Close) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Close: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Close: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Reason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBep - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthBep - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthBep - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Reason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipBep(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBep - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipBep(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowBep - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowBep - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowBep - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthBep - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupBep - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthBep - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthBep = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowBep = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupBep = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/protocol/bep_clusterconfig.go b/lib/protocol/bep_clusterconfig.go new file mode 100644 index 00000000000..1e237abc51f --- /dev/null +++ b/lib/protocol/bep_clusterconfig.go @@ -0,0 +1,147 @@ +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package protocol + +import ( + "fmt" + + "github.com/syncthing/syncthing/internal/gen/bep" +) + +type Compression = bep.Compression + +const ( + CompressionMetadata = bep.Compression_COMPRESSION_METADATA + CompressionNever = bep.Compression_COMPRESSION_NEVER + CompressionAlways = bep.Compression_COMPRESSION_ALWAYS +) + +type ClusterConfig struct { + Folders []Folder + Secondary bool +} + +func (c *ClusterConfig) toWire() *bep.ClusterConfig { + folders := make([]*bep.Folder, len(c.Folders)) + for i, f := range c.Folders { + folders[i] = f.toWire() + } + return &bep.ClusterConfig{ + Folders: folders, + Secondary: c.Secondary, + } +} + +func clusterConfigFromWire(w *bep.ClusterConfig) *ClusterConfig { + if w == nil { + return nil + } + c := &ClusterConfig{ + Secondary: w.Secondary, + } + c.Folders = make([]Folder, len(w.Folders)) + for i, f := range w.Folders { + c.Folders[i] = folderFromWire(f) + } + return c +} + +type Folder struct { + ID string + Label string + ReadOnly bool + IgnorePermissions bool + IgnoreDelete bool + DisableTempIndexes bool + Paused bool + Devices []Device +} + +func (f *Folder) toWire() *bep.Folder { + devices := make([]*bep.Device, len(f.Devices)) + for i, d := range f.Devices { + devices[i] = d.toWire() + } + return &bep.Folder{ + Id: f.ID, + Label: f.Label, + ReadOnly: f.ReadOnly, + IgnorePermissions: f.IgnorePermissions, + IgnoreDelete: f.IgnoreDelete, + DisableTempIndexes: f.DisableTempIndexes, + Paused: f.Paused, + Devices: devices, + } +} + +func folderFromWire(w *bep.Folder) Folder { + devices := make([]Device, len(w.Devices)) + for i, d := range w.Devices { + devices[i] = deviceFromWire(d) + } + return Folder{ + ID: w.Id, + Label: w.Label, + ReadOnly: w.ReadOnly, + IgnorePermissions: w.IgnorePermissions, + IgnoreDelete: w.IgnoreDelete, + DisableTempIndexes: w.DisableTempIndexes, + Paused: w.Paused, + Devices: devices, + } +} + +func (f Folder) Description() string { + // used by logging stuff + if f.Label == "" { + return f.ID + } + return fmt.Sprintf("%q (%s)", f.Label, f.ID) +} + +type Device struct { + ID DeviceID + Name string + Addresses []string + Compression Compression + CertName string + MaxSequence int64 + Introducer bool + IndexID IndexID + SkipIntroductionRemovals bool + EncryptionPasswordToken []byte +} + +func (d *Device) toWire() *bep.Device { + return &bep.Device{ + Id: d.ID[:], + Name: d.Name, + Addresses: d.Addresses, + Compression: d.Compression, + CertName: d.CertName, + MaxSequence: d.MaxSequence, + Introducer: d.Introducer, + IndexId: uint64(d.IndexID), + SkipIntroductionRemovals: d.SkipIntroductionRemovals, + EncryptionPasswordToken: d.EncryptionPasswordToken, + } +} + +func deviceFromWire(w *bep.Device) Device { + return Device{ + ID: DeviceID(w.Id), + Name: w.Name, + Addresses: w.Addresses, + Compression: w.Compression, + CertName: w.CertName, + MaxSequence: w.MaxSequence, + Introducer: w.Introducer, + IndexID: IndexID(w.IndexId), + SkipIntroductionRemovals: w.SkipIntroductionRemovals, + EncryptionPasswordToken: w.EncryptionPasswordToken, + } +} diff --git a/lib/protocol/bep_download_progress.go b/lib/protocol/bep_download_progress.go new file mode 100644 index 00000000000..75474b3cc5b --- /dev/null +++ b/lib/protocol/bep_download_progress.go @@ -0,0 +1,79 @@ +// Copyright (C) 2016 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package protocol + +import "github.com/syncthing/syncthing/internal/gen/bep" + +type FileDownloadProgressUpdateType = bep.FileDownloadProgressUpdateType + +const ( + FileDownloadProgressUpdateTypeAppend = bep.FileDownloadProgressUpdateType_FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND + FileDownloadProgressUpdateTypeForget = bep.FileDownloadProgressUpdateType_FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_FORGET +) + +type DownloadProgress struct { + Folder string + Updates []FileDownloadProgressUpdate +} + +func (d *DownloadProgress) toWire() *bep.DownloadProgress { + updates := make([]*bep.FileDownloadProgressUpdate, len(d.Updates)) + for i, u := range d.Updates { + updates[i] = u.toWire() + } + return &bep.DownloadProgress{ + Folder: d.Folder, + Updates: updates, + } +} + +func downloadProgressFromWire(w *bep.DownloadProgress) *DownloadProgress { + dp := &DownloadProgress{ + Folder: w.Folder, + Updates: make([]FileDownloadProgressUpdate, len(w.Updates)), + } + for i, u := range w.Updates { + dp.Updates[i] = fileDownloadProgressUpdateFromWire(u) + } + return dp +} + +type FileDownloadProgressUpdate struct { + UpdateType FileDownloadProgressUpdateType + Name string + Version Vector + BlockIndexes []int + BlockSize int +} + +func (f *FileDownloadProgressUpdate) toWire() *bep.FileDownloadProgressUpdate { + bidxs := make([]int32, len(f.BlockIndexes)) + for i, b := range f.BlockIndexes { + bidxs[i] = int32(b) + } + return &bep.FileDownloadProgressUpdate{ + UpdateType: f.UpdateType, + Name: f.Name, + Version: f.Version.ToWire(), + BlockIndexes: bidxs, + BlockSize: int32(f.BlockSize), + } +} + +func fileDownloadProgressUpdateFromWire(w *bep.FileDownloadProgressUpdate) FileDownloadProgressUpdate { + bidxs := make([]int, len(w.BlockIndexes)) + for i, b := range w.BlockIndexes { + bidxs[i] = int(b) + } + return FileDownloadProgressUpdate{ + UpdateType: w.UpdateType, + Name: w.Name, + Version: VectorFromWire(w.Version), + BlockIndexes: bidxs, + BlockSize: int(w.BlockSize), + } +} diff --git a/lib/protocol/bep_extensions.go b/lib/protocol/bep_fileinfo.go similarity index 52% rename from lib/protocol/bep_extensions.go rename to lib/protocol/bep_fileinfo.go index 43eeeb45126..d8ed11b5ede 100644 --- a/lib/protocol/bep_extensions.go +++ b/lib/protocol/bep_fileinfo.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol @@ -6,51 +10,240 @@ import ( "bytes" "crypto/sha256" "encoding/binary" - "encoding/json" - "errors" "fmt" "time" + "github.com/syncthing/syncthing/internal/gen/bep" "github.com/syncthing/syncthing/lib/build" - "github.com/syncthing/syncthing/lib/rand" ) +// FileInfo.LocalFlags flags +const ( + FlagLocalUnsupported = 1 << 0 // The kind is unsupported, e.g. symlinks on Windows + FlagLocalIgnored = 1 << 1 // Matches local ignore patterns + FlagLocalMustRescan = 1 << 2 // Doesn't match content on disk, must be rechecked fully + FlagLocalReceiveOnly = 1 << 3 // Change detected on receive only folder + + // Flags that should result in the Invalid bit on outgoing updates + LocalInvalidFlags = FlagLocalUnsupported | FlagLocalIgnored | FlagLocalMustRescan | FlagLocalReceiveOnly + + // Flags that should result in a file being in conflict with its + // successor, due to us not having an up to date picture of its state on + // disk. + LocalConflictFlags = FlagLocalUnsupported | FlagLocalIgnored | FlagLocalReceiveOnly + + LocalAllFlags = FlagLocalUnsupported | FlagLocalIgnored | FlagLocalMustRescan | FlagLocalReceiveOnly +) + +// BlockSizes is the list of valid block sizes, from min to max +var BlockSizes []int + +func init() { + for blockSize := MinBlockSize; blockSize <= MaxBlockSize; blockSize *= 2 { + BlockSizes = append(BlockSizes, blockSize) + if _, ok := sha256OfEmptyBlock[blockSize]; !ok { + panic("missing hard coded value for sha256 of empty block") + } + } + BufferPool = newBufferPool() // must happen after BlockSizes is initialized +} + +type FileInfoType = bep.FileInfoType + const ( - SyntheticDirectorySize = 128 - HelloMessageMagic uint32 = 0x2EA7D90B - Version13HelloMagic uint32 = 0x9F79BC40 // old + FileInfoTypeFile = bep.FileInfoType_FILE_INFO_TYPE_FILE + FileInfoTypeDirectory = bep.FileInfoType_FILE_INFO_TYPE_DIRECTORY + FileInfoTypeSymlinkFile = bep.FileInfoType_FILE_INFO_TYPE_SYMLINK_FILE + FileInfoTypeSymlinkDirectory = bep.FileInfoType_FILE_INFO_TYPE_SYMLINK_DIRECTORY + FileInfoTypeSymlink = bep.FileInfoType_FILE_INFO_TYPE_SYMLINK ) -// FileIntf is the set of methods implemented by both FileInfo and -// db.FileInfoTruncated. -type FileIntf interface { - FileSize() int64 - FileName() string - FileLocalFlags() uint32 - IsDeleted() bool - IsInvalid() bool - IsIgnored() bool - IsUnsupported() bool - MustRescan() bool - IsReceiveOnlyChanged() bool - IsDirectory() bool - IsSymlink() bool - ShouldConflict() bool - HasPermissionBits() bool - SequenceNo() int64 - BlockSize() int - FileVersion() Vector - FileType() FileInfoType - FilePermissions() uint32 - FileModifiedBy() ShortID - ModTime() time.Time - PlatformData() PlatformData - InodeChangeTime() time.Time - FileBlocksHash() []byte -} - -func (Hello) Magic() uint32 { - return HelloMessageMagic +type FileInfo struct { + Name string + Size int64 + ModifiedS int64 + ModifiedBy ShortID + Version Vector + Sequence int64 + Blocks []BlockInfo + SymlinkTarget string + BlocksHash []byte + Encrypted []byte + Platform PlatformData + + Type FileInfoType + Permissions uint32 + ModifiedNs int32 + RawBlockSize int32 + + // The local_flags fields stores flags that are relevant to the local + // host only. It is not part of the protocol, doesn't get sent or + // received (we make sure to zero it), nonetheless we need it on our + // struct and to be able to serialize it to/from the database. + LocalFlags uint32 + + // The version_hash is an implementation detail and not part of the wire + // format. + VersionHash []byte + + // The time when the inode was last changed (i.e., permissions, xattrs + // etc changed). This is host-local, not sent over the wire. + InodeChangeNs int64 + + // The size of the data appended to the encrypted file on disk. This is + // host-local, not sent over the wire. + EncryptionTrailerSize int + + Deleted bool + RawInvalid bool + NoPermissions bool + + truncated bool // was created from a truncated file info without blocks +} + +func (f *FileInfo) ToWire(withInternalFields bool) *bep.FileInfo { + if f.truncated && !(f.IsDeleted() || f.IsInvalid() || f.IsIgnored()) { + panic("bug: must not serialize truncated file info") + } + blocks := make([]*bep.BlockInfo, len(f.Blocks)) + for j, b := range f.Blocks { + blocks[j] = b.ToWire() + } + w := &bep.FileInfo{ + Name: f.Name, + Size: f.Size, + ModifiedS: f.ModifiedS, + ModifiedBy: uint64(f.ModifiedBy), + Version: f.Version.ToWire(), + Sequence: f.Sequence, + Blocks: blocks, + SymlinkTarget: f.SymlinkTarget, + BlocksHash: f.BlocksHash, + Encrypted: f.Encrypted, + Type: f.Type, + Permissions: f.Permissions, + ModifiedNs: f.ModifiedNs, + BlockSize: f.RawBlockSize, + Platform: f.Platform.toWire(), + Deleted: f.Deleted, + Invalid: f.RawInvalid, + NoPermissions: f.NoPermissions, + } + if withInternalFields { + w.LocalFlags = f.LocalFlags + w.VersionHash = f.VersionHash + w.InodeChangeNs = f.InodeChangeNs + w.EncryptionTrailerSize = int32(f.EncryptionTrailerSize) + } + return w +} + +// WinsConflict returns true if "f" is the one to choose when it is in +// conflict with "other". +func (f *FileInfo) WinsConflict(other FileInfo) bool { + // If only one of the files is invalid, that one loses. + if f.IsInvalid() != other.IsInvalid() { + return !f.IsInvalid() + } + + // If a modification is in conflict with a delete, we pick the + // modification. + if !f.IsDeleted() && other.IsDeleted() { + return true + } + if f.IsDeleted() && !other.IsDeleted() { + return false + } + + // The one with the newer modification time wins. + if f.ModTime().After(other.ModTime()) { + return true + } + if f.ModTime().Before(other.ModTime()) { + return false + } + + // The modification times were equal. Use the device ID in the version + // vector as tie breaker. + return f.FileVersion().Compare(other.FileVersion()) == ConcurrentGreater +} + +func FileInfoFromWire(w *bep.FileInfo) FileInfo { + var blocks []BlockInfo + if len(w.Blocks) > 0 { + blocks = make([]BlockInfo, len(w.Blocks)) + for j, b := range w.Blocks { + blocks[j] = BlockInfoFromWire(b) + } + } + return fileInfoFromWireWithBlocks(w, blocks) +} + +type FileInfoWithoutBlocks interface { + GetName() string + GetSize() int64 + GetModifiedS() int64 + GetModifiedBy() uint64 + GetVersion() *bep.Vector + GetSequence() int64 + // GetBlocks() []*bep.BlockInfo // not included + GetSymlinkTarget() string + GetBlocksHash() []byte + GetEncrypted() []byte + GetType() FileInfoType + GetPermissions() uint32 + GetModifiedNs() int32 + GetBlockSize() int32 + GetPlatform() *bep.PlatformData + GetLocalFlags() uint32 + GetVersionHash() []byte + GetInodeChangeNs() int64 + GetEncryptionTrailerSize() int32 + GetDeleted() bool + GetInvalid() bool + GetNoPermissions() bool +} + +func fileInfoFromWireWithBlocks(w FileInfoWithoutBlocks, blocks []BlockInfo) FileInfo { + return FileInfo{ + Name: w.GetName(), + Size: w.GetSize(), + ModifiedS: w.GetModifiedS(), + ModifiedBy: ShortID(w.GetModifiedBy()), + Version: VectorFromWire(w.GetVersion()), + Sequence: w.GetSequence(), + Blocks: blocks, + SymlinkTarget: w.GetSymlinkTarget(), + BlocksHash: w.GetBlocksHash(), + Encrypted: w.GetEncrypted(), + Type: w.GetType(), + Permissions: w.GetPermissions(), + ModifiedNs: w.GetModifiedNs(), + RawBlockSize: w.GetBlockSize(), + Platform: platformDataFromWire(w.GetPlatform()), + Deleted: w.GetDeleted(), + RawInvalid: w.GetInvalid(), + NoPermissions: w.GetNoPermissions(), + } +} + +func FileInfoFromDB(w *bep.FileInfo) FileInfo { + f := FileInfoFromWire(w) + f.LocalFlags = w.LocalFlags + f.VersionHash = w.VersionHash + f.InodeChangeNs = w.InodeChangeNs + f.EncryptionTrailerSize = int(w.EncryptionTrailerSize) + return f +} + +func FileInfoFromDBTruncated(w FileInfoWithoutBlocks) FileInfo { + f := fileInfoFromWireWithBlocks(w, nil) + f.LocalFlags = w.GetLocalFlags() + f.VersionHash = w.GetVersionHash() + f.InodeChangeNs = w.GetInodeChangeNs() + f.EncryptionTrailerSize = int(w.GetEncryptionTrailerSize()) + f.truncated = true + return f } func (f FileInfo) String() string { @@ -128,7 +321,19 @@ func (f FileInfo) BlockSize() int { if f.RawBlockSize < MinBlockSize { return MinBlockSize } - return f.RawBlockSize + return int(f.RawBlockSize) +} + +// BlockSize returns the block size to use for the given file size +func BlockSize(fileSize int64) int { + var blockSize int + for _, blockSize = range BlockSizes { + if fileSize < DesiredPerFileBlocks*int64(blockSize) { + break + } + } + + return blockSize } func (f FileInfo) FileName() string { @@ -175,36 +380,6 @@ func (f FileInfo) FileBlocksHash() []byte { return f.BlocksHash } -// WinsConflict returns true if "f" is the one to choose when it is in -// conflict with "other". -func WinsConflict(f, other FileIntf) bool { - // If only one of the files is invalid, that one loses. - if f.IsInvalid() != other.IsInvalid() { - return !f.IsInvalid() - } - - // If a modification is in conflict with a delete, we pick the - // modification. - if !f.IsDeleted() && other.IsDeleted() { - return true - } - if f.IsDeleted() && !other.IsDeleted() { - return false - } - - // The one with the newer modification time wins. - if f.ModTime().After(other.ModTime()) { - return true - } - if f.ModTime().Before(other.ModTime()) { - return false - } - - // The modification times were equal. Use the device ID in the version - // vector as tie breaker. - return f.FileVersion().Compare(other.FileVersion()) == ConcurrentGreater -} - type FileInfoComparison struct { ModTimeWindow time.Duration IgnorePerms bool @@ -336,18 +511,121 @@ func (f FileInfo) BlocksEqual(other FileInfo) bool { return blocksEqual(f.Blocks, other.Blocks) } +func (f *FileInfo) SetMustRescan() { + f.setLocalFlags(FlagLocalMustRescan) +} + +func (f *FileInfo) SetIgnored() { + f.setLocalFlags(FlagLocalIgnored) +} + +func (f *FileInfo) SetUnsupported() { + f.setLocalFlags(FlagLocalUnsupported) +} + +func (f *FileInfo) SetDeleted(by ShortID) { + f.ModifiedBy = by + f.Deleted = true + f.Version = f.Version.Update(by) + f.ModifiedS = time.Now().Unix() + f.setNoContent() +} + +func (f *FileInfo) setLocalFlags(flags uint32) { + f.RawInvalid = false + f.LocalFlags = flags + f.setNoContent() +} + +func (f *FileInfo) setNoContent() { + f.Blocks = nil + f.BlocksHash = nil + f.Size = 0 +} + +type BlockInfo struct { + Hash []byte + Offset int64 + Size int + WeakHash uint32 +} + +func (b BlockInfo) ToWire() *bep.BlockInfo { + return &bep.BlockInfo{ + Hash: b.Hash, + Offset: b.Offset, + Size: int32(b.Size), + WeakHash: b.WeakHash, + } +} + +func BlockInfoFromWire(w *bep.BlockInfo) BlockInfo { + return BlockInfo{ + Hash: w.Hash, + Offset: w.Offset, + Size: int(w.Size), + WeakHash: w.WeakHash, + } +} + +func (b BlockInfo) String() string { + return fmt.Sprintf("Block{%d/%d/%d/%x}", b.Offset, b.Size, b.WeakHash, b.Hash) +} + +// For each block size, the hash of a block of all zeroes +var sha256OfEmptyBlock = map[int][sha256.Size]byte{ + 128 << KiB: {0xfa, 0x43, 0x23, 0x9b, 0xce, 0xe7, 0xb9, 0x7c, 0xa6, 0x2f, 0x0, 0x7c, 0xc6, 0x84, 0x87, 0x56, 0xa, 0x39, 0xe1, 0x9f, 0x74, 0xf3, 0xdd, 0xe7, 0x48, 0x6d, 0xb3, 0xf9, 0x8d, 0xf8, 0xe4, 0x71}, + 256 << KiB: {0x8a, 0x39, 0xd2, 0xab, 0xd3, 0x99, 0x9a, 0xb7, 0x3c, 0x34, 0xdb, 0x24, 0x76, 0x84, 0x9c, 0xdd, 0xf3, 0x3, 0xce, 0x38, 0x9b, 0x35, 0x82, 0x68, 0x50, 0xf9, 0xa7, 0x0, 0x58, 0x9b, 0x4a, 0x90}, + 512 << KiB: {0x7, 0x85, 0x4d, 0x2f, 0xef, 0x29, 0x7a, 0x6, 0xba, 0x81, 0x68, 0x5e, 0x66, 0xc, 0x33, 0x2d, 0xe3, 0x6d, 0x5d, 0x18, 0xd5, 0x46, 0x92, 0x7d, 0x30, 0xda, 0xad, 0x6d, 0x7f, 0xda, 0x15, 0x41}, + 1 << MiB: {0x30, 0xe1, 0x49, 0x55, 0xeb, 0xf1, 0x35, 0x22, 0x66, 0xdc, 0x2f, 0xf8, 0x6, 0x7e, 0x68, 0x10, 0x46, 0x7, 0xe7, 0x50, 0xab, 0xb9, 0xd3, 0xb3, 0x65, 0x82, 0xb8, 0xaf, 0x90, 0x9f, 0xcb, 0x58}, + 2 << MiB: {0x56, 0x47, 0xf0, 0x5e, 0xc1, 0x89, 0x58, 0x94, 0x7d, 0x32, 0x87, 0x4e, 0xeb, 0x78, 0x8f, 0xa3, 0x96, 0xa0, 0x5d, 0xb, 0xab, 0x7c, 0x1b, 0x71, 0xf1, 0x12, 0xce, 0xb7, 0xe9, 0xb3, 0x1e, 0xee}, + 4 << MiB: {0xbb, 0x9f, 0x8d, 0xf6, 0x14, 0x74, 0xd2, 0x5e, 0x71, 0xfa, 0x0, 0x72, 0x23, 0x18, 0xcd, 0x38, 0x73, 0x96, 0xca, 0x17, 0x36, 0x60, 0x5e, 0x12, 0x48, 0x82, 0x1c, 0xc0, 0xde, 0x3d, 0x3a, 0xf8}, + 8 << MiB: {0x2d, 0xae, 0xb1, 0xf3, 0x60, 0x95, 0xb4, 0x4b, 0x31, 0x84, 0x10, 0xb3, 0xf4, 0xe8, 0xb5, 0xd9, 0x89, 0xdc, 0xc7, 0xbb, 0x2, 0x3d, 0x14, 0x26, 0xc4, 0x92, 0xda, 0xb0, 0xa3, 0x5, 0x3e, 0x74}, + 16 << MiB: {0x8, 0xa, 0xcf, 0x35, 0xa5, 0x7, 0xac, 0x98, 0x49, 0xcf, 0xcb, 0xa4, 0x7d, 0xc2, 0xad, 0x83, 0xe0, 0x1b, 0x75, 0x66, 0x3a, 0x51, 0x62, 0x79, 0xc8, 0xb9, 0xd2, 0x43, 0xb7, 0x19, 0x64, 0x3e}, +} + +// IsEmpty returns true if the block is a full block of zeroes. +func (b BlockInfo) IsEmpty() bool { + if v, ok := sha256OfEmptyBlock[b.Size]; ok { + return bytes.Equal(b.Hash, v[:]) + } + return false +} + +func BlocksHash(bs []BlockInfo) []byte { + h := sha256.New() + for _, b := range bs { + _, _ = h.Write(b.Hash) + _ = binary.Write(h, binary.BigEndian, b.WeakHash) + } + return h.Sum(nil) +} + +func VectorHash(v Vector) []byte { + h := sha256.New() + for _, c := range v.Counters { + if err := binary.Write(h, binary.BigEndian, c.ID); err != nil { + panic("impossible: failed to write c.ID to hash function: " + err.Error()) + } + if err := binary.Write(h, binary.BigEndian, c.Value); err != nil { + panic("impossible: failed to write c.Value to hash function: " + err.Error()) + } + } + return h.Sum(nil) +} + // Xattrs is a convenience method to return the extended attributes of the // file for the current platform. -func (f *PlatformData) Xattrs() []Xattr { +func (p *PlatformData) Xattrs() []Xattr { switch { - case build.IsLinux && f.Linux != nil: - return f.Linux.Xattrs - case build.IsDarwin && f.Darwin != nil: - return f.Darwin.Xattrs - case build.IsFreeBSD && f.FreeBSD != nil: - return f.FreeBSD.Xattrs - case build.IsNetBSD && f.NetBSD != nil: - return f.NetBSD.Xattrs + case build.IsLinux && p.Linux != nil: + return p.Linux.Xattrs + case build.IsDarwin && p.Darwin != nil: + return p.Darwin.Xattrs + case build.IsFreeBSD && p.FreeBSD != nil: + return p.FreeBSD.Xattrs + case build.IsNetBSD && p.NetBSD != nil: + return p.NetBSD.Xattrs default: return nil } @@ -422,119 +700,122 @@ func blocksEqual(a, b []BlockInfo) bool { return true } -func (f *FileInfo) SetMustRescan() { - f.setLocalFlags(FlagLocalMustRescan) -} - -func (f *FileInfo) SetIgnored() { - f.setLocalFlags(FlagLocalIgnored) -} - -func (f *FileInfo) SetUnsupported() { - f.setLocalFlags(FlagLocalUnsupported) +type PlatformData struct { + Unix *UnixData + Windows *WindowsData + Linux *XattrData + Darwin *XattrData + FreeBSD *XattrData + NetBSD *XattrData } -func (f *FileInfo) SetDeleted(by ShortID) { - f.ModifiedBy = by - f.Deleted = true - f.Version = f.Version.Update(by) - f.ModifiedS = time.Now().Unix() - f.setNoContent() +func (p *PlatformData) toWire() *bep.PlatformData { + return &bep.PlatformData{ + Unix: p.Unix.toWire(), + Windows: p.Windows, + Linux: p.Linux.toWire(), + Darwin: p.Darwin.toWire(), + Freebsd: p.FreeBSD.toWire(), + Netbsd: p.NetBSD.toWire(), + } } -func (f *FileInfo) setLocalFlags(flags uint32) { - f.RawInvalid = false - f.LocalFlags = flags - f.setNoContent() +func platformDataFromWire(w *bep.PlatformData) PlatformData { + if w == nil { + return PlatformData{} + } + return PlatformData{ + Unix: unixDataFromWire(w.Unix), + Windows: w.Windows, + Linux: xattrDataFromWire(w.Linux), + Darwin: xattrDataFromWire(w.Darwin), + FreeBSD: xattrDataFromWire(w.Freebsd), + NetBSD: xattrDataFromWire(w.Netbsd), + } } -func (f *FileInfo) setNoContent() { - f.Blocks = nil - f.BlocksHash = nil - f.Size = 0 +type UnixData struct { + // The owner name and group name are set when known (i.e., could be + // resolved on the source device), while the UID and GID are always set + // as they come directly from the stat() call. + OwnerName string + GroupName string + UID int + GID int } -func (b BlockInfo) String() string { - return fmt.Sprintf("Block{%d/%d/%d/%x}", b.Offset, b.Size, b.WeakHash, b.Hash) +func (u *UnixData) toWire() *bep.UnixData { + if u == nil { + return nil + } + return &bep.UnixData{ + OwnerName: u.OwnerName, + GroupName: u.GroupName, + Uid: int32(u.UID), + Gid: int32(u.GID), + } } -// IsEmpty returns true if the block is a full block of zeroes. -func (b BlockInfo) IsEmpty() bool { - if v, ok := sha256OfEmptyBlock[int(b.Size)]; ok { - return bytes.Equal(b.Hash, v[:]) +func unixDataFromWire(w *bep.UnixData) *UnixData { + if w == nil { + return nil + } + return &UnixData{ + OwnerName: w.OwnerName, + GroupName: w.GroupName, + UID: int(w.Uid), + GID: int(w.Gid), } - return false } -type IndexID uint64 - -func (i IndexID) String() string { - return fmt.Sprintf("0x%016X", uint64(i)) -} +type WindowsData = bep.WindowsData -func (i IndexID) Marshal() ([]byte, error) { - bs := make([]byte, 8) - binary.BigEndian.PutUint64(bs, uint64(i)) - return bs, nil +type XattrData struct { + Xattrs []Xattr } -func (i *IndexID) Unmarshal(bs []byte) error { - if len(bs) != 8 { - return errors.New("incorrect IndexID length") +func (x *XattrData) toWire() *bep.XattrData { + if x == nil { + return nil } - *i = IndexID(binary.BigEndian.Uint64(bs)) - return nil -} - -func NewIndexID() IndexID { - return IndexID(rand.Uint64()) -} - -func (f Folder) Description() string { - // used by logging stuff - if f.Label == "" { - return f.ID + xattrs := make([]*bep.Xattr, len(x.Xattrs)) + for i, a := range x.Xattrs { + xattrs[i] = a.toWire() } - return fmt.Sprintf("%q (%s)", f.Label, f.ID) -} - -func BlocksHash(bs []BlockInfo) []byte { - h := sha256.New() - for _, b := range bs { - _, _ = h.Write(b.Hash) - _ = binary.Write(h, binary.BigEndian, b.WeakHash) + return &bep.XattrData{ + Xattrs: xattrs, } - return h.Sum(nil) } -func VectorHash(v Vector) []byte { - h := sha256.New() - for _, c := range v.Counters { - if err := binary.Write(h, binary.BigEndian, c.ID); err != nil { - panic("impossible: failed to write c.ID to hash function: " + err.Error()) - } - if err := binary.Write(h, binary.BigEndian, c.Value); err != nil { - panic("impossible: failed to write c.Value to hash function: " + err.Error()) - } +func xattrDataFromWire(w *bep.XattrData) *XattrData { + if w == nil { + return nil } - return h.Sum(nil) + x := &XattrData{} + x.Xattrs = make([]Xattr, len(w.Xattrs)) + for i, a := range w.Xattrs { + x.Xattrs[i] = xattrFromWire(a) + } + return x } -func (x *FileInfoType) MarshalJSON() ([]byte, error) { - return json.Marshal(x.String()) +type Xattr struct { + Name string + Value []byte } -func (x *FileInfoType) UnmarshalJSON(data []byte) error { - var s string - if err := json.Unmarshal(data, &s); err != nil { - return err +func (a Xattr) toWire() *bep.Xattr { + return &bep.Xattr{ + Name: a.Name, + Value: a.Value, } - n, ok := FileInfoType_value[s] - if !ok { - return errors.New("invalid value: " + s) +} + +func xattrFromWire(w *bep.Xattr) Xattr { + return Xattr{ + Name: w.Name, + Value: w.Value, } - *x = FileInfoType(n) - return nil } func xattrsEqual(a, b *XattrData) bool { diff --git a/lib/protocol/bep_fileinfo_test.go b/lib/protocol/bep_fileinfo_test.go new file mode 100644 index 00000000000..f3be6ba00dc --- /dev/null +++ b/lib/protocol/bep_fileinfo_test.go @@ -0,0 +1,293 @@ +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package protocol + +import ( + "crypto/sha256" + "testing" + + "github.com/syncthing/syncthing/lib/build" +) + +func TestLocalFlagBits(t *testing.T) { + var f FileInfo + if f.IsIgnored() || f.MustRescan() || f.IsInvalid() { + t.Error("file should have no weird bits set by default") + } + + f.SetIgnored() + if !f.IsIgnored() || f.MustRescan() || !f.IsInvalid() { + t.Error("file should be ignored and invalid") + } + + f.SetMustRescan() + if f.IsIgnored() || !f.MustRescan() || !f.IsInvalid() { + t.Error("file should be must-rescan and invalid") + } + + f.SetUnsupported() + if f.IsIgnored() || f.MustRescan() || !f.IsInvalid() { + t.Error("file should be invalid") + } +} + +func TestIsEquivalent(t *testing.T) { + b := func(v bool) *bool { + return &v + } + + type testCase struct { + a FileInfo + b FileInfo + ignPerms *bool // nil means should not matter, we'll test both variants + ignBlocks *bool + ignFlags uint32 + eq bool + } + cases := []testCase{ + // Empty FileInfos are equivalent + {eq: true}, + + // Various basic attributes, all of which cause inequality when + // they differ + { + a: FileInfo{Name: "foo"}, + b: FileInfo{Name: "bar"}, + eq: false, + }, + { + a: FileInfo{Type: FileInfoTypeFile}, + b: FileInfo{Type: FileInfoTypeDirectory}, + eq: false, + }, + { + a: FileInfo{Size: 1234}, + b: FileInfo{Size: 2345}, + eq: false, + }, + { + a: FileInfo{Deleted: false}, + b: FileInfo{Deleted: true}, + eq: false, + }, + { + a: FileInfo{RawInvalid: false}, + b: FileInfo{RawInvalid: true}, + eq: false, + }, + { + a: FileInfo{ModifiedS: 1234}, + b: FileInfo{ModifiedS: 2345}, + eq: false, + }, + { + a: FileInfo{ModifiedNs: 1234}, + b: FileInfo{ModifiedNs: 2345}, + eq: false, + }, + + // Special handling of local flags and invalidity. "MustRescan" + // files are never equivalent to each other. Otherwise, equivalence + // is based just on whether the file becomes IsInvalid() or not, not + // the specific reason or flag bits. + { + a: FileInfo{LocalFlags: FlagLocalMustRescan}, + b: FileInfo{LocalFlags: FlagLocalMustRescan}, + eq: false, + }, + { + a: FileInfo{RawInvalid: true}, + b: FileInfo{RawInvalid: true}, + eq: true, + }, + { + a: FileInfo{LocalFlags: FlagLocalUnsupported}, + b: FileInfo{LocalFlags: FlagLocalUnsupported}, + eq: true, + }, + { + a: FileInfo{RawInvalid: true}, + b: FileInfo{LocalFlags: FlagLocalUnsupported}, + eq: true, + }, + { + a: FileInfo{LocalFlags: 0}, + b: FileInfo{LocalFlags: FlagLocalReceiveOnly}, + eq: false, + }, + { + a: FileInfo{LocalFlags: 0}, + b: FileInfo{LocalFlags: FlagLocalReceiveOnly}, + ignFlags: FlagLocalReceiveOnly, + eq: true, + }, + + // Difference in blocks is not OK + { + a: FileInfo{Blocks: []BlockInfo{{Hash: []byte{1, 2, 3, 4}}}}, + b: FileInfo{Blocks: []BlockInfo{{Hash: []byte{2, 3, 4, 5}}}}, + ignBlocks: b(false), + eq: false, + }, + + // ... unless we say it is + { + a: FileInfo{Blocks: []BlockInfo{{Hash: []byte{1, 2, 3, 4}}}}, + b: FileInfo{Blocks: []BlockInfo{{Hash: []byte{2, 3, 4, 5}}}}, + ignBlocks: b(true), + eq: true, + }, + + // Difference in permissions is not OK. + { + a: FileInfo{Permissions: 0o444}, + b: FileInfo{Permissions: 0o666}, + ignPerms: b(false), + eq: false, + }, + + // ... unless we say it is + { + a: FileInfo{Permissions: 0o666}, + b: FileInfo{Permissions: 0o444}, + ignPerms: b(true), + eq: true, + }, + + // These attributes are not checked at all + { + a: FileInfo{NoPermissions: false}, + b: FileInfo{NoPermissions: true}, + eq: true, + }, + { + a: FileInfo{Version: Vector{Counters: []Counter{{ID: 1, Value: 42}}}}, + b: FileInfo{Version: Vector{Counters: []Counter{{ID: 42, Value: 1}}}}, + eq: true, + }, + { + a: FileInfo{Sequence: 1}, + b: FileInfo{Sequence: 2}, + eq: true, + }, + + // The block size is not checked (but this would fail the blocks + // check in real world) + { + a: FileInfo{RawBlockSize: 1}, + b: FileInfo{RawBlockSize: 2}, + eq: true, + }, + + // The symlink target is checked for symlinks + { + a: FileInfo{Type: FileInfoTypeSymlink, SymlinkTarget: "a"}, + b: FileInfo{Type: FileInfoTypeSymlink, SymlinkTarget: "b"}, + eq: false, + }, + + // ... but not for non-symlinks + { + a: FileInfo{Type: FileInfoTypeFile, SymlinkTarget: "a"}, + b: FileInfo{Type: FileInfoTypeFile, SymlinkTarget: "b"}, + eq: true, + }, + } + + if build.IsWindows { + // On windows we only check the user writable bit of the permission + // set, so these are equivalent. + cases = append(cases, testCase{ + a: FileInfo{Permissions: 0o777}, + b: FileInfo{Permissions: 0o600}, + ignPerms: b(false), + eq: true, + }) + } + + for i, tc := range cases { + // Check the standard attributes with all permutations of the + // special ignore flags, unless the value of those flags are given + // in the tests. + for _, ignPerms := range []bool{true, false} { + for _, ignBlocks := range []bool{true, false} { + if tc.ignPerms != nil && *tc.ignPerms != ignPerms { + continue + } + if tc.ignBlocks != nil && *tc.ignBlocks != ignBlocks { + continue + } + + if res := tc.a.isEquivalent(tc.b, FileInfoComparison{IgnorePerms: ignPerms, IgnoreBlocks: ignBlocks, IgnoreFlags: tc.ignFlags}); res != tc.eq { + t.Errorf("Case %d:\na: %v\nb: %v\na.IsEquivalent(b, %v, %v) => %v, expected %v", i, tc.a, tc.b, ignPerms, ignBlocks, res, tc.eq) + } + if res := tc.b.isEquivalent(tc.a, FileInfoComparison{IgnorePerms: ignPerms, IgnoreBlocks: ignBlocks, IgnoreFlags: tc.ignFlags}); res != tc.eq { + t.Errorf("Case %d:\na: %v\nb: %v\nb.IsEquivalent(a, %v, %v) => %v, expected %v", i, tc.a, tc.b, ignPerms, ignBlocks, res, tc.eq) + } + } + } + } +} + +func TestSha256OfEmptyBlock(t *testing.T) { + // every block size should have a correct entry in sha256OfEmptyBlock + for blockSize := MinBlockSize; blockSize <= MaxBlockSize; blockSize *= 2 { + expected := sha256.Sum256(make([]byte, blockSize)) + if sha256OfEmptyBlock[blockSize] != expected { + t.Error("missing or wrong hash for block of size", blockSize) + } + } +} + +func TestBlocksEqual(t *testing.T) { + blocksOne := []BlockInfo{{Hash: []byte{1, 2, 3, 4}}} + blocksTwo := []BlockInfo{{Hash: []byte{5, 6, 7, 8}}} + hashOne := []byte{42, 42, 42, 42} + hashTwo := []byte{29, 29, 29, 29} + + cases := []struct { + b1 []BlockInfo + h1 []byte + b2 []BlockInfo + h2 []byte + eq bool + }{ + {blocksOne, hashOne, blocksOne, hashOne, true}, // everything equal + {blocksOne, hashOne, blocksTwo, hashTwo, false}, // nothing equal + {blocksOne, hashOne, blocksOne, nil, true}, // blocks compared + {blocksOne, nil, blocksOne, nil, true}, // blocks compared + {blocksOne, nil, blocksTwo, nil, false}, // blocks compared + {blocksOne, hashOne, blocksTwo, hashOne, true}, // hashes equal, blocks not looked at + {blocksOne, hashOne, blocksOne, hashTwo, true}, // hashes different, blocks compared + {blocksOne, hashOne, blocksTwo, hashTwo, false}, // hashes different, blocks compared + {blocksOne, hashOne, nil, nil, false}, // blocks is different from no blocks + {blocksOne, nil, nil, nil, false}, // blocks is different from no blocks + {nil, hashOne, nil, nil, true}, // nil blocks are equal, even of one side has a hash + } + + for _, tc := range cases { + f1 := FileInfo{Blocks: tc.b1, BlocksHash: tc.h1} + f2 := FileInfo{Blocks: tc.b2, BlocksHash: tc.h2} + + if !f1.BlocksEqual(f1) { + t.Error("f1 is always equal to itself", f1) + } + if !f2.BlocksEqual(f2) { + t.Error("f2 is always equal to itself", f2) + } + if res := f1.BlocksEqual(f2); res != tc.eq { + t.Log("f1", f1.BlocksHash, f1.Blocks) + t.Log("f2", f2.BlocksHash, f2.Blocks) + t.Errorf("f1.BlocksEqual(f2) == %v but should be %v", res, tc.eq) + } + if res := f2.BlocksEqual(f1); res != tc.eq { + t.Log("f1", f1.BlocksHash, f1.Blocks) + t.Log("f2", f2.BlocksHash, f2.Blocks) + t.Errorf("f2.BlocksEqual(f1) == %v but should be %v", res, tc.eq) + } + } +} diff --git a/lib/protocol/hello.go b/lib/protocol/bep_hello.go similarity index 63% rename from lib/protocol/hello.go rename to lib/protocol/bep_hello.go index 8a9c8c864e7..7550643fb80 100644 --- a/lib/protocol/hello.go +++ b/lib/protocol/bep_hello.go @@ -1,4 +1,8 @@ -// Copyright (C) 2016 The Protocol Authors. +// Copyright (C) 2016 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol @@ -6,6 +10,15 @@ import ( "encoding/binary" "errors" "io" + + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" +) + +const ( + HelloMessageMagic uint32 = 0x2EA7D90B + Version13HelloMagic uint32 = 0x9F79BC40 // old ) var ( @@ -17,6 +30,38 @@ var ( ErrUnknownMagic = errors.New("the remote device speaks an unknown (newer?) version of the protocol") ) +type Hello struct { + DeviceName string + ClientName string + ClientVersion string + NumConnections int + Timestamp int64 +} + +func (h *Hello) toWire() *bep.Hello { + return &bep.Hello{ + DeviceName: h.DeviceName, + ClientName: h.ClientName, + ClientVersion: h.ClientVersion, + NumConnections: int32(h.NumConnections), + Timestamp: h.Timestamp, + } +} + +func helloFromWire(w *bep.Hello) Hello { + return Hello{ + DeviceName: w.DeviceName, + ClientName: w.ClientName, + ClientVersion: w.ClientVersion, + NumConnections: int(w.NumConnections), + Timestamp: w.Timestamp, + } +} + +func (Hello) Magic() uint32 { + return HelloMessageMagic +} + func ExchangeHello(c io.ReadWriter, h Hello) (Hello, error) { if h.Timestamp == 0 { panic("bug: missing timestamp in outgoing hello") @@ -30,12 +75,7 @@ func ExchangeHello(c io.ReadWriter, h Hello) (Hello, error) { // IsVersionMismatch returns true if the error is a reliable indication of a // version mismatch that we might want to alert the user about. func IsVersionMismatch(err error) bool { - switch err { - case ErrTooOldVersion, ErrUnknownMagic: - return true - default: - return false - } + return errors.Is(err, ErrTooOldVersion) || errors.Is(err, ErrUnknownMagic) } func readHello(c io.Reader) (Hello, error) { @@ -59,11 +99,12 @@ func readHello(c io.Reader) (Hello, error) { return Hello{}, err } - var hello Hello - if err := hello.Unmarshal(buf); err != nil { + var wh bep.Hello + if err := proto.Unmarshal(buf, &wh); err != nil { return Hello{}, err } - return Hello(hello), nil + + return helloFromWire(&wh), nil case 0x00010001, 0x00010000, Version13HelloMagic: // This is the first word of an older cluster config message or an @@ -76,7 +117,7 @@ func readHello(c io.Reader) (Hello, error) { } func writeHello(c io.Writer, h Hello) error { - msg, err := h.Marshal() + msg, err := proto.Marshal(h.toWire()) if err != nil { return err } diff --git a/lib/protocol/hello_test.go b/lib/protocol/bep_hello_test.go similarity index 86% rename from lib/protocol/hello_test.go rename to lib/protocol/bep_hello_test.go index ce3bfc98477..9a919ae9977 100644 --- a/lib/protocol/hello_test.go +++ b/lib/protocol/bep_hello_test.go @@ -1,4 +1,8 @@ -// Copyright (C) 2016 The Protocol Authors. +// Copyright (C) 2016 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol @@ -8,6 +12,8 @@ import ( "encoding/hex" "io" "testing" + + "google.golang.org/protobuf/proto" ) func TestVersion14Hello(t *testing.T) { @@ -18,7 +24,7 @@ func TestVersion14Hello(t *testing.T) { ClientName: "syncthing", ClientVersion: "v0.14.5", } - msgBuf, err := expected.Marshal() + msgBuf, err := proto.Marshal(expected.toWire()) if err != nil { t.Fatal(err) } diff --git a/lib/protocol/bep_index_updates.go b/lib/protocol/bep_index_updates.go new file mode 100644 index 00000000000..368b386a7a9 --- /dev/null +++ b/lib/protocol/bep_index_updates.go @@ -0,0 +1,78 @@ +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package protocol + +import "github.com/syncthing/syncthing/internal/gen/bep" + +type Index struct { + Folder string + Files []FileInfo + LastSequence int64 +} + +func (i *Index) toWire() *bep.Index { + files := make([]*bep.FileInfo, len(i.Files)) + for j, f := range i.Files { + files[j] = f.ToWire(false) + } + return &bep.Index{ + Folder: i.Folder, + Files: files, + LastSequence: i.LastSequence, + } +} + +func indexFromWire(w *bep.Index) *Index { + if w == nil { + return nil + } + i := &Index{ + Folder: w.Folder, + LastSequence: w.LastSequence, + } + i.Files = make([]FileInfo, len(w.Files)) + for j, f := range w.Files { + i.Files[j] = FileInfoFromWire(f) + } + return i +} + +type IndexUpdate struct { + Folder string + Files []FileInfo + LastSequence int64 + PrevSequence int64 +} + +func (i *IndexUpdate) toWire() *bep.IndexUpdate { + files := make([]*bep.FileInfo, len(i.Files)) + for j, f := range i.Files { + files[j] = f.ToWire(false) + } + return &bep.IndexUpdate{ + Folder: i.Folder, + Files: files, + LastSequence: i.LastSequence, + PrevSequence: i.PrevSequence, + } +} + +func indexUpdateFromWire(w *bep.IndexUpdate) *IndexUpdate { + if w == nil { + return nil + } + i := &IndexUpdate{ + Folder: w.Folder, + LastSequence: w.LastSequence, + PrevSequence: w.PrevSequence, + } + i.Files = make([]FileInfo, len(w.Files)) + for j, f := range w.Files { + i.Files[j] = FileInfoFromWire(f) + } + return i +} diff --git a/lib/protocol/bep_request_response.go b/lib/protocol/bep_request_response.go new file mode 100644 index 00000000000..2affd3724b6 --- /dev/null +++ b/lib/protocol/bep_request_response.go @@ -0,0 +1,80 @@ +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package protocol + +import "github.com/syncthing/syncthing/internal/gen/bep" + +type ErrorCode = bep.ErrorCode + +const ( + ErrorCodeNoError = bep.ErrorCode_ERROR_CODE_NO_ERROR + ErrorCodeGeneric = bep.ErrorCode_ERROR_CODE_GENERIC + ErrorCodeNoSuchFile = bep.ErrorCode_ERROR_CODE_NO_SUCH_FILE + ErrorCodeInvalidFile = bep.ErrorCode_ERROR_CODE_INVALID_FILE +) + +type Request struct { + ID int + Folder string + Name string + Offset int64 + Size int + Hash []byte + FromTemporary bool + WeakHash uint32 + BlockNo int +} + +func (r *Request) toWire() *bep.Request { + return &bep.Request{ + Id: int32(r.ID), + Folder: r.Folder, + Name: r.Name, + Offset: r.Offset, + Size: int32(r.Size), + Hash: r.Hash, + FromTemporary: r.FromTemporary, + WeakHash: r.WeakHash, + BlockNo: int32(r.BlockNo), + } +} + +func requestFromWire(w *bep.Request) *Request { + return &Request{ + ID: int(w.Id), + Folder: w.Folder, + Name: w.Name, + Offset: w.Offset, + Size: int(w.Size), + Hash: w.Hash, + FromTemporary: w.FromTemporary, + WeakHash: w.WeakHash, + BlockNo: int(w.BlockNo), + } +} + +type Response struct { + ID int + Data []byte + Code ErrorCode +} + +func (r *Response) toWire() *bep.Response { + return &bep.Response{ + Id: int32(r.ID), + Data: r.Data, + Code: r.Code, + } +} + +func responseFromWire(w *bep.Response) *Response { + return &Response{ + ID: int(w.Id), + Data: w.Data, + Code: w.Code, + } +} diff --git a/lib/protocol/bufferpool.go b/lib/protocol/bufferpool.go index cde957fdb11..cf7b797b6fb 100644 --- a/lib/protocol/bufferpool.go +++ b/lib/protocol/bufferpool.go @@ -1,4 +1,8 @@ -// Copyright (C) 2016 The Protocol Authors. +// Copyright (C) 2016 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol @@ -8,9 +12,8 @@ import ( "sync/atomic" ) -// Global pool to get buffers from. Requires Blocksizes to be initialised, -// therefore it is initialized in the same init() as BlockSizes -var BufferPool bufferPool +// Global pool to get buffers from. Initialized in init(). +var BufferPool *bufferPool type bufferPool struct { puts atomic.Int64 @@ -20,8 +23,8 @@ type bufferPool struct { hits []atomic.Int64 } -func newBufferPool() bufferPool { - return bufferPool{ +func newBufferPool() *bufferPool { + return &bufferPool{ pools: make([]sync.Pool, len(BlockSizes)), hits: make([]atomic.Int64, len(BlockSizes)), } diff --git a/lib/protocol/bufferpool_test.go b/lib/protocol/bufferpool_test.go index a4d08c791b6..56985905f8b 100644 --- a/lib/protocol/bufferpool_test.go +++ b/lib/protocol/bufferpool_test.go @@ -1,4 +1,8 @@ -// Copyright (C) 2019 The Protocol Authors. +// Copyright (C) 2019 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/protocol/common_test.go b/lib/protocol/common_test.go index 38019b59046..74200df10c0 100644 --- a/lib/protocol/common_test.go +++ b/lib/protocol/common_test.go @@ -1,8 +1,14 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol -import "time" +import ( + "time" +) type TestModel struct { data []byte diff --git a/lib/protocol/compression.go b/lib/protocol/compression.go deleted file mode 100644 index 428cb180ced..00000000000 --- a/lib/protocol/compression.go +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (C) 2015 The Protocol Authors. - -package protocol - -import "fmt" - -const ( - compressionThreshold = 128 // don't bother compressing messages smaller than this many bytes -) - -var compressionMarshal = map[Compression]string{ - CompressionNever: "never", - CompressionMetadata: "metadata", - CompressionAlways: "always", -} - -var compressionUnmarshal = map[string]Compression{ - // Legacy - "false": CompressionNever, - "true": CompressionMetadata, - - // Current - "never": CompressionNever, - "metadata": CompressionMetadata, - "always": CompressionAlways, -} - -func (c Compression) GoString() string { - return fmt.Sprintf("%q", c.String()) -} - -func (c Compression) MarshalText() ([]byte, error) { - return []byte(compressionMarshal[c]), nil -} - -func (c *Compression) UnmarshalText(bs []byte) error { - *c = compressionUnmarshal[string(bs)] - return nil -} diff --git a/lib/protocol/conflict_test.go b/lib/protocol/conflict_test.go index a606c47e41f..ec7e9961b69 100644 --- a/lib/protocol/conflict_test.go +++ b/lib/protocol/conflict_test.go @@ -1,8 +1,14 @@ -// Copyright (C) 2015 The Protocol Authors. +// Copyright (C) 2015 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol -import "testing" +import ( + "testing" +) func TestWinsConflict(t *testing.T) { testcases := [][2]FileInfo{ @@ -14,10 +20,10 @@ func TestWinsConflict(t *testing.T) { } for _, tc := range testcases { - if !WinsConflict(tc[0], tc[1]) { + if !tc[0].WinsConflict(tc[1]) { t.Errorf("%v should win over %v", tc[0], tc[1]) } - if WinsConflict(tc[1], tc[0]) { + if tc[1].WinsConflict(tc[0]) { t.Errorf("%v should not win over %v", tc[1], tc[0]) } } diff --git a/lib/protocol/counting.go b/lib/protocol/counting.go index d7cba25da57..65684d45aaa 100644 --- a/lib/protocol/counting.go +++ b/lib/protocol/counting.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/protocol/debug.go b/lib/protocol/debug.go index 8586fdb26fe..4acd6c74cbd 100644 --- a/lib/protocol/debug.go +++ b/lib/protocol/debug.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/protocol/deviceid.go b/lib/protocol/deviceid.go index 0f6b7d13548..a4ff04a5373 100644 --- a/lib/protocol/deviceid.go +++ b/lib/protocol/deviceid.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol @@ -36,17 +40,22 @@ func repeatedDeviceID(v byte) (d DeviceID) { return } -// NewDeviceID generates a new device ID from the raw bytes of a certificate +// NewDeviceID generates a new device ID from SHA256 hash of the given piece +// of data (usually raw certificate bytes). func NewDeviceID(rawCert []byte) DeviceID { return DeviceID(sha256.Sum256(rawCert)) } +// DeviceIDFromString parses a device ID from a string. The string is expected +// to be in the canonical format, with check digits. func DeviceIDFromString(s string) (DeviceID, error) { var n DeviceID err := n.UnmarshalText([]byte(s)) return n, err } +// DeviceIDFromBytes converts a 32 byte slice to a DeviceID. A slice of the +// wrong length results in an error. func DeviceIDFromBytes(bs []byte) (DeviceID, error) { var n DeviceID if len(bs) != len(n) { diff --git a/lib/protocol/deviceid_test.go b/lib/protocol/deviceid_test.go index dd1907553af..59469759bbf 100644 --- a/lib/protocol/deviceid_test.go +++ b/lib/protocol/deviceid_test.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol @@ -107,59 +111,6 @@ func TestDeviceIDFromBytes(t *testing.T) { } } -func TestNewDeviceIDMarshalling(t *testing.T) { - // The new DeviceID.Unmarshal / DeviceID.MarshalTo serialization should - // be message compatible with how we used to serialize DeviceIDs. - - // Create a message with a device ID in old style bytes format - - id0, _ := DeviceIDFromString(formatted) - msg0 := TestOldDeviceID{Test: id0[:]} - - // Marshal it - - bs, err := msg0.Marshal() - if err != nil { - t.Fatal(err) - } - - // Unmarshal using the new DeviceID.Unmarshal - - var msg1 TestNewDeviceID - if err := msg1.Unmarshal(bs); err != nil { - t.Fatal(err) - } - - // Verify it's the same - - if msg1.Test != id0 { - t.Error("Mismatch in old -> new direction") - } - - // Marshal using the new DeviceID.MarshalTo - - bs, err = msg1.Marshal() - if err != nil { - t.Fatal(err) - } - - // Create an old style message and attempt unmarshal - - var msg2 TestOldDeviceID - if err := msg2.Unmarshal(bs); err != nil { - t.Fatal(err) - } - - // Verify it's the same - - id1, err := DeviceIDFromBytes(msg2.Test) - if err != nil { - t.Fatal(err) - } else if id1 != id0 { - t.Error("Mismatch in old -> new direction") - } -} - var resStr string func BenchmarkLuhnify(b *testing.B) { diff --git a/lib/protocol/deviceid_test.pb.go b/lib/protocol/deviceid_test.pb.go deleted file mode 100644 index f52584b64b6..00000000000 --- a/lib/protocol/deviceid_test.pb.go +++ /dev/null @@ -1,481 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: lib/protocol/deviceid_test.proto - -package protocol - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - _ "github.com/syncthing/syncthing/proto/ext" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type TestOldDeviceID struct { - Test []byte `protobuf:"bytes,1,opt,name=test,proto3" json:"test" xml:"test"` -} - -func (m *TestOldDeviceID) Reset() { *m = TestOldDeviceID{} } -func (m *TestOldDeviceID) String() string { return proto.CompactTextString(m) } -func (*TestOldDeviceID) ProtoMessage() {} -func (*TestOldDeviceID) Descriptor() ([]byte, []int) { - return fileDescriptor_f4a75253a19e48a2, []int{0} -} -func (m *TestOldDeviceID) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TestOldDeviceID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TestOldDeviceID.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TestOldDeviceID) XXX_Merge(src proto.Message) { - xxx_messageInfo_TestOldDeviceID.Merge(m, src) -} -func (m *TestOldDeviceID) XXX_Size() int { - return m.ProtoSize() -} -func (m *TestOldDeviceID) XXX_DiscardUnknown() { - xxx_messageInfo_TestOldDeviceID.DiscardUnknown(m) -} - -var xxx_messageInfo_TestOldDeviceID proto.InternalMessageInfo - -type TestNewDeviceID struct { - Test DeviceID `protobuf:"bytes,1,opt,name=test,proto3,customtype=DeviceID" json:"test" xml:"test"` -} - -func (m *TestNewDeviceID) Reset() { *m = TestNewDeviceID{} } -func (m *TestNewDeviceID) String() string { return proto.CompactTextString(m) } -func (*TestNewDeviceID) ProtoMessage() {} -func (*TestNewDeviceID) Descriptor() ([]byte, []int) { - return fileDescriptor_f4a75253a19e48a2, []int{1} -} -func (m *TestNewDeviceID) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TestNewDeviceID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TestNewDeviceID.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TestNewDeviceID) XXX_Merge(src proto.Message) { - xxx_messageInfo_TestNewDeviceID.Merge(m, src) -} -func (m *TestNewDeviceID) XXX_Size() int { - return m.ProtoSize() -} -func (m *TestNewDeviceID) XXX_DiscardUnknown() { - xxx_messageInfo_TestNewDeviceID.DiscardUnknown(m) -} - -var xxx_messageInfo_TestNewDeviceID proto.InternalMessageInfo - -func init() { - proto.RegisterType((*TestOldDeviceID)(nil), "protocol.TestOldDeviceID") - proto.RegisterType((*TestNewDeviceID)(nil), "protocol.TestNewDeviceID") -} - -func init() { proto.RegisterFile("lib/protocol/deviceid_test.proto", fileDescriptor_f4a75253a19e48a2) } - -var fileDescriptor_f4a75253a19e48a2 = []byte{ - // 237 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0xc9, 0x4c, 0xd2, - 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0xce, 0xcf, 0xd1, 0x4f, 0x49, 0x2d, 0xcb, 0x4c, 0x4e, 0xcd, - 0x4c, 0x89, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0x03, 0x0b, 0x0b, 0x71, 0xc0, 0x64, 0xa5, 0x38, 0x53, - 0x2b, 0xa0, 0x82, 0x52, 0xca, 0x45, 0xa9, 0x05, 0xf9, 0xc5, 0x10, 0x8d, 0x49, 0xa5, 0x69, 0xfa, - 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0x0e, 0x98, 0x05, 0x51, 0xa4, 0x64, 0xcb, 0xc5, 0x1f, 0x92, 0x5a, - 0x5c, 0xe2, 0x9f, 0x93, 0xe2, 0x02, 0x36, 0xd7, 0xd3, 0x45, 0x48, 0x8b, 0x8b, 0x05, 0x64, 0xb4, - 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x8f, 0x93, 0xd8, 0xab, 0x7b, 0xf2, 0x60, 0xfe, 0xa7, 0x7b, 0xf2, - 0x5c, 0x15, 0xb9, 0x39, 0x56, 0x4a, 0x20, 0x8e, 0x52, 0x10, 0x58, 0x4c, 0x29, 0x10, 0xa2, 0xdd, - 0x2f, 0xb5, 0x1c, 0xae, 0xdd, 0x0e, 0x45, 0xbb, 0xd6, 0x89, 0x7b, 0xf2, 0x0c, 0xb7, 0xee, 0xc9, - 0x73, 0xc0, 0xe4, 0xb1, 0x1b, 0xd7, 0x71, 0x41, 0x85, 0x11, 0x62, 0xa4, 0x93, 0xef, 0x89, 0x87, - 0x72, 0x0c, 0x17, 0x1e, 0xca, 0x31, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x84, - 0xc7, 0x72, 0x0c, 0x0b, 0x1e, 0xcb, 0x31, 0x5e, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, - 0x94, 0x76, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x71, 0x65, 0x5e, - 0x72, 0x49, 0x46, 0x66, 0x5e, 0x3a, 0x12, 0x0b, 0x39, 0xb8, 0x92, 0xd8, 0xc0, 0x2c, 0x63, 0x40, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x9a, 0x0a, 0x77, 0x43, 0x45, 0x01, 0x00, 0x00, -} - -func (m *TestOldDeviceID) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TestOldDeviceID) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TestOldDeviceID) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Test) > 0 { - i -= len(m.Test) - copy(dAtA[i:], m.Test) - i = encodeVarintDeviceidTest(dAtA, i, uint64(len(m.Test))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TestNewDeviceID) Marshal() (dAtA []byte, err error) { - size := m.ProtoSize() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TestNewDeviceID) MarshalTo(dAtA []byte) (int, error) { - size := m.ProtoSize() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TestNewDeviceID) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size := m.Test.ProtoSize() - i -= size - if _, err := m.Test.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDeviceidTest(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func encodeVarintDeviceidTest(dAtA []byte, offset int, v uint64) int { - offset -= sovDeviceidTest(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *TestOldDeviceID) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Test) - if l > 0 { - n += 1 + l + sovDeviceidTest(uint64(l)) - } - return n -} - -func (m *TestNewDeviceID) ProtoSize() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.Test.ProtoSize() - n += 1 + l + sovDeviceidTest(uint64(l)) - return n -} - -func sovDeviceidTest(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozDeviceidTest(x uint64) (n int) { - return sovDeviceidTest(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *TestOldDeviceID) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceidTest - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TestOldDeviceID: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TestOldDeviceID: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Test", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceidTest - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthDeviceidTest - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthDeviceidTest - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Test = append(m.Test[:0], dAtA[iNdEx:postIndex]...) - if m.Test == nil { - m.Test = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDeviceidTest(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDeviceidTest - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TestNewDeviceID) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceidTest - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TestNewDeviceID: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TestNewDeviceID: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Test", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDeviceidTest - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthDeviceidTest - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthDeviceidTest - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Test.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDeviceidTest(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDeviceidTest - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipDeviceidTest(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDeviceidTest - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDeviceidTest - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDeviceidTest - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthDeviceidTest - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupDeviceidTest - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthDeviceidTest - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthDeviceidTest = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDeviceidTest = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupDeviceidTest = fmt.Errorf("proto: unexpected end of group") -) diff --git a/lib/protocol/doc.go b/lib/protocol/doc.go index 2c6ea8ef265..f421c03d562 100644 --- a/lib/protocol/doc.go +++ b/lib/protocol/doc.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. // Package protocol implements the Block Exchange Protocol. package protocol diff --git a/lib/protocol/encryption.go b/lib/protocol/encryption.go index 6216324bec4..f0035955b5b 100644 --- a/lib/protocol/encryption.go +++ b/lib/protocol/encryption.go @@ -17,13 +17,15 @@ import ( "strings" "sync" - "github.com/gogo/protobuf/proto" lru "github.com/hashicorp/golang-lru/v2" "github.com/miscreant/miscreant.go" - "github.com/syncthing/syncthing/lib/rand" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/hkdf" "golang.org/x/crypto/scrypt" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" + "github.com/syncthing/syncthing/lib/rand" ) const ( @@ -290,7 +292,7 @@ func encryptFileInfo(keyGen *KeyGenerator, fi FileInfo, folderKey *[keySize]byte // The entire FileInfo is encrypted with a random nonce, and concatenated // with that nonce. - bs, err := proto.Marshal(&fi) + bs, err := proto.Marshal(fi.ToWire(false)) if err != nil { panic("impossible serialization mishap: " + err.Error()) } @@ -366,7 +368,7 @@ func encryptFileInfo(keyGen *KeyGenerator, fi FileInfo, folderKey *[keySize]byte if typ == FileInfoTypeFile { enc.Size = offset // new total file size enc.Blocks = blocks - enc.RawBlockSize = fi.BlockSize() + blockOverhead + enc.RawBlockSize = int32(fi.BlockSize() + blockOverhead) } return enc @@ -407,7 +409,7 @@ func DecryptFileInfo(keyGen *KeyGenerator, fi FileInfo, folderKey *[keySize]byte return FileInfo{}, err } - var decFI FileInfo + var decFI bep.FileInfo if err := proto.Unmarshal(dec, &decFI); err != nil { return FileInfo{}, err } @@ -415,7 +417,7 @@ func DecryptFileInfo(keyGen *KeyGenerator, fi FileInfo, folderKey *[keySize]byte // Preserve sequence, which is legitimately controlled by the untrusted device decFI.Sequence = fi.Sequence - return decFI, nil + return FileInfoFromWire(&decFI), nil } var base32Hex = base32.HexEncoding.WithPadding(base32.NoPadding) diff --git a/lib/protocol/errors.go b/lib/protocol/errors.go index 07c30baaf4e..454bd39b3a8 100644 --- a/lib/protocol/errors.go +++ b/lib/protocol/errors.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol @@ -24,12 +28,12 @@ func codeToError(code ErrorCode) error { } func errorToCode(err error) ErrorCode { - switch err { - case nil: + switch { + case err == nil: return ErrorCodeNoError - case ErrNoSuchFile: + case errors.Is(err, ErrNoSuchFile): return ErrorCodeNoSuchFile - case ErrInvalid: + case errors.Is(err, ErrInvalid): return ErrorCodeInvalidFile default: return ErrorCodeGeneric diff --git a/lib/protocol/indexid.go b/lib/protocol/indexid.go new file mode 100644 index 00000000000..ff06bc0c596 --- /dev/null +++ b/lib/protocol/indexid.go @@ -0,0 +1,39 @@ +// Copyright (C) 2019 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +package protocol + +import ( + "encoding/binary" + "errors" + "fmt" + + "github.com/syncthing/syncthing/lib/rand" +) + +type IndexID uint64 + +func (i IndexID) String() string { + return fmt.Sprintf("0x%016X", uint64(i)) +} + +func (i IndexID) Marshal() ([]byte, error) { + bs := make([]byte, 8) + binary.BigEndian.PutUint64(bs, uint64(i)) + return bs, nil +} + +func (i *IndexID) Unmarshal(bs []byte) error { + if len(bs) != 8 { + return errors.New("incorrect IndexID length") + } + *i = IndexID(binary.BigEndian.Uint64(bs)) + return nil +} + +func NewIndexID() IndexID { + return IndexID(rand.Uint64()) +} diff --git a/lib/protocol/luhn.go b/lib/protocol/luhn.go index 34027654109..35aa6e6ab47 100644 --- a/lib/protocol/luhn.go +++ b/lib/protocol/luhn.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/protocol/luhn_test.go b/lib/protocol/luhn_test.go index c53c6adacce..3cbf978d0d7 100644 --- a/lib/protocol/luhn_test.go +++ b/lib/protocol/luhn_test.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/protocol/nativemodel_darwin.go b/lib/protocol/nativemodel_darwin.go index 90e7f71bbc7..7d1f06900d3 100644 --- a/lib/protocol/nativemodel_darwin.go +++ b/lib/protocol/nativemodel_darwin.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. //go:build darwin // +build darwin diff --git a/lib/protocol/nativemodel_unix.go b/lib/protocol/nativemodel_unix.go index 08bcc193cab..46c4e77da89 100644 --- a/lib/protocol/nativemodel_unix.go +++ b/lib/protocol/nativemodel_unix.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. //go:build !windows && !darwin // +build !windows,!darwin diff --git a/lib/protocol/nativemodel_windows.go b/lib/protocol/nativemodel_windows.go index 4aef8ce0810..88bc2ca6b5a 100644 --- a/lib/protocol/nativemodel_windows.go +++ b/lib/protocol/nativemodel_windows.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. //go:build windows // +build windows diff --git a/lib/protocol/nativemodel_windows_test.go b/lib/protocol/nativemodel_windows_test.go index 05cff2e5980..f92354d0b54 100644 --- a/lib/protocol/nativemodel_windows_test.go +++ b/lib/protocol/nativemodel_windows_test.go @@ -1,4 +1,8 @@ -// Copyright (C) 2016 The Protocol Authors. +// Copyright (C) 2016 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/protocol/protocol.go b/lib/protocol/protocol.go index 15191937b63..bf35f50b646 100644 --- a/lib/protocol/protocol.go +++ b/lib/protocol/protocol.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. //go:generate -command counterfeiter go run github.com/maxbrunsfeld/counterfeiter/v6 @@ -13,7 +17,6 @@ package protocol import ( "context" - "crypto/sha256" "encoding/binary" "errors" "fmt" @@ -25,6 +28,10 @@ import ( "time" lz4 "github.com/pierrec/lz4/v4" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" + "github.com/syncthing/syncthing/internal/protoutil" ) const ( @@ -46,70 +53,20 @@ const ( // DesiredPerFileBlocks is the number of blocks we aim for per file DesiredPerFileBlocks = 2000 -) - -// BlockSizes is the list of valid block sizes, from min to max -var BlockSizes []int - -// For each block size, the hash of a block of all zeroes -var sha256OfEmptyBlock = map[int][sha256.Size]byte{ - 128 << KiB: {0xfa, 0x43, 0x23, 0x9b, 0xce, 0xe7, 0xb9, 0x7c, 0xa6, 0x2f, 0x0, 0x7c, 0xc6, 0x84, 0x87, 0x56, 0xa, 0x39, 0xe1, 0x9f, 0x74, 0xf3, 0xdd, 0xe7, 0x48, 0x6d, 0xb3, 0xf9, 0x8d, 0xf8, 0xe4, 0x71}, - 256 << KiB: {0x8a, 0x39, 0xd2, 0xab, 0xd3, 0x99, 0x9a, 0xb7, 0x3c, 0x34, 0xdb, 0x24, 0x76, 0x84, 0x9c, 0xdd, 0xf3, 0x3, 0xce, 0x38, 0x9b, 0x35, 0x82, 0x68, 0x50, 0xf9, 0xa7, 0x0, 0x58, 0x9b, 0x4a, 0x90}, - 512 << KiB: {0x7, 0x85, 0x4d, 0x2f, 0xef, 0x29, 0x7a, 0x6, 0xba, 0x81, 0x68, 0x5e, 0x66, 0xc, 0x33, 0x2d, 0xe3, 0x6d, 0x5d, 0x18, 0xd5, 0x46, 0x92, 0x7d, 0x30, 0xda, 0xad, 0x6d, 0x7f, 0xda, 0x15, 0x41}, - 1 << MiB: {0x30, 0xe1, 0x49, 0x55, 0xeb, 0xf1, 0x35, 0x22, 0x66, 0xdc, 0x2f, 0xf8, 0x6, 0x7e, 0x68, 0x10, 0x46, 0x7, 0xe7, 0x50, 0xab, 0xb9, 0xd3, 0xb3, 0x65, 0x82, 0xb8, 0xaf, 0x90, 0x9f, 0xcb, 0x58}, - 2 << MiB: {0x56, 0x47, 0xf0, 0x5e, 0xc1, 0x89, 0x58, 0x94, 0x7d, 0x32, 0x87, 0x4e, 0xeb, 0x78, 0x8f, 0xa3, 0x96, 0xa0, 0x5d, 0xb, 0xab, 0x7c, 0x1b, 0x71, 0xf1, 0x12, 0xce, 0xb7, 0xe9, 0xb3, 0x1e, 0xee}, - 4 << MiB: {0xbb, 0x9f, 0x8d, 0xf6, 0x14, 0x74, 0xd2, 0x5e, 0x71, 0xfa, 0x0, 0x72, 0x23, 0x18, 0xcd, 0x38, 0x73, 0x96, 0xca, 0x17, 0x36, 0x60, 0x5e, 0x12, 0x48, 0x82, 0x1c, 0xc0, 0xde, 0x3d, 0x3a, 0xf8}, - 8 << MiB: {0x2d, 0xae, 0xb1, 0xf3, 0x60, 0x95, 0xb4, 0x4b, 0x31, 0x84, 0x10, 0xb3, 0xf4, 0xe8, 0xb5, 0xd9, 0x89, 0xdc, 0xc7, 0xbb, 0x2, 0x3d, 0x14, 0x26, 0xc4, 0x92, 0xda, 0xb0, 0xa3, 0x5, 0x3e, 0x74}, - 16 << MiB: {0x8, 0xa, 0xcf, 0x35, 0xa5, 0x7, 0xac, 0x98, 0x49, 0xcf, 0xcb, 0xa4, 0x7d, 0xc2, 0xad, 0x83, 0xe0, 0x1b, 0x75, 0x66, 0x3a, 0x51, 0x62, 0x79, 0xc8, 0xb9, 0xd2, 0x43, 0xb7, 0x19, 0x64, 0x3e}, -} -var errNotCompressible = errors.New("not compressible") + SyntheticDirectorySize = 128 -func init() { - for blockSize := MinBlockSize; blockSize <= MaxBlockSize; blockSize *= 2 { - BlockSizes = append(BlockSizes, blockSize) - if _, ok := sha256OfEmptyBlock[blockSize]; !ok { - panic("missing hard coded value for sha256 of empty block") - } - } - BufferPool = newBufferPool() -} - -// BlockSize returns the block size to use for the given file size -func BlockSize(fileSize int64) int { - var blockSize int - for _, blockSize = range BlockSizes { - if fileSize < DesiredPerFileBlocks*int64(blockSize) { - break - } - } + // don't bother compressing messages smaller than this many bytes + compressionThreshold = 128 +) - return blockSize -} +var errNotCompressible = errors.New("not compressible") const ( stateInitial = iota stateReady ) -// FileInfo.LocalFlags flags -const ( - FlagLocalUnsupported = 1 << 0 // The kind is unsupported, e.g. symlinks on Windows - FlagLocalIgnored = 1 << 1 // Matches local ignore patterns - FlagLocalMustRescan = 1 << 2 // Doesn't match content on disk, must be rechecked fully - FlagLocalReceiveOnly = 1 << 3 // Change detected on receive only folder - - // Flags that should result in the Invalid bit on outgoing updates - LocalInvalidFlags = FlagLocalUnsupported | FlagLocalIgnored | FlagLocalMustRescan | FlagLocalReceiveOnly - - // Flags that should result in a file being in conflict with its - // successor, due to us not having an up to date picture of its state on - // disk. - LocalConflictFlags = FlagLocalUnsupported | FlagLocalIgnored | FlagLocalReceiveOnly - - LocalAllFlags = FlagLocalUnsupported | FlagLocalIgnored | FlagLocalMustRescan | FlagLocalReceiveOnly -) - var ( ErrClosed = errors.New("connection closed") ErrTimeout = errors.New("read timeout") @@ -220,7 +177,7 @@ type rawConnection struct { idxMut sync.Mutex // ensures serialization of Index calls - inbox chan message + inbox chan proto.Message outbox chan asyncMessage closeBox chan asyncMessage clusterConfigBox chan *ClusterConfig @@ -239,15 +196,8 @@ type asyncResult struct { err error } -type message interface { - ProtoSize() int - Marshal() ([]byte, error) - MarshalTo([]byte) (int, error) - Unmarshal([]byte) error -} - type asyncMessage struct { - msg message + msg proto.Message done chan struct{} // done closes when we're done sending the message } @@ -303,7 +253,7 @@ func newRawConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, clo cw: cw, closer: closer, awaiting: make(map[int]chan asyncResult), - inbox: make(chan message), + inbox: make(chan proto.Message), outbox: make(chan asyncMessage), closeBox: make(chan asyncMessage), clusterConfigBox: make(chan *ClusterConfig), @@ -359,7 +309,7 @@ func (c *rawConnection) Index(ctx context.Context, idx *Index) error { default: } c.idxMut.Lock() - c.send(ctx, idx, nil) + c.send(ctx, idx.toWire(), nil) c.idxMut.Unlock() return nil } @@ -374,7 +324,7 @@ func (c *rawConnection) IndexUpdate(ctx context.Context, idxUp *IndexUpdate) err default: } c.idxMut.Lock() - c.send(ctx, idxUp, nil) + c.send(ctx, idxUp.toWire(), nil) c.idxMut.Unlock() return nil } @@ -402,7 +352,7 @@ func (c *rawConnection) Request(ctx context.Context, req *Request) ([]byte, erro c.awaitingMut.Unlock() req.ID = id - ok := c.send(ctx, req, nil) + ok := c.send(ctx, req.toWire(), nil) if !ok { return nil, ErrClosed } @@ -432,11 +382,11 @@ func (c *rawConnection) Closed() <-chan struct{} { // DownloadProgress sends the progress updates for the files that are currently being downloaded. func (c *rawConnection) DownloadProgress(ctx context.Context, dp *DownloadProgress) { - c.send(ctx, dp, nil) + c.send(ctx, dp.toWire(), nil) } func (c *rawConnection) ping() bool { - return c.send(context.Background(), &Ping{}, nil) + return c.send(context.Background(), &bep.Ping{}, nil) } func (c *rawConnection) readerLoop() { @@ -456,13 +406,12 @@ func (c *rawConnection) readerLoop() { case <-c.closed: return } - } } func (c *rawConnection) dispatcherLoop() (err error) { defer close(c.dispatcherLoopStopped) - var msg message + var msg proto.Message state := stateInitial for { select { @@ -485,11 +434,11 @@ func (c *rawConnection) dispatcherLoop() (err error) { l.Debugf("handle %v message", msgContext) switch msg := msg.(type) { - case *ClusterConfig: + case *bep.ClusterConfig: if state == stateInitial { state = stateReady } - case *Close: + case *bep.Close: return fmt.Errorf("closed by remote: %v", msg.Reason) default: if state != stateReady { @@ -498,13 +447,7 @@ func (c *rawConnection) dispatcherLoop() (err error) { } switch msg := msg.(type) { - case *Index: - err = checkIndexConsistency(msg.Files) - - case *IndexUpdate: - err = checkIndexConsistency(msg.Files) - - case *Request: + case *bep.Request: err = checkFilename(msg.Name) } if err != nil { @@ -512,23 +455,31 @@ func (c *rawConnection) dispatcherLoop() (err error) { } switch msg := msg.(type) { - case *ClusterConfig: - err = c.model.ClusterConfig(msg) + case *bep.ClusterConfig: + err = c.model.ClusterConfig(clusterConfigFromWire(msg)) - case *Index: - err = c.handleIndex(msg) + case *bep.Index: + idx := indexFromWire(msg) + if err := checkIndexConsistency(idx.Files); err != nil { + return newProtocolError(err, msgContext) + } + err = c.handleIndex(idx) - case *IndexUpdate: - err = c.handleIndexUpdate(msg) + case *bep.IndexUpdate: + idxUp := indexUpdateFromWire(msg) + if err := checkIndexConsistency(idxUp.Files); err != nil { + return newProtocolError(err, msgContext) + } + err = c.handleIndexUpdate(idxUp) - case *Request: - go c.handleRequest(msg) + case *bep.Request: + go c.handleRequest(requestFromWire(msg)) - case *Response: - c.handleResponse(msg) + case *bep.Response: + c.handleResponse(responseFromWire(msg)) - case *DownloadProgress: - err = c.model.DownloadProgress(msg) + case *bep.DownloadProgress: + err = c.model.DownloadProgress(downloadProgressFromWire(msg)) } if err != nil { return newHandleError(err, msgContext) @@ -536,7 +487,7 @@ func (c *rawConnection) dispatcherLoop() (err error) { } } -func (c *rawConnection) readMessage(fourByteBuf []byte) (message, error) { +func (c *rawConnection) readMessage(fourByteBuf []byte) (proto.Message, error) { hdr, err := c.readHeader(fourByteBuf) if err != nil { return nil, err @@ -545,7 +496,7 @@ func (c *rawConnection) readMessage(fourByteBuf []byte) (message, error) { return c.readMessageAfterHeader(hdr, fourByteBuf) } -func (c *rawConnection) readMessageAfterHeader(hdr Header, fourByteBuf []byte) (message, error) { +func (c *rawConnection) readMessageAfterHeader(hdr *bep.Header, fourByteBuf []byte) (proto.Message, error) { // First comes a 4 byte message length if _, err := io.ReadFull(c.cr, fourByteBuf[:4]); err != nil { @@ -569,10 +520,10 @@ func (c *rawConnection) readMessageAfterHeader(hdr Header, fourByteBuf []byte) ( // ... which might be compressed switch hdr.Compression { - case MessageCompressionNone: + case bep.MessageCompression_MESSAGE_COMPRESSION_NONE: // Nothing - case MessageCompressionLZ4: + case bep.MessageCompression_MESSAGE_COMPRESSION_LZ4: decomp, err := lz4Decompress(buf) BufferPool.Put(buf) if err != nil { @@ -593,7 +544,7 @@ func (c *rawConnection) readMessageAfterHeader(hdr Header, fourByteBuf []byte) ( BufferPool.Put(buf) return nil, err } - if err := msg.Unmarshal(buf); err != nil { + if err := proto.Unmarshal(buf, msg); err != nil { BufferPool.Put(buf) return nil, fmt.Errorf("unmarshalling message: %w", err) } @@ -602,15 +553,15 @@ func (c *rawConnection) readMessageAfterHeader(hdr Header, fourByteBuf []byte) ( return msg, nil } -func (c *rawConnection) readHeader(fourByteBuf []byte) (Header, error) { +func (c *rawConnection) readHeader(fourByteBuf []byte) (*bep.Header, error) { // First comes a 2 byte header length if _, err := io.ReadFull(c.cr, fourByteBuf[:2]); err != nil { - return Header{}, fmt.Errorf("reading length: %w", err) + return nil, fmt.Errorf("reading length: %w", err) } hdrLen := int16(binary.BigEndian.Uint16(fourByteBuf)) if hdrLen < 0 { - return Header{}, fmt.Errorf("negative header length %d", hdrLen) + return nil, fmt.Errorf("negative header length %d", hdrLen) } // Then comes the header @@ -618,19 +569,19 @@ func (c *rawConnection) readHeader(fourByteBuf []byte) (Header, error) { buf := BufferPool.Get(int(hdrLen)) if _, err := io.ReadFull(c.cr, buf); err != nil { BufferPool.Put(buf) - return Header{}, fmt.Errorf("reading header: %w", err) + return nil, fmt.Errorf("reading header: %w", err) } - var hdr Header - err := hdr.Unmarshal(buf) + var hdr bep.Header + err := proto.Unmarshal(buf, &hdr) BufferPool.Put(buf) if err != nil { - return Header{}, fmt.Errorf("unmarshalling header: %w", err) + return nil, fmt.Errorf("unmarshalling header: %w %x", err, buf) } metricDeviceRecvDecompressedBytes.WithLabelValues(c.idString).Add(float64(2 + len(buf))) - return hdr, nil + return &hdr, nil } func (c *rawConnection) handleIndex(im *Index) error { @@ -708,18 +659,20 @@ func checkFilename(name string) error { func (c *rawConnection) handleRequest(req *Request) { res, err := c.model.Request(req) if err != nil { - c.send(context.Background(), &Response{ + resp := &Response{ ID: req.ID, Code: errorToCode(err), - }, nil) + } + c.send(context.Background(), resp.toWire(), nil) return } done := make(chan struct{}) - c.send(context.Background(), &Response{ + resp := &Response{ ID: req.ID, Data: res.Data(), Code: errorToCode(nil), - }, done) + } + c.send(context.Background(), resp.toWire(), done) <-done res.Close() } @@ -734,7 +687,7 @@ func (c *rawConnection) handleResponse(resp *Response) { c.awaitingMut.Unlock() } -func (c *rawConnection) send(ctx context.Context, msg message, done chan struct{}) bool { +func (c *rawConnection) send(ctx context.Context, msg proto.Message, done chan struct{}) bool { select { case c.outbox <- asyncMessage{msg, done}: return true @@ -750,7 +703,7 @@ func (c *rawConnection) send(ctx context.Context, msg message, done chan struct{ func (c *rawConnection) writerLoop() { select { case cc := <-c.clusterConfigBox: - err := c.writeMessage(cc) + err := c.writeMessage(cc.toWire()) if err != nil { c.internalClose(err) return @@ -776,7 +729,7 @@ func (c *rawConnection) writerLoop() { } select { case cc := <-c.clusterConfigBox: - err := c.writeMessage(cc) + err := c.writeMessage(cc.toWire()) if err != nil { c.internalClose(err) return @@ -802,7 +755,7 @@ func (c *rawConnection) writerLoop() { } } -func (c *rawConnection) writeMessage(msg message) error { +func (c *rawConnection) writeMessage(msg proto.Message) error { msgContext, _ := messageContext(msg) l.Debugf("Writing %v", msgContext) @@ -810,11 +763,11 @@ func (c *rawConnection) writeMessage(msg message) error { metricDeviceSentMessages.WithLabelValues(c.idString).Inc() }() - size := msg.ProtoSize() - hdr := Header{ + size := proto.Size(msg) + hdr := &bep.Header{ Type: typeOf(msg), } - hdrSize := hdr.ProtoSize() + hdrSize := proto.Size(hdr) if hdrSize > 1<<16-1 { panic("impossibly large header") } @@ -825,7 +778,7 @@ func (c *rawConnection) writeMessage(msg message) error { defer BufferPool.Put(buf) // Message - if _, err := msg.MarshalTo(buf[2+hdrSize+4:]); err != nil { + if _, err := protoutil.MarshalTo(buf[overhead:], msg); err != nil { return fmt.Errorf("marshalling message: %w", err) } @@ -841,7 +794,7 @@ func (c *rawConnection) writeMessage(msg message) error { // Header length binary.BigEndian.PutUint16(buf, uint16(hdrSize)) // Header - if _, err := hdr.MarshalTo(buf[2:]); err != nil { + if _, err := protoutil.MarshalTo(buf[2:], hdr); err != nil { return fmt.Errorf("marshalling header: %w", err) } // Message length @@ -860,12 +813,12 @@ func (c *rawConnection) writeMessage(msg message) error { // // The first return value indicates whether compression succeeded. // If not, the caller should retry without compression. -func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte) (ok bool, err error) { - hdr := Header{ +func (c *rawConnection) writeCompressedMessage(msg proto.Message, marshaled []byte) (ok bool, err error) { + hdr := &bep.Header{ Type: typeOf(msg), - Compression: MessageCompressionLZ4, + Compression: bep.MessageCompression_MESSAGE_COMPRESSION_LZ4, } - hdrSize := hdr.ProtoSize() + hdrSize := proto.Size(hdr) if hdrSize > 1<<16-1 { panic("impossibly large header") } @@ -890,7 +843,7 @@ func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte) (o // Header length binary.BigEndian.PutUint16(buf, uint16(hdrSize)) // Header - if _, err := hdr.MarshalTo(buf[2:]); err != nil { + if _, err := protoutil.MarshalTo(buf[2:], hdr); err != nil { return true, fmt.Errorf("marshalling header: %w", err) } // Message length @@ -904,65 +857,65 @@ func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte) (o return true, nil } -func typeOf(msg message) MessageType { +func typeOf(msg proto.Message) bep.MessageType { switch msg.(type) { - case *ClusterConfig: - return MessageTypeClusterConfig - case *Index: - return MessageTypeIndex - case *IndexUpdate: - return MessageTypeIndexUpdate - case *Request: - return MessageTypeRequest - case *Response: - return MessageTypeResponse - case *DownloadProgress: - return MessageTypeDownloadProgress - case *Ping: - return MessageTypePing - case *Close: - return MessageTypeClose + case *bep.ClusterConfig: + return bep.MessageType_MESSAGE_TYPE_CLUSTER_CONFIG + case *bep.Index: + return bep.MessageType_MESSAGE_TYPE_INDEX + case *bep.IndexUpdate: + return bep.MessageType_MESSAGE_TYPE_INDEX_UPDATE + case *bep.Request: + return bep.MessageType_MESSAGE_TYPE_REQUEST + case *bep.Response: + return bep.MessageType_MESSAGE_TYPE_RESPONSE + case *bep.DownloadProgress: + return bep.MessageType_MESSAGE_TYPE_DOWNLOAD_PROGRESS + case *bep.Ping: + return bep.MessageType_MESSAGE_TYPE_PING + case *bep.Close: + return bep.MessageType_MESSAGE_TYPE_CLOSE default: panic("bug: unknown message type") } } -func newMessage(t MessageType) (message, error) { +func newMessage(t bep.MessageType) (proto.Message, error) { switch t { - case MessageTypeClusterConfig: - return new(ClusterConfig), nil - case MessageTypeIndex: - return new(Index), nil - case MessageTypeIndexUpdate: - return new(IndexUpdate), nil - case MessageTypeRequest: - return new(Request), nil - case MessageTypeResponse: - return new(Response), nil - case MessageTypeDownloadProgress: - return new(DownloadProgress), nil - case MessageTypePing: - return new(Ping), nil - case MessageTypeClose: - return new(Close), nil + case bep.MessageType_MESSAGE_TYPE_CLUSTER_CONFIG: + return new(bep.ClusterConfig), nil + case bep.MessageType_MESSAGE_TYPE_INDEX: + return new(bep.Index), nil + case bep.MessageType_MESSAGE_TYPE_INDEX_UPDATE: + return new(bep.IndexUpdate), nil + case bep.MessageType_MESSAGE_TYPE_REQUEST: + return new(bep.Request), nil + case bep.MessageType_MESSAGE_TYPE_RESPONSE: + return new(bep.Response), nil + case bep.MessageType_MESSAGE_TYPE_DOWNLOAD_PROGRESS: + return new(bep.DownloadProgress), nil + case bep.MessageType_MESSAGE_TYPE_PING: + return new(bep.Ping), nil + case bep.MessageType_MESSAGE_TYPE_CLOSE: + return new(bep.Close), nil default: return nil, errUnknownMessage } } -func (c *rawConnection) shouldCompressMessage(msg message) bool { +func (c *rawConnection) shouldCompressMessage(msg proto.Message) bool { switch c.compression { case CompressionNever: return false case CompressionAlways: // Use compression for large enough messages - return msg.ProtoSize() >= compressionThreshold + return proto.Size(msg) >= compressionThreshold case CompressionMetadata: - _, isResponse := msg.(*Response) + _, isResponse := msg.(*bep.Response) // Compress if it's large enough and not a response message - return !isResponse && msg.ProtoSize() >= compressionThreshold + return !isResponse && proto.Size(msg) >= compressionThreshold default: panic("unknown compression setting") @@ -977,7 +930,7 @@ func (c *rawConnection) Close(err error) { done := make(chan struct{}) timeout := time.NewTimer(CloseTimeout) select { - case c.closeBox <- asyncMessage{&Close{err.Error()}, done}: + case c.closeBox <- asyncMessage{&bep.Close{Reason: err.Error()}, done}: select { case <-done: case <-timeout.C: @@ -1127,23 +1080,23 @@ func newHandleError(err error, msgContext string) error { return fmt.Errorf("handling %v: %w", msgContext, err) } -func messageContext(msg message) (string, error) { +func messageContext(msg proto.Message) (string, error) { switch msg := msg.(type) { - case *ClusterConfig: + case *bep.ClusterConfig: return "cluster-config", nil - case *Index: + case *bep.Index: return fmt.Sprintf("index for %v", msg.Folder), nil - case *IndexUpdate: + case *bep.IndexUpdate: return fmt.Sprintf("index-update for %v", msg.Folder), nil - case *Request: + case *bep.Request: return fmt.Sprintf(`request for "%v" in %v`, msg.Name, msg.Folder), nil - case *Response: + case *bep.Response: return "response", nil - case *DownloadProgress: + case *bep.DownloadProgress: return fmt.Sprintf("download-progress for %v", msg.Folder), nil - case *Ping: + case *bep.Ping: return "ping", nil - case *Close: + case *bep.Close: return "close", nil default: return "", errors.New("unknown or empty message") diff --git a/lib/protocol/protocol_test.go b/lib/protocol/protocol_test.go index a99b62f8307..c4f304126e1 100644 --- a/lib/protocol/protocol_test.go +++ b/lib/protocol/protocol_test.go @@ -1,11 +1,14 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol import ( "bytes" "context" - "crypto/sha256" "encoding/hex" "encoding/json" "errors" @@ -13,19 +16,19 @@ import ( "os" "sync" "testing" - "testing/quick" "time" lz4 "github.com/pierrec/lz4/v4" - "github.com/syncthing/syncthing/lib/build" + "google.golang.org/protobuf/proto" + + "github.com/syncthing/syncthing/internal/gen/bep" "github.com/syncthing/syncthing/lib/rand" "github.com/syncthing/syncthing/lib/testutil" ) var ( - c0ID = NewDeviceID([]byte{1}) - c1ID = NewDeviceID([]byte{2}) - quickCfg = &quick.Config{} + c0ID = NewDeviceID([]byte{1}) + c1ID = NewDeviceID([]byte{2}) ) func TestPing(t *testing.T) { @@ -199,7 +202,7 @@ func TestClusterConfigFirst(t *testing.T) { defer closeAndWait(c, rw) select { - case c.outbox <- asyncMessage{&Ping{}, nil}: + case c.outbox <- asyncMessage{&bep.Ping{}, nil}: t.Fatal("able to send ping before cluster config") case <-time.After(100 * time.Millisecond): // Allow some time for c.writerLoop to setup after c.Start @@ -208,7 +211,7 @@ func TestClusterConfigFirst(t *testing.T) { c.ClusterConfig(&ClusterConfig{}) done := make(chan struct{}) - if ok := c.send(context.Background(), &Ping{}, done); !ok { + if ok := c.send(context.Background(), &bep.Ping{}, done); !ok { t.Fatal("send ping after cluster config returned false") } select { @@ -263,168 +266,27 @@ func TestCloseTimeout(t *testing.T) { } } -func TestMarshalIndexMessage(t *testing.T) { - if testing.Short() { - quickCfg.MaxCount = 10 - } - - f := func(m1 Index) bool { - if len(m1.Files) == 0 { - m1.Files = nil - } - for i, f := range m1.Files { - if len(f.BlocksHash) == 0 { - m1.Files[i].BlocksHash = nil - } - if len(f.VersionHash) == 0 { - m1.Files[i].VersionHash = nil - } - if len(f.Blocks) == 0 { - m1.Files[i].Blocks = nil - } else { - for j := range f.Blocks { - f.Blocks[j].Offset = 0 - if len(f.Blocks[j].Hash) == 0 { - f.Blocks[j].Hash = nil - } - } - } - if len(f.Version.Counters) == 0 { - m1.Files[i].Version.Counters = nil - } - if len(f.Encrypted) == 0 { - m1.Files[i].Encrypted = nil - } - } - - return testMarshal(t, "index", &m1, &Index{}) - } - - if err := quick.Check(f, quickCfg); err != nil { - t.Error(err) - } -} - -func TestMarshalRequestMessage(t *testing.T) { - if testing.Short() { - quickCfg.MaxCount = 10 - } - - f := func(m1 Request) bool { - if len(m1.Hash) == 0 { - m1.Hash = nil - } - return testMarshal(t, "request", &m1, &Request{}) - } - - if err := quick.Check(f, quickCfg); err != nil { - t.Error(err) - } -} - -func TestMarshalResponseMessage(t *testing.T) { - if testing.Short() { - quickCfg.MaxCount = 10 - } - - f := func(m1 Response) bool { - if len(m1.Data) == 0 { - m1.Data = nil - } - return testMarshal(t, "response", &m1, &Response{}) - } - - if err := quick.Check(f, quickCfg); err != nil { - t.Error(err) - } -} - -func TestMarshalClusterConfigMessage(t *testing.T) { - if testing.Short() { - quickCfg.MaxCount = 10 - } - - f := func(m1 ClusterConfig) bool { - if len(m1.Folders) == 0 { - m1.Folders = nil - } - for i := range m1.Folders { - if len(m1.Folders[i].Devices) == 0 { - m1.Folders[i].Devices = nil - } - for j := range m1.Folders[i].Devices { - if len(m1.Folders[i].Devices[j].Addresses) == 0 { - m1.Folders[i].Devices[j].Addresses = nil - } - if len(m1.Folders[i].Devices[j].EncryptionPasswordToken) == 0 { - m1.Folders[i].Devices[j].EncryptionPasswordToken = nil - } - } - } - - return testMarshal(t, "clusterconfig", &m1, &ClusterConfig{}) - } - - if err := quick.Check(f, quickCfg); err != nil { - t.Error(err) - } -} - -func TestMarshalCloseMessage(t *testing.T) { - if testing.Short() { - quickCfg.MaxCount = 10 - } - - f := func(m1 Close) bool { - return testMarshal(t, "close", &m1, &Close{}) - } - - if err := quick.Check(f, quickCfg); err != nil { - t.Error(err) - } -} - -func TestMarshalFDPU(t *testing.T) { - if testing.Short() { - quickCfg.MaxCount = 10 - } - - f := func(m1 FileDownloadProgressUpdate) bool { - if len(m1.Version.Counters) == 0 { - m1.Version.Counters = nil - } - if len(m1.BlockIndexes) == 0 { - m1.BlockIndexes = nil - } - return testMarshal(t, "fdpu", &m1, &FileDownloadProgressUpdate{}) - } - - if err := quick.Check(f, quickCfg); err != nil { - t.Error(err) - } -} - func TestUnmarshalFDPUv16v17(t *testing.T) { - var fdpu FileDownloadProgressUpdate + var fdpu bep.FileDownloadProgressUpdate m0, _ := hex.DecodeString("08cda1e2e3011278f3918787f3b89b8af2958887f0aa9389f3a08588f3aa8f96f39aa8a5f48b9188f19286a0f3848da4f3aba799f3beb489f0a285b9f487b684f2a3bda2f48598b4f2938a89f2a28badf187a0a2f2aebdbdf4849494f4808fbbf2b3a2adf2bb95bff0a6ada4f198ab9af29a9c8bf1abb793f3baabb2f188a6ba1a0020bb9390f60220f6d9e42220b0c7e2b2fdffffffff0120fdb2dfcdfbffffffff0120cedab1d50120bd8784c0feffffffff0120ace99591fdffffffff0120eed7d09af9ffffffff01") - if err := fdpu.Unmarshal(m0); err != nil { + if err := proto.Unmarshal(m0, &fdpu); err != nil { t.Fatal("Unmarshalling message from v0.14.16:", err) } m1, _ := hex.DecodeString("0880f1969905128401f099b192f0abb1b9f3b280aff19e9aa2f3b89e84f484b39df1a7a6b0f1aea4b1f0adac94f3b39caaf1939281f1928a8af0abb1b0f0a8b3b3f3a88e94f2bd85acf29c97a9f2969da6f0b7a188f1908ea2f09a9c9bf19d86a6f29aada8f389bb95f0bf9d88f1a09d89f1b1a4b5f29b9eabf298a59df1b2a589f2979ebdf0b69880f18986b21a440a1508c7d8fb8897ca93d90910e8c4d8e8f2f8f0ccee010a1508afa8ffd8c085b393c50110e5bdedc3bddefe9b0b0a1408a1bedddba4cac5da3c10b8e5d9958ca7e3ec19225ae2f88cb2f8ffffffff018ceda99cfbffffffff01b9c298a407e295e8e9fcffffffff01f3b9ade5fcffffffff01c08bfea9fdffffffff01a2c2e5e1ffffffffff0186dcc5dafdffffffff01e9ffc7e507c9d89db8fdffffffff01") - if err := fdpu.Unmarshal(m1); err != nil { + if err := proto.Unmarshal(m1, &fdpu); err != nil { t.Fatal("Unmarshalling message from v0.14.16:", err) } } -func testMarshal(t *testing.T, prefix string, m1, m2 message) bool { - buf, err := m1.Marshal() +func testMarshal(t *testing.T, prefix string, m1, m2 proto.Message) bool { + buf, err := proto.Marshal(m1) if err != nil { t.Fatal(err) } - err = m2.Unmarshal(buf) + err = proto.Unmarshal(buf, m2) if err != nil { t.Fatal(err) } @@ -449,7 +311,7 @@ func TestWriteCompressed(t *testing.T) { compression: CompressionAlways, } - msg := &Response{Data: make([]byte, 10240)} + msg := (&Response{Data: make([]byte, 10240)}).toWire() if random { // This should make the message uncompressible. rand.Read(msg.Data) @@ -462,12 +324,12 @@ func TestWriteCompressed(t *testing.T) { if err != nil { t.Fatal(err) } - if !bytes.Equal(got.(*Response).Data, msg.Data) { + if !bytes.Equal(got.(*bep.Response).Data, msg.Data) { t.Error("received the wrong message") } - hdr := Header{Type: typeOf(msg)} - size := int64(2 + hdr.ProtoSize() + 4 + msg.ProtoSize()) + hdr := &bep.Header{Type: typeOf(msg)} + size := int64(2 + proto.Size(hdr) + 4 + proto.Size(msg)) if c.cr.Tot() > size { t.Errorf("compression enlarged message from %d to %d", size, c.cr.Tot()) @@ -663,236 +525,6 @@ func BenchmarkBlockSize(b *testing.B) { } } -func TestLocalFlagBits(t *testing.T) { - var f FileInfo - if f.IsIgnored() || f.MustRescan() || f.IsInvalid() { - t.Error("file should have no weird bits set by default") - } - - f.SetIgnored() - if !f.IsIgnored() || f.MustRescan() || !f.IsInvalid() { - t.Error("file should be ignored and invalid") - } - - f.SetMustRescan() - if f.IsIgnored() || !f.MustRescan() || !f.IsInvalid() { - t.Error("file should be must-rescan and invalid") - } - - f.SetUnsupported() - if f.IsIgnored() || f.MustRescan() || !f.IsInvalid() { - t.Error("file should be invalid") - } -} - -func TestIsEquivalent(t *testing.T) { - b := func(v bool) *bool { - return &v - } - - type testCase struct { - a FileInfo - b FileInfo - ignPerms *bool // nil means should not matter, we'll test both variants - ignBlocks *bool - ignFlags uint32 - eq bool - } - cases := []testCase{ - // Empty FileInfos are equivalent - {eq: true}, - - // Various basic attributes, all of which cause inequality when - // they differ - { - a: FileInfo{Name: "foo"}, - b: FileInfo{Name: "bar"}, - eq: false, - }, - { - a: FileInfo{Type: FileInfoTypeFile}, - b: FileInfo{Type: FileInfoTypeDirectory}, - eq: false, - }, - { - a: FileInfo{Size: 1234}, - b: FileInfo{Size: 2345}, - eq: false, - }, - { - a: FileInfo{Deleted: false}, - b: FileInfo{Deleted: true}, - eq: false, - }, - { - a: FileInfo{RawInvalid: false}, - b: FileInfo{RawInvalid: true}, - eq: false, - }, - { - a: FileInfo{ModifiedS: 1234}, - b: FileInfo{ModifiedS: 2345}, - eq: false, - }, - { - a: FileInfo{ModifiedNs: 1234}, - b: FileInfo{ModifiedNs: 2345}, - eq: false, - }, - - // Special handling of local flags and invalidity. "MustRescan" - // files are never equivalent to each other. Otherwise, equivalence - // is based just on whether the file becomes IsInvalid() or not, not - // the specific reason or flag bits. - { - a: FileInfo{LocalFlags: FlagLocalMustRescan}, - b: FileInfo{LocalFlags: FlagLocalMustRescan}, - eq: false, - }, - { - a: FileInfo{RawInvalid: true}, - b: FileInfo{RawInvalid: true}, - eq: true, - }, - { - a: FileInfo{LocalFlags: FlagLocalUnsupported}, - b: FileInfo{LocalFlags: FlagLocalUnsupported}, - eq: true, - }, - { - a: FileInfo{RawInvalid: true}, - b: FileInfo{LocalFlags: FlagLocalUnsupported}, - eq: true, - }, - { - a: FileInfo{LocalFlags: 0}, - b: FileInfo{LocalFlags: FlagLocalReceiveOnly}, - eq: false, - }, - { - a: FileInfo{LocalFlags: 0}, - b: FileInfo{LocalFlags: FlagLocalReceiveOnly}, - ignFlags: FlagLocalReceiveOnly, - eq: true, - }, - - // Difference in blocks is not OK - { - a: FileInfo{Blocks: []BlockInfo{{Hash: []byte{1, 2, 3, 4}}}}, - b: FileInfo{Blocks: []BlockInfo{{Hash: []byte{2, 3, 4, 5}}}}, - ignBlocks: b(false), - eq: false, - }, - - // ... unless we say it is - { - a: FileInfo{Blocks: []BlockInfo{{Hash: []byte{1, 2, 3, 4}}}}, - b: FileInfo{Blocks: []BlockInfo{{Hash: []byte{2, 3, 4, 5}}}}, - ignBlocks: b(true), - eq: true, - }, - - // Difference in permissions is not OK. - { - a: FileInfo{Permissions: 0o444}, - b: FileInfo{Permissions: 0o666}, - ignPerms: b(false), - eq: false, - }, - - // ... unless we say it is - { - a: FileInfo{Permissions: 0o666}, - b: FileInfo{Permissions: 0o444}, - ignPerms: b(true), - eq: true, - }, - - // These attributes are not checked at all - { - a: FileInfo{NoPermissions: false}, - b: FileInfo{NoPermissions: true}, - eq: true, - }, - { - a: FileInfo{Version: Vector{Counters: []Counter{{ID: 1, Value: 42}}}}, - b: FileInfo{Version: Vector{Counters: []Counter{{ID: 42, Value: 1}}}}, - eq: true, - }, - { - a: FileInfo{Sequence: 1}, - b: FileInfo{Sequence: 2}, - eq: true, - }, - - // The block size is not checked (but this would fail the blocks - // check in real world) - { - a: FileInfo{RawBlockSize: 1}, - b: FileInfo{RawBlockSize: 2}, - eq: true, - }, - - // The symlink target is checked for symlinks - { - a: FileInfo{Type: FileInfoTypeSymlink, SymlinkTarget: "a"}, - b: FileInfo{Type: FileInfoTypeSymlink, SymlinkTarget: "b"}, - eq: false, - }, - - // ... but not for non-symlinks - { - a: FileInfo{Type: FileInfoTypeFile, SymlinkTarget: "a"}, - b: FileInfo{Type: FileInfoTypeFile, SymlinkTarget: "b"}, - eq: true, - }, - } - - if build.IsWindows { - // On windows we only check the user writable bit of the permission - // set, so these are equivalent. - cases = append(cases, testCase{ - a: FileInfo{Permissions: 0o777}, - b: FileInfo{Permissions: 0o600}, - ignPerms: b(false), - eq: true, - }) - } - - for i, tc := range cases { - // Check the standard attributes with all permutations of the - // special ignore flags, unless the value of those flags are given - // in the tests. - for _, ignPerms := range []bool{true, false} { - for _, ignBlocks := range []bool{true, false} { - if tc.ignPerms != nil && *tc.ignPerms != ignPerms { - continue - } - if tc.ignBlocks != nil && *tc.ignBlocks != ignBlocks { - continue - } - - if res := tc.a.isEquivalent(tc.b, FileInfoComparison{IgnorePerms: ignPerms, IgnoreBlocks: ignBlocks, IgnoreFlags: tc.ignFlags}); res != tc.eq { - t.Errorf("Case %d:\na: %v\nb: %v\na.IsEquivalent(b, %v, %v) => %v, expected %v", i, tc.a, tc.b, ignPerms, ignBlocks, res, tc.eq) - } - if res := tc.b.isEquivalent(tc.a, FileInfoComparison{IgnorePerms: ignPerms, IgnoreBlocks: ignBlocks, IgnoreFlags: tc.ignFlags}); res != tc.eq { - t.Errorf("Case %d:\na: %v\nb: %v\nb.IsEquivalent(a, %v, %v) => %v, expected %v", i, tc.a, tc.b, ignPerms, ignBlocks, res, tc.eq) - } - } - } - } -} - -func TestSha256OfEmptyBlock(t *testing.T) { - // every block size should have a correct entry in sha256OfEmptyBlock - for blockSize := MinBlockSize; blockSize <= MaxBlockSize; blockSize *= 2 { - expected := sha256.Sum256(make([]byte, blockSize)) - if sha256OfEmptyBlock[blockSize] != expected { - t.Error("missing or wrong hash for block of size", blockSize) - } - } -} - // TestClusterConfigAfterClose checks that ClusterConfig does not deadlock when // ClusterConfig is called on a closed connection. func TestClusterConfigAfterClose(t *testing.T) { @@ -930,7 +562,7 @@ func TestDispatcherToCloseDeadlock(t *testing.T) { c.Start() defer closeAndWait(c, rw) - c.inbox <- &ClusterConfig{} + c.inbox <- &bep.ClusterConfig{} select { case <-c.dispatcherLoopStopped: @@ -939,55 +571,6 @@ func TestDispatcherToCloseDeadlock(t *testing.T) { } } -func TestBlocksEqual(t *testing.T) { - blocksOne := []BlockInfo{{Hash: []byte{1, 2, 3, 4}}} - blocksTwo := []BlockInfo{{Hash: []byte{5, 6, 7, 8}}} - hashOne := []byte{42, 42, 42, 42} - hashTwo := []byte{29, 29, 29, 29} - - cases := []struct { - b1 []BlockInfo - h1 []byte - b2 []BlockInfo - h2 []byte - eq bool - }{ - {blocksOne, hashOne, blocksOne, hashOne, true}, // everything equal - {blocksOne, hashOne, blocksTwo, hashTwo, false}, // nothing equal - {blocksOne, hashOne, blocksOne, nil, true}, // blocks compared - {blocksOne, nil, blocksOne, nil, true}, // blocks compared - {blocksOne, nil, blocksTwo, nil, false}, // blocks compared - {blocksOne, hashOne, blocksTwo, hashOne, true}, // hashes equal, blocks not looked at - {blocksOne, hashOne, blocksOne, hashTwo, true}, // hashes different, blocks compared - {blocksOne, hashOne, blocksTwo, hashTwo, false}, // hashes different, blocks compared - {blocksOne, hashOne, nil, nil, false}, // blocks is different from no blocks - {blocksOne, nil, nil, nil, false}, // blocks is different from no blocks - {nil, hashOne, nil, nil, true}, // nil blocks are equal, even of one side has a hash - } - - for _, tc := range cases { - f1 := FileInfo{Blocks: tc.b1, BlocksHash: tc.h1} - f2 := FileInfo{Blocks: tc.b2, BlocksHash: tc.h2} - - if !f1.BlocksEqual(f1) { - t.Error("f1 is always equal to itself", f1) - } - if !f2.BlocksEqual(f2) { - t.Error("f2 is always equal to itself", f2) - } - if res := f1.BlocksEqual(f2); res != tc.eq { - t.Log("f1", f1.BlocksHash, f1.Blocks) - t.Log("f2", f2.BlocksHash, f2.Blocks) - t.Errorf("f1.BlocksEqual(f2) == %v but should be %v", res, tc.eq) - } - if res := f2.BlocksEqual(f1); res != tc.eq { - t.Log("f1", f1.BlocksHash, f1.Blocks) - t.Log("f2", f2.BlocksHash, f2.Blocks) - t.Errorf("f2.BlocksEqual(f1) == %v but should be %v", res, tc.eq) - } - } -} - func TestIndexIDString(t *testing.T) { // Index ID is a 64 bit, zero padded hex integer. var i IndexID = 42 diff --git a/lib/protocol/vector.go b/lib/protocol/vector.go index fefb88aa956..30cce42314d 100644 --- a/lib/protocol/vector.go +++ b/lib/protocol/vector.go @@ -1,15 +1,66 @@ -// Copyright (C) 2015 The Protocol Authors. +// Copyright (C) 2015 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol -import "time" +import ( + "time" + + "github.com/syncthing/syncthing/internal/gen/bep" +) // The Vector type represents a version vector. The zero value is a usable // version vector. The vector has slice semantics and some operations on it // are "append-like" in that they may return the same vector modified, or v // new allocated Vector with the modified contents. +type Vector struct { + Counters []Counter +} + +func (v *Vector) ToWire() *bep.Vector { + counters := make([]*bep.Counter, len(v.Counters)) + for i, c := range v.Counters { + counters[i] = c.toWire() + } + return &bep.Vector{ + Counters: counters, + } +} + +func VectorFromWire(w *bep.Vector) Vector { + var v Vector + if w == nil || len(w.Counters) == 0 { + return v + } + v.Counters = make([]Counter, len(w.Counters)) + for i, c := range w.Counters { + v.Counters[i] = counterFromWire(c) + } + return v +} // Counter represents a single counter in the version vector. +type Counter struct { + ID ShortID + Value uint64 +} + +func (c *Counter) toWire() *bep.Counter { + return &bep.Counter{ + Id: uint64(c.ID), + Value: c.Value, + } +} + +func counterFromWire(w *bep.Counter) Counter { + return Counter{ + ID: ShortID(w.Id), + Value: w.Value, + } +} // Update returns a Vector with the index for the specific ID incremented by // one. If it is possible, the vector v is updated and returned. If it is not, diff --git a/lib/protocol/vector_test.go b/lib/protocol/vector_test.go index e1fb691cfba..0d63f23293b 100644 --- a/lib/protocol/vector_test.go +++ b/lib/protocol/vector_test.go @@ -1,4 +1,8 @@ -// Copyright (C) 2015 The Protocol Authors. +// Copyright (C) 2015 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/protocol/wireformat.go b/lib/protocol/wireformat.go index e36696c5f54..c1d78ba6cf2 100644 --- a/lib/protocol/wireformat.go +++ b/lib/protocol/wireformat.go @@ -1,4 +1,8 @@ -// Copyright (C) 2014 The Protocol Authors. +// Copyright (C) 2014 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. package protocol diff --git a/lib/relay/protocol/packets.go b/lib/relay/protocol/packets.go index 563fb2832c1..926d856a9b9 100644 --- a/lib/relay/protocol/packets.go +++ b/lib/relay/protocol/packets.go @@ -9,7 +9,7 @@ import ( "fmt" "net" - syncthingprotocol "github.com/syncthing/syncthing/lib/protocol" + "github.com/syncthing/syncthing/lib/protocol" ) const ( @@ -62,7 +62,7 @@ type SessionInvitation struct { func (i SessionInvitation) String() string { device := "" - if address, err := syncthingprotocol.DeviceIDFromBytes(i.From); err == nil { + if address, err := protocol.DeviceIDFromBytes(i.From); err == nil { device = address.String() } return fmt.Sprintf("%s@%s:%d", device, net.IP(i.Address), i.Port) diff --git a/lib/scanner/walk.go b/lib/scanner/walk.go index 7146f9ae066..4f916329bde 100644 --- a/lib/scanner/walk.go +++ b/lib/scanner/walk.go @@ -17,13 +17,14 @@ import ( "unicode/utf8" metrics "github.com/rcrowley/go-metrics" + "golang.org/x/text/unicode/norm" + "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/ignore" "github.com/syncthing/syncthing/lib/osutil" "github.com/syncthing/syncthing/lib/protocol" - "golang.org/x/text/unicode/norm" ) type Config struct { @@ -421,7 +422,7 @@ func (w *walker) walkRegular(ctx context.Context, relPath string, info fs.FileIn } f = w.updateFileInfo(f, curFile) f.NoPermissions = w.IgnorePerms - f.RawBlockSize = blockSize + f.RawBlockSize = int32(blockSize) l.Debugln(w, "checking:", f) if hasCurFile { @@ -725,7 +726,7 @@ func CreateFileInfo(fi fs.FileInfo, name string, filesystem fs.Filesystem, scanO f.Permissions = uint32(fi.Mode() & fs.ModePerm) f.ModifiedS = fi.ModTime().Unix() - f.ModifiedNs = fi.ModTime().Nanosecond() + f.ModifiedNs = int32(fi.ModTime().Nanosecond()) if fi.IsDir() { f.Type = protocol.FileInfoTypeDirectory diff --git a/lib/scanner/walk_test.go b/lib/scanner/walk_test.go index ffd5c382a99..890fb9358cc 100644 --- a/lib/scanner/walk_test.go +++ b/lib/scanner/walk_test.go @@ -21,13 +21,14 @@ import ( "testing" "github.com/d4l3k/messagediff" + "golang.org/x/text/unicode/norm" + "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/ignore" "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rand" - "golang.org/x/text/unicode/norm" ) type testfile struct { diff --git a/lib/sliceutil/sliceutil.go b/lib/sliceutil/sliceutil.go index f16c6762218..948115a0443 100644 --- a/lib/sliceutil/sliceutil.go +++ b/lib/sliceutil/sliceutil.go @@ -14,3 +14,11 @@ func RemoveAndZero[E any, S ~[]E](s S, i int) S { s[len(s)-1] = *new(E) return s[:len(s)-1] } + +func Map[E, R any, S ~[]E](s S, f func(E) R) []R { + r := make([]R, len(s)) + for i, v := range s { + r[i] = f(v) + } + return r +} diff --git a/lib/syncthing/globalmigrations.go b/lib/syncthing/globalmigrations.go index 1a38c5c8285..cc49874974b 100644 --- a/lib/syncthing/globalmigrations.go +++ b/lib/syncthing/globalmigrations.go @@ -80,8 +80,7 @@ func encryptionTrailerSizeMigration(ll *db.Lowlevel, cfg config.Wrapper) error { }) filesystem := folderCfg.Filesystem(fset) var innerErr error - snap.WithHave(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool { - fi := intf.(protocol.FileInfo) + snap.WithHave(protocol.LocalDeviceID, func(fi protocol.FileInfo) bool { size, err := sizeOfEncryptedTrailer(filesystem, fi.Name) if err != nil { // Best effort: If we fail to read a file, it will show as diff --git a/lib/syncthing/utils.go b/lib/syncthing/utils.go index 15195c33444..023bbd8f163 100644 --- a/lib/syncthing/utils.go +++ b/lib/syncthing/utils.go @@ -77,7 +77,7 @@ func DefaultConfig(path string, myID protocol.DeviceID, evLogger events.Logger, fcfg := newCfg.Defaults.Folder.Copy() fcfg.ID = "default" fcfg.Label = "Default Folder" - fcfg.FilesystemType = fs.FilesystemTypeBasic + fcfg.FilesystemType = config.FilesystemTypeBasic fcfg.Path = locations.Get(locations.DefFolder) newCfg.Folders = append(newCfg.Folders, fcfg) l.Infoln("Default folder created and/or linked to new config") diff --git a/lib/ur/usage_report.go b/lib/ur/usage_report.go index 807b09cc3e4..dd62a653a7a 100644 --- a/lib/ur/usage_report.go +++ b/lib/ur/usage_report.go @@ -164,11 +164,11 @@ func (s *Service) reportData(ctx context.Context, urVersion int, preview bool) ( report.DeviceUses.CustomCertName++ } switch cfg.Compression { - case protocol.CompressionAlways: + case config.CompressionAlways: report.DeviceUses.CompressAlways++ - case protocol.CompressionMetadata: + case config.CompressionMetadata: report.DeviceUses.CompressMetadata++ - case protocol.CompressionNever: + case config.CompressionNever: report.DeviceUses.CompressNever++ default: l.Warnf("Unhandled versioning type for usage reports: %s", cfg.Compression) diff --git a/lib/versioner/simple.go b/lib/versioner/simple.go index 09e55855aec..f56a8279b4d 100644 --- a/lib/versioner/simple.go +++ b/lib/versioner/simple.go @@ -43,7 +43,7 @@ func newSimple(cfg config.FolderConfiguration) Versioner { cleanoutDays: cleanoutDays, folderFs: cfg.Filesystem(nil), versionsFs: versionerFsFromFolderCfg(cfg), - copyRangeMethod: cfg.CopyRangeMethod, + copyRangeMethod: cfg.CopyRangeMethod.ToFS(), } l.Debugf("instantiated %#v", s) diff --git a/lib/versioner/simple_test.go b/lib/versioner/simple_test.go index 5e540e48a8b..0087f826bd1 100644 --- a/lib/versioner/simple_test.go +++ b/lib/versioner/simple_test.go @@ -14,8 +14,6 @@ import ( "time" "github.com/syncthing/syncthing/lib/config" - - "github.com/syncthing/syncthing/lib/fs" ) func TestTaggedFilename(t *testing.T) { @@ -58,7 +56,7 @@ func TestSimpleVersioningVersionCount(t *testing.T) { dir := t.TempDir() cfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: config.FilesystemTypeBasic, Path: dir, Versioning: config.VersioningConfiguration{ Params: map[string]string{ @@ -108,11 +106,11 @@ func TestPathTildes(t *testing.T) { os.Mkdir(filepath.Join(home, "folder"), 0o755) cfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: config.FilesystemTypeBasic, Path: "~/folder", Versioning: config.VersioningConfiguration{ FSPath: "~/versions", - FSType: fs.FilesystemTypeBasic, + FSType: config.FilesystemTypeBasic, Params: map[string]string{ "keep": "2", }, diff --git a/lib/versioner/staggered.go b/lib/versioner/staggered.go index 6f844b19555..e97c2e6d4b2 100644 --- a/lib/versioner/staggered.go +++ b/lib/versioner/staggered.go @@ -52,7 +52,7 @@ func newStaggered(cfg config.FolderConfiguration) Versioner { {24 * 60 * 60, 30 * 24 * 60 * 60}, // next 30 days -> 1 day between versions {7 * 24 * 60 * 60, maxAge}, // next year -> 1 week between versions }, - copyRangeMethod: cfg.CopyRangeMethod, + copyRangeMethod: cfg.CopyRangeMethod.ToFS(), } l.Debugf("instantiated %#v", s) diff --git a/lib/versioner/staggered_test.go b/lib/versioner/staggered_test.go index af9c111a079..60b8065b1cb 100644 --- a/lib/versioner/staggered_test.go +++ b/lib/versioner/staggered_test.go @@ -15,8 +15,8 @@ import ( "time" "github.com/d4l3k/messagediff" + "github.com/syncthing/syncthing/lib/config" - "github.com/syncthing/syncthing/lib/fs" ) func TestStaggeredVersioningVersionCount(t *testing.T) { @@ -100,7 +100,7 @@ func TestStaggeredVersioningVersionCount(t *testing.T) { sort.Strings(delete) cfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: config.FilesystemTypeBasic, Path: "testdata", Versioning: config.VersioningConfiguration{ Params: map[string]string{ diff --git a/lib/versioner/trashcan.go b/lib/versioner/trashcan.go index 2b59eb9da02..7378c3a3352 100644 --- a/lib/versioner/trashcan.go +++ b/lib/versioner/trashcan.go @@ -36,7 +36,7 @@ func newTrashcan(cfg config.FolderConfiguration) Versioner { folderFs: cfg.Filesystem(nil), versionsFs: versionerFsFromFolderCfg(cfg), cleanoutDays: cleanoutDays, - copyRangeMethod: cfg.CopyRangeMethod, + copyRangeMethod: cfg.CopyRangeMethod.ToFS(), } l.Debugf("instantiated %#v", s) diff --git a/lib/versioner/trashcan_test.go b/lib/versioner/trashcan_test.go index 579dba08418..a12ee60765c 100644 --- a/lib/versioner/trashcan_test.go +++ b/lib/versioner/trashcan_test.go @@ -27,10 +27,10 @@ func TestTrashcanArchiveRestoreSwitcharoo(t *testing.T) { tmpDir2 := t.TempDir() cfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: config.FilesystemTypeBasic, Path: tmpDir1, Versioning: config.VersioningConfiguration{ - FSType: fs.FilesystemTypeBasic, + FSType: config.FilesystemTypeBasic, FSPath: tmpDir2, }, } @@ -105,10 +105,10 @@ func TestTrashcanRestoreDeletedFile(t *testing.T) { tmpDir2 := t.TempDir() cfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: config.FilesystemTypeBasic, Path: tmpDir1, Versioning: config.VersioningConfiguration{ - FSType: fs.FilesystemTypeBasic, + FSType: config.FilesystemTypeBasic, FSPath: tmpDir2, }, } @@ -200,7 +200,7 @@ func TestTrashcanCleanOut(t *testing.T) { testDir := t.TempDir() cfg := config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: config.FilesystemTypeBasic, Path: testDir, Versioning: config.VersioningConfiguration{ Params: map[string]string{ diff --git a/lib/versioner/util.go b/lib/versioner/util.go index a0bcfba1e7e..4693d1d9c33 100644 --- a/lib/versioner/util.go +++ b/lib/versioner/util.go @@ -262,7 +262,7 @@ func versionerFsFromFolderCfg(cfg config.FolderConfiguration) (versionsFs fs.Fil folderFs := cfg.Filesystem(nil) if cfg.Versioning.FSPath == "" { versionsFs = fs.NewFilesystem(folderFs.Type(), filepath.Join(folderFs.URI(), DefaultPath)) - } else if cfg.Versioning.FSType == fs.FilesystemTypeBasic { + } else if cfg.Versioning.FSType == config.FilesystemTypeBasic { // Expand any leading tildes for basic filesystems, // before checking for absolute paths. path, err := fs.ExpandTilde(cfg.Versioning.FSPath) @@ -275,9 +275,9 @@ func versionerFsFromFolderCfg(cfg config.FolderConfiguration) (versionsFs fs.Fil if !filepath.IsAbs(path) { path = filepath.Join(folderFs.URI(), path) } - versionsFs = fs.NewFilesystem(cfg.Versioning.FSType, path) + versionsFs = fs.NewFilesystem(cfg.Versioning.FSType.ToFS(), path) } else { - versionsFs = fs.NewFilesystem(cfg.Versioning.FSType, cfg.Versioning.FSPath) + versionsFs = fs.NewFilesystem(cfg.Versioning.FSType.ToFS(), cfg.Versioning.FSPath) } l.Debugf("%s (%s) folder using %s (%s) versioner dir", folderFs.URI(), folderFs.Type(), versionsFs.URI(), versionsFs.Type()) return diff --git a/lib/watchaggregator/aggregator_test.go b/lib/watchaggregator/aggregator_test.go index 11e7c51a0cd..681c372f872 100644 --- a/lib/watchaggregator/aggregator_test.go +++ b/lib/watchaggregator/aggregator_test.go @@ -42,7 +42,7 @@ const ( var ( folderRoot = filepath.Clean("/home/someuser/syncthing") defaultFolderCfg = config.FolderConfiguration{ - FilesystemType: fs.FilesystemTypeBasic, + FilesystemType: config.FilesystemTypeBasic, Path: folderRoot, FSWatcherDelayS: testNotifyDelayS, } diff --git a/proto/apiproto/tokenset.proto b/proto/apiproto/tokenset.proto new file mode 100644 index 00000000000..f247f4abc73 --- /dev/null +++ b/proto/apiproto/tokenset.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +package apiproto; + +message TokenSet { + // token -> expiry time (epoch nanoseconds) + map tokens = 1; +} diff --git a/proto/bep/bep.proto b/proto/bep/bep.proto new file mode 100644 index 00000000000..c1dac02be9d --- /dev/null +++ b/proto/bep/bep.proto @@ -0,0 +1,253 @@ +syntax = "proto3"; + +package bep; + +// --- Pre-auth --- + +message Hello { + string device_name = 1; + string client_name = 2; + string client_version = 3; + int32 num_connections = 4; + int64 timestamp = 5; +} + +// --- Header --- + +message Header { + MessageType type = 1; + MessageCompression compression = 2; +} + +enum MessageType { + MESSAGE_TYPE_CLUSTER_CONFIG = 0; + MESSAGE_TYPE_INDEX = 1; + MESSAGE_TYPE_INDEX_UPDATE = 2; + MESSAGE_TYPE_REQUEST = 3; + MESSAGE_TYPE_RESPONSE = 4; + MESSAGE_TYPE_DOWNLOAD_PROGRESS = 5; + MESSAGE_TYPE_PING = 6; + MESSAGE_TYPE_CLOSE = 7; +} + +enum MessageCompression { + MESSAGE_COMPRESSION_NONE = 0; + MESSAGE_COMPRESSION_LZ4 = 1; +} + +// --- Actual messages --- + +// Cluster Config + +message ClusterConfig { + repeated Folder folders = 1; + bool secondary = 2; +} + +message Folder { + string id = 1; + string label = 2; + bool read_only = 3; + bool ignore_permissions = 4; + bool ignore_delete = 5; + bool disable_temp_indexes = 6; + bool paused = 7; + + repeated Device devices = 16; +} + +message Device { + bytes id = 1; + string name = 2; + repeated string addresses = 3; + Compression compression = 4; + string cert_name = 5; + int64 max_sequence = 6; + bool introducer = 7; + uint64 index_id = 8; + bool skip_introduction_removals = 9; + bytes encryption_password_token = 10; +} + +enum Compression { + COMPRESSION_METADATA = 0; + COMPRESSION_NEVER = 1; + COMPRESSION_ALWAYS = 2; +} + +// Index and Index Update + +message Index { + string folder = 1; + repeated FileInfo files = 2; + int64 last_sequence = 3; // the highest sequence in this batch +} + +message IndexUpdate { + string folder = 1; + repeated FileInfo files = 2; + int64 last_sequence = 3; // the highest sequence in this batch + int64 prev_sequence = 4; // the highest sequence in the previous batch +} + +message FileInfo { + // The field ordering here optimizes for struct size / alignment -- + // large types come before smaller ones. + + string name = 1; + int64 size = 3; + int64 modified_s = 5; + uint64 modified_by = 12; + Vector version = 9; + int64 sequence = 10; + repeated BlockInfo blocks = 16; + string symlink_target = 17; + bytes blocks_hash = 18; + bytes encrypted = 19; + FileInfoType type = 2; + uint32 permissions = 4; + int32 modified_ns = 11; + int32 block_size = 13; + PlatformData platform = 14; + + // The local_flags fields stores flags that are relevant to the local + // host only. It is not part of the protocol, doesn't get sent or + // received (we make sure to zero it), nonetheless we need it on our + // struct and to be able to serialize it to/from the database. + uint32 local_flags = 1000; + + // The version_hash is an implementation detail and not part of the wire + // format. + bytes version_hash = 1001; + + // The time when the inode was last changed (i.e., permissions, xattrs + // etc changed). This is host-local, not sent over the wire. + int64 inode_change_ns = 1002; + + // The size of the data appended to the encrypted file on disk. This is + // host-local, not sent over the wire. + int32 encryption_trailer_size = 1003; + + bool deleted = 6; + bool invalid = 7; + bool no_permissions = 8; +} + +enum FileInfoType { + FILE_INFO_TYPE_FILE = 0; + FILE_INFO_TYPE_DIRECTORY = 1; + FILE_INFO_TYPE_SYMLINK_FILE = 2 [deprecated = true]; + FILE_INFO_TYPE_SYMLINK_DIRECTORY = 3 [deprecated = true]; + FILE_INFO_TYPE_SYMLINK = 4; +} + +message BlockInfo { + bytes hash = 3; + int64 offset = 1; + int32 size = 2; + uint32 weak_hash = 4; +} + +message Vector { + repeated Counter counters = 1; +} + +message Counter { + uint64 id = 1; + uint64 value = 2; +} + +message PlatformData { + UnixData unix = 1; + WindowsData windows = 2; + XattrData linux = 3; + XattrData darwin = 4; + XattrData freebsd = 5; + XattrData netbsd = 6; +} + +message UnixData { + // The owner name and group name are set when known (i.e., could be + // resolved on the source device), while the UID and GID are always set + // as they come directly from the stat() call. + string owner_name = 1; + string group_name = 2; + int32 uid = 3; + int32 gid = 4; +} + +message WindowsData { + // Windows file objects have a single owner, which may be a user or a + // group. We keep the name of that account, and a flag to indicate what + // type it is. + string owner_name = 1; + bool owner_is_group = 2; +} + +message XattrData { + repeated Xattr xattrs = 1; +} + +message Xattr { + string name = 1; + bytes value = 2; +} + +// Request + +message Request { + int32 id = 1; + string folder = 2; + string name = 3; + int64 offset = 4; + int32 size = 5; + bytes hash = 6; + bool from_temporary = 7; + uint32 weak_hash = 8; + int32 block_no = 9; +} + +// Response + +message Response { + int32 id = 1; + bytes data = 2; + ErrorCode code = 3; +} + +enum ErrorCode { + ERROR_CODE_NO_ERROR = 0; + ERROR_CODE_GENERIC = 1; + ERROR_CODE_NO_SUCH_FILE = 2; + ERROR_CODE_INVALID_FILE = 3; +} + +// DownloadProgress + +message DownloadProgress { + string folder = 1; + repeated FileDownloadProgressUpdate updates = 2; +} + +message FileDownloadProgressUpdate { + FileDownloadProgressUpdateType update_type = 1; + string name = 2; + Vector version = 3; + repeated int32 block_indexes = 4 [packed = false]; + int32 block_size = 5; +} + +enum FileDownloadProgressUpdateType { + FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND = 0; + FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_FORGET = 1; +} + +// Ping + +message Ping {} + +// Close + +message Close { + string reason = 1; +} diff --git a/proto/dbproto/structs.proto b/proto/dbproto/structs.proto new file mode 100644 index 00000000000..bc49b407903 --- /dev/null +++ b/proto/dbproto/structs.proto @@ -0,0 +1,103 @@ +syntax = "proto3"; + +package dbproto; + +import "bep/bep.proto"; +import "google/protobuf/timestamp.proto"; + + +// Same as bep.FileInfo, but without blocks +message FileInfoTruncated { + string name = 1; + int64 size = 3; + int64 modified_s = 5; + uint64 modified_by = 12; + bep.Vector version = 9; + int64 sequence = 10; + reserved 16; // blocks + string symlink_target = 17; + bytes blocks_hash = 18; + bytes encrypted = 19; + bep.FileInfoType type = 2; + uint32 permissions = 4; + int32 modified_ns = 11; + int32 block_size = 13; + bep.PlatformData platform = 14; + + // The local_flags fields stores flags that are relevant to the local + // host only. It is not part of the protocol, doesn't get sent or + // received (we make sure to zero it), nonetheless we need it on our + // struct and to be able to serialize it to/from the database. + uint32 local_flags = 1000; + + // The version_hash is an implementation detail and not part of the wire + // format. + bytes version_hash = 1001; + + // The time when the inode was last changed (i.e., permissions, xattrs + // etc changed). This is host-local, not sent over the wire. + int64 inode_change_ns = 1002; + + // The size of the data appended to the encrypted file on disk. This is + // host-local, not sent over the wire. + int32 encryption_trailer_size = 1003; + + bool deleted = 6; + bool invalid = 7; + bool no_permissions = 8; +} + + +message FileVersion { + bep.Vector version = 1; + bool deleted = 2; + repeated bytes devices = 3; + repeated bytes invalid_devices = 4; +} + +message VersionList { + repeated FileVersion versions = 1; +} + +// BlockList is the structure used to store block lists +message BlockList { + repeated bep.BlockInfo blocks = 1; +} + +// IndirectionHashesOnly is used to only unmarshal the indirection hashes +// from a FileInfo +message IndirectionHashesOnly { + bytes blocks_hash = 18; + bytes version_hash = 1001; +} + +// For each folder and device we keep one of these to track the current +// counts and sequence. We also keep one for the global state of the folder. +message Counts { + int32 files = 1; + int32 directories = 2; + int32 symlinks = 3; + int32 deleted = 4; + int64 bytes = 5; + int64 sequence = 6; // zero for the global state + bytes device_id = 17; // device ID for remote devices, or special values for local/global + uint32 local_flags = 18; // the local flag for this count bucket +} + +message CountsSet { + repeated Counts counts = 1; + int64 created = 2; // unix nanos +} + +message ObservedFolder { + google.protobuf.Timestamp time = 1; + string label = 2; + bool receive_encrypted = 3; + bool remote_encrypted = 4; +} + +message ObservedDevice { + google.protobuf.Timestamp time = 1; + string name = 2; + string address = 3; +} diff --git a/proto/discoproto/local.proto b/proto/discoproto/local.proto new file mode 100644 index 00000000000..e7117adb4f2 --- /dev/null +++ b/proto/discoproto/local.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package discoproto; + +message Announce { + bytes id = 1; + repeated string addresses = 2; + int64 instance_id = 3; +} diff --git a/proto/discosrv/discosrv.proto b/proto/discosrv/discosrv.proto new file mode 100644 index 00000000000..018fff07a31 --- /dev/null +++ b/proto/discosrv/discosrv.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; + +package discosrv; + +message DatabaseRecord { + repeated DatabaseAddress addresses = 1; + int64 seen = 3; // Unix nanos, last device announce +} + +message ReplicationRecord { + bytes key = 1; // raw 32 byte device ID + repeated DatabaseAddress addresses = 2; + int64 seen = 3; // Unix nanos, last device announce +} + +message DatabaseAddress { + string address = 1; + int64 expires = 2; // Unix nanos +} diff --git a/proto/ext.proto b/proto/ext.proto deleted file mode 100644 index db2cc7eb3c5..00000000000 --- a/proto/ext.proto +++ /dev/null @@ -1,26 +0,0 @@ -syntax = "proto2"; - -package ext; - -import "google/protobuf/descriptor.proto"; - -option go_package = "github.com/syncthing/syncthing/proto/ext"; - -extend google.protobuf.MessageOptions { - optional bool xml_tags = 74001; -} - -extend google.protobuf.FieldOptions { - optional string xml = 75005; - optional string json = 75006; - optional string default = 75007; - optional bool restart = 75008; - optional bool device_id = 75009; - optional string goname = 75010; - optional string gotype = 75011; - optional bool nodefault = 75012; -} - -extend google.protobuf.EnumValueOptions { - optional string enumgoname = 76010; -} diff --git a/proto/ext/ext.pb.go b/proto/ext/ext.pb.go deleted file mode 100644 index 2d1be028e4b..00000000000 --- a/proto/ext/ext.pb.go +++ /dev/null @@ -1,152 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ext.proto - -package ext - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -var E_XmlTags = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.MessageOptions)(nil), - ExtensionType: (*bool)(nil), - Field: 74001, - Name: "ext.xml_tags", - Tag: "varint,74001,opt,name=xml_tags", - Filename: "ext.proto", -} - -var E_Xml = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.FieldOptions)(nil), - ExtensionType: (*string)(nil), - Field: 75005, - Name: "ext.xml", - Tag: "bytes,75005,opt,name=xml", - Filename: "ext.proto", -} - -var E_Json = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.FieldOptions)(nil), - ExtensionType: (*string)(nil), - Field: 75006, - Name: "ext.json", - Tag: "bytes,75006,opt,name=json", - Filename: "ext.proto", -} - -var E_Default = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.FieldOptions)(nil), - ExtensionType: (*string)(nil), - Field: 75007, - Name: "ext.default", - Tag: "bytes,75007,opt,name=default", - Filename: "ext.proto", -} - -var E_Restart = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.FieldOptions)(nil), - ExtensionType: (*bool)(nil), - Field: 75008, - Name: "ext.restart", - Tag: "varint,75008,opt,name=restart", - Filename: "ext.proto", -} - -var E_DeviceId = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.FieldOptions)(nil), - ExtensionType: (*bool)(nil), - Field: 75009, - Name: "ext.device_id", - Tag: "varint,75009,opt,name=device_id", - Filename: "ext.proto", -} - -var E_Goname = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.FieldOptions)(nil), - ExtensionType: (*string)(nil), - Field: 75010, - Name: "ext.goname", - Tag: "bytes,75010,opt,name=goname", - Filename: "ext.proto", -} - -var E_Gotype = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.FieldOptions)(nil), - ExtensionType: (*string)(nil), - Field: 75011, - Name: "ext.gotype", - Tag: "bytes,75011,opt,name=gotype", - Filename: "ext.proto", -} - -var E_Nodefault = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.FieldOptions)(nil), - ExtensionType: (*bool)(nil), - Field: 75012, - Name: "ext.nodefault", - Tag: "varint,75012,opt,name=nodefault", - Filename: "ext.proto", -} - -var E_Enumgoname = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.EnumValueOptions)(nil), - ExtensionType: (*string)(nil), - Field: 76010, - Name: "ext.enumgoname", - Tag: "bytes,76010,opt,name=enumgoname", - Filename: "ext.proto", -} - -func init() { - proto.RegisterExtension(E_XmlTags) - proto.RegisterExtension(E_Xml) - proto.RegisterExtension(E_Json) - proto.RegisterExtension(E_Default) - proto.RegisterExtension(E_Restart) - proto.RegisterExtension(E_DeviceId) - proto.RegisterExtension(E_Goname) - proto.RegisterExtension(E_Gotype) - proto.RegisterExtension(E_Nodefault) - proto.RegisterExtension(E_Enumgoname) -} - -func init() { proto.RegisterFile("ext.proto", fileDescriptor_95fe6908ffcf64d3) } - -var fileDescriptor_95fe6908ffcf64d3 = []byte{ - // 332 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xd2, 0x4d, 0x4b, 0xfb, 0x30, - 0x1c, 0xc0, 0x71, 0xca, 0xc6, 0x7f, 0x6b, 0x8e, 0x3b, 0xfd, 0x11, 0x9c, 0xf3, 0xb6, 0x53, 0x8b, - 0x08, 0x8a, 0x61, 0x5e, 0x14, 0x05, 0x0f, 0x22, 0x0c, 0xf1, 0xe0, 0x65, 0x64, 0xed, 0x6f, 0x59, - 0x24, 0x0f, 0xa5, 0x49, 0xa5, 0xbb, 0xf9, 0xf4, 0x06, 0x7c, 0x4b, 0x9e, 0x74, 0x27, 0x7d, 0x07, - 0xb2, 0xa3, 0xef, 0xc1, 0x07, 0xba, 0xa6, 0x6e, 0xb0, 0x43, 0xbc, 0x95, 0xf2, 0xfd, 0x24, 0xbf, - 0x84, 0x20, 0x1f, 0x72, 0x13, 0x24, 0xa9, 0x32, 0xaa, 0x55, 0x83, 0xdc, 0xac, 0x75, 0xa8, 0x52, - 0x94, 0x43, 0x38, 0xff, 0x35, 0xcc, 0x46, 0x61, 0x0c, 0x3a, 0x4a, 0x59, 0x62, 0x54, 0x5a, 0x66, - 0xb8, 0x87, 0x9a, 0xb9, 0xe0, 0x03, 0x43, 0xa8, 0x6e, 0x6d, 0x04, 0x65, 0x1e, 0x54, 0x79, 0x70, - 0x0a, 0x5a, 0x13, 0x0a, 0x67, 0x89, 0x61, 0x4a, 0xea, 0xff, 0x8f, 0x4f, 0xf5, 0x8e, 0xd7, 0x6d, - 0xf6, 0x1b, 0xb9, 0xe0, 0xe7, 0x84, 0x6a, 0xbc, 0x85, 0x6a, 0xb9, 0xe0, 0xad, 0xf5, 0x15, 0x78, - 0xcc, 0x80, 0xc7, 0x15, 0xfb, 0x7c, 0x29, 0x98, 0xdf, 0x2f, 0x5a, 0xbc, 0x8d, 0xea, 0x57, 0x5a, - 0x49, 0x97, 0xf9, 0xb2, 0x66, 0x1e, 0xe3, 0x3d, 0xd4, 0x88, 0x61, 0x44, 0x32, 0x6e, 0x5c, 0xee, - 0xdb, 0xba, 0xaa, 0x2f, 0x68, 0x0a, 0xda, 0x90, 0xd4, 0x49, 0x6f, 0xa6, 0xf6, 0x74, 0xb6, 0xc7, - 0x3d, 0xe4, 0xc7, 0x70, 0xcd, 0x22, 0x18, 0xb0, 0xd8, 0x85, 0x6f, 0x2d, 0x6e, 0x96, 0xe2, 0x24, - 0xc6, 0xbb, 0xe8, 0x1f, 0x55, 0x92, 0x08, 0x70, 0xd1, 0xbb, 0x69, 0x39, 0xb2, 0xcd, 0x4b, 0x68, - 0x26, 0x89, 0x13, 0xde, 0x2f, 0x60, 0x91, 0xe3, 0x7d, 0xe4, 0x4b, 0xf5, 0xc7, 0x7b, 0x7a, 0xb0, - 0xf3, 0x2e, 0x04, 0x3e, 0x44, 0x08, 0x64, 0x26, 0xec, 0xd0, 0x9b, 0x2b, 0xfe, 0x48, 0x66, 0xe2, - 0x82, 0xf0, 0xec, 0xf7, 0x39, 0x7c, 0xbc, 0x95, 0xfb, 0x2f, 0xb1, 0x83, 0x9d, 0xe7, 0x59, 0xdb, - 0x7b, 0x9d, 0xb5, 0xbd, 0xf7, 0x59, 0xdb, 0xbb, 0xec, 0x52, 0x66, 0xc6, 0xd9, 0x30, 0x88, 0x94, - 0x08, 0xf5, 0x44, 0x46, 0x66, 0xcc, 0x24, 0x5d, 0xfa, 0x9a, 0xaf, 0x1d, 0x42, 0x6e, 0x7e, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x65, 0x95, 0xf9, 0xeb, 0xba, 0x02, 0x00, 0x00, -} diff --git a/proto/generate.go b/proto/generate.go deleted file mode 100644 index c264868d8be..00000000000 --- a/proto/generate.go +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (C) 2020 The Syncthing Authors. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// You can obtain one at https://mozilla.org/MPL/2.0/. - -//go:build ignore -// +build ignore - -package main - -import ( - "log" - "os" - "os/exec" - "path/filepath" -) - -//go:generate go run scripts/protofmt.go . - -// First generate extensions using standard proto compiler. -//go:generate protoc -I ../ -I . --gogofast_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,paths=source_relative:ext ext.proto - -// Then build our vanity compiler that uses the new extensions -//go:generate go build -o scripts/protoc-gen-gosyncthing scripts/protoc_plugin.go - -// Inception, go generate calls the script itself that then deals with generation. -// This is only done because go:generate does not support wildcards in paths. -//go:generate go run generate.go lib/protocol lib/config lib/fs lib/db lib/discover lib/api - -func main() { - for _, path := range os.Args[1:] { - matches, err := filepath.Glob(filepath.Join(path, "*proto")) - if err != nil { - log.Fatal(err) - } - log.Println(path, "returned:", matches) - args := []string{ - "-I", "..", - "-I", ".", - "--plugin=protoc-gen-gosyncthing=scripts/protoc-gen-gosyncthing", - "--gosyncthing_out=paths=source_relative:..", - } - args = append(args, matches...) - cmd := exec.Command("protoc", args...) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - if err := cmd.Run(); err != nil { - log.Fatal("Failed generating", path) - } - } -} diff --git a/proto/lib/api/tokenset.proto b/proto/lib/api/tokenset.proto deleted file mode 100644 index bf3ff084296..00000000000 --- a/proto/lib/api/tokenset.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -package api; - -message TokenSet { - // token -> expiry time (epoch nanoseconds) - map tokens = 1; -} diff --git a/proto/lib/config/authmode.proto b/proto/lib/config/authmode.proto deleted file mode 100644 index c045385f6ab..00000000000 --- a/proto/lib/config/authmode.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -package config; - -import "repos/protobuf/gogoproto/gogo.proto"; - -import "ext.proto"; - -enum AuthMode { - option (gogoproto.goproto_enum_stringer) = false; - - AUTH_MODE_STATIC = 0; - AUTH_MODE_LDAP = 1 [(ext.enumgoname) = "AuthModeLDAP"]; -} diff --git a/proto/lib/config/blockpullorder.proto b/proto/lib/config/blockpullorder.proto deleted file mode 100644 index a80cb6b4a84..00000000000 --- a/proto/lib/config/blockpullorder.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -package config; - -import "repos/protobuf/gogoproto/gogo.proto"; - -enum BlockPullOrder { - option (gogoproto.goproto_enum_stringer) = false; - - BLOCK_PULL_ORDER_STANDARD = 0; - BLOCK_PULL_ORDER_RANDOM = 1; - BLOCK_PULL_ORDER_IN_ORDER = 2; -} diff --git a/proto/lib/config/config.proto b/proto/lib/config/config.proto deleted file mode 100644 index 6f447bb2052..00000000000 --- a/proto/lib/config/config.proto +++ /dev/null @@ -1,34 +0,0 @@ -syntax = "proto3"; - -package config; - -import "lib/config/folderconfiguration.proto"; -import "lib/config/deviceconfiguration.proto"; -import "lib/config/guiconfiguration.proto"; -import "lib/config/ldapconfiguration.proto"; -import "lib/config/optionsconfiguration.proto"; -import "lib/config/observed.proto"; - -import "ext.proto"; - -message Configuration { - int32 version = 1 [(ext.xml) = "version,attr"]; - repeated FolderConfiguration folders = 2; - repeated DeviceConfiguration devices = 3; - GUIConfiguration gui = 4 [(ext.goname) = "GUI"]; - LDAPConfiguration ldap = 5 [(ext.goname) = "LDAP"]; - OptionsConfiguration options = 6; - repeated ObservedDevice ignored_devices = 7 [(ext.json) = "remoteIgnoredDevices", (ext.xml) = "remoteIgnoredDevice"]; - repeated ObservedDevice pending_devices = 8 [deprecated=true]; - Defaults defaults = 9; -} - -message Defaults { - FolderConfiguration folder = 1; - DeviceConfiguration device = 2; - Ignores ignores = 3; -} - -message Ignores { - repeated string lines = 1; -} diff --git a/proto/lib/config/deviceconfiguration.proto b/proto/lib/config/deviceconfiguration.proto deleted file mode 100644 index 46afeed80c9..00000000000 --- a/proto/lib/config/deviceconfiguration.proto +++ /dev/null @@ -1,30 +0,0 @@ -syntax = "proto3"; - -package config; - -import "lib/protocol/bep.proto"; -import "lib/config/observed.proto"; - -import "ext.proto"; - -message DeviceConfiguration { - bytes device_id = 1 [(ext.goname) = "DeviceID", (ext.xml) = "id,attr", (ext.json) = "deviceID", (ext.device_id) = true, (ext.nodefault) = true]; - string name = 2 [(ext.xml) = "name,attr,omitempty"]; - repeated string addresses = 3 [(ext.xml) = "address,omitempty"]; - protocol.Compression compression = 4 [(ext.xml) = "compression,attr"]; - string cert_name = 5 [(ext.xml) = "certName,attr,omitempty"]; - bool introducer = 6 [(ext.xml) = "introducer,attr"]; - bool skip_introduction_removals = 7 [(ext.xml) = "skipIntroductionRemovals,attr"]; - bytes introduced_by = 8 [(ext.xml) = "introducedBy,attr", (ext.device_id) = true, (ext.nodefault) = true]; - bool paused = 9; - repeated string allowed_networks = 10 [(ext.xml) = "allowedNetwork,omitempty"]; - bool auto_accept_folders = 11; - int32 max_send_kbps = 12; - int32 max_recv_kbps = 13; - repeated ObservedFolder ignored_folders = 14; - repeated ObservedFolder pending_folders = 15 [deprecated = true]; - int32 max_request_kib = 16 [(ext.goname) = "MaxRequestKiB", (ext.xml) = "maxRequestKiB", (ext.json) = "maxRequestKiB"]; - bool untrusted = 17; - int32 remote_gui_port = 18 [(ext.goname) = "RemoteGUIPort", (ext.xml) = "remoteGUIPort", (ext.json) = "remoteGUIPort"]; - int32 num_connections = 19 [(ext.goname) = "RawNumConnections"]; // attempt to establish this many connections to the device -} diff --git a/proto/lib/config/folderconfiguration.proto b/proto/lib/config/folderconfiguration.proto deleted file mode 100644 index 896992f7bfc..00000000000 --- a/proto/lib/config/folderconfiguration.proto +++ /dev/null @@ -1,86 +0,0 @@ -syntax = "proto3"; - -package config; - -import "lib/config/foldertype.proto"; -import "lib/config/size.proto"; -import "lib/config/pullorder.proto"; -import "lib/config/versioningconfiguration.proto"; -import "lib/config/blockpullorder.proto"; - -import "lib/fs/types.proto"; -import "lib/fs/copyrangemethod.proto"; - -import "ext.proto"; - -message FolderDeviceConfiguration { - bytes device_id = 1 [(ext.goname) = "DeviceID", (ext.xml) = "id,attr", (ext.json) = "deviceID", (ext.device_id) = true]; - bytes introduced_by = 2 [(ext.xml) = "introducedBy,attr", (ext.device_id) = true]; - string encryption_password = 3; -} - -message FolderConfiguration { - string id = 1 [(ext.goname) = "ID", (ext.xml) = "id,attr", (ext.nodefault) = true]; - string label = 2 [(ext.xml) = "label,attr", (ext.restart) = false]; - fs.FilesystemType filesystem_type = 3; - string path = 4 [(ext.xml) = "path,attr", (ext.default) = "~"]; - FolderType type = 5 [(ext.xml) = "type,attr"]; - repeated FolderDeviceConfiguration devices = 6; - int32 rescan_interval_s = 7 [(ext.xml) = "rescanIntervalS,attr", (ext.default) = "3600"]; - bool fs_watcher_enabled = 8 [(ext.goname) = "FSWatcherEnabled", (ext.xml) = "fsWatcherEnabled,attr", (ext.default) = "true"]; - double fs_watcher_delay_s = 9 [(ext.goname) = "FSWatcherDelayS", (ext.xml) = "fsWatcherDelayS,attr", (ext.default) = "10"]; - double fs_watcher_timeout_s = 40 [(ext.goname) = "FSWatcherTimeoutS", (ext.xml) = "fsWatcherTimeoutS,attr"]; - bool ignore_perms = 10 [(ext.xml) = "ignorePerms,attr"]; - bool auto_normalize = 11 [(ext.xml) = "autoNormalize,attr", (ext.default) = "true"]; - Size min_disk_free = 12 [(ext.default) = "1 %"]; - VersioningConfiguration versioning = 13; - int32 copiers = 14; - int32 puller_max_pending_kib = 15 [(ext.goname) = "PullerMaxPendingKiB", (ext.xml) = "pullerMaxPendingKiB", (ext.json) = "pullerMaxPendingKiB"]; - int32 hashers = 16; - PullOrder order = 17; - bool ignore_delete = 18; - int32 scan_progress_interval_s = 19; - int32 puller_pause_s = 20; - int32 max_conflicts = 21 [(ext.default) = "10"]; - bool disable_sparse_files = 22; - bool disable_temp_indexes = 23; - bool paused = 24; - int32 weak_hash_threshold_pct = 25; - string marker_name = 26; - bool copy_ownership_from_parent = 27; - int32 mod_time_window_s = 28 [(ext.goname) = "RawModTimeWindowS"]; - int32 max_concurrent_writes = 29 [(ext.default) = "2"]; - bool disable_fsync = 30; - BlockPullOrder block_pull_order = 31; - fs.CopyRangeMethod copy_range_method = 32 [(ext.default) = "standard"]; - bool case_sensitive_fs = 33 [(ext.goname) = "CaseSensitiveFS", (ext.xml) = "caseSensitiveFS", (ext.json) = "caseSensitiveFS"]; - bool follow_junctions = 34 [(ext.goname) = "JunctionsAsDirs", (ext.xml) = "junctionsAsDirs", (ext.json) = "junctionsAsDirs"]; - bool sync_ownership = 35; - bool send_ownership = 36; - bool sync_xattrs = 37; - bool send_xattrs = 38; - XattrFilter xattr_filter = 39; - - // Legacy deprecated - bool read_only = 9000 [deprecated=true, (ext.xml) = "ro,attr,omitempty"]; - double min_disk_free_pct = 9001 [deprecated=true]; - int32 pullers = 9002 [deprecated=true]; - bool scan_ownership = 9003 [deprecated=true]; -} - -// Extended attribute filter. This is a list of patterns to match (glob -// style), each with an action (permit or deny). First match is used. If the -// filter is empty, all strings are permitted. If the filter is non-empty, -// the default action becomes deny. To counter this, you can use the "*" -// pattern to match all strings at the end of the filter. There are also -// limits on the size of accepted attributes. -message XattrFilter { - repeated XattrFilterEntry entries = 1 [(ext.xml) = "entry"]; - int32 max_single_entry_size = 2 [(ext.xml) = "maxSingleEntrySize", (ext.default) = "1024"]; - int32 max_total_size = 3 [(ext.xml) = "maxTotalSize", (ext.default) = "4096"]; -} - -message XattrFilterEntry { - string match = 1 [(ext.xml) = "match,attr"]; - bool permit = 2 [(ext.xml) = "permit,attr"]; -} diff --git a/proto/lib/config/foldertype.proto b/proto/lib/config/foldertype.proto deleted file mode 100644 index 18f19b020df..00000000000 --- a/proto/lib/config/foldertype.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -package config; - -import "repos/protobuf/gogoproto/gogo.proto"; - -enum FolderType { - option (gogoproto.goproto_enum_stringer) = false; - - FOLDER_TYPE_SEND_RECEIVE = 0; - FOLDER_TYPE_SEND_ONLY = 1; - FOLDER_TYPE_RECEIVE_ONLY = 2; - FOLDER_TYPE_RECEIVE_ENCRYPTED = 3; -} diff --git a/proto/lib/config/guiconfiguration.proto b/proto/lib/config/guiconfiguration.proto deleted file mode 100644 index c636bb11a9d..00000000000 --- a/proto/lib/config/guiconfiguration.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; - -package config; - -import "lib/config/authmode.proto"; - -import "ext.proto"; - -message GUIConfiguration { - bool enabled = 1 [(ext.xml) = "enabled,attr", (ext.default) = "true"]; - string address = 2 [(ext.goname) = "RawAddress", (ext.default) = "127.0.0.1:8384"]; - string unix_socket_permissions = 3 [(ext.goname) = "RawUnixSocketPermissions", (ext.xml) = "unixSocketPermissions,omitempty"]; - string user = 4 [(ext.xml) = "user,omitempty"]; - string password = 5 [(ext.xml) = "password,omitempty"]; - AuthMode auth_mode = 6 [(ext.xml) = "authMode,omitempty"]; - bool use_tls = 7 [(ext.goname) = "RawUseTLS", (ext.xml) = "tls,attr", (ext.json) = "useTLS"]; - string api_key = 8 [(ext.goname) = "APIKey", (ext.xml) = "apikey,omitempty"]; - bool insecure_admin_access = 9 [(ext.xml) = "insecureAdminAccess,omitempty"]; - string theme = 10 [(ext.default) = "default"]; - bool debugging = 11 [(ext.xml) = "debugging,attr"]; - bool insecure_skip_host_check = 12 [(ext.xml) = "insecureSkipHostcheck,omitempty", (ext.json) = "insecureSkipHostcheck"]; - bool insecure_allow_frame_loading = 13 [(ext.xml) = "insecureAllowFrameLoading,omitempty"]; - bool send_basic_auth_prompt = 14 [(ext.xml) = "sendBasicAuthPrompt,attr"]; -} diff --git a/proto/lib/config/ldapconfiguration.proto b/proto/lib/config/ldapconfiguration.proto deleted file mode 100644 index 6ad98966254..00000000000 --- a/proto/lib/config/ldapconfiguration.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -package config; - -import "lib/config/ldaptransport.proto"; - -import "ext.proto"; - - -message LDAPConfiguration { - string address = 1 [(ext.xml) = "address,omitempty"]; - string bind_dn = 2 [(ext.goname) = "BindDN", (ext.xml) = "bindDN,omitempty", (ext.json) = "bindDN"]; - LDAPTransport transport = 3 [(ext.xml) = "transport,omitempty"]; - bool insecure_skip_verify = 4 [(ext.xml) = "insecureSkipVerify,omitempty", (ext.default) = "false"]; - string search_base_dn = 5 [(ext.goname) = "SearchBaseDN", (ext.xml) = "searchBaseDN,omitempty", (ext.json) = "searchBaseDN"]; - string search_filter = 6 [(ext.xml) = "searchFilter,omitempty"]; -} diff --git a/proto/lib/config/ldaptransport.proto b/proto/lib/config/ldaptransport.proto deleted file mode 100644 index 938f65e9079..00000000000 --- a/proto/lib/config/ldaptransport.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -package config; - -import "repos/protobuf/gogoproto/gogo.proto"; - -import "ext.proto"; - -enum LDAPTransport { - option (gogoproto.goproto_enum_stringer) = false; - - LDAP_TRANSPORT_PLAIN = 0 [(ext.enumgoname) = "LDAPTransportPlain"]; - LDAP_TRANSPORT_TLS = 2 [(ext.enumgoname) = "LDAPTransportTLS"]; - LDAP_TRANSPORT_START_TLS = 3 [(ext.enumgoname) = "LDAPTransportStartTLS"]; -} diff --git a/proto/lib/config/observed.proto b/proto/lib/config/observed.proto deleted file mode 100644 index a1b44bcf725..00000000000 --- a/proto/lib/config/observed.proto +++ /dev/null @@ -1,20 +0,0 @@ -syntax = "proto3"; - -package config; - -import "google/protobuf/timestamp.proto"; - -import "ext.proto"; - -message ObservedFolder { - google.protobuf.Timestamp time = 1 [(ext.xml) = "time,attr"]; - string id = 2 [(ext.goname) = "ID", (ext.xml) = "id,attr"]; - string label = 3 [(ext.xml) = "label,attr"]; -} - -message ObservedDevice { - google.protobuf.Timestamp time = 1 [(ext.xml) = "time,attr"]; - bytes id = 2 [(ext.goname) = "ID", (ext.json) = "deviceID", (ext.xml) = "id,attr", (ext.device_id) = true]; - string name = 3 [(ext.xml) = "name,attr"]; - string address = 4 [(ext.xml) = "address,attr"]; -} diff --git a/proto/lib/config/optionsconfiguration.proto b/proto/lib/config/optionsconfiguration.proto deleted file mode 100644 index 0e24746957c..00000000000 --- a/proto/lib/config/optionsconfiguration.proto +++ /dev/null @@ -1,88 +0,0 @@ -syntax = "proto3"; - -package config; - -import "lib/config/tuning.proto"; -import "lib/config/size.proto"; - -import "ext.proto"; - -message OptionsConfiguration { - repeated string listen_addresses = 1 [(ext.goname) = "RawListenAddresses", (ext.default) = "default"]; - repeated string global_discovery_servers = 2 [(ext.goname) = "RawGlobalAnnServers", (ext.xml) = "globalAnnounceServer", (ext.json) = "globalAnnounceServers", (ext.default) = "default"]; - bool global_discovery_enabled = 3 [(ext.goname) = "GlobalAnnEnabled", (ext.xml) = "globalAnnounceEnabled", (ext.json) = "globalAnnounceEnabled", (ext.default) = "true"]; - bool local_discovery_enabled = 4 [(ext.goname) = "LocalAnnEnabled", (ext.xml) = "localAnnounceEnabled", (ext.json) = "localAnnounceEnabled", (ext.default) = "true"]; - int32 local_announce_port = 5 [(ext.goname) = "LocalAnnPort", (ext.xml) = "localAnnouncePort", (ext.json) = "localAnnouncePort", (ext.default) = "21027"]; - string local_announce_multicast_address = 6 [(ext.goname) = "LocalAnnMCAddr", (ext.xml) = "localAnnounceMCAddr", (ext.json) = "localAnnounceMCAddr", (ext.default) = "[ff12::8384]:21027"]; - int32 max_send_kbps = 7; - int32 max_recv_kbps = 8; - int32 reconnection_interval_s = 9 [(ext.goname) = "ReconnectIntervalS", (ext.default) = "60"]; - bool relays_enabled = 10 [(ext.default) = "true"]; - int32 relays_reconnect_interval_m = 11 [(ext.goname) = "RelayReconnectIntervalM", (ext.xml) = "relayReconnectIntervalM", (ext.json) = "relayReconnectIntervalM", (ext.default) = "10"]; - bool start_browser = 12 [(ext.default) = "true"]; - bool nat_traversal_enabled = 14 [(ext.goname) = "NATEnabled", (ext.xml) = "natEnabled", (ext.json) = "natEnabled", (ext.default) = "true"]; - int32 nat_traversal_lease_m = 15 [(ext.goname) = "NATLeaseM", (ext.xml) = "natLeaseMinutes", (ext.json) = "natLeaseMinutes", (ext.default) = "60"]; - int32 nat_traversal_renewal_m = 16 [(ext.goname) = "NATRenewalM", (ext.xml) = "natRenewalMinutes", (ext.json) = "natRenewalMinutes", (ext.default) = "30"]; - int32 nat_traversal_timeout_s = 17 [(ext.goname) = "NATTimeoutS", (ext.xml) = "natTimeoutSeconds", (ext.json) = "natTimeoutSeconds", (ext.default) = "10"]; - int32 usage_reporting_accepted = 18 [(ext.goname) = "URAccepted", (ext.xml) = "urAccepted", (ext.json) = "urAccepted"]; - int32 usage_reporting_seen = 19 [(ext.goname) = "URSeen", (ext.xml) = "urSeen", (ext.json) = "urSeen"]; - string usage_reporting_unique_id = 20 [(ext.goname) = "URUniqueID", (ext.xml) = "urUniqueID", (ext.json) = "urUniqueId"]; - string usage_reporting_url = 21 [(ext.goname) = "URURL", (ext.xml) = "urURL", (ext.json) = "urURL", (ext.default) = "https://data.syncthing.net/newdata"]; - bool usage_reporting_post_insecurely = 22 [(ext.goname) = "URPostInsecurely", (ext.xml) = "urPostInsecurely", (ext.json) = "urPostInsecurely", (ext.default) = "false"]; - int32 usage_reporting_initial_delay_s = 23 [(ext.goname) = "URInitialDelayS", (ext.xml) = "urInitialDelayS", (ext.json) = "urInitialDelayS", (ext.default) = "1800"]; - int32 auto_upgrade_interval_h = 25 [(ext.default) = "12"]; - bool upgrade_to_pre_releases = 26; - int32 keep_temporaries_h = 27 [(ext.default) = "24"]; - bool cache_ignored_files = 28 [(ext.default) = "false"]; - int32 progress_update_interval_s = 29 [(ext.default) = "5"]; - bool limit_bandwidth_in_lan = 30 [(ext.default) = "false"]; - Size min_home_disk_free = 31 [(ext.default) = "1 %"]; - string releases_url = 32 [(ext.goname) = "ReleasesURL", (ext.xml) = "releasesURL", (ext.json) = "releasesURL", (ext.default) = "https://upgrades.syncthing.net/meta.json"]; - repeated string always_local_nets = 33; - bool overwrite_remote_device_names_on_connect = 34 [(ext.goname) = "OverwriteRemoteDevNames", (ext.default) = "false"]; - int32 temp_index_min_blocks = 35 [(ext.default) = "10"]; - repeated string unacked_notification_ids = 36 [(ext.goname) = "UnackedNotificationIDs", (ext.xml) = "unackedNotificationID", (ext.json) = "unackedNotificationIDs"]; - int32 traffic_class = 37; - string default_folder_path = 38 [deprecated = true]; - bool set_low_priority = 39 [(ext.default) = "true"]; - int32 max_folder_concurrency = 40 [(ext.goname) = "RawMaxFolderConcurrency"]; - string crash_reporting_url = 41 [(ext.goname) = "CRURL", (ext.xml) = "crashReportingURL", (ext.json) = "crURL", (ext.default) = "https://crash.syncthing.net/newcrash"]; - bool crash_reporting_enabled = 42 [(ext.goname) = "CREnabled", (ext.default) = "true"]; - int32 stun_keepalive_start_s = 43 [(ext.default) = "180"]; - int32 stun_keepalive_min_s = 44 [(ext.default) = "20"]; - repeated string stun_servers = 45 [(ext.goname) = "RawStunServers", (ext.default) = "default"]; - Tuning database_tuning = 46 [(ext.restart) = true]; - int32 max_concurrent_incoming_request_kib = 47 [(ext.goname) = "RawMaxCIRequestKiB", (ext.xml) = "maxConcurrentIncomingRequestKiB", (ext.json) = "maxConcurrentIncomingRequestKiB"]; - bool announce_lan_addresses = 48 [(ext.goname)= "AnnounceLANAddresses", (ext.xml) = "announceLANAddresses", (ext.json) = "announceLANAddresses", (ext.default) = "true"]; - bool send_full_index_on_upgrade = 49; - repeated string feature_flags = 50; - - // The number of connections at which we stop trying to connect to more - // devices, zero meaning no limit. Does not affect incoming connections. - int32 connection_limit_enough = 51; - - // The maximum number of connections which we will allow in total, zero - // meaning no limit. Affects incoming connections and prevents - // attempting outgoing connections. - int32 connection_limit_max = 52; - - // When set, this allows TLS 1.2 on sync connections, where we otherwise - // default to TLS 1.3+ only. - bool insecure_allow_old_tls_versions = 53 [(ext.goname)= "InsecureAllowOldTLSVersions", (ext.xml) = "insecureAllowOldTLSVersions", (ext.json) = "insecureAllowOldTLSVersions"]; - - int32 connection_priority_tcp_lan = 54 [(ext.default) = "10", (ext.goname) = "ConnectionPriorityTCPLAN"]; - int32 connection_priority_quic_lan = 55 [(ext.default) = "20", (ext.goname) = "ConnectionPriorityQUICLAN"]; - int32 connection_priority_tcp_wan = 56 [(ext.default) = "30", (ext.goname) = "ConnectionPriorityTCPWAN"]; - int32 connection_priority_quic_wan = 57 [(ext.default) = "40", (ext.goname) = "ConnectionPriorityQUICWAN"]; - int32 connection_priority_relay = 58 [(ext.default) = "50"]; - int32 connection_priority_upgrade_threshold = 59 [(ext.default) = "0"]; - - // Legacy deprecated - bool upnp_enabled = 9000 [deprecated = true, (ext.goname) = "DeprecatedUPnPEnabled"]; - int32 upnp_lease_m = 9001 [deprecated = true, (ext.goname) = "DeprecatedUPnPLeaseM", (ext.xml) = "upnpLeaseMinutes,omitempty"]; - int32 upnp_renewal_m = 9002 [deprecated = true, (ext.goname) = "DeprecatedUPnPRenewalM", (ext.xml) = "upnpRenewalMinutes,omitempty"]; - int32 upnp_timeout_s = 9003 [deprecated = true, (ext.goname) = "DeprecatedUPnPTimeoutS", (ext.xml) = "upnpTimeoutSeconds,omitempty"]; - repeated string relay_servers = 9004 [deprecated = true]; - double min_home_disk_free_pct = 9005 [deprecated = true]; - int32 max_concurrent_scans = 9006 [deprecated = true]; -} diff --git a/proto/lib/config/pullorder.proto b/proto/lib/config/pullorder.proto deleted file mode 100644 index b9afb8e0d5c..00000000000 --- a/proto/lib/config/pullorder.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -package config; - -import "repos/protobuf/gogoproto/gogo.proto"; - -enum PullOrder { - option (gogoproto.goproto_enum_stringer) = false; - - PULL_ORDER_RANDOM = 0; - PULL_ORDER_ALPHABETIC = 1; - PULL_ORDER_SMALLEST_FIRST = 2; - PULL_ORDER_LARGEST_FIRST = 3; - PULL_ORDER_OLDEST_FIRST = 4; - PULL_ORDER_NEWEST_FIRST = 5; -} diff --git a/proto/lib/config/size.proto b/proto/lib/config/size.proto deleted file mode 100644 index e1795ddb145..00000000000 --- a/proto/lib/config/size.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; - -package config; - -import "repos/protobuf/gogoproto/gogo.proto"; - -import "ext.proto"; - -message Size { - option (gogoproto.goproto_stringer) = false; - - double value = 1 [(ext.xml) = ",chardata"]; - string unit = 2 [(ext.xml) = "unit,attr"]; -} diff --git a/proto/lib/config/tuning.proto b/proto/lib/config/tuning.proto deleted file mode 100644 index edbbf319338..00000000000 --- a/proto/lib/config/tuning.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -package config; - -import "repos/protobuf/gogoproto/gogo.proto"; - -enum Tuning { - option (gogoproto.goproto_enum_stringer) = false; - - TUNING_AUTO = 0; - TUNING_SMALL = 1; - TUNING_LARGE = 2; -} diff --git a/proto/lib/config/versioningconfiguration.proto b/proto/lib/config/versioningconfiguration.proto deleted file mode 100644 index e1c4952e6cd..00000000000 --- a/proto/lib/config/versioningconfiguration.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -package config; - -import "lib/fs/types.proto"; - -import "ext.proto"; - -// VersioningConfiguration is used in the code and for JSON serialization -message VersioningConfiguration { - string type = 1[(ext.xml) = "type,attr"]; - map parameters = 2 [(ext.goname) = "Params", (ext.json) = "params"]; - int32 cleanup_interval_s = 3 [(ext.default) = "3600"]; - string fs_path = 4 [(ext.goname) = "FSPath"]; - fs.FilesystemType fs_type = 5 [(ext.goname) = "FSType"]; -} diff --git a/proto/lib/db/structs.proto b/proto/lib/db/structs.proto deleted file mode 100644 index 7ea733c4aaf..00000000000 --- a/proto/lib/db/structs.proto +++ /dev/null @@ -1,106 +0,0 @@ -syntax = "proto3"; - -package db; - -import "repos/protobuf/gogoproto/gogo.proto"; -import "google/protobuf/timestamp.proto"; -import "lib/protocol/bep.proto"; -import "ext.proto"; - -message FileVersion { - protocol.Vector version = 1; - bool deleted = 2; - repeated bytes devices = 3; - repeated bytes invalid_devices = 4; -} - -message VersionList { - option (gogoproto.goproto_stringer) = false; - repeated FileVersion versions = 1 [(ext.goname) = "RawVersions"]; -} - -// Must be the same as FileInfo but without the blocks field -message FileInfoTruncated { - option (gogoproto.goproto_stringer) = false; - string name = 1; - int64 size = 3; - int64 modified_s = 5; - uint64 modified_by = 12 [(ext.gotype) = "github.com/syncthing/syncthing/lib/protocol.ShortID"]; - protocol.Vector version = 9; - int64 sequence = 10; - // repeated BlockInfo Blocks = 16 - string symlink_target = 17; - bytes blocks_hash = 18; - bytes encrypted = 19; - protocol.FileInfoType type = 2; - uint32 permissions = 4; - int32 modified_ns = 11; - int32 block_size = 13 [(ext.goname) = "RawBlockSize"]; - protocol.PlatformData platform = 14; - - // see bep.proto - uint32 local_flags = 1000; - bytes version_hash = 1001; - int64 inode_change_ns = 1002; - - bool deleted = 6; - bool invalid = 7 [(ext.goname) = "RawInvalid"]; - bool no_permissions = 8; -} - -// BlockList is the structure used to store block lists -message BlockList { - repeated protocol.BlockInfo blocks = 1; -} - -// IndirectionHashesOnly is used to only unmarshal the indirection hashes -// from a FileInfo -message IndirectionHashesOnly { - bytes blocks_hash = 18; - bytes version_hash = 1001; -} - -// For each folder and device we keep one of these to track the current -// counts and sequence. We also keep one for the global state of the folder. -message Counts { - option (gogoproto.goproto_stringer) = false; - - int32 files = 1; - int32 directories = 2; - int32 symlinks = 3; - int32 deleted = 4; - int64 bytes = 5; - int64 sequence = 6; // zero for the global state - bytes device_id = 17 [(ext.goname) = "DeviceID"]; // device ID for remote devices, or special values for local/global - uint32 local_flags = 18; // the local flag for this count bucket -} - -message CountsSet { - repeated Counts counts = 1; - int64 created = 2; // unix nanos -} - -message FileVersionDeprecated { - protocol.Vector version = 1; - bytes device = 2; - bool invalid = 3; - bool deleted = 4; -} - -message VersionListDeprecated { - option (gogoproto.goproto_stringer) = false; - repeated FileVersionDeprecated versions = 1; -} - -message ObservedFolder { - google.protobuf.Timestamp time = 1 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - string label = 2; - bool receive_encrypted = 3; - bool remote_encrypted = 4; -} - -message ObservedDevice { - google.protobuf.Timestamp time = 1 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - string name = 2; - string address = 3; -} diff --git a/proto/lib/discover/local.proto b/proto/lib/discover/local.proto deleted file mode 100644 index b728c1ac574..00000000000 --- a/proto/lib/discover/local.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -package discover; - -import "repos/protobuf/gogoproto/gogo.proto"; - -import "ext.proto"; - -message Announce { - bytes id = 1 [(ext.goname) = "ID", (ext.device_id) = true, (gogoproto.nullable) = false]; - repeated string addresses = 2; - int64 instance_id = 3 [(ext.goname) = "InstanceID"]; -} diff --git a/proto/lib/fs/copyrangemethod.proto b/proto/lib/fs/copyrangemethod.proto deleted file mode 100644 index a651a10253e..00000000000 --- a/proto/lib/fs/copyrangemethod.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -package fs; - -import "repos/protobuf/gogoproto/gogo.proto"; - -enum CopyRangeMethod { - option (gogoproto.goproto_enum_stringer) = false; - - COPY_RANGE_METHOD_STANDARD = 0; - COPY_RANGE_METHOD_IOCTL = 1; - COPY_RANGE_METHOD_COPY_FILE_RANGE = 2; - COPY_RANGE_METHOD_SEND_FILE = 3; - COPY_RANGE_METHOD_DUPLICATE_EXTENTS = 4; - COPY_RANGE_METHOD_ALL_WITH_FALLBACK = 5; -} diff --git a/proto/lib/fs/types.proto b/proto/lib/fs/types.proto deleted file mode 100644 index 6f3a5c78d9c..00000000000 --- a/proto/lib/fs/types.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -package fs; - -import "repos/protobuf/gogoproto/gogo.proto"; - -enum FilesystemType { - option (gogoproto.goproto_enum_stringer) = false; - - FILESYSTEM_TYPE_BASIC = 0; - FILESYSTEM_TYPE_FAKE = 1; -} diff --git a/proto/lib/protocol/bep.proto b/proto/lib/protocol/bep.proto deleted file mode 100644 index b0f9b77a4d9..00000000000 --- a/proto/lib/protocol/bep.proto +++ /dev/null @@ -1,261 +0,0 @@ -syntax = "proto3"; - -package protocol; - -import "ext.proto"; -import "repos/protobuf/gogoproto/gogo.proto"; - -// --- Pre-auth --- - -message Hello { - string device_name = 1; - string client_name = 2; - string client_version = 3; - int32 num_connections = 4; - int64 timestamp = 5; -} - -// --- Header --- - -message Header { - MessageType type = 1; - MessageCompression compression = 2; -} - -enum MessageType { - MESSAGE_TYPE_CLUSTER_CONFIG = 0; - MESSAGE_TYPE_INDEX = 1; - MESSAGE_TYPE_INDEX_UPDATE = 2; - MESSAGE_TYPE_REQUEST = 3; - MESSAGE_TYPE_RESPONSE = 4; - MESSAGE_TYPE_DOWNLOAD_PROGRESS = 5; - MESSAGE_TYPE_PING = 6; - MESSAGE_TYPE_CLOSE = 7; -} - -enum MessageCompression { - MESSAGE_COMPRESSION_NONE = 0; - MESSAGE_COMPRESSION_LZ4 = 1 [(ext.enumgoname) = "MessageCompressionLZ4"]; -} - -// --- Actual messages --- - -// Cluster Config - -message ClusterConfig { - repeated Folder folders = 1; - bool secondary = 2; -} - -message Folder { - string id = 1 [(ext.goname) = "ID"]; - string label = 2; - bool read_only = 3; - bool ignore_permissions = 4; - bool ignore_delete = 5; - bool disable_temp_indexes = 6; - bool paused = 7; - - repeated Device devices = 16; -} - -message Device { - bytes id = 1 [(ext.goname) = "ID", (ext.device_id) = true]; - string name = 2; - repeated string addresses = 3; - Compression compression = 4; - string cert_name = 5; - int64 max_sequence = 6; - bool introducer = 7; - uint64 index_id = 8 [(ext.goname) = "IndexID", (ext.gotype) = "IndexID"]; - bool skip_introduction_removals = 9; - bytes encryption_password_token = 10; -} - -enum Compression { - COMPRESSION_METADATA = 0; - COMPRESSION_NEVER = 1; - COMPRESSION_ALWAYS = 2; -} - -// Index and Index Update - -message Index { - string folder = 1; - repeated FileInfo files = 2; - int64 last_sequence = 3; // the highest sequence in this batch -} - -message IndexUpdate { - string folder = 1; - repeated FileInfo files = 2; - int64 last_sequence = 3; // the highest sequence in this batch - int64 prev_sequence = 4; // the highest sequence in the previous batch -} - -message FileInfo { - option (gogoproto.goproto_stringer) = false; - - // The field ordering here optimizes for struct size / alignment -- - // large types come before smaller ones. - - string name = 1; - int64 size = 3; - int64 modified_s = 5; - uint64 modified_by = 12 [(ext.gotype) = "ShortID"]; - Vector version = 9; - int64 sequence = 10; - repeated BlockInfo blocks = 16; - string symlink_target = 17; - bytes blocks_hash = 18; - bytes encrypted = 19; - FileInfoType type = 2; - uint32 permissions = 4; - int32 modified_ns = 11; - int32 block_size = 13 [(ext.goname) = "RawBlockSize"]; - PlatformData platform = 14; - - // The local_flags fields stores flags that are relevant to the local - // host only. It is not part of the protocol, doesn't get sent or - // received (we make sure to zero it), nonetheless we need it on our - // struct and to be able to serialize it to/from the database. - uint32 local_flags = 1000; - - // The version_hash is an implementation detail and not part of the wire - // format. - bytes version_hash = 1001; - - // The time when the inode was last changed (i.e., permissions, xattrs - // etc changed). This is host-local, not sent over the wire. - int64 inode_change_ns = 1002; - - // The size of the data appended to the encrypted file on disk. This is - // host-local, not sent over the wire. - int32 encryption_trailer_size = 1003; - - bool deleted = 6; - bool invalid = 7 [(ext.goname) = "RawInvalid"]; - bool no_permissions = 8; -} - -enum FileInfoType { - FILE_INFO_TYPE_FILE = 0; - FILE_INFO_TYPE_DIRECTORY = 1; - FILE_INFO_TYPE_SYMLINK_FILE = 2 [deprecated = true]; - FILE_INFO_TYPE_SYMLINK_DIRECTORY = 3 [deprecated = true]; - FILE_INFO_TYPE_SYMLINK = 4; -} - -message BlockInfo { - option (gogoproto.goproto_stringer) = false; - bytes hash = 3; - int64 offset = 1; - int32 size = 2; - uint32 weak_hash = 4; -} - -message Vector { - repeated Counter counters = 1; -} - -message Counter { - uint64 id = 1 [(ext.goname) = "ID", (ext.gotype) = "ShortID"]; - uint64 value = 2; -} - -message PlatformData { - UnixData unix = 1 [(gogoproto.nullable) = true]; - WindowsData windows = 2 [(gogoproto.nullable) = true]; - XattrData linux = 3 [(gogoproto.nullable) = true]; - XattrData darwin = 4 [(gogoproto.nullable) = true]; - XattrData freebsd = 5 [(gogoproto.nullable) = true, (ext.goname) = "FreeBSD"]; - XattrData netbsd = 6 [(gogoproto.nullable) = true, (ext.goname) = "NetBSD"]; -} - -message UnixData { - // The owner name and group name are set when known (i.e., could be - // resolved on the source device), while the UID and GID are always set - // as they come directly from the stat() call. - string owner_name = 1; - string group_name = 2; - int32 uid = 3 [(ext.goname) = "UID"]; - int32 gid = 4 [(ext.goname) = "GID"]; -} - -message WindowsData { - // Windows file objects have a single owner, which may be a user or a - // group. We keep the name of that account, and a flag to indicate what - // type it is. - string owner_name = 1; - bool owner_is_group = 2; -} - -message XattrData { - repeated Xattr xattrs = 1; -} - -message Xattr { - string name = 1; - bytes value = 2; -} - -// Request - -message Request { - int32 id = 1 [(ext.goname) = "ID"]; - string folder = 2; - string name = 3; - int64 offset = 4; - int32 size = 5; - bytes hash = 6; - bool from_temporary = 7; - uint32 weak_hash = 8; - int32 block_no = 9; -} - -// Response - -message Response { - int32 id = 1 [(ext.goname) = "ID"]; - bytes data = 2; - ErrorCode code = 3; -} - -enum ErrorCode { - ERROR_CODE_NO_ERROR = 0; - ERROR_CODE_GENERIC = 1; - ERROR_CODE_NO_SUCH_FILE = 2; - ERROR_CODE_INVALID_FILE = 3; -} - -// DownloadProgress - -message DownloadProgress { - string folder = 1; - repeated FileDownloadProgressUpdate updates = 2; -} - -message FileDownloadProgressUpdate { - FileDownloadProgressUpdateType update_type = 1; - string name = 2; - Vector version = 3; - repeated int32 block_indexes = 4 [packed=false]; - int32 block_size = 5; -} - -enum FileDownloadProgressUpdateType { - FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_APPEND = 0; - FILE_DOWNLOAD_PROGRESS_UPDATE_TYPE_FORGET = 1; -} - -// Ping - -message Ping { -} - -// Close - -message Close { - string reason = 1; -} - diff --git a/proto/lib/protocol/deviceid_test.proto b/proto/lib/protocol/deviceid_test.proto deleted file mode 100644 index e7cb88ca3cb..00000000000 --- a/proto/lib/protocol/deviceid_test.proto +++ /dev/null @@ -1,15 +0,0 @@ - -syntax = "proto3"; - -package protocol; - -import "ext.proto"; -import "repos/protobuf/gogoproto/gogo.proto"; - -message TestOldDeviceID { - bytes test = 1; -} - -message TestNewDeviceID { - bytes test = 1 [(ext.device_id) = true, (gogoproto.nullable) = false]; -} diff --git a/proto/scripts/dump_tags.go b/proto/scripts/dump_tags.go deleted file mode 100644 index 9a4c8b79ac5..00000000000 --- a/proto/scripts/dump_tags.go +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2020 The Syncthing Authors. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// You can obtain one at https://mozilla.org/MPL/2.0/. - -//go:build ignore -// +build ignore - -package main - -import ( - "encoding/csv" - "fmt" - "os" - "path/filepath" - "reflect" - "strings" - - "github.com/syncthing/syncthing/lib/config" -) - -func main() { - new, err := os.Create("tags.csv") - if err != nil { - panic(err) - } - fmt.Println(filepath.Abs(new.Name())) - w := csv.NewWriter(new) - w.Write([]string{ - "path", "json", "xml", "default", "restart", - }) - walk(w, "", &config.Configuration{}) - w.Flush() - new.Close() -} - -func walk(w *csv.Writer, prefix string, data interface{}) { - s := reflect.ValueOf(data).Elem() - t := s.Type() - for i := 0; i < s.NumField(); i++ { - f := s.Field(i) - ft := t.Field(i) - - for f.Kind() == reflect.Ptr { - f = f.Elem() - } - - pfx := prefix + "." + s.Type().Field(i).Name - if f.Kind() == reflect.Slice { - slc := reflect.MakeSlice(f.Type(), 1, 1) - f = slc.Index(0) - pfx = prefix + "." + s.Type().Field(i).Name + "[]" - } - - if f.Kind() == reflect.Struct && strings.HasPrefix(f.Type().PkgPath(), "github.com/syncthing/syncthing") { - walk(w, pfx, f.Addr().Interface()) - } else { - jsonTag := ft.Tag.Get("json") - xmlTag := ft.Tag.Get("xml") - defaultTag := ft.Tag.Get("default") - restartTag := ft.Tag.Get("restart") - w.Write([]string{ - strings.ToLower(pfx), jsonTag, xmlTag, defaultTag, restartTag, - }) - } - } -} diff --git a/proto/scripts/protoc_plugin.go b/proto/scripts/protoc_plugin.go deleted file mode 100644 index 6f2aa9c47fd..00000000000 --- a/proto/scripts/protoc_plugin.go +++ /dev/null @@ -1,313 +0,0 @@ -// Copyright (C) 2020 The Syncthing Authors. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// You can obtain one at https://mozilla.org/MPL/2.0/. - -//go:build ignore -// +build ignore - -package main - -import ( - "fmt" - "path/filepath" - "strings" - "unicode" - - "github.com/syncthing/syncthing/proto/ext" - - "github.com/gogo/protobuf/gogoproto" - "github.com/gogo/protobuf/proto" - "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - "github.com/gogo/protobuf/vanity" - "github.com/gogo/protobuf/vanity/command" -) - -func main() { - req := command.Read() - files := req.GetProtoFile() - files = vanity.FilterFiles(files, vanity.NotGoogleProtobufDescriptorProto) - - vanity.ForEachFile(files, vanity.TurnOffGoGettersAll) - vanity.ForEachFile(files, TurnOnProtoSizerAll) - vanity.ForEachFile(files, vanity.TurnOffGoEnumPrefixAll) - vanity.ForEachFile(files, vanity.TurnOffGoUnrecognizedAll) - vanity.ForEachFile(files, vanity.TurnOffGoUnkeyedAll) - vanity.ForEachFile(files, vanity.TurnOffGoSizecacheAll) - vanity.ForEachFile(files, vanity.TurnOnMarshalerAll) - vanity.ForEachFile(files, vanity.TurnOnUnmarshalerAll) - vanity.ForEachEnumInFiles(files, HandleCustomEnumExtensions) - vanity.ForEachFile(files, SetPackagePrefix("github.com/syncthing/syncthing")) - vanity.ForEachFile(files, HandleFile) - vanity.ForEachFieldInFilesExcludingExtensions(files, TurnOffNullableForMessages) - - resp := command.Generate(req) - command.Write(resp) -} - -func TurnOnProtoSizerAll(file *descriptor.FileDescriptorProto) { - vanity.SetBoolFileOption(gogoproto.E_ProtosizerAll, true)(file) -} - -func TurnOffNullableForMessages(field *descriptor.FieldDescriptorProto) { - if !vanity.FieldHasBoolExtension(field, gogoproto.E_Nullable) { - _, hasCustomType := GetFieldStringExtension(field, gogoproto.E_Customtype) - if field.IsMessage() || hasCustomType { - vanity.SetBoolFieldOption(gogoproto.E_Nullable, false)(field) - } - } -} - -func HandleCustomEnumExtensions(enum *descriptor.EnumDescriptorProto) { - for _, field := range enum.Value { - if field == nil { - continue - } - if field.Options == nil { - field.Options = &descriptor.EnumValueOptions{} - } - customName := gogoproto.GetEnumValueCustomName(field) - if customName != "" { - continue - } - if v, ok := GetEnumValueStringExtension(field, ext.E_Enumgoname); ok { - SetEnumValueStringFieldOption(field, gogoproto.E_EnumvalueCustomname, v) - } else { - SetEnumValueStringFieldOption(field, gogoproto.E_EnumvalueCustomname, toCamelCase(*field.Name, true)) - } - - } -} - -func SetPackagePrefix(prefix string) func(file *descriptor.FileDescriptorProto) { - return func(file *descriptor.FileDescriptorProto) { - if file.Options.GoPackage == nil { - pkg, _ := filepath.Split(file.GetName()) - fullPkg := prefix + "/" + strings.TrimSuffix(pkg, "/") - file.Options.GoPackage = &fullPkg - } - } -} - -func toCamelCase(input string, firstUpper bool) string { - runes := []rune(strings.ToLower(input)) - outputRunes := make([]rune, 0, len(runes)) - - nextUpper := false - for i, rune := range runes { - if rune == '_' { - nextUpper = true - continue - } - if (firstUpper && i == 0) || nextUpper { - rune = unicode.ToUpper(rune) - nextUpper = false - } - outputRunes = append(outputRunes, rune) - } - return string(outputRunes) -} - -func SetStringFieldOption(field *descriptor.FieldDescriptorProto, extension *proto.ExtensionDesc, value string) { - if _, ok := GetFieldStringExtension(field, extension); ok { - return - } - if field.Options == nil { - field.Options = &descriptor.FieldOptions{} - } - if err := proto.SetExtension(field.Options, extension, &value); err != nil { - panic(err) - } -} - -func SetEnumValueStringFieldOption(field *descriptor.EnumValueDescriptorProto, extension *proto.ExtensionDesc, value string) { - if _, ok := GetEnumValueStringExtension(field, extension); ok { - return - } - if field.Options == nil { - field.Options = &descriptor.EnumValueOptions{} - } - if err := proto.SetExtension(field.Options, extension, &value); err != nil { - panic(err) - } -} - -func GetEnumValueStringExtension(enumValue *descriptor.EnumValueDescriptorProto, extension *proto.ExtensionDesc) (string, bool) { - if enumValue.Options == nil { - return "", false - } - value, err := proto.GetExtension(enumValue.Options, extension) - if err != nil { - return "", false - } - if value == nil { - return "", false - } - if v, ok := value.(*string); !ok || v == nil { - return "", false - } else { - return *v, true - } -} - -func GetFieldStringExtension(field *descriptor.FieldDescriptorProto, extension *proto.ExtensionDesc) (string, bool) { - if field.Options == nil { - return "", false - } - value, err := proto.GetExtension(field.Options, extension) - if err != nil { - return "", false - } - if value == nil { - return "", false - } - if v, ok := value.(*string); !ok || v == nil { - return "", false - } else { - return *v, true - } -} - -func GetFieldBooleanExtension(field *descriptor.FieldDescriptorProto, extension *proto.ExtensionDesc) (bool, bool) { - if field.Options == nil { - return false, false - } - value, err := proto.GetExtension(field.Options, extension) - if err != nil { - return false, false - } - if value == nil { - return false, false - } - if v, ok := value.(*bool); !ok || v == nil { - return false, false - } else { - return *v, true - } -} - -func GetMessageBoolExtension(msg *descriptor.DescriptorProto, extension *proto.ExtensionDesc) (bool, bool) { - if msg.Options == nil { - return false, false - } - value, err := proto.GetExtension(msg.Options, extension) - if err != nil { - return false, false - } - if value == nil { - return false, false - } - val, ok := value.(*bool) - if !ok || val == nil { - return false, false - } - return *val, true -} - -func HandleFile(file *descriptor.FileDescriptorProto) { - vanity.ForEachMessageInFiles([]*descriptor.FileDescriptorProto{file}, HandleCustomExtensions(file)) -} - -func HandleCustomExtensions(file *descriptor.FileDescriptorProto) func(msg *descriptor.DescriptorProto) { - return func(msg *descriptor.DescriptorProto) { - generateXmlTags := true - if generate, ok := GetMessageBoolExtension(msg, ext.E_XmlTags); ok { - generateXmlTags = generate - } - - vanity.ForEachField([]*descriptor.DescriptorProto{msg}, func(field *descriptor.FieldDescriptorProto) { - if field.Options == nil { - field.Options = &descriptor.FieldOptions{} - } - deprecated := field.Options.Deprecated != nil && *field.Options.Deprecated == true - - if field.Type != nil && *field.Type == descriptor.FieldDescriptorProto_TYPE_INT32 { - SetStringFieldOption(field, gogoproto.E_Casttype, "int") - } - - if field.TypeName != nil && *field.TypeName == ".google.protobuf.Timestamp" { - vanity.SetBoolFieldOption(gogoproto.E_Stdtime, true)(field) - } - - if goName, ok := GetFieldStringExtension(field, ext.E_Goname); ok { - SetStringFieldOption(field, gogoproto.E_Customname, goName) - } else if deprecated { - SetStringFieldOption(field, gogoproto.E_Customname, "Deprecated"+toCamelCase(*field.Name, true)) - } - - if goType, ok := GetFieldStringExtension(field, ext.E_Gotype); ok { - SetStringFieldOption(field, gogoproto.E_Customtype, goType) - } - - if val, ok := GetFieldBooleanExtension(field, ext.E_DeviceId); ok && val { - if *file.Options.GoPackage != "github.com/syncthing/syncthing/lib/protocol" { - SetStringFieldOption(field, gogoproto.E_Customtype, "github.com/syncthing/syncthing/lib/protocol.DeviceID") - } else { - SetStringFieldOption(field, gogoproto.E_Customtype, "DeviceID") - } - } - - if jsonValue, ok := GetFieldStringExtension(field, ext.E_Json); ok { - SetStringFieldOption(field, gogoproto.E_Jsontag, jsonValue) - } else if deprecated { - SetStringFieldOption(field, gogoproto.E_Jsontag, "-") - } else { - SetStringFieldOption(field, gogoproto.E_Jsontag, toCamelCase(*field.Name, false)) - } - - current := "" - if v, ok := GetFieldStringExtension(field, gogoproto.E_Moretags); ok { - current = v - } - - if generateXmlTags { - if len(current) > 0 { - current += " " - } - if xmlValue, ok := GetFieldStringExtension(field, ext.E_Xml); ok { - current += fmt.Sprintf(`xml:"%s"`, xmlValue) - } else { - xmlValue = toCamelCase(*field.Name, false) - // XML dictates element name within the collection, not collection name, so trim plural suffix. - if field.IsRepeated() { - if strings.HasSuffix(xmlValue, "ses") { - // addresses -> address - xmlValue = strings.TrimSuffix(xmlValue, "es") - } else { - // devices -> device - xmlValue = strings.TrimSuffix(xmlValue, "s") - } - } - if deprecated { - xmlValue += ",omitempty" - } - current += fmt.Sprintf(`xml:"%s"`, xmlValue) - } - } - - if defaultValue, ok := GetFieldStringExtension(field, ext.E_Default); ok { - if len(current) > 0 { - current += " " - } - current += fmt.Sprintf(`default:"%s"`, defaultValue) - } - - if nodefaultValue, ok := GetFieldBooleanExtension(field, ext.E_Nodefault); ok { - if len(current) > 0 { - current += " " - } - current += fmt.Sprintf(`nodefault:"%t"`, nodefaultValue) - } - - if restartValue, ok := GetFieldBooleanExtension(field, ext.E_Restart); ok { - if len(current) > 0 { - current += " " - } - current += fmt.Sprintf(`restart:"%t"`, restartValue) - } - - SetStringFieldOption(field, gogoproto.E_Moretags, current) - }) - } -} diff --git a/proto/scripts/protofmt.go b/proto/scripts/protofmt.go deleted file mode 100644 index 4141a63eced..00000000000 --- a/proto/scripts/protofmt.go +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright (C) 2016 The Syncthing Authors. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// You can obtain one at https://mozilla.org/MPL/2.0/. - -//go:build ignore -// +build ignore - -package main - -import ( - "bufio" - "flag" - "fmt" - "io" - "log" - "os" - "path/filepath" - "regexp" - "strings" - "text/tabwriter" -) - -func main() { - flag.Parse() - for _, arg := range flag.Args() { - matches, err := filepath.Glob(arg) - if err != nil { - log.Fatal(err) - } - for _, file := range matches { - if stat, err := os.Stat(file); err != nil { - log.Fatal(err) - } else if stat.IsDir() { - err := filepath.Walk(file, func(path string, info os.FileInfo, err error) error { - if err != nil { - return err - } - if filepath.Ext(path) == ".proto" { - return formatProtoFile(path) - } - return nil - }) - if err != nil { - log.Fatal(err) - } - } else { - if err := formatProtoFile(file); err != nil { - log.Fatal(err) - } - } - } - } -} - -func formatProtoFile(file string) error { - log.Println("Formatting", file) - in, err := os.Open(file) - if err != nil { - return err - } - defer in.Close() - out, err := os.Create(file + ".tmp") - if err != nil { - return err - } - defer out.Close() - if err := formatProto(in, out); err != nil { - return err - } - in.Close() - out.Close() - return os.Rename(file+".tmp", file) -} - -func formatProto(in io.Reader, out io.Writer) error { - sc := bufio.NewScanner(in) - lineExp := regexp.MustCompile(`([^=]+)\s+([^=\s]+?)\s*=(.+)`) - var tw *tabwriter.Writer - for sc.Scan() { - line := sc.Text() - if strings.HasPrefix(line, "//") { - if _, err := fmt.Fprintln(out, line); err != nil { - return err - } - continue - } - - ms := lineExp.FindStringSubmatch(line) - for i := range ms { - ms[i] = strings.TrimSpace(ms[i]) - } - if len(ms) == 4 && ms[1] != "option" { - typ := strings.Join(strings.Fields(ms[1]), " ") - name := ms[2] - id := ms[3] - if tw == nil { - tw = tabwriter.NewWriter(out, 4, 4, 1, ' ', 0) - } - if typ == "" { - // We're in an enum - fmt.Fprintf(tw, "\t%s\t= %s\n", name, id) - } else { - // Message - fmt.Fprintf(tw, "\t%s\t%s\t= %s\n", typ, name, id) - } - } else { - if tw != nil { - if err := tw.Flush(); err != nil { - return err - } - tw = nil - } - if _, err := fmt.Fprintln(out, line); err != nil { - return err - } - } - } - - return nil -} diff --git a/tools.go b/tools.go index 71313a0dc89..0ce34255fc5 100644 --- a/tools.go +++ b/tools.go @@ -9,7 +9,6 @@ package tools import ( _ "github.com/calmh/xdr" - _ "github.com/gogo/protobuf/protoc-gen-gogofast" _ "github.com/maxbrunsfeld/counterfeiter/v6" _ "golang.org/x/tools/cmd/goimports" )