deprecate global transport settings in proto config

This commit is contained in:
Darien Raymond committed 2019-01-13 20:14:24 +01:00
1 parent 7538490c71
commit 5aee521798
2 files changed
+34 -29

No files matched your search

+31 -28
View File
@@ -28,7 +28,9 @@ type Config struct {
// App is for configurations of all features in V2Ray. A feature must implement the Feature interface, and its config type must be registered through common.RegisterConfig.
App []*serial.TypedMessage `protobuf:"bytes,4,rep,name=app,proto3" json:"app,omitempty"`
// Transport settings.
Transport *transport.Config `protobuf:"bytes,5,opt,name=transport,proto3" json:"transport,omitempty"`
// Deprecated. Each inbound and outbound should choose their own transport config.
// Date to remove: 2020-01-13
Transport *transport.Config `protobuf:"bytes,5,opt,name=transport,proto3" json:"transport,omitempty"` // Deprecated: Do not use.
// Configuration for extensions. The config may not work if corresponding extension is not loaded into V2Ray.
// V2Ray will ignore such config during initialization.
Extension []*serial.TypedMessage `protobuf:"bytes,6,rep,name=extension,proto3" json:"extension,omitempty"`
@@ -83,6 +85,7 @@ func (m *Config) GetApp() []*serial.TypedMessage {
return nil
}
// Deprecated: Do not use.
func (m *Config) GetTransport() *transport.Config {
if m != nil {
return m.Transport
@@ -242,31 +245,31 @@ func init() {
func init() { proto.RegisterFile("v2ray.com/core/config.proto", fileDescriptor_13704400b1045c6b) }
var fileDescriptor_13704400b1045c6b = []byte{
// 405 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x41, 0x6f, 0x94, 0x40,
0x1c, 0xc5, 0x33, 0x0b, 0x6e, 0xcb, 0xbf, 0x71, 0x5d, 0x27, 0x6a, 0x26, 0xd5, 0x03, 0x6e, 0x52,
0xc3, 0x69, 0x30, 0x78, 0x31, 0x4d, 0xbc, 0x58, 0x0f, 0x6a, 0xd2, 0xd4, 0x50, 0xe3, 0xc1, 0x4b,
0x33, 0x85, 0xbf, 0x84, 0xa4, 0xcc, 0x90, 0x99, 0x69, 0xb3, 0x7c, 0x25, 0xbf, 0x87, 0x37, 0xbf,
0x91, 0x17, 0x03, 0x03, 0x0b, 0xd5, 0x3d, 0xb8, 0x26, 0x3d, 0xc1, 0xf0, 0xe6, 0xf7, 0xde, 0xff,
0x01, 0x03, 0x4f, 0x6f, 0x12, 0x2d, 0x1a, 0x9e, 0xa9, 0x2a, 0xce, 0x94, 0xc6, 0x38, 0x53, 0xf2,
0x5b, 0x59, 0xf0, 0x5a, 0x2b, 0xab, 0x28, 0x0c, 0xa2, 0xc6, 0xc3, 0x97, 0x7f, 0x6d, 0xac, 0x2a,
0x25, 0x63, 0x83, 0xba, 0x14, 0x57, 0xb1, 0x6d, 0x6a, 0xcc, 0x2f, 0x2a, 0x34, 0x46, 0x14, 0xe8,
0xe8, 0xc3, 0xa3, 0x3f, 0x08, 0xab, 0x85, 0x34, 0xb5, 0xd2, 0xf6, 0x56, 0xc8, 0xea, 0xc7, 0x0c,
0xe6, 0x27, 0xdd, 0x03, 0x7a, 0x0c, 0x7b, 0xa5, 0xbc, 0x54, 0xd7, 0x32, 0x67, 0x24, 0xf4, 0xa2,
0x83, 0x24, 0xe4, 0xe3, 0x04, 0xfc, 0x83, 0x93, 0xde, 0x0b, 0x99, 0x5f, 0xa1, 0x76, 0x48, 0x3a,
0x00, 0xf4, 0x0d, 0xec, 0xab, 0x6b, 0xeb, 0xe0, 0x59, 0x07, 0x3f, 0x9f, 0xc2, 0x67, 0xbd, 0x76,
0x9b, 0xde, 0x20, 0xf4, 0x35, 0x78, 0xa2, 0xae, 0x99, 0xdf, 0x91, 0x2f, 0xa6, 0xa4, 0x2b, 0xca,
0x5d, 0x51, 0xfe, 0xb9, 0x2d, 0x7a, 0xea, 0x7a, 0xa6, 0x2d, 0x42, 0x8f, 0x21, 0xd8, 0x34, 0x63,
0xf7, 0x42, 0x12, 0x1d, 0x24, 0xcf, 0xa6, 0xfc, 0x46, 0xe4, 0x7d, 0xe8, 0xb8, 0x9d, 0xbe, 0x83,
0x00, 0xd7, 0x16, 0xa5, 0x29, 0x95, 0x64, 0xf3, 0x9d, 0xb2, 0x47, 0xf0, 0xa3, 0xbf, 0xef, 0x2d,
0xfd, 0xd5, 0x4f, 0x02, 0x8f, 0xb6, 0xbd, 0x22, 0xba, 0x04, 0xcf, 0x8a, 0x82, 0x91, 0x90, 0x44,
0x41, 0xda, 0xde, 0xd2, 0x73, 0x78, 0xa8, 0x31, 0xc3, 0xf2, 0x06, 0xf5, 0x85, 0x41, 0x6b, 0x4b,
0x59, 0x18, 0x36, 0xeb, 0x46, 0xff, 0xd7, 0xf8, 0xe5, 0x60, 0x70, 0xde, 0xf3, 0xf4, 0x14, 0x16,
0xb5, 0x56, 0xeb, 0x66, 0x74, 0xf4, 0x76, 0x72, 0xbc, 0xdf, 0xd1, 0x83, 0xdd, 0xea, 0x17, 0x81,
0xc7, 0x5b, 0x3f, 0xda, 0x96, 0x3e, 0x67, 0xf0, 0xc0, 0xa0, 0xcc, 0xff, 0xbf, 0xcd, 0xc2, 0xe1,
0x77, 0xd4, 0x85, 0x3e, 0x81, 0x39, 0xae, 0xeb, 0x52, 0x23, 0xf3, 0x43, 0x12, 0x79, 0x69, 0xbf,
0xa2, 0x0c, 0xf6, 0x5a, 0x13, 0x94, 0xee, 0xc7, 0x09, 0xd2, 0x61, 0xf9, 0xf6, 0x08, 0x16, 0x99,
0xaa, 0x26, 0x69, 0x9f, 0xc8, 0x57, 0xbf, 0xbd, 0x7e, 0x9f, 0xc1, 0x97, 0x24, 0x15, 0x0d, 0x3f,
0x51, 0x1a, 0x2f, 0xe7, 0xdd, 0x11, 0x7a, 0xf5, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x15, 0xee,
0x31, 0xc6, 0x03, 0x00, 0x00,
// 409 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0xd3, 0xcf, 0x6b, 0xd4, 0x40,
0x14, 0x07, 0x70, 0x26, 0x89, 0xdb, 0xe6, 0x15, 0xd7, 0x75, 0x50, 0x19, 0xaa, 0x87, 0xb8, 0x50,
0xc9, 0x69, 0x22, 0xf1, 0x22, 0x82, 0x1e, 0x5a, 0x0f, 0x2a, 0x94, 0x4a, 0x2a, 0x1e, 0xbc, 0x94,
0x69, 0xf2, 0x0c, 0x81, 0x66, 0x26, 0xcc, 0x4c, 0xcb, 0xe6, 0x5f, 0xf2, 0x3f, 0x11, 0xfc, 0x8f,
0xbc, 0x48, 0x32, 0x9b, 0x4d, 0xaa, 0x7b, 0x70, 0x05, 0x4f, 0xc9, 0xe4, 0xe5, 0xf3, 0xde, 0x7c,
0xf3, 0x03, 0x1e, 0xdf, 0xa4, 0x5a, 0xb4, 0x3c, 0x57, 0x75, 0x92, 0x2b, 0x8d, 0x49, 0xae, 0xe4,
0xd7, 0xaa, 0xe4, 0x8d, 0x56, 0x56, 0x51, 0x18, 0x8a, 0x1a, 0x0f, 0x9f, 0xff, 0x71, 0x63, 0x5d,
0x2b, 0x99, 0x18, 0xd4, 0x95, 0xb8, 0x4a, 0x6c, 0xdb, 0x60, 0x71, 0x51, 0xa3, 0x31, 0xa2, 0x44,
0xa7, 0x0f, 0x8f, 0x7e, 0x13, 0x56, 0x0b, 0x69, 0x1a, 0xa5, 0xed, 0xad, 0x21, 0xcb, 0xef, 0x1e,
0xcc, 0x4e, 0xfa, 0x0b, 0xf4, 0x15, 0xec, 0x55, 0xf2, 0x52, 0x5d, 0xcb, 0x82, 0x91, 0xc8, 0x8f,
0x0f, 0xd2, 0x88, 0x8f, 0x3b, 0xe0, 0xef, 0x5d, 0xe9, 0x9d, 0x90, 0xc5, 0x15, 0x6a, 0x47, 0xb2,
0x01, 0xd0, 0xd7, 0xb0, 0xaf, 0xae, 0xad, 0xc3, 0x5e, 0x8f, 0x9f, 0x4e, 0xf1, 0xd9, 0xba, 0x76,
0x5b, 0x6f, 0x08, 0x7d, 0x09, 0xbe, 0x68, 0x1a, 0x16, 0xf4, 0xf2, 0xd9, 0x54, 0xba, 0xa0, 0xdc,
0x05, 0xe5, 0x9f, 0xba, 0xa0, 0xa7, 0x2e, 0x67, 0xd6, 0x11, 0xfa, 0x06, 0xc2, 0x4d, 0x32, 0x76,
0x27, 0x22, 0xf1, 0x41, 0xfa, 0x64, 0xea, 0x37, 0x45, 0xee, 0x86, 0x1e, 0x7b, 0x8c, 0x64, 0x23,
0xa1, 0x6f, 0x21, 0xc4, 0x95, 0x45, 0x69, 0x2a, 0x25, 0xd9, 0x6c, 0xa7, 0xf9, 0x23, 0xfc, 0x10,
0xec, 0xfb, 0x8b, 0x60, 0xf9, 0x83, 0xc0, 0x83, 0x6d, 0x8f, 0x89, 0x2e, 0xc0, 0xb7, 0xa2, 0x64,
0x24, 0x22, 0x71, 0x98, 0x75, 0xa7, 0xf4, 0x1c, 0xee, 0x6b, 0xcc, 0xb1, 0xba, 0x41, 0x7d, 0x61,
0xd0, 0xda, 0x4a, 0x96, 0x86, 0x79, 0xfd, 0xf6, 0xff, 0x76, 0xfc, 0x62, 0x68, 0x70, 0xbe, 0xf6,
0xf4, 0x14, 0xe6, 0x8d, 0x56, 0xab, 0x76, 0xec, 0xe8, 0xef, 0xd4, 0xf1, 0x6e, 0xaf, 0x87, 0x76,
0xcb, 0x9f, 0x04, 0x1e, 0x6e, 0x7d, 0x71, 0x5b, 0xf2, 0x9c, 0xc1, 0x3d, 0x83, 0xb2, 0xf8, 0xf7,
0x34, 0x73, 0xc7, 0xff, 0x53, 0x16, 0xfa, 0x08, 0x66, 0xb8, 0x6a, 0x2a, 0x8d, 0x2c, 0x88, 0x48,
0xec, 0x67, 0xeb, 0x15, 0x65, 0xb0, 0xd7, 0x35, 0x41, 0xe9, 0x3e, 0x9e, 0x30, 0x1b, 0x96, 0xc7,
0x47, 0x30, 0xcf, 0x55, 0x3d, 0x99, 0xf6, 0x91, 0x7c, 0x09, 0xba, 0xe3, 0x37, 0x0f, 0x3e, 0xa7,
0x99, 0x68, 0xf9, 0x89, 0xd2, 0x78, 0x39, 0xeb, 0x7f, 0xa3, 0x17, 0xbf, 0x02, 0x00, 0x00, 0xff,
0xff, 0xde, 0x43, 0xe7, 0x49, 0xca, 0x03, 0x00, 0x00,
}
+3 -1
View File
@@ -23,7 +23,9 @@ message Config {
repeated v2ray.core.common.serial.TypedMessage app = 4;
// Transport settings.
v2ray.core.transport.Config transport = 5;
// Deprecated. Each inbound and outbound should choose their own transport config.
// Date to remove: 2020-01-13
v2ray.core.transport.Config transport = 5 [deprecated = true];
// Configuration for extensions. The config may not work if corresponding extension is not loaded into V2Ray.
// V2Ray will ignore such config during initialization.