diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go index 9ad5bd40e..fd79bbb56 100644 --- a/app/dispatcher/config.pb.go +++ b/app/dispatcher/config.pb.go @@ -55,7 +55,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/app/dispatcher/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 215 bytes of a gzipped FileDescriptorProto + // 210 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2a, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0x2c, 0x28, 0xd0, 0x4f, 0xc9, 0x2c, 0x2e, 0x48, 0x2c, 0x49, 0xce, 0x48, 0x2d, 0xd2, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, @@ -65,9 +65,9 @@ var fileDescriptor0 = []byte{ 0x2c, 0x4b, 0x8d, 0x4f, 0xce, 0xcf, 0xcb, 0x4b, 0x4d, 0x2e, 0xc9, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x08, 0x12, 0x03, 0xcb, 0x07, 0x40, 0xa4, 0x9d, 0xe1, 0xb2, 0x4a, 0x7e, 0x5c, 0x6c, 0x50, 0x33, 0x5c, 0xb8, 0x38, 0x8a, 0x53, 0x4b, 0x4a, 0x32, 0xf3, 0xd2, 0x8b, 0xc1, 0x7a, - 0xb8, 0x8d, 0x34, 0xf4, 0x70, 0x3a, 0x41, 0x0f, 0xc5, 0xfe, 0x20, 0xb8, 0x4e, 0xa7, 0x10, 0x2e, - 0xd9, 0xe4, 0xfc, 0x5c, 0xdc, 0x1a, 0x9d, 0xb8, 0x21, 0x5a, 0x02, 0x40, 0x7e, 0x8c, 0xe2, 0x42, - 0x48, 0xac, 0x62, 0x92, 0x0c, 0x33, 0x0a, 0x4a, 0xac, 0xd4, 0x73, 0x06, 0x69, 0x72, 0x2c, 0x28, - 0xd0, 0x73, 0x81, 0xcb, 0x25, 0xb1, 0x81, 0x83, 0xc4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x4d, - 0xf7, 0x84, 0x36, 0x40, 0x01, 0x00, 0x00, + 0xb8, 0x8d, 0x34, 0xf4, 0x70, 0x3a, 0x41, 0x0f, 0xc5, 0xfe, 0x20, 0xb8, 0x4e, 0x27, 0x4f, 0x2e, + 0xd9, 0xe4, 0xfc, 0x5c, 0xdc, 0x1a, 0x03, 0x18, 0xa3, 0xb8, 0x10, 0xbc, 0x55, 0x4c, 0x92, 0x61, + 0x46, 0x41, 0x89, 0x95, 0x7a, 0xce, 0x20, 0x95, 0x8e, 0x05, 0x05, 0x7a, 0x2e, 0x70, 0xb9, 0x24, + 0x36, 0x70, 0x38, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x50, 0x1d, 0x4d, 0x35, 0x01, + 0x00, 0x00, } diff --git a/app/dispatcher/config.proto b/app/dispatcher/config.proto index 2e4a3079e..7ad426042 100644 --- a/app/dispatcher/config.proto +++ b/app/dispatcher/config.proto @@ -4,7 +4,7 @@ package v2ray.core.app.dispatcher; option csharp_namespace = "V2Ray.Core.App.Dispatcher"; option go_package = "dispatcher"; option java_package = "com.v2ray.core.app.dispatcher"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message SessionConfig { bool allow_passive_connection = 1; diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go index b5e8273f7..0c097d531 100644 --- a/app/dns/config.pb.go +++ b/app/dns/config.pb.go @@ -51,24 +51,23 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/app/dns/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 290 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0xcd, 0x4a, 0x03, 0x31, - 0x10, 0x80, 0xd9, 0x2d, 0x2d, 0x98, 0xbd, 0x48, 0x0e, 0xb2, 0xf4, 0x62, 0x55, 0xc4, 0x82, 0x30, - 0x81, 0xf5, 0xa0, 0xe8, 0x41, 0xfa, 0x07, 0x7a, 0xd1, 0xb2, 0x82, 0x07, 0x3d, 0xc5, 0x4d, 0x94, - 0x45, 0x33, 0x13, 0x92, 0x58, 0xd8, 0x57, 0xf2, 0xbd, 0x7c, 0x0f, 0xd9, 0x0d, 0x62, 0x51, 0x7b, - 0x0b, 0xe1, 0xfb, 0x32, 0x5f, 0x86, 0x1d, 0xac, 0x0a, 0x27, 0x1b, 0xa8, 0xc8, 0x88, 0x8a, 0x9c, - 0x16, 0xd2, 0x5a, 0xa1, 0xd0, 0x8b, 0x8a, 0xf0, 0xb9, 0x7e, 0x01, 0xeb, 0x28, 0x10, 0xe7, 0xdf, - 0x90, 0xd3, 0x20, 0xad, 0x05, 0x85, 0x7e, 0x78, 0xf4, 0x4b, 0xac, 0xc8, 0x18, 0x42, 0x81, 0x3a, - 0x08, 0xa9, 0x94, 0xd3, 0xde, 0x47, 0x79, 0x78, 0xbc, 0x19, 0x54, 0xda, 0x87, 0x1a, 0x65, 0xa8, - 0x09, 0x23, 0xbc, 0xff, 0x99, 0xb0, 0xc1, 0xac, 0x1b, 0xcd, 0x27, 0x2c, 0xbb, 0x91, 0x46, 0xdf, - 0x69, 0xb7, 0xd2, 0xce, 0xe7, 0xc9, 0xa8, 0x37, 0xce, 0x8a, 0x5d, 0x58, 0x4b, 0x89, 0x2f, 0x01, - 0xea, 0x00, 0x0b, 0x54, 0x96, 0x6a, 0x0c, 0xe5, 0xba, 0xc3, 0x2f, 0x58, 0xff, 0x8a, 0x7c, 0xf0, - 0x79, 0xda, 0xc9, 0x87, 0xf0, 0xf7, 0x1f, 0x10, 0xa7, 0x41, 0xc7, 0x2d, 0x30, 0xb8, 0xa6, 0x8c, - 0xce, 0xf0, 0x91, 0xb1, 0x9f, 0x4b, 0xbe, 0xcd, 0x7a, 0xaf, 0xba, 0xc9, 0x93, 0x51, 0x32, 0xde, - 0x2a, 0xdb, 0x23, 0x3f, 0x65, 0xfd, 0x95, 0x7c, 0x7b, 0xd7, 0x79, 0x3a, 0x4a, 0xc6, 0x59, 0xb1, - 0xb7, 0xa1, 0xec, 0x7a, 0x79, 0xeb, 0xe6, 0x64, 0x64, 0x8d, 0x65, 0xe4, 0xcf, 0xd3, 0xb3, 0x64, - 0x7a, 0xc9, 0x76, 0x2a, 0x32, 0xff, 0xf4, 0x4c, 0xb3, 0x18, 0xb4, 0x6c, 0xd7, 0xf1, 0xd0, 0x53, - 0xe8, 0x3f, 0x52, 0x7e, 0x5f, 0x94, 0xb2, 0x81, 0x59, 0x8b, 0x4d, 0xac, 0x85, 0x39, 0xfa, 0xa7, - 0x41, 0xb7, 0xaf, 0x93, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x18, 0xf5, 0xa2, 0xc0, 0x01, - 0x00, 0x00, + // 286 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0x41, 0x4b, 0x33, 0x31, + 0x10, 0x86, 0xc9, 0x96, 0x16, 0xbe, 0xf4, 0xf2, 0x91, 0x83, 0x2c, 0xbd, 0x58, 0x15, 0xb1, 0x20, + 0x4c, 0x60, 0x15, 0x14, 0x3d, 0xd5, 0xb6, 0xa0, 0x17, 0x2d, 0x2b, 0x78, 0xd0, 0x53, 0xdc, 0x44, + 0x59, 0x34, 0x33, 0x21, 0x89, 0x0b, 0xfb, 0x97, 0xfc, 0x5f, 0xfe, 0x0f, 0xe9, 0x06, 0xb1, 0xa8, + 0xbd, 0x85, 0xe4, 0x79, 0xf2, 0xbe, 0x33, 0x7c, 0xaf, 0x29, 0xbc, 0x6a, 0xa1, 0x22, 0x2b, 0x2b, + 0xf2, 0x46, 0x2a, 0xe7, 0xa4, 0xc6, 0x20, 0x2b, 0xc2, 0xa7, 0xfa, 0x19, 0x9c, 0xa7, 0x48, 0x42, + 0x7c, 0x41, 0xde, 0x80, 0x72, 0x0e, 0x34, 0x86, 0xd1, 0xc1, 0x0f, 0xb1, 0x22, 0x6b, 0x09, 0x25, + 0x9a, 0x28, 0x95, 0xd6, 0xde, 0x84, 0x90, 0xe4, 0xd1, 0xe1, 0x66, 0x50, 0x9b, 0x10, 0x6b, 0x54, + 0xb1, 0x26, 0x4c, 0xf0, 0xee, 0x07, 0xe3, 0x83, 0x59, 0x17, 0x2d, 0xa6, 0x7c, 0x78, 0xad, 0xac, + 0xb9, 0x35, 0xbe, 0x31, 0x3e, 0xe4, 0x6c, 0xdc, 0x9b, 0x0c, 0x8b, 0x6d, 0x58, 0xab, 0x92, 0x7e, + 0x02, 0x34, 0x11, 0x16, 0xa8, 0x1d, 0xd5, 0x18, 0xcb, 0x75, 0x47, 0x9c, 0xf3, 0xfe, 0x25, 0x85, + 0x18, 0xf2, 0xac, 0x93, 0xf7, 0xe1, 0xf7, 0x1c, 0x90, 0xd2, 0xa0, 0xe3, 0x16, 0x18, 0x7d, 0x5b, + 0x26, 0x67, 0xf4, 0xc0, 0xf9, 0xf7, 0xa5, 0xf8, 0xcf, 0x7b, 0x2f, 0xa6, 0xcd, 0xd9, 0x98, 0x4d, + 0xfe, 0x95, 0xab, 0xa3, 0x38, 0xe1, 0xfd, 0x46, 0xbd, 0xbe, 0x99, 0x3c, 0x1b, 0xb3, 0xc9, 0xb0, + 0xd8, 0xd9, 0xd0, 0xec, 0x6a, 0x79, 0xe3, 0xe7, 0x64, 0x55, 0x8d, 0x65, 0xe2, 0xcf, 0xb2, 0x53, + 0x76, 0x71, 0xcc, 0xb7, 0x2a, 0xb2, 0x7f, 0xf4, 0x59, 0xb2, 0xfb, 0x9e, 0xc6, 0xf0, 0x9e, 0x89, + 0xbb, 0xa2, 0x54, 0x2d, 0xcc, 0x56, 0x6f, 0x53, 0xe7, 0x60, 0x8e, 0xe1, 0x71, 0xd0, 0x2d, 0xe9, + 0xe8, 0x33, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xe1, 0x96, 0x19, 0xb5, 0x01, 0x00, 0x00, } diff --git a/app/dns/config.proto b/app/dns/config.proto index 8f13895ca..c15e95500 100644 --- a/app/dns/config.proto +++ b/app/dns/config.proto @@ -4,7 +4,7 @@ package v2ray.core.app.dns; option csharp_namespace = "V2Ray.Core.App.Dns"; option go_package = "dns"; option java_package = "com.v2ray.core.app.dns"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/net/address.proto"; import "v2ray.com/core/common/net/destination.proto"; diff --git a/app/log/config.pb.go b/app/log/config.pb.go index 8a2bf9d9e..cd59e6e9f 100644 --- a/app/log/config.pb.go +++ b/app/log/config.pb.go @@ -129,26 +129,26 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/app/log/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 335 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4b, 0xc3, 0x30, - 0x1c, 0xc5, 0xd7, 0x76, 0x3f, 0xb3, 0x5f, 0x21, 0x07, 0x19, 0xe8, 0x61, 0xa8, 0xc8, 0xd8, 0xa1, - 0x85, 0x89, 0x67, 0xd9, 0xba, 0x09, 0xc2, 0x90, 0x31, 0x44, 0xc1, 0xcb, 0xc8, 0x6a, 0x96, 0x15, - 0xb2, 0x7c, 0x43, 0x5a, 0x07, 0xfd, 0x7f, 0x3c, 0xf9, 0x57, 0x4a, 0x32, 0x6b, 0x15, 0x15, 0x8f, - 0x29, 0xef, 0x7d, 0xde, 0x7b, 0x7c, 0x8b, 0xce, 0xf6, 0x23, 0x4d, 0x33, 0x3f, 0x82, 0x5d, 0x10, - 0x81, 0x66, 0x01, 0x55, 0x2a, 0x10, 0xc0, 0x83, 0x08, 0xe4, 0x26, 0xe6, 0xbe, 0xd2, 0x90, 0x02, - 0x21, 0xb9, 0x48, 0x33, 0x9f, 0x2a, 0xe5, 0x0b, 0xe0, 0xa7, 0xaf, 0x2e, 0xaa, 0x86, 0x56, 0x44, - 0xc6, 0xa8, 0xc3, 0xb4, 0x06, 0xbd, 0x12, 0xc0, 0x57, 0x69, 0xa6, 0x58, 0xcf, 0xe9, 0x3b, 0x83, - 0xce, 0xe8, 0xd8, 0xff, 0xe9, 0xf3, 0xe7, 0xc0, 0xef, 0x33, 0xc5, 0x96, 0x2d, 0x6b, 0xf9, 0x78, - 0x91, 0x29, 0xea, 0x16, 0x08, 0xc1, 0xf6, 0x4c, 0xf4, 0x5c, 0xcb, 0x38, 0xf9, 0x83, 0x31, 0x37, - 0x9a, 0x65, 0x3b, 0x87, 0xd8, 0x27, 0x39, 0xff, 0x5a, 0x44, 0xd1, 0x74, 0xdb, 0xf3, 0xfa, 0xce, - 0xa0, 0x51, 0x64, 0x2d, 0x68, 0xba, 0x25, 0x21, 0xea, 0xd2, 0x28, 0x62, 0x49, 0x52, 0xf4, 0x2d, - 0xff, 0xdf, 0xb7, 0x7d, 0xf0, 0xe4, 0x85, 0x2f, 0xbe, 0x41, 0x6c, 0x56, 0xc5, 0x66, 0x15, 0x3a, - 0x13, 0x36, 0xbc, 0x42, 0xb5, 0xdc, 0x52, 0x47, 0xe5, 0x3b, 0x90, 0x0c, 0x97, 0x48, 0x13, 0xd5, - 0x42, 0x90, 0x09, 0x08, 0x86, 0x1d, 0xf3, 0xf9, 0x26, 0x16, 0x0c, 0xbb, 0xa4, 0x81, 0x2a, 0xb3, - 0x3d, 0x93, 0x29, 0xf6, 0x86, 0x33, 0x54, 0xff, 0x5c, 0xd5, 0x42, 0xf5, 0x69, 0x9c, 0xd0, 0xb5, - 0x60, 0xcf, 0xb8, 0x64, 0x45, 0x66, 0x0d, 0x76, 0x0c, 0xe6, 0x91, 0x6a, 0x19, 0x4b, 0x8e, 0x5d, - 0x83, 0xb9, 0x95, 0x1b, 0xc0, 0x9e, 0x51, 0x4c, 0xd9, 0xfa, 0x85, 0xe3, 0xf2, 0xe4, 0x1a, 0x1d, - 0x45, 0xb0, 0xfb, 0x65, 0xd6, 0xa4, 0x79, 0xb8, 0xdd, 0xc2, 0xdc, 0xf7, 0xc9, 0x13, 0xc0, 0xdf, - 0x5c, 0xf2, 0x30, 0x5a, 0xd2, 0xcc, 0x0f, 0x8d, 0x6c, 0xac, 0x94, 0x59, 0xbe, 0xae, 0xda, 0x1f, - 0xe0, 0xf2, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x89, 0x56, 0x54, 0xa7, 0x27, 0x02, 0x00, 0x00, + // 331 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x91, 0xcd, 0x4a, 0xfb, 0x40, + 0x14, 0xc5, 0x9b, 0xa4, 0x9f, 0xf3, 0xef, 0xc7, 0x30, 0x8b, 0x3f, 0x05, 0x5d, 0x14, 0x15, 0x29, + 0x5d, 0x24, 0x50, 0xf5, 0x01, 0x6a, 0x5a, 0x41, 0x28, 0x52, 0x8a, 0x28, 0xb8, 0x29, 0xd3, 0x78, + 0x3b, 0x0d, 0x4c, 0x73, 0x87, 0x49, 0x2c, 0xe4, 0x7d, 0x5c, 0xf9, 0x94, 0x32, 0xa3, 0x31, 0x8a, + 0x8a, 0xcb, 0x9b, 0x9c, 0xf3, 0x3b, 0xe7, 0x30, 0xe4, 0x78, 0x3f, 0xd6, 0x3c, 0xf7, 0x23, 0xdc, + 0x05, 0x11, 0x6a, 0x08, 0xb8, 0x52, 0x81, 0x44, 0x11, 0x44, 0x98, 0x6c, 0x62, 0xe1, 0x2b, 0x8d, + 0x19, 0x32, 0x56, 0x88, 0x34, 0xf8, 0x5c, 0x29, 0x5f, 0xa2, 0x38, 0x7a, 0x76, 0x49, 0x3d, 0xb4, + 0x22, 0x36, 0x21, 0x5d, 0xd0, 0x1a, 0xf5, 0x4a, 0xa2, 0x58, 0x65, 0xb9, 0x82, 0xbe, 0x33, 0x70, + 0x86, 0xdd, 0xf1, 0x81, 0xff, 0xdd, 0xe7, 0xcf, 0x51, 0xdc, 0xe6, 0x0a, 0x96, 0x6d, 0x6b, 0x79, + 0xbf, 0xd8, 0x94, 0xf4, 0x4a, 0x84, 0x84, 0x3d, 0xc8, 0xbe, 0x6b, 0x19, 0x87, 0xbf, 0x30, 0xe6, + 0x46, 0xb3, 0xec, 0x14, 0x10, 0x7b, 0xb2, 0x93, 0xcf, 0x45, 0x14, 0xcf, 0xb6, 0x7d, 0x6f, 0xe0, + 0x0c, 0x5b, 0x65, 0xd6, 0x82, 0x67, 0x5b, 0x16, 0x92, 0x1e, 0x8f, 0x22, 0x48, 0xd3, 0xb2, 0x6f, + 0xf5, 0xef, 0xbe, 0x9d, 0x37, 0x4f, 0x51, 0xf8, 0xf4, 0x0b, 0xc4, 0x66, 0xd5, 0x6c, 0x56, 0xa9, + 0x33, 0x61, 0xa3, 0x0b, 0xd2, 0x28, 0x2c, 0x4d, 0x52, 0xbd, 0xc1, 0x04, 0x68, 0x85, 0xfd, 0x23, + 0x8d, 0x10, 0x93, 0x14, 0x25, 0x50, 0xc7, 0x7c, 0xbe, 0x8a, 0x25, 0x50, 0x97, 0xb5, 0x48, 0x6d, + 0xb6, 0x87, 0x24, 0xa3, 0xde, 0x68, 0x46, 0x9a, 0x1f, 0xab, 0xda, 0xa4, 0x39, 0x8d, 0x53, 0xbe, + 0x96, 0xf0, 0x48, 0x2b, 0x56, 0x64, 0xd6, 0x50, 0xc7, 0x60, 0xee, 0xb9, 0x4e, 0xe2, 0x44, 0x50, + 0xd7, 0x60, 0xae, 0x93, 0x0d, 0x52, 0xcf, 0x28, 0xa6, 0xb0, 0x7e, 0x12, 0xb4, 0x7a, 0x79, 0x4e, + 0xfe, 0x47, 0xb8, 0xfb, 0x61, 0xd6, 0xc2, 0x79, 0xf0, 0x24, 0x8a, 0x17, 0x97, 0xdd, 0x8d, 0x97, + 0x3c, 0xf7, 0x43, 0xf3, 0x6f, 0xa2, 0x94, 0x99, 0xbb, 0xae, 0xdb, 0x57, 0x3f, 0x7b, 0x0d, 0x00, + 0x00, 0xff, 0xff, 0x93, 0x6e, 0xe5, 0xbd, 0x1c, 0x02, 0x00, 0x00, } diff --git a/app/log/config.proto b/app/log/config.proto index e1f515ea7..0903c4645 100644 --- a/app/log/config.proto +++ b/app/log/config.proto @@ -4,7 +4,7 @@ package v2ray.core.app.log; option csharp_namespace = "V2Ray.Core.App.Log"; option go_package = "log"; option java_package = "com.v2ray.core.app.log"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; enum LogType { None = 0; diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go index d66583576..30d317dc9 100644 --- a/app/proxyman/config.pb.go +++ b/app/proxyman/config.pb.go @@ -395,59 +395,58 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/app/proxyman/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 853 bytes of a gzipped FileDescriptorProto + // 846 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xdd, 0x6e, 0x23, 0x35, - 0x18, 0x65, 0x92, 0x6e, 0xda, 0x7e, 0x69, 0xd3, 0x60, 0x96, 0xdd, 0x10, 0x40, 0x94, 0x08, 0x41, - 0xc5, 0xa2, 0xc9, 0x92, 0x15, 0x02, 0xae, 0xa0, 0xdb, 0x16, 0xd1, 0x8b, 0x6e, 0x83, 0xb3, 0xe2, - 0x02, 0x21, 0x05, 0x77, 0xc6, 0x3b, 0x6b, 0x31, 0x63, 0x1b, 0xdb, 0xe9, 0x66, 0x5e, 0x89, 0x67, - 0xe0, 0x82, 0x07, 0xe0, 0x51, 0x78, 0x03, 0x6e, 0x90, 0x7f, 0x26, 0x89, 0x9a, 0x0e, 0xa5, 0x54, - 0xdc, 0x8d, 0x67, 0xce, 0x39, 0xf6, 0xf9, 0xce, 0xf7, 0x79, 0xe0, 0xe0, 0x72, 0xa4, 0x48, 0x19, - 0x27, 0xa2, 0x18, 0x26, 0x42, 0xd1, 0x21, 0x91, 0x72, 0x28, 0x95, 0x98, 0x97, 0x05, 0xe1, 0xc3, - 0x44, 0xf0, 0x17, 0x2c, 0x8b, 0xa5, 0x12, 0x46, 0xa0, 0x87, 0x15, 0x52, 0xd1, 0x98, 0x48, 0x19, - 0x57, 0xa8, 0xfe, 0xe3, 0x2b, 0x12, 0x89, 0x28, 0x0a, 0xc1, 0x87, 0x9a, 0x2a, 0x46, 0xf2, 0xa1, - 0x29, 0x25, 0x4d, 0xa7, 0x05, 0xd5, 0x9a, 0x64, 0xd4, 0x4b, 0xf5, 0x3f, 0xba, 0x9e, 0xc1, 0xa9, - 0x19, 0x92, 0x34, 0x55, 0x54, 0xeb, 0x00, 0x7c, 0x54, 0x0f, 0x4c, 0xa9, 0x36, 0x8c, 0x13, 0xc3, - 0x04, 0x0f, 0xe0, 0x0f, 0xea, 0xc1, 0x52, 0x28, 0x13, 0x50, 0xf1, 0x15, 0x94, 0x51, 0x84, 0x6b, - 0xfb, 0x7d, 0xc8, 0xb8, 0xa1, 0xca, 0xa2, 0x57, 0x6d, 0x0f, 0xf6, 0x60, 0xf7, 0x94, 0x5f, 0x88, - 0x19, 0x4f, 0x8f, 0xdc, 0xeb, 0xc1, 0xef, 0x4d, 0x40, 0x87, 0x79, 0x2e, 0x12, 0xb7, 0xf7, 0xc4, - 0x28, 0x62, 0x68, 0x56, 0xa2, 0x63, 0xd8, 0xb0, 0x56, 0x7b, 0xd1, 0x7e, 0x74, 0xd0, 0x19, 0x3d, - 0x8e, 0x6b, 0xaa, 0x15, 0xaf, 0x53, 0xe3, 0xe7, 0xa5, 0xa4, 0xd8, 0xb1, 0xd1, 0xcf, 0xd0, 0x4e, - 0x04, 0x4f, 0x66, 0x4a, 0x51, 0x9e, 0x94, 0xbd, 0xc6, 0x7e, 0x74, 0xd0, 0x1e, 0x9d, 0xde, 0x46, - 0x6c, 0xfd, 0xd5, 0xd1, 0x52, 0x10, 0xaf, 0xaa, 0xa3, 0x29, 0x6c, 0x2a, 0xfa, 0x42, 0x51, 0xfd, - 0xb2, 0xd7, 0x74, 0x1b, 0x9d, 0xdc, 0x6d, 0x23, 0xec, 0xc5, 0x70, 0xa5, 0xda, 0xff, 0x0c, 0xde, - 0xfd, 0xc7, 0xe3, 0xa0, 0xfb, 0x70, 0xef, 0x92, 0xe4, 0x33, 0x5f, 0xb5, 0x5d, 0xec, 0x17, 0xfd, - 0x4f, 0xe1, 0xad, 0x5a, 0xf1, 0xeb, 0x29, 0x83, 0x4f, 0x60, 0xc3, 0x56, 0x11, 0x01, 0xb4, 0x0e, - 0xf3, 0x57, 0xa4, 0xd4, 0xdd, 0xd7, 0xec, 0x33, 0x26, 0x3c, 0x15, 0x45, 0x37, 0x42, 0x3b, 0xb0, - 0x75, 0x32, 0xb7, 0xf1, 0x92, 0xbc, 0xdb, 0x18, 0xfc, 0xd6, 0x84, 0x0e, 0xa6, 0x09, 0x65, 0x97, - 0x54, 0xf9, 0x54, 0xd1, 0x57, 0x00, 0xb6, 0x09, 0xa6, 0x8a, 0xf0, 0xcc, 0x6b, 0xb7, 0x47, 0xfb, - 0xab, 0xe5, 0xf0, 0xdd, 0x14, 0x73, 0x6a, 0xe2, 0xb1, 0x50, 0x06, 0x5b, 0x1c, 0xde, 0x96, 0xd5, - 0x23, 0xfa, 0x12, 0x5a, 0x39, 0xd3, 0x86, 0xf2, 0x10, 0xda, 0xfb, 0x35, 0xe4, 0xd3, 0xf1, 0xb9, - 0x3a, 0x16, 0x05, 0x61, 0x1c, 0x07, 0x02, 0xfa, 0x11, 0xde, 0x20, 0x0b, 0xbf, 0x53, 0x1d, 0x0c, - 0x87, 0x4c, 0x1e, 0xdd, 0x22, 0x13, 0x8c, 0xc8, 0x7a, 0x63, 0x3e, 0x87, 0x3d, 0x6d, 0x14, 0x25, - 0xc5, 0x54, 0x53, 0x63, 0x18, 0xcf, 0x74, 0x6f, 0x63, 0x5d, 0x79, 0x31, 0x06, 0x71, 0x35, 0x06, - 0xf1, 0xc4, 0xb1, 0x7c, 0x7d, 0x70, 0xc7, 0x6b, 0x4c, 0x82, 0x04, 0xfa, 0x1a, 0xde, 0x51, 0xbe, - 0x82, 0x53, 0xa1, 0x58, 0xc6, 0x38, 0xc9, 0xa7, 0x2b, 0x23, 0xd9, 0xbb, 0xb7, 0x1f, 0x1d, 0x6c, - 0xe1, 0x7e, 0xc0, 0x9c, 0x07, 0xc8, 0xf1, 0x12, 0x81, 0xbe, 0x80, 0x9e, 0x3d, 0xed, 0xab, 0xa9, - 0x24, 0x5a, 0x5b, 0x9d, 0x44, 0x70, 0x4e, 0x13, 0xc7, 0x6e, 0x39, 0xf6, 0x03, 0xf7, 0x7d, 0xec, - 0x3f, 0x1f, 0x2d, 0xbe, 0x0e, 0xfe, 0x88, 0xe0, 0x7e, 0x98, 0xc9, 0x6f, 0x09, 0x4f, 0xf3, 0x45, - 0x88, 0x5d, 0x68, 0x1a, 0x92, 0xb9, 0xf4, 0xb6, 0xb1, 0x7d, 0x44, 0x13, 0x78, 0x3d, 0x1c, 0x41, - 0x2d, 0xed, 0xfb, 0x80, 0x3e, 0xbc, 0x26, 0x20, 0x7f, 0x67, 0xb9, 0x81, 0x4c, 0xcf, 0xfc, 0x95, - 0x85, 0xbb, 0x95, 0xc0, 0xc2, 0xfb, 0x19, 0x74, 0x5c, 0x08, 0x4b, 0xc5, 0xe6, 0xad, 0x14, 0x77, - 0x1d, 0xbb, 0x92, 0x1b, 0x74, 0xa1, 0x73, 0x3e, 0x33, 0xab, 0x57, 0xcc, 0x9f, 0x11, 0xec, 0x4c, - 0x28, 0x4f, 0x17, 0xc6, 0x9e, 0x40, 0xf3, 0x92, 0x91, 0xd0, 0x96, 0xff, 0xa2, 0xb3, 0x2c, 0xfa, - 0xba, 0xe0, 0x1b, 0x77, 0x0f, 0xfe, 0xbb, 0x1a, 0xf3, 0x1f, 0xdf, 0x20, 0x3a, 0xb6, 0xa4, 0xa0, - 0x79, 0xa5, 0x00, 0x7f, 0x45, 0xf0, 0x66, 0x55, 0x81, 0x9b, 0x02, 0x3d, 0x87, 0x3d, 0xed, 0x2a, - 0xf3, 0x5f, 0xe3, 0xec, 0x78, 0xfa, 0xff, 0x14, 0x26, 0x7a, 0x00, 0x2d, 0x3a, 0x97, 0x4c, 0x51, - 0x37, 0x64, 0x4d, 0x1c, 0x56, 0xa8, 0x07, 0x9b, 0x56, 0x84, 0x72, 0xe3, 0x46, 0x63, 0x1b, 0x57, - 0xcb, 0x41, 0x0c, 0xe8, 0x6c, 0x96, 0x1b, 0x26, 0x73, 0x3a, 0x67, 0x3c, 0x0b, 0xce, 0x7b, 0xb0, - 0x49, 0x39, 0xb9, 0xc8, 0x69, 0xea, 0xdc, 0x6f, 0xe1, 0x6a, 0x39, 0xf8, 0x09, 0x3a, 0xc7, 0x4c, - 0x4b, 0x62, 0x92, 0x97, 0x01, 0xfb, 0x0c, 0x76, 0x8a, 0xd9, 0x7c, 0x69, 0x20, 0xba, 0xe1, 0xe2, - 0x58, 0xdf, 0x0e, 0xb7, 0x8b, 0xd9, 0x7c, 0x91, 0xc7, 0x2f, 0xb6, 0xfb, 0xb4, 0x66, 0x82, 0x7f, - 0xa3, 0x48, 0x41, 0x51, 0x07, 0x1a, 0x2c, 0x0d, 0xf7, 0x6d, 0x83, 0xa5, 0xe8, 0x73, 0x68, 0x19, - 0xa2, 0x32, 0x6a, 0x42, 0xe9, 0xdf, 0xab, 0x69, 0xc8, 0x13, 0x9e, 0x4a, 0xc1, 0xb8, 0xc1, 0x01, - 0x6e, 0x4d, 0x49, 0x52, 0xe6, 0x82, 0xa4, 0xae, 0xc8, 0x3b, 0xb8, 0x5a, 0x3e, 0x7d, 0x06, 0x6f, - 0x27, 0xa2, 0xa8, 0x3b, 0xf1, 0xd3, 0xb6, 0x3f, 0xe6, 0xd8, 0xfe, 0x91, 0x7f, 0xd8, 0xaa, 0x5e, - 0xff, 0xda, 0x78, 0xf8, 0xfd, 0x08, 0x93, 0x32, 0x3e, 0xb2, 0x84, 0x43, 0x29, 0x7d, 0x93, 0x15, - 0x84, 0x5f, 0xb4, 0xdc, 0xcf, 0xfb, 0xc9, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x69, 0xf1, 0x9f, - 0x6a, 0xdf, 0x08, 0x00, 0x00, + 0x18, 0x65, 0x92, 0x6e, 0xda, 0x7e, 0x6d, 0xd3, 0x60, 0x96, 0xdd, 0x10, 0x40, 0x94, 0x08, 0x41, + 0xc5, 0xa2, 0xc9, 0x92, 0x15, 0x02, 0xae, 0xa0, 0xa4, 0x45, 0xf4, 0xa2, 0x34, 0x38, 0x2b, 0x2e, + 0x10, 0x52, 0x70, 0x67, 0xbc, 0xb3, 0x16, 0x33, 0xb6, 0xb1, 0x9d, 0x6e, 0xe6, 0x95, 0x78, 0x06, + 0x2e, 0x78, 0x00, 0x1e, 0x85, 0x37, 0xe0, 0x06, 0xf9, 0x67, 0x92, 0xa8, 0xc9, 0x50, 0xca, 0x8a, + 0xbb, 0x71, 0x7c, 0xce, 0xb1, 0xcf, 0x77, 0xbe, 0xcf, 0x81, 0xe3, 0xeb, 0xa1, 0x22, 0x65, 0x9c, + 0x88, 0x62, 0x90, 0x08, 0x45, 0x07, 0x44, 0xca, 0x81, 0x54, 0x62, 0x5e, 0x16, 0x84, 0x0f, 0x12, + 0xc1, 0x9f, 0xb1, 0x2c, 0x96, 0x4a, 0x18, 0x81, 0x1e, 0x56, 0x48, 0x45, 0x63, 0x22, 0x65, 0x5c, + 0xa1, 0x7a, 0x8f, 0x6f, 0x48, 0x24, 0xa2, 0x28, 0x04, 0x1f, 0x68, 0xaa, 0x18, 0xc9, 0x07, 0xa6, + 0x94, 0x34, 0x9d, 0x16, 0x54, 0x6b, 0x92, 0x51, 0x2f, 0xd5, 0xfb, 0x60, 0x33, 0x83, 0x53, 0x33, + 0x20, 0x69, 0xaa, 0xa8, 0xd6, 0x01, 0xf8, 0xa8, 0x1e, 0x98, 0x52, 0x6d, 0x18, 0x27, 0x86, 0x09, + 0x1e, 0xc0, 0xef, 0xd5, 0x83, 0xa5, 0x50, 0x26, 0xa0, 0xe2, 0x1b, 0x28, 0xa3, 0x08, 0xd7, 0x76, + 0x7f, 0xc0, 0xb8, 0xa1, 0xca, 0xa2, 0x57, 0x6d, 0xf7, 0x0f, 0xe1, 0xe0, 0x9c, 0x5f, 0x89, 0x19, + 0x4f, 0x47, 0xee, 0xe7, 0xfe, 0xef, 0x4d, 0x40, 0x27, 0x79, 0x2e, 0x12, 0x77, 0xf6, 0xc4, 0x28, + 0x62, 0x68, 0x56, 0xa2, 0x53, 0xd8, 0xb2, 0x56, 0xbb, 0xd1, 0x51, 0x74, 0xdc, 0x1e, 0x3e, 0x8e, + 0x6b, 0xaa, 0x15, 0xaf, 0x53, 0xe3, 0xa7, 0xa5, 0xa4, 0xd8, 0xb1, 0xd1, 0xcf, 0xb0, 0x97, 0x08, + 0x9e, 0xcc, 0x94, 0xa2, 0x3c, 0x29, 0xbb, 0x8d, 0xa3, 0xe8, 0x78, 0x6f, 0x78, 0x7e, 0x17, 0xb1, + 0xf5, 0x9f, 0x46, 0x4b, 0x41, 0xbc, 0xaa, 0x8e, 0xa6, 0xb0, 0xad, 0xe8, 0x33, 0x45, 0xf5, 0xf3, + 0x6e, 0xd3, 0x1d, 0x74, 0xf6, 0x72, 0x07, 0x61, 0x2f, 0x86, 0x2b, 0xd5, 0xde, 0x27, 0xf0, 0xf6, + 0x3f, 0x5e, 0x07, 0xdd, 0x87, 0x7b, 0xd7, 0x24, 0x9f, 0xf9, 0xaa, 0x1d, 0x60, 0xbf, 0xe8, 0x7d, + 0x0c, 0x6f, 0xd4, 0x8a, 0x6f, 0xa6, 0xf4, 0x3f, 0x82, 0x2d, 0x5b, 0x45, 0x04, 0xd0, 0x3a, 0xc9, + 0x5f, 0x90, 0x52, 0x77, 0x5e, 0xb1, 0xdf, 0x98, 0xf0, 0x54, 0x14, 0x9d, 0x08, 0xed, 0xc3, 0xce, + 0xd9, 0xdc, 0xc6, 0x4b, 0xf2, 0x4e, 0xa3, 0xff, 0x5b, 0x13, 0xda, 0x98, 0x26, 0x94, 0x5d, 0x53, + 0xe5, 0x53, 0x45, 0x5f, 0x00, 0xd8, 0x26, 0x98, 0x2a, 0xc2, 0x33, 0xaf, 0xbd, 0x37, 0x3c, 0x5a, + 0x2d, 0x87, 0xef, 0xa6, 0x98, 0x53, 0x13, 0x8f, 0x85, 0x32, 0xd8, 0xe2, 0xf0, 0xae, 0xac, 0x3e, + 0xd1, 0xe7, 0xd0, 0xca, 0x99, 0x36, 0x94, 0x87, 0xd0, 0xde, 0xad, 0x21, 0x9f, 0x8f, 0x2f, 0xd5, + 0xa9, 0x28, 0x08, 0xe3, 0x38, 0x10, 0xd0, 0x8f, 0xf0, 0x1a, 0x59, 0xf8, 0x9d, 0xea, 0x60, 0x38, + 0x64, 0xf2, 0xe8, 0x0e, 0x99, 0x60, 0x44, 0xd6, 0x1b, 0xf3, 0x29, 0x1c, 0x6a, 0xa3, 0x28, 0x29, + 0xa6, 0x9a, 0x1a, 0xc3, 0x78, 0xa6, 0xbb, 0x5b, 0xeb, 0xca, 0x8b, 0x31, 0x88, 0xab, 0x31, 0x88, + 0x27, 0x8e, 0xe5, 0xeb, 0x83, 0xdb, 0x5e, 0x63, 0x12, 0x24, 0xd0, 0x97, 0xf0, 0x96, 0xf2, 0x15, + 0x9c, 0x0a, 0xc5, 0x32, 0xc6, 0x49, 0x3e, 0x5d, 0x19, 0xc9, 0xee, 0xbd, 0xa3, 0xe8, 0x78, 0x07, + 0xf7, 0x02, 0xe6, 0x32, 0x40, 0x4e, 0x97, 0x08, 0xf4, 0x19, 0x74, 0xed, 0x6d, 0x5f, 0x4c, 0x25, + 0xd1, 0xda, 0xea, 0x24, 0x82, 0x73, 0x9a, 0x38, 0x76, 0xcb, 0xb1, 0x1f, 0xb8, 0xfd, 0xb1, 0xdf, + 0x1e, 0x2d, 0x76, 0xfb, 0x7f, 0x44, 0x70, 0x3f, 0xcc, 0xe4, 0x37, 0x84, 0xa7, 0xf9, 0x22, 0xc4, + 0x0e, 0x34, 0x0d, 0xc9, 0x5c, 0x7a, 0xbb, 0xd8, 0x7e, 0xa2, 0x09, 0xbc, 0x1a, 0xae, 0xa0, 0x96, + 0xf6, 0x7d, 0x40, 0xef, 0x6f, 0x08, 0xc8, 0xbf, 0x59, 0x6e, 0x20, 0xd3, 0x0b, 0xff, 0x64, 0xe1, + 0x4e, 0x25, 0xb0, 0xf0, 0x7e, 0x01, 0x6d, 0x17, 0xc2, 0x52, 0xb1, 0x79, 0x27, 0xc5, 0x03, 0xc7, + 0xae, 0xe4, 0xfa, 0x1d, 0x68, 0x5f, 0xce, 0xcc, 0xea, 0x13, 0xf3, 0x67, 0x04, 0xfb, 0x13, 0xca, + 0xd3, 0x85, 0xb1, 0x27, 0xd0, 0xbc, 0x66, 0x24, 0xb4, 0xe5, 0xbf, 0xe8, 0x2c, 0x8b, 0xde, 0x14, + 0x7c, 0xe3, 0xe5, 0x83, 0xff, 0xae, 0xc6, 0xfc, 0x87, 0xb7, 0x88, 0x8e, 0x2d, 0x29, 0x68, 0xde, + 0x28, 0xc0, 0x5f, 0x11, 0xbc, 0x5e, 0x55, 0xe0, 0xb6, 0x40, 0x2f, 0xe1, 0x50, 0xbb, 0xca, 0xfc, + 0xd7, 0x38, 0xdb, 0x9e, 0xfe, 0x3f, 0x85, 0x89, 0x1e, 0x40, 0x8b, 0xce, 0x25, 0x53, 0xd4, 0x0d, + 0x59, 0x13, 0x87, 0x15, 0xea, 0xc2, 0xb6, 0x15, 0xa1, 0xdc, 0xb8, 0xd1, 0xd8, 0xc5, 0xd5, 0xb2, + 0x1f, 0x03, 0xba, 0x98, 0xe5, 0x86, 0xc9, 0x9c, 0xce, 0x19, 0xcf, 0x82, 0xf3, 0x2e, 0x6c, 0x53, + 0x4e, 0xae, 0x72, 0x9a, 0x3a, 0xf7, 0x3b, 0xb8, 0x5a, 0xf6, 0x7f, 0x82, 0xf6, 0x29, 0xd3, 0x92, + 0x98, 0xe4, 0x79, 0xc0, 0x7e, 0x0b, 0xfb, 0xc5, 0x6c, 0xbe, 0x34, 0x10, 0xdd, 0xf2, 0x70, 0xac, + 0x1f, 0x87, 0xf7, 0x8a, 0xd9, 0x7c, 0x91, 0xc7, 0x2f, 0xb6, 0xfb, 0xb4, 0x66, 0x82, 0x7f, 0xad, + 0x48, 0x41, 0x51, 0x1b, 0x1a, 0x2c, 0x0d, 0xef, 0x6d, 0x83, 0xa5, 0xe8, 0x53, 0x68, 0x19, 0xa2, + 0x32, 0x6a, 0x42, 0xe9, 0xdf, 0xa9, 0x69, 0xc8, 0x33, 0x9e, 0x4a, 0xc1, 0xb8, 0xc1, 0x01, 0x6e, + 0x4d, 0x49, 0x52, 0xe6, 0x82, 0xa4, 0xae, 0xc8, 0xfb, 0xb8, 0x5a, 0x7e, 0x35, 0x82, 0x37, 0x13, + 0x51, 0xd4, 0xdd, 0x78, 0x1c, 0xfd, 0xb0, 0x53, 0x7d, 0xff, 0xda, 0x78, 0xf8, 0xfd, 0x10, 0x93, + 0x32, 0x1e, 0x59, 0xd4, 0x89, 0x94, 0xbe, 0xb3, 0x0a, 0xc2, 0xaf, 0x5a, 0xee, 0x1f, 0xfb, 0xc9, + 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xcf, 0x2c, 0xca, 0xd4, 0x08, 0x00, 0x00, } diff --git a/app/proxyman/config.proto b/app/proxyman/config.proto index 31dd831ea..4dadb25b1 100644 --- a/app/proxyman/config.proto +++ b/app/proxyman/config.proto @@ -4,7 +4,7 @@ package v2ray.core.app.proxyman; option csharp_namespace = "V2Ray.Core.App.Proxyman"; option go_package = "proxyman"; option java_package = "com.v2ray.core.app.proxyman"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message InboundConfig { } diff --git a/app/router/config.pb.go b/app/router/config.pb.go index 205f4836f..f297fc1ab 100644 --- a/app/router/config.pb.go +++ b/app/router/config.pb.go @@ -230,39 +230,39 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/app/router/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 538 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x93, 0xd1, 0x6e, 0xd3, 0x3e, - 0x14, 0xc6, 0xff, 0x69, 0xb3, 0xfc, 0x97, 0x93, 0x51, 0x22, 0x8b, 0xa1, 0x30, 0x98, 0x88, 0x22, - 0x04, 0xbd, 0x40, 0x89, 0x54, 0x04, 0xdc, 0x20, 0xa1, 0xad, 0x9b, 0x44, 0x25, 0x98, 0x26, 0xb3, - 0x71, 0xc1, 0x4d, 0xe4, 0xa5, 0x5e, 0xb0, 0x48, 0x6c, 0xcb, 0x71, 0xc6, 0xfa, 0x10, 0xbc, 0x08, - 0x4f, 0xc3, 0x23, 0x21, 0xdb, 0x99, 0xd8, 0xd0, 0x0a, 0x77, 0x3e, 0xa7, 0xbf, 0xef, 0xf8, 0xeb, - 0xf1, 0x17, 0x78, 0x7a, 0x31, 0x53, 0x64, 0x95, 0x57, 0xa2, 0x2d, 0x2a, 0xa1, 0x68, 0x41, 0xa4, - 0x2c, 0x94, 0xe8, 0x35, 0x55, 0x45, 0x25, 0xf8, 0x39, 0xab, 0x73, 0xa9, 0x84, 0x16, 0x68, 0xfb, - 0x8a, 0x53, 0x34, 0x27, 0x52, 0xe6, 0x8e, 0xd9, 0x79, 0xf2, 0x87, 0xbc, 0x12, 0x6d, 0x2b, 0x78, - 0xc1, 0xa9, 0x2e, 0xa4, 0x50, 0xda, 0x89, 0x77, 0x9e, 0xad, 0xa7, 0x38, 0xd5, 0xdf, 0x84, 0xfa, - 0xea, 0xc0, 0x4c, 0x43, 0x70, 0x20, 0x5a, 0xc2, 0x38, 0x7a, 0x05, 0xbe, 0x5e, 0x49, 0x9a, 0x78, - 0xa9, 0x37, 0x9d, 0xcc, 0xb2, 0xfc, 0xd6, 0xeb, 0x73, 0x07, 0xe7, 0x27, 0x2b, 0x49, 0xb1, 0xe5, - 0xd1, 0x3d, 0xd8, 0xb8, 0x20, 0x4d, 0x4f, 0x93, 0x51, 0xea, 0x4d, 0x43, 0xec, 0x8a, 0xec, 0x11, - 0xf8, 0x86, 0x41, 0x21, 0x6c, 0x1c, 0x37, 0x84, 0xf1, 0xf8, 0x3f, 0x73, 0xc4, 0xb4, 0xa6, 0x97, - 0xb1, 0x97, 0xe5, 0xe0, 0xcf, 0x17, 0x07, 0x18, 0x4d, 0x60, 0xc4, 0xa4, 0xbd, 0x71, 0x0b, 0x8f, - 0x98, 0x44, 0xf7, 0x21, 0x90, 0x8a, 0x9e, 0xb3, 0x4b, 0x3b, 0xec, 0x0e, 0x1e, 0xaa, 0xec, 0xfb, - 0x18, 0x22, 0x2c, 0x7a, 0xcd, 0x78, 0x8d, 0xfb, 0x86, 0xa2, 0x18, 0xc6, 0x9a, 0xd4, 0x56, 0x18, - 0x62, 0x73, 0x44, 0x2f, 0x21, 0x58, 0x5a, 0x6b, 0xc9, 0x28, 0x1d, 0x4f, 0xa3, 0xd9, 0xee, 0x5f, - 0xfd, 0xe3, 0x01, 0x46, 0x05, 0xf8, 0x15, 0x5b, 0xaa, 0x64, 0x6c, 0x45, 0x0f, 0xd7, 0x88, 0x8c, - 0x57, 0x6c, 0x41, 0xf4, 0x16, 0xc0, 0xac, 0xb9, 0x54, 0x84, 0xd7, 0x34, 0xf1, 0x53, 0x6f, 0x1a, - 0xcd, 0xd2, 0xeb, 0x32, 0xb7, 0xe9, 0x9c, 0x53, 0x9d, 0x1f, 0x0b, 0xa5, 0xb1, 0xe1, 0x70, 0x28, - 0xaf, 0x8e, 0xe8, 0x10, 0xb6, 0x86, 0x17, 0x28, 0x1b, 0xd6, 0xe9, 0x64, 0xc3, 0x8e, 0xc8, 0xd6, - 0x8c, 0x38, 0x72, 0xe8, 0x7b, 0xd6, 0x69, 0x1c, 0xf1, 0xdf, 0x05, 0x7a, 0x03, 0x51, 0x27, 0x7a, - 0x55, 0xd1, 0xd2, 0xfa, 0x0f, 0xfe, 0xed, 0x1f, 0x1c, 0x3f, 0x37, 0xff, 0x62, 0x17, 0xa0, 0xef, - 0xa8, 0x2a, 0x69, 0x4b, 0x58, 0x93, 0xfc, 0x9f, 0x8e, 0xa7, 0x21, 0x0e, 0x4d, 0xe7, 0xd0, 0x34, - 0xd0, 0x63, 0x88, 0x18, 0x3f, 0x13, 0x3d, 0x5f, 0x96, 0x66, 0xcd, 0x9b, 0xf6, 0x77, 0x18, 0x5a, - 0x27, 0xa4, 0xce, 0x7e, 0x7a, 0x10, 0xcc, 0x6d, 0x58, 0xd1, 0x29, 0xdc, 0x75, 0xbb, 0x2c, 0x3b, - 0xad, 0x88, 0xa6, 0xf5, 0x6a, 0x48, 0xd0, 0xf3, 0x75, 0x66, 0x5c, 0xc8, 0xdd, 0x43, 0x7c, 0x1c, - 0x34, 0x78, 0xb2, 0xbc, 0x51, 0x9b, 0x34, 0xaa, 0xbe, 0xa1, 0xc3, 0x6b, 0xae, 0x4b, 0xe3, 0xb5, - 0x4c, 0x60, 0xcb, 0x67, 0xaf, 0x61, 0x72, 0x73, 0x32, 0xda, 0x04, 0x7f, 0xaf, 0x5b, 0x74, 0x2e, - 0x80, 0xa7, 0x1d, 0x5d, 0xc8, 0xd8, 0x43, 0x31, 0x6c, 0x2d, 0xe4, 0xe2, 0xfc, 0x48, 0xf0, 0x0f, - 0x44, 0x57, 0x5f, 0xe2, 0xd1, 0xfe, 0x3b, 0x78, 0x50, 0x89, 0xf6, 0xf6, 0x7b, 0xf6, 0x23, 0x67, - 0xfa, 0xd8, 0x7c, 0x32, 0x9f, 0x03, 0xd7, 0xfc, 0x31, 0xda, 0xfe, 0x34, 0xc3, 0x64, 0x95, 0xcf, - 0x0d, 0xbc, 0x27, 0xa5, 0x75, 0x43, 0xd5, 0x59, 0x60, 0xbf, 0xac, 0x17, 0xbf, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x27, 0x56, 0x8a, 0x08, 0xe9, 0x03, 0x00, 0x00, + // 531 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x93, 0xd1, 0x6e, 0xd3, 0x30, + 0x14, 0x86, 0x49, 0x9b, 0x85, 0xe5, 0x64, 0x94, 0xc8, 0x62, 0x28, 0x0c, 0x26, 0xa2, 0x08, 0x41, + 0x2f, 0x50, 0x22, 0x15, 0x01, 0x37, 0x20, 0x34, 0xba, 0x5d, 0x54, 0x82, 0x69, 0x32, 0x1b, 0x17, + 0xdc, 0x44, 0x5e, 0xea, 0x05, 0x8b, 0xc4, 0xb6, 0x1c, 0x67, 0xac, 0x0f, 0xc1, 0x8b, 0xf0, 0x34, + 0x3c, 0x12, 0xb2, 0x9d, 0x89, 0x0d, 0xad, 0x70, 0x77, 0x8e, 0xfb, 0xfd, 0xc7, 0x7f, 0x8f, 0xff, + 0xc0, 0xd3, 0xf3, 0x99, 0x22, 0xab, 0xbc, 0x12, 0x6d, 0x51, 0x09, 0x45, 0x0b, 0x22, 0x65, 0xa1, + 0x44, 0xaf, 0xa9, 0x2a, 0x2a, 0xc1, 0xcf, 0x58, 0x9d, 0x4b, 0x25, 0xb4, 0x40, 0xdb, 0x97, 0x9c, + 0xa2, 0x39, 0x91, 0x32, 0x77, 0xcc, 0xce, 0x93, 0xbf, 0xe4, 0x95, 0x68, 0x5b, 0xc1, 0x0b, 0x4e, + 0x75, 0x21, 0x85, 0xd2, 0x4e, 0xbc, 0xf3, 0x6c, 0x3d, 0xc5, 0xa9, 0xfe, 0x2e, 0xd4, 0x37, 0x07, + 0x66, 0x1a, 0x82, 0x7d, 0xd1, 0x12, 0xc6, 0xd1, 0x2b, 0xf0, 0xf5, 0x4a, 0xd2, 0xc4, 0x4b, 0xbd, + 0xe9, 0x64, 0x96, 0xe5, 0x37, 0x5e, 0x9f, 0x3b, 0x38, 0x3f, 0x5e, 0x49, 0x8a, 0x2d, 0x8f, 0xee, + 0xc1, 0xc6, 0x39, 0x69, 0x7a, 0x9a, 0x8c, 0x52, 0x6f, 0x1a, 0x62, 0xd7, 0x64, 0x8f, 0xc0, 0x37, + 0x0c, 0x0a, 0x61, 0xe3, 0xa8, 0x21, 0x8c, 0xc7, 0xb7, 0x4c, 0x89, 0x69, 0x4d, 0x2f, 0x62, 0x2f, + 0xcb, 0xc1, 0x9f, 0x2f, 0xf6, 0x31, 0x9a, 0xc0, 0x88, 0x49, 0x7b, 0xe3, 0x16, 0x1e, 0x31, 0x89, + 0xee, 0x43, 0x20, 0x15, 0x3d, 0x63, 0x17, 0x76, 0xd8, 0x1d, 0x3c, 0x74, 0xd9, 0x8f, 0x31, 0x44, + 0x58, 0xf4, 0x9a, 0xf1, 0x1a, 0xf7, 0x0d, 0x45, 0x31, 0x8c, 0x35, 0xa9, 0xad, 0x30, 0xc4, 0xa6, + 0x44, 0x2f, 0x21, 0x58, 0x5a, 0x6b, 0xc9, 0x28, 0x1d, 0x4f, 0xa3, 0xd9, 0xee, 0x3f, 0xfd, 0xe3, + 0x01, 0x46, 0x05, 0xf8, 0x15, 0x5b, 0xaa, 0x64, 0x6c, 0x45, 0x0f, 0xd7, 0x88, 0x8c, 0x57, 0x6c, + 0x41, 0xf4, 0x0e, 0xc0, 0xac, 0xb9, 0x54, 0x84, 0xd7, 0x34, 0xf1, 0x53, 0x6f, 0x1a, 0xcd, 0xd2, + 0xab, 0x32, 0xb7, 0xe9, 0x9c, 0x53, 0x9d, 0x1f, 0x09, 0xa5, 0xb1, 0xe1, 0x70, 0x28, 0x2f, 0x4b, + 0x74, 0x00, 0x5b, 0xc3, 0x0b, 0x94, 0x0d, 0xeb, 0x74, 0xb2, 0x61, 0x47, 0x64, 0x6b, 0x46, 0x1c, + 0x3a, 0xf4, 0x03, 0xeb, 0x34, 0x8e, 0xf8, 0x9f, 0x06, 0xbd, 0x81, 0xa8, 0x13, 0xbd, 0xaa, 0x68, + 0x69, 0xfd, 0x07, 0xff, 0xf7, 0x0f, 0x8e, 0x9f, 0x9b, 0x7f, 0xb1, 0x0b, 0xd0, 0x77, 0x54, 0x95, + 0xb4, 0x25, 0xac, 0x49, 0x6e, 0xa7, 0xe3, 0x69, 0x88, 0x43, 0x73, 0x72, 0x60, 0x0e, 0xd0, 0x63, + 0x88, 0x18, 0x3f, 0x15, 0x3d, 0x5f, 0x96, 0x66, 0xcd, 0x9b, 0xf6, 0x77, 0x18, 0x8e, 0x8e, 0x49, + 0x9d, 0xfd, 0xf2, 0x20, 0x98, 0xdb, 0xb0, 0xa2, 0x13, 0xb8, 0xeb, 0x76, 0x59, 0x76, 0x5a, 0x11, + 0x4d, 0xeb, 0xd5, 0x90, 0xa0, 0xe7, 0xeb, 0xcc, 0xb8, 0x90, 0xbb, 0x87, 0xf8, 0x34, 0x68, 0xf0, + 0x64, 0x79, 0xad, 0x37, 0x69, 0x54, 0x7d, 0x43, 0x87, 0xd7, 0x5c, 0x97, 0xc6, 0x2b, 0x99, 0xc0, + 0x96, 0xcf, 0x5e, 0xc3, 0xe4, 0xfa, 0x64, 0xb4, 0x09, 0xfe, 0x5e, 0xb7, 0xe8, 0x5c, 0x00, 0x4f, + 0x3a, 0xba, 0x90, 0xb1, 0x87, 0x62, 0xd8, 0x5a, 0xc8, 0xc5, 0xd9, 0xa1, 0xe0, 0x1f, 0x89, 0xae, + 0xbe, 0xc6, 0xa3, 0xf7, 0x6f, 0xe1, 0x41, 0x25, 0xda, 0x9b, 0xef, 0x39, 0xf2, 0xbe, 0x04, 0xae, + 0xfa, 0x39, 0xda, 0xfe, 0x3c, 0xc3, 0x64, 0x95, 0xcf, 0x0d, 0xb1, 0x27, 0xa5, 0xb5, 0x40, 0xd5, + 0x69, 0x60, 0x3f, 0xa7, 0x17, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xcb, 0x22, 0xdd, 0x6c, 0xde, + 0x03, 0x00, 0x00, } diff --git a/app/router/config.proto b/app/router/config.proto index 15c81cfb8..cc1ef5379 100644 --- a/app/router/config.proto +++ b/app/router/config.proto @@ -4,7 +4,7 @@ package v2ray.core.app.router; option csharp_namespace = "V2Ray.Core.App.Router"; option go_package = "router"; option java_package = "com.v2ray.core.app.router"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/net/port.proto"; import "v2ray.com/core/common/net/network.proto"; diff --git a/app/web/config.pb.go b/app/web/config.pb.go index 527e24c7d..8a907d101 100644 --- a/app/web/config.pb.go +++ b/app/web/config.pb.go @@ -203,26 +203,26 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/app/web/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 328 bytes of a gzipped FileDescriptorProto + // 324 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x91, 0xcf, 0x4a, 0xc3, 0x40, - 0x10, 0x87, 0x4d, 0xff, 0x04, 0x33, 0xb9, 0x2d, 0x52, 0x42, 0x0f, 0x52, 0xaa, 0x48, 0x4f, 0x1b, - 0x89, 0x37, 0x11, 0xc4, 0xb4, 0x8a, 0x17, 0x51, 0xa2, 0x28, 0x78, 0x50, 0x36, 0xe9, 0x58, 0x17, - 0x9a, 0xec, 0xb2, 0x59, 0x5a, 0xf2, 0x46, 0xe2, 0x53, 0xca, 0xee, 0x46, 0x2b, 0xda, 0x5b, 0x26, - 0xf3, 0xfd, 0x66, 0x26, 0x5f, 0xe0, 0x60, 0x95, 0x28, 0xd6, 0xd0, 0x42, 0x94, 0x71, 0x21, 0x14, - 0xc6, 0x4c, 0xca, 0x78, 0x8d, 0x79, 0x5c, 0x88, 0xea, 0x8d, 0x2f, 0xa8, 0x54, 0x42, 0x0b, 0x42, - 0xbe, 0x21, 0x85, 0x94, 0x49, 0x49, 0xd7, 0x98, 0x0f, 0x8f, 0xff, 0x04, 0x0b, 0x51, 0x96, 0xa2, - 0x8a, 0x6b, 0x54, 0x9c, 0x2d, 0x63, 0xdd, 0x48, 0x9c, 0xbf, 0x96, 0x58, 0xd7, 0x6c, 0x81, 0x6e, - 0xca, 0xf8, 0xc3, 0x03, 0xb8, 0xe2, 0x4b, 0xbc, 0x47, 0xb5, 0x42, 0x45, 0x4e, 0xa1, 0x8f, 0x95, - 0x56, 0x4d, 0xe4, 0x8d, 0xba, 0x93, 0x30, 0x39, 0xa4, 0xff, 0x97, 0xd0, 0x0d, 0x4e, 0x2f, 0x0d, - 0x9b, 0xb9, 0xc8, 0xf0, 0x05, 0xfa, 0xb6, 0x26, 0x7b, 0xd0, 0x33, 0x4c, 0xe4, 0x8d, 0xbc, 0x49, - 0x70, 0xbd, 0x93, 0xd9, 0x8a, 0xec, 0x43, 0x30, 0xe3, 0x0a, 0x0b, 0x2d, 0x54, 0x13, 0x75, 0xda, - 0xd6, 0xe6, 0x15, 0x21, 0xd0, 0x93, 0x4c, 0xbf, 0x47, 0x5d, 0xd3, 0xca, 0xec, 0x73, 0x1a, 0x42, - 0x60, 0xb2, 0xb7, 0x6a, 0xc6, 0xd5, 0x78, 0x0e, 0x7e, 0x7b, 0xe5, 0x00, 0xfc, 0xb9, 0x28, 0x19, - 0xaf, 0xec, 0x99, 0x41, 0xd6, 0x56, 0x24, 0x85, 0xdd, 0x1a, 0xb5, 0xe6, 0xd5, 0xa2, 0xb6, 0x1b, - 0xc2, 0xe4, 0xe8, 0xf7, 0x07, 0x38, 0x1b, 0xd4, 0xd9, 0xa0, 0x0f, 0xc6, 0xc6, 0x8d, 0x93, 0x91, - 0xfd, 0xe4, 0xc6, 0x67, 0xe0, 0x4f, 0xad, 0x66, 0x92, 0x80, 0x5f, 0xdb, 0x7d, 0xad, 0x8c, 0xe1, - 0x36, 0x19, 0xee, 0xa2, 0xac, 0x25, 0xd3, 0x73, 0x18, 0x14, 0xa2, 0xdc, 0x02, 0xa6, 0xa1, 0x9b, - 0x7a, 0x67, 0xac, 0x3f, 0x77, 0xd7, 0x98, 0x7f, 0x76, 0xc8, 0x63, 0x92, 0xb1, 0x86, 0x4e, 0x0d, - 0x76, 0x21, 0x25, 0x7d, 0xc2, 0x3c, 0xf7, 0xed, 0x6f, 0x39, 0xf9, 0x0a, 0x00, 0x00, 0xff, 0xff, - 0xc9, 0x59, 0x48, 0x03, 0x03, 0x02, 0x00, 0x00, + 0x10, 0x87, 0x4d, 0xff, 0x04, 0x33, 0xbd, 0x2d, 0x52, 0x42, 0x0f, 0x52, 0xaa, 0x48, 0x4f, 0x1b, + 0x89, 0x9e, 0xc4, 0x8b, 0x6d, 0x15, 0x2f, 0xa2, 0xac, 0xa2, 0xe0, 0x41, 0xd9, 0xa4, 0x63, 0x5d, + 0x68, 0xb2, 0xcb, 0x64, 0x69, 0xc9, 0x1b, 0x89, 0x4f, 0x29, 0xd9, 0x44, 0x2b, 0xda, 0x5b, 0x26, + 0xf3, 0xfd, 0x76, 0x66, 0xbf, 0x85, 0x83, 0x55, 0x4c, 0xb2, 0xe4, 0xa9, 0xce, 0xa2, 0x54, 0x13, + 0x46, 0xd2, 0x98, 0x68, 0x8d, 0x49, 0x94, 0xea, 0xfc, 0x4d, 0x2d, 0xb8, 0x21, 0x6d, 0x35, 0x63, + 0xdf, 0x10, 0x21, 0x97, 0xc6, 0xf0, 0x35, 0x26, 0x83, 0xe3, 0x3f, 0xc1, 0x54, 0x67, 0x99, 0xce, + 0xa3, 0x02, 0x49, 0xc9, 0x65, 0x64, 0x4b, 0x83, 0xf3, 0xd7, 0x0c, 0x8b, 0x42, 0x2e, 0xb0, 0x3e, + 0x65, 0xf4, 0xe1, 0x01, 0x5c, 0xa9, 0x25, 0xde, 0x23, 0xad, 0x90, 0xd8, 0x19, 0x74, 0x31, 0xb7, + 0x54, 0x86, 0xde, 0xb0, 0x3d, 0xee, 0xc5, 0x87, 0xfc, 0xff, 0x10, 0xbe, 0xc1, 0xf9, 0x65, 0xc5, + 0x8a, 0x3a, 0x32, 0x78, 0x81, 0xae, 0xab, 0xd9, 0x1e, 0x74, 0x2a, 0x26, 0xf4, 0x86, 0xde, 0x38, + 0xb8, 0xde, 0x11, 0xae, 0x62, 0xfb, 0x10, 0xcc, 0x14, 0x61, 0x6a, 0x35, 0x95, 0x61, 0xab, 0x69, + 0x6d, 0x7e, 0x31, 0x06, 0x1d, 0x23, 0xed, 0x7b, 0xd8, 0xae, 0x5a, 0xc2, 0x7d, 0x4f, 0x7a, 0x10, + 0x54, 0xd9, 0x5b, 0x9a, 0x29, 0x1a, 0xcd, 0xc1, 0x6f, 0xb6, 0xec, 0x83, 0x3f, 0xd7, 0x99, 0x54, + 0xb9, 0x5b, 0x33, 0x10, 0x4d, 0xc5, 0x26, 0xb0, 0x5b, 0xa0, 0xb5, 0x2a, 0x5f, 0x14, 0x6e, 0x42, + 0x2f, 0x3e, 0xfa, 0x7d, 0x81, 0xda, 0x06, 0xaf, 0x6d, 0xf0, 0x87, 0xca, 0xc6, 0x4d, 0x2d, 0x43, + 0xfc, 0xe4, 0x46, 0xe7, 0xe0, 0x4f, 0x9d, 0x66, 0x16, 0x83, 0x5f, 0xb8, 0x79, 0x8d, 0x8c, 0xc1, + 0x36, 0x19, 0xf5, 0x46, 0xa2, 0x21, 0x27, 0xa7, 0xd0, 0x4f, 0x75, 0xb6, 0x05, 0xbc, 0xf3, 0x9e, + 0xdb, 0x6b, 0x4c, 0x3e, 0x5b, 0xec, 0x31, 0x16, 0xb2, 0xe4, 0xd3, 0xaa, 0x77, 0x61, 0x0c, 0x7f, + 0xc2, 0x24, 0xf1, 0xdd, 0x5b, 0x9c, 0x7c, 0x05, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x2a, 0xe1, 0x59, + 0xf8, 0x01, 0x00, 0x00, } diff --git a/app/web/config.proto b/app/web/config.proto index 7f80da312..5b81b419f 100644 --- a/app/web/config.proto +++ b/app/web/config.proto @@ -4,7 +4,7 @@ package v2ray.core.app.web; option csharp_namespace = "V2Ray.Core.App.Web"; option go_package = "web"; option java_package = "com.v2ray.core.app.web"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/serial/typed_message.proto"; diff --git a/common/net/address.pb.go b/common/net/address.pb.go index 9d01a9963..7e47420f0 100644 --- a/common/net/address.pb.go +++ b/common/net/address.pb.go @@ -135,7 +135,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/net/address.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 181 bytes of a gzipped FileDescriptorProto + // 174 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x4f, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0xd6, 0x2b, 0x28, @@ -143,9 +143,8 @@ var fileDescriptor0 = []byte{ 0x51, 0x72, 0xe6, 0xe2, 0xf2, 0x0c, 0xf0, 0x2f, 0x72, 0xc9, 0xcf, 0x4d, 0xcc, 0xcc, 0x13, 0x12, 0xe0, 0x62, 0xca, 0x2c, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0xf1, 0x60, 0x08, 0x62, 0xca, 0x2c, 0x10, 0x92, 0xe0, 0x62, 0x4b, 0x01, 0xcb, 0x49, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x7a, 0x30, 0x04, - 0x41, 0xf9, 0x4e, 0x9c, 0x5c, 0xec, 0x50, 0x1b, 0x9c, 0xdc, 0xb8, 0x24, 0x93, 0xf3, 0x73, 0xf5, - 0xb0, 0xda, 0xe0, 0xc4, 0xe3, 0x08, 0x51, 0x15, 0x00, 0x72, 0x46, 0x14, 0x73, 0x5e, 0x6a, 0xc9, - 0x2a, 0x26, 0xd1, 0x30, 0xa3, 0xa0, 0xc4, 0x4a, 0x3d, 0x67, 0x90, 0x52, 0x67, 0x88, 0x52, 0xbf, - 0xd4, 0x92, 0x24, 0x36, 0xb0, 0x53, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x88, 0x8a, 0x6d, - 0x70, 0xd5, 0x00, 0x00, 0x00, + 0x41, 0xf9, 0x4e, 0x9c, 0x5c, 0xec, 0x50, 0x1b, 0x9c, 0xac, 0xb8, 0x24, 0x93, 0xf3, 0x73, 0xf5, + 0xb0, 0xda, 0x10, 0xc0, 0x18, 0xc5, 0x9c, 0x97, 0x5a, 0xb2, 0x8a, 0x49, 0x34, 0xcc, 0x28, 0x28, + 0xb1, 0x52, 0xcf, 0x19, 0x24, 0xed, 0x0c, 0x91, 0xf6, 0x4b, 0x2d, 0x49, 0x62, 0x03, 0x3b, 0xcf, + 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xb4, 0xfa, 0x61, 0xc9, 0x00, 0x00, 0x00, } diff --git a/common/net/address.proto b/common/net/address.proto index 9208fb613..399fcbf50 100644 --- a/common/net/address.proto +++ b/common/net/address.proto @@ -4,7 +4,7 @@ package v2ray.core.common.net; option csharp_namespace = "V2Ray.Core.Common.Net"; option go_package = "net"; option java_package = "com.v2ray.core.common.net"; -option java_outer_classname = "AddressProto"; +option java_multiple_files = true; message IPOrDomain { oneof address { diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go index cdbc5948b..2c6a72bea 100644 --- a/common/net/destination.pb.go +++ b/common/net/destination.pb.go @@ -48,7 +48,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/net/destination.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 237 bytes of a gzipped FileDescriptorProto + // 230 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2e, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x4f, 0x49, 0x2d, 0x2e, 0xc9, 0xcc, 0x4b, 0x2c, 0xc9, 0xcc, @@ -60,8 +60,8 @@ var fileDescriptor1 = []byte{ 0x10, 0x4c, 0xb9, 0x90, 0x35, 0x17, 0x3b, 0xd4, 0x5c, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x45, 0x1c, 0x3a, 0x3d, 0x03, 0xfc, 0x8b, 0x5c, 0xf2, 0x73, 0x13, 0x33, 0xf3, 0x82, 0x60, 0x3a, 0x84, 0x84, 0xb8, 0x58, 0x0a, 0xf2, 0x8b, 0x4a, 0x24, 0x98, 0x15, 0x18, 0x35, 0x78, 0x83, 0xc0, - 0x6c, 0x27, 0x2f, 0x2e, 0xc9, 0xe4, 0xfc, 0x5c, 0xec, 0x86, 0x38, 0x09, 0xb8, 0x20, 0x02, 0x2c, - 0x00, 0xe4, 0x8d, 0x28, 0xe6, 0xbc, 0xd4, 0x92, 0x55, 0x4c, 0xa2, 0x61, 0x46, 0x41, 0x89, 0x95, - 0x7a, 0xce, 0x20, 0xe5, 0xce, 0x10, 0xe5, 0x7e, 0xa9, 0x25, 0x49, 0x6c, 0x60, 0xaf, 0x1a, 0x03, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x3a, 0x5c, 0x8c, 0x82, 0x01, 0x00, 0x00, + 0x6c, 0x27, 0x2b, 0x2e, 0xc9, 0xe4, 0xfc, 0x5c, 0xec, 0x86, 0x04, 0x30, 0x46, 0x31, 0xe7, 0xa5, + 0x96, 0xac, 0x62, 0x12, 0x0d, 0x33, 0x0a, 0x4a, 0xac, 0xd4, 0x73, 0x06, 0x49, 0x3b, 0x43, 0xa4, + 0xfd, 0x52, 0x4b, 0x92, 0xd8, 0xc0, 0x5e, 0x33, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x75, 0xe4, + 0xce, 0x58, 0x72, 0x01, 0x00, 0x00, } diff --git a/common/net/destination.proto b/common/net/destination.proto index d61cb2322..d38105f65 100644 --- a/common/net/destination.proto +++ b/common/net/destination.proto @@ -4,7 +4,7 @@ package v2ray.core.common.net; option csharp_namespace = "V2Ray.Core.Common.Net"; option go_package = "net"; option java_package = "com.v2ray.core.common.net"; -option java_outer_classname = "DestinationProto"; +option java_multiple_files = true; import "v2ray.com/core/common/net/network.proto"; import "v2ray.com/core/common/net/address.proto"; diff --git a/common/net/network.pb.go b/common/net/network.pb.go index 0e81d0709..5f83fee22 100644 --- a/common/net/network.pb.go +++ b/common/net/network.pb.go @@ -62,7 +62,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/net/network.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 203 bytes of a gzipped FileDescriptorProto + // 198 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0x01, 0xe1, 0xf2, 0xfc, 0xa2, 0x6c, 0xbd, 0x82, 0xa2, 0xfc, 0x92, @@ -72,8 +72,8 @@ var fileDescriptor2 = []byte{ 0xb5, 0x2c, 0xb8, 0xd8, 0xa1, 0x62, 0x42, 0xdc, 0x5c, 0xec, 0xa1, 0x79, 0xd9, 0x79, 0xf9, 0xe5, 0x79, 0x02, 0x0c, 0x42, 0x7c, 0x5c, 0x6c, 0x41, 0x89, 0xe5, 0x21, 0xce, 0x01, 0x02, 0x8c, 0x52, 0x4c, 0x1c, 0x8c, 0x42, 0xec, 0x5c, 0xcc, 0x20, 0x0e, 0x13, 0x88, 0x11, 0xea, 0x12, 0x20, 0xc0, - 0xec, 0xe4, 0xc6, 0x25, 0x99, 0x9c, 0x9f, 0x8b, 0xdd, 0x1e, 0x27, 0x1e, 0xa8, 0xa1, 0x01, 0x20, - 0x4f, 0x44, 0x31, 0xe7, 0xa5, 0x96, 0xac, 0x62, 0x12, 0x0d, 0x33, 0x0a, 0x4a, 0xac, 0xd4, 0x73, - 0x06, 0x29, 0x75, 0x86, 0x28, 0xf5, 0x4b, 0x2d, 0x49, 0x62, 0x03, 0x7b, 0xd4, 0x18, 0x10, 0x00, - 0x00, 0xff, 0xff, 0x3c, 0x17, 0x32, 0x51, 0x13, 0x01, 0x00, 0x00, + 0xec, 0x64, 0xc5, 0x25, 0x99, 0x9c, 0x9f, 0x8b, 0xdd, 0x9e, 0x00, 0xc6, 0x28, 0xe6, 0xbc, 0xd4, + 0x92, 0x55, 0x4c, 0xa2, 0x61, 0x46, 0x41, 0x89, 0x95, 0x7a, 0xce, 0x20, 0x69, 0x67, 0x88, 0xb4, + 0x5f, 0x6a, 0x49, 0x12, 0x1b, 0xd8, 0x73, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xef, 0x75, + 0xd9, 0x5b, 0x07, 0x01, 0x00, 0x00, } diff --git a/common/net/network.proto b/common/net/network.proto index 4356092ad..ee51bf3de 100644 --- a/common/net/network.proto +++ b/common/net/network.proto @@ -4,7 +4,7 @@ package v2ray.core.common.net; option csharp_namespace = "V2Ray.Core.Common.Net"; option go_package = "net"; option java_package = "com.v2ray.core.common.net"; -option java_outer_classname = "NetworkProto"; +option java_multiple_files = true; enum Network { Unknown = 0; diff --git a/common/net/port.pb.go b/common/net/port.pb.go index 7be620b5c..7d60365fd 100644 --- a/common/net/port.pb.go +++ b/common/net/port.pb.go @@ -41,16 +41,15 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/net/port.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 163 bytes of a gzipped FileDescriptorProto + // 158 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x29, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x2f, 0xc8, 0x2f, 0x2a, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xa9, 0x2a, 0x4a, 0xd5, 0x83, 0xa8, 0xd0, 0xcb, 0x4b, 0x2d, 0x51, 0xd2, 0xe7, 0xe2, 0x0c, 0xc8, 0x2f, 0x2a, 0x09, 0x4a, 0xcc, 0x4b, 0x4f, 0x15, 0x12, 0xe2, 0x62, 0x71, 0x2b, 0xca, 0xcf, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0d, 0x02, 0xb3, 0x85, 0xf8, 0xb8, 0x98, 0x42, - 0xf2, 0x25, 0x98, 0xc0, 0x22, 0x4c, 0x21, 0xf9, 0x4e, 0xce, 0x5c, 0x92, 0xc9, 0xf9, 0xb9, 0x7a, - 0x58, 0x4d, 0x73, 0x02, 0x9b, 0x15, 0x00, 0xb2, 0x2f, 0x8a, 0x39, 0x2f, 0xb5, 0x64, 0x15, 0x93, - 0x68, 0x98, 0x51, 0x50, 0x62, 0xa5, 0x9e, 0x33, 0x48, 0x9d, 0x33, 0x44, 0x9d, 0x5f, 0x6a, 0x49, - 0x12, 0x1b, 0xd8, 0x4d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, 0xed, 0x95, 0xd7, 0xbb, - 0x00, 0x00, 0x00, + 0xf2, 0x25, 0x98, 0xc0, 0x22, 0x4c, 0x21, 0xf9, 0x4e, 0x56, 0x5c, 0x92, 0xc9, 0xf9, 0xb9, 0x7a, + 0x58, 0x4d, 0x0b, 0x60, 0x8c, 0x62, 0xce, 0x4b, 0x2d, 0x59, 0xc5, 0x24, 0x1a, 0x66, 0x14, 0x94, + 0x58, 0xa9, 0xe7, 0x0c, 0x92, 0x76, 0x86, 0x48, 0xfb, 0xa5, 0x96, 0x24, 0xb1, 0x81, 0x9d, 0x62, + 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x0f, 0x6a, 0xc0, 0xb2, 0x00, 0x00, 0x00, } diff --git a/common/net/port.proto b/common/net/port.proto index be2a48630..ed04f871a 100644 --- a/common/net/port.proto +++ b/common/net/port.proto @@ -4,7 +4,7 @@ package v2ray.core.common.net; option csharp_namespace = "V2Ray.Core.Common.Net"; option go_package = "net"; option java_package = "com.v2ray.core.common.net"; -option java_outer_classname = "PortProto"; +option java_multiple_files = true; // PortRange represents a range of ports. message PortRange { diff --git a/common/protocol/command.pb.go b/common/protocol/command.pb.go index 27394947c..47fd5bec7 100644 --- a/common/protocol/command.pb.go +++ b/common/protocol/command.pb.go @@ -48,22 +48,22 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/protocol/command.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 266 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0xc1, 0x4a, 0xc4, 0x30, - 0x10, 0x86, 0xa9, 0x82, 0x2c, 0x55, 0x14, 0x7a, 0xd2, 0x1e, 0x44, 0x3c, 0x88, 0xa0, 0x4c, 0xa4, - 0x3e, 0x81, 0xed, 0x59, 0x5c, 0xba, 0xab, 0x07, 0x2f, 0x4b, 0x36, 0x1d, 0x4b, 0xa1, 0xc9, 0x94, - 0x64, 0x76, 0xa1, 0xaf, 0xe4, 0xdd, 0xf7, 0x93, 0x26, 0xdb, 0x22, 0xea, 0x1e, 0xf3, 0xe7, 0xff, - 0x3f, 0x3e, 0x26, 0xbe, 0xdf, 0x66, 0x56, 0xf6, 0xa0, 0x48, 0x0b, 0x45, 0x16, 0x85, 0x22, 0xad, - 0xc9, 0x88, 0xce, 0x12, 0x93, 0xa2, 0xd6, 0xbf, 0xa5, 0xa9, 0xc0, 0x07, 0x49, 0x3a, 0xb6, 0x2d, - 0x42, 0x68, 0xc2, 0xd8, 0x4c, 0x1f, 0xfe, 0x27, 0x39, 0xb4, 0x8d, 0x6c, 0x05, 0xf7, 0x1d, 0x56, - 0x2b, 0x8d, 0xce, 0xc9, 0x1a, 0xc3, 0x28, 0x85, 0x5f, 0x0b, 0xb6, 0xd2, 0xb8, 0x8e, 0x2c, 0x8b, - 0xc6, 0x30, 0x5a, 0x83, 0x2c, 0x14, 0x99, 0x8f, 0xa6, 0x0e, 0xfd, 0xeb, 0xaf, 0x28, 0xbe, 0x78, - 0x6a, 0x87, 0x1f, 0xc9, 0xcd, 0x16, 0x5f, 0x36, 0xbc, 0xa6, 0x8d, 0xa9, 0x0a, 0xdf, 0x49, 0xf2, - 0x78, 0xe6, 0x90, 0xb9, 0x31, 0xb5, 0x3b, 0x8f, 0xae, 0xa2, 0xdb, 0xe3, 0xec, 0x06, 0xfe, 0xea, - 0x06, 0x1d, 0x58, 0x0e, 0x3a, 0xcf, 0xc1, 0xa6, 0x9c, 0x76, 0xc9, 0x32, 0x3e, 0x73, 0x6c, 0x51, - 0xea, 0xd5, 0x84, 0x3a, 0xf4, 0xa8, 0xbb, 0x9f, 0xa8, 0xc9, 0x13, 0x46, 0x4f, 0x58, 0xf8, 0x55, - 0x30, 0x29, 0x4f, 0x03, 0x63, 0xb1, 0x43, 0xe4, 0xaf, 0xf1, 0xa5, 0x22, 0x0d, 0xfb, 0x6f, 0x97, - 0x9f, 0x14, 0xe1, 0xcc, 0xf3, 0x21, 0x78, 0x9f, 0x8d, 0xf9, 0xe7, 0x41, 0xfa, 0x96, 0x95, 0xb2, - 0x87, 0x62, 0x18, 0x15, 0x61, 0x34, 0xdf, 0x7d, 0xae, 0x8f, 0x7c, 0xed, 0xf1, 0x3b, 0x00, 0x00, - 0xff, 0xff, 0xea, 0x88, 0xd0, 0xa5, 0xc3, 0x01, 0x00, 0x00, + // 262 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0xcf, 0x4a, 0xc3, 0x40, + 0x10, 0x87, 0x89, 0x82, 0x94, 0x08, 0x0a, 0x39, 0x69, 0x0e, 0x22, 0x1e, 0x44, 0x50, 0x66, 0x25, + 0x3e, 0x81, 0xcd, 0xc9, 0x83, 0x58, 0xd2, 0xe2, 0xc1, 0x4b, 0xd9, 0x6e, 0xc6, 0xb0, 0x90, 0xdd, + 0x09, 0xbb, 0xd3, 0x42, 0x5e, 0xc9, 0xbb, 0xef, 0x27, 0xd9, 0x6d, 0x82, 0xf8, 0xe7, 0x96, 0x64, + 0xbe, 0xdf, 0xc7, 0x47, 0xd2, 0xbb, 0x5d, 0xe1, 0x64, 0x0f, 0x8a, 0x8c, 0x50, 0xe4, 0x50, 0x28, + 0x32, 0x86, 0xac, 0xe8, 0x1c, 0x31, 0x29, 0x6a, 0xc3, 0xbb, 0xb4, 0x35, 0x84, 0x0f, 0x59, 0x3e, + 0xd2, 0x0e, 0x21, 0x92, 0x30, 0x92, 0xf9, 0xfd, 0xdf, 0x26, 0x8f, 0x4e, 0xcb, 0x56, 0x70, 0xdf, + 0x61, 0xbd, 0x36, 0xe8, 0xbd, 0x6c, 0x30, 0x8e, 0x72, 0xf8, 0xb1, 0x60, 0x27, 0xad, 0xef, 0xc8, + 0xb1, 0xd0, 0x96, 0xd1, 0x59, 0x64, 0xa1, 0xc8, 0xbe, 0xeb, 0x26, 0xf2, 0x57, 0x9f, 0x49, 0x7a, + 0xfe, 0xd8, 0x0e, 0x17, 0xc9, 0x7a, 0x87, 0x2f, 0x5b, 0xde, 0xd0, 0xd6, 0xd6, 0x65, 0x60, 0xb2, + 0x79, 0x3a, 0xf3, 0xc8, 0xac, 0x6d, 0xe3, 0xcf, 0x92, 0xcb, 0xe4, 0xe6, 0xb8, 0xb8, 0x86, 0xdf, + 0xb9, 0x31, 0x07, 0x56, 0x43, 0xce, 0x73, 0xac, 0xa9, 0xa6, 0x5d, 0xb6, 0x4a, 0x4f, 0x3d, 0x3b, + 0x94, 0x66, 0x3d, 0xa9, 0x0e, 0x83, 0xea, 0xf6, 0xbb, 0x6a, 0xea, 0x84, 0xb1, 0x13, 0x96, 0x61, + 0x15, 0x4b, 0xaa, 0x93, 0xe8, 0x58, 0xee, 0x15, 0xf3, 0xa7, 0xf4, 0x42, 0x91, 0x81, 0xff, 0xff, + 0xdd, 0x22, 0x79, 0x9b, 0x8d, 0xcf, 0x1f, 0x07, 0xf9, 0x6b, 0x51, 0xc9, 0x1e, 0xca, 0x01, 0x2c, + 0x23, 0xb8, 0xd8, 0x1f, 0x37, 0x47, 0x01, 0x7b, 0xf8, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x86, 0xeb, + 0x0e, 0x01, 0xb7, 0x01, 0x00, 0x00, } diff --git a/common/protocol/command.proto b/common/protocol/command.proto index a44f6a884..9ac9bff5b 100644 --- a/common/protocol/command.proto +++ b/common/protocol/command.proto @@ -4,7 +4,7 @@ package v2ray.core.common.protocol; option csharp_namespace = "V2Ray.Core.Common.Protocol"; option go_package = "protocol"; option java_package = "com.v2ray.core.common.protocol"; -option java_outer_classname = "CommandProto"; +option java_multiple_files = true; import "v2ray.com/core/common/serial/typed_message.proto"; import "v2ray.com/core/transport/internet/config.proto"; diff --git a/common/protocol/headers.pb.go b/common/protocol/headers.pb.go index e0696f842..70ff78e3c 100644 --- a/common/protocol/headers.pb.go +++ b/common/protocol/headers.pb.go @@ -66,7 +66,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/protocol/headers.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 259 bytes of a gzipped FileDescriptorProto + // 252 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x29, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0xce, 0xcf, 0xd1, 0xcf, 0x48, 0x4d, 0x4c, 0x49, @@ -79,9 +79,8 @@ var fileDescriptor1 = []byte{ 0xc4, 0xc1, 0xc5, 0xe2, 0x18, 0x1a, 0xe2, 0x2f, 0xc0, 0x24, 0xc4, 0xc7, 0xc5, 0xe5, 0xe8, 0x1a, 0x6c, 0x68, 0x64, 0x11, 0xef, 0xee, 0xec, 0x2b, 0xc0, 0x2c, 0x24, 0xca, 0x25, 0xe8, 0xec, 0xe1, 0xe8, 0xec, 0xe1, 0x68, 0x64, 0x10, 0x1f, 0xe0, 0xef, 0x13, 0x69, 0x68, 0x6c, 0x60, 0x2a, 0xc0, - 0x02, 0xd2, 0xe0, 0xe7, 0xef, 0xe7, 0x2a, 0xc0, 0xea, 0x14, 0xca, 0x25, 0x97, 0x9c, 0x9f, 0x8b, - 0xc7, 0x61, 0x4e, 0x3c, 0x1e, 0x90, 0x00, 0x08, 0x00, 0x09, 0x44, 0x71, 0xc0, 0xc4, 0x57, 0x31, - 0x49, 0x85, 0x19, 0x05, 0x25, 0x56, 0xea, 0x39, 0x83, 0x34, 0x39, 0x43, 0x34, 0x05, 0x40, 0x25, - 0x93, 0xd8, 0xc0, 0xca, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xc5, 0x09, 0x7c, 0x5d, - 0x01, 0x00, 0x00, + 0x02, 0xd2, 0xe0, 0xe7, 0xef, 0xe7, 0x2a, 0xc0, 0xea, 0xe4, 0xc9, 0x25, 0x97, 0x9c, 0x9f, 0x8b, + 0xc7, 0x61, 0x01, 0x8c, 0x51, 0x1c, 0x30, 0xf6, 0x2a, 0x26, 0xa9, 0x30, 0xa3, 0xa0, 0xc4, 0x4a, + 0x3d, 0x67, 0x90, 0x42, 0x67, 0x88, 0xc2, 0x00, 0xa8, 0x64, 0x12, 0x1b, 0x58, 0x99, 0x31, 0x20, + 0x00, 0x00, 0xff, 0xff, 0x0b, 0xc1, 0xe1, 0x94, 0x51, 0x01, 0x00, 0x00, } diff --git a/common/protocol/headers.proto b/common/protocol/headers.proto index c48b2fe16..ea37d48c4 100644 --- a/common/protocol/headers.proto +++ b/common/protocol/headers.proto @@ -4,7 +4,7 @@ package v2ray.core.common.protocol; option csharp_namespace = "V2Ray.Core.Common.Protocol"; option go_package = "protocol"; option java_package = "com.v2ray.core.common.protocol"; -option java_outer_classname = "HeadersProto"; +option java_multiple_files = true; enum SecurityType { UNKNOWN = 0; diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go index f48340522..0c68a8464 100644 --- a/common/protocol/server_spec.pb.go +++ b/common/protocol/server_spec.pb.go @@ -49,21 +49,21 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/protocol/server_spec.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 251 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0x3f, 0x4f, 0xf3, 0x30, - 0x10, 0xc6, 0x95, 0xb6, 0x7a, 0x5f, 0xe4, 0x0a, 0x90, 0x3c, 0x45, 0x19, 0x50, 0x60, 0x21, 0x2c, - 0x67, 0x14, 0xd8, 0xd8, 0x5a, 0x18, 0x98, 0x88, 0x52, 0x81, 0x10, 0x0b, 0x0a, 0xce, 0x0d, 0x95, - 0xb0, 0xcf, 0x3a, 0x9b, 0x4a, 0xfd, 0x24, 0x7c, 0x07, 0x3e, 0x25, 0x8a, 0xdd, 0x4c, 0xfc, 0xdb, - 0xac, 0xbb, 0xdf, 0xef, 0x9e, 0xc7, 0xe2, 0x7c, 0x53, 0x73, 0xb7, 0x05, 0x4d, 0x46, 0x69, 0x62, - 0x54, 0x9a, 0x8c, 0x21, 0xab, 0x1c, 0x53, 0x20, 0x4d, 0xaf, 0xca, 0x23, 0x6f, 0x90, 0x9f, 0xbd, - 0x43, 0x0d, 0x71, 0x28, 0x8b, 0xd1, 0x60, 0x84, 0x44, 0xc3, 0x48, 0x17, 0xa7, 0xdf, 0x5f, 0xb3, - 0x18, 0x54, 0xd7, 0xf7, 0x8c, 0xde, 0x27, 0xb6, 0x38, 0xfb, 0x23, 0xf6, 0xcd, 0x23, 0x27, 0xf4, - 0xe4, 0x3d, 0x13, 0x07, 0xab, 0xd8, 0xe2, 0xc6, 0xf6, 0x8e, 0xd6, 0x36, 0xc8, 0x2b, 0xf1, 0x7f, - 0x77, 0x2e, 0xcf, 0xca, 0xac, 0x9a, 0xd7, 0xc7, 0xf0, 0xb5, 0x94, 0xc5, 0x00, 0xb7, 0xcd, 0x1d, - 0x5f, 0x93, 0xe9, 0xd6, 0xb6, 0x1d, 0x0d, 0x29, 0xc5, 0xcc, 0x11, 0x87, 0x7c, 0x52, 0x66, 0xd5, - 0x7e, 0x1b, 0xdf, 0xf2, 0x52, 0xcc, 0x86, 0xc4, 0x7c, 0x5a, 0x4e, 0xab, 0x79, 0x5d, 0xc2, 0xcf, - 0x5f, 0x84, 0x7b, 0x8f, 0xdc, 0x46, 0x7a, 0xf1, 0x28, 0x8e, 0x34, 0x99, 0x5f, 0xe0, 0xc5, 0x61, - 0x2a, 0xbe, 0x72, 0xa8, 0x9b, 0x61, 0xf6, 0xb4, 0x37, 0xae, 0x3e, 0x26, 0xc5, 0x43, 0xdd, 0x76, - 0x5b, 0x58, 0x0e, 0xde, 0x32, 0x79, 0xcd, 0x6e, 0xf9, 0xf2, 0x2f, 0x62, 0x17, 0x9f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x90, 0x81, 0xc4, 0x33, 0x9e, 0x01, 0x00, 0x00, + // 241 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0xcf, 0xbd, 0x4e, 0xc3, 0x30, + 0x10, 0x07, 0x70, 0xb9, 0xad, 0x00, 0xb9, 0x82, 0xc1, 0x53, 0x94, 0x01, 0x05, 0x16, 0xc2, 0x72, + 0x46, 0x81, 0x8d, 0x8d, 0xc2, 0xd0, 0x89, 0x28, 0x08, 0x06, 0x16, 0x14, 0x9c, 0x1b, 0x2a, 0x61, + 0x5f, 0x74, 0x36, 0x95, 0xfa, 0x24, 0xbc, 0x03, 0x4f, 0x89, 0x6a, 0xd7, 0x13, 0x5f, 0xdb, 0xc9, + 0xfe, 0xdd, 0xdd, 0xff, 0xe4, 0xc5, 0xba, 0xe1, 0x7e, 0x03, 0x86, 0xac, 0x36, 0xc4, 0xa8, 0x0d, + 0x59, 0x4b, 0x4e, 0x8f, 0x4c, 0x81, 0x0c, 0xbd, 0x69, 0x8f, 0xbc, 0x46, 0x7e, 0xf1, 0x23, 0x1a, + 0x88, 0x8f, 0xaa, 0xcc, 0x1d, 0x8c, 0x90, 0x34, 0x64, 0x5d, 0x9e, 0xfd, 0x3c, 0xcd, 0x61, 0xd0, + 0xfd, 0x30, 0x30, 0x7a, 0x9f, 0x6c, 0x79, 0xfe, 0xcf, 0xda, 0x77, 0x8f, 0x9c, 0xe8, 0xe9, 0x87, + 0x90, 0x47, 0x0f, 0x31, 0xc5, 0x9d, 0x1b, 0x46, 0x5a, 0xb9, 0xa0, 0xae, 0xe5, 0xfe, 0x6e, 0x5c, + 0x21, 0x2a, 0x51, 0xcf, 0x9b, 0x13, 0xf8, 0x1e, 0xca, 0x61, 0x80, 0x65, 0x7b, 0xcf, 0xb7, 0x64, + 0xfb, 0x95, 0xeb, 0x72, 0x87, 0x52, 0x72, 0x36, 0x12, 0x87, 0x62, 0x52, 0x89, 0xfa, 0xb0, 0x8b, + 0xb5, 0xba, 0x92, 0xb3, 0xed, 0xc6, 0x62, 0x5a, 0x4d, 0xeb, 0x79, 0x53, 0xc1, 0xef, 0x27, 0xc2, + 0xa3, 0x47, 0xee, 0xa2, 0xbe, 0x59, 0xca, 0x63, 0x43, 0xf6, 0x0f, 0xdc, 0x8a, 0xe7, 0x83, 0x5c, + 0x7f, 0x4e, 0xca, 0xa7, 0xa6, 0xeb, 0x37, 0xb0, 0xd8, 0xc2, 0x45, 0x82, 0xed, 0xee, 0xf3, 0x75, + 0x2f, 0xb2, 0xcb, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x61, 0xa2, 0x3c, 0x8f, 0x01, 0x00, + 0x00, } diff --git a/common/protocol/server_spec.proto b/common/protocol/server_spec.proto index 41fd512d9..55b6d4ca4 100644 --- a/common/protocol/server_spec.proto +++ b/common/protocol/server_spec.proto @@ -4,7 +4,7 @@ package v2ray.core.common.protocol; option csharp_namespace = "V2Ray.Core.Common.Protocol"; option go_package = "protocol"; option java_package = "com.v2ray.core.common.protocol"; -option java_outer_classname = "ServerSpecProto"; +option java_multiple_files = true; import "v2ray.com/core/common/net/address.proto"; import "v2ray.com/core/common/protocol/user.proto"; diff --git a/common/protocol/user.pb.go b/common/protocol/user.pb.go index f7cb40120..e63349836 100644 --- a/common/protocol/user.pb.go +++ b/common/protocol/user.pb.go @@ -50,19 +50,19 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/protocol/user.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 222 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x8f, 0xcf, 0x4a, 0xc4, 0x30, - 0x10, 0xc6, 0xc9, 0xfa, 0x77, 0x23, 0x5e, 0x8a, 0x87, 0xd2, 0x83, 0x14, 0x0f, 0x52, 0x2f, 0x13, - 0xa9, 0x2f, 0x20, 0xbb, 0x67, 0xa1, 0x04, 0xf5, 0xe0, 0x45, 0x62, 0x1c, 0xa4, 0x90, 0x74, 0x4a, - 0x92, 0x16, 0xfa, 0x4a, 0x3e, 0xa5, 0xa4, 0x31, 0x27, 0xdd, 0xe3, 0x37, 0xf9, 0xfd, 0xf2, 0xcd, - 0xf0, 0xbb, 0xb9, 0x75, 0x6a, 0x01, 0x4d, 0x56, 0x68, 0x72, 0x28, 0x34, 0x59, 0x4b, 0x83, 0x18, - 0x1d, 0x05, 0xd2, 0x64, 0xc4, 0xe4, 0xd1, 0xc1, 0x9a, 0x8a, 0x2a, 0xa3, 0x0e, 0x21, 0x61, 0x90, - 0xb1, 0xea, 0xfe, 0xff, 0x6f, 0x3c, 0xba, 0x5e, 0x19, 0x11, 0x96, 0x11, 0x3f, 0xdf, 0x2d, 0x7a, - 0xaf, 0xbe, 0x30, 0x49, 0x37, 0x81, 0x1f, 0xbf, 0x78, 0x74, 0xc5, 0x15, 0x3f, 0x31, 0x38, 0xa3, - 0x29, 0x59, 0xcd, 0x9a, 0x4b, 0x99, 0x42, 0x9c, 0xa2, 0x55, 0xbd, 0x29, 0x37, 0x35, 0x6b, 0xb6, - 0x32, 0x85, 0xe2, 0x91, 0x9f, 0x29, 0xad, 0x69, 0x1a, 0x42, 0x79, 0x54, 0xb3, 0xe6, 0xa2, 0xbd, - 0x85, 0xbf, 0x3b, 0xa5, 0x4e, 0x78, 0x8e, 0x9d, 0x4f, 0xa9, 0x52, 0x66, 0x6d, 0x27, 0xf9, 0xb5, - 0x26, 0x0b, 0x87, 0x2f, 0xd9, 0x6d, 0xe3, 0x56, 0x5d, 0x4c, 0x6f, 0xe7, 0x79, 0xf8, 0xbd, 0xa9, - 0x5e, 0x5b, 0xa9, 0x16, 0xd8, 0x47, 0x63, 0x9f, 0x8c, 0xee, 0xf7, 0xf1, 0xe3, 0x74, 0xc5, 0x1e, - 0x7e, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x5d, 0xb5, 0xb7, 0x4b, 0x01, 0x00, 0x00, + // 218 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2c, 0x33, 0x2a, 0x4a, + 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, + 0xcf, 0xd3, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0xce, 0xcf, 0xd1, 0x2f, 0x2d, 0x4e, 0x2d, 0xd2, + 0x03, 0xf3, 0x84, 0xa4, 0x60, 0x4a, 0x8b, 0x52, 0xf5, 0x20, 0xca, 0xf4, 0x60, 0xca, 0xa4, 0x0c, + 0xb0, 0x1b, 0x53, 0x9c, 0x5a, 0x94, 0x99, 0x98, 0xa3, 0x5f, 0x52, 0x59, 0x90, 0x9a, 0x12, 0x9f, + 0x9b, 0x5a, 0x5c, 0x9c, 0x98, 0x9e, 0x0a, 0xd1, 0xa4, 0x54, 0xc2, 0xc5, 0x12, 0x5a, 0x9c, 0x5a, + 0x24, 0x24, 0xc2, 0xc5, 0x9a, 0x93, 0x5a, 0x96, 0x9a, 0x23, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x1b, + 0x04, 0xe1, 0x80, 0x44, 0x53, 0x73, 0x13, 0x33, 0x73, 0x24, 0x98, 0x14, 0x18, 0x35, 0x38, 0x83, + 0x20, 0x1c, 0x21, 0x07, 0x2e, 0xf6, 0xc4, 0xe4, 0xe4, 0xfc, 0xd2, 0xbc, 0x12, 0x09, 0x66, 0x05, + 0x46, 0x0d, 0x6e, 0x23, 0x35, 0x3d, 0x4c, 0x37, 0x41, 0xec, 0xd4, 0x0b, 0x01, 0xd9, 0xe9, 0x0b, + 0xb1, 0x32, 0x08, 0xa6, 0xcd, 0xc9, 0x93, 0x4b, 0x2e, 0x39, 0x3f, 0x57, 0x0f, 0xb7, 0x4f, 0x02, + 0x18, 0xa3, 0x38, 0x60, 0xec, 0x55, 0x4c, 0x52, 0x61, 0x46, 0x41, 0x89, 0x95, 0x7a, 0xce, 0x20, + 0x85, 0xce, 0x10, 0x85, 0x01, 0x50, 0xc9, 0x24, 0x36, 0xb0, 0x32, 0x63, 0x40, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x02, 0xf5, 0x15, 0xcc, 0x42, 0x01, 0x00, 0x00, } diff --git a/common/protocol/user.proto b/common/protocol/user.proto index ddbb72a95..87fb729f1 100644 --- a/common/protocol/user.proto +++ b/common/protocol/user.proto @@ -4,7 +4,7 @@ package v2ray.core.common.protocol; option csharp_namespace = "V2Ray.Core.Common.Protocol"; option go_package = "protocol"; option java_package = "com.v2ray.core.common.protocol"; -option java_outer_classname = "UserProto"; +option java_multiple_files = true; import "v2ray.com/core/common/serial/typed_message.proto"; diff --git a/common/serial/typed_message.pb.go b/common/serial/typed_message.pb.go index 1b37ac8ce..ef6a33644 100644 --- a/common/serial/typed_message.pb.go +++ b/common/serial/typed_message.pb.go @@ -49,7 +49,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/serial/typed_message.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 174 bytes of a gzipped FileDescriptorProto + // 168 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0x28, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0x2f, 0x4e, 0x2d, 0xca, 0x4c, 0xcc, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x4d, 0x89, 0xcf, @@ -57,8 +57,8 @@ var fileDescriptor0 = []byte{ 0x28, 0x4a, 0xd5, 0x83, 0xa8, 0xd6, 0x83, 0xa8, 0x56, 0xb2, 0xe0, 0xe2, 0x09, 0x01, 0x69, 0xf0, 0x85, 0xa8, 0x17, 0x12, 0xe2, 0x62, 0x01, 0x19, 0x20, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0x66, 0x0b, 0x89, 0x70, 0xb1, 0x96, 0x25, 0xe6, 0x94, 0xa6, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0xf0, - 0x04, 0x41, 0x38, 0x4e, 0x21, 0x5c, 0x32, 0xc9, 0xf9, 0xb9, 0x7a, 0xb8, 0x4c, 0x76, 0x12, 0x44, - 0x36, 0x37, 0x00, 0xe4, 0x8c, 0x28, 0x36, 0x88, 0xd4, 0x2a, 0x26, 0x89, 0x30, 0xa3, 0xa0, 0xc4, - 0x4a, 0x3d, 0x67, 0x90, 0x2e, 0x67, 0x88, 0xae, 0x60, 0xb0, 0x54, 0x12, 0x1b, 0xd8, 0xc1, 0xc6, - 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x74, 0x15, 0xc3, 0xe2, 0xe4, 0x00, 0x00, 0x00, + 0x04, 0x41, 0x38, 0x4e, 0xce, 0x5c, 0x32, 0xc9, 0xf9, 0xb9, 0x7a, 0xb8, 0x4c, 0x0e, 0x60, 0x8c, + 0x62, 0x83, 0xb0, 0x56, 0x31, 0x49, 0x84, 0x19, 0x05, 0x25, 0x56, 0xea, 0x39, 0x83, 0x14, 0x39, + 0x43, 0x14, 0x05, 0x83, 0xa5, 0x92, 0xd8, 0xc0, 0xee, 0x33, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, + 0x2f, 0x28, 0xe9, 0x5b, 0xd3, 0x00, 0x00, 0x00, } diff --git a/common/serial/typed_message.proto b/common/serial/typed_message.proto index fba8e029a..d8b8f3080 100644 --- a/common/serial/typed_message.proto +++ b/common/serial/typed_message.proto @@ -4,7 +4,7 @@ package v2ray.core.common.serial; option csharp_namespace = "V2Ray.Core.Common.Serial"; option go_package = "serial"; option java_package = "com.v2ray.core.common.serial"; -option java_outer_classname = "TypedMessageProto"; +option java_multiple_files = true; // Serialized proto message along with its type name. message TypedMessage { diff --git a/config.pb.go b/config.pb.go index 74e9909bc..0363cf1fe 100644 --- a/config.pb.go +++ b/config.pb.go @@ -91,26 +91,25 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 321 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0xcd, 0x4a, 0xf3, 0x40, - 0x14, 0x86, 0xbf, 0xb6, 0xf9, 0x6a, 0x3c, 0x2d, 0x52, 0x66, 0x55, 0xaa, 0x8b, 0x22, 0x58, 0x8a, - 0xe0, 0xa4, 0xc4, 0x8d, 0xb8, 0x6c, 0xc1, 0x9f, 0x82, 0x56, 0xaa, 0xb8, 0x70, 0x23, 0xd3, 0x74, - 0x5a, 0x0a, 0x9d, 0x39, 0xc3, 0x64, 0x22, 0xe6, 0x52, 0xbc, 0x05, 0xaf, 0x52, 0x92, 0x49, 0xd2, - 0xa4, 0xe2, 0xf6, 0x9c, 0xf7, 0x79, 0xe6, 0xcc, 0x0b, 0xc7, 0x1f, 0xbe, 0x66, 0x31, 0x0d, 0x50, - 0x78, 0x01, 0x6a, 0xee, 0x05, 0x28, 0x57, 0x9b, 0x35, 0x55, 0x1a, 0x0d, 0x12, 0xc8, 0x97, 0x9a, - 0xf7, 0x86, 0x7b, 0x41, 0xa6, 0x94, 0xa7, 0x34, 0x7e, 0xc6, 0x82, 0xc9, 0x0a, 0xd5, 0x1b, 0xfd, - 0x52, 0x0a, 0x81, 0xd2, 0x0b, 0xb9, 0xde, 0xb0, 0xad, 0x67, 0x62, 0xc5, 0x97, 0xef, 0x82, 0x87, - 0x21, 0x5b, 0xf3, 0x8c, 0x38, 0xdb, 0x23, 0x8c, 0x66, 0x32, 0x54, 0xa8, 0x4d, 0x45, 0x7c, 0xfa, - 0x55, 0x87, 0xe6, 0x24, 0x1d, 0x90, 0x5b, 0x38, 0xd8, 0xc8, 0x05, 0x46, 0x72, 0xd9, 0xad, 0xf5, - 0x1b, 0xc3, 0x96, 0x7f, 0x41, 0x77, 0xb7, 0x52, 0xa6, 0x14, 0xcd, 0x6f, 0xa3, 0xf7, 0x36, 0x77, - 0xc7, 0xe4, 0x72, 0xcb, 0xb5, 0xe5, 0xe7, 0x39, 0x4d, 0xa6, 0xe0, 0x62, 0x64, 0xac, 0xa9, 0x9e, - 0x9a, 0xe8, 0x9f, 0xa6, 0x59, 0x16, 0xac, 0xaa, 0x0a, 0x9e, 0x5c, 0x41, 0x83, 0x29, 0xd5, 0x75, - 0x52, 0xcd, 0xa0, 0xac, 0xb1, 0x15, 0x50, 0x5b, 0x01, 0x7d, 0x49, 0x2a, 0x78, 0xb0, 0x0d, 0xcc, - 0x13, 0x84, 0x5c, 0xc3, 0x61, 0xf1, 0xe7, 0xee, 0xff, 0x7e, 0x6d, 0xd8, 0xf2, 0x4f, 0xca, 0x7c, - 0xb1, 0xa4, 0xd9, 0xa3, 0xbb, 0xf8, 0xd4, 0x71, 0x1b, 0x1d, 0xe7, 0x7c, 0x00, 0x6d, 0xbb, 0xba, - 0x41, 0x2d, 0x98, 0x21, 0x6d, 0x70, 0x9f, 0x92, 0xd2, 0x16, 0xd1, 0xaa, 0xf3, 0x8f, 0xb8, 0xe0, - 0x4c, 0x9f, 0x67, 0x8f, 0x9d, 0xda, 0x78, 0x04, 0x47, 0x01, 0x8a, 0x92, 0x7b, 0xdc, 0xb2, 0x5c, - 0x9a, 0x7e, 0x73, 0x92, 0xd1, 0x77, 0x1d, 0x5e, 0xfd, 0x39, 0x8b, 0xe9, 0x04, 0x35, 0x5f, 0x34, - 0xd3, 0xf2, 0x2f, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x7e, 0xca, 0x56, 0x2a, 0x02, 0x00, - 0x00, + // 319 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0x5f, 0x4b, 0xf3, 0x30, + 0x14, 0xc6, 0xdf, 0x6e, 0x7d, 0x67, 0x3d, 0x1b, 0x32, 0x72, 0x35, 0xa6, 0x17, 0x43, 0xd8, 0x18, + 0x82, 0xa9, 0xd4, 0x1b, 0xf1, 0xd2, 0x81, 0x7f, 0x06, 0xba, 0x31, 0xc5, 0x0b, 0x6f, 0x24, 0xeb, + 0xb2, 0x31, 0x58, 0x72, 0x42, 0x9a, 0x89, 0xfd, 0x28, 0x7e, 0x05, 0x3f, 0xa5, 0xb4, 0x69, 0xbb, + 0x76, 0xe2, 0x55, 0x20, 0xe7, 0xf9, 0xfd, 0x72, 0xf2, 0xc0, 0xf1, 0x47, 0xa0, 0x59, 0x4c, 0x43, + 0x14, 0x7e, 0x88, 0x9a, 0xfb, 0x21, 0xca, 0xe5, 0x7a, 0x45, 0x95, 0x46, 0x83, 0x04, 0xf2, 0xa1, + 0xe6, 0xdd, 0xe1, 0x5e, 0x90, 0x29, 0xe5, 0x2b, 0x8d, 0x9f, 0xb1, 0x60, 0xb2, 0x42, 0x75, 0x2f, + 0x7e, 0x29, 0x85, 0x40, 0xe9, 0x47, 0x5c, 0xaf, 0xd9, 0xc6, 0x37, 0xb1, 0xe2, 0x8b, 0x77, 0xc1, + 0xa3, 0x88, 0xad, 0x78, 0x46, 0xf4, 0xf7, 0x08, 0xa3, 0x99, 0x8c, 0x14, 0x6a, 0x53, 0x11, 0x9f, + 0x7e, 0xd5, 0xa0, 0x31, 0x4a, 0x2f, 0xc8, 0x1d, 0x1c, 0xac, 0xe5, 0x1c, 0xb7, 0x72, 0xd1, 0x71, + 0x7a, 0xf5, 0x61, 0x33, 0x38, 0xa7, 0xbb, 0x5d, 0x29, 0x53, 0x8a, 0xe6, 0xbb, 0xd1, 0x07, 0x9b, + 0xbb, 0x67, 0x72, 0xb1, 0xe1, 0xda, 0xf2, 0xb3, 0x9c, 0x26, 0x63, 0xf0, 0x70, 0x6b, 0xac, 0xa9, + 0x96, 0x9a, 0xe8, 0x9f, 0xa6, 0x49, 0x16, 0xac, 0xaa, 0x0a, 0x9e, 0x5c, 0x41, 0x9d, 0x29, 0xd5, + 0x71, 0x53, 0xcd, 0xa0, 0xac, 0xb1, 0x15, 0x50, 0x5b, 0x01, 0x7d, 0x49, 0x2a, 0x78, 0xb4, 0x0d, + 0xcc, 0x12, 0x84, 0x5c, 0xc3, 0x61, 0xf1, 0xe7, 0xce, 0xff, 0x9e, 0x33, 0x6c, 0x06, 0x27, 0x65, + 0xbe, 0x18, 0xd2, 0xec, 0xd1, 0x5d, 0x7c, 0xec, 0x7a, 0xf5, 0xb6, 0x7b, 0x36, 0x80, 0x96, 0x1d, + 0xdd, 0xa2, 0x16, 0xcc, 0x90, 0x16, 0x78, 0xd3, 0xa4, 0xb4, 0xf9, 0x76, 0xd9, 0xfe, 0x47, 0x3c, + 0x70, 0xc7, 0xcf, 0x93, 0xa7, 0xb6, 0x73, 0xd3, 0x87, 0xa3, 0x10, 0x45, 0xc9, 0x3d, 0x75, 0xde, + 0xdc, 0xe4, 0xfc, 0xae, 0xc1, 0x6b, 0x30, 0x63, 0x31, 0x1d, 0xa1, 0xe6, 0xf3, 0x46, 0xda, 0xf8, + 0xe5, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xbe, 0x63, 0xd9, 0x1f, 0x02, 0x00, 0x00, } diff --git a/config.proto b/config.proto index c2bce55a7..273c2ec3d 100644 --- a/config.proto +++ b/config.proto @@ -4,7 +4,7 @@ package v2ray.core; option csharp_namespace = "V2Ray.Core"; option go_package = "core"; option java_package = "com.v2ray.core"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/app/proxyman/config.proto"; import "v2ray.com/core/common/serial/typed_message.proto"; diff --git a/proxy/blackhole/config.pb.go b/proxy/blackhole/config.pb.go index fc976355f..bcb5ce361 100644 --- a/proxy/blackhole/config.pb.go +++ b/proxy/blackhole/config.pb.go @@ -57,7 +57,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/blackhole/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 223 bytes of a gzipped FileDescriptorProto + // 217 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2e, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8, 0xd4, 0x4f, 0xca, 0x49, 0x4c, 0xce, 0xce, 0xc8, 0xcf, 0x49, 0xd5, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, @@ -68,8 +68,8 @@ var fileDescriptor0 = []byte{ 0x41, 0x7e, 0x5e, 0x71, 0x2a, 0x88, 0xef, 0x11, 0x12, 0x12, 0x00, 0xe7, 0xfb, 0x70, 0xb1, 0x39, 0x83, 0x6d, 0x17, 0x72, 0xe2, 0xe2, 0x28, 0x82, 0x8a, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0xa9, 0xe9, 0x21, 0x39, 0x05, 0x62, 0x95, 0x1e, 0xc4, 0x2a, 0xbd, 0x10, 0x90, 0x55, 0xbe, 0x10, - 0x9b, 0x82, 0xe0, 0xfa, 0x9c, 0x42, 0xb9, 0xe4, 0x92, 0xf3, 0x73, 0xf5, 0x70, 0xfb, 0xc0, 0x89, - 0x1b, 0x62, 0x5b, 0x00, 0xc8, 0x71, 0x51, 0x9c, 0x70, 0xf1, 0x55, 0x4c, 0x52, 0x61, 0x46, 0x41, - 0x89, 0x95, 0x7a, 0xce, 0x20, 0x4d, 0x01, 0x60, 0x4d, 0x4e, 0x30, 0xc9, 0x24, 0x36, 0xb0, 0x5f, - 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xca, 0x68, 0xd4, 0x4f, 0x48, 0x01, 0x00, 0x00, + 0x9b, 0x82, 0xe0, 0xfa, 0x9c, 0xbc, 0xb8, 0xe4, 0x92, 0xf3, 0x73, 0xf5, 0x70, 0xfb, 0x20, 0x80, + 0x31, 0x8a, 0x13, 0xce, 0x59, 0xc5, 0x24, 0x15, 0x66, 0x14, 0x94, 0x58, 0xa9, 0xe7, 0x0c, 0x52, + 0x19, 0x00, 0x56, 0xe9, 0x04, 0x93, 0x4c, 0x62, 0x03, 0x7b, 0xc0, 0x18, 0x10, 0x00, 0x00, 0xff, + 0xff, 0xb6, 0x3c, 0xef, 0x4f, 0x3d, 0x01, 0x00, 0x00, } diff --git a/proxy/blackhole/config.proto b/proxy/blackhole/config.proto index a8c43082a..f9733329d 100644 --- a/proxy/blackhole/config.proto +++ b/proxy/blackhole/config.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.blackhole; option csharp_namespace = "V2Ray.Core.Proxy.Blackhole"; option go_package = "blackhole"; option java_package = "com.v2ray.core.proxy.blackhole"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/serial/typed_message.proto"; diff --git a/proxy/dokodemo/config.pb.go b/proxy/dokodemo/config.pb.go index 16401a380..7656313d7 100644 --- a/proxy/dokodemo/config.pb.go +++ b/proxy/dokodemo/config.pb.go @@ -72,24 +72,23 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/dokodemo/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 293 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4b, 0xfb, 0x30, - 0x18, 0xc7, 0xe9, 0x7e, 0xfb, 0x6d, 0x23, 0xf5, 0x0f, 0xe4, 0x94, 0x09, 0x42, 0xdd, 0x65, 0xc5, - 0x43, 0x02, 0xf5, 0xe8, 0x6d, 0x9b, 0x07, 0x41, 0xb4, 0xe4, 0xe0, 0xc1, 0xcb, 0xa8, 0x69, 0x26, - 0x61, 0x4d, 0x9e, 0x92, 0x46, 0x67, 0xdf, 0x92, 0x6f, 0xcb, 0x37, 0x22, 0x4b, 0x5a, 0x14, 0x61, - 0xde, 0xfa, 0x3c, 0xfd, 0x7c, 0x3f, 0x4f, 0xf8, 0xa2, 0xcb, 0xb7, 0xcc, 0x16, 0x2d, 0x15, 0xa0, - 0x99, 0x00, 0x2b, 0x59, 0x6d, 0xe1, 0xbd, 0x65, 0x25, 0x6c, 0xa1, 0x94, 0x1a, 0x98, 0x00, 0xb3, - 0x51, 0x2f, 0xb4, 0xb6, 0xe0, 0x00, 0x4f, 0x7b, 0xd6, 0x4a, 0xea, 0x39, 0xda, 0x73, 0x67, 0xf3, - 0x5f, 0x1a, 0x01, 0x5a, 0x83, 0x61, 0x46, 0x3a, 0x56, 0x94, 0xa5, 0x95, 0x4d, 0x13, 0x1c, 0x7f, - 0x81, 0x46, 0xba, 0x1d, 0xd8, 0x6d, 0x00, 0x67, 0x9f, 0x11, 0x1a, 0x2d, 0xfd, 0x75, 0x7c, 0x8d, - 0xc6, 0x9d, 0x84, 0x44, 0x49, 0x94, 0xc6, 0xd9, 0x05, 0xfd, 0xf1, 0x92, 0x60, 0xa0, 0x46, 0x3a, - 0x7a, 0x9b, 0x3f, 0xd8, 0x15, 0xe8, 0x42, 0x19, 0xde, 0x27, 0x30, 0x46, 0xc3, 0x1a, 0xac, 0x23, - 0x83, 0x24, 0x4a, 0x8f, 0xb9, 0xff, 0xc6, 0x37, 0xe8, 0xa8, 0x3b, 0xb6, 0xae, 0x54, 0xe3, 0xc8, - 0x3f, 0x6f, 0x9d, 0x1d, 0xb0, 0xde, 0x07, 0xf4, 0x4e, 0x35, 0x8e, 0xc7, 0xe6, 0x7b, 0xc0, 0x04, - 0x8d, 0x9d, 0xd2, 0x12, 0x5e, 0x1d, 0x19, 0x7a, 0x7b, 0x3f, 0xe2, 0x39, 0x3a, 0xdd, 0x40, 0x55, - 0xc1, 0x6e, 0x6d, 0x65, 0xa9, 0xac, 0x14, 0x8e, 0xfc, 0x4f, 0xa2, 0x74, 0xc2, 0x4f, 0xc2, 0x9a, - 0x77, 0xdb, 0x05, 0x47, 0xe7, 0x02, 0x34, 0x3d, 0x58, 0xec, 0x22, 0x0e, 0x1d, 0xe4, 0xfb, 0x4e, - 0x9e, 0x26, 0xfd, 0xfa, 0x63, 0x30, 0x7d, 0xcc, 0x78, 0xd1, 0xd2, 0xe5, 0x3e, 0x92, 0xfb, 0xc8, - 0xaa, 0xfb, 0xf7, 0x3c, 0xf2, 0x05, 0x5e, 0x7d, 0x05, 0x00, 0x00, 0xff, 0xff, 0x88, 0x4d, 0x7b, - 0x60, 0xdb, 0x01, 0x00, 0x00, + // 286 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4a, 0x03, 0x31, + 0x10, 0x87, 0x49, 0xad, 0x6d, 0x49, 0xfd, 0x03, 0x39, 0xa5, 0x82, 0x50, 0x7b, 0x69, 0xf1, 0x90, + 0x40, 0x3d, 0x7a, 0xb3, 0x15, 0x11, 0x44, 0x97, 0x1c, 0x3c, 0x78, 0x29, 0x6b, 0x36, 0x95, 0xd0, + 0x4d, 0x66, 0x99, 0x8d, 0xd6, 0x7d, 0x25, 0x5f, 0xcb, 0x17, 0x11, 0xb3, 0xbb, 0x28, 0x42, 0xbd, + 0xcd, 0x4c, 0xbe, 0x7c, 0x33, 0xfc, 0xe8, 0xf9, 0xdb, 0x1c, 0xd3, 0x4a, 0x68, 0x70, 0x52, 0x03, + 0x1a, 0x59, 0x20, 0xbc, 0x57, 0x32, 0x83, 0x0d, 0x64, 0xc6, 0x81, 0xd4, 0xe0, 0xd7, 0xf6, 0x45, + 0x14, 0x08, 0x01, 0xd8, 0xa8, 0x65, 0xd1, 0x88, 0xc8, 0x89, 0x96, 0x3b, 0x99, 0xfe, 0xd1, 0x68, + 0x70, 0x0e, 0xbc, 0xf4, 0x26, 0xc8, 0x34, 0xcb, 0xd0, 0x94, 0x65, 0xed, 0xf8, 0x0f, 0xf4, 0x26, + 0x6c, 0x01, 0x37, 0x35, 0x38, 0xf9, 0x24, 0xb4, 0xb7, 0x88, 0xdb, 0xd9, 0x25, 0xed, 0x37, 0x12, + 0x4e, 0xc6, 0x64, 0x36, 0x9c, 0x9f, 0x89, 0x5f, 0x97, 0xd4, 0x06, 0xe1, 0x4d, 0x10, 0xb7, 0xc9, + 0x03, 0x2e, 0xc1, 0xa5, 0xd6, 0xab, 0xf6, 0x07, 0x63, 0xb4, 0x5b, 0x00, 0x06, 0xde, 0x19, 0x93, + 0xd9, 0xa1, 0x8a, 0x35, 0xbb, 0xa6, 0x07, 0xcd, 0xb2, 0x55, 0x6e, 0xcb, 0xc0, 0xf7, 0xa2, 0x75, + 0xb2, 0xc3, 0x7a, 0x5f, 0xa3, 0x77, 0xb6, 0x0c, 0x6a, 0xe8, 0x7f, 0x1a, 0xc6, 0x69, 0x3f, 0x58, + 0x67, 0xe0, 0x35, 0xf0, 0x6e, 0xb4, 0xb7, 0x2d, 0x9b, 0xd2, 0xe3, 0x35, 0xe4, 0x39, 0x6c, 0x57, + 0x68, 0x32, 0x8b, 0x46, 0x07, 0xbe, 0x3f, 0x26, 0xb3, 0x81, 0x3a, 0xaa, 0xc7, 0xaa, 0x99, 0x5e, + 0xdd, 0xd0, 0x53, 0x0d, 0x4e, 0xec, 0x0c, 0x36, 0x21, 0x4f, 0x83, 0xb6, 0xfe, 0xe8, 0x8c, 0x1e, + 0xe7, 0x2a, 0xad, 0xc4, 0xe2, 0x9b, 0x4b, 0x22, 0xb7, 0x6c, 0xde, 0x9e, 0x7b, 0x31, 0xb5, 0x8b, + 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x1c, 0xb0, 0xd9, 0xd0, 0x01, 0x00, 0x00, } diff --git a/proxy/dokodemo/config.proto b/proxy/dokodemo/config.proto index 26e05c807..d3cd6df16 100644 --- a/proxy/dokodemo/config.proto +++ b/proxy/dokodemo/config.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.dokodemo; option csharp_namespace = "V2Ray.Core.Proxy.Dokodemo"; option go_package = "dokodemo"; option java_package = "com.v2ray.core.proxy.dokodemo"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/net/address.proto"; import "v2ray.com/core/common/net/network.proto"; diff --git a/proxy/freedom/config.pb.go b/proxy/freedom/config.pb.go index 9c82a4af4..66a615f4b 100644 --- a/proxy/freedom/config.pb.go +++ b/proxy/freedom/config.pb.go @@ -94,26 +94,25 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/freedom/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0xcf, 0x4a, 0xf3, 0x40, - 0x14, 0xc5, 0xbf, 0xf4, 0xc3, 0x14, 0x6f, 0xb1, 0x96, 0xa9, 0x8b, 0x20, 0x2e, 0x4a, 0x37, 0x56, - 0xc1, 0x89, 0xc4, 0x27, 0xb0, 0x7f, 0x84, 0xae, 0x5a, 0x12, 0x14, 0x75, 0x13, 0x63, 0xe6, 0xb6, - 0x0c, 0x98, 0xb9, 0x61, 0x32, 0x16, 0xf3, 0x04, 0xbe, 0x8b, 0x4f, 0x29, 0x9d, 0xa4, 0x68, 0xd5, - 0x2e, 0xe7, 0xce, 0xf9, 0x9d, 0x7b, 0xcf, 0x81, 0xb3, 0x55, 0xa0, 0x93, 0x92, 0xa7, 0x94, 0xf9, - 0x29, 0x69, 0xf4, 0x73, 0x4d, 0x6f, 0xa5, 0xbf, 0xd0, 0x88, 0xc2, 0x8e, 0xd4, 0x42, 0x2e, 0x79, - 0xae, 0xc9, 0x10, 0xf3, 0x36, 0x52, 0x8d, 0xdc, 0xca, 0x78, 0x2d, 0x3b, 0xbe, 0xfc, 0x61, 0x92, - 0x52, 0x96, 0x91, 0xf2, 0x2d, 0x96, 0xd2, 0x8b, 0x5f, 0xa0, 0x5e, 0xa1, 0x8e, 0x8b, 0x1c, 0xd3, - 0xca, 0xab, 0xff, 0x00, 0xdd, 0x31, 0x16, 0x46, 0xaa, 0xc4, 0x48, 0x52, 0xb3, 0x15, 0x6a, 0x2d, - 0x05, 0xb2, 0x21, 0xb8, 0x95, 0xd6, 0x73, 0x7a, 0xce, 0xa0, 0x15, 0x9c, 0xf3, 0x6f, 0x3b, 0x2b, - 0x57, 0xbe, 0x71, 0xe5, 0x91, 0x55, 0x4e, 0x94, 0xc8, 0x49, 0x2a, 0x13, 0xd6, 0x64, 0xff, 0xbd, - 0x01, 0xee, 0xc8, 0xde, 0xcd, 0xee, 0xe1, 0x50, 0x50, 0x96, 0x48, 0x15, 0x17, 0x46, 0x27, 0x06, - 0x97, 0xa5, 0xf5, 0x6d, 0x07, 0x3e, 0xdf, 0x95, 0x85, 0x57, 0x28, 0x1f, 0x5b, 0x2e, 0xaa, 0xb1, - 0xb0, 0x2d, 0xb6, 0xde, 0xcc, 0x83, 0xa6, 0x91, 0x19, 0xd2, 0xab, 0xf1, 0x1a, 0x3d, 0x67, 0x70, - 0x10, 0x6e, 0x9e, 0xec, 0x09, 0x8e, 0xc4, 0x57, 0xb2, 0x98, 0xea, 0x68, 0xde, 0x7f, 0x1b, 0xe8, - 0x62, 0xf7, 0xe2, 0x3f, 0xfa, 0x08, 0xbb, 0xe2, 0xf7, 0xb0, 0x7f, 0x0a, 0xed, 0xed, 0xeb, 0xd8, - 0x3e, 0xec, 0x5d, 0x47, 0xf1, 0x34, 0xea, 0xfc, 0x63, 0x00, 0xee, 0x6d, 0x34, 0x89, 0xa7, 0xf3, - 0x8e, 0x33, 0x9c, 0xc1, 0x49, 0x4a, 0xd9, 0xce, 0x8d, 0xc3, 0x56, 0x95, 0x75, 0xbe, 0x2e, 0xf4, - 0xb1, 0x59, 0x4f, 0x3f, 0x1a, 0xde, 0x5d, 0x10, 0x26, 0x25, 0x1f, 0xad, 0x81, 0xb9, 0x05, 0x6e, - 0xaa, 0xaf, 0x67, 0xd7, 0x76, 0x7f, 0xf5, 0x19, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x1e, 0xb5, 0x64, - 0x35, 0x02, 0x00, 0x00, + // 318 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0xcf, 0x4a, 0xc3, 0x40, + 0x10, 0xc6, 0x4d, 0xc5, 0x14, 0x47, 0xac, 0x65, 0xeb, 0x21, 0x88, 0x87, 0xd2, 0x8b, 0x55, 0x70, + 0x23, 0xf1, 0x09, 0xec, 0x1f, 0xa1, 0x27, 0x4b, 0x82, 0xa2, 0x5e, 0x62, 0xcc, 0x4e, 0xcb, 0x82, + 0xd9, 0x09, 0x9b, 0xb5, 0x98, 0x27, 0xf0, 0x5d, 0x7c, 0x4a, 0x71, 0x93, 0xa2, 0x55, 0x73, 0xdb, + 0x99, 0xfd, 0x7d, 0xdf, 0xcc, 0x37, 0x70, 0xba, 0x0a, 0x74, 0x52, 0xf2, 0x94, 0x32, 0x3f, 0x25, + 0x8d, 0x7e, 0xae, 0xe9, 0xad, 0xf4, 0x17, 0x1a, 0x51, 0xd8, 0x96, 0x5a, 0xc8, 0x25, 0xcf, 0x35, + 0x19, 0x62, 0xde, 0x1a, 0xd5, 0xc8, 0x2d, 0xc6, 0x6b, 0xec, 0xe8, 0xe2, 0x97, 0x49, 0x4a, 0x59, + 0x46, 0xca, 0xb7, 0xb2, 0x94, 0x5e, 0xfc, 0x02, 0xf5, 0x0a, 0x75, 0x5c, 0xe4, 0x98, 0x56, 0x5e, + 0x83, 0x07, 0xe8, 0x4d, 0xb0, 0x30, 0x52, 0x25, 0x46, 0x92, 0xba, 0x59, 0xa1, 0xd6, 0x52, 0x20, + 0x1b, 0x81, 0x5b, 0xb1, 0x9e, 0xd3, 0x77, 0x86, 0x7b, 0xc1, 0x19, 0xff, 0x31, 0xb3, 0x72, 0xe5, + 0x6b, 0x57, 0x1e, 0x59, 0x72, 0xaa, 0x44, 0x4e, 0x52, 0x99, 0xb0, 0x56, 0x0e, 0xde, 0x5b, 0xe0, + 0x8e, 0xed, 0xde, 0xec, 0x1e, 0x0e, 0x04, 0x65, 0x89, 0x54, 0x71, 0x61, 0x74, 0x62, 0x70, 0x59, + 0x5a, 0xdf, 0x4e, 0xe0, 0xf3, 0xa6, 0x2c, 0xbc, 0x92, 0xf2, 0x89, 0xd5, 0x45, 0xb5, 0x2c, 0xec, + 0x88, 0x8d, 0x9a, 0x79, 0xd0, 0x36, 0x32, 0x43, 0x7a, 0x35, 0x5e, 0xab, 0xef, 0x0c, 0xf7, 0xc3, + 0x75, 0xc9, 0x9e, 0xe0, 0x50, 0x7c, 0x27, 0x8b, 0xa9, 0x8e, 0xe6, 0x6d, 0xdb, 0x40, 0xe7, 0xcd, + 0x83, 0xff, 0xb9, 0x47, 0xd8, 0x13, 0x7f, 0x9b, 0x83, 0x13, 0xe8, 0x6c, 0x6e, 0xc7, 0x76, 0x61, + 0xe7, 0x2a, 0x8a, 0x67, 0x51, 0x77, 0x8b, 0x01, 0xb8, 0xb7, 0xd1, 0x34, 0x9e, 0xcd, 0xbb, 0xce, + 0x68, 0x02, 0xc7, 0x29, 0x65, 0x8d, 0x13, 0xe7, 0xce, 0x63, 0xbb, 0x7e, 0x7e, 0xb4, 0xbc, 0xbb, + 0x20, 0x4c, 0x4a, 0x3e, 0xfe, 0xa2, 0xe6, 0x96, 0xba, 0xae, 0xbe, 0x9e, 0x5d, 0x7b, 0xf0, 0xcb, + 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x45, 0xb3, 0x84, 0x2e, 0x2a, 0x02, 0x00, 0x00, } diff --git a/proxy/freedom/config.proto b/proxy/freedom/config.proto index 424d1d27b..ec4764e4b 100644 --- a/proxy/freedom/config.proto +++ b/proxy/freedom/config.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.freedom; option csharp_namespace = "V2Ray.Core.Proxy.Freedom"; option go_package = "freedom"; option java_package = "com.v2ray.core.proxy.freedom"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/protocol/server_spec.proto"; diff --git a/proxy/http/config.pb.go b/proxy/http/config.pb.go index da73a3ec8..dc1ae242b 100644 --- a/proxy/http/config.pb.go +++ b/proxy/http/config.pb.go @@ -49,16 +49,16 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/http/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 167 bytes of a gzipped FileDescriptorProto + // 161 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2b, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8, 0xd4, 0xcf, 0x28, 0x29, 0x29, 0xd0, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xa9, 0x2b, 0x4a, 0xd5, 0x03, 0xab, 0xd1, 0x03, 0xa9, 0x51, 0xd2, 0xe0, 0xe2, 0x09, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x72, 0x06, 0x2b, 0x16, 0x92, 0xe0, 0x62, 0x2f, 0xc9, 0xcc, 0x4d, 0xcd, 0x2f, 0x2d, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0d, 0x82, 0x71, 0x95, - 0xf8, 0xb8, 0x78, 0x9c, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0x20, 0x2a, 0x9d, 0xdc, 0xb8, 0x24, 0x93, - 0xf3, 0x73, 0xf5, 0xb0, 0x1a, 0xeb, 0xc4, 0x0d, 0x51, 0x14, 0x00, 0xb2, 0x3a, 0x8a, 0x05, 0x24, - 0xb4, 0x8a, 0x49, 0x34, 0xcc, 0x28, 0x28, 0xb1, 0x52, 0xcf, 0x19, 0xa4, 0x34, 0x00, 0xac, 0xd4, - 0xa3, 0xa4, 0xa4, 0x20, 0x89, 0x0d, 0xec, 0x3e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa1, - 0x81, 0x13, 0x9c, 0xc9, 0x00, 0x00, 0x00, + 0xf8, 0xb8, 0x78, 0x9c, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0x20, 0x2a, 0x9d, 0xac, 0xb9, 0x24, 0x93, + 0xf3, 0x73, 0xf5, 0xb0, 0x1a, 0x1b, 0xc0, 0x18, 0xc5, 0x02, 0xa2, 0x57, 0x31, 0x89, 0x86, 0x19, + 0x05, 0x25, 0x56, 0xea, 0x39, 0x83, 0xe4, 0x03, 0xc0, 0xf2, 0x1e, 0x25, 0x25, 0x05, 0x49, 0x6c, + 0x60, 0x47, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xae, 0x86, 0xab, 0xbe, 0x00, 0x00, + 0x00, } diff --git a/proxy/http/config.proto b/proxy/http/config.proto index 1c892ae72..5cbfdb83c 100644 --- a/proxy/http/config.proto +++ b/proxy/http/config.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.http; option csharp_namespace = "V2Ray.Core.Proxy.Http"; option go_package = "http"; option java_package = "com.v2ray.core.proxy.http"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; // Config for HTTP proxy server. message ServerConfig { diff --git a/proxy/shadowsocks/config.pb.go b/proxy/shadowsocks/config.pb.go index 660186c12..c48494444 100644 --- a/proxy/shadowsocks/config.pb.go +++ b/proxy/shadowsocks/config.pb.go @@ -154,33 +154,33 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/shadowsocks/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 448 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x51, 0xdd, 0x6e, 0xd3, 0x4c, - 0x14, 0xac, 0x93, 0xa8, 0xcd, 0x77, 0x36, 0x1f, 0x98, 0xbd, 0x8a, 0xa2, 0x4a, 0x58, 0xb9, 0x0a, - 0x95, 0x58, 0xb7, 0xcb, 0x8f, 0xb8, 0x75, 0x4c, 0xaa, 0x56, 0x48, 0x69, 0xe5, 0xa4, 0x20, 0x01, - 0x92, 0xe5, 0xae, 0x17, 0x62, 0x11, 0xfb, 0xac, 0x76, 0xed, 0x16, 0xbf, 0x12, 0x6f, 0xc6, 0x5b, - 0x20, 0xaf, 0x93, 0x36, 0xe2, 0x22, 0xdc, 0xf9, 0x9c, 0x33, 0x33, 0x9e, 0x99, 0x85, 0x97, 0x77, - 0x5c, 0x27, 0x35, 0x13, 0x98, 0xfb, 0x02, 0xb5, 0xf4, 0x95, 0xc6, 0x9f, 0xb5, 0x6f, 0x56, 0x49, - 0x8a, 0xf7, 0x06, 0xc5, 0x0f, 0xe3, 0x0b, 0x2c, 0xbe, 0x65, 0xdf, 0x99, 0xd2, 0x58, 0x22, 0x3d, - 0xde, 0xc2, 0xb5, 0x64, 0x16, 0xca, 0x76, 0xa0, 0xa3, 0x17, 0x7f, 0x89, 0x09, 0xcc, 0x73, 0x2c, - 0x7c, 0x4b, 0x15, 0xb8, 0xf6, 0x2b, 0x23, 0x75, 0x2b, 0x34, 0x3a, 0xfd, 0x07, 0xd4, 0x48, 0x7d, - 0x27, 0x75, 0x6c, 0x94, 0x14, 0x2d, 0x63, 0xfc, 0xdb, 0x81, 0xa3, 0x40, 0x08, 0xac, 0x8a, 0x92, - 0x8e, 0xa0, 0xaf, 0x12, 0x63, 0xee, 0x51, 0xa7, 0x43, 0xc7, 0x73, 0x26, 0xff, 0x45, 0x0f, 0x33, - 0xbd, 0x04, 0x22, 0x32, 0xb5, 0x92, 0x3a, 0x2e, 0x6b, 0x25, 0x87, 0x1d, 0xcf, 0x99, 0x3c, 0xe1, - 0x13, 0xb6, 0xcf, 0x38, 0x0b, 0x2d, 0x61, 0x59, 0x2b, 0x19, 0x81, 0x78, 0xf8, 0xa6, 0x21, 0x74, - 0xb1, 0x4c, 0x86, 0x5d, 0x2b, 0x71, 0xb6, 0x5f, 0x62, 0x63, 0x8d, 0x5d, 0x15, 0x72, 0x99, 0xe5, - 0x32, 0xa8, 0xca, 0x55, 0xd4, 0xb0, 0xc7, 0x1c, 0xc8, 0xce, 0x8e, 0xf6, 0xa1, 0x17, 0x54, 0x25, - 0xba, 0x07, 0x74, 0x00, 0xfd, 0xf7, 0x99, 0x49, 0x6e, 0xd7, 0x32, 0x75, 0x1d, 0x4a, 0xe0, 0x68, - 0x56, 0xb4, 0x43, 0x67, 0x2c, 0x61, 0xb0, 0xb0, 0x05, 0x84, 0xb6, 0x7c, 0xfa, 0x1c, 0x48, 0x95, - 0xaa, 0x58, 0xb6, 0x00, 0x1b, 0xb9, 0x1f, 0x41, 0x95, 0xaa, 0x0d, 0x85, 0xbe, 0x86, 0x5e, 0x53, - 0xae, 0x4d, 0x4b, 0xb8, 0xb7, 0x6b, 0xb5, 0x6d, 0x96, 0x6d, 0x9b, 0x65, 0x37, 0x46, 0xea, 0xc8, - 0xa2, 0xc7, 0x11, 0x0c, 0xc2, 0x75, 0x26, 0x8b, 0x72, 0xf3, 0x9b, 0x29, 0x1c, 0xb6, 0xbd, 0x0f, - 0x1d, 0xaf, 0x3b, 0x21, 0xfc, 0x64, 0x9f, 0x4e, 0x6b, 0x70, 0x56, 0xa4, 0x0a, 0xb3, 0xa2, 0x8c, - 0x36, 0xcc, 0x93, 0xaf, 0x00, 0x8f, 0x6d, 0x36, 0xa9, 0x6e, 0xe6, 0x1f, 0xe6, 0x57, 0x9f, 0xe6, - 0xee, 0x01, 0x7d, 0x0a, 0x24, 0x98, 0x2d, 0xe2, 0x33, 0xfe, 0x2e, 0x0e, 0xcf, 0xa7, 0xae, 0xb3, - 0x5d, 0xf0, 0x37, 0x6f, 0xed, 0xa2, 0xd3, 0x54, 0x12, 0x5e, 0x04, 0xe1, 0x45, 0xc0, 0x4f, 0xdd, - 0x2e, 0x7d, 0x06, 0xff, 0x6f, 0xa7, 0xf8, 0x72, 0xb6, 0x3c, 0x77, 0x7b, 0xd3, 0x2f, 0xe0, 0x09, - 0xcc, 0xf7, 0xbe, 0xc4, 0x94, 0xb4, 0x69, 0xae, 0x1b, 0xa3, 0x9f, 0xc9, 0xce, 0xe5, 0x57, 0xe7, - 0xf8, 0x23, 0x8f, 0x92, 0x9a, 0x85, 0x0d, 0xf1, 0xda, 0x12, 0x17, 0x8f, 0xe7, 0xdb, 0x43, 0x9b, - 0xed, 0xd5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x4e, 0xca, 0xdc, 0x14, 0x03, 0x00, 0x00, + // 442 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x91, 0x4f, 0x6f, 0xd3, 0x40, + 0x10, 0xc5, 0xeb, 0x24, 0x6a, 0xc3, 0x38, 0x80, 0xd9, 0x53, 0x14, 0x55, 0xc2, 0xca, 0x29, 0x54, + 0x62, 0xdd, 0x2e, 0x7f, 0xc4, 0xd5, 0x31, 0xa9, 0x5a, 0x21, 0xa5, 0x91, 0x93, 0x82, 0x84, 0x90, + 0x2c, 0x77, 0xbd, 0x10, 0x8b, 0xd8, 0xb3, 0xda, 0xb5, 0x5b, 0xfc, 0x95, 0xf8, 0x66, 0x7c, 0x0b, + 0xe4, 0x75, 0xd2, 0x44, 0x1c, 0xcc, 0xcd, 0x33, 0x7e, 0xef, 0x79, 0xde, 0xcf, 0xf0, 0xfa, 0x9e, + 0xa9, 0xb8, 0xa2, 0x1c, 0x33, 0x8f, 0xa3, 0x12, 0x9e, 0x54, 0xf8, 0xab, 0xf2, 0xf4, 0x3a, 0x4e, + 0xf0, 0x41, 0x23, 0xff, 0xa9, 0x3d, 0x8e, 0xf9, 0xf7, 0xf4, 0x07, 0x95, 0x0a, 0x0b, 0x24, 0xa7, + 0x3b, 0xb9, 0x12, 0xd4, 0x48, 0xe9, 0x81, 0x74, 0xf4, 0xea, 0x9f, 0x30, 0x8e, 0x59, 0x86, 0xb9, + 0x67, 0xac, 0x1c, 0x37, 0x5e, 0xa9, 0x85, 0x6a, 0x82, 0x46, 0xe7, 0xff, 0x91, 0x6a, 0xa1, 0xee, + 0x85, 0x8a, 0xb4, 0x14, 0xbc, 0x71, 0x8c, 0xff, 0x58, 0x70, 0xe2, 0x73, 0x8e, 0x65, 0x5e, 0x90, + 0x11, 0xf4, 0x65, 0xac, 0xf5, 0x03, 0xaa, 0x64, 0x68, 0xb9, 0xd6, 0xe4, 0x49, 0xf8, 0x38, 0x93, + 0x6b, 0xb0, 0x79, 0x2a, 0xd7, 0x42, 0x45, 0x45, 0x25, 0xc5, 0xb0, 0xe3, 0x5a, 0x93, 0x67, 0x6c, + 0x42, 0xdb, 0x0e, 0xa7, 0x81, 0x31, 0xac, 0x2a, 0x29, 0x42, 0xe0, 0x8f, 0xcf, 0x24, 0x80, 0x2e, + 0x16, 0xf1, 0xb0, 0x6b, 0x22, 0x2e, 0xda, 0x23, 0xb6, 0xa7, 0xd1, 0x9b, 0x5c, 0xac, 0xd2, 0x4c, + 0xf8, 0x65, 0xb1, 0x0e, 0x6b, 0xf7, 0x98, 0x81, 0x7d, 0xb0, 0x23, 0x7d, 0xe8, 0xf9, 0x65, 0x81, + 0xce, 0x11, 0x19, 0x40, 0xff, 0x63, 0xaa, 0xe3, 0xbb, 0x8d, 0x48, 0x1c, 0x8b, 0xd8, 0x70, 0x32, + 0xcb, 0x9b, 0xa1, 0x33, 0x16, 0x30, 0x58, 0x1a, 0x00, 0x81, 0x81, 0x4f, 0x5e, 0x82, 0x5d, 0x26, + 0x32, 0x12, 0x8d, 0xc0, 0x54, 0xee, 0x87, 0x50, 0x26, 0x72, 0x6b, 0x21, 0x6f, 0xa1, 0x57, 0xc3, + 0x35, 0x6d, 0x6d, 0xe6, 0x1e, 0x9e, 0xda, 0x90, 0xa5, 0x3b, 0xb2, 0xf4, 0x56, 0x0b, 0x15, 0x1a, + 0xf5, 0x38, 0x84, 0x41, 0xb0, 0x49, 0x45, 0x5e, 0x6c, 0x3f, 0x33, 0x85, 0xe3, 0x86, 0xfb, 0xd0, + 0x72, 0xbb, 0x13, 0x9b, 0x9d, 0xb5, 0xe5, 0x34, 0x07, 0xce, 0xf2, 0x44, 0x62, 0x9a, 0x17, 0xe1, + 0xd6, 0x79, 0xf6, 0x0d, 0x60, 0x4f, 0xb3, 0x6e, 0x75, 0x3b, 0xff, 0x34, 0xbf, 0xf9, 0x32, 0x77, + 0x8e, 0xc8, 0x73, 0xb0, 0xfd, 0xd9, 0x32, 0xba, 0x60, 0x1f, 0xa2, 0xe0, 0x72, 0xea, 0x58, 0xbb, + 0x05, 0x7b, 0xf7, 0xde, 0x2c, 0x3a, 0x35, 0x92, 0xe0, 0xca, 0x0f, 0xae, 0x7c, 0x76, 0xee, 0x74, + 0xc9, 0x0b, 0x78, 0xba, 0x9b, 0xa2, 0xeb, 0xd9, 0xea, 0xd2, 0xe9, 0x4d, 0x17, 0xe0, 0x72, 0xcc, + 0x5a, 0xff, 0xc4, 0xc2, 0xfa, 0x6a, 0x1f, 0x8c, 0xbf, 0x3b, 0xa7, 0x9f, 0x59, 0x18, 0x57, 0x34, + 0xa8, 0xd5, 0x0b, 0xa3, 0x5e, 0xee, 0x5f, 0xdf, 0x1d, 0x9b, 0x42, 0x6f, 0xfe, 0x06, 0x00, 0x00, + 0xff, 0xff, 0x2b, 0x46, 0x7c, 0x1c, 0x09, 0x03, 0x00, 0x00, } diff --git a/proxy/shadowsocks/config.proto b/proxy/shadowsocks/config.proto index e85dbe14a..164f404b0 100644 --- a/proxy/shadowsocks/config.proto +++ b/proxy/shadowsocks/config.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.shadowsocks; option csharp_namespace = "V2Ray.Core.Proxy.Shadowsocks"; option go_package = "shadowsocks"; option java_package = "com.v2ray.core.proxy.shadowsocks"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/protocol/user.proto"; import "v2ray.com/core/common/protocol/server_spec.proto"; diff --git a/proxy/socks/config.pb.go b/proxy/socks/config.pb.go index 7674d371e..9759d294a 100644 --- a/proxy/socks/config.pb.go +++ b/proxy/socks/config.pb.go @@ -136,34 +136,34 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/socks/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 453 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0x49, 0x4b, 0xd7, 0xec, 0xa5, 0x43, 0x95, 0x85, 0xa6, 0x28, 0x17, 0x42, 0x25, 0x44, - 0xb4, 0x83, 0x83, 0xc2, 0x05, 0x31, 0x71, 0x48, 0xbb, 0x4a, 0xec, 0xb2, 0x56, 0xee, 0x00, 0x89, - 0x4b, 0xe5, 0x39, 0x86, 0x45, 0x6b, 0xec, 0xc8, 0x76, 0x0a, 0xf9, 0x4a, 0x7c, 0x1c, 0x3e, 0x11, - 0x4a, 0x9c, 0x4c, 0x63, 0xea, 0x6e, 0x7e, 0x7e, 0xff, 0xf7, 0xf7, 0xfb, 0xff, 0x0c, 0x6f, 0xf7, - 0x89, 0xa2, 0x35, 0x66, 0xb2, 0x88, 0x99, 0x54, 0x3c, 0x2e, 0x95, 0xfc, 0x5d, 0xc7, 0x5a, 0xb2, - 0x3b, 0x1d, 0x33, 0x29, 0x7e, 0xe4, 0x3f, 0x71, 0xa9, 0xa4, 0x91, 0xe8, 0xb4, 0x17, 0x2a, 0x8e, - 0x5b, 0x11, 0x6e, 0x45, 0xc1, 0x63, 0x03, 0x26, 0x8b, 0x42, 0x8a, 0x58, 0x70, 0x13, 0xd3, 0x2c, - 0x53, 0x5c, 0x6b, 0x6b, 0x10, 0xbc, 0x3b, 0x2c, 0x6c, 0x9b, 0x4c, 0xee, 0x62, 0xcd, 0xd5, 0x9e, - 0xab, 0xad, 0x2e, 0x39, 0xb3, 0x13, 0xb3, 0x14, 0xc6, 0x29, 0x63, 0xb2, 0x12, 0x06, 0x05, 0xe0, - 0x56, 0x9a, 0x2b, 0x41, 0x0b, 0xee, 0x3b, 0xa1, 0x13, 0x1d, 0x93, 0xfb, 0xba, 0xe9, 0x95, 0x54, - 0xeb, 0x5f, 0x52, 0x65, 0xfe, 0xc0, 0xf6, 0xfa, 0x7a, 0xf6, 0x77, 0x00, 0x93, 0x4d, 0x6b, 0xbc, - 0x68, 0xc3, 0xa0, 0x4f, 0x70, 0x4c, 0x2b, 0x73, 0xbb, 0x35, 0x75, 0x69, 0x9d, 0x5e, 0x24, 0x21, - 0x3e, 0x1c, 0x0d, 0xa7, 0x95, 0xb9, 0xbd, 0xae, 0x4b, 0x4e, 0x5c, 0xda, 0x9d, 0xd0, 0x15, 0xb8, - 0xd4, 0xae, 0xa4, 0xfd, 0x41, 0x38, 0x8c, 0xbc, 0x24, 0x79, 0x6a, 0xfa, 0xe1, 0xb3, 0xb8, 0xcb, - 0xa1, 0x97, 0xc2, 0xa8, 0x9a, 0xdc, 0x7b, 0xa0, 0x73, 0x18, 0x77, 0x94, 0xfc, 0x61, 0xe8, 0x44, - 0x5e, 0xf2, 0xfa, 0xa1, 0x9d, 0x45, 0x84, 0x05, 0x37, 0xf8, 0x72, 0xbd, 0x52, 0x17, 0xb2, 0xa0, - 0xb9, 0x20, 0xfd, 0x04, 0x7a, 0x05, 0x5e, 0x95, 0x95, 0x5b, 0x2e, 0xe8, 0xcd, 0x8e, 0x67, 0xfe, - 0xf3, 0xd0, 0x89, 0x5c, 0x02, 0x55, 0x56, 0x2e, 0xed, 0x0d, 0xf2, 0x61, 0x6c, 0xf2, 0x82, 0xcb, - 0xca, 0xf8, 0xa3, 0xd0, 0x89, 0x4e, 0x48, 0x5f, 0x06, 0xe7, 0x70, 0xf2, 0xdf, 0x4a, 0x68, 0x0a, - 0xc3, 0x3b, 0x5e, 0x77, 0x6c, 0x9b, 0x23, 0x7a, 0x09, 0xa3, 0x3d, 0xdd, 0x55, 0xbc, 0x63, 0x6a, - 0x8b, 0x8f, 0x83, 0x0f, 0xce, 0x8c, 0xc0, 0x64, 0xb1, 0xcb, 0xb9, 0x30, 0x1d, 0xd3, 0x39, 0x1c, - 0xd9, 0xcf, 0xf3, 0x9d, 0x16, 0xc9, 0xd9, 0x81, 0x0c, 0xfd, 0x37, 0x77, 0x58, 0x96, 0x22, 0x2b, - 0x65, 0x2e, 0x0c, 0xe9, 0x26, 0xcf, 0xde, 0x80, 0xdb, 0xe3, 0x46, 0x1e, 0x8c, 0xaf, 0x56, 0xdb, - 0xf4, 0xcb, 0xf5, 0xe7, 0xe9, 0x33, 0x34, 0x01, 0x77, 0x9d, 0x6e, 0x36, 0xdf, 0x56, 0xe4, 0x62, - 0xea, 0xcc, 0x2f, 0x21, 0x60, 0xb2, 0x78, 0x02, 0xf9, 0xdc, 0xb3, 0x0b, 0xad, 0x9b, 0xb7, 0xbe, - 0x8f, 0xda, 0xbb, 0x3f, 0x83, 0xd3, 0xaf, 0x09, 0xa1, 0x35, 0x5e, 0x34, 0xe2, 0x75, 0x2b, 0xde, - 0x34, 0x8d, 0x9b, 0xa3, 0x76, 0xa5, 0xf7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x8f, 0x57, - 0x58, 0x02, 0x03, 0x00, 0x00, + // 449 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0xd1, 0x6e, 0xd3, 0x3e, + 0x14, 0xc6, 0xff, 0x49, 0xff, 0x5d, 0xb3, 0xd3, 0x0e, 0x55, 0x16, 0x9a, 0xa2, 0xdc, 0x10, 0x2a, + 0x21, 0xa2, 0x5d, 0x38, 0x28, 0xdc, 0x20, 0x26, 0x90, 0xb2, 0xae, 0x12, 0xdc, 0xac, 0x95, 0x3b, + 0x40, 0xe2, 0xa6, 0xf2, 0x1c, 0xc3, 0xa2, 0x35, 0x76, 0x64, 0x3b, 0x85, 0xbc, 0x12, 0x8f, 0xc3, + 0x13, 0xa1, 0xda, 0xc9, 0x34, 0x50, 0x77, 0x77, 0x4e, 0xce, 0x77, 0xbe, 0x9c, 0xef, 0x67, 0x78, + 0xb9, 0xcb, 0x14, 0x6d, 0x31, 0x93, 0x55, 0xca, 0xa4, 0xe2, 0x69, 0xad, 0xe4, 0xcf, 0x36, 0xd5, + 0x92, 0xdd, 0xe9, 0x94, 0x49, 0xf1, 0xad, 0xfc, 0x8e, 0x6b, 0x25, 0x8d, 0x44, 0xa7, 0xbd, 0x50, + 0x71, 0x6c, 0x45, 0xd8, 0x8a, 0xa2, 0x7f, 0x0d, 0x98, 0xac, 0x2a, 0x29, 0x52, 0xc1, 0x4d, 0x4a, + 0x8b, 0x42, 0x71, 0xad, 0x9d, 0x41, 0xf4, 0xea, 0xb0, 0xd0, 0x0e, 0x99, 0xdc, 0xa6, 0x9a, 0xab, + 0x1d, 0x57, 0x1b, 0x5d, 0x73, 0xe6, 0x36, 0x66, 0x39, 0x8c, 0x72, 0xc6, 0x64, 0x23, 0x0c, 0x8a, + 0x20, 0x68, 0x34, 0x57, 0x82, 0x56, 0x3c, 0xf4, 0x62, 0x2f, 0x39, 0x26, 0xf7, 0xfd, 0x7e, 0x56, + 0x53, 0xad, 0x7f, 0x48, 0x55, 0x84, 0xbe, 0x9b, 0xf5, 0xfd, 0xec, 0xb7, 0x0f, 0x93, 0xb5, 0x35, + 0x9e, 0xdb, 0x30, 0xe8, 0x1d, 0x1c, 0xd3, 0xc6, 0xdc, 0x6e, 0x4c, 0x5b, 0x3b, 0xa7, 0x27, 0x59, + 0x8c, 0x0f, 0x47, 0xc3, 0x79, 0x63, 0x6e, 0xaf, 0xdb, 0x9a, 0x93, 0x80, 0x76, 0x15, 0xba, 0x82, + 0x80, 0xba, 0x93, 0x74, 0xe8, 0xc7, 0x83, 0x64, 0x9c, 0x65, 0x8f, 0x6d, 0x3f, 0xfc, 0x2d, 0xee, + 0x72, 0xe8, 0x85, 0x30, 0xaa, 0x25, 0xf7, 0x1e, 0xe8, 0x1c, 0x46, 0x1d, 0xa5, 0x70, 0x10, 0x7b, + 0xc9, 0x38, 0x7b, 0xfe, 0xd0, 0xce, 0x21, 0xc2, 0x82, 0x1b, 0xfc, 0x71, 0xb5, 0x54, 0x97, 0xb2, + 0xa2, 0xa5, 0x20, 0xfd, 0x06, 0x7a, 0x06, 0xe3, 0xa6, 0xa8, 0x37, 0x5c, 0xd0, 0x9b, 0x2d, 0x2f, + 0xc2, 0xff, 0x63, 0x2f, 0x09, 0x08, 0x34, 0x45, 0xbd, 0x70, 0x5f, 0x50, 0x08, 0x23, 0x53, 0x56, + 0x5c, 0x36, 0x26, 0x1c, 0xc6, 0x5e, 0x72, 0x42, 0xfa, 0x36, 0x3a, 0x87, 0x93, 0xbf, 0x4e, 0x42, + 0x53, 0x18, 0xdc, 0xf1, 0xb6, 0x63, 0xbb, 0x2f, 0xd1, 0x53, 0x18, 0xee, 0xe8, 0xb6, 0xe1, 0x1d, + 0x53, 0xd7, 0xbc, 0xf5, 0xdf, 0x78, 0x33, 0x02, 0x93, 0xf9, 0xb6, 0xe4, 0xc2, 0x74, 0x4c, 0x2f, + 0xe0, 0xc8, 0x3d, 0x5e, 0xe8, 0x59, 0x24, 0x67, 0x07, 0x32, 0xf4, 0xcf, 0xdc, 0x61, 0x59, 0x88, + 0xa2, 0x96, 0xa5, 0x30, 0xa4, 0xdb, 0x3c, 0x7b, 0x01, 0x41, 0x8f, 0x1b, 0x8d, 0x61, 0x74, 0xb5, + 0xdc, 0xe4, 0x9f, 0xae, 0x3f, 0x4c, 0xff, 0x43, 0x13, 0x08, 0x56, 0xf9, 0x7a, 0xfd, 0x65, 0x49, + 0x2e, 0xa7, 0xde, 0xc5, 0x7b, 0x88, 0x98, 0xac, 0x1e, 0x41, 0xbe, 0xf2, 0xbe, 0x0e, 0x6d, 0xf1, + 0xcb, 0x3f, 0xfd, 0x9c, 0x11, 0xda, 0xe2, 0xf9, 0x5e, 0xb1, 0xb2, 0x8a, 0xf5, 0x7e, 0x70, 0x73, + 0x64, 0xef, 0x78, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x57, 0x01, 0x54, 0x95, 0xf7, 0x02, 0x00, + 0x00, } diff --git a/proxy/socks/config.proto b/proxy/socks/config.proto index 3d6f7b96d..f6121c5e5 100644 --- a/proxy/socks/config.proto +++ b/proxy/socks/config.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.socks; option csharp_namespace = "V2Ray.Core.Proxy.Socks"; option go_package = "socks"; option java_package = "com.v2ray.core.proxy.socks"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/net/address.proto"; import "v2ray.com/core/common/protocol/server_spec.proto"; diff --git a/proxy/vmess/account.pb.go b/proxy/vmess/account.pb.go index d7a0005d5..3e5fa3db3 100644 --- a/proxy/vmess/account.pb.go +++ b/proxy/vmess/account.pb.go @@ -58,21 +58,21 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/account.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 250 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x8f, 0x4f, 0x4b, 0xc3, 0x30, - 0x18, 0xc6, 0x49, 0x45, 0xa7, 0xf1, 0x0f, 0xda, 0xc3, 0xa8, 0x3b, 0x15, 0x4f, 0x45, 0xe4, 0x0d, - 0xd4, 0x4f, 0xe0, 0x76, 0xd2, 0xd3, 0xe8, 0x60, 0x82, 0x97, 0x11, 0x93, 0x38, 0x03, 0x4b, 0xdf, - 0xf1, 0x26, 0x1b, 0xf6, 0x43, 0xf8, 0x45, 0xfc, 0x94, 0xd2, 0xb4, 0x05, 0x91, 0x1d, 0x93, 0xfc, - 0x9e, 0xdf, 0xf3, 0x84, 0x17, 0xfb, 0x92, 0x64, 0x03, 0x0a, 0x9d, 0x50, 0x48, 0x46, 0x6c, 0x09, - 0xbf, 0x1a, 0xb1, 0x77, 0xc6, 0x7b, 0x21, 0x95, 0xc2, 0x5d, 0x1d, 0x60, 0x4b, 0x18, 0x30, 0x1d, - 0x0f, 0x24, 0x19, 0x88, 0x14, 0x44, 0x6a, 0xf2, 0xf0, 0xcf, 0xa0, 0xd0, 0x39, 0xac, 0x45, 0x0c, - 0x29, 0xdc, 0x88, 0x4f, 0x23, 0xb5, 0x21, 0xdf, 0x59, 0xee, 0xbe, 0x19, 0x1f, 0x3d, 0x75, 0xde, - 0xf4, 0x8a, 0x27, 0x56, 0x67, 0x2c, 0x67, 0xc5, 0x59, 0x95, 0x58, 0x9d, 0xde, 0xf2, 0x53, 0xb9, - 0x09, 0x86, 0x56, 0x56, 0x67, 0x49, 0xce, 0x8a, 0xcb, 0x6a, 0x14, 0xcf, 0xcf, 0x3a, 0x7d, 0xe5, - 0x37, 0xde, 0xa8, 0x1d, 0xd9, 0xd0, 0xac, 0xbc, 0x09, 0xc1, 0xd6, 0x6b, 0x9f, 0x1d, 0xe5, 0xac, - 0x38, 0x2f, 0xef, 0xe1, 0xcf, 0xb0, 0xae, 0x1c, 0x86, 0x72, 0x58, 0xf4, 0xa1, 0x19, 0xd6, 0x1f, - 0x76, 0x5d, 0x5d, 0x0f, 0x92, 0x45, 0xef, 0x98, 0xbe, 0xf0, 0x89, 0x42, 0x07, 0x87, 0xff, 0x36, - 0xbd, 0xe8, 0xa7, 0xce, 0x5b, 0xdf, 0xdb, 0x71, 0xbc, 0xfc, 0x49, 0xc6, 0xcb, 0xb2, 0x92, 0x0d, - 0xcc, 0x5a, 0x7a, 0x1e, 0xe9, 0x65, 0xfb, 0xf0, 0x7e, 0x12, 0x6b, 0x1f, 0x7f, 0x03, 0x00, 0x00, - 0xff, 0xff, 0x5d, 0x45, 0x43, 0x16, 0x54, 0x01, 0x00, 0x00, + // 244 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x8f, 0xc1, 0x4a, 0x03, 0x31, + 0x10, 0x86, 0xc9, 0x8a, 0x56, 0x23, 0x8a, 0xee, 0xa1, 0xac, 0x3d, 0x2d, 0x9e, 0x16, 0x91, 0x09, + 0xac, 0x77, 0x41, 0x7b, 0xf2, 0x56, 0xb6, 0x50, 0xc1, 0x4b, 0x89, 0x49, 0xac, 0x81, 0x66, 0xa7, + 0x4c, 0xd2, 0x62, 0x1e, 0xc2, 0x17, 0xf1, 0x29, 0xa5, 0xd9, 0x5d, 0x10, 0xe9, 0x2d, 0x61, 0xbe, + 0xff, 0xfb, 0x67, 0x78, 0xb5, 0xab, 0x49, 0x46, 0x50, 0xe8, 0x84, 0x42, 0x32, 0x62, 0x43, 0xf8, + 0x15, 0xc5, 0xce, 0x19, 0xef, 0x85, 0x54, 0x0a, 0xb7, 0x6d, 0x80, 0x0d, 0x61, 0xc0, 0x7c, 0x3c, + 0x90, 0x64, 0x20, 0x51, 0x90, 0xa8, 0xc9, 0xfd, 0x3f, 0x83, 0x42, 0xe7, 0xb0, 0x15, 0x29, 0xa4, + 0x70, 0x2d, 0x3e, 0x8d, 0xd4, 0x86, 0x7c, 0x67, 0xb9, 0xfd, 0x66, 0x7c, 0xf4, 0xd4, 0x79, 0xf3, + 0x4b, 0x9e, 0x59, 0x5d, 0xb0, 0x92, 0x55, 0x67, 0x4d, 0x66, 0x75, 0x7e, 0xc3, 0x4f, 0xe5, 0x3a, + 0x18, 0x5a, 0x5a, 0x5d, 0x64, 0x25, 0xab, 0x2e, 0x9a, 0x51, 0xfa, 0xbf, 0xe8, 0xfc, 0x95, 0x5f, + 0x7b, 0xa3, 0xb6, 0x64, 0x43, 0x5c, 0x7a, 0x13, 0x82, 0x6d, 0x57, 0xbe, 0x38, 0x2a, 0x59, 0x75, + 0x5e, 0xdf, 0xc1, 0x9f, 0xc5, 0xba, 0x72, 0x18, 0xca, 0x61, 0xde, 0x87, 0xa6, 0xd8, 0x7e, 0xd8, + 0x55, 0x73, 0x35, 0x48, 0xe6, 0xbd, 0xe3, 0xf9, 0x91, 0x4f, 0x14, 0x3a, 0x38, 0x7c, 0xdb, 0x8c, + 0xbd, 0x1d, 0xa7, 0xc7, 0x4f, 0x36, 0x5e, 0xd4, 0x8d, 0x8c, 0x30, 0xdd, 0x13, 0xb3, 0x44, 0x2c, + 0xf6, 0x83, 0xf7, 0x93, 0x54, 0xf5, 0xf0, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x82, 0xf9, 0x1b, 0xdb, + 0x48, 0x01, 0x00, 0x00, } diff --git a/proxy/vmess/account.proto b/proxy/vmess/account.proto index 984a346b7..c69317d97 100644 --- a/proxy/vmess/account.proto +++ b/proxy/vmess/account.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.vmess; option csharp_namespace = "V2Ray.Core.Proxy.Vmess"; option go_package = "vmess"; option java_package = "com.v2ray.core.proxy.vmess"; -option java_outer_classname = "AccountProto"; +option java_multiple_files = true; import "v2ray.com/core/common/protocol/headers.proto"; diff --git a/proxy/vmess/inbound/config.pb.go b/proxy/vmess/inbound/config.pb.go index 68dae1dea..f65d7db47 100644 --- a/proxy/vmess/inbound/config.pb.go +++ b/proxy/vmess/inbound/config.pb.go @@ -97,24 +97,24 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/inbound/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 302 bytes of a gzipped FileDescriptorProto + // 297 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xcf, 0x4e, 0x83, 0x40, - 0x10, 0xc6, 0x03, 0xd5, 0xa2, 0x8b, 0xf5, 0x40, 0x3c, 0xa0, 0x07, 0x42, 0x38, 0xd5, 0x44, 0x77, - 0x13, 0xf4, 0x01, 0x4c, 0x4b, 0x62, 0x7a, 0x6b, 0x36, 0xb1, 0x07, 0x3d, 0x18, 0xba, 0x6c, 0x0d, - 0x09, 0x30, 0xcd, 0xb2, 0x10, 0x79, 0x25, 0xdf, 0xc5, 0x77, 0x32, 0xcc, 0x42, 0xfc, 0x73, 0xb0, - 0xc7, 0x99, 0x7c, 0xbf, 0x6f, 0xbe, 0x6f, 0x08, 0x6b, 0x63, 0x95, 0x76, 0x54, 0x40, 0xc9, 0x04, - 0x28, 0xc9, 0xf6, 0x0a, 0xde, 0x3b, 0xd6, 0x96, 0xb2, 0xae, 0x59, 0x5e, 0x6d, 0xa1, 0xa9, 0x32, - 0x26, 0xa0, 0xda, 0xe5, 0x6f, 0x74, 0xaf, 0x40, 0x83, 0x17, 0x8c, 0x80, 0x92, 0x14, 0xc5, 0x14, - 0xc5, 0x74, 0x10, 0x5f, 0x5d, 0xff, 0x31, 0x14, 0x50, 0x96, 0x50, 0x31, 0x84, 0x05, 0x14, 0xac, - 0xa9, 0xa5, 0x32, 0x56, 0x51, 0x40, 0xce, 0x12, 0xa9, 0xa1, 0x51, 0x4b, 0x3c, 0xe0, 0x9d, 0x13, - 0x5b, 0x83, 0x6f, 0x85, 0xd6, 0xfc, 0x94, 0xdb, 0x1a, 0xa2, 0x07, 0x32, 0x4b, 0xe4, 0x2e, 0x6d, - 0x0a, 0x3d, 0x08, 0x2e, 0xc9, 0x49, 0x5a, 0x68, 0xa9, 0x5e, 0xf3, 0x0c, 0x65, 0x33, 0xee, 0xe0, - 0xbc, 0xca, 0xbc, 0x0b, 0x72, 0x5c, 0xc8, 0x56, 0x16, 0xbe, 0x8d, 0x7b, 0x33, 0x44, 0x9f, 0x16, - 0x99, 0x0e, 0xec, 0x3d, 0x39, 0xea, 0x4f, 0xfb, 0x56, 0x38, 0x99, 0xbb, 0x71, 0x48, 0x7f, 0xd4, - 0x30, 0x11, 0xe9, 0x18, 0x91, 0x3e, 0xd5, 0x52, 0x71, 0x54, 0x7b, 0x8f, 0xc4, 0xc9, 0x4c, 0x04, - 0x34, 0x76, 0xe3, 0x5b, 0xfa, 0x7f, 0x7f, 0xfa, 0x2b, 0x31, 0x1f, 0x69, 0x2f, 0x21, 0xd3, 0x0c, - 0xbb, 0xfa, 0x13, 0xf4, 0xb9, 0x39, 0xec, 0xf3, 0xfd, 0x19, 0x3e, 0xb0, 0x8b, 0x17, 0x12, 0x09, - 0x28, 0x0f, 0xa0, 0x0b, 0xd7, 0x50, 0xeb, 0xbe, 0xcf, 0xb3, 0x33, 0x6c, 0x3f, 0xec, 0x60, 0x13, - 0xf3, 0xb4, 0xa3, 0xcb, 0x1e, 0x5b, 0x23, 0xb6, 0x41, 0x6c, 0x65, 0x04, 0xdb, 0x29, 0x3e, 0xe0, - 0xee, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x49, 0x28, 0x20, 0xa9, 0x13, 0x02, 0x00, 0x00, + 0x10, 0xc6, 0x03, 0xd5, 0xa2, 0x5b, 0xeb, 0x81, 0x78, 0x40, 0x0f, 0x84, 0x70, 0xaa, 0x89, 0xce, + 0x26, 0xe8, 0x03, 0x18, 0x4b, 0x62, 0x7a, 0x23, 0x9b, 0xd8, 0x83, 0x17, 0x43, 0x97, 0xad, 0x21, + 0x01, 0xa6, 0x59, 0x16, 0x22, 0xaf, 0xe4, 0xbb, 0xf8, 0x4e, 0xa6, 0x03, 0xc4, 0x3f, 0x07, 0x7b, + 0xdb, 0xd9, 0xfc, 0xbe, 0x6f, 0xbe, 0x6f, 0x18, 0x6f, 0x23, 0x9d, 0x76, 0x20, 0xb1, 0xe4, 0x12, + 0xb5, 0xe2, 0x3b, 0x8d, 0xef, 0x1d, 0x6f, 0x4b, 0x55, 0xd7, 0x3c, 0xaf, 0x36, 0xd8, 0x54, 0x19, + 0x97, 0x58, 0x6d, 0xf3, 0x37, 0xd8, 0x69, 0x34, 0xe8, 0xfa, 0xa3, 0x40, 0x2b, 0x20, 0x18, 0x08, + 0x86, 0x01, 0xbe, 0xba, 0xfe, 0x63, 0x28, 0xb1, 0x2c, 0xb1, 0xe2, 0x24, 0x96, 0x58, 0xf0, 0xa6, + 0x56, 0xba, 0xb7, 0x0a, 0x7d, 0x76, 0x16, 0x2b, 0x83, 0x8d, 0x5e, 0xd2, 0x02, 0xf7, 0x9c, 0xd9, + 0x06, 0x3d, 0x2b, 0xb0, 0x16, 0xa7, 0xc2, 0x36, 0x18, 0x3e, 0xb0, 0x79, 0xac, 0xb6, 0x69, 0x53, + 0x98, 0x01, 0xb8, 0x64, 0x27, 0x69, 0x61, 0x94, 0x7e, 0xcd, 0x33, 0xc2, 0xe6, 0xc2, 0xa1, 0x79, + 0x95, 0xb9, 0x17, 0xec, 0xb8, 0x50, 0xad, 0x2a, 0x3c, 0x9b, 0xfe, 0xfb, 0x21, 0xfc, 0xb4, 0xd8, + 0x74, 0xd0, 0xde, 0xb3, 0xa3, 0xfd, 0x6a, 0xcf, 0x0a, 0x26, 0x8b, 0x59, 0x14, 0xc0, 0x8f, 0x1a, + 0x7d, 0x44, 0x18, 0x23, 0xc2, 0x73, 0xad, 0xb4, 0x20, 0xda, 0x7d, 0x62, 0x4e, 0xd6, 0x47, 0x20, + 0xe3, 0x59, 0x74, 0x0b, 0xff, 0xf7, 0x87, 0x5f, 0x89, 0xc5, 0xa8, 0x76, 0x63, 0x36, 0xcd, 0xa8, + 0xab, 0x37, 0x21, 0x9f, 0x9b, 0xc3, 0x3e, 0xdf, 0x97, 0x11, 0x83, 0xf6, 0x31, 0x61, 0xa1, 0xc4, + 0xf2, 0x80, 0x34, 0xb1, 0x5e, 0x9c, 0xe1, 0xf9, 0x61, 0xfb, 0xeb, 0x48, 0xa4, 0x1d, 0x2c, 0xf7, + 0x6c, 0x42, 0xec, 0x9a, 0xd8, 0x55, 0x0f, 0x6c, 0xa6, 0xd4, 0xfa, 0xee, 0x2b, 0x00, 0x00, 0xff, + 0xff, 0x8d, 0x37, 0x9e, 0x90, 0x08, 0x02, 0x00, 0x00, } diff --git a/proxy/vmess/inbound/config.proto b/proxy/vmess/inbound/config.proto index 147258b53..fa69a2033 100644 --- a/proxy/vmess/inbound/config.proto +++ b/proxy/vmess/inbound/config.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.vmess.inbound; option csharp_namespace = "V2Ray.Core.Proxy.Vmess.Inbound"; option go_package = "inbound"; option java_package = "com.v2ray.core.proxy.vmess.inbound"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/protocol/user.proto"; diff --git a/proxy/vmess/outbound/config.pb.go b/proxy/vmess/outbound/config.pb.go index 77fd9a765..80d406fda 100644 --- a/proxy/vmess/outbound/config.pb.go +++ b/proxy/vmess/outbound/config.pb.go @@ -39,19 +39,18 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/outbound/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 213 bytes of a gzipped FileDescriptorProto + // 208 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8e, 0xb1, 0x4a, 0xc4, 0x40, - 0x10, 0x86, 0x51, 0xe1, 0x38, 0xf6, 0xba, 0xab, 0xc4, 0xe6, 0x44, 0x1b, 0xb1, 0x98, 0x95, 0xf8, - 0x06, 0x77, 0x68, 0x6b, 0x88, 0x90, 0xc2, 0x42, 0x49, 0x26, 0xa3, 0x04, 0xdc, 0x9d, 0x65, 0x36, - 0x59, 0xcc, 0x2b, 0xf9, 0x94, 0x92, 0x89, 0x2b, 0x62, 0x63, 0x3b, 0x7c, 0xdf, 0xf7, 0x8f, 0xb9, - 0x49, 0x85, 0x34, 0x13, 0x20, 0x3b, 0x8b, 0x2c, 0x64, 0x83, 0xf0, 0xc7, 0x64, 0x93, 0xa3, 0x18, - 0x2d, 0x8f, 0x43, 0xcb, 0xa3, 0xef, 0x2c, 0xb2, 0x7f, 0xed, 0xdf, 0x20, 0x08, 0x0f, 0xbc, 0xdd, - 0x65, 0x43, 0x08, 0x94, 0x06, 0xa5, 0x21, 0xd3, 0x67, 0x7f, 0x93, 0xc8, 0xce, 0xb1, 0xb7, 0x6a, - 0x23, 0xbf, 0xdb, 0x48, 0x92, 0x48, 0x5e, 0x62, 0x20, 0x5c, 0x92, 0x17, 0xa5, 0x59, 0x1d, 0x74, - 0x62, 0x7b, 0x6f, 0xd6, 0x15, 0x21, 0xf5, 0x89, 0xe4, 0xf4, 0xe8, 0xfc, 0xe4, 0x6a, 0x53, 0x5c, - 0xc3, 0xaf, 0xbd, 0x25, 0x05, 0x39, 0x05, 0x8f, 0x9a, 0xba, 0xf3, 0x5d, 0xe0, 0xde, 0x0f, 0xd5, - 0x8f, 0xbb, 0x7f, 0x36, 0x97, 0xc8, 0x0e, 0xfe, 0x79, 0x75, 0xbf, 0x59, 0x66, 0xcb, 0xb9, 0xf7, - 0xb4, 0xce, 0xe7, 0xcf, 0xe3, 0x5d, 0x5d, 0x54, 0xcd, 0x04, 0x87, 0x59, 0x2c, 0x55, 0xac, 0x55, - 0x7c, 0xf8, 0x26, 0xda, 0x95, 0xbe, 0x70, 0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0x51, 0x8a, 0x44, - 0x99, 0x3f, 0x01, 0x00, 0x00, + 0x10, 0x86, 0x39, 0x85, 0xe3, 0x58, 0xbb, 0xab, 0xc4, 0xe6, 0x44, 0x1b, 0xb1, 0x98, 0x95, 0xf8, + 0x06, 0x06, 0x6d, 0x0d, 0x09, 0xa4, 0xb0, 0x91, 0x64, 0x32, 0x4a, 0xc0, 0xdd, 0x59, 0x66, 0x93, + 0xc5, 0xbc, 0x92, 0x4f, 0x29, 0x4e, 0x5c, 0x11, 0x1b, 0xbb, 0x29, 0xbe, 0xff, 0xfb, 0xc6, 0xdc, + 0xa4, 0x42, 0xba, 0x05, 0x90, 0x9d, 0x45, 0x16, 0xb2, 0x41, 0xf8, 0x7d, 0xb1, 0xc9, 0x51, 0x8c, + 0x96, 0xe7, 0xa9, 0xe7, 0xd9, 0x0f, 0x16, 0xd9, 0xbf, 0x8c, 0xaf, 0x10, 0x84, 0x27, 0xde, 0x1f, + 0xf2, 0x42, 0x08, 0x94, 0x06, 0xa5, 0x21, 0xd3, 0x67, 0x7f, 0x95, 0xc8, 0xce, 0xb1, 0xb7, 0xba, + 0x46, 0x7e, 0xb3, 0x91, 0x24, 0x91, 0x3c, 0xc7, 0x40, 0xb8, 0x2a, 0x2f, 0x2a, 0xb3, 0x2d, 0x35, + 0xb1, 0x7f, 0x30, 0xbb, 0x9a, 0x90, 0xc6, 0x44, 0x72, 0xba, 0x39, 0x3f, 0xbe, 0x3a, 0x29, 0xae, + 0xe1, 0x57, 0x6f, 0x55, 0x41, 0x56, 0x41, 0xa3, 0xaa, 0x7b, 0x3f, 0x04, 0x1e, 0xfd, 0x54, 0xff, + 0x6c, 0xef, 0x1a, 0x73, 0x89, 0xec, 0xe0, 0x9f, 0x57, 0xab, 0xcd, 0xd3, 0x2e, 0xdf, 0x1f, 0x47, + 0x87, 0xb6, 0xa8, 0xbb, 0x05, 0xca, 0x2f, 0xba, 0x52, 0xba, 0x55, 0xfa, 0xf1, 0x9b, 0xe8, 0xb7, + 0xda, 0xbd, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x80, 0xb5, 0x19, 0x90, 0x34, 0x01, 0x00, 0x00, } diff --git a/proxy/vmess/outbound/config.proto b/proxy/vmess/outbound/config.proto index ca240adfa..7530988df 100644 --- a/proxy/vmess/outbound/config.proto +++ b/proxy/vmess/outbound/config.proto @@ -4,7 +4,7 @@ package v2ray.core.proxy.vmess.outbound; option csharp_namespace = "V2Ray.Core.Proxy.Vmess.Outbound"; option go_package = "outbound"; option java_package = "com.v2ray.core.proxy.vmess.outbound"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/protocol/server_spec.proto"; diff --git a/tools/geoip/geoip.pb.go b/tools/geoip/geoip.pb.go index 4da57fff8..da6ca397a 100644 --- a/tools/geoip/geoip.pb.go +++ b/tools/geoip/geoip.pb.go @@ -39,7 +39,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/tools/geoip/geoip.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 189 bytes of a gzipped FileDescriptorProto + // 184 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2b, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0xc9, 0xcf, 0xcf, 0x29, 0xd6, 0x4f, 0x4f, 0xcd, 0xcf, 0x2c, 0x80, 0x90, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x62, @@ -48,8 +48,8 @@ var fileDescriptor0 = []byte{ 0x4a, 0xf6, 0x5c, 0x7c, 0xce, 0xf9, 0xa5, 0x79, 0x25, 0x45, 0x95, 0x9e, 0x01, 0x41, 0x89, 0x79, 0xe9, 0xa9, 0x42, 0xba, 0x5c, 0xcc, 0x99, 0x05, 0xc5, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0xd2, 0x7a, 0x48, 0xe6, 0x27, 0x16, 0x14, 0xe8, 0x41, 0xcc, 0xd0, 0x73, 0xf6, 0x74, 0x09, 0x0a, - 0x02, 0xa9, 0x73, 0xf2, 0xe0, 0x92, 0x4a, 0xce, 0xcf, 0xd5, 0xc3, 0xee, 0x0c, 0x27, 0x2e, 0x77, - 0x10, 0x15, 0x00, 0xb2, 0x2a, 0x8a, 0x15, 0x2c, 0xb4, 0x8a, 0x49, 0x2c, 0xcc, 0x28, 0x28, 0xb1, - 0x52, 0xcf, 0x19, 0xa4, 0x36, 0x04, 0xac, 0x16, 0xac, 0x28, 0x89, 0x0d, 0xec, 0x22, 0x63, 0x40, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x42, 0x52, 0x54, 0xfb, 0x00, 0x00, 0x00, + 0x02, 0xa9, 0x73, 0xb2, 0xe3, 0x92, 0x4a, 0xce, 0xcf, 0xd5, 0xc3, 0xee, 0x8c, 0x00, 0xc6, 0x28, + 0x56, 0x30, 0x63, 0x15, 0x93, 0x58, 0x98, 0x51, 0x50, 0x62, 0xa5, 0x9e, 0x33, 0x48, 0x45, 0x08, + 0x58, 0x85, 0x3b, 0x48, 0x22, 0x89, 0x0d, 0xec, 0x0e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xe5, 0xf7, 0xf0, 0xf6, 0xf1, 0x00, 0x00, 0x00, } diff --git a/tools/geoip/geoip.proto b/tools/geoip/geoip.proto index 499171e4b..10691bc69 100644 --- a/tools/geoip/geoip.proto +++ b/tools/geoip/geoip.proto @@ -4,7 +4,7 @@ package v2ray.core.tools.geoip; option csharp_namespace = "V2Ray.Core.Tools.Geoip"; option go_package = "geoip"; option java_package = "com.v2ray.core.tools.geoip"; -option java_outer_classname = "GeoipProto"; +option java_multiple_files = true; import "v2ray.com/core/app/router/config.proto"; diff --git a/transport/config.pb.go b/transport/config.pb.go index 81f58dbfc..d988a7806 100644 --- a/transport/config.pb.go +++ b/transport/config.pb.go @@ -40,7 +40,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/transport/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 175 bytes of a gzipped FileDescriptorProto + // 170 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2d, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f, @@ -48,8 +48,8 @@ var fileDescriptor0 = []byte{ 0xaf, 0x24, 0xb5, 0x28, 0x2f, 0x15, 0xd5, 0x14, 0xa5, 0x74, 0x2e, 0x36, 0x67, 0x30, 0x5f, 0x28, 0x96, 0x4b, 0x08, 0xae, 0x38, 0xbe, 0x38, 0xb5, 0xa4, 0x24, 0x33, 0x2f, 0xbd, 0x58, 0x82, 0x51, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x4f, 0x0f, 0x9b, 0x65, 0x7a, 0x30, 0x23, 0xf5, 0x42, 0x60, 0x42, - 0x10, 0xb3, 0x82, 0x04, 0xe1, 0x6a, 0x82, 0xa1, 0x06, 0x39, 0x79, 0x72, 0x49, 0x24, 0xe7, 0xe7, - 0x62, 0x35, 0xc7, 0x89, 0x1b, 0xa2, 0x2d, 0x00, 0xe4, 0xa2, 0x28, 0x4e, 0xb8, 0xf8, 0x2a, 0x26, - 0x91, 0x30, 0xa3, 0xa0, 0xc4, 0x4a, 0x3d, 0x67, 0x90, 0x72, 0xb8, 0x1d, 0x49, 0x6c, 0x60, 0xa7, - 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x89, 0x64, 0xdc, 0xb9, 0x29, 0x01, 0x00, 0x00, + 0x10, 0xb3, 0x82, 0x04, 0xe1, 0x6a, 0x82, 0xa1, 0x06, 0x39, 0xd9, 0x71, 0x49, 0x24, 0xe7, 0xe7, + 0x62, 0x35, 0x27, 0x80, 0x31, 0x8a, 0x13, 0xce, 0x59, 0xc5, 0x24, 0x12, 0x66, 0x14, 0x94, 0x58, + 0xa9, 0xe7, 0x0c, 0x52, 0x03, 0x37, 0x38, 0x89, 0x0d, 0xec, 0x5e, 0x63, 0x40, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x92, 0xcd, 0x15, 0x9b, 0x1e, 0x01, 0x00, 0x00, } diff --git a/transport/config.proto b/transport/config.proto index 174e74d67..9a408365f 100644 --- a/transport/config.proto +++ b/transport/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport; option csharp_namespace = "V2Ray.Core.Transport"; option go_package = "transport"; option java_package = "com.v2ray.core.transport"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/transport/internet/config.proto"; diff --git a/transport/internet/config.pb.go b/transport/internet/config.pb.go index a4605e1ef..0f4960999 100644 --- a/transport/internet/config.pb.go +++ b/transport/internet/config.pb.go @@ -137,29 +137,29 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/transport/internet/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 375 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x91, 0x4f, 0x4b, 0xc3, 0x30, - 0x18, 0xc6, 0x6d, 0x3b, 0xb4, 0x7b, 0xbb, 0x69, 0x97, 0xd3, 0x10, 0x86, 0x73, 0x82, 0x14, 0x0f, - 0xe9, 0xa8, 0x77, 0x0f, 0xab, 0x17, 0xd1, 0x41, 0x69, 0xa7, 0xc2, 0x40, 0x46, 0x17, 0x63, 0x29, - 0xae, 0xcd, 0x48, 0xa3, 0xd8, 0xcf, 0xe3, 0xcd, 0xbb, 0xdf, 0x4f, 0xfa, 0x2f, 0x0c, 0x85, 0xb1, - 0x8b, 0xb7, 0x92, 0x3c, 0xef, 0xef, 0xfd, 0xf5, 0x09, 0xe0, 0x77, 0x87, 0x87, 0x39, 0x26, 0x2c, - 0xb1, 0x09, 0xe3, 0xd4, 0x16, 0x3c, 0x4c, 0xb3, 0x35, 0xe3, 0xc2, 0x8e, 0x53, 0x41, 0x79, 0x4a, - 0x85, 0x4d, 0x58, 0xfa, 0x12, 0x47, 0x78, 0xcd, 0x99, 0x60, 0x68, 0xd0, 0xe4, 0x39, 0xc5, 0x32, - 0x8b, 0x9b, 0xec, 0xf1, 0xf8, 0x17, 0x8e, 0xb0, 0x24, 0x61, 0xa9, 0x9d, 0x51, 0x1e, 0x87, 0x2b, - 0x5b, 0xe4, 0x6b, 0xfa, 0xbc, 0x48, 0x68, 0x96, 0x85, 0x11, 0xad, 0x80, 0xa3, 0x4f, 0x05, 0x8e, - 0x66, 0x0d, 0xc8, 0x2d, 0x57, 0xa1, 0x3b, 0xd0, 0xcb, 0x4b, 0xc2, 0x56, 0x7d, 0x65, 0xa8, 0x58, - 0x87, 0xce, 0x18, 0x6f, 0xdd, 0x8b, 0x25, 0xc1, 0xab, 0xe7, 0x7c, 0x49, 0x40, 0x13, 0xd0, 0x33, - 0x2a, 0x44, 0x9c, 0x46, 0x59, 0x5f, 0x1d, 0x2a, 0x96, 0xe1, 0x9c, 0x6f, 0xd2, 0x2a, 0x45, 0x5c, - 0x29, 0xe2, 0x59, 0xa1, 0x38, 0xad, 0x0c, 0x7d, 0x39, 0x37, 0xfa, 0x56, 0xa1, 0x13, 0x08, 0x4e, - 0xc3, 0xe4, 0x5f, 0x14, 0x9f, 0x00, 0xc9, 0x89, 0xc5, 0x86, 0xac, 0x66, 0x19, 0x0e, 0xde, 0x95, - 0x5b, 0x99, 0xf9, 0x3d, 0x99, 0x09, 0x6a, 0x10, 0x3a, 0x83, 0x6e, 0x46, 0xc9, 0x1b, 0x8f, 0x45, - 0xbe, 0x28, 0xde, 0xa0, 0xaf, 0x0d, 0x15, 0xab, 0xed, 0x77, 0x9a, 0xc3, 0xe2, 0xa7, 0x51, 0x00, - 0x3d, 0x19, 0x92, 0x0a, 0xad, 0x52, 0x61, 0xd7, 0xbe, 0xcc, 0x06, 0xd0, 0x6c, 0x1e, 0x9d, 0x80, - 0xe1, 0x71, 0xf6, 0x91, 0xd7, 0xad, 0x99, 0xa0, 0x89, 0x30, 0x2a, 0x0b, 0x6b, 0xfb, 0xc5, 0xe7, - 0xc5, 0x15, 0xf4, 0xfe, 0x14, 0x83, 0x0e, 0x40, 0x9b, 0xb9, 0x9e, 0xb9, 0x57, 0x7c, 0xdc, 0x5f, - 0x7b, 0xa6, 0x82, 0x74, 0x68, 0x4d, 0x6f, 0x5d, 0xcf, 0x54, 0x51, 0x17, 0xda, 0x8f, 0x74, 0x19, - 0x30, 0xf2, 0x4a, 0x85, 0xa9, 0x4d, 0xe6, 0x70, 0x4a, 0x58, 0xb2, 0xbd, 0xa2, 0x89, 0x51, 0xad, - 0x2f, 0xf9, 0x73, 0xbd, 0x39, 0xfe, 0x52, 0x07, 0x0f, 0x8e, 0x1f, 0xe6, 0xd8, 0x2d, 0xc6, 0xa4, - 0x05, 0xbe, 0xa9, 0xef, 0x97, 0xfb, 0xe5, 0xfb, 0x5c, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xbc, - 0x9c, 0xbf, 0x91, 0x24, 0x03, 0x00, 0x00, + // 374 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x91, 0x4d, 0x4b, 0xeb, 0x40, + 0x14, 0x86, 0x6f, 0x92, 0x72, 0x6f, 0x7a, 0xda, 0x5e, 0xd3, 0x59, 0x15, 0xa1, 0x58, 0x2b, 0x48, + 0x70, 0x31, 0x29, 0x71, 0xef, 0xa2, 0x71, 0x23, 0x5a, 0x0c, 0x49, 0x55, 0x10, 0xa4, 0xa4, 0xe3, + 0x18, 0x82, 0x4d, 0xa6, 0x4c, 0x46, 0x31, 0xbf, 0xc7, 0x9d, 0x7b, 0xff, 0x9f, 0xe4, 0x63, 0x86, + 0xa2, 0x50, 0xba, 0x71, 0x37, 0x64, 0xde, 0xf3, 0x9c, 0x27, 0xef, 0x00, 0x7e, 0x75, 0x79, 0x54, + 0x60, 0xc2, 0x52, 0x87, 0x30, 0x4e, 0x1d, 0xc1, 0xa3, 0x2c, 0x5f, 0x33, 0x2e, 0x9c, 0x24, 0x13, + 0x94, 0x67, 0x54, 0x38, 0x84, 0x65, 0x4f, 0x49, 0x8c, 0xd7, 0x9c, 0x09, 0x86, 0x86, 0x32, 0xcf, + 0x29, 0x56, 0x59, 0x2c, 0xb3, 0xfb, 0x93, 0x6f, 0x38, 0xc2, 0xd2, 0x94, 0x65, 0x4e, 0x4e, 0x79, + 0x12, 0xad, 0x1c, 0x51, 0xac, 0xe9, 0xe3, 0x22, 0xa5, 0x79, 0x1e, 0xc5, 0xb4, 0x06, 0x8e, 0xdf, + 0x35, 0xd8, 0x9b, 0x4b, 0x90, 0x57, 0xad, 0x42, 0x57, 0x60, 0x56, 0x97, 0x84, 0xad, 0x06, 0xda, + 0x48, 0xb3, 0xff, 0xbb, 0x13, 0xbc, 0x75, 0x2f, 0x56, 0x04, 0xbf, 0x99, 0x0b, 0x14, 0x01, 0x4d, + 0xc1, 0xcc, 0xa9, 0x10, 0x49, 0x16, 0xe7, 0x03, 0x7d, 0xa4, 0xd9, 0x1d, 0xf7, 0x78, 0x93, 0x56, + 0x2b, 0xe2, 0x5a, 0x11, 0xcf, 0x4b, 0xc5, 0x59, 0x6d, 0x18, 0xa8, 0xb9, 0xf1, 0xa7, 0x0e, 0xdd, + 0x50, 0x70, 0x1a, 0xa5, 0xbf, 0xa2, 0xf8, 0x00, 0x48, 0x4d, 0x2c, 0x36, 0x64, 0x0d, 0xbb, 0xe3, + 0xe2, 0x5d, 0xb9, 0xb5, 0x59, 0xd0, 0x57, 0x99, 0xb0, 0x01, 0xa1, 0x23, 0xe8, 0xe5, 0x94, 0xbc, + 0xf0, 0x44, 0x14, 0x8b, 0xf2, 0x0d, 0x06, 0xc6, 0x48, 0xb3, 0xdb, 0x41, 0x57, 0x7e, 0x2c, 0x7f, + 0x1a, 0x85, 0xd0, 0x57, 0x21, 0xa5, 0xd0, 0xaa, 0x14, 0x76, 0xed, 0xcb, 0x92, 0x00, 0xb9, 0x79, + 0x7c, 0x00, 0x1d, 0x9f, 0xb3, 0xb7, 0xa2, 0x69, 0xcd, 0x02, 0x43, 0x44, 0x71, 0x55, 0x58, 0x3b, + 0x28, 0x8f, 0x27, 0x67, 0xd0, 0xff, 0x51, 0x0c, 0xfa, 0x07, 0xc6, 0xdc, 0xf3, 0xad, 0x3f, 0xe5, + 0xe1, 0xe6, 0xdc, 0xb7, 0x34, 0x64, 0x42, 0x6b, 0x76, 0xe9, 0xf9, 0x96, 0x8e, 0x7a, 0xd0, 0xbe, + 0xa3, 0xcb, 0x90, 0x91, 0x67, 0x2a, 0x2c, 0x63, 0x7a, 0x0d, 0x87, 0x84, 0xa5, 0xdb, 0x2b, 0xf2, + 0xb5, 0x7b, 0x53, 0x9e, 0x3f, 0xf4, 0xe1, 0xad, 0x1b, 0x44, 0x05, 0xf6, 0xca, 0xac, 0x5a, 0x8d, + 0x2f, 0x9a, 0xfb, 0xe5, 0xdf, 0xea, 0x51, 0x4e, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x4a, + 0x68, 0x51, 0x19, 0x03, 0x00, 0x00, } diff --git a/transport/internet/config.proto b/transport/internet/config.proto index 30b2e10c8..43530205c 100644 --- a/transport/internet/config.proto +++ b/transport/internet/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet; option csharp_namespace = "V2Ray.Core.Transport.Internet"; option go_package = "internet"; option java_package = "com.v2ray.core.transport.internet"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/serial/typed_message.proto"; diff --git a/transport/internet/headers/http/config.pb.go b/transport/internet/headers/http/config.pb.go index 48775adcb..9cd9db103 100644 --- a/transport/internet/headers/http/config.pb.go +++ b/transport/internet/headers/http/config.pb.go @@ -217,30 +217,30 @@ func init() { } var fileDescriptor0 = []byte{ - // 399 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0x4f, 0x6b, 0xdb, 0x30, - 0x18, 0xc6, 0xb1, 0x9d, 0x39, 0xcb, 0x1b, 0x36, 0x86, 0x18, 0xc3, 0xa7, 0x2d, 0xf8, 0x14, 0x72, - 0x90, 0xc1, 0xd9, 0x65, 0xdb, 0x2d, 0xb9, 0x64, 0x85, 0x40, 0x51, 0x4a, 0x0e, 0xbd, 0xa9, 0x8e, - 0xda, 0x18, 0x1a, 0xc9, 0x95, 0xe4, 0x40, 0xbe, 0x41, 0x3f, 0x4b, 0xef, 0xfd, 0x6c, 0xbd, 0x16, - 0xfd, 0xb1, 0x9b, 0x1e, 0x0a, 0x75, 0x4b, 0x6f, 0xef, 0x6b, 0xbf, 0xcf, 0x8f, 0xf7, 0x79, 0x2c, - 0x19, 0xfe, 0xed, 0x73, 0x49, 0x0f, 0xb8, 0x10, 0xbb, 0xac, 0x10, 0x92, 0x65, 0x5a, 0x52, 0xae, - 0x2a, 0x21, 0x75, 0x56, 0x72, 0xcd, 0x24, 0x67, 0x3a, 0xdb, 0x32, 0xba, 0x61, 0x52, 0x65, 0x5b, - 0xad, 0xab, 0xac, 0x10, 0xfc, 0xb2, 0xbc, 0xc2, 0x95, 0x14, 0x5a, 0xa0, 0x49, 0x23, 0x96, 0x0c, - 0xb7, 0x42, 0xdc, 0x08, 0xb1, 0x17, 0x62, 0x23, 0x4c, 0x73, 0x88, 0x17, 0xb6, 0x47, 0x08, 0x7a, - 0x9c, 0xee, 0x58, 0x12, 0x8c, 0x82, 0xf1, 0x80, 0xd8, 0x1a, 0x7d, 0x87, 0x4f, 0x7b, 0x7a, 0x5d, - 0xb3, 0x24, 0x1c, 0x45, 0xe3, 0x01, 0x71, 0x4d, 0xfa, 0x0b, 0xfa, 0x6b, 0x26, 0x55, 0x29, 0xf8, - 0xd3, 0x80, 0x53, 0xf9, 0x81, 0x9f, 0x10, 0x2f, 0x99, 0xde, 0x8a, 0xcd, 0x0b, 0xef, 0x6f, 0x43, - 0xf8, 0x42, 0xd8, 0x4d, 0xcd, 0x94, 0x9e, 0xdb, 0xc5, 0xd1, 0x12, 0xfa, 0x7b, 0x87, 0xb4, 0x93, - 0xc3, 0x7c, 0x8a, 0x5f, 0x6f, 0x02, 0xfb, 0x6d, 0x48, 0xc3, 0x40, 0x27, 0x10, 0xef, 0xec, 0x02, - 0x49, 0x68, 0x69, 0x79, 0x17, 0x9a, 0x5b, 0x9d, 0x78, 0x02, 0xfa, 0x06, 0x51, 0x2d, 0xcb, 0x24, - 0xb2, 0x09, 0x98, 0xd2, 0xd0, 0x9d, 0x20, 0xe9, 0x8d, 0xa2, 0xae, 0x74, 0x97, 0x36, 0xf1, 0x84, - 0xf4, 0x37, 0xc4, 0x2b, 0x4d, 0x75, 0xad, 0x4c, 0xfe, 0x85, 0xd8, 0xb4, 0xf9, 0x9b, 0x1a, 0xfd, - 0x80, 0x58, 0x32, 0xaa, 0x04, 0xb7, 0x3e, 0x06, 0xc4, 0x77, 0xe9, 0x43, 0x00, 0x5f, 0x09, 0x53, - 0x95, 0xe0, 0x8a, 0x7d, 0x58, 0x82, 0xca, 0xee, 0xf5, 0x96, 0x04, 0x9d, 0x23, 0xe2, 0x09, 0x47, - 0x79, 0x45, 0xef, 0xce, 0xeb, 0x3e, 0x80, 0xd8, 0x3b, 0x5e, 0x41, 0x5f, 0xba, 0x43, 0xe4, 0x1d, - 0xff, 0xe9, 0xc2, 0x7d, 0x76, 0xfe, 0x48, 0x43, 0x42, 0x6b, 0xf8, 0x2c, 0x7d, 0xb0, 0xde, 0xf9, - 0xdf, 0x6e, 0xd4, 0xe3, 0x8f, 0x42, 0x5a, 0xd6, 0xac, 0x02, 0x73, 0x99, 0x3b, 0xa0, 0x66, 0x43, - 0xc7, 0x38, 0x35, 0x57, 0xfa, 0xbc, 0x67, 0x1e, 0xdd, 0x85, 0x93, 0x75, 0x4e, 0xe8, 0x01, 0xcf, - 0x8d, 0xfe, 0xac, 0xd5, 0xff, 0x6f, 0xf4, 0x0b, 0xaf, 0x5f, 0x68, 0x5d, 0x5d, 0xc4, 0xf6, 0x67, - 0x30, 0x7d, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x30, 0x13, 0xcf, 0x4b, 0x04, 0x00, 0x00, + // 394 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0xbf, 0x8a, 0xdb, 0x40, + 0x10, 0xc6, 0x91, 0xe4, 0xc8, 0xf1, 0x84, 0x84, 0xb0, 0x84, 0xa0, 0x2a, 0x31, 0xaa, 0x8c, 0x8b, + 0x15, 0xc8, 0x69, 0x92, 0x74, 0x71, 0xe3, 0x04, 0x0c, 0x61, 0x1d, 0x5c, 0xa4, 0xdb, 0xc8, 0x93, + 0x58, 0x10, 0xef, 0x2a, 0xbb, 0x2b, 0x83, 0xdf, 0x20, 0xcf, 0x72, 0xfd, 0x3d, 0xdb, 0xb5, 0xc7, + 0xfe, 0x91, 0xce, 0x57, 0x1c, 0x9c, 0xee, 0xb8, 0x4a, 0x33, 0x68, 0xbe, 0x1f, 0xf3, 0x7d, 0x5a, + 0x2d, 0x7c, 0x3e, 0x96, 0x8a, 0x9f, 0x68, 0x25, 0x0f, 0x45, 0x25, 0x15, 0x16, 0x46, 0x71, 0xa1, + 0x1b, 0xa9, 0x4c, 0x51, 0x0b, 0x83, 0x4a, 0xa0, 0x29, 0xf6, 0xc8, 0x77, 0xa8, 0x74, 0xb1, 0x37, + 0xa6, 0x29, 0x2a, 0x29, 0x7e, 0xd7, 0x7f, 0x68, 0xa3, 0xa4, 0x91, 0x64, 0xde, 0x89, 0x15, 0xd2, + 0x5e, 0x48, 0x3b, 0x21, 0x0d, 0x42, 0x6a, 0x85, 0x79, 0x09, 0xe9, 0xca, 0xf5, 0x84, 0xc0, 0x48, + 0xf0, 0x03, 0x66, 0xd1, 0x34, 0x9a, 0x4d, 0x98, 0xab, 0xc9, 0x1b, 0x78, 0x76, 0xe4, 0x7f, 0x5b, + 0xcc, 0xe2, 0x69, 0x32, 0x9b, 0x30, 0xdf, 0xe4, 0xef, 0x61, 0xbc, 0x45, 0xa5, 0x6b, 0x29, 0x6e, + 0x06, 0xbc, 0x2a, 0x0c, 0xbc, 0x83, 0x74, 0x8d, 0x66, 0x2f, 0x77, 0x77, 0xbc, 0xff, 0x1f, 0xc3, + 0x4b, 0x86, 0xff, 0x5a, 0xd4, 0x66, 0xe9, 0x16, 0x27, 0x6b, 0x18, 0x1f, 0x3d, 0xd2, 0x4d, 0xbe, + 0x28, 0x17, 0xf4, 0xfe, 0x26, 0x68, 0xd8, 0x86, 0x75, 0x0c, 0xf2, 0x0d, 0xd2, 0x83, 0x5b, 0x20, + 0x8b, 0x1d, 0xad, 0x1c, 0x42, 0xf3, 0xab, 0xb3, 0x40, 0x20, 0xaf, 0x21, 0x69, 0x55, 0x9d, 0x25, + 0x2e, 0x01, 0x5b, 0x5a, 0xba, 0x17, 0x64, 0xa3, 0x69, 0x32, 0x94, 0xee, 0xd3, 0x66, 0x81, 0x90, + 0x7f, 0x80, 0x74, 0x63, 0xb8, 0x69, 0xb5, 0xcd, 0xbf, 0x92, 0xbb, 0x3e, 0x7f, 0x5b, 0x93, 0xb7, + 0x90, 0x2a, 0xe4, 0x5a, 0x0a, 0xe7, 0x63, 0xc2, 0x42, 0x97, 0x5f, 0x45, 0xf0, 0x8a, 0xa1, 0x6e, + 0xa4, 0xd0, 0xf8, 0x64, 0x09, 0x6a, 0xb7, 0xd7, 0x43, 0x12, 0xf4, 0x8e, 0x58, 0x20, 0x9c, 0xe5, + 0x95, 0x3c, 0x3a, 0xaf, 0xcb, 0x08, 0xd2, 0xe0, 0x78, 0x03, 0x63, 0xe5, 0x0f, 0x51, 0x70, 0xfc, + 0x71, 0x08, 0xf7, 0xd6, 0xf9, 0x63, 0x1d, 0x89, 0x6c, 0xe1, 0xb9, 0x0a, 0xc1, 0x06, 0xe7, 0x9f, + 0x86, 0x51, 0xcf, 0x3f, 0x0a, 0xeb, 0x59, 0x5f, 0x10, 0xec, 0xcf, 0x3c, 0x00, 0xf5, 0x3d, 0xfa, + 0x39, 0xb2, 0xcf, 0x8b, 0x78, 0xbe, 0x2d, 0x19, 0x3f, 0xd1, 0xa5, 0x15, 0xfd, 0xe8, 0x45, 0x5f, + 0x3b, 0xd1, 0x2a, 0x88, 0x56, 0xc6, 0x34, 0xbf, 0x52, 0x77, 0x03, 0x2c, 0xae, 0x03, 0x00, 0x00, + 0xff, 0xff, 0x10, 0xea, 0x22, 0x27, 0x40, 0x04, 0x00, 0x00, } diff --git a/transport/internet/headers/http/config.proto b/transport/internet/headers/http/config.proto index 18b08f080..df033b141 100644 --- a/transport/internet/headers/http/config.proto +++ b/transport/internet/headers/http/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.headers.http; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Http"; option go_package = "http"; option java_package = "com.v2ray.core.transport.internet.headers.http"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message Header { // "Accept", "Cookie", etc diff --git a/transport/internet/headers/noop/config.pb.go b/transport/internet/headers/noop/config.pb.go index 70d1f7f4b..53931879f 100644 --- a/transport/internet/headers/noop/config.pb.go +++ b/transport/internet/headers/noop/config.pb.go @@ -41,16 +41,16 @@ func init() { } var fileDescriptor0 = []byte{ - // 174 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0xcf, 0xb1, 0xea, 0xc2, 0x40, - 0x0c, 0xc7, 0x71, 0xf8, 0xf3, 0xa7, 0xc8, 0xb9, 0x48, 0x1f, 0xa1, 0x63, 0x87, 0x1c, 0xd4, 0xd1, - 0xad, 0x5d, 0x74, 0x11, 0x11, 0x71, 0x70, 0x3b, 0xcf, 0xa8, 0x1d, 0x4c, 0x8e, 0x34, 0x08, 0x7d, - 0x25, 0x9f, 0x52, 0xae, 0xed, 0x75, 0x76, 0xfd, 0xc1, 0x27, 0x7c, 0x63, 0x36, 0xef, 0x4a, 0x5c, - 0x0f, 0x9e, 0x5f, 0xd6, 0xb3, 0xa0, 0x55, 0x71, 0xd4, 0x05, 0x16, 0xb5, 0x2d, 0x29, 0x0a, 0xa1, - 0xda, 0x27, 0xba, 0x1b, 0x4a, 0x67, 0x89, 0x39, 0x58, 0xcf, 0x74, 0x6f, 0x1f, 0x10, 0x84, 0x95, - 0xf3, 0x32, 0x61, 0x41, 0x98, 0x21, 0x24, 0x08, 0x13, 0x84, 0x08, 0x8b, 0x85, 0xc9, 0x9a, 0xc1, - 0x16, 0xb9, 0x59, 0x35, 0x4c, 0x84, 0x5e, 0x5b, 0xa6, 0x71, 0xab, 0x83, 0x89, 0x09, 0xf0, 0xfb, - 0xbd, 0x7a, 0x39, 0xca, 0x43, 0x0c, 0xb9, 0xfc, 0xc7, 0xe9, 0xf3, 0x57, 0x9e, 0xab, 0xa3, 0xeb, - 0xa1, 0x89, 0xfe, 0x34, 0xfb, 0x5d, 0xf2, 0xdb, 0xc9, 0xef, 0x99, 0xc3, 0x35, 0x1b, 0x5e, 0x58, - 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x55, 0x14, 0x69, 0x01, 0x01, 0x00, 0x00, + // 170 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0xce, 0xb1, 0xaa, 0xc2, 0x40, + 0x10, 0x85, 0x61, 0xee, 0x45, 0x82, 0x6c, 0x25, 0x79, 0x84, 0x94, 0x29, 0x66, 0x21, 0x96, 0x76, + 0xa6, 0xd1, 0x46, 0x44, 0xc4, 0xc2, 0x6e, 0x5d, 0x47, 0x4d, 0xe1, 0x9c, 0x65, 0xb2, 0x08, 0x79, + 0x25, 0x9f, 0x52, 0x36, 0x26, 0xa9, 0xad, 0x06, 0x06, 0xbe, 0xc3, 0x6f, 0x56, 0xaf, 0x4a, 0x5d, + 0x47, 0x1e, 0x4f, 0xeb, 0xa1, 0x6c, 0xa3, 0x3a, 0x69, 0x03, 0x34, 0xda, 0x46, 0x22, 0xab, 0x70, + 0xb4, 0x0f, 0x76, 0x57, 0xd6, 0xd6, 0x0a, 0x10, 0xac, 0x87, 0xdc, 0x9a, 0x3b, 0x05, 0x45, 0x44, + 0x5e, 0x8e, 0x58, 0x99, 0x26, 0x48, 0x23, 0xa4, 0x01, 0x52, 0x82, 0xc5, 0xdc, 0x64, 0x75, 0x6f, + 0x8b, 0xdc, 0x2c, 0x6a, 0x88, 0xb0, 0x8f, 0x0d, 0xe4, 0xfb, 0x5b, 0xb3, 0x49, 0x09, 0xf4, 0xfb, + 0xde, 0xfe, 0xef, 0x3c, 0x4b, 0xf7, 0xfd, 0x5f, 0x9e, 0xaa, 0x83, 0xeb, 0xa8, 0x4e, 0xe8, 0x38, + 0xa1, 0xed, 0x88, 0x36, 0x03, 0xda, 0x01, 0xe1, 0x92, 0xf5, 0xdd, 0xcb, 0x4f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xd0, 0xe6, 0xd7, 0x87, 0xf6, 0x00, 0x00, 0x00, } diff --git a/transport/internet/headers/noop/config.proto b/transport/internet/headers/noop/config.proto index 2ee99b6bf..aec672a9d 100644 --- a/transport/internet/headers/noop/config.proto +++ b/transport/internet/headers/noop/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.headers.noop; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Noop"; option go_package = "noop"; option java_package = "com.v2ray.core.transport.internet.headers.noop"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message Config {} diff --git a/transport/internet/headers/srtp/config.pb.go b/transport/internet/headers/srtp/config.pb.go index f7ff95baa..2ffd2cdf6 100644 --- a/transport/internet/headers/srtp/config.pb.go +++ b/transport/internet/headers/srtp/config.pb.go @@ -80,22 +80,22 @@ func init() { } var fileDescriptor0 = []byte{ - // 264 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0xd0, 0xb1, 0x4f, 0x03, 0x21, - 0x14, 0x06, 0xf0, 0x5c, 0xad, 0xa7, 0xa5, 0xba, 0x30, 0x18, 0x06, 0x4d, 0xaa, 0x53, 0xd3, 0x01, - 0x92, 0x3a, 0xba, 0xb5, 0x8b, 0x6e, 0xe6, 0x6c, 0x1c, 0x5c, 0x1a, 0xe4, 0x9e, 0xf5, 0xa2, 0x05, - 0xf2, 0x78, 0x36, 0xf2, 0x2f, 0x39, 0xfb, 0x07, 0x1a, 0xf0, 0xa8, 0xab, 0xe3, 0xf7, 0x91, 0x1f, - 0xc9, 0xfb, 0xd8, 0xcd, 0x6e, 0x8e, 0x3a, 0x4a, 0xe3, 0xb6, 0xca, 0x38, 0x04, 0x45, 0xa8, 0x6d, - 0xf0, 0x0e, 0x49, 0x75, 0x96, 0x00, 0x2d, 0x90, 0x7a, 0x05, 0xdd, 0x02, 0x06, 0x15, 0x90, 0xbc, - 0x32, 0xce, 0xbe, 0x74, 0x1b, 0xe9, 0xd1, 0x91, 0xe3, 0xb3, 0x82, 0x11, 0xe4, 0x1e, 0xca, 0x02, - 0x65, 0x0f, 0x65, 0x82, 0x57, 0xdf, 0x15, 0xab, 0x97, 0x19, 0x73, 0xc1, 0x8e, 0x76, 0x80, 0xa1, - 0x73, 0x56, 0x54, 0x93, 0x6a, 0x7a, 0xda, 0x94, 0x98, 0x5e, 0xbc, 0x6e, 0xdb, 0xce, 0x6e, 0xc4, - 0x60, 0x52, 0x4d, 0x8f, 0x9b, 0x12, 0xf9, 0x39, 0x1b, 0xc1, 0x27, 0x81, 0xcd, 0xea, 0x20, 0xbf, - 0xfd, 0x15, 0xfc, 0x82, 0x31, 0x13, 0xd0, 0xac, 0x8d, 0xfb, 0xb0, 0x24, 0x86, 0xf9, 0xd3, 0x51, - 0x6a, 0x96, 0xa9, 0xe0, 0x67, 0xac, 0xde, 0x6a, 0x7c, 0x03, 0x14, 0x87, 0x59, 0xf6, 0x89, 0x5f, - 0xb2, 0x13, 0xaf, 0xe3, 0xbb, 0xd3, 0xed, 0x9a, 0xa2, 0x07, 0x51, 0x67, 0x38, 0xee, 0xbb, 0x55, - 0xf4, 0xb0, 0xf0, 0x2c, 0x6d, 0x23, 0xff, 0x7f, 0xe8, 0x62, 0xfc, 0x7b, 0xe5, 0x7d, 0x5a, 0xe8, - 0x69, 0x98, 0xaa, 0xaf, 0xc1, 0xec, 0x71, 0xde, 0xe8, 0x28, 0x97, 0xc9, 0xaf, 0xf6, 0xfe, 0xae, - 0xf8, 0xdb, 0xde, 0x3f, 0x20, 0xf9, 0xe7, 0x3a, 0x6f, 0x7b, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, - 0xd5, 0x92, 0x8f, 0x21, 0x9a, 0x01, 0x00, 0x00, + // 260 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0xd0, 0x31, 0x4b, 0x03, 0x31, + 0x14, 0x07, 0x70, 0xae, 0xd6, 0xd3, 0x46, 0x5d, 0x32, 0x48, 0x06, 0x85, 0xea, 0x54, 0x3a, 0x24, + 0x50, 0x47, 0x37, 0x6f, 0xd1, 0x4d, 0xce, 0xe2, 0xe0, 0x52, 0x62, 0xee, 0x59, 0x0f, 0x6d, 0x12, + 0x5e, 0x9e, 0xc5, 0x7c, 0x25, 0x67, 0x3f, 0xa0, 0x24, 0x5c, 0xea, 0xda, 0x29, 0xfc, 0xff, 0x8f, + 0x5f, 0xe0, 0x3d, 0x76, 0xbb, 0x5d, 0xa0, 0x8e, 0xd2, 0xb8, 0x8d, 0x32, 0x0e, 0x41, 0x11, 0x6a, + 0x1b, 0xbc, 0x43, 0x52, 0xbd, 0x25, 0x40, 0x0b, 0xa4, 0xde, 0x41, 0x77, 0x80, 0x41, 0x05, 0x24, + 0xaf, 0x8c, 0xb3, 0x6f, 0xfd, 0x5a, 0x7a, 0x74, 0xe4, 0xf8, 0xbc, 0x60, 0x04, 0xb9, 0x83, 0xb2, + 0x40, 0x39, 0x40, 0x99, 0xe0, 0xf5, 0x6f, 0xc5, 0xea, 0x26, 0x63, 0x2e, 0xd8, 0xd1, 0x16, 0x30, + 0xf4, 0xce, 0x8a, 0x6a, 0x5a, 0xcd, 0xce, 0xda, 0x12, 0xd3, 0xc4, 0xeb, 0xae, 0xeb, 0xed, 0x5a, + 0x8c, 0xa6, 0xd5, 0xec, 0xb8, 0x2d, 0x91, 0x5f, 0xb0, 0x09, 0x7c, 0x13, 0xd8, 0xac, 0x0e, 0xf2, + 0xec, 0xbf, 0xe0, 0x97, 0x8c, 0x99, 0x80, 0x66, 0x65, 0xdc, 0x97, 0x25, 0x31, 0xce, 0x9f, 0x4e, + 0x52, 0xd3, 0xa4, 0x82, 0x9f, 0xb3, 0x7a, 0xa3, 0xf1, 0x03, 0x50, 0x1c, 0x66, 0x39, 0x24, 0x7e, + 0xc5, 0x4e, 0xbd, 0x8e, 0x9f, 0x4e, 0x77, 0x2b, 0x8a, 0x1e, 0x44, 0x9d, 0xe1, 0xc9, 0xd0, 0x2d, + 0xa3, 0x87, 0x3b, 0x60, 0xe9, 0x36, 0x72, 0xff, 0x45, 0x1f, 0xab, 0x97, 0x71, 0x7a, 0x7f, 0x46, + 0xf3, 0xe7, 0x45, 0xab, 0xa3, 0x6c, 0x12, 0x5a, 0xee, 0xd0, 0x43, 0x41, 0xf7, 0x03, 0x7a, 0x42, + 0xf2, 0xaf, 0x75, 0x3e, 0xe8, 0xcd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x13, 0x73, 0xfd, 0x63, + 0x8f, 0x01, 0x00, 0x00, } diff --git a/transport/internet/headers/srtp/config.proto b/transport/internet/headers/srtp/config.proto index a8ae0235c..d1d9e501f 100644 --- a/transport/internet/headers/srtp/config.proto +++ b/transport/internet/headers/srtp/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.headers.srtp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Srtp"; option go_package = "srtp"; option java_package = "com.v2ray.core.transport.internet.headers.srtp"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message Config { uint32 version = 1; diff --git a/transport/internet/headers/utp/config.pb.go b/transport/internet/headers/utp/config.pb.go index 2dea5a128..be7ebaee0 100644 --- a/transport/internet/headers/utp/config.pb.go +++ b/transport/internet/headers/utp/config.pb.go @@ -40,7 +40,7 @@ func init() { } var fileDescriptor0 = []byte{ - // 182 bytes of a gzipped FileDescriptorProto + // 177 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x2a, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0x2d, 0xd1, 0xcf, 0x48, @@ -48,9 +48,9 @@ var fileDescriptor0 = []byte{ 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xd2, 0x84, 0xe9, 0x2d, 0x4a, 0xd5, 0x83, 0xeb, 0xd3, 0x83, 0xe9, 0xd3, 0x83, 0xea, 0xd3, 0x2b, 0x2d, 0x29, 0x50, 0x52, 0xe2, 0x62, 0x73, 0x06, 0x6b, 0x15, 0x92, 0xe0, 0x62, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd4, - 0xe0, 0x0d, 0x82, 0x71, 0x9d, 0x72, 0xb9, 0x74, 0x93, 0xf3, 0x73, 0xf5, 0x88, 0x36, 0xd4, 0x89, - 0x1b, 0x62, 0x64, 0x00, 0xc8, 0x31, 0x51, 0xcc, 0xa5, 0x25, 0x05, 0xab, 0x98, 0x34, 0xc3, 0x8c, - 0x82, 0x12, 0x2b, 0xf5, 0x9c, 0x41, 0xba, 0x43, 0xe0, 0xba, 0x3d, 0x61, 0xba, 0x3d, 0xa0, 0xba, - 0x43, 0x4b, 0x0a, 0x92, 0xd8, 0xc0, 0x9e, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x91, 0x1b, - 0x92, 0x61, 0x02, 0x01, 0x00, 0x00, + 0xe0, 0x0d, 0x82, 0x71, 0x9d, 0x92, 0xb8, 0x74, 0x93, 0xf3, 0x73, 0xf5, 0x88, 0x36, 0x34, 0x80, + 0x31, 0x8a, 0xb9, 0xb4, 0xa4, 0x60, 0x15, 0x93, 0x66, 0x98, 0x51, 0x50, 0x62, 0xa5, 0x9e, 0x33, + 0x48, 0x4b, 0x08, 0x5c, 0x8b, 0x27, 0x4c, 0x8b, 0x07, 0x54, 0x4b, 0x68, 0x49, 0x41, 0x12, 0x1b, + 0xd8, 0xe5, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x86, 0xa8, 0x3b, 0xf7, 0x00, 0x00, + 0x00, } diff --git a/transport/internet/headers/utp/config.proto b/transport/internet/headers/utp/config.proto index 81b794385..f55e4dcf4 100644 --- a/transport/internet/headers/utp/config.proto +++ b/transport/internet/headers/utp/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.headers.utp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Utp"; option go_package = "utp"; option java_package = "com.v2ray.core.transport.internet.headers.utp"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message Config { uint32 version = 1; diff --git a/transport/internet/headers/wechat/config.pb.go b/transport/internet/headers/wechat/config.pb.go index 17f8df933..289ccee98 100644 --- a/transport/internet/headers/wechat/config.pb.go +++ b/transport/internet/headers/wechat/config.pb.go @@ -32,16 +32,16 @@ func init() { } var fileDescriptor0 = []byte{ - // 169 bytes of a gzipped FileDescriptorProto + // 163 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x2d, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0x2d, 0xd1, 0xcf, 0x48, 0x4d, 0x4c, 0x49, 0x2d, 0x2a, 0xd6, 0x2f, 0x4f, 0x4d, 0xce, 0x48, 0x2c, 0xd1, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xd2, 0x81, 0x69, 0x2f, 0x4a, 0xd5, 0x83, 0x6b, 0xd5, 0x83, 0x69, 0xd5, 0x83, 0x6a, 0xd5, 0x83, 0x68, 0x55, 0xe2, 0xe5, 0xe2, 0x0e, - 0xcb, 0x4c, 0x49, 0xcd, 0x77, 0x06, 0x1b, 0xe1, 0x54, 0xc6, 0x65, 0x90, 0x9c, 0x9f, 0xab, 0x47, - 0x8a, 0x11, 0x4e, 0xdc, 0x10, 0xbd, 0x01, 0x20, 0xdb, 0xa3, 0xd8, 0x20, 0x82, 0xab, 0x98, 0x74, - 0xc2, 0x8c, 0x82, 0x12, 0x2b, 0xf5, 0x9c, 0x41, 0x66, 0x84, 0xc0, 0xcd, 0xf0, 0x84, 0x99, 0xe1, - 0x01, 0x35, 0x23, 0x1c, 0xac, 0x3c, 0x89, 0x0d, 0xec, 0x76, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x9b, 0x6a, 0x0f, 0x19, 0xfc, 0x00, 0x00, 0x00, + 0xcb, 0x4c, 0x49, 0xcd, 0x77, 0x06, 0x1b, 0xe1, 0x94, 0xcd, 0x65, 0x90, 0x9c, 0x9f, 0xab, 0x47, + 0x8a, 0x11, 0x01, 0x8c, 0x51, 0x6c, 0x10, 0xd6, 0x2a, 0x26, 0x9d, 0x30, 0xa3, 0xa0, 0xc4, 0x4a, + 0x3d, 0x67, 0x90, 0xc6, 0x10, 0xb8, 0x46, 0x4f, 0x98, 0x46, 0x0f, 0xa8, 0xc6, 0x70, 0xb0, 0xf2, + 0x24, 0x36, 0xb0, 0x83, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x46, 0x75, 0xf8, 0xf1, + 0x00, 0x00, 0x00, } diff --git a/transport/internet/headers/wechat/config.proto b/transport/internet/headers/wechat/config.proto index 819f3e678..f2b852925 100644 --- a/transport/internet/headers/wechat/config.proto +++ b/transport/internet/headers/wechat/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.headers.wechat; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Wechat"; option go_package = "wechat"; option java_package = "com.v2ray.core.transport.internet.headers.wechat"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message VideoConfig { } \ No newline at end of file diff --git a/transport/internet/kcp/config.pb.go b/transport/internet/kcp/config.pb.go index d64637a89..ff5c571d1 100644 --- a/transport/internet/kcp/config.pb.go +++ b/transport/internet/kcp/config.pb.go @@ -228,36 +228,36 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/transport/internet/kcp/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 491 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x54, 0xdf, 0x6f, 0xd3, 0x30, - 0x18, 0xd4, 0xd6, 0xad, 0x8c, 0x2f, 0xdb, 0x5a, 0x22, 0x84, 0x22, 0x90, 0xd0, 0x5a, 0x89, 0x69, - 0x3c, 0xe0, 0x40, 0xf6, 0xc2, 0x73, 0xcb, 0x4b, 0x35, 0x15, 0x81, 0x95, 0x82, 0x34, 0x69, 0x0a, - 0xae, 0xf3, 0xb5, 0x44, 0x6d, 0xec, 0xc8, 0x71, 0x56, 0x95, 0xff, 0x08, 0xfe, 0x4a, 0x64, 0xa7, - 0xe9, 0x2f, 0x34, 0x96, 0xb7, 0xd8, 0xbe, 0x3b, 0x5b, 0xf7, 0xdd, 0x05, 0x82, 0xfb, 0x40, 0xb1, - 0x25, 0xe1, 0x32, 0xf5, 0xb9, 0x54, 0xe8, 0x6b, 0xc5, 0x44, 0x9e, 0x49, 0xa5, 0xfd, 0x44, 0x68, - 0x54, 0x02, 0xb5, 0x3f, 0xe3, 0x99, 0xcf, 0xa5, 0x98, 0x24, 0x53, 0x92, 0x29, 0xa9, 0xa5, 0xdb, - 0xa9, 0x38, 0x0a, 0xc9, 0x1a, 0x4f, 0x2a, 0x3c, 0x99, 0xf1, 0xec, 0xe5, 0xfb, 0x3d, 0x59, 0x2e, - 0xd3, 0x54, 0x0a, 0x3f, 0x47, 0x95, 0xb0, 0xb9, 0xaf, 0x97, 0x19, 0xc6, 0x51, 0x8a, 0x79, 0xce, - 0xa6, 0x58, 0x8a, 0x76, 0x5f, 0x41, 0x63, 0x18, 0x8e, 0xdc, 0xe7, 0x70, 0x7c, 0xcf, 0xe6, 0x05, - 0x7a, 0x07, 0x17, 0x07, 0x57, 0x67, 0xb4, 0x5c, 0x98, 0xc3, 0x30, 0x1c, 0x3c, 0x70, 0x78, 0x09, - 0xe7, 0xa3, 0x6c, 0x9e, 0x88, 0x59, 0x9f, 0x65, 0x8c, 0x27, 0x7a, 0xf9, 0x00, 0xee, 0x0a, 0xda, - 0x9f, 0xe4, 0x42, 0xd4, 0x40, 0x76, 0xc0, 0xf9, 0xae, 0x12, 0x8d, 0xbd, 0x62, 0x32, 0x41, 0xe5, - 0xba, 0x70, 0x94, 0x27, 0xbf, 0x2a, 0x8c, 0xfd, 0xee, 0x5e, 0x00, 0x50, 0x64, 0xf1, 0x7f, 0x10, - 0x6f, 0xa1, 0xd5, 0x97, 0x42, 0x20, 0xd7, 0x89, 0x14, 0x14, 0x8b, 0x1c, 0xdd, 0x17, 0xd0, 0x44, - 0xc1, 0xc6, 0xf3, 0x12, 0x78, 0x42, 0x57, 0xab, 0xee, 0xef, 0x63, 0x68, 0xf6, 0xad, 0xc3, 0xee, - 0x47, 0x68, 0xa4, 0xba, 0xb0, 0xe7, 0x4e, 0x70, 0x49, 0x1e, 0x75, 0x9a, 0x0c, 0xc3, 0x11, 0x35, - 0x14, 0xc3, 0xd4, 0x3a, 0xf1, 0x0e, 0x6b, 0x33, 0xc3, 0x70, 0x40, 0x0d, 0xc5, 0xbd, 0x85, 0x56, - 0x61, 0x0d, 0x8c, 0xf8, 0xca, 0x17, 0xaf, 0x61, 0x55, 0x3e, 0xd4, 0x50, 0xd9, 0xb5, 0x9e, 0x9e, - 0x17, 0xbb, 0xa3, 0xf8, 0x01, 0xcf, 0xe2, 0x95, 0xe9, 0x1b, 0xf5, 0x23, 0xab, 0x7e, 0x5d, 0x43, - 0x7d, 0x7f, 0x60, 0xb4, 0x1d, 0xef, 0x8f, 0xf0, 0x35, 0x00, 0x97, 0x62, 0x8a, 0xb9, 0xf1, 0xd9, - 0x3b, 0xb6, 0xc6, 0x6e, 0xed, 0xb8, 0x5f, 0xe1, 0x74, 0x61, 0x86, 0x19, 0x8d, 0xed, 0xac, 0xbc, - 0xa6, 0xbd, 0x9c, 0xd4, 0xb8, 0x7c, 0x2b, 0x03, 0xd4, 0x59, 0x6c, 0x05, 0xe2, 0x33, 0x38, 0x0a, - 0x59, 0x5c, 0x29, 0x3e, 0xb1, 0x8a, 0xef, 0x6a, 0x28, 0x6e, 0x22, 0x43, 0x41, 0x6d, 0xe2, 0x73, - 0x03, 0x67, 0x3f, 0x91, 0xc5, 0xa8, 0xa2, 0xb2, 0x67, 0xde, 0xc9, 0xbf, 0x43, 0x2c, 0x1b, 0x44, - 0xca, 0x06, 0x91, 0xd0, 0x34, 0x68, 0x58, 0x16, 0x88, 0x9e, 0x96, 0xe4, 0x55, 0x82, 0xee, 0xa0, - 0xcd, 0xd7, 0xb9, 0x8b, 0x94, 0x09, 0x9e, 0xf7, 0xd4, 0xea, 0x05, 0x35, 0x5e, 0xb8, 0x17, 0x59, - 0xda, 0xe2, 0xbb, 0x1b, 0xbd, 0x3b, 0x78, 0xc3, 0x65, 0xfa, 0xb8, 0x52, 0xcf, 0x29, 0xdf, 0xf3, - 0xc5, 0xb4, 0xfb, 0xb6, 0x31, 0xe3, 0xd9, 0x9f, 0xc3, 0xce, 0xb7, 0x80, 0xb2, 0x25, 0xe9, 0x1b, - 0x56, 0xb8, 0x66, 0x0d, 0x2a, 0xd6, 0x0d, 0xcf, 0xc6, 0x4d, 0xfb, 0x37, 0xb8, 0xfe, 0x1b, 0x00, - 0x00, 0xff, 0xff, 0x77, 0xae, 0x78, 0x3a, 0x98, 0x04, 0x00, 0x00, + // 487 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x94, 0x5f, 0x6f, 0xd3, 0x30, + 0x14, 0xc5, 0xd5, 0x75, 0x2d, 0xe3, 0x76, 0x5b, 0x4b, 0x84, 0x50, 0x04, 0x12, 0x5a, 0x2b, 0x31, + 0x8d, 0x07, 0x1c, 0xc8, 0x5e, 0x78, 0x5e, 0x79, 0xa9, 0xa6, 0x22, 0xb0, 0x52, 0x90, 0x26, 0xa1, + 0xe0, 0x3a, 0xb7, 0x25, 0x6a, 0x63, 0x47, 0x8e, 0xb3, 0xaa, 0x7c, 0x23, 0xf8, 0x94, 0xc8, 0x4e, + 0xd3, 0x7f, 0x68, 0x6b, 0xde, 0x6a, 0xdf, 0x73, 0x7f, 0xae, 0xce, 0x3d, 0x37, 0xe0, 0xdf, 0xfb, + 0x8a, 0x2d, 0x09, 0x97, 0x89, 0xc7, 0xa5, 0x42, 0x4f, 0x2b, 0x26, 0xb2, 0x54, 0x2a, 0xed, 0xc5, + 0x42, 0xa3, 0x12, 0xa8, 0xbd, 0x19, 0x4f, 0x3d, 0x2e, 0xc5, 0x24, 0x9e, 0x92, 0x54, 0x49, 0x2d, + 0x9d, 0x6e, 0xd9, 0xa3, 0x90, 0xac, 0xf5, 0xa4, 0xd4, 0x93, 0x19, 0x4f, 0x5f, 0xbe, 0xdf, 0xc3, + 0x72, 0x99, 0x24, 0x52, 0x78, 0x19, 0xaa, 0x98, 0xcd, 0x3d, 0xbd, 0x4c, 0x31, 0x0a, 0x13, 0xcc, + 0x32, 0x36, 0xc5, 0x02, 0xda, 0x7b, 0x05, 0xf5, 0x61, 0x30, 0x72, 0x9e, 0x43, 0xe3, 0x9e, 0xcd, + 0x73, 0x74, 0x6b, 0x17, 0xb5, 0xab, 0x33, 0x5a, 0x1c, 0x4c, 0x31, 0x08, 0x06, 0x0f, 0x14, 0x2f, + 0xe1, 0x7c, 0x94, 0xce, 0x63, 0x31, 0xeb, 0xb3, 0x94, 0xf1, 0x58, 0x2f, 0x1f, 0xd0, 0x5d, 0x41, + 0xe7, 0x93, 0x5c, 0x88, 0x0a, 0xca, 0x2e, 0xb4, 0xbe, 0xab, 0x58, 0xe3, 0x4d, 0x3e, 0x99, 0xa0, + 0x72, 0x1c, 0x38, 0xce, 0xe2, 0xdf, 0xa5, 0xc6, 0xfe, 0xee, 0x5d, 0x00, 0x50, 0x64, 0xd1, 0x23, + 0x8a, 0xb7, 0xd0, 0xee, 0x4b, 0x21, 0x90, 0xeb, 0x58, 0x0a, 0x8a, 0x79, 0x86, 0xce, 0x0b, 0x68, + 0xa2, 0x60, 0xe3, 0x79, 0x21, 0x3c, 0xa1, 0xab, 0x53, 0xef, 0x4f, 0x03, 0x9a, 0x7d, 0xeb, 0xb0, + 0xf3, 0x11, 0xea, 0x89, 0xce, 0x6d, 0xbd, 0xe5, 0x5f, 0x92, 0x83, 0x4e, 0x93, 0x61, 0x30, 0xa2, + 0xa6, 0xc5, 0x74, 0x6a, 0x1d, 0xbb, 0x47, 0x95, 0x3b, 0x83, 0x60, 0x40, 0x4d, 0x8b, 0x73, 0x07, + 0xed, 0xdc, 0x1a, 0x18, 0xf2, 0x95, 0x2f, 0x6e, 0xdd, 0x52, 0x3e, 0x54, 0xa0, 0xec, 0x5a, 0x4f, + 0xcf, 0xf3, 0xdd, 0x51, 0xfc, 0x84, 0x67, 0xd1, 0xca, 0xf4, 0x0d, 0xfd, 0xd8, 0xd2, 0xaf, 0x2b, + 0xd0, 0xf7, 0x07, 0x46, 0x3b, 0xd1, 0xfe, 0x08, 0x5f, 0x03, 0x70, 0x29, 0xa6, 0x98, 0x19, 0x9f, + 0xdd, 0x86, 0x35, 0x76, 0xeb, 0xc6, 0xf9, 0x0a, 0xa7, 0x0b, 0x33, 0xcc, 0x70, 0x6c, 0x67, 0xe5, + 0x36, 0xed, 0xe3, 0xa4, 0xc2, 0xe3, 0x5b, 0x19, 0xa0, 0xad, 0xc5, 0x56, 0x20, 0x3e, 0x43, 0x4b, + 0x21, 0x8b, 0x4a, 0xe2, 0x13, 0x4b, 0x7c, 0x57, 0x81, 0xb8, 0x89, 0x0c, 0x05, 0xb5, 0x89, 0xcf, + 0x2d, 0x9c, 0xfd, 0x42, 0x16, 0xa1, 0x0a, 0x8b, 0x3d, 0x73, 0x4f, 0xfe, 0x1f, 0x62, 0xb1, 0x41, + 0xa4, 0xd8, 0x20, 0x12, 0x98, 0x0d, 0x1a, 0x16, 0x0b, 0x44, 0x4f, 0x8b, 0xe6, 0x55, 0x82, 0x7e, + 0x40, 0x87, 0xaf, 0x73, 0x17, 0x2a, 0x13, 0x3c, 0xf7, 0xa9, 0xe5, 0xf9, 0x15, 0xfe, 0xe1, 0x5e, + 0x64, 0x69, 0x9b, 0xef, 0x5e, 0xdc, 0x50, 0x78, 0xc3, 0x65, 0x72, 0x98, 0xf4, 0xa5, 0x76, 0x57, + 0x9f, 0xf1, 0xf4, 0xef, 0x51, 0xf7, 0x9b, 0x4f, 0xd9, 0x92, 0xf4, 0x8d, 0x34, 0x58, 0x4b, 0x07, + 0xa5, 0xf4, 0x96, 0xa7, 0xe3, 0xa6, 0xfd, 0x04, 0x5c, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x1d, + 0x04, 0x18, 0x2b, 0x8d, 0x04, 0x00, 0x00, } diff --git a/transport/internet/kcp/config.proto b/transport/internet/kcp/config.proto index 8d51fad0d..41658be80 100644 --- a/transport/internet/kcp/config.proto +++ b/transport/internet/kcp/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.kcp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Kcp"; option go_package = "kcp"; option java_package = "com.v2ray.core.transport.internet.kcp"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/serial/typed_message.proto"; diff --git a/transport/internet/tcp/config.pb.go b/transport/internet/tcp/config.pb.go index ccbebd029..b03e7500b 100644 --- a/transport/internet/tcp/config.pb.go +++ b/transport/internet/tcp/config.pb.go @@ -64,23 +64,23 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/transport/internet/tcp/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 277 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4a, 0xc3, 0x40, - 0x10, 0x86, 0x69, 0x85, 0x22, 0x5b, 0x30, 0x92, 0x83, 0x14, 0x4f, 0xb6, 0xa0, 0xe8, 0x65, 0x57, - 0xe2, 0x1b, 0x34, 0x27, 0x0f, 0xa2, 0xc4, 0xe0, 0x41, 0x28, 0x61, 0x3b, 0x1d, 0x63, 0xa0, 0xd9, - 0x59, 0x76, 0x47, 0x21, 0xaf, 0xe4, 0x13, 0xf8, 0x78, 0x92, 0x6c, 0x13, 0x24, 0x97, 0x1e, 0x17, - 0xfe, 0xef, 0xdf, 0xff, 0x1b, 0x91, 0x7c, 0x27, 0x4e, 0x37, 0x12, 0xa8, 0x56, 0x40, 0x0e, 0x15, - 0x3b, 0x6d, 0xbc, 0x25, 0xc7, 0xaa, 0x32, 0x8c, 0xce, 0x20, 0x2b, 0x06, 0xab, 0x80, 0xcc, 0x47, - 0x55, 0x4a, 0xeb, 0x88, 0x29, 0x5e, 0xf6, 0x8c, 0x43, 0x39, 0xe4, 0x65, 0x9f, 0x97, 0x0c, 0xf6, - 0xf2, 0x7e, 0x54, 0x0b, 0x54, 0xd7, 0x64, 0x94, 0x47, 0x57, 0xe9, 0xbd, 0xe2, 0xc6, 0xe2, 0xae, - 0xa8, 0xd1, 0x7b, 0x5d, 0x62, 0x28, 0x5d, 0xdd, 0x89, 0x28, 0x25, 0x63, 0x10, 0xb8, 0x22, 0x93, - 0xe1, 0x97, 0xc7, 0xf8, 0x42, 0xcc, 0xd0, 0xe8, 0xed, 0x1e, 0x17, 0x93, 0xab, 0xc9, 0xed, 0x69, - 0x76, 0x78, 0xad, 0x7e, 0x27, 0x62, 0x96, 0x76, 0x83, 0xe2, 0x8d, 0x38, 0x87, 0x81, 0x2a, 0x5c, - 0x8b, 0x75, 0xe1, 0x79, 0x92, 0xc8, 0xa3, 0x2b, 0xe5, 0xe8, 0xc3, 0x2c, 0x82, 0xd1, 0x82, 0x67, - 0x11, 0x7d, 0xa2, 0xde, 0xa1, 0x2b, 0x3c, 0x32, 0x57, 0xa6, 0xf4, 0x8b, 0x69, 0xd7, 0x7e, 0xf3, - 0xbf, 0x3d, 0xc8, 0xc9, 0x20, 0x27, 0xf3, 0x56, 0xee, 0x29, 0xb8, 0x65, 0x67, 0x01, 0x7f, 0x3d, - 0xd0, 0xeb, 0x8d, 0xb8, 0x06, 0xaa, 0x8f, 0x4f, 0x5b, 0xcf, 0x83, 0xe0, 0x4b, 0x7b, 0x9b, 0xf7, - 0x13, 0x06, 0xfb, 0x33, 0x5d, 0xbe, 0x25, 0x99, 0x6e, 0x64, 0xda, 0x52, 0xf9, 0x40, 0x3d, 0xf6, - 0x54, 0x0e, 0x76, 0x3b, 0xeb, 0x6e, 0xf9, 0xf0, 0x17, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x15, 0xa3, - 0xb6, 0xd6, 0x01, 0x00, 0x00, + // 273 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4a, 0xf4, 0x30, + 0x14, 0x85, 0xe9, 0xfc, 0x50, 0x7e, 0x22, 0x58, 0xe9, 0x42, 0x06, 0x57, 0xce, 0x80, 0xa2, 0x9b, + 0x44, 0xea, 0x1b, 0xd8, 0x95, 0x0b, 0x51, 0x62, 0x71, 0x21, 0x48, 0xc9, 0xdc, 0xb9, 0xd6, 0xc2, + 0x34, 0x37, 0x24, 0x57, 0xa1, 0xaf, 0xe4, 0x13, 0xf8, 0x78, 0xd2, 0x76, 0x5a, 0xa4, 0x9b, 0x59, + 0x06, 0xbe, 0xef, 0xe4, 0x9c, 0x2b, 0xb2, 0xaf, 0xcc, 0x9b, 0x56, 0x02, 0x35, 0x0a, 0xc8, 0xa3, + 0x62, 0x6f, 0x6c, 0x70, 0xe4, 0x59, 0xd5, 0x96, 0xd1, 0x5b, 0x64, 0xc5, 0xe0, 0x14, 0x90, 0x7d, + 0xaf, 0x2b, 0xe9, 0x3c, 0x31, 0xa5, 0xab, 0xd1, 0xf1, 0x28, 0x27, 0x5e, 0x8e, 0xbc, 0x64, 0x70, + 0x67, 0x37, 0xb3, 0x58, 0xa0, 0xa6, 0x21, 0xab, 0x02, 0xfa, 0xda, 0xec, 0x14, 0xb7, 0x0e, 0xb7, + 0x65, 0x83, 0x21, 0x98, 0x0a, 0x87, 0xd0, 0xf5, 0xb5, 0x48, 0x72, 0xb2, 0x16, 0x81, 0x6b, 0xb2, + 0x1a, 0x3f, 0x03, 0xa6, 0xa7, 0x22, 0x46, 0x6b, 0x36, 0x3b, 0x5c, 0x46, 0xe7, 0xd1, 0xd5, 0x7f, + 0xbd, 0x7f, 0xad, 0x7f, 0x22, 0x11, 0xe7, 0x7d, 0xa1, 0xf4, 0x4d, 0x9c, 0xc0, 0x64, 0x95, 0xbe, + 0xd3, 0x7a, 0xf8, 0x28, 0xcb, 0xe4, 0xc1, 0x96, 0x72, 0xf6, 0xa1, 0x4e, 0x60, 0xd6, 0xe0, 0x51, + 0x24, 0x1f, 0x68, 0xb6, 0xe8, 0xcb, 0x80, 0xcc, 0xb5, 0xad, 0xc2, 0x72, 0xd1, 0xa7, 0x5f, 0xfe, + 0x4d, 0x1f, 0xc6, 0xc9, 0x61, 0x9c, 0x2c, 0xba, 0x71, 0x0f, 0xc3, 0x36, 0x7d, 0x3c, 0xe8, 0xcf, + 0x7b, 0xfb, 0x4e, 0x8b, 0x0b, 0xa0, 0xe6, 0x70, 0xb5, 0xa7, 0xe8, 0xf5, 0x1f, 0x83, 0xfb, 0x5e, + 0xac, 0x5e, 0x32, 0x6d, 0x5a, 0x99, 0x77, 0x68, 0x31, 0xa1, 0xf7, 0x23, 0x5a, 0x80, 0xdb, 0xc4, + 0xfd, 0x01, 0x6f, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x17, 0x2c, 0x8e, 0x55, 0xcb, 0x01, 0x00, + 0x00, } diff --git a/transport/internet/tcp/config.proto b/transport/internet/tcp/config.proto index 2b051ad58..37479f5ac 100644 --- a/transport/internet/tcp/config.proto +++ b/transport/internet/tcp/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.tcp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Tcp"; option go_package = "tcp"; option java_package = "com.v2ray.core.transport.internet.tcp"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; import "v2ray.com/core/common/serial/typed_message.proto"; diff --git a/transport/internet/tls/config.pb.go b/transport/internet/tls/config.pb.go index b9fa52356..b09bcca68 100644 --- a/transport/internet/tls/config.pb.go +++ b/transport/internet/tls/config.pb.go @@ -84,22 +84,21 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/transport/internet/tls/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 261 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4b, 0xc3, 0x30, - 0x14, 0xc6, 0x69, 0x0b, 0x43, 0x53, 0x15, 0xe9, 0xa9, 0x37, 0xbb, 0xc1, 0xa0, 0xa7, 0x04, 0xea, - 0x5f, 0xe0, 0x7a, 0x1a, 0x82, 0x8c, 0x30, 0x3c, 0x08, 0x32, 0x62, 0x78, 0x93, 0x40, 0x9a, 0x8c, - 0x97, 0xe7, 0xa4, 0xff, 0x8e, 0x47, 0xff, 0x4a, 0x69, 0x6b, 0x47, 0x77, 0xda, 0x2d, 0xf9, 0xf2, - 0xfd, 0xde, 0xf7, 0xf2, 0xb1, 0xea, 0x58, 0xa1, 0x6a, 0xb9, 0xf6, 0x8d, 0xd0, 0x1e, 0x41, 0x10, - 0x2a, 0x17, 0x0e, 0x1e, 0x49, 0x18, 0x47, 0x80, 0x0e, 0x48, 0x90, 0x0d, 0x42, 0x7b, 0xb7, 0x37, - 0x9f, 0xfc, 0x80, 0x9e, 0x7c, 0x36, 0x1f, 0x19, 0x04, 0x7e, 0xf2, 0xf3, 0xd1, 0xcf, 0xc9, 0x86, - 0xc5, 0x13, 0x4b, 0x6b, 0x40, 0x32, 0x7b, 0xa3, 0x15, 0x41, 0x56, 0x9c, 0x5d, 0xf3, 0xa8, 0x88, - 0xca, 0x1b, 0x79, 0xe6, 0xb8, 0x67, 0xc9, 0x33, 0xb4, 0x79, 0xdc, 0xbf, 0x74, 0xc7, 0xc5, 0x4f, - 0xc4, 0x66, 0x75, 0x1f, 0x9b, 0x2d, 0xd9, 0x9d, 0xb2, 0xd6, 0x7f, 0xef, 0x8c, 0x0b, 0xa0, 0xbf, - 0x70, 0x98, 0x70, 0x25, 0x6f, 0x7b, 0x75, 0xfd, 0x2f, 0x66, 0x1b, 0x96, 0xea, 0x49, 0x4a, 0x5c, - 0x24, 0x65, 0x5a, 0x71, 0x7e, 0x71, 0x5b, 0x3e, 0x59, 0x44, 0x4e, 0x47, 0x64, 0x0f, 0x2c, 0x0d, - 0x80, 0x47, 0xc0, 0x9d, 0x53, 0x0d, 0xe4, 0x49, 0x11, 0x95, 0xd7, 0x92, 0x0d, 0xd2, 0x8b, 0x6a, - 0x60, 0xf5, 0xce, 0x96, 0xda, 0x37, 0x97, 0x23, 0x56, 0xe9, 0xf0, 0x95, 0x4d, 0x57, 0xe0, 0x5b, - 0x42, 0x36, 0xfc, 0xc6, 0xf3, 0xd7, 0x4a, 0xaa, 0x96, 0xd7, 0x1d, 0xb5, 0x3d, 0x51, 0xeb, 0x91, - 0xda, 0xda, 0xf0, 0x31, 0xeb, 0x0b, 0x7f, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xeb, 0x52, - 0x64, 0xa6, 0x01, 0x00, 0x00, + // 255 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0x41, 0x4b, 0x03, 0x31, + 0x10, 0x85, 0x49, 0x17, 0x8a, 0x66, 0x55, 0x24, 0xa7, 0xbd, 0xb9, 0x2d, 0x14, 0xf6, 0x94, 0xc0, + 0xfa, 0x0b, 0x74, 0x4f, 0x45, 0x90, 0x12, 0x8a, 0x07, 0x2f, 0x25, 0x86, 0xa9, 0x04, 0xb2, 0x49, + 0x99, 0x8c, 0x95, 0xfd, 0x3b, 0x1e, 0xfd, 0x95, 0xd2, 0xad, 0x5b, 0xb6, 0xa7, 0xde, 0x92, 0x37, + 0xdf, 0xbc, 0xf7, 0x18, 0x5e, 0xef, 0x6b, 0x34, 0x9d, 0xb4, 0xb1, 0x55, 0x36, 0x22, 0x28, 0x42, + 0x13, 0xd2, 0x2e, 0x22, 0x29, 0x17, 0x08, 0x30, 0x00, 0x29, 0xf2, 0x49, 0xd9, 0x18, 0xb6, 0xee, + 0x53, 0xee, 0x30, 0x52, 0x14, 0xb3, 0x61, 0x07, 0x41, 0x9e, 0x78, 0x39, 0xf0, 0x92, 0x7c, 0x9a, + 0x3f, 0xf1, 0xbc, 0x01, 0x24, 0xb7, 0x75, 0xd6, 0x10, 0x88, 0xf2, 0xec, 0x5b, 0xb0, 0x92, 0x55, + 0x37, 0xfa, 0x8c, 0xb8, 0xe7, 0xd9, 0x0b, 0x74, 0xc5, 0xa4, 0x9f, 0x1c, 0x9e, 0xf3, 0x1f, 0xc6, + 0xa7, 0x4d, 0x1f, 0x2b, 0x16, 0xfc, 0xce, 0x78, 0x1f, 0xbf, 0x37, 0x2e, 0x24, 0xb0, 0x5f, 0x78, + 0x74, 0xb8, 0xd2, 0xb7, 0xbd, 0xba, 0xfc, 0x17, 0xc5, 0x8a, 0xe7, 0x76, 0x94, 0x32, 0x29, 0xb3, + 0x2a, 0xaf, 0xa5, 0xbc, 0xd8, 0x56, 0x8e, 0x8a, 0xe8, 0xb1, 0x85, 0x78, 0xe0, 0x79, 0x02, 0xdc, + 0x03, 0x6e, 0x82, 0x69, 0xa1, 0xc8, 0x4a, 0x56, 0x5d, 0x6b, 0x7e, 0x94, 0x5e, 0x4d, 0x0b, 0xcf, + 0x9a, 0x2f, 0x6c, 0x6c, 0x2f, 0x47, 0xac, 0xd8, 0x7b, 0x46, 0x3e, 0xfd, 0x4e, 0x66, 0x6f, 0xb5, + 0x36, 0x9d, 0x6c, 0x0e, 0xe8, 0xfa, 0x84, 0x2e, 0x07, 0x74, 0xed, 0xd3, 0xc7, 0xb4, 0xbf, 0xf2, + 0xe3, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0x0b, 0x8b, 0x74, 0x9b, 0x01, 0x00, 0x00, } diff --git a/transport/internet/tls/config.proto b/transport/internet/tls/config.proto index 23c729542..a472b1da8 100644 --- a/transport/internet/tls/config.proto +++ b/transport/internet/tls/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.tls; option csharp_namespace = "V2Ray.Core.Transport.Internet.Tls"; option go_package = "tls"; option java_package = "com.v2ray.core.transport.internet.tls"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message Certificate { // TLS certificate in x509 format. diff --git a/transport/internet/websocket/config.pb.go b/transport/internet/websocket/config.pb.go index e81729fc8..825f1025f 100644 --- a/transport/internet/websocket/config.pb.go +++ b/transport/internet/websocket/config.pb.go @@ -67,20 +67,20 @@ func init() { } var fileDescriptor0 = []byte{ - // 233 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x90, 0xb1, 0x4a, 0x03, 0x41, - 0x10, 0x86, 0xb9, 0x20, 0x87, 0xd9, 0x14, 0x91, 0x2b, 0x24, 0x65, 0x48, 0x93, 0x88, 0xb0, 0x0b, - 0x67, 0x93, 0x3a, 0x57, 0xd9, 0xc9, 0x22, 0x0a, 0x36, 0xb2, 0x37, 0x8c, 0x7a, 0x68, 0x66, 0x8e, - 0xb9, 0x51, 0x49, 0xe9, 0xeb, 0xf8, 0x94, 0x72, 0x67, 0x76, 0x8b, 0x54, 0xd7, 0xed, 0x0e, 0xf3, - 0xfd, 0xdf, 0xf0, 0x9b, 0xed, 0x57, 0x29, 0xe1, 0x60, 0x81, 0xf7, 0x0e, 0x58, 0xd0, 0xa9, 0x04, - 0xea, 0x5a, 0x16, 0x75, 0x0d, 0x29, 0x0a, 0xa1, 0xba, 0x6f, 0xac, 0x3b, 0x86, 0x77, 0x54, 0x07, - 0x4c, 0x2f, 0xcd, 0xab, 0x6d, 0x85, 0x95, 0x8b, 0x75, 0x24, 0x05, 0x6d, 0xa2, 0x6c, 0xa4, 0x6c, - 0xa2, 0x56, 0x57, 0x66, 0x5e, 0x31, 0x11, 0x82, 0x36, 0x4c, 0x1e, 0x3f, 0x3b, 0x2c, 0x2e, 0x4d, - 0x8e, 0x14, 0xea, 0x0f, 0x5c, 0x64, 0xcb, 0x6c, 0x73, 0xee, 0x8f, 0xbf, 0xd5, 0x4f, 0x66, 0xf2, - 0x6a, 0x90, 0x14, 0x60, 0x2e, 0x20, 0x51, 0xcf, 0xd2, 0x63, 0xc3, 0xf2, 0xac, 0xdc, 0xda, 0x91, - 0x66, 0x7b, 0xa2, 0xf5, 0x73, 0x38, 0xb9, 0xa3, 0x30, 0x67, 0x6d, 0xd0, 0xb7, 0xc5, 0x64, 0x99, - 0x6d, 0xa6, 0x7e, 0x78, 0xef, 0xd8, 0x5c, 0x03, 0xef, 0xc7, 0x3a, 0x76, 0xb3, 0xff, 0x7b, 0xef, - 0xfa, 0x4e, 0x9e, 0xa6, 0x69, 0xfe, 0x3b, 0x59, 0x3f, 0x94, 0x3e, 0x1c, 0x6c, 0xd5, 0x27, 0xdc, - 0xa7, 0x84, 0xdb, 0x98, 0xf0, 0x18, 0x37, 0xeb, 0x7c, 0xe8, 0xf3, 0xe6, 0x2f, 0x00, 0x00, 0xff, - 0xff, 0x62, 0x54, 0x39, 0x72, 0x8b, 0x01, 0x00, 0x00, + // 226 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0xd0, 0xb1, 0x4a, 0x03, 0x41, + 0x10, 0x80, 0x61, 0x36, 0xc8, 0x61, 0xd6, 0x22, 0x72, 0x85, 0xa4, 0x0c, 0x69, 0x12, 0x11, 0x76, + 0xe1, 0x6c, 0x52, 0x7b, 0x95, 0x9d, 0x2c, 0xa2, 0x60, 0x23, 0x7b, 0xe3, 0xa8, 0x87, 0x66, 0xe6, + 0x98, 0x1b, 0x95, 0x94, 0xbe, 0x8e, 0x4f, 0x29, 0x39, 0xb2, 0x5b, 0xa4, 0xba, 0x6e, 0x07, 0xe6, + 0xe3, 0x5f, 0xc6, 0x6e, 0xbe, 0x2b, 0x89, 0x3b, 0x07, 0xbc, 0xf5, 0xc0, 0x82, 0x5e, 0x25, 0x52, + 0xdf, 0xb1, 0xa8, 0x6f, 0x49, 0x51, 0x08, 0xd5, 0xff, 0x60, 0xd3, 0x33, 0x7c, 0xa0, 0x7a, 0x60, + 0x7a, 0x6d, 0xdf, 0x5c, 0x27, 0xac, 0x5c, 0xae, 0x92, 0x14, 0x74, 0x59, 0xb9, 0xa4, 0x5c, 0x56, + 0xcb, 0x4b, 0x3b, 0xab, 0x99, 0x08, 0x41, 0x5b, 0xa6, 0x80, 0x5f, 0x3d, 0x96, 0x17, 0xb6, 0x40, + 0x8a, 0xcd, 0x27, 0xce, 0xcd, 0xc2, 0xac, 0x4f, 0xc3, 0x61, 0x5a, 0xfe, 0x1a, 0x5b, 0xd4, 0x43, + 0xa4, 0x04, 0x7b, 0x0e, 0x59, 0x3d, 0xcb, 0x9e, 0x0d, 0xcb, 0x67, 0xd5, 0xc6, 0x8d, 0x2c, 0xbb, + 0xa3, 0x6c, 0x98, 0xc1, 0xd1, 0x3f, 0x4a, 0x7b, 0xd2, 0x45, 0x7d, 0x9f, 0x4f, 0x16, 0x66, 0x3d, + 0x0d, 0xc3, 0xfb, 0xe6, 0xc5, 0x5e, 0x01, 0x6f, 0xc7, 0x36, 0xee, 0xcc, 0xd3, 0x34, 0x0f, 0x7f, + 0x93, 0xd5, 0x43, 0x15, 0xe2, 0xce, 0xd5, 0x7b, 0x76, 0x9f, 0xd9, 0x6d, 0x62, 0x8f, 0x69, 0xb3, + 0x29, 0x86, 0x23, 0x5e, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x22, 0x65, 0x99, 0x41, 0x80, 0x01, + 0x00, 0x00, } diff --git a/transport/internet/websocket/config.proto b/transport/internet/websocket/config.proto index 8864c3d1c..3de9c63f5 100644 --- a/transport/internet/websocket/config.proto +++ b/transport/internet/websocket/config.proto @@ -4,7 +4,7 @@ package v2ray.core.transport.internet.websocket; option csharp_namespace = "V2Ray.Core.Transport.Internet.Websocket"; option go_package = "websocket"; option java_package = "com.v2ray.core.transport.internet.websocket"; -option java_outer_classname = "ConfigProto"; +option java_multiple_files = true; message ConnectionReuse { bool enable = 1;