From b19b5c95d39ce5e25e1ee57a11ab00a9a23a62b3 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Tue, 25 Aug 2020 10:48:14 +0100 Subject: [PATCH] lib/connections: Announce LAN addresses by default (fixes #6928) (#6896) --- lib/config/config_test.go | 1 + lib/config/optionsconfiguration.pb.go | 385 ++++++++++---------- lib/config/testdata/overridenvalues.xml | 1 + lib/connections/quic_listen.go | 5 +- lib/connections/service.go | 3 + lib/connections/tcp_listen.go | 4 +- lib/connections/util.go | 85 +++++ lib/discover/global.go | 12 +- lib/discover/local.go | 5 +- proto/lib/config/optionsconfiguration.proto | 2 + 10 files changed, 305 insertions(+), 198 deletions(-) diff --git a/lib/config/config_test.go b/lib/config/config_test.go index 7873c4d49..a0ec753e8 100644 --- a/lib/config/config_test.go +++ b/lib/config/config_test.go @@ -76,6 +76,7 @@ func TestDefaultValues(t *testing.T) { StunKeepaliveStartS: 180, StunKeepaliveMinS: 20, RawStunServers: []string{"default"}, + AnnounceLANAddresses: true, } cfg := New(device1) diff --git a/lib/config/optionsconfiguration.pb.go b/lib/config/optionsconfiguration.pb.go index 342ec2612..04670fa5b 100644 --- a/lib/config/optionsconfiguration.pb.go +++ b/lib/config/optionsconfiguration.pb.go @@ -69,6 +69,7 @@ type OptionsConfiguration struct { RawStunServers []string `protobuf:"bytes,45,rep,name=stun_servers,json=stunServers,proto3" json:"stunServers" xml:"stunServer" default:"default"` DatabaseTuning Tuning `protobuf:"varint,46,opt,name=database_tuning,json=databaseTuning,proto3,enum=config.Tuning" json:"databaseTuning" xml:"databaseTuning" restart:"true"` RawMaxCIRequestKiB int `protobuf:"varint,47,opt,name=max_concurrent_incoming_request_kib,json=maxConcurrentIncomingRequestKib,proto3,casttype=int" json:"maxConcurrentIncomingRequestKiB" xml:"maxConcurrentIncomingRequestKiB"` + AnnounceLANAddresses bool `protobuf:"varint,48,opt,name=announce_lan_addresses,json=announceLanAddresses,proto3" json:"announceLANAddresses" xml:"announceLANAddresses" default:"true"` // Legacy deprecated DeprecatedUPnPEnabled bool `protobuf:"varint,9000,opt,name=upnp_enabled,json=upnpEnabled,proto3" json:"-" xml:"upnpEnabled,omitempty"` // Deprecated: Do not use. DeprecatedUPnPLeaseM int `protobuf:"varint,9001,opt,name=upnp_lease_m,json=upnpLeaseM,proto3,casttype=int" json:"-" xml:"upnpLeaseMinutes,omitempty"` // Deprecated: Do not use. @@ -112,195 +113,198 @@ func init() { } var fileDescriptor_d09882599506ca03 = []byte{ - // 3006 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x5a, 0x5b, 0x6c, 0x24, 0x47, - 0xd5, 0x76, 0xef, 0x66, 0x37, 0xd9, 0xb6, 0xd7, 0x5e, 0xb7, 0x6f, 0x9d, 0xdd, 0x8d, 0xdb, 0x99, - 0x9d, 0x4d, 0x9c, 0x9b, 0x6f, 0x9b, 0xec, 0xbf, 0xff, 0x4a, 0xbf, 0x7e, 0x7c, 0x89, 0x13, 0x13, - 0x7b, 0xd7, 0x2a, 0xdb, 0x0a, 0x0a, 0x42, 0xad, 0x9a, 0x9e, 0xb2, 0xdd, 0xb8, 0xa7, 0x7a, 0xb6, - 0xab, 0xda, 0x97, 0x80, 0x42, 0x14, 0xc4, 0xe5, 0x0d, 0xb0, 0xb8, 0x48, 0x20, 0xa1, 0x20, 0x40, - 0x22, 0x04, 0x10, 0x12, 0x12, 0x12, 0x48, 0x08, 0x84, 0x84, 0x14, 0xc1, 0x83, 0xfd, 0x88, 0x44, - 0x68, 0x14, 0x2f, 0x0f, 0x68, 0x1e, 0x78, 0x98, 0x47, 0xf3, 0x82, 0x4e, 0xf5, 0xad, 0xfa, 0x32, - 0xd9, 0x7d, 0x9b, 0x3a, 0xdf, 0xa9, 0x53, 0xdf, 0x39, 0x55, 0x75, 0xaa, 0x4e, 0xf5, 0xa8, 0xd7, - 0x1d, 0xbb, 0x36, 0x69, 0xb9, 0x74, 0xd3, 0xde, 0x9a, 0x74, 0x9b, 0xdc, 0x76, 0x29, 0x0b, 0x5b, - 0xbe, 0x87, 0xa1, 0x35, 0xd1, 0xf4, 0x5c, 0xee, 0x6a, 0xe7, 0x43, 0xe1, 0xe5, 0x11, 0x49, 0x9d, - 0xfb, 0xd4, 0xa6, 0x5b, 0xa1, 0xc2, 0xe5, 0x21, 0x09, 0x60, 0xf6, 0x9b, 0x24, 0x12, 0x5f, 0x20, - 0xfb, 0x3c, 0xfc, 0x59, 0xf9, 0xdd, 0xbc, 0x3a, 0x78, 0x37, 0x1c, 0x61, 0x5e, 0x1e, 0x41, 0xfb, - 0xbe, 0xa2, 0x5e, 0x72, 0x6c, 0xc6, 0x09, 0x35, 0x71, 0xbd, 0xee, 0x11, 0xc6, 0x08, 0xd3, 0x95, - 0xb1, 0xb3, 0xe3, 0x17, 0xe6, 0xd8, 0x49, 0x60, 0x68, 0x08, 0xef, 0x2d, 0x0b, 0x78, 0x36, 0x46, - 0x5b, 0x81, 0xd1, 0xe7, 0x64, 0x45, 0xed, 0xc0, 0xb8, 0xbe, 0xdf, 0x70, 0x6e, 0x57, 0x32, 0xf2, - 0xca, 0x58, 0x9d, 0x6c, 0x62, 0xdf, 0xe1, 0xb7, 0x2b, 0xd1, 0x8f, 0xca, 0xe9, 0x51, 0xf5, 0xd1, - 0xe8, 0xf7, 0xe1, 0x71, 0xb5, 0xc4, 0x38, 0xca, 0x9b, 0xd6, 0xfe, 0xad, 0xa8, 0xfa, 0x96, 0xe3, - 0xd6, 0xb0, 0x63, 0xd6, 0x6d, 0x66, 0xb9, 0xbb, 0xc4, 0x3b, 0x30, 0x19, 0xf1, 0x76, 0x89, 0xc7, - 0xf4, 0x33, 0x82, 0xe8, 0xaf, 0x94, 0x93, 0xc0, 0x18, 0x40, 0x78, 0xef, 0x15, 0xa1, 0x37, 0x4b, - 0xe9, 0x5a, 0x88, 0xb7, 0x02, 0x63, 0x68, 0x2b, 0x96, 0xb9, 0x3e, 0xb5, 0x48, 0x04, 0xb4, 0x03, - 0xe3, 0x79, 0x41, 0xb8, 0x0c, 0x2d, 0xe1, 0xdd, 0x3a, 0xaa, 0x0e, 0x96, 0xa9, 0xb6, 0x8f, 0xaa, - 0xe5, 0x03, 0x64, 0x1d, 0x2d, 0xe3, 0x86, 0x86, 0xc3, 0x8e, 0x0b, 0xb1, 0x53, 0x91, 0x5c, 0xfb, - 0x67, 0x99, 0xc3, 0x84, 0xe2, 0x9a, 0x43, 0xea, 0xfa, 0xd9, 0x31, 0x65, 0xfc, 0xb1, 0xb9, 0xf7, - 0xc0, 0xe1, 0x4b, 0x89, 0xc5, 0x97, 0x43, 0xb0, 0xe8, 0x6d, 0x04, 0xb4, 0x03, 0xe3, 0xd9, 0x12, - 0x6f, 0x23, 0x54, 0x72, 0x97, 0x7b, 0x3e, 0x01, 0x5f, 0x3b, 0x98, 0xe9, 0x04, 0x9c, 0x1e, 0x55, - 0x1f, 0x81, 0xae, 0x87, 0xc7, 0xd5, 0x02, 0xa9, 0x82, 0x9b, 0x91, 0x5c, 0xfb, 0x50, 0x51, 0x47, - 0x1c, 0xd7, 0x2a, 0xf5, 0xf2, 0x11, 0xe1, 0xe5, 0x0f, 0xc1, 0xcb, 0xbe, 0x65, 0xd0, 0xc9, 0x38, - 0x39, 0xe8, 0x44, 0xa2, 0x9c, 0x8f, 0xcf, 0x84, 0x4b, 0xb0, 0x04, 0x2c, 0x71, 0xb1, 0xdc, 0x48, - 0x07, 0xb9, 0xe4, 0x60, 0x9e, 0x0f, 0x1a, 0x12, 0x1d, 0x0a, 0xee, 0xfd, 0x45, 0x51, 0x07, 0x42, - 0xf7, 0x70, 0x64, 0xcb, 0x6c, 0xba, 0x1e, 0xd7, 0xcf, 0x8d, 0x29, 0xe3, 0xe7, 0xe6, 0xbe, 0x0b, - 0xae, 0xf5, 0xc4, 0xa6, 0x56, 0x5d, 0x8f, 0xb7, 0x02, 0xa3, 0x3f, 0x33, 0x34, 0x08, 0xdb, 0x81, - 0xf1, 0x74, 0xd1, 0x29, 0x40, 0x24, 0x8f, 0x66, 0xa6, 0xa7, 0x66, 0xfe, 0xa7, 0x72, 0x1a, 0x18, - 0x67, 0x6d, 0xca, 0x5b, 0x47, 0xd5, 0x12, 0x33, 0x65, 0xc2, 0xd3, 0xa3, 0xea, 0x39, 0xd1, 0xf5, - 0xf0, 0xb8, 0x9a, 0x61, 0x82, 0x8a, 0xba, 0xda, 0x17, 0xcf, 0xa8, 0x63, 0x39, 0x6f, 0x1a, 0xbe, - 0xc3, 0x6d, 0x0b, 0x33, 0x1e, 0xe7, 0x0d, 0xfd, 0xfc, 0x98, 0x32, 0x7e, 0x61, 0xee, 0x37, 0xe0, - 0x5a, 0x6f, 0x6c, 0x70, 0x65, 0x1e, 0x76, 0x72, 0x2b, 0x30, 0x06, 0x32, 0x46, 0x43, 0x71, 0x3b, - 0x30, 0x6e, 0x16, 0xdd, 0x0b, 0x31, 0xc9, 0xc1, 0x4f, 0x6f, 0x6e, 0x4e, 0xcf, 0xdc, 0xbe, 0x7d, - 0xeb, 0xc6, 0xad, 0x17, 0x3f, 0x73, 0x3b, 0xf4, 0xb6, 0x75, 0x54, 0x2d, 0x35, 0x58, 0x2e, 0x3e, - 0x3d, 0xaa, 0x6a, 0x45, 0x23, 0x87, 0xc7, 0xd5, 0x1c, 0x4d, 0xf4, 0x44, 0xb6, 0x73, 0xec, 0x61, - 0x94, 0x8c, 0xb4, 0xbb, 0xea, 0xc5, 0x06, 0xde, 0x37, 0x19, 0xa1, 0x75, 0x73, 0xa7, 0xd6, 0x64, - 0xfa, 0xa3, 0x62, 0x32, 0x9f, 0x6b, 0x05, 0x46, 0x77, 0x03, 0xef, 0xaf, 0x11, 0x5a, 0x7f, 0xad, - 0xd6, 0x84, 0xe4, 0xd2, 0x2f, 0xdc, 0x92, 0x64, 0xf1, 0xfc, 0x20, 0x59, 0x31, 0x36, 0xe8, 0x11, - 0x6b, 0x37, 0x34, 0xf8, 0x58, 0xc6, 0x20, 0x22, 0xd6, 0x6e, 0xde, 0x60, 0x2c, 0xcb, 0x18, 0x8c, - 0x85, 0xda, 0xaf, 0x15, 0x75, 0xc4, 0x23, 0x96, 0x4b, 0x29, 0xb1, 0x20, 0xbd, 0x9b, 0x36, 0xe5, - 0xc4, 0xdb, 0xc5, 0x8e, 0xc9, 0xf4, 0x0b, 0xc2, 0xf6, 0x5b, 0x22, 0xa9, 0xc7, 0x2a, 0x4b, 0x11, - 0xbc, 0x06, 0xb9, 0x43, 0xee, 0x98, 0x00, 0xed, 0xc0, 0x18, 0x17, 0x63, 0x97, 0xa2, 0xd2, 0x2c, - 0xdd, 0x9c, 0x8a, 0x29, 0x9d, 0x1e, 0x55, 0xcf, 0xdc, 0x9c, 0x12, 0xf9, 0xbd, 0x30, 0x0e, 0x2a, - 0x1f, 0x45, 0xdb, 0x54, 0x7b, 0x3d, 0xe2, 0xe0, 0x03, 0x96, 0xe4, 0x00, 0x55, 0xe4, 0x80, 0xff, - 0x6f, 0x05, 0xc6, 0xc5, 0x10, 0x49, 0x37, 0x7a, 0x25, 0x22, 0x24, 0x49, 0xf3, 0x3b, 0x3c, 0xde, - 0xb1, 0x28, 0xdb, 0x59, 0x7b, 0xe7, 0x8c, 0x7a, 0x25, 0x1a, 0x28, 0x21, 0x92, 0x06, 0xa9, 0xa1, - 0x77, 0x8b, 0x20, 0xfd, 0x11, 0xd6, 0xf0, 0x08, 0x02, 0xbd, 0x82, 0x0b, 0x2b, 0xad, 0xc0, 0x18, - 0xf1, 0xca, 0xa1, 0x24, 0xd1, 0x76, 0xc0, 0x25, 0x96, 0xd3, 0x53, 0xd2, 0x96, 0xed, 0x68, 0xaf, - 0x33, 0x04, 0x41, 0x9e, 0x86, 0x20, 0x77, 0xa2, 0x89, 0xf4, 0xd0, 0xcf, 0x22, 0xa2, 0xd5, 0xd4, - 0x8b, 0x8c, 0x63, 0x8f, 0x9b, 0x35, 0xcf, 0xdd, 0x63, 0xc4, 0xd3, 0x7b, 0x44, 0xac, 0xff, 0xaf, - 0x15, 0x18, 0x3d, 0x02, 0x98, 0x0b, 0xe5, 0xed, 0xc0, 0x78, 0x52, 0xb8, 0x23, 0x0b, 0x3b, 0x46, - 0x3a, 0xd3, 0x55, 0xfb, 0xb1, 0xa2, 0x0e, 0x51, 0xcc, 0x4d, 0xee, 0x61, 0x38, 0xd5, 0xb0, 0x93, - 0x4c, 0x6c, 0xaf, 0x18, 0xec, 0xde, 0x49, 0x60, 0xa8, 0x77, 0x66, 0xd7, 0xd3, 0xb4, 0xae, 0x52, - 0xcc, 0xd3, 0x39, 0x36, 0xc4, 0xc0, 0xa9, 0xa8, 0x24, 0x85, 0xcb, 0x1d, 0x32, 0x2d, 0x29, 0x5d, - 0x4b, 0x43, 0xa0, 0x01, 0x8a, 0xf9, 0x7a, 0x4c, 0x27, 0x5e, 0x10, 0xbf, 0x2d, 0xf0, 0x74, 0x08, - 0x66, 0xc4, 0x6c, 0xe8, 0x7d, 0x62, 0x29, 0x7c, 0x19, 0x96, 0xc2, 0x85, 0x3b, 0xb3, 0xeb, 0xcb, - 0x20, 0x86, 0xc9, 0xef, 0xa3, 0x98, 0x87, 0x0d, 0x9b, 0xfa, 0x5c, 0x5c, 0x7e, 0x2a, 0x31, 0x59, - 0x59, 0x5e, 0xba, 0x37, 0x5a, 0x47, 0xd5, 0x42, 0xff, 0xa2, 0x28, 0xd9, 0x41, 0xe9, 0xc0, 0x48, - 0x93, 0xd9, 0x87, 0x32, 0xed, 0xcf, 0x8a, 0x3a, 0x92, 0x25, 0xef, 0x11, 0x4a, 0xf6, 0xc4, 0x4a, - 0xbe, 0x24, 0xe8, 0x1f, 0x02, 0xfd, 0xee, 0x3b, 0xb3, 0xeb, 0x28, 0x04, 0xc0, 0x81, 0x7e, 0x8a, - 0x79, 0xdc, 0x4c, 0x5c, 0xa8, 0xc6, 0x2e, 0x64, 0x11, 0xc9, 0x89, 0x1b, 0xb2, 0x13, 0x25, 0x36, - 0xca, 0x84, 0xe0, 0xc8, 0x0d, 0x70, 0x44, 0xa6, 0x80, 0x06, 0x65, 0x57, 0x62, 0x69, 0x89, 0x33, - 0xdc, 0x6e, 0x10, 0xd7, 0xe7, 0x26, 0xd3, 0xfb, 0xb3, 0xce, 0xac, 0x87, 0xc0, 0x5a, 0xe4, 0x4c, - 0xdc, 0x84, 0x95, 0x5e, 0xcf, 0x38, 0x93, 0x45, 0x3a, 0x6d, 0xbf, 0x12, 0x1b, 0x65, 0xc2, 0x64, - 0xcb, 0xc9, 0x14, 0xb2, 0xce, 0xc4, 0x52, 0xed, 0x7b, 0x8a, 0xaa, 0xfb, 0x0c, 0x6f, 0x11, 0xd3, - 0x23, 0x70, 0xee, 0xdb, 0x74, 0xcb, 0xc4, 0x96, 0x45, 0x9a, 0x9c, 0xd4, 0x75, 0x4d, 0x78, 0x83, - 0x61, 0x07, 0x6c, 0xa0, 0xd9, 0x48, 0x0a, 0x3b, 0xc0, 0xf7, 0xe2, 0x56, 0x3b, 0x30, 0x2e, 0x09, - 0x27, 0x52, 0x91, 0x44, 0x58, 0x56, 0xcc, 0xb4, 0x60, 0xc5, 0xa7, 0x26, 0xd1, 0xb0, 0xa0, 0x80, - 0x62, 0x06, 0xb1, 0x5c, 0xfb, 0x9c, 0x3a, 0x98, 0x27, 0xc7, 0x08, 0xa1, 0xfa, 0x80, 0x20, 0xb6, - 0x74, 0x12, 0x18, 0xe7, 0x37, 0xd0, 0x1a, 0x21, 0xb4, 0x15, 0x18, 0xe7, 0x7d, 0x0f, 0x7e, 0xb5, - 0x03, 0xa3, 0x27, 0x22, 0x04, 0x4d, 0x89, 0x4c, 0xac, 0x90, 0xfc, 0x3a, 0x3c, 0xae, 0x46, 0xdd, - 0x91, 0x96, 0x25, 0x00, 0x32, 0xed, 0x5b, 0x8a, 0xfa, 0x78, 0x7e, 0x74, 0x9f, 0xda, 0xf7, 0x7c, - 0x62, 0xda, 0x75, 0x7d, 0x50, 0x5c, 0x22, 0xde, 0x08, 0x63, 0xb3, 0x21, 0xc4, 0x4b, 0x0b, 0x61, - 0x6c, 0xa2, 0x96, 0x1c, 0x9b, 0x58, 0xa1, 0x12, 0x06, 0x25, 0x6e, 0xb6, 0xe5, 0x56, 0x14, 0x94, - 0x18, 0xcb, 0x07, 0x25, 0xd6, 0xd2, 0xfe, 0xa0, 0xa8, 0x03, 0x05, 0x5e, 0x9e, 0xa3, 0x0f, 0x09, - 0x46, 0x5f, 0x83, 0xb5, 0x77, 0x6e, 0x03, 0x6d, 0xa0, 0xe5, 0x56, 0x60, 0x9c, 0xf3, 0xbd, 0x0d, - 0xb4, 0xdc, 0x0e, 0x8c, 0x5b, 0x31, 0x11, 0xb4, 0x2c, 0xad, 0xae, 0x6d, 0xce, 0x9b, 0xec, 0xf6, - 0xe4, 0x64, 0x1d, 0x73, 0x3c, 0xc1, 0x0e, 0xa8, 0xc5, 0xb7, 0xa1, 0x58, 0xa3, 0x84, 0x4f, 0x52, - 0xb2, 0x07, 0x52, 0x20, 0x1c, 0x19, 0x89, 0x7f, 0x9c, 0x1e, 0x55, 0x1f, 0xa2, 0xe3, 0xe1, 0x71, - 0x35, 0x64, 0x81, 0xfa, 0x73, 0x7e, 0x78, 0x8e, 0xf6, 0x0f, 0x45, 0x35, 0xf2, 0x2e, 0x34, 0x5d, - 0x06, 0x27, 0x1c, 0x23, 0x96, 0xef, 0x11, 0xe7, 0x40, 0x1f, 0x16, 0xe9, 0xf7, 0x3b, 0xa2, 0x82, - 0xd8, 0x40, 0xab, 0x2e, 0xe3, 0x4b, 0x09, 0xd8, 0x0a, 0x8c, 0x4b, 0xbe, 0x97, 0x95, 0xb5, 0x03, - 0xe3, 0xa9, 0xc8, 0xc9, 0x2c, 0x20, 0xf9, 0xbb, 0x89, 0x1d, 0x26, 0x52, 0x72, 0xb1, 0x77, 0x89, - 0x0c, 0x6e, 0x9e, 0xa2, 0x07, 0xd4, 0x0b, 0x79, 0x0a, 0xe8, 0x6a, 0xd6, 0xad, 0x2c, 0xaa, 0xfd, - 0xbd, 0xc4, 0x43, 0x9b, 0xda, 0xdc, 0x86, 0x3a, 0x02, 0xce, 0x3b, 0x93, 0xe9, 0x23, 0x62, 0x15, - 0x7f, 0x5b, 0x54, 0x0f, 0x1b, 0x68, 0x29, 0x44, 0x17, 0x00, 0x84, 0x84, 0xd1, 0xe7, 0x7b, 0x19, - 0x51, 0x92, 0x2e, 0x72, 0x72, 0x39, 0x59, 0xdc, 0x9a, 0xca, 0x24, 0xf0, 0xbc, 0x85, 0xa2, 0x08, - 0x4e, 0x20, 0xe8, 0x05, 0x05, 0x43, 0x8e, 0x02, 0xba, 0x92, 0x75, 0x30, 0x03, 0x6a, 0xae, 0xda, - 0xef, 0x91, 0xf0, 0x70, 0x76, 0xa9, 0xb9, 0x87, 0x77, 0x88, 0xdf, 0xd4, 0x75, 0x31, 0x65, 0xf3, - 0x40, 0x3e, 0x02, 0xef, 0xd2, 0xd7, 0x05, 0x94, 0x90, 0xcf, 0xc9, 0x3b, 0x1e, 0xd2, 0x79, 0x03, - 0xda, 0x57, 0x14, 0x75, 0x04, 0xfb, 0xdc, 0x35, 0xfd, 0xe6, 0x96, 0x87, 0xeb, 0x24, 0xbd, 0x0c, - 0x6d, 0xeb, 0x8f, 0x8b, 0x40, 0xae, 0x42, 0xc9, 0x05, 0x2a, 0x1b, 0xa1, 0x46, 0x7c, 0x8f, 0x78, - 0x35, 0xa9, 0x4e, 0xca, 0x40, 0x39, 0x7c, 0x33, 0xf2, 0xcd, 0x70, 0x7a, 0x06, 0x95, 0x5a, 0xd3, - 0x1a, 0xea, 0x48, 0xcc, 0x81, 0xbb, 0x66, 0xd3, 0x83, 0x29, 0x16, 0x67, 0x31, 0xd3, 0x2f, 0x8b, - 0x00, 0xdc, 0x04, 0x22, 0x91, 0xca, 0xba, 0xbb, 0xea, 0x11, 0x14, 0xe1, 0xed, 0xc0, 0xb8, 0x1c, - 0x4e, 0x61, 0x09, 0x58, 0x41, 0xa5, 0x7d, 0xb4, 0x5d, 0x55, 0xdb, 0x21, 0xa4, 0x69, 0x72, 0xd2, - 0x68, 0xba, 0x1e, 0xf6, 0x6c, 0xc2, 0xcc, 0x6d, 0xfd, 0x8a, 0x70, 0xf9, 0x55, 0xd8, 0x08, 0x80, - 0xae, 0xa7, 0x20, 0xb8, 0x7b, 0x4d, 0x8c, 0x92, 0x07, 0xe4, 0x5a, 0xec, 0x45, 0xd9, 0xd5, 0x99, - 0x17, 0x51, 0xc1, 0x8a, 0x76, 0xa0, 0x0e, 0x58, 0xd8, 0xda, 0x26, 0xa6, 0xbd, 0x45, 0x5d, 0x8f, - 0xd4, 0xcd, 0x4d, 0xdb, 0x21, 0x4c, 0xbf, 0x2a, 0x5c, 0x5c, 0x82, 0x13, 0x4d, 0xc0, 0x4b, 0x21, - 0xba, 0x08, 0x60, 0x12, 0xe8, 0x02, 0x52, 0xd8, 0x83, 0xc9, 0xde, 0x42, 0x45, 0x33, 0xda, 0x37, - 0x14, 0xf5, 0x72, 0xd3, 0x73, 0xb7, 0xa0, 0x98, 0x31, 0xfd, 0x66, 0x1d, 0x73, 0x22, 0x17, 0x08, - 0x4f, 0x08, 0xdf, 0xd7, 0xe1, 0x7e, 0x1b, 0x6b, 0x6d, 0x08, 0x25, 0xb9, 0x18, 0x08, 0x8b, 0xec, - 0x0e, 0xb8, 0x44, 0xe7, 0x25, 0x29, 0x10, 0xca, 0x4b, 0xa8, 0x93, 0x45, 0xed, 0x1d, 0x45, 0x1d, - 0x76, 0xec, 0x86, 0xcd, 0xcd, 0x1a, 0xa6, 0xf5, 0x3d, 0xbb, 0xce, 0xb7, 0x4d, 0x9b, 0x9a, 0x0e, - 0xa6, 0xfa, 0xa8, 0x08, 0xc9, 0x8a, 0x28, 0x1e, 0x41, 0x63, 0x2e, 0x56, 0x58, 0xa2, 0xcb, 0x98, - 0xa6, 0x05, 0x7f, 0x11, 0xfb, 0x98, 0xb0, 0x94, 0x99, 0xd2, 0xde, 0x56, 0x54, 0xad, 0x61, 0x53, - 0x73, 0xdb, 0x6d, 0x10, 0xb3, 0x6e, 0xb3, 0x1d, 0x73, 0xd3, 0x23, 0x44, 0x37, 0xc6, 0x94, 0xf1, - 0xee, 0x99, 0x9e, 0x89, 0xf0, 0x65, 0x6d, 0x62, 0xcd, 0x7e, 0x93, 0xcc, 0xbd, 0xfc, 0x41, 0x60, - 0x74, 0xc1, 0x4e, 0x6c, 0xd8, 0xf4, 0x55, 0xb7, 0x41, 0x16, 0x6c, 0xb6, 0xb3, 0xe8, 0x11, 0x92, - 0xac, 0x8e, 0x9c, 0x5c, 0xde, 0x07, 0x63, 0xd7, 0x81, 0xc8, 0xd9, 0xe9, 0xb1, 0xeb, 0x28, 0xdf, - 0x5d, 0xbb, 0xaf, 0xa8, 0x3d, 0xf1, 0x7a, 0x17, 0xc7, 0xce, 0x98, 0x38, 0x76, 0x7e, 0x2f, 0xae, - 0x3c, 0xf1, 0xa2, 0x0d, 0x0f, 0x9f, 0x6e, 0x2f, 0x6d, 0xb6, 0x03, 0x63, 0x21, 0xae, 0x38, 0x62, - 0x59, 0xc9, 0x41, 0x14, 0xed, 0x00, 0x96, 0x3b, 0x53, 0x1a, 0x84, 0xe3, 0x89, 0xcf, 0x32, 0x97, - 0x42, 0xee, 0xce, 0x98, 0xcd, 0x36, 0x4f, 0x8f, 0xaa, 0xe3, 0x0f, 0x6b, 0x0a, 0xee, 0x47, 0x12, - 0x5f, 0x94, 0xda, 0xf1, 0x1c, 0xed, 0x75, 0xb5, 0x1f, 0x3b, 0x7b, 0x50, 0x7d, 0x85, 0xaf, 0x09, - 0x94, 0x70, 0xa6, 0x3f, 0x29, 0x1e, 0xf1, 0xa0, 0xe8, 0xed, 0x0b, 0x41, 0x51, 0x95, 0xdf, 0x21, - 0x1c, 0x16, 0xfe, 0x60, 0x98, 0x61, 0x32, 0xf2, 0x0a, 0xca, 0x2b, 0x6a, 0xff, 0x51, 0xd4, 0x71, - 0x77, 0x97, 0x78, 0x7b, 0x9e, 0xcd, 0x21, 0x71, 0x34, 0x5c, 0x4e, 0xcc, 0x3a, 0xd9, 0xb5, 0x2d, - 0x62, 0x52, 0xdc, 0x20, 0x0c, 0xd2, 0x69, 0x54, 0x08, 0xe9, 0x95, 0xf4, 0x79, 0x69, 0xe4, 0x6e, - 0xdc, 0x09, 0x89, 0x3e, 0x0b, 0x64, 0xf7, 0x0e, 0xa8, 0xb7, 0x02, 0xe3, 0x9a, 0x5b, 0x80, 0x6c, - 0x8b, 0x08, 0xf4, 0x2e, 0x9d, 0x0f, 0x4d, 0xb5, 0x03, 0xe3, 0x7f, 0x05, 0xc1, 0x87, 0xd0, 0xed, - 0xbc, 0x28, 0xa1, 0x8a, 0xeb, 0xc0, 0x03, 0x3d, 0x0c, 0x0b, 0xed, 0x0b, 0xea, 0x10, 0xa4, 0x31, - 0xd3, 0xa6, 0x75, 0xb2, 0x6f, 0xc2, 0x4a, 0xae, 0x39, 0xae, 0xb5, 0xc3, 0xf4, 0x6b, 0x62, 0x4b, - 0xc3, 0xa2, 0xd1, 0x40, 0x61, 0x09, 0xf0, 0x15, 0x9b, 0xce, 0x09, 0x34, 0x79, 0xb5, 0x2d, 0x42, - 0xa5, 0x37, 0xe5, 0xf0, 0xfe, 0x8b, 0x4a, 0x2c, 0x69, 0x7f, 0x83, 0xeb, 0x2e, 0xc5, 0xd6, 0x0e, - 0xa9, 0x9b, 0xd4, 0xe5, 0xf6, 0xa6, 0x6d, 0xe1, 0xf0, 0xfd, 0xa1, 0xce, 0xf4, 0xaa, 0x98, 0xdf, - 0x77, 0x21, 0xdc, 0xc3, 0x1b, 0xa1, 0xd2, 0x1d, 0x49, 0x67, 0x69, 0x01, 0xa2, 0x3d, 0xec, 0x97, - 0x22, 0xed, 0xc0, 0xb8, 0x12, 0xa6, 0xf6, 0x32, 0x58, 0xbc, 0x55, 0x96, 0x22, 0xed, 0xa3, 0x6a, - 0x07, 0x8b, 0x87, 0xc7, 0xd5, 0x0e, 0x2c, 0x50, 0x69, 0x8f, 0x3a, 0xd3, 0x90, 0x7a, 0x91, 0x7b, - 0x78, 0x73, 0xd3, 0xb6, 0x4c, 0xcb, 0xc1, 0x8c, 0xe9, 0xd7, 0x45, 0x58, 0x5f, 0x80, 0x7a, 0x39, - 0x02, 0xe6, 0x41, 0xde, 0x0e, 0x0c, 0x2d, 0x0c, 0xa8, 0x24, 0x4c, 0x1e, 0x6a, 0x32, 0xaa, 0xda, - 0x3d, 0x75, 0x20, 0x0a, 0xb1, 0xb9, 0xe9, 0x3a, 0x75, 0xe2, 0x99, 0x4d, 0xcc, 0xb7, 0xf5, 0xa7, - 0xc4, 0xae, 0x9f, 0x85, 0x63, 0x20, 0x82, 0x17, 0x05, 0xba, 0x8a, 0xf9, 0x76, 0x92, 0x62, 0x0a, - 0x88, 0x34, 0x5d, 0x6f, 0xc1, 0xb2, 0x52, 0xde, 0x42, 0xc5, 0xee, 0xda, 0x8e, 0x7a, 0x89, 0x11, - 0x6e, 0x3a, 0xee, 0x9e, 0xd9, 0xf4, 0x6c, 0xd7, 0xb3, 0xf9, 0x81, 0xfe, 0xb4, 0xd8, 0x0a, 0x30, - 0x5e, 0x2f, 0x23, 0x7c, 0xd9, 0xdd, 0x5b, 0x8d, 0x90, 0x64, 0xb0, 0xac, 0xb8, 0xe3, 0xc5, 0x22, - 0xd7, 0x5d, 0x7b, 0x4f, 0x51, 0x87, 0x1b, 0x78, 0x3f, 0x76, 0xce, 0x72, 0xa9, 0xe5, 0x7b, 0x1e, - 0xa1, 0xd6, 0x81, 0x3e, 0x2e, 0xa2, 0xc7, 0xc4, 0x13, 0x0b, 0xde, 0x5b, 0xc1, 0xfb, 0x21, 0xc7, - 0xf9, 0x54, 0x05, 0x0e, 0xfa, 0x46, 0x89, 0x3c, 0x39, 0xe8, 0xcb, 0xc0, 0x38, 0xd0, 0xe2, 0x4d, - 0xa4, 0xdc, 0x2e, 0x2a, 0xb5, 0xaa, 0x7d, 0xa8, 0xa8, 0x03, 0x96, 0x87, 0xd9, 0x76, 0xee, 0xe6, - 0xff, 0x8c, 0x98, 0x8c, 0xf7, 0xc5, 0xcd, 0x7f, 0x3e, 0xbe, 0xf9, 0x5b, 0xd1, 0xcd, 0x7f, 0x31, - 0x3c, 0x91, 0xa1, 0x5b, 0x7a, 0x07, 0x2f, 0x4d, 0xbe, 0x42, 0xa7, 0x78, 0x9b, 0x17, 0x62, 0x58, - 0xc1, 0xfd, 0x05, 0x23, 0x50, 0x13, 0x58, 0x51, 0x4d, 0x50, 0x7d, 0x18, 0x33, 0x50, 0x15, 0xcc, - 0x87, 0x55, 0x41, 0xce, 0x98, 0xe7, 0x68, 0x3f, 0x50, 0xd4, 0x91, 0xbc, 0x7b, 0xf1, 0x63, 0xcc, - 0xb3, 0x62, 0xfe, 0xed, 0x93, 0xc0, 0xb8, 0x30, 0x8f, 0xa4, 0xef, 0x08, 0x59, 0x2b, 0xf9, 0xef, - 0x08, 0xa5, 0x68, 0xa7, 0xa5, 0x71, 0x78, 0x5c, 0x4d, 0x6d, 0xa3, 0x72, 0xcb, 0xda, 0x97, 0x14, - 0x75, 0x98, 0x71, 0x9f, 0x9a, 0x70, 0x5f, 0xc2, 0x8e, 0xbd, 0x4b, 0xcc, 0xf0, 0x16, 0xcc, 0xf4, - 0xe7, 0x92, 0x5b, 0xe8, 0x00, 0x68, 0xbc, 0x16, 0x2b, 0xac, 0x01, 0xbe, 0x96, 0xdc, 0x8d, 0x4a, - 0xb0, 0xec, 0x15, 0x5e, 0x4a, 0x63, 0x67, 0xa7, 0x6f, 0x4d, 0xa1, 0x32, 0x6b, 0x50, 0x19, 0xe7, - 0x68, 0x40, 0x36, 0x65, 0xfa, 0xf3, 0x82, 0xc4, 0x27, 0x61, 0x5f, 0x66, 0xba, 0xad, 0xd8, 0x34, - 0xad, 0x20, 0x0a, 0x88, 0x7c, 0x33, 0xcc, 0xa4, 0xd1, 0x99, 0x29, 0x54, 0xb4, 0x03, 0x77, 0xf1, - 0x1e, 0x31, 0x7a, 0xfc, 0x79, 0xeb, 0x05, 0x91, 0x39, 0xeb, 0x27, 0x81, 0xd1, 0x8b, 0xf0, 0xde, - 0x1a, 0xf7, 0xa5, 0x0f, 0x5b, 0xdd, 0x2c, 0x6d, 0x26, 0x4f, 0x50, 0xa9, 0xec, 0x81, 0x1f, 0xdf, - 0x72, 0x16, 0x91, 0x6c, 0x4f, 0xdb, 0x55, 0xfb, 0xa0, 0xd8, 0xac, 0x61, 0x46, 0xcc, 0xf0, 0x4b, - 0xa3, 0x3e, 0x31, 0xa6, 0x8c, 0xf7, 0xce, 0xf4, 0xc6, 0x97, 0xa1, 0x75, 0x21, 0x15, 0x6f, 0x86, - 0xbd, 0xb1, 0x6a, 0x28, 0x4b, 0xd3, 0x54, 0x46, 0x5c, 0x19, 0x8b, 0x4a, 0x8f, 0x68, 0x79, 0xbc, - 0x7d, 0x5c, 0x55, 0x50, 0xae, 0xab, 0xf6, 0xcd, 0x33, 0xea, 0x35, 0xc8, 0x1a, 0x49, 0xba, 0x80, - 0xd2, 0xd5, 0x72, 0x1b, 0xb0, 0x64, 0x3d, 0x72, 0xcf, 0x27, 0x8c, 0x9b, 0x3b, 0x76, 0x4d, 0x9f, - 0x14, 0xd3, 0xf1, 0x27, 0x25, 0xfa, 0x42, 0xb9, 0x82, 0xf7, 0xe7, 0x97, 0x50, 0x88, 0xbf, 0x66, - 0xcf, 0xb5, 0x02, 0xc3, 0x68, 0xe0, 0xfd, 0x64, 0x8b, 0xf3, 0xa5, 0xc8, 0x46, 0xaa, 0x92, 0x9c, - 0x7d, 0x0f, 0xd0, 0x93, 0xca, 0xbe, 0x07, 0x9a, 0x7c, 0xb0, 0x4a, 0xf4, 0xcd, 0x33, 0x47, 0x17, - 0x3d, 0xa0, 0x5b, 0x4d, 0xfb, 0xbc, 0xda, 0xe3, 0x37, 0x69, 0x33, 0xd9, 0xb5, 0x3f, 0x59, 0x14, - 0xdb, 0xf6, 0x53, 0x27, 0x81, 0x31, 0xb4, 0x40, 0x9a, 0x1e, 0xb1, 0x30, 0x27, 0xf5, 0x8d, 0x55, - 0xba, 0x9a, 0x6e, 0x61, 0xe5, 0x85, 0xf4, 0xec, 0x6c, 0xd2, 0x66, 0x04, 0x3c, 0xef, 0x36, 0x6c, - 0x38, 0xbf, 0xf9, 0x41, 0xe5, 0xf0, 0xb8, 0x5a, 0xde, 0x59, 0x57, 0x50, 0xb7, 0xd4, 0x45, 0xfb, - 0x91, 0x12, 0x0d, 0x1f, 0xbf, 0x8c, 0xbe, 0xb7, 0x28, 0xc2, 0xff, 0x36, 0x84, 0x7f, 0x30, 0x6b, - 0x22, 0x79, 0x25, 0x15, 0xc3, 0x8f, 0x25, 0xc3, 0xcb, 0xaf, 0x9b, 0x12, 0x87, 0x34, 0xba, 0x97, - 0x3b, 0x6b, 0x1d, 0x1e, 0x57, 0x4b, 0x47, 0xd1, 0x15, 0xa4, 0xa6, 0xbd, 0xb4, 0x5f, 0x2a, 0x6a, - 0xaf, 0xa0, 0x99, 0xbe, 0x81, 0xfe, 0x34, 0x24, 0xfa, 0x55, 0x71, 0xf5, 0xc8, 0x9a, 0x90, 0xde, - 0x43, 0x05, 0xd5, 0x4a, 0x42, 0x35, 0xfb, 0x82, 0x59, 0x4a, 0xf6, 0xea, 0xc7, 0xe9, 0xc1, 0x05, - 0xa3, 0x7c, 0x2c, 0x5d, 0x41, 0x3d, 0x72, 0xcf, 0x94, 0x72, 0xfa, 0xd2, 0xf9, 0x7e, 0x67, 0xca, - 0xd2, 0xab, 0x67, 0x8e, 0x72, 0xf6, 0x9d, 0xb2, 0x33, 0xe5, 0x4e, 0x7a, 0x45, 0xca, 0xb1, 0x66, - 0x4c, 0x39, 0x79, 0xd8, 0xdc, 0x54, 0xc3, 0x2f, 0x2a, 0x49, 0x8e, 0xfa, 0xd9, 0xa2, 0x48, 0x52, - 0x9f, 0xc8, 0xf2, 0x15, 0x1f, 0x25, 0xd2, 0x64, 0x25, 0x2d, 0x46, 0x2f, 0x45, 0x24, 0xa2, 0x30, - 0x8e, 0x84, 0x30, 0x51, 0x17, 0x16, 0x4b, 0x32, 0xb3, 0x69, 0x71, 0xfd, 0xe7, 0x10, 0x22, 0x65, - 0x6e, 0xe5, 0x24, 0x30, 0xae, 0xa6, 0x23, 0xae, 0x64, 0x0b, 0xaa, 0x55, 0x8b, 0x67, 0xe3, 0xd4, - 0x28, 0xe0, 0xd9, 0xe1, 0xb5, 0xa2, 0x02, 0x24, 0xe4, 0xc1, 0x5c, 0x3a, 0x62, 0x16, 0xa6, 0x4c, - 0xff, 0x45, 0x38, 0x4b, 0xeb, 0x39, 0x0a, 0xf2, 0x36, 0x5e, 0x03, 0xc5, 0x1c, 0x85, 0x02, 0x5e, - 0x9c, 0x2a, 0xc1, 0xa4, 0xa0, 0x37, 0xf7, 0xca, 0x07, 0x1f, 0x8d, 0x76, 0x1d, 0x7f, 0x34, 0xda, - 0xf5, 0xaf, 0x93, 0xd1, 0xae, 0xaf, 0xdf, 0x1f, 0xed, 0x7a, 0xf7, 0xfe, 0xa8, 0x72, 0x7c, 0x7f, - 0xb4, 0xeb, 0xaf, 0xf7, 0x47, 0xbb, 0xde, 0x78, 0x66, 0xcb, 0xe6, 0xdb, 0x7e, 0x6d, 0xc2, 0x72, - 0x1b, 0x93, 0xc9, 0x05, 0x41, 0xfa, 0x95, 0xfe, 0x3d, 0xa4, 0x76, 0x5e, 0xfc, 0x1f, 0xe4, 0xc6, - 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa4, 0xc7, 0xba, 0x90, 0x7b, 0x22, 0x00, 0x00, + // 3054 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x5a, 0x5b, 0x6c, 0x1d, 0x47, + 0x19, 0xce, 0x26, 0x4d, 0xda, 0x6c, 0x1c, 0x3b, 0x5e, 0xdf, 0xb6, 0x49, 0xea, 0x75, 0x4f, 0x4e, + 0x5a, 0xf7, 0xe6, 0x5b, 0xda, 0x10, 0x22, 0x21, 0xf0, 0xa5, 0x6e, 0x4d, 0x6d, 0xc7, 0x1a, 0xdb, + 0x2a, 0x2a, 0x42, 0xab, 0x39, 0x7b, 0xc6, 0xf6, 0xe2, 0x3d, 0xb3, 0x27, 0xbb, 0xb3, 0xbe, 0x14, + 0x54, 0xaa, 0x22, 0x2e, 0x6f, 0x80, 0xc5, 0x45, 0x02, 0x09, 0x15, 0x51, 0x24, 0x4a, 0x29, 0x42, + 0x42, 0x42, 0x82, 0x17, 0x10, 0x12, 0x52, 0x05, 0x0f, 0xf6, 0x23, 0x12, 0x65, 0x51, 0x9d, 0x3e, + 0xa0, 0xf3, 0xc0, 0xc3, 0x79, 0x34, 0x2f, 0xe8, 0x9f, 0xbd, 0xcd, 0xee, 0xce, 0x69, 0xf2, 0x76, + 0xf6, 0xff, 0xfe, 0xf9, 0xe7, 0xfb, 0xe7, 0xf2, 0xcf, 0xff, 0xcf, 0x1c, 0xf5, 0xba, 0x63, 0xd7, + 0xc6, 0x2d, 0x97, 0x6e, 0xd8, 0x9b, 0xe3, 0x6e, 0x93, 0xd9, 0x2e, 0xf5, 0xa3, 0xaf, 0xc0, 0xc3, + 0xf0, 0x35, 0xd6, 0xf4, 0x5c, 0xe6, 0x6a, 0xe7, 0x22, 0xe1, 0xe5, 0x21, 0x41, 0x9d, 0x05, 0xd4, + 0xa6, 0x9b, 0x91, 0xc2, 0xe5, 0x01, 0x01, 0xf0, 0xed, 0xd7, 0x49, 0x2c, 0x3e, 0x4f, 0xf6, 0x58, + 0xf4, 0xb3, 0xf2, 0xce, 0x8b, 0x6a, 0xff, 0x9d, 0xa8, 0x87, 0x59, 0xb1, 0x07, 0xed, 0xa7, 0x8a, + 0x7a, 0xc9, 0xb1, 0x7d, 0x46, 0xa8, 0x89, 0xeb, 0x75, 0x8f, 0xf8, 0x3e, 0xf1, 0x75, 0x65, 0xe4, + 0xcc, 0xe8, 0xf9, 0x19, 0xff, 0x38, 0x34, 0x34, 0x84, 0x77, 0x17, 0x39, 0x3c, 0x9d, 0xa0, 0xad, + 0xd0, 0xe8, 0x71, 0xf2, 0xa2, 0x76, 0x68, 0x5c, 0xdf, 0x6b, 0x38, 0xb7, 0x2b, 0x39, 0x79, 0x65, + 0xa4, 0x4e, 0x36, 0x70, 0xe0, 0xb0, 0xdb, 0x95, 0xf8, 0x47, 0xe5, 0xe4, 0xb0, 0xfa, 0x70, 0xfc, + 0xfb, 0xe0, 0xa8, 0x2a, 0x31, 0x8e, 0x8a, 0xa6, 0xb5, 0xff, 0x2a, 0xaa, 0xbe, 0xe9, 0xb8, 0x35, + 0xec, 0x98, 0x75, 0xdb, 0xb7, 0xdc, 0x1d, 0xe2, 0xed, 0x9b, 0x3e, 0xf1, 0x76, 0x88, 0xe7, 0xeb, + 0xa7, 0x39, 0xd1, 0xdf, 0x29, 0xc7, 0xa1, 0xd1, 0x87, 0xf0, 0xee, 0x4b, 0x5c, 0x6f, 0x9a, 0xd2, + 0xd5, 0x08, 0x6f, 0x85, 0xc6, 0xc0, 0x66, 0x22, 0x73, 0x03, 0x6a, 0x91, 0x18, 0x68, 0x87, 0xc6, + 0xb3, 0x9c, 0xb0, 0x0c, 0x95, 0xf0, 0x6e, 0x1d, 0x56, 0xfb, 0x65, 0xaa, 0xed, 0xc3, 0xaa, 0xbc, + 0x83, 0xbc, 0xa3, 0x32, 0x6e, 0x68, 0x30, 0x6a, 0x38, 0x97, 0x38, 0x15, 0xcb, 0xb5, 0x8f, 0x65, + 0x0e, 0x13, 0x8a, 0x6b, 0x0e, 0xa9, 0xeb, 0x67, 0x46, 0x94, 0xd1, 0x47, 0x66, 0xde, 0x05, 0x87, + 0x2f, 0xa5, 0x16, 0x5f, 0x8c, 0xc0, 0xb2, 0xb7, 0x31, 0xd0, 0x0e, 0x8d, 0xa7, 0x25, 0xde, 0xc6, + 0xa8, 0xe0, 0x2e, 0xf3, 0x02, 0x02, 0xbe, 0x76, 0x30, 0xd3, 0x09, 0x38, 0x39, 0xac, 0x3e, 0x04, + 0x4d, 0x0f, 0x8e, 0xaa, 0x25, 0x52, 0x25, 0x37, 0x63, 0xb9, 0xf6, 0xa1, 0xa2, 0x0e, 0x39, 0xae, + 0x25, 0xf5, 0xf2, 0x21, 0xee, 0xe5, 0xcf, 0xc1, 0xcb, 0x9e, 0x45, 0xd0, 0xc9, 0x39, 0xd9, 0xef, + 0xc4, 0xa2, 0x82, 0x8f, 0x4f, 0x45, 0x4b, 0x50, 0x02, 0x4a, 0x5c, 0x94, 0x1b, 0xe9, 0x20, 0x17, + 0x1c, 0x2c, 0xf2, 0x41, 0x03, 0xbc, 0x41, 0xc9, 0xbd, 0xbf, 0x2b, 0x6a, 0x5f, 0xe4, 0x1e, 0x8e, + 0x6d, 0x99, 0x4d, 0xd7, 0x63, 0xfa, 0xd9, 0x11, 0x65, 0xf4, 0xec, 0xcc, 0x8f, 0xc1, 0xb5, 0xae, + 0xc4, 0xd4, 0x8a, 0xeb, 0xb1, 0x56, 0x68, 0xf4, 0xe6, 0xba, 0x06, 0x61, 0x3b, 0x34, 0x9e, 0x2c, + 0x3b, 0x05, 0x88, 0xe0, 0xd1, 0xd4, 0xe4, 0xc4, 0xd4, 0xa7, 0x2a, 0x27, 0xa1, 0x71, 0xc6, 0xa6, + 0xac, 0x75, 0x58, 0x95, 0x98, 0x91, 0x09, 0x4f, 0x0e, 0xab, 0x67, 0x79, 0xd3, 0x83, 0xa3, 0x6a, + 0x8e, 0x09, 0x2a, 0xeb, 0x6a, 0x5f, 0x3f, 0xad, 0x8e, 0x14, 0xbc, 0x69, 0x04, 0x0e, 0xb3, 0x2d, + 0xec, 0xb3, 0x24, 0x6e, 0xe8, 0xe7, 0x46, 0x94, 0xd1, 0xf3, 0x33, 0x7f, 0x00, 0xd7, 0xba, 0x13, + 0x83, 0x4b, 0xb3, 0xb0, 0x93, 0x5b, 0xa1, 0xd1, 0x97, 0x33, 0x1a, 0x89, 0xdb, 0xa1, 0x71, 0xb3, + 0xec, 0x5e, 0x84, 0x09, 0x0e, 0x7e, 0x71, 0x63, 0x63, 0x72, 0xea, 0xf6, 0xed, 0x5b, 0x37, 0x6e, + 0x3d, 0xff, 0xa5, 0xdb, 0x91, 0xb7, 0xad, 0xc3, 0xaa, 0xd4, 0xa0, 0x5c, 0x7c, 0x72, 0x58, 0xd5, + 0xca, 0x46, 0x0e, 0x8e, 0xaa, 0x05, 0x9a, 0xe8, 0xb1, 0x7c, 0xe3, 0xc4, 0xc3, 0x38, 0x18, 0x69, + 0x77, 0xd4, 0x8b, 0x0d, 0xbc, 0x67, 0xfa, 0x84, 0xd6, 0xcd, 0xed, 0x5a, 0xd3, 0xd7, 0x1f, 0xe6, + 0x93, 0xf9, 0x4c, 0x2b, 0x34, 0x2e, 0x34, 0xf0, 0xde, 0x2a, 0xa1, 0xf5, 0x57, 0x6a, 0x4d, 0x08, + 0x2e, 0xbd, 0xdc, 0x2d, 0x41, 0x96, 0xcc, 0x0f, 0x12, 0x15, 0x13, 0x83, 0x1e, 0xb1, 0x76, 0x22, + 0x83, 0x8f, 0xe4, 0x0c, 0x22, 0x62, 0xed, 0x14, 0x0d, 0x26, 0xb2, 0x9c, 0xc1, 0x44, 0xa8, 0xfd, + 0x5e, 0x51, 0x87, 0x3c, 0x62, 0xb9, 0x94, 0x12, 0x0b, 0xc2, 0xbb, 0x69, 0x53, 0x46, 0xbc, 0x1d, + 0xec, 0x98, 0xbe, 0x7e, 0x9e, 0xdb, 0x7e, 0x83, 0x07, 0xf5, 0x44, 0x65, 0x21, 0x86, 0x57, 0x21, + 0x76, 0x88, 0x0d, 0x53, 0xa0, 0x1d, 0x1a, 0xa3, 0xbc, 0x6f, 0x29, 0x2a, 0xcc, 0xd2, 0xcd, 0x89, + 0x84, 0xd2, 0xc9, 0x61, 0xf5, 0xf4, 0xcd, 0x09, 0x1e, 0xdf, 0x4b, 0xfd, 0x20, 0x79, 0x2f, 0xda, + 0x86, 0xda, 0xed, 0x11, 0x07, 0xef, 0xfb, 0x69, 0x0c, 0x50, 0x79, 0x0c, 0xf8, 0x6c, 0x2b, 0x34, + 0x2e, 0x46, 0x48, 0xb6, 0xd1, 0x2b, 0x31, 0x21, 0x41, 0x5a, 0xdc, 0xe1, 0xc9, 0x8e, 0x45, 0xf9, + 0xc6, 0xda, 0x5b, 0xa7, 0xd5, 0x2b, 0x71, 0x47, 0x29, 0x91, 0x6c, 0x90, 0x1a, 0xfa, 0x05, 0x3e, + 0x48, 0x7f, 0x81, 0x35, 0x3c, 0x84, 0x40, 0xaf, 0xe4, 0xc2, 0x52, 0x2b, 0x34, 0x86, 0x3c, 0x39, + 0x94, 0x06, 0xda, 0x0e, 0xb8, 0xc0, 0x72, 0x72, 0x42, 0xd8, 0xb2, 0x1d, 0xed, 0x75, 0x86, 0x60, + 0x90, 0x27, 0x61, 0x90, 0x3b, 0xd1, 0x44, 0x7a, 0xe4, 0x67, 0x19, 0xd1, 0x6a, 0xea, 0x45, 0x9f, + 0x61, 0x8f, 0x99, 0x35, 0xcf, 0xdd, 0xf5, 0x89, 0xa7, 0x77, 0xf1, 0xb1, 0xfe, 0x4c, 0x2b, 0x34, + 0xba, 0x38, 0x30, 0x13, 0xc9, 0xdb, 0xa1, 0xf1, 0x38, 0x77, 0x47, 0x14, 0x76, 0x1c, 0xe9, 0x5c, + 0x53, 0xed, 0x17, 0x8a, 0x3a, 0x40, 0x31, 0x33, 0x99, 0x87, 0xe1, 0x54, 0xc3, 0x4e, 0x3a, 0xb1, + 0xdd, 0xbc, 0xb3, 0xbb, 0xc7, 0xa1, 0xa1, 0x2e, 0x4f, 0xaf, 0x65, 0x61, 0x5d, 0xa5, 0x98, 0x65, + 0x73, 0x6c, 0xf0, 0x8e, 0x33, 0x91, 0x24, 0x84, 0x8b, 0x0d, 0x72, 0x5f, 0x42, 0xb8, 0x16, 0xba, + 0x40, 0x7d, 0x14, 0xb3, 0xb5, 0x84, 0x4e, 0xb2, 0x20, 0xfe, 0x58, 0xe2, 0xe9, 0x10, 0xec, 0x13, + 0xb3, 0xa1, 0xf7, 0xf0, 0xa5, 0xf0, 0x4d, 0x58, 0x0a, 0xe7, 0x97, 0xa7, 0xd7, 0x16, 0x41, 0x0c, + 0x93, 0xdf, 0x43, 0x31, 0x8b, 0x3e, 0x6c, 0x1a, 0x30, 0x9e, 0xfc, 0x54, 0x12, 0xb2, 0xa2, 0x5c, + 0xba, 0x37, 0x5a, 0x87, 0xd5, 0x52, 0xfb, 0xb2, 0x28, 0xdd, 0x41, 0x59, 0xc7, 0x48, 0x13, 0xd9, + 0x47, 0x32, 0xed, 0x6f, 0x8a, 0x3a, 0x94, 0x27, 0xef, 0x11, 0x4a, 0x76, 0xf9, 0x4a, 0xbe, 0xc4, + 0xe9, 0x1f, 0x00, 0xfd, 0x0b, 0xcb, 0xd3, 0x6b, 0x28, 0x02, 0xc0, 0x81, 0x5e, 0x8a, 0x59, 0xf2, + 0x99, 0xba, 0x50, 0x4d, 0x5c, 0xc8, 0x23, 0x82, 0x13, 0x37, 0x44, 0x27, 0x24, 0x36, 0x64, 0x42, + 0x70, 0xe4, 0x06, 0x38, 0x22, 0x52, 0x40, 0xfd, 0xa2, 0x2b, 0x89, 0x54, 0xe2, 0x0c, 0xb3, 0x1b, + 0xc4, 0x0d, 0x98, 0xe9, 0xeb, 0xbd, 0x79, 0x67, 0xd6, 0x22, 0x60, 0x35, 0x76, 0x26, 0xf9, 0x84, + 0x95, 0x5e, 0xcf, 0x39, 0x93, 0x47, 0x3a, 0x6d, 0x3f, 0x89, 0x0d, 0x99, 0x30, 0xdd, 0x72, 0x22, + 0x85, 0xbc, 0x33, 0x89, 0x54, 0xfb, 0x89, 0xa2, 0xea, 0x81, 0x8f, 0x37, 0x89, 0xe9, 0x11, 0x38, + 0xf7, 0x6d, 0xba, 0x69, 0x62, 0xcb, 0x22, 0x4d, 0x46, 0xea, 0xba, 0xc6, 0xbd, 0xc1, 0xb0, 0x03, + 0xd6, 0xd1, 0x74, 0x2c, 0x85, 0x1d, 0x10, 0x78, 0xc9, 0x57, 0x3b, 0x34, 0x2e, 0x71, 0x27, 0x32, + 0x91, 0x40, 0x58, 0x54, 0xcc, 0x7d, 0xc1, 0x8a, 0xcf, 0x4c, 0xa2, 0x41, 0x4e, 0x01, 0x25, 0x0c, + 0x12, 0xb9, 0xf6, 0x15, 0xb5, 0xbf, 0x48, 0xce, 0x27, 0x84, 0xea, 0x7d, 0x9c, 0xd8, 0xc2, 0x71, + 0x68, 0x9c, 0x5b, 0x47, 0xab, 0x84, 0xd0, 0x56, 0x68, 0x9c, 0x0b, 0x3c, 0xf8, 0xd5, 0x0e, 0x8d, + 0xae, 0x98, 0x10, 0x7c, 0x0a, 0x64, 0x12, 0x85, 0xf4, 0xd7, 0xc1, 0x51, 0x35, 0x6e, 0x8e, 0xb4, + 0x3c, 0x01, 0x90, 0x69, 0x3f, 0x50, 0xd4, 0x47, 0x8b, 0xbd, 0x07, 0xd4, 0xbe, 0x1b, 0x10, 0xd3, + 0xae, 0xeb, 0xfd, 0x3c, 0x89, 0x78, 0x2d, 0x1a, 0x9b, 0x75, 0x2e, 0x5e, 0x98, 0x8b, 0xc6, 0x26, + 0xfe, 0x12, 0xc7, 0x26, 0x51, 0xa8, 0x44, 0x83, 0x92, 0x7c, 0xb6, 0xc5, 0xaf, 0x78, 0x50, 0x12, + 0xac, 0x38, 0x28, 0x89, 0x96, 0xf6, 0x67, 0x45, 0xed, 0x2b, 0xf1, 0xf2, 0x1c, 0x7d, 0x80, 0x33, + 0xfa, 0x0e, 0xac, 0xbd, 0xb3, 0xeb, 0x68, 0x1d, 0x2d, 0xb6, 0x42, 0xe3, 0x6c, 0xe0, 0xad, 0xa3, + 0xc5, 0x76, 0x68, 0xdc, 0x4a, 0x88, 0xa0, 0x45, 0x61, 0x75, 0x6d, 0x31, 0xd6, 0xf4, 0x6f, 0x8f, + 0x8f, 0xd7, 0x31, 0xc3, 0x63, 0xfe, 0x3e, 0xb5, 0xd8, 0x16, 0x14, 0x6b, 0x94, 0xb0, 0x71, 0x4a, + 0x76, 0x41, 0x0a, 0x84, 0x63, 0x23, 0xc9, 0x8f, 0x93, 0xc3, 0xea, 0x03, 0x34, 0x3c, 0x38, 0xaa, + 0x46, 0x2c, 0x50, 0x6f, 0xc1, 0x0f, 0xcf, 0xd1, 0xfe, 0xad, 0xa8, 0x46, 0xd1, 0x85, 0xa6, 0xeb, + 0xc3, 0x09, 0xe7, 0x13, 0x2b, 0xf0, 0x88, 0xb3, 0xaf, 0x0f, 0xf2, 0xf0, 0xfb, 0x23, 0x5e, 0x41, + 0xac, 0xa3, 0x15, 0xd7, 0x67, 0x0b, 0x29, 0xd8, 0x0a, 0x8d, 0x4b, 0x81, 0x97, 0x97, 0xb5, 0x43, + 0xe3, 0x89, 0xd8, 0xc9, 0x3c, 0x20, 0xf8, 0xbb, 0x81, 0x1d, 0x9f, 0x87, 0xe4, 0x72, 0x6b, 0x89, + 0x0c, 0x32, 0x4f, 0xde, 0x02, 0xea, 0x85, 0x22, 0x05, 0x74, 0x35, 0xef, 0x56, 0x1e, 0xd5, 0xfe, + 0x25, 0xf1, 0xd0, 0xa6, 0x36, 0xb3, 0xa1, 0x8e, 0x80, 0xf3, 0xce, 0xf4, 0xf5, 0x21, 0xbe, 0x8a, + 0x7f, 0xc8, 0xab, 0x87, 0x75, 0xb4, 0x10, 0xa1, 0x73, 0x00, 0x42, 0xc0, 0xe8, 0x09, 0xbc, 0x9c, + 0x28, 0x0d, 0x17, 0x05, 0xb9, 0x18, 0x2c, 0x6e, 0x4d, 0xe4, 0x02, 0x78, 0xd1, 0x42, 0x59, 0x04, + 0x27, 0x10, 0xb4, 0x82, 0x82, 0xa1, 0x40, 0x01, 0x5d, 0xc9, 0x3b, 0x98, 0x03, 0x35, 0x57, 0xed, + 0xf5, 0x48, 0x74, 0x38, 0xbb, 0xd4, 0xdc, 0xc5, 0xdb, 0x24, 0x68, 0xea, 0x3a, 0x9f, 0xb2, 0x59, + 0x20, 0x1f, 0x83, 0x77, 0xe8, 0xab, 0x1c, 0x4a, 0xc9, 0x17, 0xe4, 0x1d, 0x0f, 0xe9, 0xa2, 0x01, + 0xed, 0x5b, 0x8a, 0x3a, 0x84, 0x03, 0xe6, 0x9a, 0x41, 0x73, 0xd3, 0xc3, 0x75, 0x92, 0x25, 0x43, + 0x5b, 0xfa, 0xa3, 0x7c, 0x20, 0x57, 0xa0, 0xe4, 0x02, 0x95, 0xf5, 0x48, 0x23, 0xc9, 0x23, 0x5e, + 0x4e, 0xab, 0x13, 0x19, 0x28, 0x0e, 0xdf, 0x94, 0x98, 0x19, 0x4e, 0x4e, 0x21, 0xa9, 0x35, 0xad, + 0xa1, 0x0e, 0x25, 0x1c, 0x98, 0x6b, 0x36, 0x3d, 0x98, 0x62, 0x7e, 0x16, 0xfb, 0xfa, 0x65, 0x3e, + 0x00, 0x37, 0x81, 0x48, 0xac, 0xb2, 0xe6, 0xae, 0x78, 0x04, 0xc5, 0x78, 0x3b, 0x34, 0x2e, 0x47, + 0x53, 0x28, 0x01, 0x2b, 0x48, 0xda, 0x46, 0xdb, 0x51, 0xb5, 0x6d, 0x42, 0x9a, 0x26, 0x23, 0x8d, + 0xa6, 0xeb, 0x61, 0xcf, 0x26, 0xbe, 0xb9, 0xa5, 0x5f, 0xe1, 0x2e, 0xbf, 0x0c, 0x1b, 0x01, 0xd0, + 0xb5, 0x0c, 0x04, 0x77, 0xaf, 0xf1, 0x5e, 0x8a, 0x80, 0x58, 0x8b, 0x3d, 0x2f, 0xba, 0x3a, 0xf5, + 0x3c, 0x2a, 0x59, 0xd1, 0xf6, 0xd5, 0x3e, 0x0b, 0x5b, 0x5b, 0xc4, 0xb4, 0x37, 0xa9, 0xeb, 0x91, + 0xba, 0xb9, 0x61, 0x3b, 0xc4, 0xd7, 0xaf, 0x72, 0x17, 0x17, 0xe0, 0x44, 0xe3, 0xf0, 0x42, 0x84, + 0xce, 0x03, 0x98, 0x0e, 0x74, 0x09, 0x29, 0xed, 0xc1, 0x74, 0x6f, 0xa1, 0xb2, 0x19, 0xed, 0x7b, + 0x8a, 0x7a, 0xb9, 0xe9, 0xb9, 0x9b, 0x50, 0xcc, 0x98, 0x41, 0xb3, 0x8e, 0x19, 0x11, 0x0b, 0x84, + 0xc7, 0xb8, 0xef, 0x6b, 0x90, 0xdf, 0x26, 0x5a, 0xeb, 0x5c, 0x49, 0x2c, 0x06, 0xa2, 0x22, 0xbb, + 0x03, 0x2e, 0xd0, 0x79, 0x41, 0x18, 0x08, 0xe5, 0x05, 0xd4, 0xc9, 0xa2, 0xf6, 0x96, 0xa2, 0x0e, + 0x3a, 0x76, 0xc3, 0x66, 0x66, 0x0d, 0xd3, 0xfa, 0xae, 0x5d, 0x67, 0x5b, 0xa6, 0x4d, 0x4d, 0x07, + 0x53, 0x7d, 0x98, 0x0f, 0xc9, 0x12, 0x2f, 0x1e, 0x41, 0x63, 0x26, 0x51, 0x58, 0xa0, 0x8b, 0x98, + 0x66, 0x05, 0x7f, 0x19, 0xfb, 0x84, 0x61, 0x91, 0x99, 0xd2, 0xde, 0x54, 0x54, 0xad, 0x61, 0x53, + 0x73, 0xcb, 0x6d, 0x10, 0xb3, 0x6e, 0xfb, 0xdb, 0xe6, 0x86, 0x47, 0x88, 0x6e, 0x8c, 0x28, 0xa3, + 0x17, 0xa6, 0xba, 0xc6, 0xa2, 0x9b, 0xb5, 0xb1, 0x55, 0xfb, 0x75, 0x32, 0xf3, 0xe2, 0x07, 0xa1, + 0x71, 0x0a, 0x76, 0x62, 0xc3, 0xa6, 0x2f, 0xbb, 0x0d, 0x32, 0x67, 0xfb, 0xdb, 0xf3, 0x1e, 0x21, + 0xe9, 0xea, 0x28, 0xc8, 0xc5, 0x7d, 0x30, 0x72, 0x1d, 0x88, 0x9c, 0x99, 0x1c, 0xb9, 0x8e, 0x8a, + 0xcd, 0xb5, 0x7b, 0x8a, 0xda, 0x95, 0xac, 0x77, 0x7e, 0xec, 0x8c, 0xf0, 0x63, 0xe7, 0x4f, 0x3c, + 0xe5, 0x49, 0x16, 0x6d, 0x74, 0xf8, 0x5c, 0xf0, 0xb2, 0xcf, 0x76, 0x68, 0xcc, 0x25, 0x15, 0x47, + 0x22, 0x93, 0x1c, 0x44, 0xf1, 0x0e, 0xf0, 0x0b, 0x67, 0x4a, 0x83, 0x30, 0x3c, 0xf6, 0x65, 0xdf, + 0xa5, 0x10, 0xbb, 0x73, 0x66, 0xf3, 0x9f, 0x27, 0x87, 0xd5, 0xd1, 0x07, 0x35, 0x05, 0xf9, 0x91, + 0xc0, 0x17, 0x65, 0x76, 0x3c, 0x47, 0x7b, 0x55, 0xed, 0xc5, 0xce, 0x2e, 0x54, 0x5f, 0xd1, 0x6d, + 0x02, 0x25, 0xcc, 0xd7, 0x1f, 0xe7, 0x97, 0x78, 0x50, 0xf4, 0xf6, 0x44, 0x20, 0xaf, 0xca, 0x97, + 0x09, 0x83, 0x85, 0xdf, 0x1f, 0x45, 0x98, 0x9c, 0xbc, 0x82, 0x8a, 0x8a, 0xda, 0xff, 0x14, 0x75, + 0xd4, 0xdd, 0x21, 0xde, 0xae, 0x67, 0x33, 0x08, 0x1c, 0x0d, 0x97, 0x11, 0xb3, 0x4e, 0x76, 0x6c, + 0x8b, 0x98, 0x14, 0x37, 0x88, 0x0f, 0xe1, 0x34, 0x2e, 0x84, 0xf4, 0x4a, 0x76, 0xbd, 0x34, 0x74, + 0x27, 0x69, 0x84, 0x78, 0x9b, 0x39, 0xb2, 0xb3, 0x0c, 0xea, 0xad, 0xd0, 0xb8, 0xe6, 0x96, 0x20, + 0xdb, 0x22, 0x1c, 0xbd, 0x43, 0x67, 0x23, 0x53, 0xed, 0xd0, 0xf8, 0x34, 0x27, 0xf8, 0x00, 0xba, + 0x9d, 0x17, 0x25, 0x54, 0x71, 0x1d, 0x78, 0xa0, 0x07, 0x61, 0xa1, 0x7d, 0x4d, 0x1d, 0x80, 0x30, + 0x66, 0xda, 0xb4, 0x4e, 0xf6, 0x4c, 0x58, 0xc9, 0x35, 0xc7, 0xb5, 0xb6, 0x7d, 0xfd, 0x1a, 0xdf, + 0xd2, 0xb0, 0x68, 0x34, 0x50, 0x58, 0x00, 0x7c, 0xc9, 0xa6, 0x33, 0x1c, 0x4d, 0x6f, 0x6d, 0xcb, + 0x90, 0x34, 0x53, 0x8e, 0xf2, 0x5f, 0x24, 0xb1, 0xa4, 0xfd, 0x13, 0xd2, 0x5d, 0x8a, 0xad, 0x6d, + 0x52, 0x37, 0xa9, 0xcb, 0xec, 0x0d, 0xdb, 0xc2, 0xd1, 0xfd, 0x43, 0xdd, 0xd7, 0xab, 0x7c, 0x7e, + 0xdf, 0x86, 0xe1, 0x1e, 0x5c, 0x8f, 0x94, 0x96, 0x05, 0x9d, 0x85, 0x39, 0x18, 0xed, 0xc1, 0x40, + 0x8a, 0xb4, 0x43, 0xe3, 0x4a, 0x14, 0xda, 0x65, 0x30, 0xbf, 0xab, 0x94, 0x22, 0xed, 0xc3, 0x6a, + 0x07, 0x8b, 0x07, 0x47, 0xd5, 0x0e, 0x2c, 0x90, 0xb4, 0x45, 0xdd, 0xd7, 0x90, 0x7a, 0x91, 0x79, + 0x78, 0x63, 0xc3, 0xb6, 0x4c, 0xcb, 0xc1, 0xbe, 0xaf, 0x5f, 0xe7, 0xc3, 0xfa, 0x1c, 0xd4, 0xcb, + 0x31, 0x30, 0x0b, 0xf2, 0x76, 0x68, 0x68, 0xd1, 0x80, 0x0a, 0xc2, 0xf4, 0xa2, 0x26, 0xa7, 0xaa, + 0xdd, 0x55, 0xfb, 0xe2, 0x21, 0x36, 0x37, 0x5c, 0xa7, 0x4e, 0x3c, 0xb3, 0x89, 0xd9, 0x96, 0xfe, + 0x04, 0xdf, 0xf5, 0xd3, 0x70, 0x0c, 0xc4, 0xf0, 0x3c, 0x47, 0x57, 0x30, 0xdb, 0x4a, 0x43, 0x4c, + 0x09, 0x11, 0xa6, 0xeb, 0x0d, 0x58, 0x56, 0xca, 0x1b, 0xa8, 0xdc, 0x5c, 0xdb, 0x56, 0x2f, 0xf9, + 0x84, 0x99, 0x8e, 0xbb, 0x6b, 0x36, 0x3d, 0xdb, 0xf5, 0x6c, 0xb6, 0xaf, 0x3f, 0xc9, 0xb7, 0x02, + 0xf4, 0xd7, 0xed, 0x13, 0xb6, 0xe8, 0xee, 0xae, 0xc4, 0x48, 0xda, 0x59, 0x5e, 0xdc, 0x31, 0xb1, + 0x28, 0x34, 0xd7, 0xde, 0x55, 0xd4, 0xc1, 0x06, 0xde, 0x4b, 0x9c, 0xb3, 0x5c, 0x6a, 0x05, 0x9e, + 0x47, 0xa8, 0xb5, 0xaf, 0x8f, 0xf2, 0xd1, 0xf3, 0xf9, 0x15, 0x0b, 0xde, 0x5d, 0xc2, 0x7b, 0x11, + 0xc7, 0xd9, 0x4c, 0x05, 0x0e, 0xfa, 0x86, 0x44, 0x9e, 0x1e, 0xf4, 0x32, 0x30, 0x19, 0x68, 0x7e, + 0x27, 0x22, 0xb7, 0x8b, 0xa4, 0x56, 0xb5, 0x0f, 0x15, 0xb5, 0xcf, 0xf2, 0xb0, 0xbf, 0x55, 0xc8, + 0xfc, 0x9f, 0xe2, 0x93, 0xf1, 0x1e, 0xcf, 0xfc, 0x67, 0x93, 0xcc, 0xdf, 0x8a, 0x33, 0xff, 0xf9, + 0xe8, 0x44, 0x86, 0x66, 0x59, 0x0e, 0x2e, 0x0d, 0xbe, 0x5c, 0xa7, 0x9c, 0xcd, 0x73, 0x31, 0xac, + 0xe0, 0xde, 0x92, 0x11, 0xa8, 0x09, 0xac, 0xb8, 0x26, 0xa8, 0x3e, 0x88, 0x19, 0xa8, 0x0a, 0x66, + 0xa3, 0xaa, 0xa0, 0x60, 0xcc, 0x73, 0xb4, 0x9f, 0x29, 0xea, 0x50, 0xd1, 0xbd, 0xe4, 0x32, 0xe6, + 0x69, 0x3e, 0xff, 0xf6, 0x71, 0x68, 0x9c, 0x9f, 0x45, 0xc2, 0x3b, 0x42, 0xde, 0x4a, 0xf1, 0x1d, + 0x41, 0x8a, 0x76, 0x5a, 0x1a, 0x07, 0x47, 0xd5, 0xcc, 0x36, 0x92, 0x5b, 0xd6, 0xbe, 0xa1, 0xa8, + 0x83, 0x3e, 0x0b, 0xa8, 0x09, 0xf9, 0x12, 0x76, 0xec, 0x1d, 0x62, 0x46, 0x59, 0xb0, 0xaf, 0x3f, + 0x93, 0x66, 0xa1, 0x7d, 0xa0, 0xf1, 0x4a, 0xa2, 0xb0, 0x0a, 0xf8, 0x6a, 0x9a, 0x1b, 0x49, 0xb0, + 0x7c, 0x0a, 0x2f, 0x84, 0xb1, 0x33, 0x93, 0xb7, 0x26, 0x90, 0xcc, 0x1a, 0x54, 0xc6, 0x05, 0x1a, + 0x10, 0x4d, 0x7d, 0xfd, 0x59, 0x4e, 0xe2, 0xf3, 0xb0, 0x2f, 0x73, 0xcd, 0x96, 0x6c, 0x9a, 0x55, + 0x10, 0x25, 0x44, 0xcc, 0x0c, 0x73, 0x61, 0x74, 0x6a, 0x02, 0x95, 0xed, 0x40, 0x2e, 0xde, 0xc5, + 0x7b, 0x4f, 0x9e, 0xb7, 0x9e, 0xe3, 0x91, 0xb3, 0x7e, 0x1c, 0x1a, 0xdd, 0x08, 0xef, 0xae, 0xb2, + 0x40, 0x78, 0xd8, 0xba, 0xe0, 0x67, 0x9f, 0xe9, 0x15, 0x54, 0x26, 0xbb, 0xef, 0xe3, 0x5b, 0xc1, + 0x22, 0x12, 0xed, 0x69, 0x3b, 0x6a, 0x0f, 0x14, 0x9b, 0x35, 0xec, 0x13, 0x33, 0x7a, 0x69, 0xd4, + 0xc7, 0x46, 0x94, 0xd1, 0xee, 0xa9, 0xee, 0x24, 0x19, 0x5a, 0xe3, 0x52, 0x7e, 0x67, 0xd8, 0x9d, + 0xa8, 0x46, 0xb2, 0x2c, 0x4c, 0xe5, 0xc4, 0x95, 0x91, 0xb8, 0xf4, 0x88, 0x97, 0xc7, 0x9b, 0x47, + 0x55, 0x05, 0x15, 0x9a, 0x6a, 0xdf, 0x3f, 0xad, 0x5e, 0x83, 0xa8, 0x91, 0x86, 0x0b, 0x28, 0x5d, + 0x2d, 0xb7, 0x01, 0x4b, 0xd6, 0x23, 0x77, 0x03, 0xe2, 0x33, 0x73, 0xdb, 0xae, 0xe9, 0xe3, 0x7c, + 0x3a, 0xfe, 0xaa, 0xc4, 0x2f, 0x94, 0x4b, 0x78, 0x6f, 0x76, 0x01, 0x45, 0xf8, 0x2b, 0xf6, 0x4c, + 0x2b, 0x34, 0x8c, 0x06, 0xde, 0x4b, 0xb7, 0x38, 0x5b, 0x88, 0x6d, 0x64, 0x2a, 0xe9, 0xd9, 0x77, + 0x1f, 0x3d, 0xa1, 0xec, 0xbb, 0xaf, 0xc9, 0xfb, 0xab, 0xc4, 0x6f, 0x9e, 0x05, 0xba, 0xe8, 0x3e, + 0xcd, 0x6a, 0xda, 0xc7, 0x8a, 0x3a, 0x98, 0x3e, 0xbc, 0x38, 0x58, 0x7c, 0xaa, 0x9d, 0xe0, 0x1b, + 0xf8, 0x7d, 0x18, 0x89, 0xfe, 0xe4, 0xe1, 0x62, 0x71, 0x7a, 0x59, 0x7c, 0xad, 0xed, 0xc7, 0x12, + 0x79, 0x9a, 0x3e, 0xcb, 0x40, 0xd9, 0x7b, 0x99, 0xd4, 0x48, 0x07, 0xb9, 0xb0, 0xf5, 0xa5, 0xa4, + 0x50, 0xd6, 0x0a, 0x0b, 0x4f, 0xbd, 0x5f, 0x55, 0xbb, 0x82, 0x26, 0x6d, 0xa6, 0xc1, 0xe9, 0x97, + 0xf3, 0xdc, 0xb9, 0x2f, 0x1c, 0x87, 0xc6, 0xc0, 0x1c, 0x69, 0x7a, 0xc4, 0xc2, 0x8c, 0xd4, 0xd7, + 0x57, 0xe8, 0x4a, 0x16, 0xa9, 0x94, 0xe7, 0xb2, 0x14, 0xa1, 0x49, 0x9b, 0x31, 0xf0, 0xac, 0xdb, + 0xb0, 0x21, 0x4d, 0x61, 0xfb, 0x95, 0x83, 0xa3, 0xaa, 0xbc, 0xb1, 0xae, 0xa0, 0x0b, 0x42, 0x13, + 0xed, 0x1d, 0x25, 0xee, 0x3e, 0xb9, 0x00, 0x7e, 0x77, 0x9e, 0xaf, 0xb2, 0x37, 0xf9, 0xd8, 0xe6, + 0x4d, 0xa4, 0x97, 0xc1, 0xbc, 0xfb, 0x91, 0xb4, 0x7b, 0xf1, 0x12, 0x57, 0xe0, 0x90, 0x2d, 0xa2, + 0xcb, 0x9d, 0xb5, 0x60, 0xb0, 0x64, 0xbd, 0xe8, 0x0a, 0x52, 0xb3, 0x56, 0xda, 0x6f, 0x15, 0xb5, + 0x9b, 0xd3, 0xcc, 0xae, 0x7a, 0x7f, 0x15, 0x11, 0xfd, 0x36, 0xcf, 0xb0, 0xf2, 0x26, 0x84, 0x6b, + 0x5f, 0x4e, 0xb5, 0x92, 0x52, 0xcd, 0x5f, 0xd4, 0x4a, 0xc9, 0x5e, 0xfd, 0x24, 0x3d, 0xc8, 0xa3, + 0xe4, 0x7d, 0xe9, 0x0a, 0xea, 0x12, 0x5b, 0x66, 0x94, 0xb3, 0x0b, 0xdd, 0xf7, 0x3a, 0x53, 0x16, + 0x2e, 0x77, 0x0b, 0x94, 0xf3, 0xd7, 0xb1, 0x9d, 0x29, 0x77, 0xd2, 0x2b, 0x53, 0x4e, 0x34, 0x13, + 0xca, 0xe9, 0xfd, 0xed, 0x86, 0x1a, 0x3d, 0x1c, 0xa5, 0xa1, 0xf8, 0xd7, 0xf3, 0x3c, 0x16, 0x7f, + 0x2e, 0xcf, 0x97, 0xbf, 0xbd, 0x64, 0x31, 0x59, 0x58, 0x8c, 0x5e, 0x86, 0x08, 0x44, 0xa1, 0x1f, + 0x01, 0xf1, 0x79, 0xf9, 0x5b, 0xae, 0x3c, 0xcd, 0xa6, 0xc5, 0xf4, 0xf7, 0x61, 0x88, 0x94, 0x99, + 0xa5, 0xe3, 0xd0, 0xb8, 0x9a, 0xf5, 0xb8, 0x94, 0xaf, 0x1b, 0x57, 0x2c, 0x96, 0x1f, 0xa7, 0x46, + 0x09, 0xcf, 0x77, 0xaf, 0x95, 0x15, 0xe0, 0xdc, 0xe9, 0x2f, 0x44, 0x5d, 0xdf, 0xc2, 0xd4, 0xd7, + 0x7f, 0x13, 0xcd, 0xd2, 0x5a, 0x81, 0x82, 0x18, 0xad, 0x56, 0x41, 0xb1, 0x40, 0xa1, 0x84, 0x97, + 0xa7, 0x8a, 0x33, 0x29, 0xe9, 0xcd, 0xbc, 0xf4, 0xc1, 0x47, 0xc3, 0xa7, 0x8e, 0x3e, 0x1a, 0x3e, + 0xf5, 0x9f, 0xe3, 0xe1, 0x53, 0xdf, 0xbd, 0x37, 0x7c, 0xea, 0xed, 0x7b, 0xc3, 0xca, 0xd1, 0xbd, + 0xe1, 0x53, 0xff, 0xb8, 0x37, 0x7c, 0xea, 0xb5, 0xa7, 0x36, 0x6d, 0xb6, 0x15, 0xd4, 0xc6, 0x2c, + 0xb7, 0x31, 0x9e, 0xe6, 0x41, 0xc2, 0xaf, 0xec, 0x5f, 0x30, 0xb5, 0x73, 0xfc, 0x6f, 0x2f, 0x37, + 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x28, 0xaa, 0x01, 0x3c, 0x62, 0x23, 0x00, 0x00, } func (m *OptionsConfiguration) ProtoSize() (n int) { @@ -467,6 +471,9 @@ func (m *OptionsConfiguration) ProtoSize() (n int) { if m.RawMaxCIRequestKiB != 0 { n += 2 + sovOptionsconfiguration(uint64(m.RawMaxCIRequestKiB)) } + if m.AnnounceLANAddresses { + n += 3 + } if m.DeprecatedUPnPEnabled { n += 4 } diff --git a/lib/config/testdata/overridenvalues.xml b/lib/config/testdata/overridenvalues.xml index 159098578..555f813d4 100644 --- a/lib/config/testdata/overridenvalues.xml +++ b/lib/config/testdata/overridenvalues.xml @@ -44,5 +44,6 @@ 900 foo asdfasdf + false diff --git a/lib/connections/quic_listen.go b/lib/connections/quic_listen.go index bf929c317..d709c7cca 100644 --- a/lib/connections/quic_listen.go +++ b/lib/connections/quic_listen.go @@ -170,7 +170,10 @@ func (t *quicListener) WANAddresses() []*url.URL { } func (t *quicListener) LANAddresses() []*url.URL { - return []*url.URL{t.uri} + addrs := []*url.URL{t.uri} + network := strings.Replace(t.uri.Scheme, "quic", "udp", -1) + addrs = append(addrs, getURLsForAllAdaptersIfUnspecified(network, t.uri)...) + return addrs } func (t *quicListener) String() string { diff --git a/lib/connections/service.go b/lib/connections/service.go index 40235aa13..11a5d43bf 100644 --- a/lib/connections/service.go +++ b/lib/connections/service.go @@ -675,6 +675,9 @@ func (s *service) AllAddresses() []string { } func (s *service) ExternalAddresses() []string { + if s.cfg.Options().AnnounceLANAddresses { + return s.AllAddresses() + } s.listenersMut.RLock() var addrs []string for _, listener := range s.listeners { diff --git a/lib/connections/tcp_listen.go b/lib/connections/tcp_listen.go index b1f541dc0..74448c95c 100644 --- a/lib/connections/tcp_listen.go +++ b/lib/connections/tcp_listen.go @@ -179,7 +179,9 @@ func (t *tcpListener) WANAddresses() []*url.URL { } func (t *tcpListener) LANAddresses() []*url.URL { - return []*url.URL{t.uri} + addrs := []*url.URL{t.uri} + addrs = append(addrs, getURLsForAllAdaptersIfUnspecified(t.uri.Scheme, t.uri)...) + return addrs } func (t *tcpListener) String() string { diff --git a/lib/connections/util.go b/lib/connections/util.go index 2ad611147..1738c8c85 100644 --- a/lib/connections/util.go +++ b/lib/connections/util.go @@ -11,6 +11,8 @@ import ( "net/url" "strconv" "strings" + + "github.com/syncthing/syncthing/lib/osutil" ) func fixupPort(uri *url.URL, defaultPort int) *url.URL { @@ -32,3 +34,86 @@ func fixupPort(uri *url.URL, defaultPort int) *url.URL { return ©URI } + +func getURLsForAllAdaptersIfUnspecified(network string, uri *url.URL) []*url.URL { + ip, port, err := resolve(network, uri.Host) + // Failed to resolve + if err != nil || port == 0 { + return nil + } + + // Not an unspecified address, so no point of substituting with local + // interface addresses as it's listening on a specific adapter anyway. + if len(ip) != 0 && !ip.IsUnspecified() { + return nil + } + + hostPorts := getHostPortsForAllAdapters(port) + addrs := make([]*url.URL, 0, len(hostPorts)) + for _, hostPort := range hostPorts { + newUri := *uri + newUri.Host = hostPort + addrs = append(addrs, &newUri) + } + + return addrs +} + +func getHostPortsForAllAdapters(port int) []string { + nets, err := osutil.GetLans() + if err != nil { + // Ignore failure. + return nil + } + + hostPorts := make([]string, 0, len(nets)) + + portStr := strconv.Itoa(port) + + for _, network := range nets { + // Only IPv4 addresses, as v6 link local require an interface identifiers to work correctly + // And non link local in theory are globally routable anyway. + if network.IP.To4() == nil { + continue + } + if network.IP.IsLinkLocalUnicast() || (isV4Local(network.IP) && network.IP.IsGlobalUnicast()) { + hostPorts = append(hostPorts, net.JoinHostPort(network.IP.String(), portStr)) + } + } + return hostPorts +} + +func resolve(network, hostPort string) (net.IP, int, error) { + switch network { + case "tcp", "tcp4", "tcp6": + if addr, err := net.ResolveTCPAddr(network, hostPort); err != nil { + return net.IPv4zero, 0, err + } else { + return addr.IP, addr.Port, nil + } + case "udp", "udp4", "udp6": + if addr, err := net.ResolveUDPAddr(network, hostPort); err != nil { + return net.IPv4zero, 0, err + } else { + return addr.IP, addr.Port, nil + } + case "ip", "ip4", "ip6": + if addr, err := net.ResolveIPAddr(network, hostPort); err != nil { + return net.IPv4zero, 0, err + } else { + return addr.IP, 0, nil + } + } + return net.IPv4zero, 0, net.UnknownNetworkError(network) +} + +func isV4Local(ip net.IP) bool { + // See https://go-review.googlesource.com/c/go/+/162998/ + // We only take the V4 part of that. + if ip4 := ip.To4(); ip4 != nil { + return ip4[0] == 10 || + (ip4[0] == 172 && ip4[1]&0xf0 == 16) || + (ip4[0] == 192 && ip4[1] == 168) + } + return false +} diff --git a/lib/discover/global.go b/lib/discover/global.go index 9aa2e09d4..57749c5ac 100644 --- a/lib/discover/global.go +++ b/lib/discover/global.go @@ -254,27 +254,27 @@ func (c *globalClient) sendAnnouncement(ctx context.Context, timer *time.Timer) // The marshal doesn't fail, I promise. postData, _ := json.Marshal(ann) - l.Debugf("Announcement: %v", ann) + l.Debugf("%s Announcement: %v", c, ann) resp, err := c.announceClient.Post(ctx, c.server, "application/json", bytes.NewReader(postData)) if err != nil { - l.Debugln("announce POST:", err) + l.Debugln(c, "announce POST:", err) c.setError(err) timer.Reset(announceErrorRetryInterval) return } - l.Debugln("announce POST:", resp.Status) + l.Debugln(c, "announce POST:", resp.Status) resp.Body.Close() if resp.StatusCode < 200 || resp.StatusCode > 299 { - l.Debugln("announce POST:", resp.Status) + l.Debugln(c, "announce POST:", resp.Status) c.setError(errors.New(resp.Status)) if h := resp.Header.Get("Retry-After"); h != "" { // The server has a recommendation on when we should // retry. Follow it. if secs, err := strconv.Atoi(h); err == nil && secs > 0 { - l.Debugln("announce Retry-After:", secs, err) + l.Debugln(c, "announce Retry-After:", secs, err) timer.Reset(time.Duration(secs) * time.Second) return } @@ -290,7 +290,7 @@ func (c *globalClient) sendAnnouncement(ctx context.Context, timer *time.Timer) // The server has a recommendation on when we should // reannounce. Follow it. if secs, err := strconv.Atoi(h); err == nil && secs > 0 { - l.Debugln("announce Reannounce-After:", secs, err) + l.Debugln(c, "announce Reannounce-After:", secs, err) timer.Reset(time.Duration(secs) * time.Second) return } diff --git a/lib/discover/local.go b/lib/discover/local.go index 3ff55a416..a4d79e059 100644 --- a/lib/discover/local.go +++ b/lib/discover/local.go @@ -166,8 +166,11 @@ func (c *localClient) recvAnnouncements(ctx context.Context) { } buf, addr := b.Recv() + if addr == nil { + continue + } if len(buf) < 4 { - l.Debugf("discover: short packet from %s") + l.Debugf("discover: short packet from %s", addr.String()) continue } diff --git a/proto/lib/config/optionsconfiguration.proto b/proto/lib/config/optionsconfiguration.proto index dfed02241..b421da0b9 100644 --- a/proto/lib/config/optionsconfiguration.proto +++ b/proto/lib/config/optionsconfiguration.proto @@ -54,6 +54,8 @@ message OptionsConfiguration { repeated string stun_servers = 45 [(ext.goname) = "RawStunServers", (ext.default) = "default"]; Tuning database_tuning = 46 [(ext.restart) = true]; int32 max_concurrent_incoming_request_kib = 47 [(ext.goname) = "RawMaxCIRequestKiB", (ext.xml) = "maxConcurrentIncomingRequestKiB", (ext.json) = "maxConcurrentIncomingRequestKiB"]; + bool announce_lan_addresses = 48 [(ext.goname)= "AnnounceLANAddresses", (ext.xml) = "announceLANAddresses", (ext.json) = "announceLANAddresses", (ext.default) = "true"]; + // Legacy deprecated bool upnp_enabled = 9000 [deprecated = true, (ext.goname) = "DeprecatedUPnPEnabled"];