aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--go.mod1
-rw-r--r--go.sum2
-rw-r--r--lib/config/config_test.go15
-rw-r--r--lib/config/deviceconfiguration.go6
-rw-r--r--lib/config/deviceconfiguration.pb.go163
-rw-r--r--lib/connections/service.go2
-rw-r--r--lib/model/model_test.go2
-rw-r--r--lib/protocol/benchmark_test.go4
-rw-r--r--lib/protocol/bep.pb.go411
-rw-r--r--lib/protocol/protocol.go93
-rw-r--r--lib/protocol/protocol_test.go29
-rw-r--r--proto/lib/config/deviceconfiguration.proto37
-rw-r--r--proto/lib/protocol/bep.proto5
-rw-r--r--test/h1/config.xml136
-rw-r--r--test/h2/config.xml144
15 files changed, 705 insertions, 345 deletions
diff --git a/go.mod b/go.mod
index 62e120623..37d403bcb 100644
--- a/go.mod
+++ b/go.mod
@@ -46,6 +46,7 @@ require (
github.com/syncthing/notify v0.0.0-20210616190510-c6b7342338d2
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
github.com/thejerf/suture/v4 v4.0.2
+ github.com/ulikunitz/xz v0.5.11
github.com/urfave/cli v1.22.14
github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0
golang.org/x/crypto v0.11.0
diff --git a/go.sum b/go.sum
index 73d660e72..48e76008f 100644
--- a/go.sum
+++ b/go.sum
@@ -194,6 +194,8 @@ github.com/thejerf/suture/v4 v4.0.2 h1:VxIH/J8uYvqJY1+9fxi5GBfGRkRZ/jlSOP6x9HijF
github.com/thejerf/suture/v4 v4.0.2/go.mod h1:g0e8vwskm9tI0jRjxrnA6lSr0q6OfPdWJVX7G5bVWRs=
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
diff --git a/lib/config/config_test.go b/lib/config/config_test.go
index e0d6ef22d..75c0da578 100644
--- a/lib/config/config_test.go
+++ b/lib/config/config_test.go
@@ -128,6 +128,7 @@ func TestDefaultValues(t *testing.T) {
AllowedNetworks: []string{},
Compression: protocol.CompressionMetadata,
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
Ignores: Ignores{
Lines: []string{},
@@ -207,6 +208,7 @@ func TestDeviceConfig(t *testing.T) {
Compression: protocol.CompressionMetadata,
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
{
DeviceID: device4,
@@ -215,6 +217,7 @@ func TestDeviceConfig(t *testing.T) {
Compression: protocol.CompressionMetadata,
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
}
expectedDeviceIDs := []protocol.DeviceID{device1, device4}
@@ -321,18 +324,21 @@ func TestDeviceAddressesDynamic(t *testing.T) {
Addresses: []string{"dynamic"},
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device2: {
DeviceID: device2,
Addresses: []string{"dynamic"},
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device3: {
DeviceID: device3,
Addresses: []string{"dynamic"},
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device4: {
DeviceID: device4,
@@ -341,6 +347,7 @@ func TestDeviceAddressesDynamic(t *testing.T) {
Compression: protocol.CompressionMetadata,
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
}
@@ -365,6 +372,7 @@ func TestDeviceCompression(t *testing.T) {
Compression: protocol.CompressionMetadata,
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device2: {
DeviceID: device2,
@@ -372,6 +380,7 @@ func TestDeviceCompression(t *testing.T) {
Compression: protocol.CompressionMetadata,
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device3: {
DeviceID: device3,
@@ -379,6 +388,7 @@ func TestDeviceCompression(t *testing.T) {
Compression: protocol.CompressionNever,
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device4: {
DeviceID: device4,
@@ -387,6 +397,7 @@ func TestDeviceCompression(t *testing.T) {
Compression: protocol.CompressionMetadata,
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
}
@@ -410,18 +421,21 @@ func TestDeviceAddressesStatic(t *testing.T) {
Addresses: []string{"tcp://192.0.2.1", "tcp://192.0.2.2"},
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device2: {
DeviceID: device2,
Addresses: []string{"tcp://192.0.2.3:6070", "tcp://[2001:db8::42]:4242"},
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device3: {
DeviceID: device3,
Addresses: []string{"tcp://[2001:db8::44]:4444", "tcp://192.0.2.4:6090"},
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
device4: {
DeviceID: device4,
@@ -430,6 +444,7 @@ func TestDeviceAddressesStatic(t *testing.T) {
Compression: protocol.CompressionMetadata,
AllowedNetworks: []string{},
IgnoredFolders: []ObservedFolder{},
+ CompressionAlgo: protocol.MessageCompressionLZ4,
},
}
diff --git a/lib/config/deviceconfiguration.go b/lib/config/deviceconfiguration.go
index 54a30affc..5463b059a 100644
--- a/lib/config/deviceconfiguration.go
+++ b/lib/config/deviceconfiguration.go
@@ -9,6 +9,8 @@ package config
import (
"fmt"
"sort"
+
+ "github.com/syncthing/syncthing/lib/protocol"
)
func (cfg DeviceConfiguration) Copy() DeviceConfiguration {
@@ -35,6 +37,10 @@ func (cfg *DeviceConfiguration) prepare(sharedFolders []string) {
cfg.IgnoredFolders = sortedObservedFolderSlice(ignoredFolders)
+ if cfg.CompressionAlgo == protocol.MessageCompressionNone {
+ cfg.CompressionAlgo = protocol.MessageCompressionLZ4
+ }
+
// A device cannot be simultaneously untrusted and an introducer, nor
// auto accept folders.
if cfg.Untrusted {
diff --git a/lib/config/deviceconfiguration.pb.go b/lib/config/deviceconfiguration.pb.go
index e07bb1eb0..7f2a64907 100644
--- a/lib/config/deviceconfiguration.pb.go
+++ b/lib/config/deviceconfiguration.pb.go
@@ -30,6 +30,7 @@ type DeviceConfiguration struct {
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" default:"dynamic"`
Compression protocol.Compression `protobuf:"varint,4,opt,name=compression,proto3,enum=protocol.Compression" json:"compression" xml:"compression,attr"`
+ CompressionAlgo protocol.MessageCompression `protobuf:"varint,19,opt,name=compression_algo,json=compressionAlgo,proto3,enum=protocol.MessageCompression" json:"compressionAlgo" xml:"compressionAlgo,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"`
@@ -88,72 +89,75 @@ func init() {
}
var fileDescriptor_744b782bd13071dd = []byte{
- // 1026 bytes of a gzipped FileDescriptorProto
+ // 1073 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbf, 0x6f, 0xdb, 0x46,
- 0x18, 0x15, 0xeb, 0xc4, 0xb6, 0xce, 0x3f, 0x64, 0xd3, 0x88, 0xc3, 0x18, 0x88, 0x4e, 0x50, 0x35,
- 0x28, 0x68, 0x22, 0x17, 0x6e, 0x27, 0xa3, 0x2d, 0x50, 0xc6, 0x68, 0x63, 0x18, 0x4d, 0x5c, 0x16,
- 0x5d, 0xbc, 0xb0, 0x24, 0xef, 0xac, 0x1c, 0x2c, 0xf2, 0x58, 0xf2, 0xa8, 0x58, 0x40, 0xff, 0x80,
- 0x76, 0x2b, 0x02, 0x74, 0xea, 0x92, 0xf6, 0xdf, 0xe8, 0xd0, 0xd5, 0x9b, 0x35, 0x16, 0x1d, 0x0e,
- 0x88, 0xbd, 0x71, 0x29, 0xc0, 0x31, 0x53, 0x71, 0x77, 0x14, 0x45, 0xca, 0x51, 0x50, 0xa0, 0x1b,
- 0xef, 0xbd, 0x77, 0xef, 0xdd, 0xf7, 0xe9, 0xbb, 0x13, 0xe8, 0x0c, 0x88, 0xbb, 0xeb, 0xd1, 0xe0,
- 0x94, 0xf4, 0x77, 0x11, 0x1e, 0x12, 0x0f, 0xab, 0x45, 0x12, 0x39, 0x8c, 0xd0, 0xa0, 0x17, 0x46,
- 0x94, 0x51, 0x7d, 0x51, 0x81, 0x3b, 0xdb, 0x42, 0x2d, 0x21, 0x8f, 0x0e, 0x76, 0x5d, 0x1c, 0x2a,
- 0x7e, 0xe7, 0x5e, 0xc9, 0x85, 0xba, 0x31, 0x8e, 0x86, 0x18, 0xe5, 0x54, 0x1d, 0x9f, 0x33, 0xf5,
- 0xd9, 0xfe, 0x67, 0x03, 0x6c, 0x1d, 0xc8, 0x8c, 0xc7, 0xe5, 0x0c, 0xfd, 0x4f, 0x0d, 0xd4, 0x55,
- 0xb6, 0x4d, 0x90, 0xa1, 0xb5, 0xb4, 0xee, 0xaa, 0xf9, 0x9b, 0x76, 0xc1, 0x61, 0xed, 0x6f, 0x0e,
- 0x3f, 0xee, 0x13, 0xf6, 0x3c, 0x71, 0x7b, 0x1e, 0xf5, 0x77, 0xe3, 0x51, 0xe0, 0xb1, 0xe7, 0x24,
- 0xe8, 0x97, 0xbe, 0xca, 0x27, 0xea, 0x29, 0xf7, 0xc3, 0x83, 0x2b, 0x0e, 0x97, 0x27, 0xdf, 0x29,
- 0x87, 0xcb, 0x28, 0xff, 0xce, 0x38, 0x6c, 0x9e, 0xfb, 0x83, 0xfd, 0x36, 0x41, 0x0f, 0x1d, 0xc6,
- 0xa2, 0x76, 0x2b, 0xa0, 0x08, 0x9f, 0x3a, 0xc9, 0x80, 0xed, 0xb7, 0x59, 0x94, 0xe0, 0x76, 0x7a,
- 0xd9, 0x59, 0xca, 0xc9, 0xec, 0xb2, 0x53, 0x6c, 0xfc, 0x71, 0xdc, 0xd1, 0x5e, 0x8e, 0x3b, 0x85,
- 0xe9, 0xab, 0x71, 0x47, 0xb3, 0x26, 0x2c, 0xd2, 0x8f, 0xc1, 0xad, 0xc0, 0xf1, 0xb1, 0xf1, 0x5e,
- 0x4b, 0xeb, 0xd6, 0xcd, 0x4f, 0x52, 0x0e, 0xe5, 0x3a, 0xe3, 0xf0, 0x9e, 0x8c, 0x13, 0x0b, 0xe9,
- 0xf9, 0x90, 0xfa, 0x84, 0x61, 0x3f, 0x64, 0x23, 0x91, 0xb4, 0xf5, 0x16, 0xdc, 0x92, 0x3b, 0xf5,
- 0x73, 0x50, 0x77, 0x10, 0x8a, 0x70, 0x1c, 0xe3, 0xd8, 0x58, 0x68, 0x2d, 0x74, 0xeb, 0xe6, 0x49,
- 0xca, 0xe1, 0x14, 0xcc, 0x38, 0x7c, 0x20, 0xbd, 0x73, 0xa4, 0xe4, 0xdc, 0x2a, 0x4a, 0x42, 0xa3,
- 0xc0, 0xf1, 0x89, 0x27, 0xb2, 0x36, 0x6f, 0xe8, 0xde, 0x5c, 0x76, 0x96, 0x72, 0x81, 0x35, 0xf5,
- 0xd5, 0x87, 0x60, 0xc5, 0xa3, 0x7e, 0x28, 0x56, 0x84, 0x06, 0xc6, 0xad, 0x96, 0xd6, 0x5d, 0xdf,
- 0xbb, 0xd3, 0x2b, 0x7a, 0xfc, 0x78, 0x4a, 0x9a, 0x9f, 0xa6, 0x1c, 0x96, 0xd5, 0x19, 0x87, 0xdb,
- 0xf2, 0x50, 0x25, 0x4c, 0x35, 0x3a, 0xbd, 0xec, 0x6c, 0xcc, 0x82, 0x56, 0x79, 0xab, 0x8e, 0x41,
- 0xdd, 0xc3, 0x11, 0xb3, 0x65, 0x23, 0x6f, 0xcb, 0x46, 0x3e, 0x11, 0xbf, 0x9d, 0x00, 0x9f, 0xaa,
- 0x66, 0xde, 0x57, 0xde, 0x39, 0xf0, 0x96, 0x86, 0xde, 0x9d, 0xc3, 0x59, 0x85, 0x8b, 0x7e, 0x02,
- 0x00, 0x09, 0x58, 0x44, 0x51, 0xe2, 0xe1, 0xc8, 0x58, 0x6c, 0x69, 0xdd, 0x65, 0x73, 0x3f, 0xe5,
- 0xb0, 0x84, 0x66, 0x1c, 0xde, 0x51, 0x53, 0x52, 0x40, 0x45, 0x11, 0x8d, 0x19, 0xcc, 0x2a, 0xed,
- 0xd3, 0x7f, 0xd7, 0xc0, 0x4e, 0x7c, 0x46, 0x42, 0x7b, 0x82, 0x89, 0xf1, 0xb6, 0x23, 0xec, 0xd3,
- 0xa1, 0x33, 0x88, 0x8d, 0x25, 0x19, 0x86, 0x52, 0x0e, 0x0d, 0xa1, 0x3a, 0x2c, 0x89, 0xac, 0x5c,
- 0x93, 0x71, 0xf8, 0xbe, 0x8c, 0x9e, 0x27, 0x28, 0x0e, 0x72, 0xff, 0x9d, 0x0a, 0x6b, 0x6e, 0x82,
- 0xfe, 0x87, 0x06, 0xd6, 0x8a, 0x33, 0x23, 0xdb, 0x1d, 0x19, 0xcb, 0xf2, 0xc6, 0xfd, 0xf2, 0xbf,
- 0x6e, 0x5c, 0xca, 0xe1, 0xea, 0xd4, 0xd5, 0x1c, 0x65, 0x1c, 0x76, 0xab, 0x3d, 0x44, 0xe6, 0x68,
- 0xfe, 0x9d, 0xdb, 0xbc, 0x21, 0x13, 0x37, 0x4e, 0xde, 0xb2, 0x8a, 0xad, 0xbe, 0x07, 0x16, 0x43,
- 0x27, 0x89, 0x31, 0x32, 0xea, 0xb2, 0x9b, 0x3b, 0x29, 0x87, 0x39, 0x92, 0x71, 0xb8, 0x2a, 0x23,
- 0xd5, 0xb2, 0x6d, 0xe5, 0xb8, 0xfe, 0x03, 0xd8, 0x70, 0x06, 0x03, 0xfa, 0x02, 0x23, 0x3b, 0xc0,
- 0xec, 0x05, 0x8d, 0xce, 0x62, 0x03, 0xc8, 0x2b, 0xf5, 0x75, 0xca, 0x61, 0x23, 0xe7, 0x9e, 0xe6,
- 0x54, 0xf1, 0x46, 0x54, 0xf1, 0xea, 0xa0, 0x19, 0xf3, 0x48, 0x6b, 0xd6, 0x4e, 0xff, 0x0e, 0x6c,
- 0x39, 0x09, 0xa3, 0xb6, 0xe3, 0x79, 0x38, 0x64, 0xf6, 0x29, 0x1d, 0x20, 0x1c, 0xc5, 0xc6, 0x8a,
- 0x3c, 0xfe, 0x87, 0x29, 0x87, 0x9b, 0x82, 0xfe, 0x5c, 0xb2, 0x5f, 0x28, 0x32, 0xe3, 0xf0, 0xae,
- 0x3a, 0xc2, 0x2c, 0xd3, 0xb6, 0x6e, 0xaa, 0xf5, 0x67, 0x60, 0xcd, 0x77, 0xce, 0xed, 0x18, 0x07,
- 0xc8, 0x3e, 0x73, 0xc3, 0xd8, 0x58, 0x6d, 0x69, 0xdd, 0xdb, 0xe6, 0x07, 0xe2, 0x72, 0xfa, 0xce,
- 0xf9, 0x37, 0x38, 0x40, 0x47, 0x6e, 0x28, 0x5c, 0x37, 0xa5, 0x6b, 0x09, 0x6b, 0xbf, 0xe1, 0x70,
- 0x81, 0x04, 0xcc, 0x2a, 0x0b, 0x27, 0x86, 0x11, 0xf6, 0x86, 0xca, 0x70, 0xad, 0x62, 0x68, 0x61,
- 0x6f, 0x38, 0x6b, 0x38, 0xc1, 0x2a, 0x86, 0x13, 0x50, 0x0f, 0x40, 0x83, 0xf4, 0x03, 0x1a, 0x61,
- 0x54, 0xd4, 0xbf, 0xde, 0x5a, 0xe8, 0xae, 0xec, 0x6d, 0xf7, 0xd4, 0xbf, 0x46, 0xef, 0x59, 0xfe,
- 0xaf, 0xa1, 0x6a, 0x32, 0x1f, 0x89, 0x59, 0x4c, 0x39, 0x5c, 0xcf, 0xb7, 0x4d, 0x1b, 0xb3, 0xa5,
- 0xa6, 0xaa, 0x0c, 0xb7, 0xad, 0x19, 0x99, 0xfe, 0x93, 0x06, 0x1a, 0x21, 0x0e, 0x10, 0x09, 0xfa,
- 0x45, 0x60, 0xe3, 0x9d, 0x81, 0x4f, 0x44, 0xe0, 0x15, 0x87, 0xc6, 0x01, 0x0e, 0x23, 0xec, 0x39,
- 0x0c, 0xa3, 0x63, 0x65, 0x90, 0x7b, 0xa6, 0x1c, 0x6a, 0x8f, 0x8a, 0x37, 0x28, 0x2c, 0x73, 0xa5,
- 0xd1, 0x30, 0x34, 0x6b, 0xbd, 0xc2, 0xc5, 0xfa, 0xaf, 0x1a, 0x68, 0xa8, 0x6e, 0x7e, 0x9f, 0xe0,
- 0x98, 0xd9, 0x67, 0xc4, 0x35, 0x36, 0x64, 0x3f, 0xe3, 0x2b, 0x0e, 0xd7, 0xbe, 0x12, 0x6d, 0x92,
- 0xcc, 0x11, 0x31, 0x53, 0x0e, 0xd7, 0xfc, 0x32, 0x50, 0x14, 0x5c, 0x41, 0x27, 0x4d, 0x4e, 0x2f,
- 0x3b, 0x33, 0xf2, 0x59, 0xe0, 0xe5, 0xb8, 0x53, 0x4d, 0xb0, 0x2a, 0xbc, 0xab, 0x7f, 0x06, 0xea,
- 0x49, 0xc0, 0xa2, 0x24, 0x66, 0x18, 0x19, 0x9b, 0x72, 0x26, 0x5b, 0xe2, 0x7f, 0xa6, 0x00, 0x33,
- 0x0e, 0x1b, 0xf2, 0x04, 0x05, 0xd2, 0xb6, 0xa6, 0xac, 0xac, 0x4e, 0x3c, 0x70, 0x0c, 0xdb, 0xfd,
- 0x84, 0xd8, 0x21, 0x8d, 0x98, 0xa1, 0x4f, 0xab, 0xb3, 0x24, 0xf5, 0xe5, 0xb7, 0x87, 0xc7, 0x34,
- 0x62, 0xa2, 0xba, 0xa8, 0x0c, 0x14, 0xd5, 0x55, 0xd0, 0x72, 0x75, 0x55, 0xf9, 0x2c, 0x20, 0xaa,
- 0xab, 0x24, 0x58, 0x13, 0x3e, 0x21, 0x62, 0x69, 0x1e, 0x5d, 0xbc, 0x6e, 0xd6, 0xc6, 0xaf, 0x9b,
- 0xb5, 0x8b, 0xab, 0xa6, 0x36, 0xbe, 0x6a, 0x6a, 0x3f, 0x5f, 0x37, 0x6b, 0xaf, 0xae, 0x9b, 0xda,
- 0xf8, 0xba, 0x59, 0xfb, 0xeb, 0xba, 0x59, 0x3b, 0x79, 0xf0, 0x1f, 0x1e, 0x3b, 0x35, 0x31, 0xee,
- 0xa2, 0x7c, 0xf4, 0x3e, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x4a, 0x4f, 0x60, 0x33, 0x09,
- 0x00, 0x00,
+ 0x14, 0x16, 0xeb, 0xc4, 0xb6, 0xce, 0x3f, 0x64, 0xd3, 0x8d, 0xc3, 0x18, 0x8d, 0x4e, 0x50, 0x35,
+ 0x28, 0x68, 0x22, 0x17, 0x6e, 0x27, 0xa3, 0x2d, 0x10, 0xc6, 0x68, 0x63, 0x18, 0x49, 0x5c, 0x16,
+ 0x5d, 0xbc, 0xb0, 0x14, 0xef, 0xac, 0x10, 0x26, 0x79, 0x2c, 0x79, 0x54, 0x2c, 0xa0, 0x63, 0x87,
+ 0x76, 0x2b, 0x0c, 0x74, 0xea, 0x92, 0xf6, 0xdf, 0xe8, 0xd0, 0xd5, 0x9b, 0x35, 0x16, 0x1d, 0x0e,
+ 0x88, 0xbd, 0x71, 0xe4, 0x98, 0xa9, 0xb8, 0x23, 0x45, 0x1d, 0x69, 0x2b, 0x28, 0xd0, 0x8d, 0xf7,
+ 0x7d, 0xef, 0xbe, 0xef, 0xbd, 0xc7, 0xc7, 0x47, 0xd0, 0x71, 0x9d, 0xfe, 0xb6, 0x4d, 0xfc, 0x63,
+ 0x67, 0xb0, 0x8d, 0xf0, 0xd0, 0xb1, 0x71, 0x76, 0x88, 0x43, 0x8b, 0x3a, 0xc4, 0xef, 0x05, 0x21,
+ 0xa1, 0x44, 0x9d, 0xcf, 0xc0, 0xad, 0x4d, 0x1e, 0x2d, 0x20, 0x9b, 0xb8, 0xdb, 0x7d, 0x1c, 0x64,
+ 0xfc, 0xd6, 0x3d, 0x49, 0x85, 0xf4, 0x23, 0x1c, 0x0e, 0x31, 0xca, 0xa9, 0x3a, 0x3e, 0xa5, 0xd9,
+ 0x63, 0xfb, 0x47, 0x15, 0x6c, 0xec, 0x09, 0x8f, 0x27, 0xb2, 0x87, 0xfa, 0x97, 0x02, 0xea, 0x99,
+ 0xb7, 0xe9, 0x20, 0x4d, 0x69, 0x29, 0xdd, 0x65, 0xfd, 0x77, 0xe5, 0x9c, 0xc1, 0xda, 0x3f, 0x0c,
+ 0x7e, 0x3a, 0x70, 0xe8, 0xcb, 0xb8, 0xdf, 0xb3, 0x89, 0xb7, 0x1d, 0x8d, 0x7c, 0x9b, 0xbe, 0x74,
+ 0xfc, 0x81, 0xf4, 0x24, 0x67, 0xd4, 0xcb, 0xd4, 0xf7, 0xf7, 0x2e, 0x19, 0x5c, 0x9c, 0x3c, 0x27,
+ 0x0c, 0x2e, 0xa2, 0xfc, 0x39, 0x65, 0xb0, 0x79, 0xea, 0xb9, 0xbb, 0x6d, 0x07, 0x3d, 0xb4, 0x28,
+ 0x0d, 0xdb, 0x2d, 0x9f, 0x20, 0x7c, 0x6c, 0xc5, 0x2e, 0xdd, 0x6d, 0xd3, 0x30, 0xc6, 0xed, 0xe4,
+ 0xa2, 0xb3, 0x90, 0x93, 0xe9, 0x45, 0xa7, 0xb8, 0xf8, 0xd3, 0xb8, 0xa3, 0x9c, 0x8d, 0x3b, 0x85,
+ 0xe8, 0xeb, 0x71, 0x47, 0x31, 0x26, 0x2c, 0x52, 0x0f, 0xc1, 0x2d, 0xdf, 0xf2, 0xb0, 0xf6, 0x5e,
+ 0x4b, 0xe9, 0xd6, 0xf5, 0xcf, 0x12, 0x06, 0xc5, 0x39, 0x65, 0xf0, 0x9e, 0xb0, 0xe3, 0x07, 0xa1,
+ 0xf9, 0x90, 0x78, 0x0e, 0xc5, 0x5e, 0x40, 0x47, 0xdc, 0x69, 0xe3, 0x06, 0xdc, 0x10, 0x37, 0xd5,
+ 0x53, 0x50, 0xb7, 0x10, 0x0a, 0x71, 0x14, 0xe1, 0x48, 0x9b, 0x6b, 0xcd, 0x75, 0xeb, 0xfa, 0x51,
+ 0xc2, 0xe0, 0x14, 0x4c, 0x19, 0x7c, 0x20, 0xb4, 0x73, 0x44, 0x52, 0x6e, 0x15, 0x25, 0xa1, 0x91,
+ 0x6f, 0x79, 0x8e, 0xcd, 0xbd, 0xd6, 0xaf, 0xc5, 0xbd, 0xbd, 0xe8, 0x2c, 0xe4, 0x01, 0xc6, 0x54,
+ 0x57, 0x1d, 0x82, 0x25, 0x9b, 0x78, 0x01, 0x3f, 0x39, 0xc4, 0xd7, 0x6e, 0xb5, 0x94, 0xee, 0xea,
+ 0xce, 0x9d, 0x5e, 0xd1, 0xe3, 0x27, 0x53, 0x52, 0xff, 0x3c, 0x61, 0x50, 0x8e, 0x4e, 0x19, 0xdc,
+ 0x14, 0x49, 0x49, 0x58, 0xd6, 0xe8, 0xe4, 0xa2, 0xb3, 0x56, 0x05, 0x0d, 0xf9, 0xaa, 0x7a, 0xa6,
+ 0x00, 0x39, 0xc2, 0xb4, 0xdc, 0x01, 0xd1, 0x36, 0x84, 0xfb, 0x07, 0x53, 0xf7, 0x67, 0x38, 0x8a,
+ 0xac, 0x01, 0x96, 0x93, 0xd8, 0x4f, 0x18, 0x6c, 0x48, 0x37, 0x1f, 0xbb, 0x03, 0x92, 0x32, 0xb8,
+ 0x55, 0x4d, 0x84, 0xe3, 0x45, 0x32, 0xef, 0xdf, 0x44, 0x18, 0x55, 0x19, 0x15, 0x83, 0xba, 0x8d,
+ 0x43, 0x6a, 0x8a, 0xb7, 0x7b, 0x5b, 0xbc, 0xdd, 0xa7, 0x7c, 0xa0, 0x38, 0xf8, 0x3c, 0x7b, 0xc3,
+ 0xf7, 0x33, 0x9f, 0x1c, 0xb8, 0xe1, 0x2d, 0xdf, 0x9d, 0xc1, 0x19, 0x85, 0x8a, 0x7a, 0x04, 0x80,
+ 0xe3, 0xd3, 0x90, 0xa0, 0xd8, 0xc6, 0xa1, 0x36, 0xdf, 0x52, 0xba, 0x8b, 0xfa, 0x6e, 0xc2, 0xa0,
+ 0x84, 0xa6, 0x0c, 0xde, 0xc9, 0x46, 0xb7, 0x80, 0x8a, 0x62, 0x1a, 0x15, 0xcc, 0x90, 0xee, 0xa9,
+ 0x7f, 0x28, 0x60, 0x2b, 0x3a, 0x71, 0x02, 0x73, 0x82, 0xf1, 0x6f, 0xce, 0x0c, 0xb1, 0x47, 0x86,
+ 0x96, 0x1b, 0x69, 0x0b, 0xc2, 0x0c, 0x25, 0x0c, 0x6a, 0x3c, 0x6a, 0x5f, 0x0a, 0x32, 0xf2, 0x98,
+ 0x94, 0xc1, 0x0f, 0x85, 0xf5, 0xac, 0x80, 0x22, 0x91, 0xfb, 0xef, 0x8c, 0x30, 0x66, 0x3a, 0xa8,
+ 0x7f, 0x2a, 0x60, 0xa5, 0xc8, 0x19, 0x99, 0xfd, 0x91, 0xb6, 0x28, 0xd6, 0xc0, 0xaf, 0xff, 0x6b,
+ 0x0d, 0x24, 0x0c, 0x2e, 0x4f, 0x55, 0xf5, 0x51, 0xca, 0x60, 0xb7, 0xdc, 0x43, 0xa4, 0x8f, 0x66,
+ 0x2f, 0x82, 0xf5, 0x6b, 0x61, 0x7c, 0x0d, 0x88, 0x4f, 0xbf, 0x24, 0xab, 0xee, 0x80, 0xf9, 0xc0,
+ 0x8a, 0x23, 0x8c, 0xb4, 0xba, 0xe8, 0xe6, 0x56, 0xc2, 0x60, 0x8e, 0xa4, 0x0c, 0x2e, 0x0b, 0xcb,
+ 0xec, 0xd8, 0x36, 0x72, 0x5c, 0xfd, 0x01, 0xac, 0x59, 0xae, 0x4b, 0x5e, 0x61, 0x64, 0xfa, 0x98,
+ 0xbe, 0x22, 0xe1, 0x49, 0xa4, 0x01, 0xf1, 0x9d, 0x7f, 0xcd, 0xe7, 0x39, 0xe7, 0x9e, 0xe7, 0x54,
+ 0xb1, 0xb8, 0xca, 0x78, 0x79, 0xd0, 0xb4, 0x59, 0xa4, 0x51, 0x95, 0x53, 0xbf, 0x03, 0x1b, 0x56,
+ 0x4c, 0x89, 0x69, 0xd9, 0x36, 0x0e, 0xa8, 0x79, 0x4c, 0x5c, 0x84, 0xc3, 0x48, 0x5b, 0x12, 0xe9,
+ 0x7f, 0x9c, 0x30, 0xb8, 0xce, 0xe9, 0xc7, 0x82, 0xfd, 0x32, 0x23, 0x53, 0x06, 0xef, 0x66, 0x29,
+ 0x54, 0x99, 0xb6, 0x71, 0x3d, 0x5a, 0x7d, 0x01, 0x56, 0x3c, 0xeb, 0xd4, 0x8c, 0xb0, 0x8f, 0xcc,
+ 0x93, 0x7e, 0x10, 0x69, 0xcb, 0x2d, 0xa5, 0x7b, 0x5b, 0xff, 0x88, 0x6f, 0x0c, 0xcf, 0x3a, 0xfd,
+ 0x06, 0xfb, 0xe8, 0xa0, 0x1f, 0x70, 0xd5, 0x75, 0xa1, 0x2a, 0x61, 0xed, 0xb7, 0x0c, 0xce, 0x39,
+ 0x3e, 0x35, 0xe4, 0xc0, 0x89, 0x60, 0x88, 0xed, 0x61, 0x26, 0xb8, 0x52, 0x12, 0x34, 0xb0, 0x3d,
+ 0xac, 0x0a, 0x4e, 0xb0, 0x92, 0xe0, 0x04, 0x54, 0x7d, 0xd0, 0x70, 0x06, 0x3e, 0x09, 0x31, 0x2a,
+ 0xea, 0x5f, 0x6d, 0xcd, 0x75, 0x97, 0x76, 0x36, 0x7b, 0xd9, 0xaf, 0xac, 0xf7, 0x22, 0xff, 0x95,
+ 0x65, 0x35, 0xe9, 0x8f, 0xf8, 0x2c, 0x26, 0x0c, 0xae, 0xe6, 0xd7, 0xa6, 0x8d, 0xd9, 0xc8, 0xa6,
+ 0x4a, 0x86, 0xdb, 0x46, 0x25, 0x4c, 0xfd, 0x59, 0x01, 0x8d, 0x00, 0xfb, 0xc8, 0xf1, 0x07, 0x85,
+ 0x61, 0xe3, 0x9d, 0x86, 0x4f, 0xb9, 0xe1, 0x25, 0x83, 0xda, 0x1e, 0x0e, 0x42, 0x6c, 0x5b, 0x14,
+ 0xa3, 0xc3, 0x4c, 0x20, 0xd7, 0x4c, 0x18, 0x54, 0x1e, 0x15, 0x3b, 0x28, 0x90, 0x39, 0x69, 0x34,
+ 0x34, 0xc5, 0x58, 0x2d, 0x71, 0x91, 0xfa, 0x9b, 0x02, 0x1a, 0x59, 0x37, 0xbf, 0x8f, 0x71, 0x44,
+ 0xcd, 0x13, 0xa7, 0xaf, 0xad, 0x89, 0x7e, 0x46, 0x97, 0x0c, 0xae, 0x3c, 0xe3, 0x6d, 0x12, 0xcc,
+ 0x81, 0xa3, 0x27, 0x0c, 0xae, 0x78, 0x32, 0x50, 0x14, 0x5c, 0x42, 0x27, 0x4d, 0x4e, 0x2e, 0x3a,
+ 0x95, 0xf0, 0x2a, 0x70, 0x36, 0xee, 0x94, 0x1d, 0x8c, 0x12, 0xdf, 0x57, 0xbf, 0x00, 0xf5, 0xd8,
+ 0xa7, 0x61, 0x1c, 0x51, 0x8c, 0xb4, 0x75, 0x31, 0x93, 0x2d, 0xfe, 0xf3, 0x2b, 0xc0, 0x94, 0xc1,
+ 0x86, 0xc8, 0xa0, 0x40, 0xda, 0xc6, 0x94, 0x15, 0xd5, 0xf1, 0x05, 0x47, 0xb1, 0x39, 0x88, 0x1d,
+ 0x33, 0x20, 0x21, 0xd5, 0xd4, 0x69, 0x75, 0x86, 0xa0, 0xbe, 0xfa, 0x76, 0xff, 0x90, 0x84, 0x94,
+ 0x57, 0x17, 0xca, 0x40, 0x51, 0x5d, 0x09, 0x95, 0xab, 0x2b, 0x87, 0x57, 0x01, 0x5e, 0x5d, 0xc9,
+ 0xc1, 0x98, 0xf0, 0xb1, 0xc3, 0x8f, 0xfa, 0xc1, 0xf9, 0x9b, 0x66, 0x6d, 0xfc, 0xa6, 0x59, 0x3b,
+ 0xbf, 0x6c, 0x2a, 0xe3, 0xcb, 0xa6, 0xf2, 0xcb, 0x55, 0xb3, 0xf6, 0xfa, 0xaa, 0xa9, 0x8c, 0xaf,
+ 0x9a, 0xb5, 0xbf, 0xaf, 0x9a, 0xb5, 0xa3, 0x07, 0xff, 0x61, 0xd9, 0x65, 0x13, 0xd3, 0x9f, 0x17,
+ 0x4b, 0xef, 0x93, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x60, 0x13, 0xd0, 0xc1, 0xc8, 0x09, 0x00,
+ 0x00,
}
func (m *DeviceConfiguration) Marshal() (dAtA []byte, err error) {
@@ -176,6 +180,13 @@ func (m *DeviceConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
+ if m.CompressionAlgo != 0 {
+ i = encodeVarintDeviceconfiguration(dAtA, i, uint64(m.CompressionAlgo))
+ i--
+ dAtA[i] = 0x1
+ i--
+ dAtA[i] = 0x98
+ }
if m.RemoteGUIPort != 0 {
i = encodeVarintDeviceconfiguration(dAtA, i, uint64(m.RemoteGUIPort))
i--
@@ -423,6 +434,9 @@ func (m *DeviceConfiguration) ProtoSize() (n int) {
if m.RemoteGUIPort != 0 {
n += 2 + sovDeviceconfiguration(uint64(m.RemoteGUIPort))
}
+ if m.CompressionAlgo != 0 {
+ n += 2 + sovDeviceconfiguration(uint64(m.CompressionAlgo))
+ }
return n
}
@@ -918,6 +932,25 @@ func (m *DeviceConfiguration) Unmarshal(dAtA []byte) error {
break
}
}
+ case 19:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CompressionAlgo", wireType)
+ }
+ m.CompressionAlgo = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowDeviceconfiguration
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.CompressionAlgo |= protocol.MessageCompression(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipDeviceconfiguration(dAtA[iNdEx:])
diff --git a/lib/connections/service.go b/lib/connections/service.go
index 55118f8fb..bed7d26aa 100644
--- a/lib/connections/service.go
+++ b/lib/connections/service.go
@@ -412,7 +412,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, deviceCfg.CompressionAlgo, s.cfg.FolderPasswords(remoteID), s.keyGen)
go func() {
<-protoConn.Closed()
s.dialNowDevicesMut.Lock()
diff --git a/lib/model/model_test.go b/lib/model/model_test.go
index a8bbddd12..598e6b8e4 100644
--- a/lib/model/model_test.go
+++ b/lib/model/model_test.go
@@ -2968,7 +2968,7 @@ func TestConnCloseOnRestart(t *testing.T) {
br := &testutils.BlockingRW{}
nw := &testutils.NoopRW{}
- m.AddConnection(protocol.NewConnection(device1, br, nw, testutils.NoopCloser{}, m, new(protocolmocks.ConnectionInfo), protocol.CompressionNever, nil, m.keyGen), protocol.Hello{})
+ m.AddConnection(protocol.NewConnection(device1, br, nw, testutils.NoopCloser{}, m, new(protocolmocks.ConnectionInfo), protocol.CompressionNever, protocol.MessageCompressionNone, nil, m.keyGen), protocol.Hello{})
m.pmut.RLock()
if len(m.closed) != 1 {
t.Fatalf("Expected just one conn (len(m.conn) == %v)", len(m.conn))
diff --git a/lib/protocol/benchmark_test.go b/lib/protocol/benchmark_test.go
index c740e0725..288024052 100644
--- a/lib/protocol/benchmark_test.go
+++ b/lib/protocol/benchmark_test.go
@@ -60,9 +60,9 @@ func benchmarkRequestsTLS(b *testing.B, conn0, conn1 net.Conn) {
func benchmarkRequestsConnPair(b *testing.B, conn0, conn1 net.Conn) {
// Start up Connections on them
- c0 := NewConnection(LocalDeviceID, conn0, conn0, testutils.NoopCloser{}, new(fakeModel), new(mockedConnectionInfo), CompressionMetadata, nil, testKeyGen)
+ c0 := NewConnection(LocalDeviceID, conn0, conn0, testutils.NoopCloser{}, new(fakeModel), new(mockedConnectionInfo), CompressionMetadata, MessageCompressionLZMA2, nil, testKeyGen)
c0.Start()
- c1 := NewConnection(LocalDeviceID, conn1, conn1, testutils.NoopCloser{}, new(fakeModel), new(mockedConnectionInfo), CompressionMetadata, nil, testKeyGen)
+ c1 := NewConnection(LocalDeviceID, conn1, conn1, testutils.NoopCloser{}, new(fakeModel), new(mockedConnectionInfo), CompressionMetadata, MessageCompressionLZMA2, nil, testKeyGen)
c1.Start()
// Satisfy the assertions in the protocol by sending an initial cluster config
diff --git a/lib/protocol/bep.pb.go b/lib/protocol/bep.pb.go
index 38a258a71..370fddbae 100644
--- a/lib/protocol/bep.pb.go
+++ b/lib/protocol/bep.pb.go
@@ -70,18 +70,21 @@ func (MessageType) EnumDescriptor() ([]byte, []int) {
type MessageCompression int32
const (
- MessageCompressionNone MessageCompression = 0
- MessageCompressionLZ4 MessageCompression = 1
+ MessageCompressionNone MessageCompression = 0
+ MessageCompressionLZ4 MessageCompression = 1
+ MessageCompressionLZMA2 MessageCompression = 2
)
var MessageCompression_name = map[int32]string{
0: "MESSAGE_COMPRESSION_NONE",
1: "MESSAGE_COMPRESSION_LZ4",
+ 2: "MESSAGE_COMPRESSION_LZMA2",
}
var MessageCompression_value = map[string]int32{
- "MESSAGE_COMPRESSION_NONE": 0,
- "MESSAGE_COMPRESSION_LZ4": 1,
+ "MESSAGE_COMPRESSION_NONE": 0,
+ "MESSAGE_COMPRESSION_LZ4": 1,
+ "MESSAGE_COMPRESSION_LZMA2": 2,
}
func (x MessageCompression) String() string {
@@ -1142,205 +1145,207 @@ func init() {
func init() { proto.RegisterFile("lib/protocol/bep.proto", fileDescriptor_311ef540e10d9705) }
var fileDescriptor_311ef540e10d9705 = []byte{
- // 3163 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4d, 0x6c, 0x1b, 0xc7,
- 0xbd, 0x17, 0xc5, 0x0f, 0x51, 0x23, 0xc9, 0xa6, 0xc6, 0x5f, 0x0c, 0x6d, 0x6b, 0xf9, 0x26, 0xce,
- 0x7b, 0x8a, 0xf2, 0x62, 0x27, 0xca, 0xc7, 0xcb, 0x8b, 0xf3, 0x1c, 0x88, 0x22, 0x25, 0x33, 0x96,
- 0x49, 0x65, 0x28, 0xdb, 0xb1, 0xf1, 0x1e, 0x88, 0x15, 0x77, 0x44, 0x2d, 0x4c, 0xee, 0xf2, 0xed,
- 0x52, 0x5f, 0x41, 0x2f, 0x6d, 0x80, 0x20, 0xd0, 0xa1, 0x28, 0x72, 0x2a, 0x8a, 0x0a, 0x0d, 0x7a,
- 0xe9, 0xad, 0x40, 0x0f, 0xbd, 0xe4, 0xd4, 0xa3, 0x8f, 0x46, 0x80, 0x02, 0x45, 0x0f, 0x0b, 0xc4,
- 0xbe, 0xb4, 0xec, 0x8d, 0xc7, 0x9e, 0x8a, 0xf9, 0xcf, 0xec, 0xec, 0xac, 0x3e, 0x52, 0x39, 0x39,
- 0xf4, 0x64, 0xfe, 0x7f, 0xff, 0xdf, 0xff, 0xbf, 0xb3, 0xf3, 0xff, 0x9a, 0x59, 0x19, 0x5d, 0xec,
- 0xd8, 0xeb, 0x37, 0x7a, 0x9e, 0xdb, 0x77, 0x5b, 0x6e, 0xe7, 0xc6, 0x3a, 0xeb, 0x5d, 0x07, 0x01,
- 0x67, 0x43, 0xac, 0x30, 0xce, 0x76, 0xfb, 0x02, 0x2c, 0xbc, 0xec, 0xb1, 0x9e, 0xeb, 0x0b, 0xfa,
- 0xfa, 0xd6, 0xc6, 0x8d, 0xb6, 0xdb, 0x76, 0x41, 0x80, 0x5f, 0x82, 0x44, 0x9e, 0x25, 0x50, 0xfa,
- 0x36, 0xeb, 0x74, 0x5c, 0xbc, 0x88, 0x26, 0x2c, 0xb6, 0x6d, 0xb7, 0x58, 0xd3, 0x31, 0xbb, 0x2c,
- 0x9f, 0x28, 0x26, 0x66, 0xc7, 0x4b, 0x64, 0x10, 0x18, 0x48, 0xc0, 0x35, 0xb3, 0xcb, 0x86, 0x81,
- 0x91, 0xdb, 0xed, 0x76, 0xde, 0x27, 0x11, 0x44, 0xa8, 0xa6, 0xe7, 0x4e, 0x5a, 0x1d, 0x9b, 0x39,
- 0x7d, 0xe1, 0x64, 0x34, 0x72, 0x22, 0xe0, 0x98, 0x93, 0x08, 0x22, 0x54, 0xd3, 0xe3, 0x3a, 0x3a,
- 0x23, 0x9d, 0x6c, 0x33, 0xcf, 0xb7, 0x5d, 0x27, 0x9f, 0x04, 0x3f, 0xb3, 0x83, 0xc0, 0x98, 0x12,
- 0x9a, 0xfb, 0x42, 0x31, 0x0c, 0x8c, 0x73, 0x9a, 0x2b, 0x89, 0x12, 0x1a, 0x67, 0x91, 0xdf, 0x25,
- 0x50, 0xe6, 0x36, 0x33, 0x2d, 0xe6, 0xe1, 0x05, 0x94, 0xea, 0xef, 0xf5, 0xc4, 0xeb, 0x9d, 0x99,
- 0xbf, 0x70, 0x3d, 0xdc, 0xb8, 0xeb, 0x77, 0x99, 0xef, 0x9b, 0x6d, 0xb6, 0xb6, 0xd7, 0x63, 0xa5,
- 0x8b, 0x83, 0xc0, 0x00, 0xda, 0x30, 0x30, 0x10, 0xf8, 0xe7, 0x02, 0xa1, 0x80, 0x61, 0x0b, 0x4d,
- 0xb4, 0xdc, 0x6e, 0xcf, 0x63, 0x3e, 0xac, 0x6d, 0x14, 0x3c, 0x5d, 0x39, 0xe2, 0x69, 0x31, 0xe2,
- 0x94, 0xae, 0x0d, 0x02, 0x43, 0x37, 0x1a, 0x06, 0xc6, 0xb4, 0x58, 0x77, 0x84, 0x11, 0xaa, 0x33,
- 0xc8, 0xff, 0xa2, 0xa9, 0xc5, 0xce, 0x96, 0xdf, 0x67, 0xde, 0xa2, 0xeb, 0x6c, 0xd8, 0x6d, 0x7c,
- 0x07, 0x8d, 0x6d, 0xb8, 0x1d, 0x8b, 0x79, 0x7e, 0x3e, 0x51, 0x4c, 0xce, 0x4e, 0xcc, 0xe7, 0xa2,
- 0x47, 0x2e, 0x81, 0xa2, 0x64, 0x3c, 0x09, 0x8c, 0x91, 0x41, 0x60, 0x84, 0xc4, 0x61, 0x60, 0x4c,
- 0xc2, 0x63, 0x84, 0x4c, 0x68, 0xa8, 0x20, 0x5f, 0xa7, 0x50, 0x46, 0x18, 0xe1, 0xeb, 0x68, 0xd4,
- 0xb6, 0x64, 0xb8, 0x67, 0x9e, 0x05, 0xc6, 0x68, 0xb5, 0x3c, 0x08, 0x8c, 0x51, 0xdb, 0x1a, 0x06,
- 0x46, 0x16, 0xac, 0x6d, 0x8b, 0x7c, 0xf9, 0xf4, 0xda, 0x68, 0xb5, 0x4c, 0x47, 0x6d, 0x0b, 0x5f,
- 0x47, 0xe9, 0x8e, 0xb9, 0xce, 0x3a, 0x32, 0xb8, 0xf9, 0x41, 0x60, 0x08, 0x60, 0x18, 0x18, 0x13,
- 0xc0, 0x07, 0x89, 0x50, 0x81, 0xe2, 0x9b, 0x68, 0xdc, 0x63, 0xa6, 0xd5, 0x74, 0x9d, 0xce, 0x1e,
- 0x04, 0x32, 0x5b, 0x9a, 0x19, 0x04, 0x46, 0x96, 0x83, 0x75, 0xa7, 0xb3, 0x37, 0x0c, 0x8c, 0x33,
- 0x60, 0x16, 0x02, 0x84, 0x2a, 0x1d, 0x6e, 0x22, 0x6c, 0xb7, 0x1d, 0xd7, 0x63, 0xcd, 0x1e, 0xf3,
- 0xba, 0x36, 0x6c, 0x8d, 0x9f, 0x4f, 0x81, 0x97, 0x37, 0x06, 0x81, 0x31, 0x2d, 0xb4, 0xab, 0x91,
- 0x72, 0x18, 0x18, 0x97, 0xc4, 0xaa, 0x0f, 0x6b, 0x08, 0x3d, 0xca, 0xc6, 0x77, 0xd0, 0x94, 0x7c,
- 0x80, 0xc5, 0x3a, 0xac, 0xcf, 0xf2, 0x69, 0xf0, 0xfd, 0xef, 0x83, 0xc0, 0x98, 0x14, 0x8a, 0x32,
- 0xe0, 0xc3, 0xc0, 0xc0, 0x9a, 0x5b, 0x01, 0x12, 0x1a, 0xe3, 0x60, 0x0b, 0x9d, 0xb7, 0x6c, 0xdf,
- 0x5c, 0xef, 0xb0, 0x66, 0x9f, 0x75, 0x7b, 0x4d, 0xdb, 0xb1, 0xd8, 0x2e, 0xf3, 0xf3, 0x19, 0xf0,
- 0x39, 0x3f, 0x08, 0x0c, 0x2c, 0xf5, 0x6b, 0xac, 0xdb, 0xab, 0x0a, 0xed, 0x30, 0x30, 0xf2, 0xa2,
- 0xa6, 0x8e, 0xa8, 0x08, 0x3d, 0x86, 0x8f, 0xe7, 0x51, 0xa6, 0x67, 0x6e, 0xf9, 0xcc, 0xca, 0x8f,
- 0x81, 0xdf, 0xc2, 0x20, 0x30, 0x24, 0xa2, 0x02, 0x2e, 0x44, 0x42, 0x25, 0xce, 0x93, 0x47, 0x54,
- 0xa9, 0x9f, 0xcf, 0x1d, 0x4e, 0x9e, 0x32, 0x28, 0xa2, 0xe4, 0x91, 0x44, 0xe5, 0x4b, 0xc8, 0x84,
- 0x86, 0x0a, 0xf2, 0x87, 0x0c, 0xca, 0x08, 0x23, 0x5c, 0x52, 0xc9, 0x33, 0x59, 0x9a, 0xe7, 0x0e,
- 0xfe, 0x1c, 0x18, 0x59, 0xa1, 0xab, 0x96, 0x4f, 0x4a, 0xa6, 0x2f, 0x9e, 0x5e, 0x4b, 0x68, 0x09,
- 0x35, 0x87, 0x52, 0x5a, 0xb3, 0x80, 0xda, 0x73, 0x44, 0x9b, 0x10, 0xb5, 0xe7, 0x40, 0x83, 0x00,
- 0x0c, 0x7f, 0x80, 0xc6, 0x4d, 0xcb, 0xe2, 0x35, 0xc2, 0xfc, 0x7c, 0xb2, 0x98, 0xe4, 0x39, 0x3b,
- 0x08, 0x8c, 0x08, 0x1c, 0x06, 0xc6, 0x14, 0x58, 0x49, 0x84, 0xd0, 0x48, 0x87, 0xff, 0x2f, 0x5e,
- 0xb9, 0xa9, 0xc3, 0x3d, 0xe0, 0x87, 0x95, 0x2c, 0xcf, 0xf4, 0x16, 0xf3, 0x64, 0xeb, 0x4b, 0x8b,
- 0x82, 0xe2, 0x99, 0xce, 0x41, 0xd9, 0xf8, 0x44, 0xa6, 0x87, 0x00, 0xa1, 0x4a, 0x87, 0x97, 0xd1,
- 0x64, 0xd7, 0xdc, 0x6d, 0xfa, 0xec, 0xff, 0xb7, 0x98, 0xd3, 0x62, 0x90, 0x33, 0x49, 0xb1, 0x8a,
- 0xae, 0xb9, 0xdb, 0x90, 0xb0, 0x5a, 0x85, 0x86, 0x11, 0xaa, 0x33, 0x70, 0x09, 0x21, 0xdb, 0xe9,
- 0x7b, 0xae, 0xb5, 0xd5, 0x62, 0x9e, 0x4c, 0x11, 0xe8, 0xc0, 0x11, 0xaa, 0x3a, 0x70, 0x04, 0x11,
- 0xaa, 0xe9, 0x71, 0x1b, 0x65, 0x21, 0x77, 0x9b, 0xb6, 0x95, 0xcf, 0x16, 0x13, 0xb3, 0xa9, 0xd2,
- 0x8a, 0x0c, 0xee, 0x18, 0x64, 0x21, 0xc4, 0x36, 0xfc, 0xc9, 0x73, 0x06, 0xd8, 0x55, 0x4b, 0xed,
- 0xbe, 0x94, 0x79, 0xdf, 0x08, 0x69, 0xbf, 0x88, 0x7e, 0xd2, 0x90, 0x8f, 0x7f, 0x84, 0x0a, 0xfe,
- 0x63, 0x9b, 0x57, 0x8a, 0x78, 0x76, 0xdf, 0x76, 0x9d, 0xa6, 0xc7, 0xba, 0xee, 0xb6, 0xd9, 0xf1,
- 0xf3, 0xe3, 0xb0, 0xf8, 0x5b, 0x83, 0xc0, 0xc8, 0x73, 0x56, 0x55, 0x23, 0x51, 0xc9, 0x19, 0x06,
- 0xc6, 0x0c, 0x3c, 0xf1, 0x24, 0x02, 0xa1, 0x27, 0xda, 0xe2, 0x5d, 0xf4, 0x12, 0x73, 0x5a, 0xde,
- 0x5e, 0x0f, 0x1e, 0xdb, 0x33, 0x7d, 0x7f, 0xc7, 0xf5, 0xac, 0x66, 0xdf, 0x7d, 0xcc, 0x9c, 0x3c,
- 0x82, 0xa4, 0xfe, 0x60, 0x10, 0x18, 0x97, 0x22, 0xd2, 0xaa, 0xe4, 0xac, 0x71, 0xca, 0x30, 0x30,
- 0xae, 0xc2, 0xb3, 0x4f, 0xd0, 0x13, 0x7a, 0x92, 0x25, 0xf9, 0x49, 0x02, 0xa5, 0x61, 0x33, 0x78,
- 0x35, 0x8b, 0xa6, 0x2c, 0x5b, 0x30, 0x54, 0xb3, 0x40, 0x8e, 0xb4, 0x6f, 0x89, 0xe3, 0x0a, 0x4a,
- 0x6f, 0xd8, 0x1d, 0xe6, 0xe7, 0x47, 0xa1, 0x96, 0xb1, 0x36, 0x08, 0xec, 0x0e, 0xab, 0x3a, 0x1b,
- 0x6e, 0xe9, 0xb2, 0xac, 0x66, 0x41, 0x54, 0xb5, 0xc4, 0x25, 0x42, 0x05, 0x48, 0xbe, 0x48, 0xa0,
- 0x09, 0x58, 0xc4, 0xbd, 0x9e, 0x65, 0xf6, 0xd9, 0xbf, 0x72, 0x29, 0x9f, 0x4f, 0xa1, 0x6c, 0x68,
- 0xa0, 0x1a, 0x42, 0xe2, 0x14, 0x0d, 0x61, 0x0e, 0xa5, 0x7c, 0xfb, 0x53, 0x06, 0x83, 0x25, 0x29,
- 0xb8, 0x5c, 0x56, 0x5c, 0x2e, 0x10, 0x0a, 0x18, 0xfe, 0x10, 0xa1, 0xae, 0x6b, 0xd9, 0x1b, 0x36,
- 0xb3, 0x9a, 0x3e, 0x14, 0x68, 0xb2, 0x54, 0xe4, 0xdd, 0x23, 0x44, 0x1b, 0xc3, 0xc0, 0x38, 0x2b,
- 0xca, 0x2b, 0x44, 0x08, 0x8d, 0xb4, 0xbc, 0x7f, 0x28, 0x07, 0xeb, 0x7b, 0xf9, 0x49, 0xa8, 0x8c,
- 0x0f, 0xc2, 0xca, 0x68, 0x6c, 0xba, 0x5e, 0x1f, 0xca, 0x41, 0x3d, 0xa6, 0xb4, 0xa7, 0x4a, 0x2d,
- 0x82, 0x08, 0xaf, 0x04, 0x49, 0xa6, 0x1a, 0x15, 0xaf, 0xa0, 0xb1, 0xf0, 0xc0, 0xc3, 0x33, 0x3f,
- 0xd6, 0xa4, 0xef, 0xb3, 0x56, 0xdf, 0xf5, 0x4a, 0xc5, 0xb0, 0x49, 0x6f, 0xab, 0x03, 0x90, 0x28,
- 0xb8, 0xed, 0xf0, 0xe8, 0x13, 0x6a, 0xf0, 0xfb, 0x28, 0xab, 0x9a, 0x09, 0x82, 0x77, 0x85, 0x66,
- 0xe4, 0x47, 0x9d, 0x44, 0x34, 0x23, 0x5f, 0xb5, 0x11, 0xa5, 0xc3, 0x1f, 0xa1, 0xcc, 0x7a, 0xc7,
- 0x6d, 0x3d, 0x0e, 0xa7, 0xc5, 0xb9, 0x68, 0x21, 0x25, 0x8e, 0x43, 0x5c, 0xaf, 0xca, 0xb5, 0x48,
- 0xaa, 0x1a, 0xff, 0x20, 0x12, 0x2a, 0x61, 0x7e, 0x9a, 0xf3, 0xf7, 0xba, 0x1d, 0xdb, 0x79, 0xdc,
- 0xec, 0x9b, 0x5e, 0x9b, 0xf5, 0xf3, 0xd3, 0xd1, 0x69, 0x4e, 0x6a, 0xd6, 0x40, 0xa1, 0x4e, 0x73,
- 0x31, 0x94, 0xd0, 0x38, 0x8b, 0x9f, 0x31, 0x85, 0xeb, 0xe6, 0xa6, 0xe9, 0x6f, 0xe6, 0x31, 0xd4,
- 0x29, 0x74, 0x38, 0x01, 0xdf, 0x36, 0xfd, 0x4d, 0xb5, 0xed, 0x11, 0x44, 0xa8, 0xa6, 0xc7, 0xb7,
- 0xd0, 0xb8, 0xac, 0x4d, 0x66, 0xe5, 0xcf, 0x81, 0x0b, 0x48, 0x05, 0x05, 0xaa, 0x54, 0x50, 0x08,
- 0xa1, 0x91, 0x16, 0x97, 0xe4, 0x39, 0x52, 0x9c, 0xfe, 0x2e, 0x1e, 0x4d, 0xfb, 0x53, 0x1c, 0x24,
- 0x97, 0xd0, 0xc4, 0xe1, 0x53, 0xcd, 0x94, 0xe8, 0xf8, 0xbd, 0xd8, 0x79, 0x46, 0x74, 0xfc, 0x9e,
- 0x7e, 0x92, 0xd1, 0x19, 0xf8, 0x23, 0x2d, 0x2d, 0x1d, 0x3f, 0x3f, 0x51, 0x4c, 0xcc, 0xa6, 0x4b,
- 0xaf, 0xea, 0x79, 0x58, 0xf3, 0x8f, 0xe4, 0x61, 0xcd, 0x27, 0x7f, 0x0f, 0x8c, 0xa4, 0xed, 0xf4,
- 0xa9, 0x46, 0xc3, 0x1b, 0x48, 0xec, 0x52, 0x13, 0xaa, 0x6a, 0x0a, 0x5c, 0x2d, 0x3f, 0x0b, 0x8c,
- 0x49, 0x6a, 0xee, 0x40, 0xe8, 0x1b, 0xf6, 0xa7, 0x8c, 0x6f, 0xd4, 0x7a, 0x28, 0xa8, 0x8d, 0x52,
- 0x48, 0xe8, 0xf8, 0xcb, 0xa7, 0xd7, 0x62, 0x66, 0x34, 0x32, 0xc2, 0xf7, 0x51, 0xb6, 0xd7, 0x31,
- 0xfb, 0x1b, 0xae, 0xd7, 0xcd, 0x9f, 0x81, 0x64, 0xd7, 0xf6, 0x70, 0x55, 0x6a, 0xca, 0x66, 0xdf,
- 0x2c, 0x11, 0x99, 0x66, 0x8a, 0xaf, 0x32, 0x37, 0x04, 0x08, 0x55, 0x3a, 0x5c, 0x46, 0x13, 0x1d,
- 0xb7, 0x65, 0x76, 0x9a, 0x1b, 0x1d, 0xb3, 0xed, 0xe7, 0xff, 0x32, 0x06, 0x9b, 0x0a, 0xd9, 0x01,
- 0xf8, 0x12, 0x87, 0xd5, 0x66, 0x44, 0x10, 0xa1, 0x9a, 0x1e, 0xdf, 0x46, 0x93, 0xb2, 0x8c, 0x44,
- 0x8e, 0xfd, 0x75, 0x0c, 0x32, 0x04, 0x62, 0x23, 0x15, 0x32, 0xcb, 0xa6, 0xf5, 0xea, 0x13, 0x69,
- 0xa6, 0x33, 0xf0, 0xc7, 0xe8, 0xac, 0xed, 0xb8, 0x16, 0x6b, 0xb6, 0x36, 0x4d, 0xa7, 0xcd, 0x78,
- 0x7c, 0x06, 0x63, 0x50, 0x8d, 0x90, 0xff, 0xa0, 0x5b, 0x04, 0x15, 0xc4, 0xe8, 0x9c, 0x9c, 0x9e,
- 0x1a, 0x4a, 0x68, 0x9c, 0x85, 0x77, 0x91, 0x36, 0x56, 0x9a, 0x7d, 0xcf, 0xb4, 0x3b, 0xcc, 0x13,
- 0xf1, 0xfa, 0xdb, 0x18, 0x04, 0xec, 0xc3, 0x41, 0x60, 0x5c, 0x88, 0x38, 0x6b, 0x82, 0x22, 0x83,
- 0x75, 0xf9, 0xd0, 0xc8, 0xd2, 0xb4, 0x2a, 0x23, 0x8e, 0x37, 0xc6, 0xef, 0xf2, 0x53, 0x24, 0x3f,
- 0xe9, 0x5a, 0xf2, 0x48, 0x7b, 0x45, 0x9c, 0x17, 0x01, 0x52, 0xad, 0x48, 0xca, 0x70, 0x60, 0x84,
- 0x5f, 0x98, 0xa2, 0x31, 0xdb, 0xd9, 0x36, 0x3b, 0x76, 0x78, 0x64, 0x7d, 0xef, 0x59, 0x60, 0x20,
- 0x6a, 0xee, 0x54, 0x05, 0x2a, 0x4e, 0x10, 0xf0, 0x53, 0x3b, 0x41, 0x80, 0xcc, 0x4f, 0x10, 0x1a,
- 0x93, 0x86, 0x3c, 0xde, 0x56, 0x1c, 0x37, 0x76, 0x2b, 0xc8, 0x82, 0x6b, 0xd8, 0x56, 0xc7, 0x8d,
- 0xdf, 0x08, 0xc4, 0xb6, 0xc6, 0x50, 0x42, 0xe3, 0xac, 0xf7, 0x53, 0x3f, 0xff, 0xca, 0x18, 0x21,
- 0xdf, 0x26, 0xd0, 0xb8, 0x6a, 0x71, 0x7c, 0xba, 0x40, 0xfc, 0x93, 0x10, 0x7e, 0xa8, 0xe6, 0x4d,
- 0x11, 0x77, 0x51, 0xcd, 0x9b, 0x10, 0x70, 0xc0, 0xf8, 0xf4, 0x74, 0x37, 0x36, 0x7c, 0xd6, 0x87,
- 0xb9, 0x95, 0x14, 0xd3, 0x53, 0x20, 0x6a, 0x7a, 0x0a, 0x91, 0x50, 0x89, 0xe3, 0x37, 0xe5, 0xf4,
- 0x1a, 0x85, 0xb0, 0x5d, 0x3d, 0x7e, 0x7a, 0x85, 0x41, 0x11, 0x43, 0xec, 0x26, 0x1a, 0xdf, 0x61,
- 0xe6, 0x63, 0x91, 0x97, 0xa2, 0x65, 0x40, 0x5f, 0xe7, 0xa0, 0xcc, 0x49, 0x51, 0x1d, 0x21, 0x40,
- 0xa8, 0xd2, 0xc9, 0x77, 0x7c, 0x84, 0x32, 0x62, 0x9c, 0xe0, 0x55, 0x94, 0x6d, 0xb9, 0x5b, 0x4e,
- 0x3f, 0xba, 0x54, 0x4e, 0xeb, 0xa7, 0x61, 0xd0, 0x94, 0xfe, 0x2d, 0x2c, 0xc0, 0x90, 0xaa, 0x62,
- 0x24, 0x01, 0x7e, 0x8c, 0x95, 0x2a, 0xf2, 0x59, 0x02, 0x8d, 0x49, 0x43, 0x7c, 0x5b, 0x5d, 0x0e,
- 0x52, 0xa5, 0xf7, 0x0e, 0x4d, 0xc9, 0xef, 0xbe, 0x68, 0xea, 0x13, 0x52, 0xde, 0x39, 0xb7, 0xcd,
- 0xce, 0x96, 0xd8, 0xa8, 0x94, 0xb8, 0x73, 0x02, 0xa0, 0x86, 0x0e, 0x48, 0x84, 0x0a, 0x94, 0x7c,
- 0x96, 0x42, 0x93, 0x7a, 0x13, 0xe1, 0xed, 0x7a, 0xcb, 0xb1, 0x77, 0x61, 0x31, 0xb1, 0x53, 0xca,
- 0x3d, 0xc7, 0xde, 0x85, 0x36, 0x53, 0x78, 0x12, 0x18, 0x09, 0x1e, 0x00, 0xce, 0x53, 0x01, 0xe0,
- 0x02, 0xa1, 0x80, 0xe1, 0x8f, 0xd1, 0xd8, 0x8e, 0xed, 0x58, 0xee, 0x8e, 0x0f, 0xcb, 0x98, 0xd0,
- 0x6f, 0x0e, 0x0f, 0x84, 0x02, 0x3c, 0x15, 0xa5, 0xa7, 0x90, 0xad, 0xb6, 0x4b, 0xca, 0x84, 0x86,
- 0x1a, 0xbc, 0x8c, 0xd2, 0x1d, 0xdb, 0xd9, 0xda, 0x85, 0x04, 0x8b, 0x8d, 0xd9, 0x4f, 0xcc, 0x7e,
- 0xdf, 0x03, 0x77, 0x57, 0xa4, 0x3b, 0xc1, 0x8c, 0x2e, 0xd9, 0x5c, 0xe2, 0x97, 0x6c, 0xfe, 0x2f,
- 0xbe, 0x83, 0x32, 0x96, 0xe9, 0xed, 0xd8, 0xe2, 0x52, 0x73, 0x82, 0xa7, 0x19, 0xe9, 0x49, 0x52,
- 0xa3, 0x0b, 0x1e, 0x88, 0x84, 0x4a, 0x1c, 0x33, 0x34, 0xb6, 0xe1, 0x31, 0xb6, 0xee, 0x5b, 0x70,
- 0x48, 0x3a, 0xc1, 0xdb, 0xbb, 0xdc, 0x1b, 0xbf, 0x06, 0x2c, 0x79, 0x8c, 0x95, 0x1a, 0x70, 0x0d,
- 0x90, 0x66, 0xea, 0x8d, 0xa5, 0x0c, 0xd7, 0x00, 0x49, 0xa3, 0x21, 0x09, 0x37, 0x51, 0xc6, 0x61,
- 0x7d, 0xfe, 0x94, 0xcc, 0xc9, 0x4f, 0x99, 0x97, 0x4f, 0xc9, 0xd4, 0x58, 0x5f, 0x3c, 0x44, 0x1a,
- 0xa9, 0xd5, 0x0b, 0x91, 0x3f, 0x42, 0x72, 0xa8, 0x64, 0x90, 0xcf, 0x47, 0x51, 0x36, 0x8c, 0x2f,
- 0x3f, 0xfc, 0xb9, 0x3b, 0x0e, 0xf3, 0xf4, 0xaf, 0x5b, 0x30, 0xf1, 0x01, 0x95, 0xd7, 0x33, 0x31,
- 0xc8, 0x14, 0x42, 0x68, 0xa4, 0xe5, 0x0e, 0xda, 0x9e, 0xbb, 0xd5, 0xd3, 0xbf, 0x6c, 0x81, 0x03,
- 0x40, 0x63, 0x0e, 0x14, 0x42, 0x68, 0xa4, 0xc5, 0x37, 0x51, 0x72, 0xcb, 0xb6, 0x20, 0xd4, 0xe9,
- 0xd2, 0xab, 0xcf, 0x02, 0x23, 0x79, 0x0f, 0x2a, 0x80, 0xa3, 0xc3, 0xc0, 0x18, 0x17, 0x09, 0x67,
- 0x5b, 0xda, 0xf8, 0xe4, 0x0c, 0xca, 0xf5, 0xdc, 0xb8, 0x6d, 0x5b, 0x10, 0x5d, 0x69, 0xbc, 0x2c,
- 0x8c, 0xdb, 0x9a, 0x71, 0x3b, 0x6e, 0xbc, 0xcc, 0x8d, 0x39, 0xf6, 0xcb, 0x04, 0x9a, 0xd0, 0x32,
- 0xf4, 0x87, 0xef, 0xc5, 0x0a, 0x3a, 0x23, 0x1c, 0xd8, 0x7e, 0x13, 0x5e, 0x10, 0xf6, 0x43, 0x7e,
- 0x36, 0x01, 0x4d, 0xd5, 0x5f, 0xe6, 0xb8, 0xfa, 0x6c, 0xa2, 0x83, 0x84, 0xc6, 0x38, 0xa4, 0x81,
- 0xc6, 0x55, 0xc0, 0xf1, 0x12, 0xca, 0xec, 0x72, 0x21, 0x6c, 0x48, 0x67, 0x0f, 0x65, 0x45, 0x74,
- 0xec, 0x14, 0x34, 0x55, 0x10, 0x20, 0x12, 0x2a, 0x61, 0xd2, 0x42, 0x69, 0xe0, 0xbf, 0xd0, 0x6d,
- 0x22, 0xd6, 0x67, 0x26, 0xff, 0x79, 0x9f, 0xf9, 0x71, 0x0a, 0x8d, 0x51, 0x7e, 0x68, 0xf6, 0xfb,
- 0xf8, 0x1d, 0xd5, 0xed, 0xd2, 0xa5, 0x57, 0x4e, 0x6a, 0x6f, 0x51, 0x74, 0xc2, 0xaf, 0x1f, 0xd1,
- 0xa5, 0x6b, 0xf4, 0xd4, 0x97, 0xae, 0xf0, 0x95, 0x92, 0xa7, 0x78, 0xa5, 0x68, 0x2c, 0xa5, 0x5e,
- 0x78, 0x2c, 0xa5, 0x4f, 0x3f, 0x96, 0xc2, 0x49, 0x99, 0x39, 0xc5, 0xa4, 0xac, 0xa3, 0x33, 0x1b,
- 0x9e, 0xdb, 0x85, 0x6f, 0x64, 0xae, 0x67, 0x7a, 0x7b, 0xf2, 0x54, 0x00, 0xa3, 0x9b, 0x6b, 0xd6,
- 0x42, 0x85, 0x1a, 0xdd, 0x31, 0x94, 0xd0, 0x38, 0x2b, 0x3e, 0x13, 0xb3, 0x2f, 0x36, 0x13, 0xf1,
- 0x2d, 0x94, 0x15, 0x27, 0x5e, 0xc7, 0x85, 0x6b, 0x57, 0xba, 0xf4, 0x32, 0x6f, 0x65, 0x80, 0xd5,
- 0x5c, 0xd5, 0xca, 0xa4, 0xac, 0x5e, 0x3b, 0x24, 0x90, 0xdf, 0x26, 0x50, 0x96, 0x32, 0xbf, 0xe7,
- 0x3a, 0x3e, 0xfb, 0xbe, 0x49, 0x30, 0x87, 0x52, 0x96, 0xd9, 0x37, 0x65, 0xda, 0xc1, 0xee, 0x71,
- 0x59, 0xed, 0x1e, 0x17, 0x08, 0x05, 0x0c, 0x7f, 0x88, 0x52, 0x2d, 0xd7, 0x12, 0xc1, 0x3f, 0xa3,
- 0x37, 0xcd, 0x8a, 0xe7, 0xb9, 0xde, 0xa2, 0x6b, 0xc9, 0x6b, 0x07, 0x27, 0x29, 0x07, 0x5c, 0x20,
- 0x14, 0x30, 0xf2, 0x9b, 0x04, 0xca, 0x95, 0xdd, 0x1d, 0xa7, 0xe3, 0x9a, 0xd6, 0xaa, 0xe7, 0xb6,
- 0x3d, 0xe6, 0xfb, 0xdf, 0xeb, 0xee, 0xdf, 0x44, 0x63, 0x5b, 0xf0, 0xe5, 0x20, 0xbc, 0xfd, 0x5f,
- 0x8b, 0x5f, 0x83, 0x0e, 0x3f, 0x44, 0x7c, 0x66, 0x88, 0x3e, 0x34, 0x4a, 0x63, 0xe5, 0x5f, 0xc8,
- 0x84, 0x86, 0x0a, 0xf2, 0xeb, 0x24, 0x2a, 0x9c, 0xec, 0x08, 0x77, 0xd1, 0x84, 0x60, 0x36, 0xb5,
- 0x4f, 0xfa, 0xb3, 0xa7, 0x59, 0x03, 0x5c, 0xce, 0xe0, 0x52, 0xb0, 0xa5, 0x64, 0x75, 0x29, 0x88,
- 0x20, 0x42, 0x35, 0xfd, 0x0b, 0x7d, 0xa7, 0xd4, 0xae, 0xf2, 0xc9, 0x1f, 0x7e, 0x95, 0x6f, 0xa0,
- 0x29, 0x91, 0xa2, 0xe1, 0x07, 0xe5, 0x54, 0x31, 0x39, 0x9b, 0x2e, 0x5d, 0xe7, 0xdd, 0x76, 0x5d,
- 0x1c, 0x56, 0xc3, 0x4f, 0xc9, 0xd3, 0x51, 0xb2, 0x0a, 0x30, 0xcc, 0xb6, 0xdc, 0x08, 0x8d, 0x71,
- 0xf1, 0x52, 0xec, 0xa6, 0x27, 0x4a, 0xfd, 0x3f, 0x4e, 0x79, 0xb3, 0xd3, 0x6e, 0x72, 0x24, 0x83,
- 0x52, 0xab, 0xb6, 0xd3, 0x26, 0x37, 0x51, 0x7a, 0xb1, 0xe3, 0xfa, 0xd0, 0x71, 0x3c, 0x66, 0xfa,
- 0xae, 0xa3, 0xa7, 0x92, 0x40, 0x54, 0xa8, 0x85, 0x48, 0xa8, 0xc4, 0xe7, 0xbe, 0x4e, 0xa2, 0x09,
- 0xed, 0x2f, 0x30, 0xf8, 0x7f, 0xd0, 0xe5, 0xbb, 0x95, 0x46, 0x63, 0x61, 0xb9, 0xd2, 0x5c, 0x7b,
- 0xb8, 0x5a, 0x69, 0x2e, 0xae, 0xdc, 0x6b, 0xac, 0x55, 0x68, 0x73, 0xb1, 0x5e, 0x5b, 0xaa, 0x2e,
- 0xe7, 0x46, 0x0a, 0x57, 0xf6, 0x0f, 0x8a, 0x79, 0xcd, 0x22, 0xfe, 0xb7, 0x92, 0xff, 0x44, 0x38,
- 0x66, 0x5e, 0xad, 0x95, 0x2b, 0x9f, 0xe4, 0x12, 0x85, 0xf3, 0xfb, 0x07, 0xc5, 0x9c, 0x66, 0x25,
- 0x3e, 0xc1, 0xfd, 0x37, 0x7a, 0xe9, 0x28, 0xbb, 0x79, 0x6f, 0xb5, 0xbc, 0xb0, 0x56, 0xc9, 0x8d,
- 0x16, 0x0a, 0xfb, 0x07, 0xc5, 0x8b, 0x87, 0x8d, 0x64, 0x0a, 0xbe, 0x81, 0xce, 0xc7, 0x4c, 0x69,
- 0xe5, 0xe3, 0x7b, 0x95, 0xc6, 0x5a, 0x2e, 0x59, 0xb8, 0xb8, 0x7f, 0x50, 0xc4, 0x9a, 0x55, 0x38,
- 0x26, 0xe6, 0xd1, 0x85, 0x43, 0x16, 0x8d, 0xd5, 0x7a, 0xad, 0x51, 0xc9, 0xa5, 0x0a, 0x97, 0xf6,
- 0x0f, 0x8a, 0xe7, 0x62, 0x26, 0xb2, 0xab, 0x2c, 0xa2, 0x99, 0x98, 0x4d, 0xb9, 0xfe, 0xa0, 0xb6,
- 0x52, 0x5f, 0x28, 0x37, 0x57, 0x69, 0x7d, 0x99, 0x56, 0x1a, 0x8d, 0x5c, 0xba, 0x60, 0xec, 0x1f,
- 0x14, 0x2f, 0x6b, 0xc6, 0x47, 0x2a, 0x7c, 0x0e, 0x4d, 0xc7, 0x9c, 0xac, 0x56, 0x6b, 0xcb, 0xb9,
- 0x4c, 0xe1, 0xdc, 0xfe, 0x41, 0xf1, 0xac, 0x66, 0xc7, 0x63, 0x79, 0x64, 0xff, 0x16, 0x57, 0xea,
- 0x8d, 0x4a, 0x6e, 0xec, 0xc8, 0xfe, 0x41, 0xc0, 0xe7, 0x7e, 0x95, 0x40, 0xf8, 0xe8, 0x1f, 0xbd,
- 0xf0, 0x7b, 0x28, 0x1f, 0x3a, 0x59, 0xac, 0xdf, 0x5d, 0xe5, 0xeb, 0xac, 0xd6, 0x6b, 0xcd, 0x5a,
- 0xbd, 0x56, 0xc9, 0x8d, 0xc4, 0x76, 0x55, 0xb3, 0xaa, 0xb9, 0x0e, 0xc3, 0x75, 0x74, 0xe9, 0x38,
- 0xcb, 0x95, 0x47, 0x6f, 0xe7, 0x12, 0x85, 0xf9, 0xfd, 0x83, 0xe2, 0x85, 0xa3, 0x86, 0x2b, 0x8f,
- 0xde, 0xfe, 0xe6, 0xa7, 0xaf, 0x1c, 0xaf, 0x98, 0xe3, 0x07, 0x20, 0x7d, 0x69, 0x6f, 0xa2, 0xf3,
- 0xba, 0xe3, 0xbb, 0x95, 0xb5, 0x85, 0xf2, 0xc2, 0xda, 0x42, 0x6e, 0x44, 0xc4, 0x40, 0xa3, 0xde,
- 0x65, 0x7d, 0x13, 0xda, 0xee, 0x6b, 0x68, 0x3a, 0xf6, 0x16, 0x95, 0xfb, 0x15, 0x1a, 0x66, 0x94,
- 0xbe, 0x7e, 0xb6, 0xcd, 0x3c, 0xfc, 0x3a, 0xc2, 0x3a, 0x79, 0x61, 0xe5, 0xc1, 0xc2, 0xc3, 0x46,
- 0x6e, 0xb4, 0x70, 0x61, 0xff, 0xa0, 0x38, 0xad, 0xb1, 0x17, 0x3a, 0x3b, 0xe6, 0x9e, 0x3f, 0xf7,
- 0xfb, 0x51, 0x34, 0xa9, 0x7f, 0x37, 0xc2, 0xaf, 0xa3, 0x73, 0x4b, 0xd5, 0x15, 0x9e, 0x89, 0x4b,
- 0x75, 0x11, 0x01, 0x2e, 0xe6, 0x46, 0xc4, 0xe3, 0x74, 0x2a, 0xff, 0x8d, 0xff, 0x0b, 0xe5, 0x0f,
- 0xd1, 0xcb, 0x55, 0x5a, 0x59, 0x5c, 0xab, 0xd3, 0x87, 0xb9, 0x44, 0xe1, 0x25, 0xbe, 0x61, 0xba,
- 0x4d, 0xd9, 0xf6, 0xa0, 0x05, 0xed, 0xe1, 0x5b, 0xe8, 0xf2, 0x21, 0xc3, 0xc6, 0xc3, 0xbb, 0x2b,
- 0xd5, 0xda, 0x1d, 0xf1, 0xbc, 0xd1, 0xc2, 0xd5, 0xfd, 0x83, 0xe2, 0x25, 0xdd, 0xb6, 0x21, 0x3e,
- 0xc5, 0x71, 0x28, 0x9b, 0xc0, 0xb7, 0x51, 0xf1, 0x04, 0xfb, 0x68, 0x01, 0xc9, 0x02, 0xd9, 0x3f,
- 0x28, 0x5e, 0x39, 0xc6, 0x89, 0x5a, 0x47, 0x36, 0x81, 0xdf, 0x42, 0x17, 0x8f, 0xf7, 0x14, 0xd6,
- 0xc5, 0x31, 0xf6, 0x73, 0x7f, 0x4c, 0xa0, 0x71, 0x35, 0xf5, 0xf8, 0xa6, 0x55, 0x28, 0xad, 0xf3,
- 0x26, 0x51, 0xae, 0x34, 0x6b, 0xf5, 0x26, 0x48, 0xe1, 0xa6, 0x29, 0x5e, 0xcd, 0x85, 0x9f, 0x3c,
- 0xc7, 0x35, 0xfa, 0x72, 0xa5, 0x56, 0xa1, 0xd5, 0xc5, 0x30, 0xa2, 0x8a, 0xbd, 0xcc, 0x1c, 0xe6,
- 0xd9, 0x2d, 0xfc, 0x36, 0xba, 0x14, 0x77, 0xde, 0xb8, 0xb7, 0x78, 0x3b, 0xdc, 0x25, 0x58, 0xa0,
- 0xf6, 0x80, 0xc6, 0x56, 0x6b, 0x13, 0x02, 0xf3, 0x4e, 0xcc, 0xaa, 0x5a, 0xbb, 0xbf, 0xb0, 0x52,
- 0x2d, 0x0b, 0xab, 0x64, 0x21, 0xbf, 0x7f, 0x50, 0x3c, 0xaf, 0xac, 0xe4, 0x07, 0x0e, 0x6e, 0x36,
- 0xf7, 0x4d, 0x02, 0xcd, 0x7c, 0xf7, 0xf0, 0xc2, 0x0f, 0xd0, 0xab, 0xb0, 0x5f, 0x47, 0x5a, 0x81,
- 0xec, 0x5b, 0x62, 0x0f, 0x17, 0x56, 0x57, 0x2b, 0xb5, 0x72, 0x6e, 0xa4, 0x30, 0xbb, 0x7f, 0x50,
- 0xbc, 0xf6, 0xdd, 0x2e, 0x17, 0x7a, 0x3d, 0xe6, 0x58, 0xa7, 0x74, 0xbc, 0x54, 0xa7, 0xcb, 0x95,
- 0xb5, 0x5c, 0xe2, 0x34, 0x8e, 0x97, 0x5c, 0xaf, 0xcd, 0xfa, 0xa5, 0xbb, 0x4f, 0xbe, 0x9d, 0x19,
- 0x79, 0xfa, 0xed, 0xcc, 0xc8, 0x93, 0x67, 0x33, 0x89, 0xa7, 0xcf, 0x66, 0x12, 0x3f, 0x7b, 0x3e,
- 0x33, 0xf2, 0xd5, 0xf3, 0x99, 0xc4, 0xd3, 0xe7, 0x33, 0x23, 0x7f, 0x7a, 0x3e, 0x33, 0xf2, 0xe8,
- 0xb5, 0xb6, 0xdd, 0xdf, 0xdc, 0x5a, 0xbf, 0xde, 0x72, 0xbb, 0x37, 0xfc, 0x3d, 0xa7, 0xd5, 0xdf,
- 0xb4, 0x9d, 0xb6, 0xf6, 0x4b, 0xff, 0xcf, 0x0f, 0xeb, 0x19, 0xf8, 0xf5, 0xd6, 0x3f, 0x02, 0x00,
- 0x00, 0xff, 0xff, 0x68, 0x4a, 0x6e, 0xeb, 0x13, 0x21, 0x00, 0x00,
+ // 3190 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4b, 0x6c, 0x1c, 0xc7,
+ 0x99, 0xe6, 0x3c, 0x39, 0x2c, 0x92, 0xd2, 0xb0, 0xf4, 0x1a, 0x8f, 0x24, 0xf6, 0x6c, 0x59, 0xde,
+ 0xa5, 0xe9, 0xb5, 0x64, 0xd3, 0x8f, 0xf5, 0x5a, 0x5e, 0x19, 0x1c, 0xce, 0x90, 0x1a, 0x8b, 0x9c,
+ 0xa1, 0x6b, 0x48, 0xc9, 0x12, 0x76, 0x31, 0x68, 0x4e, 0x17, 0x87, 0x0d, 0xcd, 0x74, 0xcf, 0x76,
+ 0x37, 0x5f, 0xc6, 0x5e, 0x36, 0x06, 0x0c, 0x83, 0x07, 0x23, 0xf0, 0x29, 0x08, 0x42, 0xc0, 0xc8,
+ 0x25, 0xb7, 0x00, 0x39, 0xe4, 0xe2, 0x53, 0x8e, 0x3a, 0x0a, 0x06, 0x02, 0x04, 0x39, 0x34, 0x60,
+ 0xe9, 0x92, 0x4c, 0x6e, 0x73, 0xc8, 0x21, 0xa7, 0xa0, 0xfe, 0xaa, 0xee, 0xae, 0xe6, 0xc3, 0xa1,
+ 0xec, 0x43, 0x4e, 0x9a, 0xff, 0xfb, 0xbf, 0xff, 0xef, 0xea, 0xfa, 0x5f, 0x55, 0x4d, 0xa1, 0xcb,
+ 0x5d, 0x73, 0xe3, 0x56, 0xdf, 0xb1, 0x3d, 0xbb, 0x6d, 0x77, 0x6f, 0x6d, 0xb0, 0xfe, 0x4d, 0x10,
+ 0x70, 0x2e, 0xc0, 0x8a, 0x63, 0x6c, 0xcf, 0x13, 0x60, 0xf1, 0x65, 0x87, 0xf5, 0x6d, 0x57, 0xd0,
+ 0x37, 0xb6, 0x37, 0x6f, 0x75, 0xec, 0x8e, 0x0d, 0x02, 0xfc, 0x12, 0x24, 0xf2, 0x2c, 0x81, 0x32,
+ 0x77, 0x59, 0xb7, 0x6b, 0xe3, 0x05, 0x34, 0x6e, 0xb0, 0x1d, 0xb3, 0xcd, 0x5a, 0x96, 0xde, 0x63,
+ 0x85, 0x44, 0x29, 0x31, 0x33, 0x56, 0x26, 0x03, 0x5f, 0x43, 0x02, 0xae, 0xeb, 0x3d, 0x36, 0xf4,
+ 0xb5, 0xfc, 0x5e, 0xaf, 0xfb, 0x3e, 0x89, 0x20, 0x42, 0x15, 0x3d, 0x77, 0xd2, 0xee, 0x9a, 0xcc,
+ 0xf2, 0x84, 0x93, 0x64, 0xe4, 0x44, 0xc0, 0x31, 0x27, 0x11, 0x44, 0xa8, 0xa2, 0xc7, 0x0d, 0x74,
+ 0x4e, 0x3a, 0xd9, 0x61, 0x8e, 0x6b, 0xda, 0x56, 0x21, 0x05, 0x7e, 0x66, 0x06, 0xbe, 0x36, 0x29,
+ 0x34, 0xf7, 0x85, 0x62, 0xe8, 0x6b, 0x17, 0x14, 0x57, 0x12, 0x25, 0x34, 0xce, 0x22, 0xbf, 0x49,
+ 0xa0, 0xec, 0x5d, 0xa6, 0x1b, 0xcc, 0xc1, 0xf3, 0x28, 0xed, 0xed, 0xf7, 0xc5, 0xeb, 0x9d, 0x9b,
+ 0xbb, 0x74, 0x33, 0xd8, 0xb8, 0x9b, 0x2b, 0xcc, 0x75, 0xf5, 0x0e, 0x5b, 0xdb, 0xef, 0xb3, 0xf2,
+ 0xe5, 0x81, 0xaf, 0x01, 0x6d, 0xe8, 0x6b, 0x08, 0xfc, 0x73, 0x81, 0x50, 0xc0, 0xb0, 0x81, 0xc6,
+ 0xdb, 0x76, 0xaf, 0xef, 0x30, 0x17, 0xd6, 0x96, 0x04, 0x4f, 0xd7, 0x8e, 0x79, 0x5a, 0x88, 0x38,
+ 0xe5, 0x1b, 0x03, 0x5f, 0x53, 0x8d, 0x86, 0xbe, 0x36, 0x25, 0xd6, 0x1d, 0x61, 0x84, 0xaa, 0x0c,
+ 0xf2, 0xdf, 0x68, 0x72, 0xa1, 0xbb, 0xed, 0x7a, 0xcc, 0x59, 0xb0, 0xad, 0x4d, 0xb3, 0x83, 0xef,
+ 0xa1, 0xd1, 0x4d, 0xbb, 0x6b, 0x30, 0xc7, 0x2d, 0x24, 0x4a, 0xa9, 0x99, 0xf1, 0xb9, 0x7c, 0xf4,
+ 0xc8, 0x45, 0x50, 0x94, 0xb5, 0x27, 0xbe, 0x36, 0x32, 0xf0, 0xb5, 0x80, 0x38, 0xf4, 0xb5, 0x09,
+ 0x78, 0x8c, 0x90, 0x09, 0x0d, 0x14, 0xe4, 0x9b, 0x34, 0xca, 0x0a, 0x23, 0x7c, 0x13, 0x25, 0x4d,
+ 0x43, 0x86, 0x7b, 0xfa, 0x99, 0xaf, 0x25, 0x6b, 0x95, 0x81, 0xaf, 0x25, 0x4d, 0x63, 0xe8, 0x6b,
+ 0x39, 0xb0, 0x36, 0x0d, 0xf2, 0xd5, 0xd3, 0x1b, 0xc9, 0x5a, 0x85, 0x26, 0x4d, 0x03, 0xdf, 0x44,
+ 0x99, 0xae, 0xbe, 0xc1, 0xba, 0x32, 0xb8, 0x85, 0x81, 0xaf, 0x09, 0x60, 0xe8, 0x6b, 0xe3, 0xc0,
+ 0x07, 0x89, 0x50, 0x81, 0xe2, 0xdb, 0x68, 0xcc, 0x61, 0xba, 0xd1, 0xb2, 0xad, 0xee, 0x3e, 0x04,
+ 0x32, 0x57, 0x9e, 0x1e, 0xf8, 0x5a, 0x8e, 0x83, 0x0d, 0xab, 0xbb, 0x3f, 0xf4, 0xb5, 0x73, 0x60,
+ 0x16, 0x00, 0x84, 0x86, 0x3a, 0xdc, 0x42, 0xd8, 0xec, 0x58, 0xb6, 0xc3, 0x5a, 0x7d, 0xe6, 0xf4,
+ 0x4c, 0xd8, 0x1a, 0xb7, 0x90, 0x06, 0x2f, 0x6f, 0x0c, 0x7c, 0x6d, 0x4a, 0x68, 0x57, 0x23, 0xe5,
+ 0xd0, 0xd7, 0xae, 0x88, 0x55, 0x1f, 0xd5, 0x10, 0x7a, 0x9c, 0x8d, 0xef, 0xa1, 0x49, 0xf9, 0x00,
+ 0x83, 0x75, 0x99, 0xc7, 0x0a, 0x19, 0xf0, 0xfd, 0xaf, 0x03, 0x5f, 0x9b, 0x10, 0x8a, 0x0a, 0xe0,
+ 0x43, 0x5f, 0xc3, 0x8a, 0x5b, 0x01, 0x12, 0x1a, 0xe3, 0x60, 0x03, 0x5d, 0x34, 0x4c, 0x57, 0xdf,
+ 0xe8, 0xb2, 0x96, 0xc7, 0x7a, 0xfd, 0x96, 0x69, 0x19, 0x6c, 0x8f, 0xb9, 0x85, 0x2c, 0xf8, 0x9c,
+ 0x1b, 0xf8, 0x1a, 0x96, 0xfa, 0x35, 0xd6, 0xeb, 0xd7, 0x84, 0x76, 0xe8, 0x6b, 0x05, 0x51, 0x53,
+ 0xc7, 0x54, 0x84, 0x9e, 0xc0, 0xc7, 0x73, 0x28, 0xdb, 0xd7, 0xb7, 0x5d, 0x66, 0x14, 0x46, 0xc1,
+ 0x6f, 0x71, 0xe0, 0x6b, 0x12, 0x09, 0x03, 0x2e, 0x44, 0x42, 0x25, 0xce, 0x93, 0x47, 0x54, 0xa9,
+ 0x5b, 0xc8, 0x1f, 0x4d, 0x9e, 0x0a, 0x28, 0xa2, 0xe4, 0x91, 0xc4, 0xd0, 0x97, 0x90, 0x09, 0x0d,
+ 0x14, 0xe4, 0x77, 0x59, 0x94, 0x15, 0x46, 0xb8, 0x1c, 0x26, 0xcf, 0x44, 0x79, 0x8e, 0x3b, 0xf8,
+ 0xa3, 0xaf, 0xe5, 0x84, 0xae, 0x56, 0x39, 0x2d, 0x99, 0xbe, 0x78, 0x7a, 0x23, 0xa1, 0x24, 0xd4,
+ 0x2c, 0x4a, 0x2b, 0xcd, 0x02, 0x6a, 0xcf, 0x12, 0x6d, 0x42, 0xd4, 0x9e, 0x05, 0x0d, 0x02, 0x30,
+ 0xfc, 0x01, 0x1a, 0xd3, 0x0d, 0x83, 0xd7, 0x08, 0x73, 0x0b, 0xa9, 0x52, 0x8a, 0xe7, 0xec, 0xc0,
+ 0xd7, 0x22, 0x70, 0xe8, 0x6b, 0x93, 0x60, 0x25, 0x11, 0x42, 0x23, 0x1d, 0xfe, 0x9f, 0x78, 0xe5,
+ 0xa6, 0x8f, 0xf6, 0x80, 0x1f, 0x57, 0xb2, 0x3c, 0xd3, 0xdb, 0xcc, 0x91, 0xad, 0x2f, 0x23, 0x0a,
+ 0x8a, 0x67, 0x3a, 0x07, 0x65, 0xe3, 0x13, 0x99, 0x1e, 0x00, 0x84, 0x86, 0x3a, 0xbc, 0x84, 0x26,
+ 0x7a, 0xfa, 0x5e, 0xcb, 0x65, 0xff, 0xbb, 0xcd, 0xac, 0x36, 0x83, 0x9c, 0x49, 0x89, 0x55, 0xf4,
+ 0xf4, 0xbd, 0xa6, 0x84, 0xc3, 0x55, 0x28, 0x18, 0xa1, 0x2a, 0x03, 0x97, 0x11, 0x32, 0x2d, 0xcf,
+ 0xb1, 0x8d, 0xed, 0x36, 0x73, 0x64, 0x8a, 0x40, 0x07, 0x8e, 0xd0, 0xb0, 0x03, 0x47, 0x10, 0xa1,
+ 0x8a, 0x1e, 0x77, 0x50, 0x0e, 0x72, 0xb7, 0x65, 0x1a, 0x85, 0x5c, 0x29, 0x31, 0x93, 0x2e, 0x2f,
+ 0xcb, 0xe0, 0x8e, 0x42, 0x16, 0x42, 0x6c, 0x83, 0x9f, 0x3c, 0x67, 0x80, 0x5d, 0x33, 0xc2, 0xdd,
+ 0x97, 0x32, 0xef, 0x1b, 0x01, 0xed, 0xe7, 0xd1, 0x4f, 0x1a, 0xf0, 0xf1, 0xff, 0xa1, 0xa2, 0xfb,
+ 0xd8, 0xe4, 0x95, 0x22, 0x9e, 0xed, 0x99, 0xb6, 0xd5, 0x72, 0x58, 0xcf, 0xde, 0xd1, 0xbb, 0x6e,
+ 0x61, 0x0c, 0x16, 0x7f, 0x67, 0xe0, 0x6b, 0x05, 0xce, 0xaa, 0x29, 0x24, 0x2a, 0x39, 0x43, 0x5f,
+ 0x9b, 0x86, 0x27, 0x9e, 0x46, 0x20, 0xf4, 0x54, 0x5b, 0xbc, 0x87, 0x5e, 0x62, 0x56, 0xdb, 0xd9,
+ 0xef, 0xc3, 0x63, 0xfb, 0xba, 0xeb, 0xee, 0xda, 0x8e, 0xd1, 0xf2, 0xec, 0xc7, 0xcc, 0x2a, 0x20,
+ 0x48, 0xea, 0x0f, 0x06, 0xbe, 0x76, 0x25, 0x22, 0xad, 0x4a, 0xce, 0x1a, 0xa7, 0x0c, 0x7d, 0xed,
+ 0x3a, 0x3c, 0xfb, 0x14, 0x3d, 0xa1, 0xa7, 0x59, 0x92, 0x9f, 0x24, 0x50, 0x06, 0x36, 0x83, 0x57,
+ 0xb3, 0x68, 0xca, 0xb2, 0x05, 0x43, 0x35, 0x0b, 0xe4, 0x58, 0xfb, 0x96, 0x38, 0xae, 0xa2, 0xcc,
+ 0xa6, 0xd9, 0x65, 0x6e, 0x21, 0x09, 0xb5, 0x8c, 0x95, 0x41, 0x60, 0x76, 0x59, 0xcd, 0xda, 0xb4,
+ 0xcb, 0x57, 0x65, 0x35, 0x0b, 0x62, 0x58, 0x4b, 0x5c, 0x22, 0x54, 0x80, 0xe4, 0x8b, 0x04, 0x1a,
+ 0x87, 0x45, 0xac, 0xf7, 0x0d, 0xdd, 0x63, 0xff, 0xcc, 0xa5, 0x7c, 0x3e, 0x89, 0x72, 0x81, 0x41,
+ 0xd8, 0x10, 0x12, 0x67, 0x68, 0x08, 0xb3, 0x28, 0xed, 0x9a, 0x9f, 0x32, 0x18, 0x2c, 0x29, 0xc1,
+ 0xe5, 0x72, 0xc8, 0xe5, 0x02, 0xa1, 0x80, 0xe1, 0x0f, 0x11, 0xea, 0xd9, 0x86, 0xb9, 0x69, 0x32,
+ 0xa3, 0xe5, 0x42, 0x81, 0xa6, 0xca, 0x25, 0xde, 0x3d, 0x02, 0xb4, 0x39, 0xf4, 0xb5, 0xf3, 0xa2,
+ 0xbc, 0x02, 0x84, 0xd0, 0x48, 0xcb, 0xfb, 0x47, 0xe8, 0x60, 0x63, 0xbf, 0x30, 0x01, 0x95, 0xf1,
+ 0x41, 0x50, 0x19, 0xcd, 0x2d, 0xdb, 0xf1, 0xa0, 0x1c, 0xc2, 0xc7, 0x94, 0xf7, 0xc3, 0x52, 0x8b,
+ 0x20, 0xc2, 0x2b, 0x41, 0x92, 0xa9, 0x42, 0xc5, 0xcb, 0x68, 0x34, 0x38, 0xf0, 0xf0, 0xcc, 0x8f,
+ 0x35, 0xe9, 0xfb, 0xac, 0xed, 0xd9, 0x4e, 0xb9, 0x14, 0x34, 0xe9, 0x9d, 0xf0, 0x00, 0x24, 0x0a,
+ 0x6e, 0x27, 0x38, 0xfa, 0x04, 0x1a, 0xfc, 0x3e, 0xca, 0x85, 0xcd, 0x04, 0xc1, 0xbb, 0x42, 0x33,
+ 0x72, 0xa3, 0x4e, 0x22, 0x9a, 0x91, 0x1b, 0xb6, 0x91, 0x50, 0x87, 0x3f, 0x42, 0xd9, 0x8d, 0xae,
+ 0xdd, 0x7e, 0x1c, 0x4c, 0x8b, 0x0b, 0xd1, 0x42, 0xca, 0x1c, 0x87, 0xb8, 0x5e, 0x97, 0x6b, 0x91,
+ 0xd4, 0x70, 0xfc, 0x83, 0x48, 0xa8, 0x84, 0xf9, 0x69, 0xce, 0xdd, 0xef, 0x75, 0x4d, 0xeb, 0x71,
+ 0xcb, 0xd3, 0x9d, 0x0e, 0xf3, 0x0a, 0x53, 0xd1, 0x69, 0x4e, 0x6a, 0xd6, 0x40, 0x11, 0x9e, 0xe6,
+ 0x62, 0x28, 0xa1, 0x71, 0x16, 0x3f, 0x63, 0x0a, 0xd7, 0xad, 0x2d, 0xdd, 0xdd, 0x2a, 0x60, 0xa8,
+ 0x53, 0xe8, 0x70, 0x02, 0xbe, 0xab, 0xbb, 0x5b, 0xe1, 0xb6, 0x47, 0x10, 0xa1, 0x8a, 0x1e, 0xdf,
+ 0x41, 0x63, 0xb2, 0x36, 0x99, 0x51, 0xb8, 0x00, 0x2e, 0x20, 0x15, 0x42, 0x30, 0x4c, 0x85, 0x10,
+ 0x21, 0x34, 0xd2, 0xe2, 0xb2, 0x3c, 0x47, 0x8a, 0xd3, 0xdf, 0xe5, 0xe3, 0x69, 0x7f, 0x86, 0x83,
+ 0xe4, 0x22, 0x1a, 0x3f, 0x7a, 0xaa, 0x99, 0x14, 0x1d, 0xbf, 0x1f, 0x3b, 0xcf, 0x88, 0x8e, 0xdf,
+ 0x57, 0x4f, 0x32, 0x2a, 0x03, 0x7f, 0xa4, 0xa4, 0xa5, 0xe5, 0x16, 0xc6, 0x4b, 0x89, 0x99, 0x4c,
+ 0xf9, 0x55, 0x35, 0x0f, 0xeb, 0xee, 0xb1, 0x3c, 0xac, 0xbb, 0xe4, 0x6f, 0xbe, 0x96, 0x32, 0x2d,
+ 0x8f, 0x2a, 0x34, 0xbc, 0x89, 0xc4, 0x2e, 0xb5, 0xa0, 0xaa, 0x26, 0xc1, 0xd5, 0xd2, 0x33, 0x5f,
+ 0x9b, 0xa0, 0xfa, 0x2e, 0x84, 0xbe, 0x69, 0x7e, 0xca, 0xf8, 0x46, 0x6d, 0x04, 0x42, 0xb8, 0x51,
+ 0x21, 0x12, 0x38, 0xfe, 0xea, 0xe9, 0x8d, 0x98, 0x19, 0x8d, 0x8c, 0xf0, 0x7d, 0x94, 0xeb, 0x77,
+ 0x75, 0x6f, 0xd3, 0x76, 0x7a, 0x85, 0x73, 0x90, 0xec, 0xca, 0x1e, 0xae, 0x4a, 0x4d, 0x45, 0xf7,
+ 0xf4, 0x32, 0x91, 0x69, 0x16, 0xf2, 0xc3, 0xcc, 0x0d, 0x00, 0x42, 0x43, 0x1d, 0xae, 0xa0, 0xf1,
+ 0xae, 0xdd, 0xd6, 0xbb, 0xad, 0xcd, 0xae, 0xde, 0x71, 0x0b, 0x7f, 0x1a, 0x85, 0x4d, 0x85, 0xec,
+ 0x00, 0x7c, 0x91, 0xc3, 0xe1, 0x66, 0x44, 0x10, 0xa1, 0x8a, 0x1e, 0xdf, 0x45, 0x13, 0xb2, 0x8c,
+ 0x44, 0x8e, 0xfd, 0x79, 0x14, 0x32, 0x04, 0x62, 0x23, 0x15, 0x32, 0xcb, 0xa6, 0xd4, 0xea, 0x13,
+ 0x69, 0xa6, 0x32, 0xf0, 0xc7, 0xe8, 0xbc, 0x69, 0xd9, 0x06, 0x6b, 0xb5, 0xb7, 0x74, 0xab, 0xc3,
+ 0x78, 0x7c, 0x06, 0xa3, 0x50, 0x8d, 0x90, 0xff, 0xa0, 0x5b, 0x00, 0x15, 0xc4, 0xe8, 0x82, 0x9c,
+ 0x9e, 0x0a, 0x4a, 0x68, 0x9c, 0x85, 0xf7, 0x90, 0x32, 0x56, 0x5a, 0x9e, 0xa3, 0x9b, 0x5d, 0xe6,
+ 0x88, 0x78, 0xfd, 0x65, 0x14, 0x02, 0xf6, 0xe1, 0xc0, 0xd7, 0x2e, 0x45, 0x9c, 0x35, 0x41, 0x91,
+ 0xc1, 0xba, 0x7a, 0x64, 0x64, 0x29, 0xda, 0x30, 0x23, 0x4e, 0x36, 0xc6, 0xef, 0xf2, 0x53, 0x24,
+ 0x3f, 0xe9, 0x1a, 0xf2, 0x48, 0x7b, 0x4d, 0x9c, 0x17, 0x01, 0x0a, 0x5b, 0x91, 0x94, 0xe1, 0xc0,
+ 0x08, 0xbf, 0x30, 0x45, 0xa3, 0xa6, 0xb5, 0xa3, 0x77, 0xcd, 0xe0, 0xc8, 0xfa, 0xde, 0x33, 0x5f,
+ 0x43, 0x54, 0xdf, 0xad, 0x09, 0x54, 0x9c, 0x20, 0xe0, 0xa7, 0x72, 0x82, 0x00, 0x99, 0x9f, 0x20,
+ 0x14, 0x26, 0x0d, 0x78, 0xbc, 0xad, 0x58, 0x76, 0xec, 0x56, 0x90, 0x03, 0xd7, 0xb0, 0xad, 0x96,
+ 0x1d, 0xbf, 0x11, 0x88, 0x6d, 0x8d, 0xa1, 0x84, 0xc6, 0x59, 0xef, 0xa7, 0x7f, 0xf6, 0xb5, 0x36,
+ 0x42, 0xbe, 0x4b, 0xa0, 0xb1, 0xb0, 0xc5, 0xf1, 0xe9, 0x02, 0xf1, 0x4f, 0x41, 0xf8, 0xa1, 0x9a,
+ 0xb7, 0x44, 0xdc, 0x45, 0x35, 0x6f, 0x41, 0xc0, 0x01, 0xe3, 0xd3, 0xd3, 0xde, 0xdc, 0x74, 0x99,
+ 0x07, 0x73, 0x2b, 0x25, 0xa6, 0xa7, 0x40, 0xc2, 0xe9, 0x29, 0x44, 0x42, 0x25, 0x8e, 0xdf, 0x94,
+ 0xd3, 0x2b, 0x09, 0x61, 0xbb, 0x7e, 0xf2, 0xf4, 0x0a, 0x82, 0x22, 0x86, 0xd8, 0x6d, 0x34, 0xb6,
+ 0xcb, 0xf4, 0xc7, 0x22, 0x2f, 0x45, 0xcb, 0x80, 0xbe, 0xce, 0x41, 0x99, 0x93, 0xa2, 0x3a, 0x02,
+ 0x80, 0xd0, 0x50, 0x27, 0xdf, 0xf1, 0x11, 0xca, 0x8a, 0x71, 0x82, 0x57, 0x51, 0xae, 0x6d, 0x6f,
+ 0x5b, 0x5e, 0x74, 0xa9, 0x9c, 0x52, 0x4f, 0xc3, 0xa0, 0x29, 0xff, 0x4b, 0x50, 0x80, 0x01, 0x35,
+ 0x8c, 0x91, 0x04, 0xf8, 0x31, 0x56, 0xaa, 0xc8, 0x67, 0x09, 0x34, 0x2a, 0x0d, 0xf1, 0xdd, 0xf0,
+ 0x72, 0x90, 0x2e, 0xbf, 0x77, 0x64, 0x4a, 0x7e, 0xff, 0x45, 0x53, 0x9d, 0x90, 0xf2, 0xce, 0xb9,
+ 0xa3, 0x77, 0xb7, 0xc5, 0x46, 0xa5, 0xc5, 0x9d, 0x13, 0x80, 0x70, 0xe8, 0x80, 0x44, 0xa8, 0x40,
+ 0xc9, 0x67, 0x69, 0x34, 0xa1, 0x36, 0x11, 0xde, 0xae, 0xb7, 0x2d, 0x73, 0x0f, 0x16, 0x13, 0x3b,
+ 0xa5, 0xac, 0x5b, 0xe6, 0x1e, 0xb4, 0x99, 0xe2, 0x13, 0x5f, 0x4b, 0xf0, 0x00, 0x70, 0x5e, 0x18,
+ 0x00, 0x2e, 0x10, 0x0a, 0x18, 0xfe, 0x18, 0x8d, 0xee, 0x9a, 0x96, 0x61, 0xef, 0xba, 0xb0, 0x8c,
+ 0x71, 0xf5, 0xe6, 0xf0, 0x40, 0x28, 0xc0, 0x53, 0x49, 0x7a, 0x0a, 0xd8, 0xe1, 0x76, 0x49, 0x99,
+ 0xd0, 0x40, 0x83, 0x97, 0x50, 0xa6, 0x6b, 0x5a, 0xdb, 0x7b, 0x90, 0x60, 0xb1, 0x31, 0xfb, 0x89,
+ 0xee, 0x79, 0x0e, 0xb8, 0xbb, 0x26, 0xdd, 0x09, 0x66, 0x74, 0xc9, 0xe6, 0x12, 0xbf, 0x64, 0xf3,
+ 0x7f, 0xf1, 0x3d, 0x94, 0x35, 0x74, 0x67, 0xd7, 0x14, 0x97, 0x9a, 0x53, 0x3c, 0x4d, 0x4b, 0x4f,
+ 0x92, 0x1a, 0x5d, 0xf0, 0x40, 0x24, 0x54, 0xe2, 0x98, 0xa1, 0xd1, 0x4d, 0x87, 0xb1, 0x0d, 0xd7,
+ 0x80, 0x43, 0xd2, 0x29, 0xde, 0xde, 0xe5, 0xde, 0xf8, 0x35, 0x60, 0xd1, 0x61, 0xac, 0xdc, 0x84,
+ 0x6b, 0x80, 0x34, 0x0b, 0xdf, 0x58, 0xca, 0x70, 0x0d, 0x90, 0x34, 0x1a, 0x90, 0x70, 0x0b, 0x65,
+ 0x2d, 0xe6, 0xf1, 0xa7, 0x64, 0x4f, 0x7f, 0xca, 0x9c, 0x7c, 0x4a, 0xb6, 0xce, 0x3c, 0xf1, 0x10,
+ 0x69, 0x14, 0xae, 0x5e, 0x88, 0xfc, 0x11, 0x92, 0x43, 0x25, 0x83, 0x7c, 0x9e, 0x44, 0xb9, 0x20,
+ 0xbe, 0xfc, 0xf0, 0x67, 0xef, 0x5a, 0xcc, 0x51, 0xbf, 0x6e, 0xc1, 0xc4, 0x07, 0x54, 0x5e, 0xcf,
+ 0xc4, 0x20, 0x0b, 0x11, 0x42, 0x23, 0x2d, 0x77, 0xd0, 0x71, 0xec, 0xed, 0xbe, 0xfa, 0x65, 0x0b,
+ 0x1c, 0x00, 0x1a, 0x73, 0x10, 0x22, 0x84, 0x46, 0x5a, 0x7c, 0x1b, 0xa5, 0xb6, 0x4d, 0x03, 0x42,
+ 0x9d, 0x29, 0xbf, 0xfa, 0xcc, 0xd7, 0x52, 0xeb, 0x50, 0x01, 0x1c, 0x1d, 0xfa, 0xda, 0x98, 0x48,
+ 0x38, 0xd3, 0x50, 0xc6, 0x27, 0x67, 0x50, 0xae, 0xe7, 0xc6, 0x1d, 0xd3, 0x80, 0xe8, 0x4a, 0xe3,
+ 0x25, 0x61, 0xdc, 0x51, 0x8c, 0x3b, 0x71, 0xe3, 0x25, 0x6e, 0xcc, 0xb1, 0x5f, 0x24, 0xd0, 0xb8,
+ 0x92, 0xa1, 0x3f, 0x7e, 0x2f, 0x96, 0xd1, 0x39, 0xe1, 0xc0, 0x74, 0x5b, 0xf0, 0x82, 0xb0, 0x1f,
+ 0xf2, 0xb3, 0x09, 0x68, 0x6a, 0xee, 0x12, 0xc7, 0xc3, 0xcf, 0x26, 0x2a, 0x48, 0x68, 0x8c, 0x43,
+ 0x9a, 0x68, 0x2c, 0x0c, 0x38, 0x5e, 0x44, 0xd9, 0x3d, 0x2e, 0x04, 0x0d, 0xe9, 0xfc, 0x91, 0xac,
+ 0x88, 0x8e, 0x9d, 0x82, 0x16, 0x16, 0x04, 0x88, 0x84, 0x4a, 0x98, 0xb4, 0x51, 0x06, 0xf8, 0x2f,
+ 0x74, 0x9b, 0x88, 0xf5, 0x99, 0x89, 0x7f, 0xdc, 0x67, 0xfe, 0x3f, 0x8d, 0x46, 0x29, 0x3f, 0x34,
+ 0xbb, 0x1e, 0x7e, 0x27, 0xec, 0x76, 0x99, 0xf2, 0x2b, 0xa7, 0xb5, 0xb7, 0x28, 0x3a, 0xc1, 0xd7,
+ 0x8f, 0xe8, 0xd2, 0x95, 0x3c, 0xf3, 0xa5, 0x2b, 0x78, 0xa5, 0xd4, 0x19, 0x5e, 0x29, 0x1a, 0x4b,
+ 0xe9, 0x17, 0x1e, 0x4b, 0x99, 0xb3, 0x8f, 0xa5, 0x60, 0x52, 0x66, 0xcf, 0x30, 0x29, 0x1b, 0xe8,
+ 0xdc, 0xa6, 0x63, 0xf7, 0xe0, 0x1b, 0x99, 0xed, 0xe8, 0xce, 0xbe, 0x3c, 0x15, 0xc0, 0xe8, 0xe6,
+ 0x9a, 0xb5, 0x40, 0x11, 0x8e, 0xee, 0x18, 0x4a, 0x68, 0x9c, 0x15, 0x9f, 0x89, 0xb9, 0x17, 0x9b,
+ 0x89, 0xf8, 0x0e, 0xca, 0x89, 0x13, 0xaf, 0x65, 0xc3, 0xb5, 0x2b, 0x53, 0x7e, 0x99, 0xb7, 0x32,
+ 0xc0, 0xea, 0x76, 0xd8, 0xca, 0xa4, 0x1c, 0xbe, 0x76, 0x40, 0x20, 0xbf, 0x4e, 0xa0, 0x1c, 0x65,
+ 0x6e, 0xdf, 0xb6, 0x5c, 0xf6, 0x43, 0x93, 0x60, 0x16, 0xa5, 0x0d, 0xdd, 0xd3, 0x65, 0xda, 0xc1,
+ 0xee, 0x71, 0x39, 0xdc, 0x3d, 0x2e, 0x10, 0x0a, 0x18, 0xfe, 0x10, 0xa5, 0xdb, 0xb6, 0x21, 0x82,
+ 0x7f, 0x4e, 0x6d, 0x9a, 0x55, 0xc7, 0xb1, 0x9d, 0x05, 0xdb, 0x90, 0xd7, 0x0e, 0x4e, 0x0a, 0x1d,
+ 0x70, 0x81, 0x50, 0xc0, 0xc8, 0xaf, 0x12, 0x28, 0x5f, 0xb1, 0x77, 0xad, 0xae, 0xad, 0x1b, 0xab,
+ 0x8e, 0xdd, 0x71, 0x98, 0xeb, 0xfe, 0xa0, 0xbb, 0x7f, 0x0b, 0x8d, 0x6e, 0xc3, 0x97, 0x83, 0xe0,
+ 0xf6, 0x7f, 0x23, 0x7e, 0x0d, 0x3a, 0xfa, 0x10, 0xf1, 0x99, 0x21, 0xfa, 0xd0, 0x28, 0x8d, 0x43,
+ 0xff, 0x42, 0x26, 0x34, 0x50, 0x90, 0x5f, 0xa6, 0x50, 0xf1, 0x74, 0x47, 0xb8, 0x87, 0xc6, 0x05,
+ 0xb3, 0xa5, 0x7c, 0xd2, 0x9f, 0x39, 0xcb, 0x1a, 0xe0, 0x72, 0x06, 0x97, 0x82, 0xed, 0x50, 0x0e,
+ 0x2f, 0x05, 0x11, 0x44, 0xa8, 0xa2, 0x7f, 0xa1, 0xef, 0x94, 0xca, 0x55, 0x3e, 0xf5, 0xe3, 0xaf,
+ 0xf2, 0x4d, 0x34, 0x29, 0x52, 0x34, 0xf8, 0xa0, 0x9c, 0x2e, 0xa5, 0x66, 0x32, 0xe5, 0x9b, 0xbc,
+ 0xdb, 0x6e, 0x88, 0xc3, 0x6a, 0xf0, 0x29, 0x79, 0x2a, 0x4a, 0x56, 0x01, 0x06, 0xd9, 0x96, 0x1f,
+ 0xa1, 0x31, 0x2e, 0x5e, 0x8c, 0xdd, 0xf4, 0x44, 0xa9, 0xff, 0xdb, 0x19, 0x6f, 0x76, 0xca, 0x4d,
+ 0x8e, 0x64, 0x51, 0x7a, 0xd5, 0xb4, 0x3a, 0xe4, 0x36, 0xca, 0x2c, 0x74, 0x6d, 0x17, 0x3a, 0x8e,
+ 0xc3, 0x74, 0xd7, 0xb6, 0xd4, 0x54, 0x12, 0x48, 0x18, 0x6a, 0x21, 0x12, 0x2a, 0xf1, 0xd9, 0x6f,
+ 0x52, 0x68, 0x5c, 0xf9, 0x0b, 0x0c, 0xfe, 0x2f, 0x74, 0x75, 0xa5, 0xda, 0x6c, 0xce, 0x2f, 0x55,
+ 0x5b, 0x6b, 0x0f, 0x57, 0xab, 0xad, 0x85, 0xe5, 0xf5, 0xe6, 0x5a, 0x95, 0xb6, 0x16, 0x1a, 0xf5,
+ 0xc5, 0xda, 0x52, 0x7e, 0xa4, 0x78, 0xed, 0xe0, 0xb0, 0x54, 0x50, 0x2c, 0xe2, 0x7f, 0x2b, 0xf9,
+ 0x77, 0x84, 0x63, 0xe6, 0xb5, 0x7a, 0xa5, 0xfa, 0x49, 0x3e, 0x51, 0xbc, 0x78, 0x70, 0x58, 0xca,
+ 0x2b, 0x56, 0xe2, 0x13, 0xdc, 0x7f, 0xa2, 0x97, 0x8e, 0xb3, 0x5b, 0xeb, 0xab, 0x95, 0xf9, 0xb5,
+ 0x6a, 0x3e, 0x59, 0x2c, 0x1e, 0x1c, 0x96, 0x2e, 0x1f, 0x35, 0x92, 0x29, 0xf8, 0x06, 0xba, 0x18,
+ 0x33, 0xa5, 0xd5, 0x8f, 0xd7, 0xab, 0xcd, 0xb5, 0x7c, 0xaa, 0x78, 0xf9, 0xe0, 0xb0, 0x84, 0x15,
+ 0xab, 0x60, 0x4c, 0xcc, 0xa1, 0x4b, 0x47, 0x2c, 0x9a, 0xab, 0x8d, 0x7a, 0xb3, 0x9a, 0x4f, 0x17,
+ 0xaf, 0x1c, 0x1c, 0x96, 0x2e, 0xc4, 0x4c, 0x64, 0x57, 0x59, 0x40, 0xd3, 0x31, 0x9b, 0x4a, 0xe3,
+ 0x41, 0x7d, 0xb9, 0x31, 0x5f, 0x69, 0xad, 0xd2, 0xc6, 0x12, 0xad, 0x36, 0x9b, 0xf9, 0x4c, 0x51,
+ 0x3b, 0x38, 0x2c, 0x5d, 0x55, 0x8c, 0x8f, 0x55, 0xf8, 0x2c, 0x9a, 0x8a, 0x39, 0x59, 0xad, 0xd5,
+ 0x97, 0xf2, 0xd9, 0xe2, 0x85, 0x83, 0xc3, 0xd2, 0x79, 0xc5, 0x8e, 0xc7, 0xf2, 0xd8, 0xfe, 0x2d,
+ 0x2c, 0x37, 0x9a, 0xd5, 0xfc, 0xe8, 0xb1, 0xfd, 0x83, 0x80, 0xcf, 0xfe, 0x35, 0x81, 0xf0, 0xf1,
+ 0x3f, 0x7a, 0xe1, 0xf7, 0x50, 0x21, 0x70, 0xb2, 0xd0, 0x58, 0x59, 0xe5, 0xeb, 0xac, 0x35, 0xea,
+ 0xad, 0x7a, 0xa3, 0x5e, 0xcd, 0x8f, 0xc4, 0x76, 0x55, 0xb1, 0xaa, 0xdb, 0x16, 0xc3, 0x0d, 0x74,
+ 0xe5, 0x24, 0xcb, 0xe5, 0x47, 0x6f, 0xe7, 0x13, 0xc5, 0xb9, 0x83, 0xc3, 0xd2, 0xa5, 0xe3, 0x86,
+ 0xcb, 0x8f, 0xde, 0xfe, 0xf6, 0xcb, 0x57, 0x4e, 0x56, 0xe0, 0xf5, 0x28, 0xc2, 0x71, 0x87, 0x2b,
+ 0xf3, 0x73, 0xf9, 0x64, 0xf1, 0xdd, 0x83, 0xc3, 0xd2, 0x95, 0x93, 0x2c, 0x57, 0xe6, 0xe7, 0xbe,
+ 0xfd, 0xf2, 0x95, 0xd3, 0x54, 0xb3, 0xfc, 0x5c, 0xa5, 0xbe, 0xf1, 0x9b, 0xe8, 0xa2, 0xea, 0x7e,
+ 0xa5, 0xba, 0x36, 0x5f, 0x99, 0x5f, 0x9b, 0xcf, 0x8f, 0x88, 0xd0, 0x2a, 0xd4, 0x15, 0xe6, 0xe9,
+ 0xd0, 0xcd, 0x5f, 0x43, 0x53, 0xb1, 0xcd, 0xa9, 0xde, 0xaf, 0xd2, 0x20, 0x51, 0xd5, 0x6d, 0x61,
+ 0x3b, 0xcc, 0xc1, 0xaf, 0x23, 0xac, 0x92, 0xe7, 0x97, 0x1f, 0xcc, 0x3f, 0x6c, 0xe6, 0x93, 0xc5,
+ 0x4b, 0x07, 0x87, 0xa5, 0x29, 0x85, 0x3d, 0xdf, 0xdd, 0xd5, 0xf7, 0xdd, 0xd9, 0xdf, 0x26, 0xd1,
+ 0x84, 0xfa, 0x39, 0x0a, 0xbf, 0x8e, 0x2e, 0x2c, 0xd6, 0x96, 0x79, 0x82, 0x2f, 0x36, 0x44, 0x60,
+ 0xb9, 0x98, 0x1f, 0x11, 0x8f, 0x53, 0xa9, 0xfc, 0x37, 0xfe, 0x0f, 0x54, 0x38, 0x42, 0xaf, 0xd4,
+ 0x68, 0x75, 0x61, 0xad, 0x41, 0x1f, 0xe6, 0x13, 0xc5, 0x97, 0x78, 0x1c, 0x54, 0x9b, 0x8a, 0xe9,
+ 0x40, 0x67, 0xdb, 0xc7, 0x77, 0xd0, 0xd5, 0x23, 0x86, 0xcd, 0x87, 0x2b, 0xcb, 0xb5, 0xfa, 0x3d,
+ 0xf1, 0xbc, 0x64, 0xf1, 0x3a, 0xdf, 0x70, 0xd5, 0xb6, 0x29, 0xbe, 0xf0, 0x71, 0x28, 0x97, 0xc0,
+ 0x77, 0x51, 0xe9, 0x14, 0xfb, 0x68, 0x01, 0xa9, 0x22, 0x39, 0x38, 0x2c, 0x5d, 0x3b, 0xc1, 0x49,
+ 0xb8, 0x8e, 0x5c, 0x02, 0xbf, 0x85, 0x2e, 0x9f, 0xec, 0x29, 0x28, 0xb7, 0x13, 0xec, 0x67, 0x7f,
+ 0x9f, 0x40, 0x63, 0xe1, 0x30, 0xe5, 0x9b, 0x56, 0xa5, 0xb4, 0xc1, 0x7b, 0x4f, 0xa5, 0xda, 0xaa,
+ 0x37, 0x5a, 0x20, 0x05, 0x9b, 0x16, 0xf2, 0xea, 0x36, 0xfc, 0xe4, 0xa5, 0xa3, 0xd0, 0x97, 0xaa,
+ 0xf5, 0x2a, 0xad, 0x2d, 0x04, 0x11, 0x0d, 0xd9, 0x4b, 0xcc, 0x62, 0x8e, 0xd9, 0xc6, 0x6f, 0xa3,
+ 0x2b, 0x71, 0xe7, 0xcd, 0xf5, 0x85, 0xbb, 0xc1, 0x2e, 0xc1, 0x02, 0x95, 0x07, 0x34, 0xb7, 0xdb,
+ 0x5b, 0x10, 0x98, 0x77, 0x62, 0x56, 0xb5, 0xfa, 0xfd, 0xf9, 0xe5, 0x5a, 0x45, 0x58, 0xa5, 0x8a,
+ 0x85, 0x83, 0xc3, 0xd2, 0xc5, 0xd0, 0x4a, 0x7e, 0x37, 0xe1, 0x66, 0xb3, 0xdf, 0x26, 0xd0, 0xf4,
+ 0xf7, 0xcf, 0x44, 0xfc, 0x00, 0xbd, 0x0a, 0xfb, 0x75, 0xac, 0xc3, 0xc8, 0x76, 0x28, 0xf6, 0x70,
+ 0x7e, 0x75, 0xb5, 0x5a, 0xaf, 0xe4, 0x47, 0x8a, 0x33, 0x07, 0x87, 0xa5, 0x1b, 0xdf, 0xef, 0x72,
+ 0xbe, 0xdf, 0x67, 0x96, 0x71, 0x46, 0xc7, 0x8b, 0x0d, 0xba, 0x54, 0x5d, 0xcb, 0x27, 0xce, 0xe2,
+ 0x78, 0xd1, 0x76, 0x3a, 0xcc, 0x2b, 0xaf, 0x3c, 0xf9, 0x6e, 0x7a, 0xe4, 0xe9, 0x77, 0xd3, 0x23,
+ 0x4f, 0x9e, 0x4d, 0x27, 0x9e, 0x3e, 0x9b, 0x4e, 0xfc, 0xf4, 0xf9, 0xf4, 0xc8, 0xd7, 0xcf, 0xa7,
+ 0x13, 0x4f, 0x9f, 0x4f, 0x8f, 0xfc, 0xe1, 0xf9, 0xf4, 0xc8, 0xa3, 0xd7, 0x3a, 0xa6, 0xb7, 0xb5,
+ 0xbd, 0x71, 0xb3, 0x6d, 0xf7, 0x6e, 0xb9, 0xfb, 0x56, 0xdb, 0xdb, 0x32, 0xad, 0x8e, 0xf2, 0x4b,
+ 0xfd, 0x3f, 0x15, 0x1b, 0x59, 0xf8, 0xf5, 0xd6, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x15, 0xab,
+ 0x3a, 0x2b, 0x6a, 0x21, 0x00, 0x00,
}
func (m *Hello) Marshal() (dAtA []byte, err error) {
diff --git a/lib/protocol/protocol.go b/lib/protocol/protocol.go
index 7a40a72ee..c94fe901c 100644
--- a/lib/protocol/protocol.go
+++ b/lib/protocol/protocol.go
@@ -12,6 +12,7 @@
package protocol
import (
+ "bytes"
"context"
"crypto/sha256"
"encoding/binary"
@@ -25,6 +26,7 @@ import (
"time"
lz4 "github.com/pierrec/lz4/v4"
+ "github.com/ulikunitz/xz/lzma"
)
const (
@@ -195,6 +197,7 @@ type rawConnection struct {
closeOnce sync.Once
sendCloseOnce sync.Once
compression Compression
+ compressionAlgo MessageCompression
loopWG sync.WaitGroup // Need to ensure no leftover routines in testing
}
@@ -230,7 +233,7 @@ const (
// Should not be modified in production code, just for testing.
var CloseTimeout = 10 * time.Second
-func NewConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, closer io.Closer, receiver Model, connInfo ConnectionInfo, compress Compression, passwords map[string]string, keyGen *KeyGenerator) Connection {
+func NewConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, closer io.Closer, receiver Model, connInfo ConnectionInfo, compress Compression, compressionAlgo MessageCompression, passwords map[string]string, keyGen *KeyGenerator) Connection {
// Encryption / decryption is first (outermost) before conversion to
// native path formats.
nm := makeNative(receiver)
@@ -238,19 +241,21 @@ func NewConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, closer
// We do the wire format conversion first (outermost) so that the
// metadata is in wire format when it reaches the encryption step.
- rc := newRawConnection(deviceID, reader, writer, closer, em, connInfo, compress)
+ rc := newRawConnection(deviceID, reader, writer, closer, em, connInfo, compress, compressionAlgo)
ec := newEncryptedConnection(rc, rc, em.folderKeys, keyGen)
wc := wireFormatConnection{ec}
return wc
}
-func newRawConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, closer io.Closer, receiver Model, connInfo ConnectionInfo, compress Compression) *rawConnection {
+func newRawConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, closer io.Closer, receiver Model, connInfo ConnectionInfo, compress Compression, compressionAlgo MessageCompression) *rawConnection {
idString := deviceID.String()
cr := &countingReader{Reader: reader, idString: idString}
cw := &countingWriter{Writer: writer, idString: idString}
registerDeviceMetrics(idString)
+ l.Infoln("Connection uses:", compress, compressionAlgo)
+
return &rawConnection{
ConnectionInfo: connInfo,
id: deviceID,
@@ -267,6 +272,7 @@ func newRawConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, clo
dispatcherLoopStopped: make(chan struct{}),
closed: make(chan struct{}),
compression: compress,
+ compressionAlgo: compressionAlgo,
loopWG: sync.WaitGroup{},
}
}
@@ -535,6 +541,14 @@ func (c *rawConnection) readMessageAfterHeader(hdr Header, fourByteBuf []byte) (
}
buf = decomp
+ case MessageCompressionLZMA2:
+ decomp, err := lzma2Decompress(buf)
+ BufferPool.Put(buf)
+ if err != nil {
+ return nil, fmt.Errorf("decompressing message: %w", err)
+ }
+ buf = decomp
+
default:
return nil, fmt.Errorf("unknown message compression %d", hdr.Compression)
}
@@ -774,7 +788,7 @@ func (c *rawConnection) writeMessage(msg message) error {
}
if c.shouldCompressMessage(msg) {
- ok, err := c.writeCompressedMessage(msg, buf[overhead:])
+ ok, err := c.writeCompressedMessage(msg, buf[overhead:], c.compressionAlgo)
if ok {
return err
}
@@ -804,10 +818,10 @@ 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) {
+func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte, comp MessageCompression) (ok bool, err error) {
hdr := Header{
Type: typeOf(msg),
- Compression: MessageCompressionLZ4,
+ Compression: comp,
}
hdrSize := hdr.ProtoSize()
if hdrSize > 1<<16-1 {
@@ -825,9 +839,16 @@ func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte) (o
buf := BufferPool.Get(maxCompressed)
defer BufferPool.Put(buf)
- compressedSize, err := lz4Compress(marshaled, buf[cOverhead:])
+ var compressedSize int
+ switch comp {
+ case MessageCompressionLZ4:
+ compressedSize, err = lz4Compress(marshaled, buf[cOverhead:])
+ case MessageCompressionLZMA2:
+ compressedSize, err = lzma2Compress(marshaled, buf[cOverhead:])
+ }
totSize := compressedSize + cOverhead
if err != nil {
+ l.Debugf("compression failed: %v", err)
return false, nil
}
@@ -1044,6 +1065,39 @@ func lz4Compress(src, buf []byte) (int, error) {
return n + 4, nil
}
+func lzma2Compress(src, buf []byte) (int, error) {
+ sw := &sliceWriter{buf: buf, offset: 4}
+ lw, err := lzma.NewWriter2(sw)
+ if err != nil {
+ return -1, err
+ }
+ if _, err := lw.Write(src); err != nil {
+ return -1, err
+ }
+ if err := lw.Flush(); err != nil {
+ return -1, err
+ }
+
+ // The compressed block is prefixed by the size of the uncompressed data.
+ binary.BigEndian.PutUint32(buf, uint32(len(src)))
+
+ return sw.offset, nil
+}
+
+type sliceWriter struct {
+ buf []byte
+ offset int
+}
+
+func (w *sliceWriter) Write(p []byte) (int, error) {
+ if len(w.buf)-w.offset < len(p) {
+ return 0, io.ErrShortBuffer
+ }
+ copy(w.buf[w.offset:], p)
+ w.offset += len(p)
+ return len(p), nil
+}
+
func lz4Decompress(src []byte) ([]byte, error) {
size := binary.BigEndian.Uint32(src)
buf := BufferPool.Get(int(size))
@@ -1057,6 +1111,31 @@ func lz4Decompress(src []byte) ([]byte, error) {
return buf[:n], nil
}
+func lzma2Decompress(src []byte) ([]byte, error) {
+ size := int(binary.BigEndian.Uint32(src))
+ buf := BufferPool.Get(int(size))
+
+ rd, err := lzma.NewReader2(bytes.NewReader(src[4:]))
+ if err != nil {
+ return nil, err
+ }
+
+ offset := 0
+ for {
+ n, err := rd.Read(buf[offset:])
+ offset += n
+ if offset == size {
+ break
+ }
+ if err != nil {
+ BufferPool.Put(buf)
+ return nil, err
+ }
+ }
+
+ return buf[:offset], nil
+}
+
func newProtocolError(err error, msgContext string) error {
return fmt.Errorf("protocol error on %v: %w", msgContext, err)
}
diff --git a/lib/protocol/protocol_test.go b/lib/protocol/protocol_test.go
index 90916f760..6358d4aee 100644
--- a/lib/protocol/protocol_test.go
+++ b/lib/protocol/protocol_test.go
@@ -32,10 +32,10 @@ func TestPing(t *testing.T) {
ar, aw := io.Pipe()
br, bw := io.Pipe()
- c0 := getRawConnection(NewConnection(c0ID, ar, bw, testutils.NoopCloser{}, newTestModel(), new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen))
+ c0 := getRawConnection(NewConnection(c0ID, ar, bw, testutils.NoopCloser{}, newTestModel(), new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen))
c0.Start()
defer closeAndWait(c0, ar, bw)
- c1 := getRawConnection(NewConnection(c1ID, br, aw, testutils.NoopCloser{}, newTestModel(), new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen))
+ c1 := getRawConnection(NewConnection(c1ID, br, aw, testutils.NoopCloser{}, newTestModel(), new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen))
c1.Start()
defer closeAndWait(c1, ar, bw)
c0.ClusterConfig(ClusterConfig{})
@@ -58,10 +58,10 @@ func TestClose(t *testing.T) {
ar, aw := io.Pipe()
br, bw := io.Pipe()
- c0 := getRawConnection(NewConnection(c0ID, ar, bw, testutils.NoopCloser{}, m0, new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen))
+ c0 := getRawConnection(NewConnection(c0ID, ar, bw, testutils.NoopCloser{}, m0, new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen))
c0.Start()
defer closeAndWait(c0, ar, bw)
- c1 := NewConnection(c1ID, br, aw, testutils.NoopCloser{}, m1, new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen)
+ c1 := NewConnection(c1ID, br, aw, testutils.NoopCloser{}, m1, new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen)
c1.Start()
defer closeAndWait(c1, ar, bw)
c0.ClusterConfig(ClusterConfig{})
@@ -103,7 +103,7 @@ func TestCloseOnBlockingSend(t *testing.T) {
m := newTestModel()
rw := testutils.NewBlockingRW()
- c := getRawConnection(NewConnection(c0ID, rw, rw, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen))
+ c := getRawConnection(NewConnection(c0ID, rw, rw, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen))
c.Start()
defer closeAndWait(c, rw)
@@ -154,10 +154,10 @@ func TestCloseRace(t *testing.T) {
ar, aw := io.Pipe()
br, bw := io.Pipe()
- c0 := getRawConnection(NewConnection(c0ID, ar, bw, testutils.NoopCloser{}, m0, new(mockedConnectionInfo), CompressionNever, nil, testKeyGen))
+ c0 := getRawConnection(NewConnection(c0ID, ar, bw, testutils.NoopCloser{}, m0, new(mockedConnectionInfo), CompressionNever, MessageCompressionNone, nil, testKeyGen))
c0.Start()
defer closeAndWait(c0, ar, bw)
- c1 := NewConnection(c1ID, br, aw, testutils.NoopCloser{}, m1, new(mockedConnectionInfo), CompressionNever, nil, testKeyGen)
+ c1 := NewConnection(c1ID, br, aw, testutils.NoopCloser{}, m1, new(mockedConnectionInfo), CompressionNever, MessageCompressionNone, nil, testKeyGen)
c1.Start()
defer closeAndWait(c1, ar, bw)
c0.ClusterConfig(ClusterConfig{})
@@ -194,7 +194,7 @@ func TestClusterConfigFirst(t *testing.T) {
m := newTestModel()
rw := testutils.NewBlockingRW()
- c := getRawConnection(NewConnection(c0ID, rw, &testutils.NoopRW{}, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen))
+ c := getRawConnection(NewConnection(c0ID, rw, &testutils.NoopRW{}, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen))
c.Start()
defer closeAndWait(c, rw)
@@ -246,7 +246,7 @@ func TestCloseTimeout(t *testing.T) {
m := newTestModel()
rw := testutils.NewBlockingRW()
- c := getRawConnection(NewConnection(c0ID, rw, rw, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen))
+ c := getRawConnection(NewConnection(c0ID, rw, rw, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen))
c.Start()
defer closeAndWait(c, rw)
@@ -444,9 +444,10 @@ func TestWriteCompressed(t *testing.T) {
for _, random := range []bool{false, true} {
buf := new(bytes.Buffer)
c := &rawConnection{
- cr: &countingReader{Reader: buf},
- cw: &countingWriter{Writer: buf},
- compression: CompressionAlways,
+ cr: &countingReader{Reader: buf},
+ cw: &countingWriter{Writer: buf},
+ compression: CompressionAlways,
+ compressionAlgo: MessageCompressionLZMA2,
}
msg := &Response{Data: make([]byte, 10240)}
@@ -899,7 +900,7 @@ func TestClusterConfigAfterClose(t *testing.T) {
m := newTestModel()
rw := testutils.NewBlockingRW()
- c := getRawConnection(NewConnection(c0ID, rw, rw, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen))
+ c := getRawConnection(NewConnection(c0ID, rw, rw, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen))
c.Start()
defer closeAndWait(c, rw)
@@ -923,7 +924,7 @@ func TestDispatcherToCloseDeadlock(t *testing.T) {
// the model callbacks (ClusterConfig).
m := newTestModel()
rw := testutils.NewBlockingRW()
- c := getRawConnection(NewConnection(c0ID, rw, &testutils.NoopRW{}, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, nil, testKeyGen))
+ c := getRawConnection(NewConnection(c0ID, rw, &testutils.NoopRW{}, testutils.NoopCloser{}, m, new(mockedConnectionInfo), CompressionAlways, MessageCompressionLZMA2, nil, testKeyGen))
m.ccFn = func(devID DeviceID, cc ClusterConfig) {
c.Close(errManual)
}
diff --git a/proto/lib/config/deviceconfiguration.proto b/proto/lib/config/deviceconfiguration.proto
index 616329b76..dc75c8e9c 100644
--- a/proto/lib/config/deviceconfiguration.proto
+++ b/proto/lib/config/deviceconfiguration.proto
@@ -8,22 +8,23 @@ 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", (ext.default) = "dynamic"];
- 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"];
+ 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", (ext.default) = "dynamic"];
+ protocol.Compression compression = 4 [(ext.xml) = "compression,attr"];
+ protocol.MessageCompression compression_algo = 19 [(ext.xml) = "compressionAlgo,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"];
}
diff --git a/proto/lib/protocol/bep.proto b/proto/lib/protocol/bep.proto
index 7e76464a2..a09b5061a 100644
--- a/proto/lib/protocol/bep.proto
+++ b/proto/lib/protocol/bep.proto
@@ -32,8 +32,9 @@ enum MessageType {
}
enum MessageCompression {
- MESSAGE_COMPRESSION_NONE = 0;
- MESSAGE_COMPRESSION_LZ4 = 1 [(ext.enumgoname) = "MessageCompressionLZ4"];
+ MESSAGE_COMPRESSION_NONE = 0;
+ MESSAGE_COMPRESSION_LZ4 = 1 [(ext.enumgoname) = "MessageCompressionLZ4"];
+ MESSAGE_COMPRESSION_LZMA2 = 2 [(ext.enumgoname) = "MessageCompressionLZMA2"];
}
// --- Actual messages ---
diff --git a/test/h1/config.xml b/test/h1/config.xml
index a658d1bdb..a43f2b7ef 100644
--- a/test/h1/config.xml
+++ b/test/h1/config.xml
@@ -1,13 +1,23 @@
-<configuration version="32">
+<configuration version="37">
<folder id="default" label="" path="s1/" type="sendreceive" rescanIntervalS="10" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
<filesystemType>basic</filesystemType>
- <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy=""></device>
- <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy=""></device>
- <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" introducedBy=""></device>
- <device id="7PBCTLL-JJRYBSA-MOWZRKL-MSDMN4N-4US4OMX-SYEXUS4-HSBGNRY-CZXRXAT" introducedBy=""></device>
+ <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <device id="7PBCTLL-JJRYBSA-MOWZRKL-MSDMN4N-4US4OMX-SYEXUS4-HSBGNRY-CZXRXAT" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
<minDiskFree unit="%">1</minDiskFree>
<versioning>
<cleanupIntervalS>3600</cleanupIntervalS>
+ <fsPath></fsPath>
+ <fsType>basic</fsType>
</versioning>
<copiers>1</copiers>
<pullerMaxPendingKiB>0</pullerMaxPendingKiB>
@@ -24,20 +34,34 @@
<markerName>.stfolder</markerName>
<copyOwnershipFromParent>false</copyOwnershipFromParent>
<modTimeWindowS>0</modTimeWindowS>
- <maxConcurrentWrites>0</maxConcurrentWrites>
+ <maxConcurrentWrites>2</maxConcurrentWrites>
<disableFsync>false</disableFsync>
<blockPullOrder>standard</blockPullOrder>
<copyRangeMethod>standard</copyRangeMethod>
<caseSensitiveFS>false</caseSensitiveFS>
<junctionsAsDirs>true</junctionsAsDirs>
+ <syncOwnership>false</syncOwnership>
+ <sendOwnership>false</sendOwnership>
+ <syncXattrs>false</syncXattrs>
+ <sendXattrs>false</sendXattrs>
+ <xattrFilter>
+ <maxSingleEntrySize>0</maxSingleEntrySize>
+ <maxTotalSize>0</maxTotalSize>
+ </xattrFilter>
</folder>
<folder id="¯\_(ツ)_/¯ Räksmörgås 动作 Адрес" label="" path="s12-1/" type="sendreceive" rescanIntervalS="10" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
<filesystemType>basic</filesystemType>
- <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy=""></device>
- <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy=""></device>
+ <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
<minDiskFree unit="%">1</minDiskFree>
<versioning>
<cleanupIntervalS>3600</cleanupIntervalS>
+ <fsPath></fsPath>
+ <fsType>basic</fsType>
</versioning>
<copiers>1</copiers>
<pullerMaxPendingKiB>0</pullerMaxPendingKiB>
@@ -54,52 +78,70 @@
<markerName>.stfolder</markerName>
<copyOwnershipFromParent>false</copyOwnershipFromParent>
<modTimeWindowS>0</modTimeWindowS>
- <maxConcurrentWrites>0</maxConcurrentWrites>
+ <maxConcurrentWrites>2</maxConcurrentWrites>
<disableFsync>false</disableFsync>
<blockPullOrder>standard</blockPullOrder>
<copyRangeMethod>standard</copyRangeMethod>
<caseSensitiveFS>false</caseSensitiveFS>
<junctionsAsDirs>true</junctionsAsDirs>
+ <syncOwnership>false</syncOwnership>
+ <sendOwnership>false</sendOwnership>
+ <syncXattrs>false</syncXattrs>
+ <sendXattrs>false</sendXattrs>
+ <xattrFilter>
+ <maxSingleEntrySize>0</maxSingleEntrySize>
+ <maxTotalSize>0</maxTotalSize>
+ </xattrFilter>
</folder>
- <device id="EJHMPAQ-OGCVORE-ISB4IS3-SYYVJXF-TKJGLTU-66DIQPF-GJ5D2GX-GQ3OWQK" name="s4" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <device id="EJHMPAQ-OGCVORE-ISB4IS3-SYYVJXF-TKJGLTU-66DIQPF-GJ5D2GX-GQ3OWQK" name="s4" compression="always" compressionAlgo="1" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>tcp://127.0.0.1:22004</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
</device>
- <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="always" compressionAlgo="2" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>tcp://127.0.0.1:22001</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
</device>
- <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" name="s2" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" name="s2" compression="always" compressionAlgo="2" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>tcp://127.0.0.1:22002</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
</device>
- <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="always" compressionAlgo="1" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>tcp://127.0.0.1:22003</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
</device>
- <device id="7PBCTLL-JJRYBSA-MOWZRKL-MSDMN4N-4US4OMX-SYEXUS4-HSBGNRY-CZXRXAT" name="s4" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <device id="7PBCTLL-JJRYBSA-MOWZRKL-MSDMN4N-4US4OMX-SYEXUS4-HSBGNRY-CZXRXAT" name="s4" compression="always" compressionAlgo="1" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>tcp://127.0.0.1:22004</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
</device>
<gui enabled="true" tls="false" debugging="true">
<address>127.0.0.1:8081</address>
@@ -132,7 +174,6 @@
<urURL>https://data.syncthing.net/newdata</urURL>
<urPostInsecurely>false</urPostInsecurely>
<urInitialDelayS>1800</urInitialDelayS>
- <restartOnWakeup>true</restartOnWakeup>
<autoUpgradeIntervalH>12</autoUpgradeIntervalH>
<upgradeToPreReleases>false</upgradeToPreReleases>
<keepTemporariesH>24</keepTemporariesH>
@@ -144,7 +185,6 @@
<overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect>
<tempIndexMinBlocks>10</tempIndexMinBlocks>
<trafficClass>0</trafficClass>
- <defaultFolderPath>~</defaultFolderPath>
<setLowPriority>true</setLowPriority>
<maxFolderConcurrency>0</maxFolderConcurrency>
<crashReportingURL>https://crash.syncthing.net/newcrash</crashReportingURL>
@@ -155,5 +195,69 @@
<databaseTuning>auto</databaseTuning>
<maxConcurrentIncomingRequestKiB>0</maxConcurrentIncomingRequestKiB>
<announceLANAddresses>true</announceLANAddresses>
+ <sendFullIndexOnUpgrade>false</sendFullIndexOnUpgrade>
+ <connectionLimitEnough>0</connectionLimitEnough>
+ <connectionLimitMax>0</connectionLimitMax>
+ <insecureAllowOldTLSVersions>false</insecureAllowOldTLSVersions>
+ <connectionPriorityTcpLan>10</connectionPriorityTcpLan>
+ <connectionPriorityQuicLan>20</connectionPriorityQuicLan>
+ <connectionPriorityTcpWan>30</connectionPriorityTcpWan>
+ <connectionPriorityQuicWan>40</connectionPriorityQuicWan>
+ <connectionPriorityRelay>50</connectionPriorityRelay>
+ <connectionPriorityUpgradeThreshold>0</connectionPriorityUpgradeThreshold>
</options>
+ <defaults>
+ <folder id="" label="" path="~" type="sendreceive" rescanIntervalS="3600" fsWatcherEnabled="true" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
+ <filesystemType>basic</filesystemType>
+ <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <minDiskFree unit="%">1</minDiskFree>
+ <versioning>
+ <cleanupIntervalS>3600</cleanupIntervalS>
+ <fsPath></fsPath>
+ <fsType>basic</fsType>
+ </versioning>
+ <copiers>0</copiers>
+ <pullerMaxPendingKiB>0</pullerMaxPendingKiB>
+ <hashers>0</hashers>
+ <order>random</order>
+ <ignoreDelete>false</ignoreDelete>
+ <scanProgressIntervalS>0</scanProgressIntervalS>
+ <pullerPauseS>0</pullerPauseS>
+ <maxConflicts>10</maxConflicts>
+ <disableSparseFiles>false</disableSparseFiles>
+ <disableTempIndexes>false</disableTempIndexes>
+ <paused>false</paused>
+ <weakHashThresholdPct>25</weakHashThresholdPct>
+ <markerName>.stfolder</markerName>
+ <copyOwnershipFromParent>false</copyOwnershipFromParent>
+ <modTimeWindowS>0</modTimeWindowS>
+ <maxConcurrentWrites>2</maxConcurrentWrites>
+ <disableFsync>false</disableFsync>
+ <blockPullOrder>standard</blockPullOrder>
+ <copyRangeMethod>standard</copyRangeMethod>
+ <caseSensitiveFS>false</caseSensitiveFS>
+ <junctionsAsDirs>false</junctionsAsDirs>
+ <syncOwnership>false</syncOwnership>
+ <sendOwnership>false</sendOwnership>
+ <syncXattrs>false</syncXattrs>
+ <sendXattrs>false</sendXattrs>
+ <xattrFilter>
+ <maxSingleEntrySize>1024</maxSingleEntrySize>
+ <maxTotalSize>4096</maxTotalSize>
+ </xattrFilter>
+ </folder>
+ <device id="" compression="metadata" compressionAlgo="1" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <address>dynamic</address>
+ <paused>false</paused>
+ <autoAcceptFolders>false</autoAcceptFolders>
+ <maxSendKbps>0</maxSendKbps>
+ <maxRecvKbps>0</maxRecvKbps>
+ <maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
+ </device>
+ <ignores></ignores>
+ </defaults>
</configuration>
diff --git a/test/h2/config.xml b/test/h2/config.xml
index 6b5552070..94d4a41c0 100644
--- a/test/h2/config.xml
+++ b/test/h2/config.xml
@@ -1,12 +1,20 @@
-<configuration version="32">
+<configuration version="37">
<folder id="default" label="" path="s2" type="sendreceive" rescanIntervalS="15" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
<filesystemType>basic</filesystemType>
- <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy=""></device>
- <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy=""></device>
- <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" introducedBy=""></device>
+ <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
<minDiskFree unit="%">1</minDiskFree>
<versioning>
<cleanupIntervalS>3600</cleanupIntervalS>
+ <fsPath></fsPath>
+ <fsType>basic</fsType>
</versioning>
<copiers>1</copiers>
<pullerMaxPendingKiB>0</pullerMaxPendingKiB>
@@ -23,20 +31,34 @@
<markerName>.stfolder</markerName>
<copyOwnershipFromParent>false</copyOwnershipFromParent>
<modTimeWindowS>0</modTimeWindowS>
- <maxConcurrentWrites>0</maxConcurrentWrites>
+ <maxConcurrentWrites>2</maxConcurrentWrites>
<disableFsync>false</disableFsync>
<blockPullOrder>standard</blockPullOrder>
<copyRangeMethod>standard</copyRangeMethod>
<caseSensitiveFS>false</caseSensitiveFS>
<junctionsAsDirs>true</junctionsAsDirs>
+ <syncOwnership>false</syncOwnership>
+ <sendOwnership>false</sendOwnership>
+ <syncXattrs>false</syncXattrs>
+ <sendXattrs>false</sendXattrs>
+ <xattrFilter>
+ <maxSingleEntrySize>0</maxSingleEntrySize>
+ <maxTotalSize>0</maxTotalSize>
+ </xattrFilter>
</folder>
<folder id="s23" label="" path="s23-2" type="sendreceive" rescanIntervalS="15" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
<filesystemType>basic</filesystemType>
- <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy=""></device>
- <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" introducedBy=""></device>
+ <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
<minDiskFree unit="%">1</minDiskFree>
<versioning>
<cleanupIntervalS>3600</cleanupIntervalS>
+ <fsPath></fsPath>
+ <fsType>basic</fsType>
</versioning>
<copiers>1</copiers>
<pullerMaxPendingKiB>0</pullerMaxPendingKiB>
@@ -53,20 +75,34 @@
<markerName>.stfolder</markerName>
<copyOwnershipFromParent>false</copyOwnershipFromParent>
<modTimeWindowS>0</modTimeWindowS>
- <maxConcurrentWrites>0</maxConcurrentWrites>
+ <maxConcurrentWrites>2</maxConcurrentWrites>
<disableFsync>false</disableFsync>
<blockPullOrder>standard</blockPullOrder>
<copyRangeMethod>standard</copyRangeMethod>
<caseSensitiveFS>false</caseSensitiveFS>
<junctionsAsDirs>true</junctionsAsDirs>
+ <syncOwnership>false</syncOwnership>
+ <sendOwnership>false</sendOwnership>
+ <syncXattrs>false</syncXattrs>
+ <sendXattrs>false</sendXattrs>
+ <xattrFilter>
+ <maxSingleEntrySize>0</maxSingleEntrySize>
+ <maxTotalSize>0</maxTotalSize>
+ </xattrFilter>
</folder>
<folder id="¯\_(ツ)_/¯ Räksmörgås 动作 Адрес" label="" path="s12-2" type="sendreceive" rescanIntervalS="15" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
<filesystemType>basic</filesystemType>
- <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy=""></device>
- <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy=""></device>
+ <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
<minDiskFree unit="%">1</minDiskFree>
<versioning>
<cleanupIntervalS>3600</cleanupIntervalS>
+ <fsPath></fsPath>
+ <fsType>basic</fsType>
</versioning>
<copiers>1</copiers>
<pullerMaxPendingKiB>0</pullerMaxPendingKiB>
@@ -83,36 +119,50 @@
<markerName>.stfolder</markerName>
<copyOwnershipFromParent>false</copyOwnershipFromParent>
<modTimeWindowS>0</modTimeWindowS>
- <maxConcurrentWrites>0</maxConcurrentWrites>
+ <maxConcurrentWrites>2</maxConcurrentWrites>
<disableFsync>false</disableFsync>
<blockPullOrder>standard</blockPullOrder>
<copyRangeMethod>standard</copyRangeMethod>
<caseSensitiveFS>false</caseSensitiveFS>
<junctionsAsDirs>true</junctionsAsDirs>
+ <syncOwnership>false</syncOwnership>
+ <sendOwnership>false</sendOwnership>
+ <syncXattrs>false</syncXattrs>
+ <sendXattrs>false</sendXattrs>
+ <xattrFilter>
+ <maxSingleEntrySize>0</maxSingleEntrySize>
+ <maxTotalSize>0</maxTotalSize>
+ </xattrFilter>
</folder>
- <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="always" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>tcp://127.0.0.1:22001</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
</device>
- <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" name="s2" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" name="s2" compression="always" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>tcp://127.0.0.1:22002</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
</device>
- <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="always" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>tcp://127.0.0.1:22003</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
</device>
<gui enabled="true" tls="false" debugging="true">
<address>127.0.0.1:8082</address>
@@ -144,7 +194,6 @@
<urURL>https://data.syncthing.net/newdata</urURL>
<urPostInsecurely>false</urPostInsecurely>
<urInitialDelayS>1800</urInitialDelayS>
- <restartOnWakeup>true</restartOnWakeup>
<autoUpgradeIntervalH>12</autoUpgradeIntervalH>
<upgradeToPreReleases>false</upgradeToPreReleases>
<keepTemporariesH>24</keepTemporariesH>
@@ -156,7 +205,6 @@
<overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect>
<tempIndexMinBlocks>10</tempIndexMinBlocks>
<trafficClass>0</trafficClass>
- <defaultFolderPath>~</defaultFolderPath>
<setLowPriority>true</setLowPriority>
<maxFolderConcurrency>0</maxFolderConcurrency>
<crashReportingURL>https://crash.syncthing.net/newcrash</crashReportingURL>
@@ -167,5 +215,69 @@
<databaseTuning>auto</databaseTuning>
<maxConcurrentIncomingRequestKiB>0</maxConcurrentIncomingRequestKiB>
<announceLANAddresses>true</announceLANAddresses>
+ <sendFullIndexOnUpgrade>false</sendFullIndexOnUpgrade>
+ <connectionLimitEnough>0</connectionLimitEnough>
+ <connectionLimitMax>0</connectionLimitMax>
+ <insecureAllowOldTLSVersions>false</insecureAllowOldTLSVersions>
+ <connectionPriorityTcpLan>10</connectionPriorityTcpLan>
+ <connectionPriorityQuicLan>20</connectionPriorityQuicLan>
+ <connectionPriorityTcpWan>30</connectionPriorityTcpWan>
+ <connectionPriorityQuicWan>40</connectionPriorityQuicWan>
+ <connectionPriorityRelay>50</connectionPriorityRelay>
+ <connectionPriorityUpgradeThreshold>0</connectionPriorityUpgradeThreshold>
</options>
+ <defaults>
+ <folder id="" label="" path="~" type="sendreceive" rescanIntervalS="3600" fsWatcherEnabled="true" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
+ <filesystemType>basic</filesystemType>
+ <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" introducedBy="">
+ <encryptionPassword></encryptionPassword>
+ </device>
+ <minDiskFree unit="%">1</minDiskFree>
+ <versioning>
+ <cleanupIntervalS>3600</cleanupIntervalS>
+ <fsPath></fsPath>
+ <fsType>basic</fsType>
+ </versioning>
+ <copiers>0</copiers>
+ <pullerMaxPendingKiB>0</pullerMaxPendingKiB>
+ <hashers>0</hashers>
+ <order>random</order>
+ <ignoreDelete>false</ignoreDelete>
+ <scanProgressIntervalS>0</scanProgressIntervalS>
+ <pullerPauseS>0</pullerPauseS>
+ <maxConflicts>10</maxConflicts>
+ <disableSparseFiles>false</disableSparseFiles>
+ <disableTempIndexes>false</disableTempIndexes>
+ <paused>false</paused>
+ <weakHashThresholdPct>25</weakHashThresholdPct>
+ <markerName>.stfolder</markerName>
+ <copyOwnershipFromParent>false</copyOwnershipFromParent>
+ <modTimeWindowS>0</modTimeWindowS>
+ <maxConcurrentWrites>2</maxConcurrentWrites>
+ <disableFsync>false</disableFsync>
+ <blockPullOrder>standard</blockPullOrder>
+ <copyRangeMethod>standard</copyRangeMethod>
+ <caseSensitiveFS>false</caseSensitiveFS>
+ <junctionsAsDirs>false</junctionsAsDirs>
+ <syncOwnership>false</syncOwnership>
+ <sendOwnership>false</sendOwnership>
+ <syncXattrs>false</syncXattrs>
+ <sendXattrs>false</sendXattrs>
+ <xattrFilter>
+ <maxSingleEntrySize>1024</maxSingleEntrySize>
+ <maxTotalSize>4096</maxTotalSize>
+ </xattrFilter>
+ </folder>
+ <device id="" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
+ <address>dynamic</address>
+ <paused>false</paused>
+ <autoAcceptFolders>false</autoAcceptFolders>
+ <maxSendKbps>0</maxSendKbps>
+ <maxRecvKbps>0</maxRecvKbps>
+ <maxRequestKiB>0</maxRequestKiB>
+ <untrusted>false</untrusted>
+ <remoteGUIPort>0</remoteGUIPort>
+ </device>
+ <ignores></ignores>
+ </defaults>
</configuration>
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion