build: Fix proto builder on Windows

lib/db/structs.go

@@ -5,7 +5,7 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
 //go:generate go run ../../script/protofmt.go structs.proto
-//go:generate protoc --proto_path=../../../../../:../../../../gogo/protobuf/protobuf:. --gogofast_out=. structs.proto
+//go:generate protoc -I ../../../../../ -I ../../../../gogo/protobuf/protobuf -I . --gogofast_out=. structs.proto
 
 package db
 

lib/db/structs.pb.go

@@ -912,32 +912,32 @@ var (
 )
 
 var fileDescriptorStructs = []byte{
-	// 419 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x51, 0xcd, 0xaa, 0xd3, 0x40,
-	0x18, 0x4d, 0xda, 0xdc, 0x36, 0xfd, 0x62, 0xaf, 0x3a, 0xc8, 0x25, 0x14, 0x4c, 0x2f, 0x05, 0x41,
-	0x04, 0x53, 0xbd, 0xe2, 0xc6, 0x65, 0x17, 0x05, 0x41, 0x44, 0x46, 0xa9, 0xcb, 0xd2, 0x64, 0xa6,
-	0xe9, 0x40, 0x32, 0x13, 0x33, 0x93, 0x42, 0x7d, 0x12, 0x97, 0x7d, 0x9c, 0x2e, 0x7d, 0x02, 0xd1,
-	0xfa, 0x12, 0x2e, 0x9d, 0x4e, 0x7e, 0xcc, 0xd2, 0x45, 0xe0, 0x3b, 0x73, 0xce, 0xf9, 0xce, 0x99,
-	0x0c, 0x8c, 0xa5, 0x2a, 0xca, 0x58, 0xc9, 0x30, 0x2f, 0x84, 0x12, 0xa8, 0x47, 0xa2, 0xc9, 0xf3,
-	0x84, 0xa9, 0x5d, 0x19, 0x85, 0xb1, 0xc8, 0xe6, 0x89, 0x48, 0xc4, 0xdc, 0x50, 0x51, 0xb9, 0x35,
-	0xc8, 0x00, 0x33, 0x55, 0x96, 0xc9, 0xeb, 0x8e, 0x5c, 0x1e, 0x78, 0xac, 0x76, 0x8c, 0x27, 0x9d,
-	0x29, 0x65, 0x51, 0xb5, 0x21, 0x16, 0xe9, 0x3c, 0xa2, 0x79, 0x65, 0x9b, 0x7d, 0x06, 0x6f, 0xc9,
-	0x52, 0xba, 0xa2, 0x85, 0x64, 0x82, 0xa3, 0x17, 0x30, 0xdc, 0x57, 0xa3, 0x6f, 0xdf, 0xda, 0x4f,
-	0xbd, 0xbb, 0x07, 0x61, 0x63, 0x0a, 0x57, 0x34, 0x56, 0xa2, 0x58, 0x38, 0xa7, 0x1f, 0x53, 0x0b,
-	0x37, 0x32, 0x74, 0x03, 0x03, 0x42, 0xf7, 0x2c, 0xa6, 0x7e, 0x4f, 0x1b, 0xee, 0xe1, 0x1a, 0xcd,
-	0x96, 0xe0, 0xd5, 0x4b, 0xdf, 0x31, 0xa9, 0xd0, 0x4b, 0x70, 0x6b, 0x87, 0xd4, 0x9b, 0xfb, 0x7a,
-	0xf3, 0xfd, 0x90, 0x44, 0x61, 0x27, 0xbb, 0x5e, 0xdc, 0xca, 0xde, 0x38, 0xdf, 0x8e, 0x53, 0x6b,
-	0xf6, 0xa7, 0x07, 0x0f, 0x2f, 0xaa, 0xb7, 0x7c, 0x2b, 0x3e, 0x15, 0x25, 0x8f, 0x37, 0x8a, 0x12,
-	0x84, 0xc0, 0xe1, 0x9b, 0x8c, 0x9a, 0x92, 0x23, 0x6c, 0x66, 0xf4, 0x0c, 0x1c, 0x75, 0xc8, 0xab,
-	0x1e, 0xd7, 0x77, 0x37, 0xff, 0x8a, 0xb7, 0x76, 0xcd, 0x62, 0xa3, 0xb9, 0xf8, 0x25, 0xfb, 0x4a,
-	0xfd, 0xbe, 0xd6, 0xf6, 0xb1, 0x99, 0xd1, 0x2d, 0x78, 0x39, 0x2d, 0x32, 0x26, 0xab, 0x96, 0x8e,
-	0xa6, 0xc6, 0xb8, 0x7b, 0x84, 0x1e, 0x03, 0x64, 0x82, 0xb0, 0x2d, 0xa3, 0x64, 0x2d, 0xfd, 0x2b,
-	0xe3, 0x1d, 0x35, 0x27, 0x1f, 0x91, 0x0f, 0x43, 0x42, 0x53, 0xaa, 0xfb, 0xf9, 0x03, 0xcd, 0xb9,
-	0xb8, 0x81, 0x17, 0x86, 0xf1, 0xfd, 0x26, 0x65, 0xc4, 0x1f, 0x56, 0x4c, 0x0d, 0xd1, 0x13, 0xb8,
-	0xe6, 0x62, 0xdd, 0xcd, 0x75, 0x8d, 0x60, 0xcc, 0xc5, 0x87, 0x4e, 0x72, 0xe7, 0x5d, 0x46, 0xff,
-	0xf7, 0x2e, 0x13, 0x70, 0x25, 0xfd, 0x52, 0x52, 0xae, 0x5f, 0x06, 0x4c, 0xd3, 0x16, 0xa3, 0x29,
-	0x78, 0xed, 0x3d, 0x74, 0xa2, 0xa7, 0xe9, 0x2b, 0xdc, 0x5e, 0xed, 0x7d, 0xfd, 0xeb, 0x17, 0x8f,
-	0x4e, 0xbf, 0x02, 0xeb, 0x74, 0x0e, 0xec, 0xef, 0xfa, 0xfb, 0x79, 0x0e, 0xac, 0xe3, 0xef, 0xc0,
-	0x8e, 0x06, 0x26, 0xf8, 0xd5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0xae, 0x24, 0x77, 0xb3,
-	0x02, 0x00, 0x00,
+	// 425 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x51, 0x4f, 0x8b, 0xd3, 0x40,
+	0x1c, 0xed, 0xb4, 0xd9, 0xfe, 0xf9, 0xc5, 0xae, 0x3a, 0xc8, 0x32, 0x14, 0x4c, 0x43, 0x41, 0x08,
+	0x82, 0xa9, 0x56, 0xbc, 0x78, 0xdc, 0xc3, 0x82, 0x20, 0x22, 0x51, 0xd6, 0xe3, 0xd2, 0xcc, 0xfc,
+	0xda, 0x1d, 0x48, 0x67, 0x62, 0x66, 0x52, 0xa8, 0x9f, 0xc4, 0xe3, 0x7e, 0x9c, 0x1e, 0xfd, 0x04,
+	0xa2, 0xf5, 0x4b, 0x78, 0x94, 0x4e, 0xd2, 0x98, 0xe3, 0xde, 0xde, 0x9b, 0xdf, 0x7b, 0xbf, 0xf7,
+	0x66, 0x06, 0xc6, 0xc6, 0x16, 0x25, 0xb7, 0x26, 0xce, 0x0b, 0x6d, 0x35, 0xed, 0x8a, 0x74, 0xf2,
+	0x62, 0x2d, 0xed, 0x6d, 0x99, 0xc6, 0x5c, 0x6f, 0xe6, 0x6b, 0xbd, 0xd6, 0x73, 0x37, 0x4a, 0xcb,
+	0x95, 0x63, 0x8e, 0x38, 0x54, 0x59, 0x26, 0x6f, 0x5a, 0x72, 0xb3, 0x53, 0xdc, 0xde, 0x4a, 0xb5,
+	0x6e, 0xa1, 0x4c, 0xa6, 0xd5, 0x06, 0xae, 0xb3, 0x79, 0x8a, 0x79, 0x65, 0x9b, 0x7d, 0x01, 0xff,
+	0x4a, 0x66, 0x78, 0x8d, 0x85, 0x91, 0x5a, 0xd1, 0x97, 0x30, 0xd8, 0x56, 0x90, 0x91, 0x90, 0x44,
+	0xfe, 0xe2, 0x51, 0x7c, 0x32, 0xc5, 0xd7, 0xc8, 0xad, 0x2e, 0x2e, 0xbd, 0xfd, 0xcf, 0x69, 0x27,
+	0x39, 0xc9, 0xe8, 0x05, 0xf4, 0x05, 0x6e, 0x25, 0x47, 0xd6, 0x0d, 0x49, 0xf4, 0x20, 0xa9, 0xd9,
+	0xec, 0x0a, 0xfc, 0x7a, 0xe9, 0x7b, 0x69, 0x2c, 0x7d, 0x05, 0xc3, 0xda, 0x61, 0x18, 0x09, 0x7b,
+	0x91, 0xbf, 0x78, 0x18, 0x8b, 0x34, 0x6e, 0x65, 0xd7, 0x8b, 0x1b, 0xd9, 0x5b, 0xef, 0xfb, 0xdd,
+	0xb4, 0x33, 0xfb, 0xdb, 0x85, 0xc7, 0x47, 0xd5, 0x3b, 0xb5, 0xd2, 0x9f, 0x8b, 0x52, 0xf1, 0xa5,
+	0x45, 0x41, 0x29, 0x78, 0x6a, 0xb9, 0x41, 0x57, 0x72, 0x94, 0x38, 0x4c, 0x9f, 0x83, 0x67, 0x77,
+	0x79, 0xd5, 0xe3, 0x7c, 0x71, 0xf1, 0xbf, 0x78, 0x63, 0xdf, 0xe5, 0x98, 0x38, 0xcd, 0xd1, 0x6f,
+	0xe4, 0x37, 0x64, 0xbd, 0x90, 0x44, 0xbd, 0xc4, 0x61, 0x1a, 0x82, 0x9f, 0x63, 0xb1, 0x91, 0xa6,
+	0x6a, 0xe9, 0x85, 0x24, 0x1a, 0x27, 0xed, 0x23, 0xfa, 0x14, 0x60, 0xa3, 0x85, 0x5c, 0x49, 0x14,
+	0x37, 0x86, 0x9d, 0x39, 0xef, 0xe8, 0x74, 0xf2, 0x89, 0x32, 0x18, 0x08, 0xcc, 0xd0, 0xa2, 0x60,
+	0xfd, 0x90, 0x44, 0xc3, 0xe4, 0x44, 0x8f, 0x13, 0xa9, 0xb6, 0xcb, 0x4c, 0x0a, 0x36, 0xa8, 0x26,
+	0x35, 0xa5, 0xcf, 0xe0, 0x5c, 0xe9, 0x9b, 0x76, 0xee, 0xd0, 0x09, 0xc6, 0x4a, 0x7f, 0x6c, 0x25,
+	0xb7, 0xfe, 0x65, 0x74, 0xbf, 0x7f, 0x99, 0xc0, 0xd0, 0xe0, 0xd7, 0x12, 0x15, 0x47, 0x06, 0xae,
+	0x69, 0xc3, 0xe9, 0x14, 0xfc, 0xe6, 0x1e, 0xca, 0x30, 0x3f, 0x24, 0xd1, 0x59, 0xd2, 0x5c, 0xed,
+	0x43, 0xfd, 0xf4, 0x97, 0x4f, 0xf6, 0xbf, 0x83, 0xce, 0xfe, 0x10, 0x90, 0x1f, 0x87, 0x80, 0xfc,
+	0x3a, 0x04, 0x9d, 0xbb, 0x3f, 0x01, 0x49, 0xfb, 0x2e, 0xf8, 0xf5, 0xbf, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0x2a, 0xae, 0x24, 0x77, 0xb3, 0x02, 0x00, 0x00,
 }

lib/discover/local.go

@@ -5,7 +5,7 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
 //go:generate go run ../../script/protofmt.go local.proto
-//go:generate protoc --proto_path=../../../../../:../../../../gogo/protobuf/protobuf:. --gogofast_out=. local.proto
+//go:generate protoc -I ../../../../../ -I ../../../../gogo/protobuf/protobuf -I . --gogofast_out=. local.proto
 
 package discover
 

lib/discover/local.pb.go

@@ -382,20 +382,21 @@ var (
 )
 
 var fileDescriptorLocal = []byte{
-	// 235 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0xce, 0xc9, 0x4f, 0x4e,
-	0xcc, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x48, 0xc9, 0x2c, 0x4e, 0xce, 0x2f, 0x4b,
-	0x2d, 0x92, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf,
-	0x4f, 0xcf, 0xd7, 0x07, 0x2b, 0x48, 0x2a, 0x4d, 0x03, 0xf3, 0xc0, 0x1c, 0x30, 0x0b, 0xa2, 0x51,
-	0x69, 0x2d, 0x23, 0x17, 0x87, 0x63, 0x5e, 0x5e, 0x7e, 0x69, 0x5e, 0x72, 0xaa, 0x50, 0x10, 0x17,
-	0x53, 0x66, 0x8a, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x8f, 0x93, 0xd3, 0x89, 0x7b, 0xf2, 0x0c, 0xb7,
-	0xee, 0xc9, 0x9b, 0x20, 0x99, 0x57, 0x5c, 0x99, 0x97, 0x5c, 0x92, 0x91, 0x99, 0x97, 0x8e, 0xc4,
-	0xca, 0xc9, 0x4c, 0x82, 0x58, 0x91, 0x9c, 0x9f, 0xa3, 0xe7, 0x92, 0x5a, 0x96, 0x99, 0x9c, 0xea,
-	0xe9, 0xf2, 0xe8, 0x9e, 0x3c, 0x93, 0xa7, 0x4b, 0x10, 0xd0, 0x34, 0x21, 0x19, 0x2e, 0xce, 0xc4,
-	0x94, 0x94, 0xa2, 0xd4, 0xe2, 0xe2, 0xd4, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0xce, 0x20, 0x84,
-	0x80, 0x90, 0x3e, 0x17, 0x77, 0x66, 0x5e, 0x71, 0x49, 0x22, 0xd0, 0xf6, 0x78, 0xa0, 0xd5, 0xcc,
-	0x40, 0xab, 0x99, 0x9d, 0xf8, 0x80, 0xda, 0xb9, 0x3c, 0xa1, 0xc2, 0x40, 0x63, 0xb8, 0x60, 0x4a,
-	0x3c, 0x53, 0x9c, 0x44, 0x4e, 0x3c, 0x94, 0x63, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0x02, 0x10, 0x3f,
-	0x78, 0x24, 0xc7, 0xb0, 0xe0, 0xb1, 0x1c, 0x63, 0x12, 0x1b, 0xd8, 0x05, 0xc6, 0x80, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xa4, 0x46, 0x4f, 0x13, 0x14, 0x01, 0x00, 0x00,
+	// 241 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8e, 0x4f, 0x4e, 0x84, 0x30,
+	0x14, 0xc6, 0x29, 0x24, 0x66, 0xa6, 0x63, 0x5c, 0x10, 0x17, 0xc4, 0x98, 0x42, 0x5c, 0xb1, 0x11,
+	0x16, 0x7a, 0x01, 0x09, 0x9b, 0x6e, 0xb9, 0x80, 0x81, 0xb6, 0x32, 0x2f, 0xc1, 0x3e, 0x43, 0x61,
+	0x12, 0x6f, 0xe3, 0x05, 0xbc, 0x07, 0x4b, 0xd7, 0x2e, 0x1a, 0xad, 0x17, 0x31, 0xe9, 0x68, 0x86,
+	0xdd, 0xf7, 0xfd, 0xf2, 0x7b, 0x7f, 0xe8, 0x6e, 0x40, 0xd1, 0x0e, 0xc5, 0xcb, 0x88, 0x13, 0xc6,
+	0x1b, 0x09, 0x46, 0xe0, 0x41, 0x8d, 0x57, 0xb7, 0x3d, 0x4c, 0xfb, 0xb9, 0x2b, 0x04, 0x3e, 0x97,
+	0x3d, 0xf6, 0x58, 0x7a, 0xa1, 0x9b, 0x9f, 0x7c, 0xf3, 0xc5, 0xa7, 0xe3, 0xe0, 0xcd, 0x3b, 0xa1,
+	0x9b, 0x07, 0xad, 0x71, 0xd6, 0x42, 0xc5, 0x0d, 0x0d, 0x41, 0x26, 0x24, 0x23, 0xf9, 0x79, 0x55,
+	0x2d, 0x36, 0x0d, 0x3e, 0x6d, 0x7a, 0xbf, 0xda, 0x67, 0x5e, 0xb5, 0x98, 0xf6, 0xa0, 0xfb, 0x55,
+	0x1a, 0xa0, 0x3b, 0x9e, 0x10, 0x38, 0x14, 0xb5, 0x3a, 0x80, 0x50, 0xbc, 0x76, 0x36, 0x0d, 0x79,
+	0xdd, 0x84, 0x20, 0xe3, 0x6b, 0xba, 0x6d, 0xa5, 0x1c, 0x95, 0x31, 0xca, 0x24, 0x61, 0x16, 0xe5,
+	0xdb, 0xe6, 0x04, 0xe2, 0x92, 0xee, 0x40, 0x9b, 0xa9, 0xd5, 0x42, 0x3d, 0x82, 0x4c, 0xa2, 0x8c,
+	0xe4, 0x51, 0x75, 0xe1, 0x6c, 0x4a, 0xf9, 0x1f, 0xe6, 0x75, 0x43, 0xff, 0x15, 0x2e, 0xab, 0xcb,
+	0xe5, 0x9b, 0x05, 0x8b, 0x63, 0xe4, 0xc3, 0x31, 0xf2, 0xe5, 0x58, 0xf0, 0xf6, 0xc3, 0x48, 0x77,
+	0xe6, 0x3f, 0xb8, 0xfb, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x46, 0x4f, 0x13, 0x14, 0x01, 0x00,
+	0x00,
 }

lib/protocol/bep.pb.go

@@ -3953,105 +3953,108 @@ var (
 )
 
 var fileDescriptorBep = []byte{
-	// 1598 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x6e, 0xdb, 0xc6,
-	0x16, 0xb6, 0x24, 0xea, 0x6f, 0x24, 0x3b, 0xf2, 0xc4, 0x71, 0x74, 0x19, 0xc7, 0xf6, 0x65, 0x92,
-	0x7b, 0x7d, 0x85, 0x1b, 0xe7, 0xde, 0xa4, 0x6d, 0x80, 0x02, 0x2d, 0x20, 0x4b, 0xb4, 0x23, 0x44,
-	0xa6, 0x14, 0x4a, 0x72, 0x9a, 0x2e, 0x2a, 0x48, 0xe2, 0x48, 0x26, 0x42, 0x71, 0x54, 0x52, 0x4a,
-	0xe2, 0x3e, 0x42, 0xfb, 0x02, 0xdd, 0x14, 0x08, 0xba, 0xeb, 0xb6, 0xe8, 0x43, 0x64, 0x19, 0x64,
-	0xd9, 0x45, 0xd0, 0xa6, 0x9b, 0xbe, 0x40, 0xf7, 0x3d, 0x3c, 0x43, 0x52, 0x94, 0x7f, 0x8a, 0x2c,
-	0xba, 0x30, 0x34, 0x73, 0xce, 0x37, 0xe7, 0xcc, 0xf9, 0xce, 0xcf, 0xd0, 0x24, 0xdb, 0x67, 0x93,
-	0xdd, 0x89, 0xc3, 0xa7, 0x9c, 0x66, 0xf0, 0x67, 0xc0, 0x2d, 0xf9, 0xf6, 0xc8, 0x9c, 0x1e, 0xcf,
-	0xfa, 0xbb, 0x03, 0x3e, 0xbe, 0x33, 0xe2, 0x23, 0x7e, 0x07, 0x35, 0xfd, 0xd9, 0x10, 0x77, 0xb8,
-	0xc1, 0x95, 0x38, 0xa8, 0x4c, 0x48, 0xf2, 0x01, 0xb3, 0x2c, 0x4e, 0xb7, 0x48, 0xce, 0x60, 0xcf,
-	0xcc, 0x01, 0xeb, 0xda, 0xbd, 0x31, 0x2b, 0xc6, 0xb6, 0x63, 0x3b, 0x59, 0x9d, 0x08, 0x91, 0x06,
-	0x12, 0x0f, 0x30, 0xb0, 0x4c, 0x66, 0x4f, 0x05, 0x20, 0x2e, 0x00, 0x42, 0x84, 0x80, 0x5b, 0x64,
-	0xc5, 0x07, 0x3c, 0x63, 0x8e, 0x6b, 0x72, 0xbb, 0x98, 0x40, 0xcc, 0xb2, 0x90, 0x1e, 0x09, 0xa1,
-	0xe2, 0x92, 0xd4, 0x03, 0xd6, 0x33, 0x98, 0x43, 0xff, 0x43, 0xa4, 0xe9, 0xc9, 0x44, 0xf8, 0x5a,
-	0xb9, 0x7b, 0x65, 0x37, 0x88, 0x61, 0xf7, 0x90, 0xb9, 0x6e, 0x6f, 0xc4, 0xda, 0xa0, 0xd4, 0x11,
-	0x42, 0x3f, 0x05, 0xe7, 0x7c, 0x3c, 0x71, 0x40, 0xe1, 0x19, 0x8e, 0xe3, 0x89, 0x8d, 0x33, 0x27,
-	0x2a, 0x73, 0x8c, 0x1e, 0x3d, 0xa0, 0x94, 0xc9, 0x72, 0xc5, 0x9a, 0xb9, 0x53, 0xe6, 0x54, 0xb8,
-	0x3d, 0x34, 0x47, 0xf4, 0x7f, 0x24, 0x3d, 0xe4, 0x16, 0xdc, 0xc2, 0x05, 0xf7, 0x89, 0x9d, 0xdc,
-	0xdd, 0xc2, 0xdc, 0xd8, 0x3e, 0x2a, 0xf6, 0xa4, 0x57, 0x6f, 0xb7, 0x96, 0xf4, 0x00, 0xa6, 0x7c,
-	0x13, 0x27, 0x29, 0xa1, 0xa1, 0xeb, 0x24, 0x6e, 0x1a, 0x82, 0xa2, 0xbd, 0xd4, 0xbb, 0xb7, 0x5b,
-	0xf1, 0x5a, 0x55, 0x07, 0x09, 0x5d, 0x23, 0x49, 0xab, 0xd7, 0x67, 0x96, 0x4f, 0x8e, 0xd8, 0xd0,
-	0x6b, 0x24, 0xeb, 0x40, 0xc0, 0x5d, 0x6e, 0x5b, 0x27, 0x48, 0x49, 0x46, 0xcf, 0x78, 0x82, 0x06,
-	0xec, 0xe9, 0x6d, 0x42, 0xcd, 0x91, 0xcd, 0x1d, 0xd6, 0x9d, 0x30, 0x67, 0x6c, 0xe2, 0x6d, 0xdd,
-	0xa2, 0x84, 0xa8, 0x55, 0xa1, 0x69, 0xce, 0x15, 0xf4, 0x06, 0x59, 0xf6, 0xe1, 0x06, 0xb3, 0xd8,
-	0x94, 0x15, 0x93, 0x88, 0xcc, 0x0b, 0x61, 0x15, 0x65, 0x10, 0xdb, 0x9a, 0x61, 0xba, 0xbd, 0xbe,
-	0xc5, 0xba, 0x53, 0x36, 0x9e, 0x74, 0x4d, 0xdb, 0x60, 0x2f, 0x98, 0x5b, 0x4c, 0x21, 0x96, 0xfa,
-	0xba, 0x36, 0xa8, 0x6a, 0x42, 0xe3, 0xb1, 0x21, 0x32, 0xed, 0x16, 0x0b, 0xa7, 0xd9, 0xa8, 0xa2,
-	0x22, 0x60, 0xc3, 0x87, 0x29, 0x3f, 0x02, 0x1b, 0x42, 0x43, 0xff, 0x15, 0xb2, 0x91, 0xdf, 0x5b,
-	0xf7, 0x50, 0x3f, 0xbf, 0xdd, 0xca, 0x08, 0x5d, 0xad, 0x1a, 0x61, 0x87, 0x12, 0x29, 0x52, 0x39,
-	0xb8, 0xa6, 0x1b, 0x24, 0xdb, 0x33, 0x0c, 0x2f, 0x4b, 0xe0, 0x3a, 0x01, 0xae, 0xb3, 0xfa, 0x5c,
-	0x40, 0xef, 0x2f, 0x66, 0x5d, 0x3a, 0x5d, 0x27, 0x17, 0xa5, 0xdb, 0xa3, 0x7c, 0xc0, 0x1c, 0xbf,
-	0x52, 0x93, 0xe8, 0x2f, 0xe3, 0x09, 0xb0, 0x4e, 0xff, 0x49, 0xf2, 0xe3, 0xde, 0x8b, 0xae, 0xcb,
-	0xbe, 0x9c, 0x31, 0x7b, 0xc0, 0x90, 0x96, 0x84, 0x9e, 0x03, 0x59, 0xcb, 0x17, 0xd1, 0x4d, 0x42,
-	0x4c, 0x7b, 0xea, 0x70, 0x63, 0x06, 0xa7, 0x8a, 0x69, 0xe4, 0x2d, 0x22, 0xa1, 0x1f, 0x92, 0x0c,
-	0x92, 0xda, 0x85, 0xc0, 0x33, 0xa0, 0x95, 0xf6, 0x64, 0x3f, 0xf0, 0x34, 0x52, 0x8a, 0x71, 0x07,
-	0x4b, 0x3d, 0x8d, 0xd8, 0x9a, 0xa1, 0x34, 0x48, 0x12, 0x65, 0x50, 0x40, 0x29, 0x51, 0x56, 0x7e,
-	0x9f, 0xf9, 0x3b, 0xba, 0x4b, 0x92, 0x43, 0xd3, 0x02, 0x2a, 0xe2, 0x98, 0x05, 0x1a, 0xa9, 0x49,
-	0x10, 0xd7, 0xec, 0x21, 0xf7, 0xf3, 0x20, 0x60, 0x4a, 0x87, 0xe4, 0xd0, 0x60, 0x67, 0x62, 0xf4,
-	0x20, 0xf1, 0x7f, 0x97, 0xd9, 0xef, 0x13, 0x24, 0x13, 0x68, 0xc2, 0xb4, 0xc5, 0x22, 0x69, 0x2b,
-	0xf9, 0x9d, 0x2b, 0xfa, 0x70, 0xfd, 0xac, 0xbd, 0x48, 0xeb, 0xc2, 0x79, 0xd7, 0xfc, 0x8a, 0x61,
-	0xe5, 0x27, 0x74, 0x5c, 0xd3, 0x6d, 0x92, 0x3b, 0x5d, 0xee, 0xcb, 0x7a, 0x54, 0x44, 0xaf, 0x13,
-	0x32, 0xe6, 0x86, 0x39, 0x34, 0x99, 0xd1, 0x75, 0x31, 0x85, 0x09, 0x3d, 0x1b, 0x48, 0x5a, 0xb4,
-	0xe8, 0x15, 0xac, 0x57, 0xec, 0x86, 0x5f, 0xd5, 0xc1, 0xd6, 0xd3, 0x98, 0xf6, 0xb3, 0x9e, 0x05,
-	0x99, 0x11, 0x79, 0x0b, 0xb6, 0xde, 0x7c, 0xb2, 0xf9, 0x42, 0x9b, 0x65, 0x10, 0xb0, 0x6c, 0xf3,
-	0x68, 0x8b, 0x41, 0x2f, 0x04, 0xf3, 0x2b, 0x0b, 0xfa, 0x85, 0x5e, 0x38, 0x62, 0x83, 0x29, 0x0f,
-	0x27, 0x83, 0x0f, 0xa3, 0x32, 0xc9, 0x84, 0xc5, 0x44, 0xf0, 0xa6, 0xe1, 0xde, 0x9b, 0x9a, 0x61,
-	0x1c, 0xe0, 0x31, 0x07, 0xea, 0xa4, 0x1e, 0x86, 0xa6, 0xb9, 0xf4, 0xff, 0x24, 0xb5, 0x67, 0xf1,
-	0xc1, 0xd3, 0xa0, 0xf3, 0x2e, 0xcf, 0xbd, 0xa1, 0x3c, 0x92, 0x9d, 0x54, 0x1f, 0x81, 0x1f, 0x4b,
-	0xdf, 0xbe, 0xdc, 0x5a, 0x52, 0x1e, 0x91, 0x6c, 0x08, 0xf0, 0x32, 0xcf, 0x87, 0x43, 0x97, 0x4d,
-	0x31, 0x4d, 0x09, 0xdd, 0xdf, 0x85, 0xe4, 0xc7, 0xd1, 0xaf, 0x20, 0x1f, 0x64, 0xc7, 0x3d, 0xf7,
-	0x18, 0x13, 0x92, 0xd7, 0x71, 0xed, 0x9b, 0xfc, 0x84, 0xa4, 0x44, 0x84, 0xf4, 0x1e, 0xc9, 0x0c,
-	0xf8, 0xcc, 0x9e, 0xce, 0xe7, 0xe3, 0x6a, 0xb4, 0xed, 0x50, 0xe3, 0xdf, 0x2a, 0x04, 0x2a, 0xfb,
-	0x24, 0xed, 0xab, 0x80, 0xeb, 0x60, 0x26, 0x48, 0x7b, 0x57, 0x82, 0xd6, 0x68, 0x1d, 0x73, 0x67,
-	0xba, 0x30, 0x12, 0x60, 0x60, 0x42, 0x6e, 0x66, 0xe2, 0x7e, 0x92, 0x2e, 0x36, 0xca, 0x4f, 0x31,
-	0x92, 0xd6, 0x3d, 0x02, 0xdd, 0x69, 0x64, 0xd4, 0x26, 0x17, 0x46, 0xed, 0xbc, 0xd4, 0xe3, 0x0b,
-	0xa5, 0x1e, 0x54, 0x6b, 0x22, 0x52, 0xad, 0x73, 0x72, 0xa4, 0x73, 0xc9, 0x49, 0x9e, 0x43, 0x4e,
-	0x6a, 0x4e, 0x8e, 0x57, 0x38, 0x43, 0x87, 0x8f, 0x71, 0x98, 0x72, 0xa7, 0xe7, 0x9c, 0xf8, 0x95,
-	0xb5, 0xec, 0x49, 0xdb, 0x81, 0x50, 0xe9, 0x92, 0x8c, 0xce, 0xdc, 0x09, 0xd4, 0x10, 0xbb, 0xf0,
-	0xda, 0x60, 0x1e, 0x3a, 0xb5, 0x87, 0x97, 0x06, 0xf3, 0xde, 0x9a, 0xfe, 0x9b, 0x48, 0x03, 0x6e,
-	0x88, 0x2b, 0xaf, 0x44, 0xf3, 0xaf, 0x3a, 0x0e, 0x87, 0xf7, 0xca, 0x80, 0x4e, 0xf2, 0x00, 0xf0,
-	0x56, 0x17, 0xaa, 0xfc, 0xb9, 0x6d, 0xf1, 0x9e, 0xd1, 0x74, 0xf8, 0xc8, 0x1b, 0x76, 0x17, 0xb6,
-	0x7c, 0x95, 0xa4, 0x67, 0x38, 0x14, 0x82, 0xa6, 0xbf, 0xb9, 0xd8, 0xa4, 0xa7, 0x0d, 0x89, 0x09,
-	0x12, 0x54, 0xb6, 0x7f, 0x54, 0x79, 0x13, 0x23, 0xf2, 0xc5, 0x68, 0x5a, 0x23, 0x39, 0x81, 0xec,
-	0x46, 0xde, 0xf1, 0x9d, 0xf7, 0x71, 0x84, 0xf3, 0x81, 0xcc, 0xc2, 0xf5, 0xb9, 0x8f, 0x43, 0xa4,
-	0x13, 0x13, 0xef, 0xd7, 0x89, 0xf0, 0x3c, 0x62, 0x8f, 0x84, 0x4f, 0x9e, 0x04, 0xb1, 0x27, 0xf5,
-	0x7c, 0x5f, 0x34, 0x0a, 0xca, 0x94, 0x14, 0x91, 0x9a, 0xa6, 0x3d, 0x52, 0xb6, 0x48, 0xb2, 0x62,
-	0x71, 0x4c, 0x56, 0x0a, 0xde, 0x63, 0x17, 0xdc, 0xf8, 0x1c, 0x8a, 0x5d, 0xe9, 0x4d, 0x9c, 0xe4,
-	0x22, 0x9f, 0x22, 0x70, 0x9f, 0x95, 0x4a, 0xbd, 0xd3, 0x6a, 0xab, 0x7a, 0xb7, 0xd2, 0xd0, 0xf6,
-	0x6b, 0x07, 0x85, 0x25, 0x79, 0xe3, 0xeb, 0xef, 0xb6, 0x8b, 0xe3, 0x39, 0x68, 0xf1, 0x2b, 0x03,
-	0x5c, 0xd4, 0xb4, 0xaa, 0xfa, 0x59, 0x21, 0x26, 0xaf, 0x01, 0xb0, 0x10, 0x01, 0x8a, 0x87, 0xe0,
-	0xbf, 0x24, 0x8f, 0x80, 0x6e, 0xa7, 0x59, 0x2d, 0xb7, 0xd5, 0x42, 0x5c, 0x96, 0x01, 0xb7, 0x7e,
-	0x1a, 0xe7, 0xf3, 0x7d, 0x03, 0xfa, 0x42, 0x7d, 0xd4, 0x51, 0x5b, 0xed, 0x42, 0x42, 0x5e, 0x07,
-	0x20, 0x8d, 0x00, 0x83, 0x8e, 0xb9, 0x05, 0x65, 0xa8, 0xb6, 0x9a, 0x0d, 0xad, 0xa5, 0x16, 0x24,
-	0xf9, 0x2a, 0xa0, 0x2e, 0x2f, 0xa0, 0xfc, 0x0a, 0xfd, 0x88, 0xac, 0x56, 0x1b, 0x8f, 0xb5, 0x7a,
-	0xa3, 0x5c, 0xed, 0x36, 0xf5, 0xc6, 0x01, 0x9c, 0x69, 0x15, 0x92, 0xf2, 0x16, 0xe0, 0xaf, 0x45,
-	0xf0, 0x67, 0x0a, 0xee, 0x3a, 0xb0, 0x57, 0xd3, 0x0e, 0x0a, 0x29, 0xf9, 0x32, 0x40, 0x2f, 0x45,
-	0xa0, 0x1e, 0xa9, 0x5e, 0xc4, 0x95, 0x7a, 0x03, 0x5c, 0xa7, 0xcf, 0x44, 0x8c, 0x64, 0x97, 0xbe,
-	0x20, 0xf4, 0xec, 0xc7, 0x1a, 0xbd, 0x49, 0x24, 0xad, 0xa1, 0xa9, 0x40, 0x28, 0xc6, 0x7f, 0x16,
-	0xa1, 0x71, 0x9b, 0x51, 0x85, 0x24, 0xea, 0x9f, 0x7f, 0x00, 0x64, 0xfe, 0x03, 0x40, 0x57, 0xce,
-	0x82, 0x40, 0x59, 0xe2, 0x24, 0x17, 0x35, 0xac, 0x90, 0xcc, 0xa1, 0xda, 0x2e, 0x03, 0xb9, 0x65,
-	0x30, 0x8e, 0x57, 0x0a, 0xd4, 0x87, 0x6c, 0xda, 0xc3, 0x06, 0xdc, 0x20, 0x49, 0x4d, 0x3d, 0x52,
-	0x75, 0x30, 0xbc, 0x0a, 0x80, 0xe5, 0x00, 0xa0, 0x31, 0xa8, 0x2b, 0xf8, 0x16, 0x48, 0x95, 0xeb,
-	0x8f, 0xcb, 0x4f, 0x5a, 0x90, 0x1c, 0x0a, 0xea, 0x95, 0x40, 0x5d, 0xb6, 0x9e, 0xf7, 0x4e, 0xdc,
-	0xd2, 0x1f, 0x31, 0x92, 0x8f, 0x3e, 0x7b, 0x70, 0x40, 0xda, 0xaf, 0xd5, 0xd5, 0xc0, 0x5d, 0x54,
-	0xe7, 0xad, 0xe9, 0x0e, 0xc9, 0x56, 0x6b, 0xba, 0x5a, 0x69, 0x37, 0xf4, 0x27, 0x41, 0x2c, 0x51,
-	0x50, 0xd5, 0x74, 0xb0, 0xb8, 0xbd, 0x8f, 0xc3, 0x7c, 0xeb, 0xc9, 0x61, 0xbd, 0xa6, 0x3d, 0xec,
-	0xa2, 0xc5, 0xb8, 0x7c, 0x0d, 0xc0, 0x57, 0xa3, 0xe0, 0xd6, 0xc9, 0xd8, 0x32, 0xed, 0xa7, 0x68,
-	0xf8, 0x3e, 0x59, 0x0d, 0xe0, 0x73, 0x07, 0x09, 0x79, 0x1b, 0xce, 0x6c, 0x9c, 0x73, 0x66, 0xee,
-	0xe7, 0x1e, 0xb9, 0x14, 0x1c, 0xec, 0x68, 0x0f, 0x35, 0x28, 0x0b, 0xa8, 0x9c, 0x4d, 0x38, 0x26,
-	0x9f, 0x73, 0xac, 0x63, 0x3f, 0xb5, 0xa1, 0x28, 0x4a, 0x3f, 0xc4, 0x48, 0x36, 0x9c, 0x50, 0x1e,
-	0xcf, 0x5a, 0xa3, 0xab, 0xea, 0x7a, 0x43, 0x0f, 0x02, 0x0f, 0x95, 0x1a, 0xc7, 0x25, 0x7c, 0x78,
-	0xa5, 0x0f, 0x54, 0x4d, 0xd5, 0x6b, 0x95, 0xa0, 0x1f, 0x42, 0xc8, 0x01, 0xb3, 0x99, 0x63, 0x0e,
-	0xe0, 0x5f, 0x82, 0x3c, 0x98, 0x69, 0x75, 0x2a, 0x0f, 0x82, 0x88, 0xb1, 0x80, 0x23, 0xa6, 0x5a,
-	0xb3, 0xc1, 0x31, 0x46, 0x5b, 0xf2, 0x5a, 0xe7, 0xa8, 0x5c, 0xaf, 0x55, 0x05, 0x34, 0x21, 0x17,
-	0x01, 0xba, 0x16, 0x42, 0x6b, 0xe2, 0xd9, 0xf7, 0xb0, 0x25, 0x83, 0x6c, 0xfe, 0xf5, 0x2c, 0x82,
-	0x2f, 0x92, 0x54, 0xb9, 0xd9, 0x54, 0xb5, 0x6a, 0x70, 0xfb, 0xb9, 0xae, 0x3c, 0x99, 0x30, 0xdb,
-	0xf0, 0x10, 0xfb, 0x0d, 0xfd, 0x40, 0x6d, 0x07, 0x97, 0x9f, 0x23, 0xf6, 0xb9, 0x33, 0x62, 0xd3,
-	0xbd, 0x8d, 0x57, 0xbf, 0x6e, 0x2e, 0xbd, 0x86, 0xbf, 0x57, 0xef, 0x36, 0x63, 0xaf, 0xe1, 0xef,
-	0x97, 0x77, 0x9b, 0x4b, 0xbf, 0xc3, 0xef, 0xcb, 0xdf, 0x36, 0x63, 0xfd, 0x14, 0xce, 0xae, 0x7b,
-	0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x96, 0x0b, 0xf7, 0x15, 0xb6, 0x0d, 0x00, 0x00,
+	// 1635 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x73, 0xdb, 0xc6,
+	0x15, 0x17, 0x48, 0x10, 0x24, 0x1f, 0x29, 0x05, 0x5a, 0xcb, 0x0a, 0x0b, 0x2b, 0x14, 0x02, 0xc7,
+	0xad, 0xa2, 0x69, 0x14, 0x37, 0x4e, 0x9b, 0x99, 0xce, 0xb4, 0x33, 0x14, 0x09, 0xc9, 0x9c, 0xd0,
+	0x20, 0xb3, 0xa4, 0xec, 0x3a, 0x87, 0x62, 0x40, 0x62, 0x49, 0x61, 0x0c, 0x62, 0x59, 0x00, 0x94,
+	0xad, 0x7e, 0x04, 0xf6, 0x0b, 0xf4, 0xc2, 0x99, 0x4c, 0x6f, 0xbd, 0x76, 0xfa, 0x21, 0x7c, 0xcc,
+	0xe4, 0xd8, 0x83, 0xa7, 0x51, 0x2f, 0xfd, 0x02, 0xbd, 0x77, 0xb0, 0x0b, 0x80, 0xa0, 0xfe, 0x74,
+	0x7c, 0xe8, 0x89, 0xbb, 0xef, 0xfd, 0xf6, 0xed, 0xbe, 0xdf, 0xfb, 0xbd, 0x07, 0x42, 0x79, 0x48,
+	0x66, 0x47, 0x33, 0x9f, 0x86, 0x14, 0x95, 0xd8, 0xcf, 0x88, 0xba, 0xca, 0x67, 0x13, 0x27, 0x3c,
+	0x9f, 0x0f, 0x8f, 0x46, 0x74, 0xfa, 0xf9, 0x84, 0x4e, 0xe8, 0xe7, 0xcc, 0x33, 0x9c, 0x8f, 0xd9,
+	0x8e, 0x6d, 0xd8, 0x8a, 0x1f, 0xd4, 0x66, 0x50, 0x78, 0x4a, 0x5c, 0x97, 0xa2, 0x7d, 0xa8, 0xd8,
+	0xe4, 0xc2, 0x19, 0x11, 0xd3, 0xb3, 0xa6, 0xa4, 0x26, 0xa8, 0xc2, 0x41, 0x19, 0x03, 0x37, 0x19,
+	0xd6, 0x94, 0x44, 0x80, 0x91, 0xeb, 0x10, 0x2f, 0xe4, 0x80, 0x1c, 0x07, 0x70, 0x13, 0x03, 0x3c,
+	0x82, 0xad, 0x18, 0x70, 0x41, 0xfc, 0xc0, 0xa1, 0x5e, 0x2d, 0xcf, 0x30, 0x9b, 0xdc, 0xfa, 0x9c,
+	0x1b, 0xb5, 0x00, 0xa4, 0xa7, 0xc4, 0xb2, 0x89, 0x8f, 0x3e, 0x05, 0x31, 0xbc, 0x9c, 0xf1, 0xbb,
+	0xb6, 0xbe, 0xb8, 0x7f, 0x94, 0xe4, 0x70, 0xf4, 0x8c, 0x04, 0x81, 0x35, 0x21, 0x83, 0xcb, 0x19,
+	0xc1, 0x0c, 0x82, 0x7e, 0x0b, 0x95, 0x11, 0x9d, 0xce, 0x7c, 0x12, 0xb0, 0xc0, 0x39, 0x76, 0x62,
+	0xef, 0xc6, 0x89, 0xe6, 0x0a, 0x83, 0xb3, 0x07, 0xb4, 0x06, 0x6c, 0x36, 0xdd, 0x79, 0x10, 0x12,
+	0xbf, 0x49, 0xbd, 0xb1, 0x33, 0x41, 0x8f, 0xa1, 0x38, 0xa6, 0xae, 0x4d, 0xfc, 0xa0, 0x26, 0xa8,
+	0xf9, 0x83, 0xca, 0x17, 0xf2, 0x2a, 0xd8, 0x09, 0x73, 0x1c, 0x8b, 0x6f, 0xdf, 0xed, 0x6f, 0xe0,
+	0x04, 0xa6, 0xfd, 0x29, 0x07, 0x12, 0xf7, 0xa0, 0x5d, 0xc8, 0x39, 0x36, 0xa7, 0xe8, 0x58, 0xba,
+	0x7a, 0xb7, 0x9f, 0x6b, 0xb7, 0x70, 0xce, 0xb1, 0xd1, 0x0e, 0x14, 0x5c, 0x6b, 0x48, 0xdc, 0x98,
+	0x1c, 0xbe, 0x41, 0x0f, 0xa0, 0xec, 0x13, 0xcb, 0x36, 0xa9, 0xe7, 0x5e, 0x32, 0x4a, 0x4a, 0xb8,
+	0x14, 0x19, 0xba, 0x9e, 0x7b, 0x89, 0x3e, 0x03, 0xe4, 0x4c, 0x3c, 0xea, 0x13, 0x73, 0x46, 0xfc,
+	0xa9, 0xc3, 0x5e, 0x1b, 0xd4, 0x44, 0x86, 0xda, 0xe6, 0x9e, 0xde, 0xca, 0x81, 0x1e, 0xc2, 0x66,
+	0x0c, 0xb7, 0x89, 0x4b, 0x42, 0x52, 0x2b, 0x30, 0x64, 0x95, 0x1b, 0x5b, 0xcc, 0x86, 0x1e, 0xc3,
+	0x8e, 0xed, 0x04, 0xd6, 0xd0, 0x25, 0x66, 0x48, 0xa6, 0x33, 0xd3, 0xf1, 0x6c, 0xf2, 0x86, 0x04,
+	0x35, 0x89, 0x61, 0x51, 0xec, 0x1b, 0x90, 0xe9, 0xac, 0xcd, 0x3d, 0x11, 0x1b, 0xbc, 0xd2, 0x41,
+	0x4d, 0xbe, 0xce, 0x46, 0x8b, 0x39, 0x12, 0x36, 0x62, 0x98, 0xf6, 0xb7, 0x1c, 0x48, 0xdc, 0x83,
+	0x7e, 0x9a, 0xb2, 0x51, 0x3d, 0xde, 0x8d, 0x50, 0xff, 0x78, 0xb7, 0x5f, 0xe2, 0xbe, 0x76, 0x2b,
+	0xc3, 0x0e, 0x02, 0x31, 0xa3, 0x1c, 0xb6, 0x46, 0x7b, 0x50, 0xb6, 0x6c, 0x3b, 0xaa, 0x12, 0x09,
+	0x6a, 0x79, 0x35, 0x7f, 0x50, 0xc6, 0x2b, 0x03, 0xfa, 0x6a, 0xbd, 0xea, 0xe2, 0x75, 0x9d, 0xdc,
+	0x55, 0xee, 0x88, 0xf2, 0x11, 0xf1, 0x63, 0xa5, 0x16, 0xd8, 0x7d, 0xa5, 0xc8, 0xc0, 0x74, 0xfa,
+	0x31, 0x54, 0xa7, 0xd6, 0x1b, 0x33, 0x20, 0x7f, 0x98, 0x13, 0x6f, 0x44, 0x18, 0x2d, 0x79, 0x5c,
+	0x99, 0x5a, 0x6f, 0xfa, 0xb1, 0x09, 0xd5, 0x01, 0x1c, 0x2f, 0xf4, 0xa9, 0x3d, 0x1f, 0x11, 0xbf,
+	0x56, 0x64, 0xbc, 0x65, 0x2c, 0xe8, 0x97, 0x50, 0x62, 0xa4, 0x9a, 0x8e, 0x5d, 0x2b, 0xa9, 0xc2,
+	0x81, 0x78, 0xac, 0xc4, 0x89, 0x17, 0x19, 0xa5, 0x2c, 0xef, 0x64, 0x89, 0x8b, 0x0c, 0xdb, 0xb6,
+	0xb5, 0x2e, 0x14, 0x98, 0x0d, 0xed, 0x82, 0xc4, 0x65, 0x15, 0xf7, 0x59, 0xbc, 0x43, 0x47, 0x50,
+	0x18, 0x3b, 0x2e, 0x09, 0x6a, 0x39, 0x56, 0x05, 0x94, 0xd1, 0xa4, 0xe3, 0x92, 0xb6, 0x37, 0xa6,
+	0x71, 0x1d, 0x38, 0x4c, 0x3b, 0x83, 0x0a, 0x0b, 0x78, 0x36, 0xb3, 0xad, 0x90, 0xfc, 0xdf, 0xc2,
+	0xfe, 0x25, 0x0f, 0xa5, 0xc4, 0x93, 0x96, 0x4d, 0xc8, 0x94, 0xed, 0x30, 0xee, 0x5c, 0xde, 0x87,
+	0xbb, 0x37, 0xe3, 0x65, 0x5a, 0x17, 0x81, 0x18, 0x38, 0x7f, 0x24, 0x4c, 0xf9, 0x79, 0xcc, 0xd6,
+	0x48, 0x85, 0xca, 0x75, 0xb9, 0x6f, 0xe2, 0xac, 0x09, 0x7d, 0x04, 0x30, 0xa5, 0xb6, 0x33, 0x76,
+	0x88, 0x6d, 0x06, 0xac, 0x84, 0x79, 0x5c, 0x4e, 0x2c, 0x7d, 0x54, 0x8b, 0x04, 0x1b, 0x89, 0xdd,
+	0x8e, 0x55, 0x9d, 0x6c, 0x23, 0x8f, 0xe3, 0x5d, 0x58, 0xae, 0x63, 0xc7, 0x75, 0x4b, 0xb6, 0xd1,
+	0x7c, 0xf2, 0xe8, 0x5a, 0x9b, 0x95, 0x18, 0x60, 0xd3, 0xa3, 0xd9, 0x16, 0x7b, 0x0c, 0xc5, 0x64,
+	0x7e, 0x95, 0x55, 0x61, 0xbd, 0x17, 0x9e, 0x93, 0x51, 0x48, 0xd3, 0xc9, 0x10, 0xc3, 0x90, 0x02,
+	0xa5, 0x54, 0x4c, 0xc0, 0x5e, 0x9a, 0xee, 0xa3, 0xa9, 0x99, 0xe6, 0xe1, 0x05, 0xb5, 0x8a, 0x2a,
+	0x1c, 0x14, 0x70, 0x9a, 0x9a, 0x11, 0xa0, 0x5f, 0x80, 0x74, 0xec, 0xd2, 0xd1, 0xab, 0xa4, 0xf3,
+	0xee, 0xad, 0x6e, 0x63, 0xf6, 0x4c, 0x75, 0xa4, 0x21, 0x03, 0xfe, 0x5a, 0xfc, 0xf3, 0x77, 0xfb,
+	0x1b, 0xda, 0x37, 0x50, 0x4e, 0x01, 0x51, 0xe5, 0xe9, 0x78, 0x1c, 0x90, 0x90, 0x95, 0x29, 0x8f,
+	0xe3, 0x5d, 0x4a, 0x7e, 0x8e, 0xdd, 0xcb, 0xc9, 0x47, 0x20, 0x9e, 0x5b, 0xc1, 0x39, 0x2b, 0x48,
+	0x15, 0xb3, 0x75, 0x1c, 0xf2, 0x37, 0x20, 0xf1, 0x0c, 0xd1, 0x13, 0x28, 0x8d, 0xe8, 0xdc, 0x0b,
+	0x57, 0xf3, 0x71, 0x3b, 0xdb, 0x76, 0xcc, 0x13, 0xbf, 0x2a, 0x05, 0x6a, 0x27, 0x50, 0x8c, 0x5d,
+	0xe8, 0x51, 0x3a, 0x13, 0xc4, 0xe3, 0xfb, 0x49, 0x6b, 0xf4, 0xcf, 0xa9, 0x1f, 0xae, 0x8d, 0x84,
+	0x1d, 0x28, 0x5c, 0x58, 0xee, 0x9c, 0xbf, 0x4f, 0xc4, 0x7c, 0xa3, 0xfd, 0x5d, 0x80, 0x22, 0x8e,
+	0x08, 0x0c, 0xc2, 0xcc, 0xa8, 0x2d, 0xac, 0x8d, 0xda, 0x95, 0xd4, 0x73, 0x6b, 0x52, 0x4f, 0xd4,
+	0x9a, 0xcf, 0xa8, 0x75, 0x45, 0x8e, 0x78, 0x2b, 0x39, 0x85, 0x5b, 0xc8, 0x91, 0x56, 0xe4, 0x44,
+	0xc2, 0x19, 0xfb, 0x74, 0xca, 0x86, 0x29, 0xf5, 0x2d, 0xff, 0x32, 0x56, 0xd6, 0x66, 0x64, 0x1d,
+	0x24, 0x46, 0xcd, 0x84, 0x12, 0x26, 0xc1, 0x8c, 0x7a, 0x01, 0xb9, 0xf3, 0xd9, 0x08, 0x44, 0xdb,
+	0x0a, 0x2d, 0xf6, 0xe8, 0x2a, 0x66, 0x6b, 0xf4, 0x33, 0x10, 0x47, 0xd4, 0xe6, 0x4f, 0xde, 0xca,
+	0xd6, 0x5f, 0xf7, 0x7d, 0xea, 0x37, 0xa9, 0x4d, 0x30, 0x03, 0x68, 0x33, 0x90, 0x5b, 0xf4, 0xb5,
+	0xe7, 0x52, 0xcb, 0xee, 0xf9, 0x74, 0x12, 0x0d, 0xbb, 0x3b, 0x5b, 0xbe, 0x05, 0xc5, 0x39, 0x1b,
+	0x0a, 0x49, 0xd3, 0x7f, 0xb2, 0xde, 0xa4, 0xd7, 0x03, 0xf1, 0x09, 0x92, 0x28, 0x3b, 0x3e, 0xaa,
+	0xfd, 0x20, 0x80, 0x72, 0x37, 0x1a, 0xb5, 0xa1, 0xc2, 0x91, 0x66, 0xe6, 0x3b, 0x7e, 0xf0, 0x3e,
+	0x17, 0xb1, 0xf9, 0x00, 0xf3, 0x74, 0x7d, 0xeb, 0xc7, 0x21, 0xd3, 0x89, 0xf9, 0xf7, 0xeb, 0xc4,
+	0x87, 0xb0, 0xc9, 0x7a, 0x24, 0xfd, 0xe4, 0x89, 0x6a, 0xfe, 0xa0, 0x80, 0xab, 0x43, 0xde, 0x28,
+	0xcc, 0xa6, 0x49, 0x20, 0xf6, 0x1c, 0x6f, 0xa2, 0xed, 0x43, 0xa1, 0xe9, 0x52, 0x56, 0x2c, 0xc9,
+	0x27, 0x56, 0x40, 0xbd, 0x84, 0x43, 0xbe, 0x3b, 0xfc, 0x21, 0x07, 0x95, 0xcc, 0x5f, 0x11, 0xf4,
+	0x18, 0xb6, 0x9a, 0x9d, 0xb3, 0xfe, 0x40, 0xc7, 0x66, 0xb3, 0x6b, 0x9c, 0xb4, 0x4f, 0xe5, 0x0d,
+	0x65, 0x6f, 0xb1, 0x54, 0x6b, 0xd3, 0x15, 0x68, 0xfd, 0x5f, 0xc6, 0x3e, 0x14, 0xda, 0x46, 0x4b,
+	0xff, 0x9d, 0x2c, 0x28, 0x3b, 0x8b, 0xa5, 0x2a, 0x67, 0x80, 0xfc, 0x43, 0xf0, 0x73, 0xa8, 0x32,
+	0x80, 0x79, 0xd6, 0x6b, 0x35, 0x06, 0xba, 0x9c, 0x53, 0x94, 0xc5, 0x52, 0xdd, 0xbd, 0x8e, 0x8b,
+	0xf9, 0x7e, 0x08, 0x45, 0xac, 0x7f, 0x73, 0xa6, 0xf7, 0x07, 0x72, 0x5e, 0xd9, 0x5d, 0x2c, 0x55,
+	0x94, 0x01, 0x26, 0x1d, 0xf3, 0x08, 0x4a, 0x58, 0xef, 0xf7, 0xba, 0x46, 0x5f, 0x97, 0x45, 0xe5,
+	0xc3, 0xc5, 0x52, 0xbd, 0xb7, 0x86, 0x8a, 0x15, 0xfa, 0x2b, 0xd8, 0x6e, 0x75, 0x5f, 0x18, 0x9d,
+	0x6e, 0xa3, 0x65, 0xf6, 0x70, 0xf7, 0x14, 0xeb, 0xfd, 0xbe, 0x5c, 0x50, 0xf6, 0x17, 0x4b, 0xf5,
+	0x41, 0x06, 0x7f, 0x43, 0x70, 0x1f, 0x81, 0xd8, 0x6b, 0x1b, 0xa7, 0xb2, 0xa4, 0xdc, 0x5b, 0x2c,
+	0xd5, 0x0f, 0x32, 0xd0, 0x88, 0xd4, 0x28, 0xe3, 0x66, 0xa7, 0xdb, 0xd7, 0xe5, 0xe2, 0x8d, 0x8c,
+	0x19, 0xd9, 0x87, 0xbf, 0x07, 0x74, 0xf3, 0xcf, 0x1a, 0xfa, 0x04, 0x44, 0xa3, 0x6b, 0xe8, 0xf2,
+	0x06, 0xcf, 0xff, 0x26, 0xc2, 0xa0, 0x1e, 0x41, 0x1a, 0xe4, 0x3b, 0xdf, 0x7e, 0x29, 0x0b, 0xca,
+	0x4f, 0x16, 0x4b, 0xf5, 0xfe, 0x4d, 0x50, 0xe7, 0xdb, 0x2f, 0x0f, 0x29, 0x54, 0xb2, 0x81, 0x35,
+	0x28, 0x3d, 0xd3, 0x07, 0x8d, 0x56, 0x63, 0xd0, 0x90, 0x37, 0xf8, 0x93, 0x12, 0xf7, 0x33, 0x12,
+	0x5a, 0xac, 0x01, 0xf7, 0xa0, 0x60, 0xe8, 0xcf, 0x75, 0x2c, 0x0b, 0xca, 0xf6, 0x62, 0xa9, 0x6e,
+	0x26, 0x00, 0x83, 0x5c, 0x10, 0x1f, 0xd5, 0x41, 0x6a, 0x74, 0x5e, 0x34, 0x5e, 0xf6, 0xe5, 0x9c,
+	0x82, 0x16, 0x4b, 0x75, 0x2b, 0x71, 0x37, 0xdc, 0xd7, 0xd6, 0x65, 0x70, 0xf8, 0x1f, 0x01, 0xaa,
+	0xd9, 0xcf, 0x1e, 0xaa, 0x83, 0x78, 0xd2, 0xee, 0xe8, 0xc9, 0x75, 0x59, 0x5f, 0xb4, 0x46, 0x07,
+	0x50, 0x6e, 0xb5, 0xb1, 0xde, 0x1c, 0x74, 0xf1, 0xcb, 0x24, 0x97, 0x2c, 0xa8, 0xe5, 0xf8, 0x4c,
+	0xdc, 0xd1, 0x9f, 0xc3, 0x6a, 0xff, 0xe5, 0xb3, 0x4e, 0xdb, 0xf8, 0xda, 0x64, 0x11, 0x73, 0xca,
+	0x83, 0xc5, 0x52, 0xfd, 0x30, 0x0b, 0xee, 0x5f, 0x4e, 0x5d, 0xc7, 0x7b, 0xc5, 0x02, 0x7f, 0x05,
+	0xdb, 0x09, 0x7c, 0x75, 0x41, 0x5e, 0x51, 0x17, 0x4b, 0x75, 0xef, 0x96, 0x33, 0xab, 0x7b, 0x9e,
+	0xc0, 0x07, 0xc9, 0xc1, 0x33, 0xe3, 0x6b, 0xa3, 0xfb, 0xc2, 0x90, 0x45, 0xa5, 0xbe, 0x58, 0xaa,
+	0xca, 0x2d, 0xc7, 0xce, 0xbc, 0x57, 0x1e, 0x7d, 0xed, 0x1d, 0xfe, 0x55, 0x80, 0x72, 0x3a, 0xa1,
+	0x22, 0x9e, 0x8d, 0xae, 0xa9, 0x63, 0xdc, 0xc5, 0x49, 0xe2, 0xa9, 0xd3, 0xa0, 0x6c, 0x89, 0x3e,
+	0x86, 0xe2, 0xa9, 0x6e, 0xe8, 0xb8, 0xdd, 0x4c, 0xfa, 0x21, 0x85, 0x9c, 0x12, 0x8f, 0xf8, 0xce,
+	0x08, 0x7d, 0x0a, 0x55, 0xa3, 0x6b, 0xf6, 0xcf, 0x9a, 0x4f, 0x93, 0x8c, 0x99, 0x80, 0x33, 0xa1,
+	0xfa, 0xf3, 0xd1, 0x39, 0xcb, 0xf6, 0x30, 0x6a, 0x9d, 0xe7, 0x8d, 0x4e, 0xbb, 0xc5, 0xa1, 0x79,
+	0xa5, 0xb6, 0x58, 0xaa, 0x3b, 0x29, 0xb4, 0xcd, 0x3f, 0xfb, 0x11, 0xf6, 0xd0, 0x86, 0xfa, 0xff,
+	0x9e, 0x45, 0x48, 0x05, 0xa9, 0xd1, 0xeb, 0xe9, 0x46, 0x2b, 0x79, 0xfd, 0xca, 0xd7, 0x98, 0xcd,
+	0x88, 0x67, 0x47, 0x88, 0x93, 0x2e, 0x3e, 0xd5, 0x07, 0xc9, 0xe3, 0x57, 0x88, 0x13, 0xea, 0x4f,
+	0x48, 0x78, 0xbc, 0xf7, 0xf6, 0xc7, 0xfa, 0xc6, 0xf7, 0x3f, 0xd6, 0x37, 0xde, 0x5e, 0xd5, 0x85,
+	0xef, 0xaf, 0xea, 0xc2, 0x3f, 0xaf, 0xea, 0x1b, 0xff, 0xbe, 0xaa, 0x0b, 0xdf, 0xfd, 0xab, 0x2e,
+	0x0c, 0x25, 0x36, 0xbb, 0x9e, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x96, 0x0b, 0xf7, 0x15, 0xb6,
+	0x0d, 0x00, 0x00,
 }

lib/protocol/bep.proto

@@ -1,4 +1,4 @@
-// protoc --proto_path=../../../../../:../../../../gogo/protobuf/protobuf:. --gogofast_out=. message.proto
+// protoc protoc -I ../../../../../ -I ../../../../gogo/protobuf/protobuf -I . --gogofast_out=. message.proto
 
 syntax = "proto3";
 

lib/protocol/bep_extensions.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2014 The Protocol Authors.
 
 //go:generate go run ../../script/protofmt.go bep.proto
-//go:generate protoc --proto_path=../../../../../:../../../../gogo/protobuf/protobuf:. --gogofast_out=. bep.proto
+//go:generate protoc -I ../../../../../ -I ../../../../gogo/protobuf/protobuf -I . --gogofast_out=. bep.proto
 
 package protocol
 

lib/protocol/deviceid_test.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2014 The Protocol Authors.
 
 //go:generate go run ../../script/protofmt.go deviceid_test.proto
-//go:generate protoc --proto_path=../../../../../:../../../../gogo/protobuf/protobuf:. --gogofast_out=. deviceid_test.proto
+//go:generate protoc -I ../../../../../ -I ../../../../gogo/protobuf/protobuf -I . --gogofast_out=. deviceid_test.proto
 
 package protocol
 

lib/protocol/deviceid_test.pb.go

@@ -427,16 +427,16 @@ var (
 )
 
 var fileDescriptorDeviceidTest = []byte{
-	// 171 bytes of a gzipped FileDescriptorProto
+	// 176 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x12, 0x4e, 0x49, 0x2d, 0xcb,
 	0x4c, 0x4e, 0xcd, 0x4c, 0x89, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
 	0xe2, 0x00, 0x53, 0xc9, 0xf9, 0x39, 0x52, 0xba, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9,
 	0xf9, 0xb9, 0xfa, 0xe9, 0xf9, 0xe9, 0xf9, 0xfa, 0x60, 0x99, 0xa4, 0xd2, 0x34, 0x30, 0x0f, 0xcc,
-	0x01, 0xb3, 0x20, 0x1a, 0x95, 0x54, 0xb9, 0xf8, 0x43, 0x80, 0xc6, 0xf8, 0xe7, 0xa4, 0xb8, 0x80,
-	0x8d, 0xf5, 0x74, 0x11, 0x12, 0xe2, 0x62, 0x01, 0x99, 0x2c, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x13,
-	0x04, 0x66, 0x2b, 0x99, 0x43, 0x94, 0xf9, 0xa5, 0x96, 0xc3, 0x95, 0xa9, 0x20, 0x2b, 0x73, 0x12,
-	0x38, 0x71, 0x4f, 0x9e, 0xe1, 0xd6, 0x3d, 0x79, 0x0e, 0x98, 0x3c, 0x44, 0xa3, 0x93, 0xcc, 0x89,
-	0x87, 0x72, 0x0c, 0x17, 0x80, 0xf8, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x40, 0xfc, 0xe0, 0x91, 0x1c,
-	0xc3, 0x0b, 0x20, 0x5e, 0xf0, 0x58, 0x8e, 0x31, 0x89, 0x0d, 0xec, 0x08, 0x63, 0x40, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x35, 0x9c, 0x00, 0x78, 0xd4, 0x00, 0x00, 0x00,
+	0x01, 0xb3, 0x20, 0x1a, 0x95, 0x54, 0xb9, 0xf8, 0x43, 0x52, 0x8b, 0x4b, 0xfc, 0x73, 0x52, 0x5c,
+	0xc0, 0xc6, 0x7a, 0xba, 0x08, 0x09, 0x71, 0xb1, 0x80, 0x4c, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0,
+	0x09, 0x02, 0xb3, 0x95, 0xcc, 0x21, 0xca, 0xfc, 0x52, 0xcb, 0xe1, 0xca, 0x54, 0x90, 0x95, 0x39,
+	0x09, 0x9c, 0xb8, 0x27, 0xcf, 0x70, 0xeb, 0x9e, 0x3c, 0x07, 0x4c, 0x1e, 0xa2, 0xd1, 0x49, 0xe6,
+	0xc4, 0x43, 0x39, 0x86, 0x0b, 0x0f, 0xe5, 0x18, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e,
+	0xf1, 0xc1, 0x23, 0x39, 0x86, 0x17, 0x8f, 0xe4, 0x18, 0x16, 0x3c, 0x96, 0x63, 0x4c, 0x62, 0x03,
+	0x3b, 0xc2, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x35, 0x9c, 0x00, 0x78, 0xd4, 0x00, 0x00, 0x00,
 }

script/protofmt.go

@@ -35,6 +35,8 @@ func main() {
 	if err := formatProto(in, out); err != nil {
 		log.Fatal(err)
 	}
+	in.Close()
+	out.Close()
 	if err := os.Rename(file+".tmp", file); err != nil {
 		log.Fatal(err)
 	}