update proto lib

app/commander/config.pb.go

@@ -31,7 +31,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_09a7ac342567c727, []int{0}
+	return fileDescriptor_4af9cfd3f0e2019e, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -39,8 +39,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -70,10 +70,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/commander/config.proto", fileDescriptor_config_09a7ac342567c727)
+	proto.RegisterFile("v2ray.com/core/app/commander/config.proto", fileDescriptor_4af9cfd3f0e2019e)
 }
 
-var fileDescriptor_config_09a7ac342567c727 = []byte{
+var fileDescriptor_4af9cfd3f0e2019e = []byte{
 	// 212 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2c, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0x2c, 0x28, 0xd0, 0x4f,

app/dispatcher/config.pb.go

@@ -25,7 +25,7 @@ func (m *SessionConfig) Reset()         { *m = SessionConfig{} }
 func (m *SessionConfig) String() string { return proto.CompactTextString(m) }
 func (*SessionConfig) ProtoMessage()    {}
 func (*SessionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_0cc6435896f4bd54, []int{0}
+	return fileDescriptor_90b7c41cce355532, []int{0}
 }
 func (m *SessionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SessionConfig.Unmarshal(m, b)
@@ -33,8 +33,8 @@ func (m *SessionConfig) XXX_Unmarshal(b []byte) error {
 func (m *SessionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SessionConfig.Marshal(b, m, deterministic)
 }
-func (dst *SessionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SessionConfig.Merge(dst, src)
+func (m *SessionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SessionConfig.Merge(m, src)
 }
 func (m *SessionConfig) XXX_Size() int {
 	return xxx_messageInfo_SessionConfig.Size(m)
@@ -56,7 +56,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_0cc6435896f4bd54, []int{1}
+	return fileDescriptor_90b7c41cce355532, []int{1}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -64,8 +64,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -89,10 +89,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/dispatcher/config.proto", fileDescriptor_config_0cc6435896f4bd54)
+	proto.RegisterFile("v2ray.com/core/app/dispatcher/config.proto", fileDescriptor_90b7c41cce355532)
 }
 
-var fileDescriptor_config_0cc6435896f4bd54 = []byte{
+var fileDescriptor_90b7c41cce355532 = []byte{
 	// 176 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2a, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0x2c, 0x28, 0xd0, 0x4f,

app/dns/config.pb.go

@@ -29,6 +29,7 @@ var DomainMatchingType_name = map[int32]string{
 	1: "Subdomain",
 	2: "Keyword",
 }
+
 var DomainMatchingType_value = map[string]int32{
 	"Full":      0,
 	"Subdomain": 1,
@@ -38,8 +39,9 @@ var DomainMatchingType_value = map[string]int32{
 func (x DomainMatchingType) String() string {
 	return proto.EnumName(DomainMatchingType_name, int32(x))
 }
+
 func (DomainMatchingType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_6f85f947d5116df4, []int{0}
+	return fileDescriptor_ed5695198e3def8f, []int{0}
 }
 
 type NameServer struct {
@@ -54,7 +56,7 @@ func (m *NameServer) Reset()         { *m = NameServer{} }
 func (m *NameServer) String() string { return proto.CompactTextString(m) }
 func (*NameServer) ProtoMessage()    {}
 func (*NameServer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_6f85f947d5116df4, []int{0}
+	return fileDescriptor_ed5695198e3def8f, []int{0}
 }
 func (m *NameServer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NameServer.Unmarshal(m, b)
@@ -62,8 +64,8 @@ func (m *NameServer) XXX_Unmarshal(b []byte) error {
 func (m *NameServer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NameServer.Marshal(b, m, deterministic)
 }
-func (dst *NameServer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NameServer.Merge(dst, src)
+func (m *NameServer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NameServer.Merge(m, src)
 }
 func (m *NameServer) XXX_Size() int {
 	return xxx_messageInfo_NameServer.Size(m)
@@ -100,7 +102,7 @@ func (m *NameServer_PriorityDomain) Reset()         { *m = NameServer_PriorityDo
 func (m *NameServer_PriorityDomain) String() string { return proto.CompactTextString(m) }
 func (*NameServer_PriorityDomain) ProtoMessage()    {}
 func (*NameServer_PriorityDomain) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_6f85f947d5116df4, []int{0, 0}
+	return fileDescriptor_ed5695198e3def8f, []int{0, 0}
 }
 func (m *NameServer_PriorityDomain) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NameServer_PriorityDomain.Unmarshal(m, b)
@@ -108,8 +110,8 @@ func (m *NameServer_PriorityDomain) XXX_Unmarshal(b []byte) error {
 func (m *NameServer_PriorityDomain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NameServer_PriorityDomain.Marshal(b, m, deterministic)
 }
-func (dst *NameServer_PriorityDomain) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NameServer_PriorityDomain.Merge(dst, src)
+func (m *NameServer_PriorityDomain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NameServer_PriorityDomain.Merge(m, src)
 }
 func (m *NameServer_PriorityDomain) XXX_Size() int {
 	return xxx_messageInfo_NameServer_PriorityDomain.Size(m)
@@ -155,7 +157,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_6f85f947d5116df4, []int{1}
+	return fileDescriptor_ed5695198e3def8f, []int{1}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -163,8 +165,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -225,7 +227,7 @@ func (m *Config_HostMapping) Reset()         { *m = Config_HostMapping{} }
 func (m *Config_HostMapping) String() string { return proto.CompactTextString(m) }
 func (*Config_HostMapping) ProtoMessage()    {}
 func (*Config_HostMapping) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_6f85f947d5116df4, []int{1, 1}
+	return fileDescriptor_ed5695198e3def8f, []int{1, 1}
 }
 func (m *Config_HostMapping) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config_HostMapping.Unmarshal(m, b)
@@ -233,8 +235,8 @@ func (m *Config_HostMapping) XXX_Unmarshal(b []byte) error {
 func (m *Config_HostMapping) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config_HostMapping.Marshal(b, m, deterministic)
 }
-func (dst *Config_HostMapping) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config_HostMapping.Merge(dst, src)
+func (m *Config_HostMapping) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config_HostMapping.Merge(m, src)
 }
 func (m *Config_HostMapping) XXX_Size() int {
 	return xxx_messageInfo_Config_HostMapping.Size(m)
@@ -276,10 +278,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/dns/config.proto", fileDescriptor_config_6f85f947d5116df4)
+	proto.RegisterFile("v2ray.com/core/app/dns/config.proto", fileDescriptor_ed5695198e3def8f)
 }
 
-var fileDescriptor_config_6f85f947d5116df4 = []byte{
+var fileDescriptor_ed5695198e3def8f = []byte{
 	// 516 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xd1, 0x6e, 0xd3, 0x3e,
 	0x18, 0xc5, 0xff, 0x49, 0xda, 0x6e, 0xfd, 0xd2, 0x7f, 0x55, 0x7c, 0x31, 0x55, 0x45, 0x82, 0x32,

app/log/command/config.pb.go

@@ -31,7 +31,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_f0ea324480acd134, []int{0}
+	return fileDescriptor_46d95b63a682e4a6, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -39,8 +39,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -61,7 +61,7 @@ func (m *RestartLoggerRequest) Reset()         { *m = RestartLoggerRequest{} }
 func (m *RestartLoggerRequest) String() string { return proto.CompactTextString(m) }
 func (*RestartLoggerRequest) ProtoMessage()    {}
 func (*RestartLoggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_f0ea324480acd134, []int{1}
+	return fileDescriptor_46d95b63a682e4a6, []int{1}
 }
 func (m *RestartLoggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RestartLoggerRequest.Unmarshal(m, b)
@@ -69,8 +69,8 @@ func (m *RestartLoggerRequest) XXX_Unmarshal(b []byte) error {
 func (m *RestartLoggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RestartLoggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *RestartLoggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RestartLoggerRequest.Merge(dst, src)
+func (m *RestartLoggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestartLoggerRequest.Merge(m, src)
 }
 func (m *RestartLoggerRequest) XXX_Size() int {
 	return xxx_messageInfo_RestartLoggerRequest.Size(m)
@@ -91,7 +91,7 @@ func (m *RestartLoggerResponse) Reset()         { *m = RestartLoggerResponse{} }
 func (m *RestartLoggerResponse) String() string { return proto.CompactTextString(m) }
 func (*RestartLoggerResponse) ProtoMessage()    {}
 func (*RestartLoggerResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_f0ea324480acd134, []int{2}
+	return fileDescriptor_46d95b63a682e4a6, []int{2}
 }
 func (m *RestartLoggerResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RestartLoggerResponse.Unmarshal(m, b)
@@ -99,8 +99,8 @@ func (m *RestartLoggerResponse) XXX_Unmarshal(b []byte) error {
 func (m *RestartLoggerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RestartLoggerResponse.Marshal(b, m, deterministic)
 }
-func (dst *RestartLoggerResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RestartLoggerResponse.Merge(dst, src)
+func (m *RestartLoggerResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestartLoggerResponse.Merge(m, src)
 }
 func (m *RestartLoggerResponse) XXX_Size() int {
 	return xxx_messageInfo_RestartLoggerResponse.Size(m)
@@ -190,10 +190,10 @@ var _LoggerService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/log/command/config.proto", fileDescriptor_config_f0ea324480acd134)
+	proto.RegisterFile("v2ray.com/core/app/log/command/config.proto", fileDescriptor_46d95b63a682e4a6)
 }
 
-var fileDescriptor_config_f0ea324480acd134 = []byte{
+var fileDescriptor_46d95b63a682e4a6 = []byte{
 	// 210 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2e, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0x2c, 0x28, 0xd0, 0xcf,

app/log/config.pb.go

@@ -31,6 +31,7 @@ var LogType_name = map[int32]string{
 	2: "File",
 	3: "Event",
 }
+
 var LogType_value = map[string]int32{
 	"None":    0,
 	"Console": 1,
@@ -41,8 +42,9 @@ var LogType_value = map[string]int32{
 func (x LogType) String() string {
 	return proto.EnumName(LogType_name, int32(x))
 }
+
 func (LogType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_2fe3970bf77f5f95, []int{0}
+	return fileDescriptor_92dfeade43d9e989, []int{0}
 }
 
 type Config struct {
@@ -60,7 +62,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_2fe3970bf77f5f95, []int{0}
+	return fileDescriptor_92dfeade43d9e989, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -68,8 +70,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -121,10 +123,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/log/config.proto", fileDescriptor_config_2fe3970bf77f5f95)
+	proto.RegisterFile("v2ray.com/core/app/log/config.proto", fileDescriptor_92dfeade43d9e989)
 }
 
-var fileDescriptor_config_2fe3970bf77f5f95 = []byte{
+var fileDescriptor_92dfeade43d9e989 = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcd, 0x4a, 0xfb, 0x40,
 	0x14, 0x47, 0xff, 0x49, 0xbf, 0xfe, 0x1d, 0x6d, 0x1b, 0x66, 0x21, 0x45, 0x17, 0x16, 0x15, 0x29,

app/policy/config.pb.go

@@ -26,7 +26,7 @@ func (m *Second) Reset()         { *m = Second{} }
 func (m *Second) String() string { return proto.CompactTextString(m) }
 func (*Second) ProtoMessage()    {}
 func (*Second) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_8c0ebdfbe2c533e6, []int{0}
+	return fileDescriptor_48f54a345c1316d1, []int{0}
 }
 func (m *Second) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Second.Unmarshal(m, b)
@@ -34,8 +34,8 @@ func (m *Second) XXX_Unmarshal(b []byte) error {
 func (m *Second) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Second.Marshal(b, m, deterministic)
 }
-func (dst *Second) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Second.Merge(dst, src)
+func (m *Second) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Second.Merge(m, src)
 }
 func (m *Second) XXX_Size() int {
 	return xxx_messageInfo_Second.Size(m)
@@ -66,7 +66,7 @@ func (m *Policy) Reset()         { *m = Policy{} }
 func (m *Policy) String() string { return proto.CompactTextString(m) }
 func (*Policy) ProtoMessage()    {}
 func (*Policy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_8c0ebdfbe2c533e6, []int{1}
+	return fileDescriptor_48f54a345c1316d1, []int{1}
 }
 func (m *Policy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Policy.Unmarshal(m, b)
@@ -74,8 +74,8 @@ func (m *Policy) XXX_Unmarshal(b []byte) error {
 func (m *Policy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Policy.Marshal(b, m, deterministic)
 }
-func (dst *Policy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Policy.Merge(dst, src)
+func (m *Policy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Policy.Merge(m, src)
 }
 func (m *Policy) XXX_Size() int {
 	return xxx_messageInfo_Policy.Size(m)
@@ -122,7 +122,7 @@ func (m *Policy_Timeout) Reset()         { *m = Policy_Timeout{} }
 func (m *Policy_Timeout) String() string { return proto.CompactTextString(m) }
 func (*Policy_Timeout) ProtoMessage()    {}
 func (*Policy_Timeout) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_8c0ebdfbe2c533e6, []int{1, 0}
+	return fileDescriptor_48f54a345c1316d1, []int{1, 0}
 }
 func (m *Policy_Timeout) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Policy_Timeout.Unmarshal(m, b)
@@ -130,8 +130,8 @@ func (m *Policy_Timeout) XXX_Unmarshal(b []byte) error {
 func (m *Policy_Timeout) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Policy_Timeout.Marshal(b, m, deterministic)
 }
-func (dst *Policy_Timeout) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Policy_Timeout.Merge(dst, src)
+func (m *Policy_Timeout) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Policy_Timeout.Merge(m, src)
 }
 func (m *Policy_Timeout) XXX_Size() int {
 	return xxx_messageInfo_Policy_Timeout.Size(m)
@@ -182,7 +182,7 @@ func (m *Policy_Stats) Reset()         { *m = Policy_Stats{} }
 func (m *Policy_Stats) String() string { return proto.CompactTextString(m) }
 func (*Policy_Stats) ProtoMessage()    {}
 func (*Policy_Stats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_8c0ebdfbe2c533e6, []int{1, 1}
+	return fileDescriptor_48f54a345c1316d1, []int{1, 1}
 }
 func (m *Policy_Stats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Policy_Stats.Unmarshal(m, b)
@@ -190,8 +190,8 @@ func (m *Policy_Stats) XXX_Unmarshal(b []byte) error {
 func (m *Policy_Stats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Policy_Stats.Marshal(b, m, deterministic)
 }
-func (dst *Policy_Stats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Policy_Stats.Merge(dst, src)
+func (m *Policy_Stats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Policy_Stats.Merge(m, src)
 }
 func (m *Policy_Stats) XXX_Size() int {
 	return xxx_messageInfo_Policy_Stats.Size(m)
@@ -228,7 +228,7 @@ func (m *Policy_Buffer) Reset()         { *m = Policy_Buffer{} }
 func (m *Policy_Buffer) String() string { return proto.CompactTextString(m) }
 func (*Policy_Buffer) ProtoMessage()    {}
 func (*Policy_Buffer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_8c0ebdfbe2c533e6, []int{1, 2}
+	return fileDescriptor_48f54a345c1316d1, []int{1, 2}
 }
 func (m *Policy_Buffer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Policy_Buffer.Unmarshal(m, b)
@@ -236,8 +236,8 @@ func (m *Policy_Buffer) XXX_Unmarshal(b []byte) error {
 func (m *Policy_Buffer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Policy_Buffer.Marshal(b, m, deterministic)
 }
-func (dst *Policy_Buffer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Policy_Buffer.Merge(dst, src)
+func (m *Policy_Buffer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Policy_Buffer.Merge(m, src)
 }
 func (m *Policy_Buffer) XXX_Size() int {
 	return xxx_messageInfo_Policy_Buffer.Size(m)
@@ -266,7 +266,7 @@ func (m *SystemPolicy) Reset()         { *m = SystemPolicy{} }
 func (m *SystemPolicy) String() string { return proto.CompactTextString(m) }
 func (*SystemPolicy) ProtoMessage()    {}
 func (*SystemPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_8c0ebdfbe2c533e6, []int{2}
+	return fileDescriptor_48f54a345c1316d1, []int{2}
 }
 func (m *SystemPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SystemPolicy.Unmarshal(m, b)
@@ -274,8 +274,8 @@ func (m *SystemPolicy) XXX_Unmarshal(b []byte) error {
 func (m *SystemPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SystemPolicy.Marshal(b, m, deterministic)
 }
-func (dst *SystemPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SystemPolicy.Merge(dst, src)
+func (m *SystemPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemPolicy.Merge(m, src)
 }
 func (m *SystemPolicy) XXX_Size() int {
 	return xxx_messageInfo_SystemPolicy.Size(m)
@@ -305,7 +305,7 @@ func (m *SystemPolicy_Stats) Reset()         { *m = SystemPolicy_Stats{} }
 func (m *SystemPolicy_Stats) String() string { return proto.CompactTextString(m) }
 func (*SystemPolicy_Stats) ProtoMessage()    {}
 func (*SystemPolicy_Stats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_8c0ebdfbe2c533e6, []int{2, 0}
+	return fileDescriptor_48f54a345c1316d1, []int{2, 0}
 }
 func (m *SystemPolicy_Stats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SystemPolicy_Stats.Unmarshal(m, b)
@@ -313,8 +313,8 @@ func (m *SystemPolicy_Stats) XXX_Unmarshal(b []byte) error {
 func (m *SystemPolicy_Stats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SystemPolicy_Stats.Marshal(b, m, deterministic)
 }
-func (dst *SystemPolicy_Stats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SystemPolicy_Stats.Merge(dst, src)
+func (m *SystemPolicy_Stats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemPolicy_Stats.Merge(m, src)
 }
 func (m *SystemPolicy_Stats) XXX_Size() int {
 	return xxx_messageInfo_SystemPolicy_Stats.Size(m)
@@ -351,7 +351,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_8c0ebdfbe2c533e6, []int{3}
+	return fileDescriptor_48f54a345c1316d1, []int{3}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -359,8 +359,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -398,10 +398,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/policy/config.proto", fileDescriptor_config_8c0ebdfbe2c533e6)
+	proto.RegisterFile("v2ray.com/core/app/policy/config.proto", fileDescriptor_48f54a345c1316d1)
 }
 
-var fileDescriptor_config_8c0ebdfbe2c533e6 = []byte{
+var fileDescriptor_48f54a345c1316d1 = []byte{
 	// 513 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdb, 0x6a, 0x13, 0x41,
 	0x1c, 0xc6, 0xd9, 0xa4, 0xbb, 0xad, 0xff, 0x24, 0x6d, 0x19, 0x2c, 0xc4, 0x05, 0x6b, 0x49, 0xad,

app/proxyman/command/command.pb.go

@@ -35,7 +35,7 @@ func (m *AddUserOperation) Reset()         { *m = AddUserOperation{} }
 func (m *AddUserOperation) String() string { return proto.CompactTextString(m) }
 func (*AddUserOperation) ProtoMessage()    {}
 func (*AddUserOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{0}
+	return fileDescriptor_e2c30a70a48636a0, []int{0}
 }
 func (m *AddUserOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddUserOperation.Unmarshal(m, b)
@@ -43,8 +43,8 @@ func (m *AddUserOperation) XXX_Unmarshal(b []byte) error {
 func (m *AddUserOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddUserOperation.Marshal(b, m, deterministic)
 }
-func (dst *AddUserOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddUserOperation.Merge(dst, src)
+func (m *AddUserOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddUserOperation.Merge(m, src)
 }
 func (m *AddUserOperation) XXX_Size() int {
 	return xxx_messageInfo_AddUserOperation.Size(m)
@@ -73,7 +73,7 @@ func (m *RemoveUserOperation) Reset()         { *m = RemoveUserOperation{} }
 func (m *RemoveUserOperation) String() string { return proto.CompactTextString(m) }
 func (*RemoveUserOperation) ProtoMessage()    {}
 func (*RemoveUserOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{1}
+	return fileDescriptor_e2c30a70a48636a0, []int{1}
 }
 func (m *RemoveUserOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveUserOperation.Unmarshal(m, b)
@@ -81,8 +81,8 @@ func (m *RemoveUserOperation) XXX_Unmarshal(b []byte) error {
 func (m *RemoveUserOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoveUserOperation.Marshal(b, m, deterministic)
 }
-func (dst *RemoveUserOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoveUserOperation.Merge(dst, src)
+func (m *RemoveUserOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveUserOperation.Merge(m, src)
 }
 func (m *RemoveUserOperation) XXX_Size() int {
 	return xxx_messageInfo_RemoveUserOperation.Size(m)
@@ -111,7 +111,7 @@ func (m *AddInboundRequest) Reset()         { *m = AddInboundRequest{} }
 func (m *AddInboundRequest) String() string { return proto.CompactTextString(m) }
 func (*AddInboundRequest) ProtoMessage()    {}
 func (*AddInboundRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{2}
+	return fileDescriptor_e2c30a70a48636a0, []int{2}
 }
 func (m *AddInboundRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddInboundRequest.Unmarshal(m, b)
@@ -119,8 +119,8 @@ func (m *AddInboundRequest) XXX_Unmarshal(b []byte) error {
 func (m *AddInboundRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddInboundRequest.Marshal(b, m, deterministic)
 }
-func (dst *AddInboundRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddInboundRequest.Merge(dst, src)
+func (m *AddInboundRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddInboundRequest.Merge(m, src)
 }
 func (m *AddInboundRequest) XXX_Size() int {
 	return xxx_messageInfo_AddInboundRequest.Size(m)
@@ -148,7 +148,7 @@ func (m *AddInboundResponse) Reset()         { *m = AddInboundResponse{} }
 func (m *AddInboundResponse) String() string { return proto.CompactTextString(m) }
 func (*AddInboundResponse) ProtoMessage()    {}
 func (*AddInboundResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{3}
+	return fileDescriptor_e2c30a70a48636a0, []int{3}
 }
 func (m *AddInboundResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddInboundResponse.Unmarshal(m, b)
@@ -156,8 +156,8 @@ func (m *AddInboundResponse) XXX_Unmarshal(b []byte) error {
 func (m *AddInboundResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddInboundResponse.Marshal(b, m, deterministic)
 }
-func (dst *AddInboundResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddInboundResponse.Merge(dst, src)
+func (m *AddInboundResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddInboundResponse.Merge(m, src)
 }
 func (m *AddInboundResponse) XXX_Size() int {
 	return xxx_messageInfo_AddInboundResponse.Size(m)
@@ -179,7 +179,7 @@ func (m *RemoveInboundRequest) Reset()         { *m = RemoveInboundRequest{} }
 func (m *RemoveInboundRequest) String() string { return proto.CompactTextString(m) }
 func (*RemoveInboundRequest) ProtoMessage()    {}
 func (*RemoveInboundRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{4}
+	return fileDescriptor_e2c30a70a48636a0, []int{4}
 }
 func (m *RemoveInboundRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveInboundRequest.Unmarshal(m, b)
@@ -187,8 +187,8 @@ func (m *RemoveInboundRequest) XXX_Unmarshal(b []byte) error {
 func (m *RemoveInboundRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoveInboundRequest.Marshal(b, m, deterministic)
 }
-func (dst *RemoveInboundRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoveInboundRequest.Merge(dst, src)
+func (m *RemoveInboundRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveInboundRequest.Merge(m, src)
 }
 func (m *RemoveInboundRequest) XXX_Size() int {
 	return xxx_messageInfo_RemoveInboundRequest.Size(m)
@@ -216,7 +216,7 @@ func (m *RemoveInboundResponse) Reset()         { *m = RemoveInboundResponse{} }
 func (m *RemoveInboundResponse) String() string { return proto.CompactTextString(m) }
 func (*RemoveInboundResponse) ProtoMessage()    {}
 func (*RemoveInboundResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{5}
+	return fileDescriptor_e2c30a70a48636a0, []int{5}
 }
 func (m *RemoveInboundResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveInboundResponse.Unmarshal(m, b)
@@ -224,8 +224,8 @@ func (m *RemoveInboundResponse) XXX_Unmarshal(b []byte) error {
 func (m *RemoveInboundResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoveInboundResponse.Marshal(b, m, deterministic)
 }
-func (dst *RemoveInboundResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoveInboundResponse.Merge(dst, src)
+func (m *RemoveInboundResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveInboundResponse.Merge(m, src)
 }
 func (m *RemoveInboundResponse) XXX_Size() int {
 	return xxx_messageInfo_RemoveInboundResponse.Size(m)
@@ -248,7 +248,7 @@ func (m *AlterInboundRequest) Reset()         { *m = AlterInboundRequest{} }
 func (m *AlterInboundRequest) String() string { return proto.CompactTextString(m) }
 func (*AlterInboundRequest) ProtoMessage()    {}
 func (*AlterInboundRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{6}
+	return fileDescriptor_e2c30a70a48636a0, []int{6}
 }
 func (m *AlterInboundRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlterInboundRequest.Unmarshal(m, b)
@@ -256,8 +256,8 @@ func (m *AlterInboundRequest) XXX_Unmarshal(b []byte) error {
 func (m *AlterInboundRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlterInboundRequest.Marshal(b, m, deterministic)
 }
-func (dst *AlterInboundRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlterInboundRequest.Merge(dst, src)
+func (m *AlterInboundRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlterInboundRequest.Merge(m, src)
 }
 func (m *AlterInboundRequest) XXX_Size() int {
 	return xxx_messageInfo_AlterInboundRequest.Size(m)
@@ -292,7 +292,7 @@ func (m *AlterInboundResponse) Reset()         { *m = AlterInboundResponse{} }
 func (m *AlterInboundResponse) String() string { return proto.CompactTextString(m) }
 func (*AlterInboundResponse) ProtoMessage()    {}
 func (*AlterInboundResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{7}
+	return fileDescriptor_e2c30a70a48636a0, []int{7}
 }
 func (m *AlterInboundResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlterInboundResponse.Unmarshal(m, b)
@@ -300,8 +300,8 @@ func (m *AlterInboundResponse) XXX_Unmarshal(b []byte) error {
 func (m *AlterInboundResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlterInboundResponse.Marshal(b, m, deterministic)
 }
-func (dst *AlterInboundResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlterInboundResponse.Merge(dst, src)
+func (m *AlterInboundResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlterInboundResponse.Merge(m, src)
 }
 func (m *AlterInboundResponse) XXX_Size() int {
 	return xxx_messageInfo_AlterInboundResponse.Size(m)
@@ -323,7 +323,7 @@ func (m *AddOutboundRequest) Reset()         { *m = AddOutboundRequest{} }
 func (m *AddOutboundRequest) String() string { return proto.CompactTextString(m) }
 func (*AddOutboundRequest) ProtoMessage()    {}
 func (*AddOutboundRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{8}
+	return fileDescriptor_e2c30a70a48636a0, []int{8}
 }
 func (m *AddOutboundRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddOutboundRequest.Unmarshal(m, b)
@@ -331,8 +331,8 @@ func (m *AddOutboundRequest) XXX_Unmarshal(b []byte) error {
 func (m *AddOutboundRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddOutboundRequest.Marshal(b, m, deterministic)
 }
-func (dst *AddOutboundRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddOutboundRequest.Merge(dst, src)
+func (m *AddOutboundRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddOutboundRequest.Merge(m, src)
 }
 func (m *AddOutboundRequest) XXX_Size() int {
 	return xxx_messageInfo_AddOutboundRequest.Size(m)
@@ -360,7 +360,7 @@ func (m *AddOutboundResponse) Reset()         { *m = AddOutboundResponse{} }
 func (m *AddOutboundResponse) String() string { return proto.CompactTextString(m) }
 func (*AddOutboundResponse) ProtoMessage()    {}
 func (*AddOutboundResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{9}
+	return fileDescriptor_e2c30a70a48636a0, []int{9}
 }
 func (m *AddOutboundResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddOutboundResponse.Unmarshal(m, b)
@@ -368,8 +368,8 @@ func (m *AddOutboundResponse) XXX_Unmarshal(b []byte) error {
 func (m *AddOutboundResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddOutboundResponse.Marshal(b, m, deterministic)
 }
-func (dst *AddOutboundResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddOutboundResponse.Merge(dst, src)
+func (m *AddOutboundResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddOutboundResponse.Merge(m, src)
 }
 func (m *AddOutboundResponse) XXX_Size() int {
 	return xxx_messageInfo_AddOutboundResponse.Size(m)
@@ -391,7 +391,7 @@ func (m *RemoveOutboundRequest) Reset()         { *m = RemoveOutboundRequest{} }
 func (m *RemoveOutboundRequest) String() string { return proto.CompactTextString(m) }
 func (*RemoveOutboundRequest) ProtoMessage()    {}
 func (*RemoveOutboundRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{10}
+	return fileDescriptor_e2c30a70a48636a0, []int{10}
 }
 func (m *RemoveOutboundRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveOutboundRequest.Unmarshal(m, b)
@@ -399,8 +399,8 @@ func (m *RemoveOutboundRequest) XXX_Unmarshal(b []byte) error {
 func (m *RemoveOutboundRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoveOutboundRequest.Marshal(b, m, deterministic)
 }
-func (dst *RemoveOutboundRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoveOutboundRequest.Merge(dst, src)
+func (m *RemoveOutboundRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveOutboundRequest.Merge(m, src)
 }
 func (m *RemoveOutboundRequest) XXX_Size() int {
 	return xxx_messageInfo_RemoveOutboundRequest.Size(m)
@@ -428,7 +428,7 @@ func (m *RemoveOutboundResponse) Reset()         { *m = RemoveOutboundResponse{}
 func (m *RemoveOutboundResponse) String() string { return proto.CompactTextString(m) }
 func (*RemoveOutboundResponse) ProtoMessage()    {}
 func (*RemoveOutboundResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{11}
+	return fileDescriptor_e2c30a70a48636a0, []int{11}
 }
 func (m *RemoveOutboundResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveOutboundResponse.Unmarshal(m, b)
@@ -436,8 +436,8 @@ func (m *RemoveOutboundResponse) XXX_Unmarshal(b []byte) error {
 func (m *RemoveOutboundResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoveOutboundResponse.Marshal(b, m, deterministic)
 }
-func (dst *RemoveOutboundResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoveOutboundResponse.Merge(dst, src)
+func (m *RemoveOutboundResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveOutboundResponse.Merge(m, src)
 }
 func (m *RemoveOutboundResponse) XXX_Size() int {
 	return xxx_messageInfo_RemoveOutboundResponse.Size(m)
@@ -460,7 +460,7 @@ func (m *AlterOutboundRequest) Reset()         { *m = AlterOutboundRequest{} }
 func (m *AlterOutboundRequest) String() string { return proto.CompactTextString(m) }
 func (*AlterOutboundRequest) ProtoMessage()    {}
 func (*AlterOutboundRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{12}
+	return fileDescriptor_e2c30a70a48636a0, []int{12}
 }
 func (m *AlterOutboundRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlterOutboundRequest.Unmarshal(m, b)
@@ -468,8 +468,8 @@ func (m *AlterOutboundRequest) XXX_Unmarshal(b []byte) error {
 func (m *AlterOutboundRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlterOutboundRequest.Marshal(b, m, deterministic)
 }
-func (dst *AlterOutboundRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlterOutboundRequest.Merge(dst, src)
+func (m *AlterOutboundRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlterOutboundRequest.Merge(m, src)
 }
 func (m *AlterOutboundRequest) XXX_Size() int {
 	return xxx_messageInfo_AlterOutboundRequest.Size(m)
@@ -504,7 +504,7 @@ func (m *AlterOutboundResponse) Reset()         { *m = AlterOutboundResponse{} }
 func (m *AlterOutboundResponse) String() string { return proto.CompactTextString(m) }
 func (*AlterOutboundResponse) ProtoMessage()    {}
 func (*AlterOutboundResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{13}
+	return fileDescriptor_e2c30a70a48636a0, []int{13}
 }
 func (m *AlterOutboundResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlterOutboundResponse.Unmarshal(m, b)
@@ -512,8 +512,8 @@ func (m *AlterOutboundResponse) XXX_Unmarshal(b []byte) error {
 func (m *AlterOutboundResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlterOutboundResponse.Marshal(b, m, deterministic)
 }
-func (dst *AlterOutboundResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlterOutboundResponse.Merge(dst, src)
+func (m *AlterOutboundResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlterOutboundResponse.Merge(m, src)
 }
 func (m *AlterOutboundResponse) XXX_Size() int {
 	return xxx_messageInfo_AlterOutboundResponse.Size(m)
@@ -534,7 +534,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_fe406dbb59c1601f, []int{14}
+	return fileDescriptor_e2c30a70a48636a0, []int{14}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -542,8 +542,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -810,10 +810,10 @@ var _HandlerService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/proxyman/command/command.proto", fileDescriptor_command_fe406dbb59c1601f)
+	proto.RegisterFile("v2ray.com/core/app/proxyman/command/command.proto", fileDescriptor_e2c30a70a48636a0)
 }
 
-var fileDescriptor_command_fe406dbb59c1601f = []byte{
+var fileDescriptor_e2c30a70a48636a0 = []byte{
 	// 557 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdf, 0x6b, 0xd3, 0x40,
 	0x1c, 0xb7, 0x53, 0xbb, 0xed, 0x3b, 0x1d, 0xf3, 0xda, 0x6e, 0x25, 0x3e, 0x6c, 0x46, 0x90, 0x0d,

app/proxyman/config.pb.go

@@ -29,6 +29,7 @@ var KnownProtocols_name = map[int32]string{
 	0: "HTTP",
 	1: "TLS",
 }
+
 var KnownProtocols_value = map[string]int32{
 	"HTTP": 0,
 	"TLS":  1,
@@ -37,8 +38,9 @@ var KnownProtocols_value = map[string]int32{
 func (x KnownProtocols) String() string {
 	return proto.EnumName(KnownProtocols_name, int32(x))
 }
+
 func (KnownProtocols) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{0}
+	return fileDescriptor_b07f45dd938bc1b0, []int{0}
 }
 
 type AllocationStrategy_Type int32
@@ -57,6 +59,7 @@ var AllocationStrategy_Type_name = map[int32]string{
 	1: "Random",
 	2: "External",
 }
+
 var AllocationStrategy_Type_value = map[string]int32{
 	"Always":   0,
 	"Random":   1,
@@ -66,8 +69,9 @@ var AllocationStrategy_Type_value = map[string]int32{
 func (x AllocationStrategy_Type) String() string {
 	return proto.EnumName(AllocationStrategy_Type_name, int32(x))
 }
+
 func (AllocationStrategy_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{1, 0}
+	return fileDescriptor_b07f45dd938bc1b0, []int{1, 0}
 }
 
 type InboundConfig struct {
@@ -80,7 +84,7 @@ func (m *InboundConfig) Reset()         { *m = InboundConfig{} }
 func (m *InboundConfig) String() string { return proto.CompactTextString(m) }
 func (*InboundConfig) ProtoMessage()    {}
 func (*InboundConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{0}
+	return fileDescriptor_b07f45dd938bc1b0, []int{0}
 }
 func (m *InboundConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InboundConfig.Unmarshal(m, b)
@@ -88,8 +92,8 @@ func (m *InboundConfig) XXX_Unmarshal(b []byte) error {
 func (m *InboundConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InboundConfig.Marshal(b, m, deterministic)
 }
-func (dst *InboundConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InboundConfig.Merge(dst, src)
+func (m *InboundConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InboundConfig.Merge(m, src)
 }
 func (m *InboundConfig) XXX_Size() int {
 	return xxx_messageInfo_InboundConfig.Size(m)
@@ -117,7 +121,7 @@ func (m *AllocationStrategy) Reset()         { *m = AllocationStrategy{} }
 func (m *AllocationStrategy) String() string { return proto.CompactTextString(m) }
 func (*AllocationStrategy) ProtoMessage()    {}
 func (*AllocationStrategy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{1}
+	return fileDescriptor_b07f45dd938bc1b0, []int{1}
 }
 func (m *AllocationStrategy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationStrategy.Unmarshal(m, b)
@@ -125,8 +129,8 @@ func (m *AllocationStrategy) XXX_Unmarshal(b []byte) error {
 func (m *AllocationStrategy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocationStrategy.Marshal(b, m, deterministic)
 }
-func (dst *AllocationStrategy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocationStrategy.Merge(dst, src)
+func (m *AllocationStrategy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocationStrategy.Merge(m, src)
 }
 func (m *AllocationStrategy) XXX_Size() int {
 	return xxx_messageInfo_AllocationStrategy.Size(m)
@@ -173,7 +177,7 @@ func (m *AllocationStrategy_AllocationStrategyConcurrency) String() string {
 }
 func (*AllocationStrategy_AllocationStrategyConcurrency) ProtoMessage() {}
 func (*AllocationStrategy_AllocationStrategyConcurrency) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{1, 0}
+	return fileDescriptor_b07f45dd938bc1b0, []int{1, 0}
 }
 func (m *AllocationStrategy_AllocationStrategyConcurrency) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationStrategy_AllocationStrategyConcurrency.Unmarshal(m, b)
@@ -181,8 +185,8 @@ func (m *AllocationStrategy_AllocationStrategyConcurrency) XXX_Unmarshal(b []byt
 func (m *AllocationStrategy_AllocationStrategyConcurrency) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocationStrategy_AllocationStrategyConcurrency.Marshal(b, m, deterministic)
 }
-func (dst *AllocationStrategy_AllocationStrategyConcurrency) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocationStrategy_AllocationStrategyConcurrency.Merge(dst, src)
+func (m *AllocationStrategy_AllocationStrategyConcurrency) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocationStrategy_AllocationStrategyConcurrency.Merge(m, src)
 }
 func (m *AllocationStrategy_AllocationStrategyConcurrency) XXX_Size() int {
 	return xxx_messageInfo_AllocationStrategy_AllocationStrategyConcurrency.Size(m)
@@ -215,7 +219,7 @@ func (m *AllocationStrategy_AllocationStrategyRefresh) String() string {
 }
 func (*AllocationStrategy_AllocationStrategyRefresh) ProtoMessage() {}
 func (*AllocationStrategy_AllocationStrategyRefresh) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{1, 1}
+	return fileDescriptor_b07f45dd938bc1b0, []int{1, 1}
 }
 func (m *AllocationStrategy_AllocationStrategyRefresh) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationStrategy_AllocationStrategyRefresh.Unmarshal(m, b)
@@ -223,8 +227,8 @@ func (m *AllocationStrategy_AllocationStrategyRefresh) XXX_Unmarshal(b []byte) e
 func (m *AllocationStrategy_AllocationStrategyRefresh) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocationStrategy_AllocationStrategyRefresh.Marshal(b, m, deterministic)
 }
-func (dst *AllocationStrategy_AllocationStrategyRefresh) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocationStrategy_AllocationStrategyRefresh.Merge(dst, src)
+func (m *AllocationStrategy_AllocationStrategyRefresh) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocationStrategy_AllocationStrategyRefresh.Merge(m, src)
 }
 func (m *AllocationStrategy_AllocationStrategyRefresh) XXX_Size() int {
 	return xxx_messageInfo_AllocationStrategy_AllocationStrategyRefresh.Size(m)
@@ -257,7 +261,7 @@ func (m *SniffingConfig) Reset()         { *m = SniffingConfig{} }
 func (m *SniffingConfig) String() string { return proto.CompactTextString(m) }
 func (*SniffingConfig) ProtoMessage()    {}
 func (*SniffingConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{2}
+	return fileDescriptor_b07f45dd938bc1b0, []int{2}
 }
 func (m *SniffingConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SniffingConfig.Unmarshal(m, b)
@@ -265,8 +269,8 @@ func (m *SniffingConfig) XXX_Unmarshal(b []byte) error {
 func (m *SniffingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SniffingConfig.Marshal(b, m, deterministic)
 }
-func (dst *SniffingConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SniffingConfig.Merge(dst, src)
+func (m *SniffingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SniffingConfig.Merge(m, src)
 }
 func (m *SniffingConfig) XXX_Size() int {
 	return xxx_messageInfo_SniffingConfig.Size(m)
@@ -312,7 +316,7 @@ func (m *ReceiverConfig) Reset()         { *m = ReceiverConfig{} }
 func (m *ReceiverConfig) String() string { return proto.CompactTextString(m) }
 func (*ReceiverConfig) ProtoMessage()    {}
 func (*ReceiverConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{3}
+	return fileDescriptor_b07f45dd938bc1b0, []int{3}
 }
 func (m *ReceiverConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReceiverConfig.Unmarshal(m, b)
@@ -320,8 +324,8 @@ func (m *ReceiverConfig) XXX_Unmarshal(b []byte) error {
 func (m *ReceiverConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReceiverConfig.Marshal(b, m, deterministic)
 }
-func (dst *ReceiverConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReceiverConfig.Merge(dst, src)
+func (m *ReceiverConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceiverConfig.Merge(m, src)
 }
 func (m *ReceiverConfig) XXX_Size() int {
 	return xxx_messageInfo_ReceiverConfig.Size(m)
@@ -395,7 +399,7 @@ func (m *InboundHandlerConfig) Reset()         { *m = InboundHandlerConfig{} }
 func (m *InboundHandlerConfig) String() string { return proto.CompactTextString(m) }
 func (*InboundHandlerConfig) ProtoMessage()    {}
 func (*InboundHandlerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{4}
+	return fileDescriptor_b07f45dd938bc1b0, []int{4}
 }
 func (m *InboundHandlerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InboundHandlerConfig.Unmarshal(m, b)
@@ -403,8 +407,8 @@ func (m *InboundHandlerConfig) XXX_Unmarshal(b []byte) error {
 func (m *InboundHandlerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InboundHandlerConfig.Marshal(b, m, deterministic)
 }
-func (dst *InboundHandlerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InboundHandlerConfig.Merge(dst, src)
+func (m *InboundHandlerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InboundHandlerConfig.Merge(m, src)
 }
 func (m *InboundHandlerConfig) XXX_Size() int {
 	return xxx_messageInfo_InboundHandlerConfig.Size(m)
@@ -446,7 +450,7 @@ func (m *OutboundConfig) Reset()         { *m = OutboundConfig{} }
 func (m *OutboundConfig) String() string { return proto.CompactTextString(m) }
 func (*OutboundConfig) ProtoMessage()    {}
 func (*OutboundConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{5}
+	return fileDescriptor_b07f45dd938bc1b0, []int{5}
 }
 func (m *OutboundConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutboundConfig.Unmarshal(m, b)
@@ -454,8 +458,8 @@ func (m *OutboundConfig) XXX_Unmarshal(b []byte) error {
 func (m *OutboundConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutboundConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutboundConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutboundConfig.Merge(dst, src)
+func (m *OutboundConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutboundConfig.Merge(m, src)
 }
 func (m *OutboundConfig) XXX_Size() int {
 	return xxx_messageInfo_OutboundConfig.Size(m)
@@ -481,7 +485,7 @@ func (m *SenderConfig) Reset()         { *m = SenderConfig{} }
 func (m *SenderConfig) String() string { return proto.CompactTextString(m) }
 func (*SenderConfig) ProtoMessage()    {}
 func (*SenderConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{6}
+	return fileDescriptor_b07f45dd938bc1b0, []int{6}
 }
 func (m *SenderConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SenderConfig.Unmarshal(m, b)
@@ -489,8 +493,8 @@ func (m *SenderConfig) XXX_Unmarshal(b []byte) error {
 func (m *SenderConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SenderConfig.Marshal(b, m, deterministic)
 }
-func (dst *SenderConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SenderConfig.Merge(dst, src)
+func (m *SenderConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SenderConfig.Merge(m, src)
 }
 func (m *SenderConfig) XXX_Size() int {
 	return xxx_messageInfo_SenderConfig.Size(m)
@@ -543,7 +547,7 @@ func (m *MultiplexingConfig) Reset()         { *m = MultiplexingConfig{} }
 func (m *MultiplexingConfig) String() string { return proto.CompactTextString(m) }
 func (*MultiplexingConfig) ProtoMessage()    {}
 func (*MultiplexingConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4f352eea1fc05e76, []int{7}
+	return fileDescriptor_b07f45dd938bc1b0, []int{7}
 }
 func (m *MultiplexingConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MultiplexingConfig.Unmarshal(m, b)
@@ -551,8 +555,8 @@ func (m *MultiplexingConfig) XXX_Unmarshal(b []byte) error {
 func (m *MultiplexingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MultiplexingConfig.Marshal(b, m, deterministic)
 }
-func (dst *MultiplexingConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MultiplexingConfig.Merge(dst, src)
+func (m *MultiplexingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MultiplexingConfig.Merge(m, src)
 }
 func (m *MultiplexingConfig) XXX_Size() int {
 	return xxx_messageInfo_MultiplexingConfig.Size(m)
@@ -593,10 +597,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/proxyman/config.proto", fileDescriptor_config_4f352eea1fc05e76)
+	proto.RegisterFile("v2ray.com/core/app/proxyman/config.proto", fileDescriptor_b07f45dd938bc1b0)
 }
 
-var fileDescriptor_config_4f352eea1fc05e76 = []byte{
+var fileDescriptor_b07f45dd938bc1b0 = []byte{
 	// 825 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6f, 0xdb, 0x36,
 	0x18, 0xc6, 0x6b, 0xcb, 0x8d, 0x9d, 0x37, 0x8d, 0xaa, 0xb0, 0x01, 0xaa, 0x79, 0x1b, 0xe0, 0x79,

app/router/config.pb.go

@@ -36,6 +36,7 @@ var Domain_Type_name = map[int32]string{
 	2: "Domain",
 	3: "Full",
 }
+
 var Domain_Type_value = map[string]int32{
 	"Plain":  0,
 	"Regex":  1,
@@ -46,8 +47,9 @@ var Domain_Type_value = map[string]int32{
 func (x Domain_Type) String() string {
 	return proto.EnumName(Domain_Type_name, int32(x))
 }
+
 func (Domain_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{0, 0}
+	return fileDescriptor_6b1608360690c5fc, []int{0, 0}
 }
 
 type Config_DomainStrategy int32
@@ -69,6 +71,7 @@ var Config_DomainStrategy_name = map[int32]string{
 	2: "IpIfNonMatch",
 	3: "IpOnDemand",
 }
+
 var Config_DomainStrategy_value = map[string]int32{
 	"AsIs":         0,
 	"UseIp":        1,
@@ -79,8 +82,9 @@ var Config_DomainStrategy_value = map[string]int32{
 func (x Config_DomainStrategy) String() string {
 	return proto.EnumName(Config_DomainStrategy_name, int32(x))
 }
+
 func (Config_DomainStrategy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{7, 0}
+	return fileDescriptor_6b1608360690c5fc, []int{7, 0}
 }
 
 // Domain for routing decision.
@@ -98,7 +102,7 @@ func (m *Domain) Reset()         { *m = Domain{} }
 func (m *Domain) String() string { return proto.CompactTextString(m) }
 func (*Domain) ProtoMessage()    {}
 func (*Domain) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{0}
+	return fileDescriptor_6b1608360690c5fc, []int{0}
 }
 func (m *Domain) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Domain.Unmarshal(m, b)
@@ -106,8 +110,8 @@ func (m *Domain) XXX_Unmarshal(b []byte) error {
 func (m *Domain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Domain.Marshal(b, m, deterministic)
 }
-func (dst *Domain) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Domain.Merge(dst, src)
+func (m *Domain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Domain.Merge(m, src)
 }
 func (m *Domain) XXX_Size() int {
 	return xxx_messageInfo_Domain.Size(m)
@@ -147,7 +151,7 @@ func (m *CIDR) Reset()         { *m = CIDR{} }
 func (m *CIDR) String() string { return proto.CompactTextString(m) }
 func (*CIDR) ProtoMessage()    {}
 func (*CIDR) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{1}
+	return fileDescriptor_6b1608360690c5fc, []int{1}
 }
 func (m *CIDR) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CIDR.Unmarshal(m, b)
@@ -155,8 +159,8 @@ func (m *CIDR) XXX_Unmarshal(b []byte) error {
 func (m *CIDR) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CIDR.Marshal(b, m, deterministic)
 }
-func (dst *CIDR) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CIDR.Merge(dst, src)
+func (m *CIDR) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CIDR.Merge(m, src)
 }
 func (m *CIDR) XXX_Size() int {
 	return xxx_messageInfo_CIDR.Size(m)
@@ -193,7 +197,7 @@ func (m *GeoIP) Reset()         { *m = GeoIP{} }
 func (m *GeoIP) String() string { return proto.CompactTextString(m) }
 func (*GeoIP) ProtoMessage()    {}
 func (*GeoIP) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{2}
+	return fileDescriptor_6b1608360690c5fc, []int{2}
 }
 func (m *GeoIP) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoIP.Unmarshal(m, b)
@@ -201,8 +205,8 @@ func (m *GeoIP) XXX_Unmarshal(b []byte) error {
 func (m *GeoIP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoIP.Marshal(b, m, deterministic)
 }
-func (dst *GeoIP) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoIP.Merge(dst, src)
+func (m *GeoIP) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoIP.Merge(m, src)
 }
 func (m *GeoIP) XXX_Size() int {
 	return xxx_messageInfo_GeoIP.Size(m)
@@ -238,7 +242,7 @@ func (m *GeoIPList) Reset()         { *m = GeoIPList{} }
 func (m *GeoIPList) String() string { return proto.CompactTextString(m) }
 func (*GeoIPList) ProtoMessage()    {}
 func (*GeoIPList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{3}
+	return fileDescriptor_6b1608360690c5fc, []int{3}
 }
 func (m *GeoIPList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoIPList.Unmarshal(m, b)
@@ -246,8 +250,8 @@ func (m *GeoIPList) XXX_Unmarshal(b []byte) error {
 func (m *GeoIPList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoIPList.Marshal(b, m, deterministic)
 }
-func (dst *GeoIPList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoIPList.Merge(dst, src)
+func (m *GeoIPList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoIPList.Merge(m, src)
 }
 func (m *GeoIPList) XXX_Size() int {
 	return xxx_messageInfo_GeoIPList.Size(m)
@@ -277,7 +281,7 @@ func (m *GeoSite) Reset()         { *m = GeoSite{} }
 func (m *GeoSite) String() string { return proto.CompactTextString(m) }
 func (*GeoSite) ProtoMessage()    {}
 func (*GeoSite) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{4}
+	return fileDescriptor_6b1608360690c5fc, []int{4}
 }
 func (m *GeoSite) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoSite.Unmarshal(m, b)
@@ -285,8 +289,8 @@ func (m *GeoSite) XXX_Unmarshal(b []byte) error {
 func (m *GeoSite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoSite.Marshal(b, m, deterministic)
 }
-func (dst *GeoSite) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoSite.Merge(dst, src)
+func (m *GeoSite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoSite.Merge(m, src)
 }
 func (m *GeoSite) XXX_Size() int {
 	return xxx_messageInfo_GeoSite.Size(m)
@@ -322,7 +326,7 @@ func (m *GeoSiteList) Reset()         { *m = GeoSiteList{} }
 func (m *GeoSiteList) String() string { return proto.CompactTextString(m) }
 func (*GeoSiteList) ProtoMessage()    {}
 func (*GeoSiteList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{5}
+	return fileDescriptor_6b1608360690c5fc, []int{5}
 }
 func (m *GeoSiteList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoSiteList.Unmarshal(m, b)
@@ -330,8 +334,8 @@ func (m *GeoSiteList) XXX_Unmarshal(b []byte) error {
 func (m *GeoSiteList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoSiteList.Marshal(b, m, deterministic)
 }
-func (dst *GeoSiteList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoSiteList.Merge(dst, src)
+func (m *GeoSiteList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoSiteList.Merge(m, src)
 }
 func (m *GeoSiteList) XXX_Size() int {
 	return xxx_messageInfo_GeoSiteList.Size(m)
@@ -368,7 +372,7 @@ func (m *RoutingRule) Reset()         { *m = RoutingRule{} }
 func (m *RoutingRule) String() string { return proto.CompactTextString(m) }
 func (*RoutingRule) ProtoMessage()    {}
 func (*RoutingRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{6}
+	return fileDescriptor_6b1608360690c5fc, []int{6}
 }
 func (m *RoutingRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RoutingRule.Unmarshal(m, b)
@@ -376,8 +380,8 @@ func (m *RoutingRule) XXX_Unmarshal(b []byte) error {
 func (m *RoutingRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RoutingRule.Marshal(b, m, deterministic)
 }
-func (dst *RoutingRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RoutingRule.Merge(dst, src)
+func (m *RoutingRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RoutingRule.Merge(m, src)
 }
 func (m *RoutingRule) XXX_Size() int {
 	return xxx_messageInfo_RoutingRule.Size(m)
@@ -463,7 +467,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e31761c0263e38b8, []int{7}
+	return fileDescriptor_6b1608360690c5fc, []int{7}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -471,8 +475,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -511,10 +515,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/router/config.proto", fileDescriptor_config_e31761c0263e38b8)
+	proto.RegisterFile("v2ray.com/core/app/router/config.proto", fileDescriptor_6b1608360690c5fc)
 }
 
-var fileDescriptor_config_e31761c0263e38b8 = []byte{
+var fileDescriptor_6b1608360690c5fc = []byte{
 	// 656 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xd3, 0x30,
 	0x14, 0x26, 0xfd, 0xdb, 0x72, 0x52, 0x4a, 0x64, 0x31, 0x14, 0x06, 0x83, 0x12, 0x21, 0xe8, 0x05,

app/stats/command/command.pb.go

@@ -35,7 +35,7 @@ func (m *GetStatsRequest) Reset()         { *m = GetStatsRequest{} }
 func (m *GetStatsRequest) String() string { return proto.CompactTextString(m) }
 func (*GetStatsRequest) ProtoMessage()    {}
 func (*GetStatsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_bba6fe6bc2b51668, []int{0}
+	return fileDescriptor_c902411c4948f26b, []int{0}
 }
 func (m *GetStatsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetStatsRequest.Unmarshal(m, b)
@@ -43,8 +43,8 @@ func (m *GetStatsRequest) XXX_Unmarshal(b []byte) error {
 func (m *GetStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetStatsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetStatsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetStatsRequest.Merge(dst, src)
+func (m *GetStatsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetStatsRequest.Merge(m, src)
 }
 func (m *GetStatsRequest) XXX_Size() int {
 	return xxx_messageInfo_GetStatsRequest.Size(m)
@@ -81,7 +81,7 @@ func (m *Stat) Reset()         { *m = Stat{} }
 func (m *Stat) String() string { return proto.CompactTextString(m) }
 func (*Stat) ProtoMessage()    {}
 func (*Stat) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_bba6fe6bc2b51668, []int{1}
+	return fileDescriptor_c902411c4948f26b, []int{1}
 }
 func (m *Stat) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Stat.Unmarshal(m, b)
@@ -89,8 +89,8 @@ func (m *Stat) XXX_Unmarshal(b []byte) error {
 func (m *Stat) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Stat.Marshal(b, m, deterministic)
 }
-func (dst *Stat) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Stat.Merge(dst, src)
+func (m *Stat) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Stat.Merge(m, src)
 }
 func (m *Stat) XXX_Size() int {
 	return xxx_messageInfo_Stat.Size(m)
@@ -126,7 +126,7 @@ func (m *GetStatsResponse) Reset()         { *m = GetStatsResponse{} }
 func (m *GetStatsResponse) String() string { return proto.CompactTextString(m) }
 func (*GetStatsResponse) ProtoMessage()    {}
 func (*GetStatsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_bba6fe6bc2b51668, []int{2}
+	return fileDescriptor_c902411c4948f26b, []int{2}
 }
 func (m *GetStatsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetStatsResponse.Unmarshal(m, b)
@@ -134,8 +134,8 @@ func (m *GetStatsResponse) XXX_Unmarshal(b []byte) error {
 func (m *GetStatsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetStatsResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetStatsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetStatsResponse.Merge(dst, src)
+func (m *GetStatsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetStatsResponse.Merge(m, src)
 }
 func (m *GetStatsResponse) XXX_Size() int {
 	return xxx_messageInfo_GetStatsResponse.Size(m)
@@ -165,7 +165,7 @@ func (m *QueryStatsRequest) Reset()         { *m = QueryStatsRequest{} }
 func (m *QueryStatsRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryStatsRequest) ProtoMessage()    {}
 func (*QueryStatsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_bba6fe6bc2b51668, []int{3}
+	return fileDescriptor_c902411c4948f26b, []int{3}
 }
 func (m *QueryStatsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryStatsRequest.Unmarshal(m, b)
@@ -173,8 +173,8 @@ func (m *QueryStatsRequest) XXX_Unmarshal(b []byte) error {
 func (m *QueryStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryStatsRequest.Marshal(b, m, deterministic)
 }
-func (dst *QueryStatsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryStatsRequest.Merge(dst, src)
+func (m *QueryStatsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryStatsRequest.Merge(m, src)
 }
 func (m *QueryStatsRequest) XXX_Size() int {
 	return xxx_messageInfo_QueryStatsRequest.Size(m)
@@ -210,7 +210,7 @@ func (m *QueryStatsResponse) Reset()         { *m = QueryStatsResponse{} }
 func (m *QueryStatsResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryStatsResponse) ProtoMessage()    {}
 func (*QueryStatsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_bba6fe6bc2b51668, []int{4}
+	return fileDescriptor_c902411c4948f26b, []int{4}
 }
 func (m *QueryStatsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryStatsResponse.Unmarshal(m, b)
@@ -218,8 +218,8 @@ func (m *QueryStatsResponse) XXX_Unmarshal(b []byte) error {
 func (m *QueryStatsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryStatsResponse.Marshal(b, m, deterministic)
 }
-func (dst *QueryStatsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryStatsResponse.Merge(dst, src)
+func (m *QueryStatsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryStatsResponse.Merge(m, src)
 }
 func (m *QueryStatsResponse) XXX_Size() int {
 	return xxx_messageInfo_QueryStatsResponse.Size(m)
@@ -247,7 +247,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_bba6fe6bc2b51668, []int{5}
+	return fileDescriptor_c902411c4948f26b, []int{5}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -255,8 +255,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -382,10 +382,10 @@ var _StatsService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/stats/command/command.proto", fileDescriptor_command_bba6fe6bc2b51668)
+	proto.RegisterFile("v2ray.com/core/app/stats/command/command.proto", fileDescriptor_c902411c4948f26b)
 }
 
-var fileDescriptor_command_bba6fe6bc2b51668 = []byte{
+var fileDescriptor_c902411c4948f26b = []byte{
 	// 321 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xb1, 0x4e, 0xc3, 0x30,
 	0x10, 0x86, 0x49, 0x5b, 0xda, 0x72, 0x20, 0x01, 0x16, 0x43, 0x55, 0x75, 0x88, 0x3c, 0x75, 0xc1,

app/stats/config.pb.go

@@ -25,7 +25,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_0b997e1303000e51, []int{0}
+	return fileDescriptor_d494ded44ceaa50d, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -33,8 +33,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -50,10 +50,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/app/stats/config.proto", fileDescriptor_config_0b997e1303000e51)
+	proto.RegisterFile("v2ray.com/core/app/stats/config.proto", fileDescriptor_d494ded44ceaa50d)
 }
 
-var fileDescriptor_config_0b997e1303000e51 = []byte{
+var fileDescriptor_d494ded44ceaa50d = []byte{
 	// 123 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2d, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0x2c, 0x28, 0xd0, 0x2f,

common/log/log.pb.go

@@ -32,6 +32,7 @@ var Severity_name = map[int32]string{
 	3: "Info",
 	4: "Debug",
 }
+
 var Severity_value = map[string]int32{
 	"Unknown": 0,
 	"Error":   1,
@@ -43,8 +44,9 @@ var Severity_value = map[string]int32{
 func (x Severity) String() string {
 	return proto.EnumName(Severity_name, int32(x))
 }
+
 func (Severity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_log_688a64b279e8a7c0, []int{0}
+	return fileDescriptor_903ab33e40dced38, []int{0}
 }
 
 func init() {
@@ -52,10 +54,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/log/log.proto", fileDescriptor_log_688a64b279e8a7c0)
+	proto.RegisterFile("v2ray.com/core/common/log/log.proto", fileDescriptor_903ab33e40dced38)
 }
 
-var fileDescriptor_log_688a64b279e8a7c0 = []byte{
+var fileDescriptor_903ab33e40dced38 = []byte{
 	// 178 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2e, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,

common/net/address.pb.go

@@ -30,7 +30,7 @@ func (m *IPOrDomain) Reset()         { *m = IPOrDomain{} }
 func (m *IPOrDomain) String() string { return proto.CompactTextString(m) }
 func (*IPOrDomain) ProtoMessage()    {}
 func (*IPOrDomain) Descriptor() ([]byte, []int) {
-	return fileDescriptor_address_c500a1e2dec49a04, []int{0}
+	return fileDescriptor_4ba9b4a4304e7c1f, []int{0}
 }
 func (m *IPOrDomain) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IPOrDomain.Unmarshal(m, b)
@@ -38,8 +38,8 @@ func (m *IPOrDomain) XXX_Unmarshal(b []byte) error {
 func (m *IPOrDomain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IPOrDomain.Marshal(b, m, deterministic)
 }
-func (dst *IPOrDomain) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IPOrDomain.Merge(dst, src)
+func (m *IPOrDomain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IPOrDomain.Merge(m, src)
 }
 func (m *IPOrDomain) XXX_Size() int {
 	return xxx_messageInfo_IPOrDomain.Size(m)
@@ -158,10 +158,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/net/address.proto", fileDescriptor_address_c500a1e2dec49a04)
+	proto.RegisterFile("v2ray.com/core/common/net/address.proto", fileDescriptor_4ba9b4a4304e7c1f)
 }
 
-var fileDescriptor_address_c500a1e2dec49a04 = []byte{
+var fileDescriptor_4ba9b4a4304e7c1f = []byte{
 	// 174 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,

common/net/destination.pb.go

@@ -29,7 +29,7 @@ func (m *Endpoint) Reset()         { *m = Endpoint{} }
 func (m *Endpoint) String() string { return proto.CompactTextString(m) }
 func (*Endpoint) ProtoMessage()    {}
 func (*Endpoint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_destination_9cf0c1d86a8d291d, []int{0}
+	return fileDescriptor_77acfe1424029862, []int{0}
 }
 func (m *Endpoint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Endpoint.Unmarshal(m, b)
@@ -37,8 +37,8 @@ func (m *Endpoint) XXX_Unmarshal(b []byte) error {
 func (m *Endpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Endpoint.Marshal(b, m, deterministic)
 }
-func (dst *Endpoint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Endpoint.Merge(dst, src)
+func (m *Endpoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Endpoint.Merge(m, src)
 }
 func (m *Endpoint) XXX_Size() int {
 	return xxx_messageInfo_Endpoint.Size(m)
@@ -75,10 +75,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/net/destination.proto", fileDescriptor_destination_9cf0c1d86a8d291d)
+	proto.RegisterFile("v2ray.com/core/common/net/destination.proto", fileDescriptor_77acfe1424029862)
 }
 
-var fileDescriptor_destination_9cf0c1d86a8d291d = []byte{
+var fileDescriptor_77acfe1424029862 = []byte{
 	// 230 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2e, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,

common/net/network.pb.go

@@ -30,6 +30,7 @@ var Network_name = map[int32]string{
 	2: "TCP",
 	3: "UDP",
 }
+
 var Network_value = map[string]int32{
 	"Unknown": 0,
 	"RawTCP":  1,
@@ -40,8 +41,9 @@ var Network_value = map[string]int32{
 func (x Network) String() string {
 	return proto.EnumName(Network_name, int32(x))
 }
+
 func (Network) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_network_a36c8cbc46b487e4, []int{0}
+	return fileDescriptor_6a103d5ccb9e785e, []int{0}
 }
 
 // NetworkList is a list of Networks.
@@ -56,7 +58,7 @@ func (m *NetworkList) Reset()         { *m = NetworkList{} }
 func (m *NetworkList) String() string { return proto.CompactTextString(m) }
 func (*NetworkList) ProtoMessage()    {}
 func (*NetworkList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_a36c8cbc46b487e4, []int{0}
+	return fileDescriptor_6a103d5ccb9e785e, []int{0}
 }
 func (m *NetworkList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkList.Unmarshal(m, b)
@@ -64,8 +66,8 @@ func (m *NetworkList) XXX_Unmarshal(b []byte) error {
 func (m *NetworkList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkList.Marshal(b, m, deterministic)
 }
-func (dst *NetworkList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkList.Merge(dst, src)
+func (m *NetworkList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkList.Merge(m, src)
 }
 func (m *NetworkList) XXX_Size() int {
 	return xxx_messageInfo_NetworkList.Size(m)
@@ -89,10 +91,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/net/network.proto", fileDescriptor_network_a36c8cbc46b487e4)
+	proto.RegisterFile("v2ray.com/core/common/net/network.proto", fileDescriptor_6a103d5ccb9e785e)
 }
 
-var fileDescriptor_network_a36c8cbc46b487e4 = []byte{
+var fileDescriptor_6a103d5ccb9e785e = []byte{
 	// 198 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,

common/net/port.pb.go

@@ -30,7 +30,7 @@ func (m *PortRange) Reset()         { *m = PortRange{} }
 func (m *PortRange) String() string { return proto.CompactTextString(m) }
 func (*PortRange) ProtoMessage()    {}
 func (*PortRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_port_673e4083b7b87399, []int{0}
+	return fileDescriptor_166067e37a39f913, []int{0}
 }
 func (m *PortRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PortRange.Unmarshal(m, b)
@@ -38,8 +38,8 @@ func (m *PortRange) XXX_Unmarshal(b []byte) error {
 func (m *PortRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PortRange.Marshal(b, m, deterministic)
 }
-func (dst *PortRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PortRange.Merge(dst, src)
+func (m *PortRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PortRange.Merge(m, src)
 }
 func (m *PortRange) XXX_Size() int {
 	return xxx_messageInfo_PortRange.Size(m)
@@ -69,10 +69,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/net/port.proto", fileDescriptor_port_673e4083b7b87399)
+	proto.RegisterFile("v2ray.com/core/common/net/port.proto", fileDescriptor_166067e37a39f913)
 }
 
-var fileDescriptor_port_673e4083b7b87399 = []byte{
+var fileDescriptor_166067e37a39f913 = []byte{
 	// 158 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x29, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,

common/protocol/command.pb.go

@@ -29,7 +29,7 @@ func (m *AlternativeOutboundConfig) Reset()         { *m = AlternativeOutboundCo
 func (m *AlternativeOutboundConfig) String() string { return proto.CompactTextString(m) }
 func (*AlternativeOutboundConfig) ProtoMessage()    {}
 func (*AlternativeOutboundConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_73fe039ecf28347d, []int{0}
+	return fileDescriptor_679ae58a48988c7f, []int{0}
 }
 func (m *AlternativeOutboundConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlternativeOutboundConfig.Unmarshal(m, b)
@@ -37,8 +37,8 @@ func (m *AlternativeOutboundConfig) XXX_Unmarshal(b []byte) error {
 func (m *AlternativeOutboundConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlternativeOutboundConfig.Marshal(b, m, deterministic)
 }
-func (dst *AlternativeOutboundConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlternativeOutboundConfig.Merge(dst, src)
+func (m *AlternativeOutboundConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlternativeOutboundConfig.Merge(m, src)
 }
 func (m *AlternativeOutboundConfig) XXX_Size() int {
 	return xxx_messageInfo_AlternativeOutboundConfig.Size(m)
@@ -68,10 +68,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/protocol/command.proto", fileDescriptor_command_73fe039ecf28347d)
+	proto.RegisterFile("v2ray.com/core/common/protocol/command.proto", fileDescriptor_679ae58a48988c7f)
 }
 
-var fileDescriptor_command_73fe039ecf28347d = []byte{
+var fileDescriptor_679ae58a48988c7f = []byte{
 	// 262 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xcf, 0x4a, 0xc3, 0x40,
 	0x10, 0x87, 0x89, 0x82, 0x94, 0x08, 0x0a, 0x39, 0x69, 0x0e, 0x22, 0x1e, 0x44, 0x50, 0x66, 0x25,

common/protocol/headers.pb.go

@@ -34,6 +34,7 @@ var SecurityType_name = map[int32]string{
 	4: "CHACHA20_POLY1305",
 	5: "NONE",
 }
+
 var SecurityType_value = map[string]int32{
 	"UNKNOWN":           0,
 	"LEGACY":            1,
@@ -46,8 +47,9 @@ var SecurityType_value = map[string]int32{
 func (x SecurityType) String() string {
 	return proto.EnumName(SecurityType_name, int32(x))
 }
+
 func (SecurityType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_headers_48d2062ab099075f, []int{0}
+	return fileDescriptor_5931f958a3c1d408, []int{0}
 }
 
 type SecurityConfig struct {
@@ -61,7 +63,7 @@ func (m *SecurityConfig) Reset()         { *m = SecurityConfig{} }
 func (m *SecurityConfig) String() string { return proto.CompactTextString(m) }
 func (*SecurityConfig) ProtoMessage()    {}
 func (*SecurityConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_headers_48d2062ab099075f, []int{0}
+	return fileDescriptor_5931f958a3c1d408, []int{0}
 }
 func (m *SecurityConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SecurityConfig.Unmarshal(m, b)
@@ -69,8 +71,8 @@ func (m *SecurityConfig) XXX_Unmarshal(b []byte) error {
 func (m *SecurityConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SecurityConfig.Marshal(b, m, deterministic)
 }
-func (dst *SecurityConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SecurityConfig.Merge(dst, src)
+func (m *SecurityConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SecurityConfig.Merge(m, src)
 }
 func (m *SecurityConfig) XXX_Size() int {
 	return xxx_messageInfo_SecurityConfig.Size(m)
@@ -94,10 +96,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/protocol/headers.proto", fileDescriptor_headers_48d2062ab099075f)
+	proto.RegisterFile("v2ray.com/core/common/protocol/headers.proto", fileDescriptor_5931f958a3c1d408)
 }
 
-var fileDescriptor_headers_48d2062ab099075f = []byte{
+var fileDescriptor_5931f958a3c1d408 = []byte{
 	// 252 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x29, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,

common/protocol/server_spec.pb.go

@@ -29,7 +29,7 @@ func (m *ServerEndpoint) Reset()         { *m = ServerEndpoint{} }
 func (m *ServerEndpoint) String() string { return proto.CompactTextString(m) }
 func (*ServerEndpoint) ProtoMessage()    {}
 func (*ServerEndpoint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_server_spec_5e5cfcdebad37378, []int{0}
+	return fileDescriptor_8741b2fa976e72fc, []int{0}
 }
 func (m *ServerEndpoint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerEndpoint.Unmarshal(m, b)
@@ -37,8 +37,8 @@ func (m *ServerEndpoint) XXX_Unmarshal(b []byte) error {
 func (m *ServerEndpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerEndpoint.Marshal(b, m, deterministic)
 }
-func (dst *ServerEndpoint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerEndpoint.Merge(dst, src)
+func (m *ServerEndpoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerEndpoint.Merge(m, src)
 }
 func (m *ServerEndpoint) XXX_Size() int {
 	return xxx_messageInfo_ServerEndpoint.Size(m)
@@ -75,10 +75,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/protocol/server_spec.proto", fileDescriptor_server_spec_5e5cfcdebad37378)
+	proto.RegisterFile("v2ray.com/core/common/protocol/server_spec.proto", fileDescriptor_8741b2fa976e72fc)
 }
 
-var fileDescriptor_server_spec_5e5cfcdebad37378 = []byte{
+var fileDescriptor_8741b2fa976e72fc = []byte{
 	// 241 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0xcf, 0xbd, 0x4e, 0xc3, 0x30,
 	0x10, 0x07, 0x70, 0xb9, 0xad, 0x00, 0xb9, 0x82, 0xc1, 0x53, 0x94, 0x01, 0x05, 0x16, 0xc2, 0x72,

common/protocol/user.pb.go

@@ -31,7 +31,7 @@ func (m *User) Reset()         { *m = User{} }
 func (m *User) String() string { return proto.CompactTextString(m) }
 func (*User) ProtoMessage()    {}
 func (*User) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_f63d6be0dccd470d, []int{0}
+	return fileDescriptor_9da52c16030369bd, []int{0}
 }
 func (m *User) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_User.Unmarshal(m, b)
@@ -39,8 +39,8 @@ func (m *User) XXX_Unmarshal(b []byte) error {
 func (m *User) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_User.Marshal(b, m, deterministic)
 }
-func (dst *User) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_User.Merge(dst, src)
+func (m *User) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_User.Merge(m, src)
 }
 func (m *User) XXX_Size() int {
 	return xxx_messageInfo_User.Size(m)
@@ -77,10 +77,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/protocol/user.proto", fileDescriptor_user_f63d6be0dccd470d)
+	proto.RegisterFile("v2ray.com/core/common/protocol/user.proto", fileDescriptor_9da52c16030369bd)
 }
 
-var fileDescriptor_user_f63d6be0dccd470d = []byte{
+var fileDescriptor_9da52c16030369bd = []byte{
 	// 218 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2c, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,

common/serial/typed_message.pb.go

@@ -30,7 +30,7 @@ func (m *TypedMessage) Reset()         { *m = TypedMessage{} }
 func (m *TypedMessage) String() string { return proto.CompactTextString(m) }
 func (*TypedMessage) ProtoMessage()    {}
 func (*TypedMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_typed_message_70293e724b066c70, []int{0}
+	return fileDescriptor_0bb3cdb51e9fc84d, []int{0}
 }
 func (m *TypedMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TypedMessage.Unmarshal(m, b)
@@ -38,8 +38,8 @@ func (m *TypedMessage) XXX_Unmarshal(b []byte) error {
 func (m *TypedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TypedMessage.Marshal(b, m, deterministic)
 }
-func (dst *TypedMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TypedMessage.Merge(dst, src)
+func (m *TypedMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TypedMessage.Merge(m, src)
 }
 func (m *TypedMessage) XXX_Size() int {
 	return xxx_messageInfo_TypedMessage.Size(m)
@@ -69,10 +69,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/common/serial/typed_message.proto", fileDescriptor_typed_message_70293e724b066c70)
+	proto.RegisterFile("v2ray.com/core/common/serial/typed_message.proto", fileDescriptor_0bb3cdb51e9fc84d)
 }
 
-var fileDescriptor_typed_message_70293e724b066c70 = []byte{
+var fileDescriptor_0bb3cdb51e9fc84d = []byte{
 	// 168 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x28, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,

config.pb.go

@@ -39,7 +39,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_9b890a9963e1ba9b, []int{0}
+	return fileDescriptor_13704400b1045c6b, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -47,8 +47,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -111,7 +111,7 @@ func (m *InboundHandlerConfig) Reset()         { *m = InboundHandlerConfig{} }
 func (m *InboundHandlerConfig) String() string { return proto.CompactTextString(m) }
 func (*InboundHandlerConfig) ProtoMessage()    {}
 func (*InboundHandlerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_9b890a9963e1ba9b, []int{1}
+	return fileDescriptor_13704400b1045c6b, []int{1}
 }
 func (m *InboundHandlerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InboundHandlerConfig.Unmarshal(m, b)
@@ -119,8 +119,8 @@ func (m *InboundHandlerConfig) XXX_Unmarshal(b []byte) error {
 func (m *InboundHandlerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InboundHandlerConfig.Marshal(b, m, deterministic)
 }
-func (dst *InboundHandlerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InboundHandlerConfig.Merge(dst, src)
+func (m *InboundHandlerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InboundHandlerConfig.Merge(m, src)
 }
 func (m *InboundHandlerConfig) XXX_Size() int {
 	return xxx_messageInfo_InboundHandlerConfig.Size(m)
@@ -173,7 +173,7 @@ func (m *OutboundHandlerConfig) Reset()         { *m = OutboundHandlerConfig{} }
 func (m *OutboundHandlerConfig) String() string { return proto.CompactTextString(m) }
 func (*OutboundHandlerConfig) ProtoMessage()    {}
 func (*OutboundHandlerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_9b890a9963e1ba9b, []int{2}
+	return fileDescriptor_13704400b1045c6b, []int{2}
 }
 func (m *OutboundHandlerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutboundHandlerConfig.Unmarshal(m, b)
@@ -181,8 +181,8 @@ func (m *OutboundHandlerConfig) XXX_Unmarshal(b []byte) error {
 func (m *OutboundHandlerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutboundHandlerConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutboundHandlerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutboundHandlerConfig.Merge(dst, src)
+func (m *OutboundHandlerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutboundHandlerConfig.Merge(m, src)
 }
 func (m *OutboundHandlerConfig) XXX_Size() int {
 	return xxx_messageInfo_OutboundHandlerConfig.Size(m)
@@ -234,9 +234,9 @@ func init() {
 	proto.RegisterType((*OutboundHandlerConfig)(nil), "v2ray.core.OutboundHandlerConfig")
 }
 
-func init() { proto.RegisterFile("v2ray.com/core/config.proto", fileDescriptor_config_9b890a9963e1ba9b) }
+func init() { proto.RegisterFile("v2ray.com/core/config.proto", fileDescriptor_13704400b1045c6b) }
 
-var fileDescriptor_config_9b890a9963e1ba9b = []byte{
+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,

proxy/blackhole/config.pb.go

@@ -26,7 +26,7 @@ func (m *NoneResponse) Reset()         { *m = NoneResponse{} }
 func (m *NoneResponse) String() string { return proto.CompactTextString(m) }
 func (*NoneResponse) ProtoMessage()    {}
 func (*NoneResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_720e5f73f2070b8d, []int{0}
+	return fileDescriptor_8c8b37c8ae1bdfea, []int{0}
 }
 func (m *NoneResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NoneResponse.Unmarshal(m, b)
@@ -34,8 +34,8 @@ func (m *NoneResponse) XXX_Unmarshal(b []byte) error {
 func (m *NoneResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NoneResponse.Marshal(b, m, deterministic)
 }
-func (dst *NoneResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NoneResponse.Merge(dst, src)
+func (m *NoneResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NoneResponse.Merge(m, src)
 }
 func (m *NoneResponse) XXX_Size() int {
 	return xxx_messageInfo_NoneResponse.Size(m)
@@ -56,7 +56,7 @@ func (m *HTTPResponse) Reset()         { *m = HTTPResponse{} }
 func (m *HTTPResponse) String() string { return proto.CompactTextString(m) }
 func (*HTTPResponse) ProtoMessage()    {}
 func (*HTTPResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_720e5f73f2070b8d, []int{1}
+	return fileDescriptor_8c8b37c8ae1bdfea, []int{1}
 }
 func (m *HTTPResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HTTPResponse.Unmarshal(m, b)
@@ -64,8 +64,8 @@ func (m *HTTPResponse) XXX_Unmarshal(b []byte) error {
 func (m *HTTPResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HTTPResponse.Marshal(b, m, deterministic)
 }
-func (dst *HTTPResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HTTPResponse.Merge(dst, src)
+func (m *HTTPResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HTTPResponse.Merge(m, src)
 }
 func (m *HTTPResponse) XXX_Size() int {
 	return xxx_messageInfo_HTTPResponse.Size(m)
@@ -87,7 +87,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_720e5f73f2070b8d, []int{2}
+	return fileDescriptor_8c8b37c8ae1bdfea, []int{2}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -95,8 +95,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -121,10 +121,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/blackhole/config.proto", fileDescriptor_config_720e5f73f2070b8d)
+	proto.RegisterFile("v2ray.com/core/proxy/blackhole/config.proto", fileDescriptor_8c8b37c8ae1bdfea)
 }
 
-var fileDescriptor_config_720e5f73f2070b8d = []byte{
+var fileDescriptor_8c8b37c8ae1bdfea = []byte{
 	// 217 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2e, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8,

proxy/dokodemo/config.pb.go

@@ -32,7 +32,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_2e7b0f4424e753c0, []int{0}
+	return fileDescriptor_de04411d7254f312, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -40,8 +40,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -100,10 +100,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/dokodemo/config.proto", fileDescriptor_config_2e7b0f4424e753c0)
+	proto.RegisterFile("v2ray.com/core/proxy/dokodemo/config.proto", fileDescriptor_de04411d7254f312)
 }
 
-var fileDescriptor_config_2e7b0f4424e753c0 = []byte{
+var fileDescriptor_de04411d7254f312 = []byte{
 	// 310 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4e, 0xc2, 0x40,
 	0x10, 0x87, 0xd3, 0x8a, 0x80, 0x8b, 0x7f, 0x92, 0x3d, 0x2d, 0x46, 0x12, 0xe4, 0x02, 0xf1, 0xb0,

proxy/freedom/config.pb.go

@@ -27,6 +27,7 @@ var Config_DomainStrategy_name = map[int32]string{
 	0: "AS_IS",
 	1: "USE_IP",
 }
+
 var Config_DomainStrategy_value = map[string]int32{
 	"AS_IS":  0,
 	"USE_IP": 1,
@@ -35,8 +36,9 @@ var Config_DomainStrategy_value = map[string]int32{
 func (x Config_DomainStrategy) String() string {
 	return proto.EnumName(Config_DomainStrategy_name, int32(x))
 }
+
 func (Config_DomainStrategy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_232e04bef93b6842, []int{1, 0}
+	return fileDescriptor_66807b6fe2cca4da, []int{1, 0}
 }
 
 type DestinationOverride struct {
@@ -50,7 +52,7 @@ func (m *DestinationOverride) Reset()         { *m = DestinationOverride{} }
 func (m *DestinationOverride) String() string { return proto.CompactTextString(m) }
 func (*DestinationOverride) ProtoMessage()    {}
 func (*DestinationOverride) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_232e04bef93b6842, []int{0}
+	return fileDescriptor_66807b6fe2cca4da, []int{0}
 }
 func (m *DestinationOverride) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DestinationOverride.Unmarshal(m, b)
@@ -58,8 +60,8 @@ func (m *DestinationOverride) XXX_Unmarshal(b []byte) error {
 func (m *DestinationOverride) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DestinationOverride.Marshal(b, m, deterministic)
 }
-func (dst *DestinationOverride) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DestinationOverride.Merge(dst, src)
+func (m *DestinationOverride) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DestinationOverride.Merge(m, src)
 }
 func (m *DestinationOverride) XXX_Size() int {
 	return xxx_messageInfo_DestinationOverride.Size(m)
@@ -91,7 +93,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_232e04bef93b6842, []int{1}
+	return fileDescriptor_66807b6fe2cca4da, []int{1}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -99,8 +101,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -147,10 +149,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/freedom/config.proto", fileDescriptor_config_232e04bef93b6842)
+	proto.RegisterFile("v2ray.com/core/proxy/freedom/config.proto", fileDescriptor_66807b6fe2cca4da)
 }
 
-var fileDescriptor_config_232e04bef93b6842 = []byte{
+var fileDescriptor_66807b6fe2cca4da = []byte{
 	// 340 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x6f, 0x4b, 0x83, 0x50,
 	0x14, 0xc6, 0xd3, 0xca, 0xb1, 0x13, 0xad, 0xe1, 0x7a, 0x21, 0xb1, 0x60, 0xec, 0x4d, 0x2b, 0xe8,

proxy/http/config.pb.go

@@ -30,7 +30,7 @@ func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
 func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
 func (*ServerConfig) ProtoMessage()    {}
 func (*ServerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_00149e53e8f51a9f, []int{0}
+	return fileDescriptor_e66c3db3a635d8e4, []int{0}
 }
 func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
@@ -38,8 +38,8 @@ func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
 }
-func (dst *ServerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerConfig.Merge(dst, src)
+func (m *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(m, src)
 }
 func (m *ServerConfig) XXX_Size() int {
 	return xxx_messageInfo_ServerConfig.Size(m)
@@ -90,7 +90,7 @@ func (m *ClientConfig) Reset()         { *m = ClientConfig{} }
 func (m *ClientConfig) String() string { return proto.CompactTextString(m) }
 func (*ClientConfig) ProtoMessage()    {}
 func (*ClientConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_00149e53e8f51a9f, []int{1}
+	return fileDescriptor_e66c3db3a635d8e4, []int{1}
 }
 func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClientConfig.Unmarshal(m, b)
@@ -98,8 +98,8 @@ func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
 func (m *ClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClientConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClientConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientConfig.Merge(dst, src)
+func (m *ClientConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientConfig.Merge(m, src)
 }
 func (m *ClientConfig) XXX_Size() int {
 	return xxx_messageInfo_ClientConfig.Size(m)
@@ -117,10 +117,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/http/config.proto", fileDescriptor_config_00149e53e8f51a9f)
+	proto.RegisterFile("v2ray.com/core/proxy/http/config.proto", fileDescriptor_e66c3db3a635d8e4)
 }
 
-var fileDescriptor_config_00149e53e8f51a9f = []byte{
+var fileDescriptor_e66c3db3a635d8e4 = []byte{
 	// 296 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x4a, 0x33, 0x31,
 	0x14, 0xc5, 0x99, 0x69, 0xbf, 0xcf, 0xf6, 0xda, 0x4a, 0x0d, 0x16, 0x46, 0x51, 0x28, 0x5d, 0x48,

proxy/mtproto/config.pb.go

@@ -27,7 +27,7 @@ func (m *Account) Reset()         { *m = Account{} }
 func (m *Account) String() string { return proto.CompactTextString(m) }
 func (*Account) ProtoMessage()    {}
 func (*Account) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_f07451dec64d403d, []int{0}
+	return fileDescriptor_64514e21c693811b, []int{0}
 }
 func (m *Account) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Account.Unmarshal(m, b)
@@ -35,8 +35,8 @@ func (m *Account) XXX_Unmarshal(b []byte) error {
 func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Account.Marshal(b, m, deterministic)
 }
-func (dst *Account) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Account.Merge(dst, src)
+func (m *Account) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Account.Merge(m, src)
 }
 func (m *Account) XXX_Size() int {
 	return xxx_messageInfo_Account.Size(m)
@@ -67,7 +67,7 @@ func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
 func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
 func (*ServerConfig) ProtoMessage()    {}
 func (*ServerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_f07451dec64d403d, []int{1}
+	return fileDescriptor_64514e21c693811b, []int{1}
 }
 func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
@@ -75,8 +75,8 @@ func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
 }
-func (dst *ServerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerConfig.Merge(dst, src)
+func (m *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(m, src)
 }
 func (m *ServerConfig) XXX_Size() int {
 	return xxx_messageInfo_ServerConfig.Size(m)
@@ -104,7 +104,7 @@ func (m *ClientConfig) Reset()         { *m = ClientConfig{} }
 func (m *ClientConfig) String() string { return proto.CompactTextString(m) }
 func (*ClientConfig) ProtoMessage()    {}
 func (*ClientConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_f07451dec64d403d, []int{2}
+	return fileDescriptor_64514e21c693811b, []int{2}
 }
 func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClientConfig.Unmarshal(m, b)
@@ -112,8 +112,8 @@ func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
 func (m *ClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClientConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClientConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientConfig.Merge(dst, src)
+func (m *ClientConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientConfig.Merge(m, src)
 }
 func (m *ClientConfig) XXX_Size() int {
 	return xxx_messageInfo_ClientConfig.Size(m)
@@ -131,10 +131,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/mtproto/config.proto", fileDescriptor_config_f07451dec64d403d)
+	proto.RegisterFile("v2ray.com/core/proxy/mtproto/config.proto", fileDescriptor_64514e21c693811b)
 }
 
-var fileDescriptor_config_f07451dec64d403d = []byte{
+var fileDescriptor_64514e21c693811b = []byte{
 	// 221 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x8f, 0xc1, 0x4a, 0xc4, 0x30,
 	0x10, 0x86, 0x89, 0xca, 0x2e, 0xc4, 0xe2, 0xa1, 0x07, 0x09, 0xe2, 0xa1, 0xf6, 0xb4, 0x5e, 0x26,

proxy/shadowsocks/config.pb.go

@@ -42,6 +42,7 @@ var CipherType_name = map[int32]string{
 	7: "CHACHA20_POLY1305",
 	8: "NONE",
 }
+
 var CipherType_value = map[string]int32{
 	"UNKNOWN":           0,
 	"AES_128_CFB":       1,
@@ -57,8 +58,9 @@ var CipherType_value = map[string]int32{
 func (x CipherType) String() string {
 	return proto.EnumName(CipherType_name, int32(x))
 }
+
 func (CipherType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_a7d2e93dc7e58d6d, []int{0}
+	return fileDescriptor_8d089a30c2106007, []int{0}
 }
 
 type Account_OneTimeAuth int32
@@ -74,6 +76,7 @@ var Account_OneTimeAuth_name = map[int32]string{
 	1: "Disabled",
 	2: "Enabled",
 }
+
 var Account_OneTimeAuth_value = map[string]int32{
 	"Auto":     0,
 	"Disabled": 1,
@@ -83,8 +86,9 @@ var Account_OneTimeAuth_value = map[string]int32{
 func (x Account_OneTimeAuth) String() string {
 	return proto.EnumName(Account_OneTimeAuth_name, int32(x))
 }
+
 func (Account_OneTimeAuth) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_a7d2e93dc7e58d6d, []int{0, 0}
+	return fileDescriptor_8d089a30c2106007, []int{0, 0}
 }
 
 type Account struct {
@@ -100,7 +104,7 @@ func (m *Account) Reset()         { *m = Account{} }
 func (m *Account) String() string { return proto.CompactTextString(m) }
 func (*Account) ProtoMessage()    {}
 func (*Account) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_a7d2e93dc7e58d6d, []int{0}
+	return fileDescriptor_8d089a30c2106007, []int{0}
 }
 func (m *Account) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Account.Unmarshal(m, b)
@@ -108,8 +112,8 @@ func (m *Account) XXX_Unmarshal(b []byte) error {
 func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Account.Marshal(b, m, deterministic)
 }
-func (dst *Account) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Account.Merge(dst, src)
+func (m *Account) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Account.Merge(m, src)
 }
 func (m *Account) XXX_Size() int {
 	return xxx_messageInfo_Account.Size(m)
@@ -156,7 +160,7 @@ func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
 func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
 func (*ServerConfig) ProtoMessage()    {}
 func (*ServerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_a7d2e93dc7e58d6d, []int{1}
+	return fileDescriptor_8d089a30c2106007, []int{1}
 }
 func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
@@ -164,8 +168,8 @@ func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
 }
-func (dst *ServerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerConfig.Merge(dst, src)
+func (m *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(m, src)
 }
 func (m *ServerConfig) XXX_Size() int {
 	return xxx_messageInfo_ServerConfig.Size(m)
@@ -209,7 +213,7 @@ func (m *ClientConfig) Reset()         { *m = ClientConfig{} }
 func (m *ClientConfig) String() string { return proto.CompactTextString(m) }
 func (*ClientConfig) ProtoMessage()    {}
 func (*ClientConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_a7d2e93dc7e58d6d, []int{2}
+	return fileDescriptor_8d089a30c2106007, []int{2}
 }
 func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClientConfig.Unmarshal(m, b)
@@ -217,8 +221,8 @@ func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
 func (m *ClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClientConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClientConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientConfig.Merge(dst, src)
+func (m *ClientConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientConfig.Merge(m, src)
 }
 func (m *ClientConfig) XXX_Size() int {
 	return xxx_messageInfo_ClientConfig.Size(m)
@@ -245,10 +249,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/shadowsocks/config.proto", fileDescriptor_config_a7d2e93dc7e58d6d)
+	proto.RegisterFile("v2ray.com/core/proxy/shadowsocks/config.proto", fileDescriptor_8d089a30c2106007)
 }
 
-var fileDescriptor_config_a7d2e93dc7e58d6d = []byte{
+var fileDescriptor_8d089a30c2106007 = []byte{
 	// 522 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6e, 0xd3, 0x4e,
 	0x10, 0xc6, 0xbb, 0x71, 0xff, 0x4d, 0xfe, 0xe3, 0x50, 0xdc, 0x95, 0x90, 0xac, 0xa8, 0x42, 0x56,

proxy/socks/config.pb.go

@@ -28,6 +28,7 @@ var AuthType_name = map[int32]string{
 	0: "NO_AUTH",
 	1: "PASSWORD",
 }
+
 var AuthType_value = map[string]int32{
 	"NO_AUTH":  0,
 	"PASSWORD": 1,
@@ -36,8 +37,9 @@ var AuthType_value = map[string]int32{
 func (x AuthType) String() string {
 	return proto.EnumName(AuthType_name, int32(x))
 }
+
 func (AuthType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_5b5632820a3cc171, []int{0}
+	return fileDescriptor_e86958e2cebd3303, []int{0}
 }
 
 type Account struct {
@@ -52,7 +54,7 @@ func (m *Account) Reset()         { *m = Account{} }
 func (m *Account) String() string { return proto.CompactTextString(m) }
 func (*Account) ProtoMessage()    {}
 func (*Account) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_5b5632820a3cc171, []int{0}
+	return fileDescriptor_e86958e2cebd3303, []int{0}
 }
 func (m *Account) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Account.Unmarshal(m, b)
@@ -60,8 +62,8 @@ func (m *Account) XXX_Unmarshal(b []byte) error {
 func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Account.Marshal(b, m, deterministic)
 }
-func (dst *Account) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Account.Merge(dst, src)
+func (m *Account) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Account.Merge(m, src)
 }
 func (m *Account) XXX_Size() int {
 	return xxx_messageInfo_Account.Size(m)
@@ -102,7 +104,7 @@ func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
 func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
 func (*ServerConfig) ProtoMessage()    {}
 func (*ServerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_5b5632820a3cc171, []int{1}
+	return fileDescriptor_e86958e2cebd3303, []int{1}
 }
 func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
@@ -110,8 +112,8 @@ func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
 }
-func (dst *ServerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerConfig.Merge(dst, src)
+func (m *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(m, src)
 }
 func (m *ServerConfig) XXX_Size() int {
 	return xxx_messageInfo_ServerConfig.Size(m)
@@ -176,7 +178,7 @@ func (m *ClientConfig) Reset()         { *m = ClientConfig{} }
 func (m *ClientConfig) String() string { return proto.CompactTextString(m) }
 func (*ClientConfig) ProtoMessage()    {}
 func (*ClientConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_5b5632820a3cc171, []int{2}
+	return fileDescriptor_e86958e2cebd3303, []int{2}
 }
 func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClientConfig.Unmarshal(m, b)
@@ -184,8 +186,8 @@ func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
 func (m *ClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClientConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClientConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientConfig.Merge(dst, src)
+func (m *ClientConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientConfig.Merge(m, src)
 }
 func (m *ClientConfig) XXX_Size() int {
 	return xxx_messageInfo_ClientConfig.Size(m)
@@ -212,10 +214,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/socks/config.proto", fileDescriptor_config_5b5632820a3cc171)
+	proto.RegisterFile("v2ray.com/core/proxy/socks/config.proto", fileDescriptor_e86958e2cebd3303)
 }
 
-var fileDescriptor_config_5b5632820a3cc171 = []byte{
+var fileDescriptor_e86958e2cebd3303 = []byte{
 	// 470 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x5d, 0x8b, 0xd3, 0x40,
 	0x14, 0x75, 0xb2, 0xb6, 0x4d, 0x6f, 0xbb, 0x52, 0x06, 0x59, 0x42, 0x51, 0x8c, 0x05, 0xb1, 0xec,

proxy/vmess/account.pb.go

@@ -32,7 +32,7 @@ func (m *Account) Reset()         { *m = Account{} }
 func (m *Account) String() string { return proto.CompactTextString(m) }
 func (*Account) ProtoMessage()    {}
 func (*Account) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_6d7e6db8cd7c96ca, []int{0}
+	return fileDescriptor_d65dee31e5abbda0, []int{0}
 }
 func (m *Account) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Account.Unmarshal(m, b)
@@ -40,8 +40,8 @@ func (m *Account) XXX_Unmarshal(b []byte) error {
 func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Account.Marshal(b, m, deterministic)
 }
-func (dst *Account) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Account.Merge(dst, src)
+func (m *Account) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Account.Merge(m, src)
 }
 func (m *Account) XXX_Size() int {
 	return xxx_messageInfo_Account.Size(m)
@@ -78,10 +78,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/vmess/account.proto", fileDescriptor_account_6d7e6db8cd7c96ca)
+	proto.RegisterFile("v2ray.com/core/proxy/vmess/account.proto", fileDescriptor_d65dee31e5abbda0)
 }
 
-var fileDescriptor_account_6d7e6db8cd7c96ca = []byte{
+var fileDescriptor_d65dee31e5abbda0 = []byte{
 	// 244 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0xc1, 0x4a, 0x03, 0x31,
 	0x10, 0x86, 0xc9, 0x8a, 0x56, 0x23, 0x8a, 0xee, 0xa1, 0xac, 0x3d, 0x2d, 0x9e, 0x16, 0x91, 0x09,

proxy/vmess/inbound/config.pb.go

@@ -27,7 +27,7 @@ func (m *DetourConfig) Reset()         { *m = DetourConfig{} }
 func (m *DetourConfig) String() string { return proto.CompactTextString(m) }
 func (*DetourConfig) ProtoMessage()    {}
 func (*DetourConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_2ca0b8d34269ede7, []int{0}
+	return fileDescriptor_a47d4a41f33382d2, []int{0}
 }
 func (m *DetourConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetourConfig.Unmarshal(m, b)
@@ -35,8 +35,8 @@ func (m *DetourConfig) XXX_Unmarshal(b []byte) error {
 func (m *DetourConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetourConfig.Marshal(b, m, deterministic)
 }
-func (dst *DetourConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetourConfig.Merge(dst, src)
+func (m *DetourConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetourConfig.Merge(m, src)
 }
 func (m *DetourConfig) XXX_Size() int {
 	return xxx_messageInfo_DetourConfig.Size(m)
@@ -66,7 +66,7 @@ func (m *DefaultConfig) Reset()         { *m = DefaultConfig{} }
 func (m *DefaultConfig) String() string { return proto.CompactTextString(m) }
 func (*DefaultConfig) ProtoMessage()    {}
 func (*DefaultConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_2ca0b8d34269ede7, []int{1}
+	return fileDescriptor_a47d4a41f33382d2, []int{1}
 }
 func (m *DefaultConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DefaultConfig.Unmarshal(m, b)
@@ -74,8 +74,8 @@ func (m *DefaultConfig) XXX_Unmarshal(b []byte) error {
 func (m *DefaultConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DefaultConfig.Marshal(b, m, deterministic)
 }
-func (dst *DefaultConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DefaultConfig.Merge(dst, src)
+func (m *DefaultConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DefaultConfig.Merge(m, src)
 }
 func (m *DefaultConfig) XXX_Size() int {
 	return xxx_messageInfo_DefaultConfig.Size(m)
@@ -114,7 +114,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_2ca0b8d34269ede7, []int{2}
+	return fileDescriptor_a47d4a41f33382d2, []int{2}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -122,8 +122,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -169,10 +169,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/vmess/inbound/config.proto", fileDescriptor_config_2ca0b8d34269ede7)
+	proto.RegisterFile("v2ray.com/core/proxy/vmess/inbound/config.proto", fileDescriptor_a47d4a41f33382d2)
 }
 
-var fileDescriptor_config_2ca0b8d34269ede7 = []byte{
+var fileDescriptor_a47d4a41f33382d2 = []byte{
 	// 333 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x4f, 0xf2, 0x40,
 	0x10, 0xc6, 0xd3, 0xc2, 0x0b, 0xbc, 0x8b, 0x78, 0x68, 0x88, 0xa9, 0x1e, 0x48, 0xd3, 0x13, 0x26,

proxy/vmess/outbound/config.pb.go

@@ -27,7 +27,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_0177b8110f292a35, []int{0}
+	return fileDescriptor_bc22c8b653a4f7ef, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -35,8 +35,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -59,10 +59,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/proxy/vmess/outbound/config.proto", fileDescriptor_config_0177b8110f292a35)
+	proto.RegisterFile("v2ray.com/core/proxy/vmess/outbound/config.proto", fileDescriptor_bc22c8b653a4f7ef)
 }
 
-var fileDescriptor_config_0177b8110f292a35 = []byte{
+var fileDescriptor_bc22c8b653a4f7ef = []byte{
 	// 208 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8e, 0xb1, 0x4a, 0xc4, 0x40,
 	0x10, 0x86, 0x39, 0x85, 0xe3, 0x58, 0xbb, 0xab, 0xc4, 0xe6, 0x44, 0x1b, 0xb1, 0x98, 0x95, 0xf8,

transport/config.pb.go

@@ -28,7 +28,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_2753d6ea37797c2b, []int{0}
+	return fileDescriptor_e34c3c5557a3c999, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -36,8 +36,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -60,10 +60,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/config.proto", fileDescriptor_config_2753d6ea37797c2b)
+	proto.RegisterFile("v2ray.com/core/transport/config.proto", fileDescriptor_e34c3c5557a3c999)
 }
 
-var fileDescriptor_config_2753d6ea37797c2b = []byte{
+var fileDescriptor_e34c3c5557a3c999 = []byte{
 	// 170 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2d, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,

transport/internet/domainsocket/config.pb.go

@@ -30,7 +30,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_f3159b9c61268147, []int{0}
+	return fileDescriptor_76473d52e3e3815d, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -38,8 +38,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -69,10 +69,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/domainsocket/config.proto", fileDescriptor_config_f3159b9c61268147)
+	proto.RegisterFile("v2ray.com/core/transport/internet/domainsocket/config.proto", fileDescriptor_76473d52e3e3815d)
 }
 
-var fileDescriptor_config_f3159b9c61268147 = []byte{
+var fileDescriptor_76473d52e3e3815d = []byte{
 	// 189 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x2e, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,

transport/internet/headers/http/config.pb.go

@@ -29,7 +29,7 @@ func (m *Header) Reset()         { *m = Header{} }
 func (m *Header) String() string { return proto.CompactTextString(m) }
 func (*Header) ProtoMessage()    {}
 func (*Header) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_110a2a8126ce35fd, []int{0}
+	return fileDescriptor_e2685d0b4b039e80, []int{0}
 }
 func (m *Header) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Header.Unmarshal(m, b)
@@ -37,8 +37,8 @@ func (m *Header) XXX_Unmarshal(b []byte) error {
 func (m *Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Header.Marshal(b, m, deterministic)
 }
-func (dst *Header) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Header.Merge(dst, src)
+func (m *Header) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Header.Merge(m, src)
 }
 func (m *Header) XXX_Size() int {
 	return xxx_messageInfo_Header.Size(m)
@@ -75,7 +75,7 @@ func (m *Version) Reset()         { *m = Version{} }
 func (m *Version) String() string { return proto.CompactTextString(m) }
 func (*Version) ProtoMessage()    {}
 func (*Version) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_110a2a8126ce35fd, []int{1}
+	return fileDescriptor_e2685d0b4b039e80, []int{1}
 }
 func (m *Version) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Version.Unmarshal(m, b)
@@ -83,8 +83,8 @@ func (m *Version) XXX_Unmarshal(b []byte) error {
 func (m *Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Version.Marshal(b, m, deterministic)
 }
-func (dst *Version) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Version.Merge(dst, src)
+func (m *Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Version.Merge(m, src)
 }
 func (m *Version) XXX_Size() int {
 	return xxx_messageInfo_Version.Size(m)
@@ -114,7 +114,7 @@ func (m *Method) Reset()         { *m = Method{} }
 func (m *Method) String() string { return proto.CompactTextString(m) }
 func (*Method) ProtoMessage()    {}
 func (*Method) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_110a2a8126ce35fd, []int{2}
+	return fileDescriptor_e2685d0b4b039e80, []int{2}
 }
 func (m *Method) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Method.Unmarshal(m, b)
@@ -122,8 +122,8 @@ func (m *Method) XXX_Unmarshal(b []byte) error {
 func (m *Method) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Method.Marshal(b, m, deterministic)
 }
-func (dst *Method) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Method.Merge(dst, src)
+func (m *Method) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Method.Merge(m, src)
 }
 func (m *Method) XXX_Size() int {
 	return xxx_messageInfo_Method.Size(m)
@@ -158,7 +158,7 @@ func (m *RequestConfig) Reset()         { *m = RequestConfig{} }
 func (m *RequestConfig) String() string { return proto.CompactTextString(m) }
 func (*RequestConfig) ProtoMessage()    {}
 func (*RequestConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_110a2a8126ce35fd, []int{3}
+	return fileDescriptor_e2685d0b4b039e80, []int{3}
 }
 func (m *RequestConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestConfig.Unmarshal(m, b)
@@ -166,8 +166,8 @@ func (m *RequestConfig) XXX_Unmarshal(b []byte) error {
 func (m *RequestConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestConfig.Marshal(b, m, deterministic)
 }
-func (dst *RequestConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestConfig.Merge(dst, src)
+func (m *RequestConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestConfig.Merge(m, src)
 }
 func (m *RequestConfig) XXX_Size() int {
 	return xxx_messageInfo_RequestConfig.Size(m)
@@ -220,7 +220,7 @@ func (m *Status) Reset()         { *m = Status{} }
 func (m *Status) String() string { return proto.CompactTextString(m) }
 func (*Status) ProtoMessage()    {}
 func (*Status) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_110a2a8126ce35fd, []int{4}
+	return fileDescriptor_e2685d0b4b039e80, []int{4}
 }
 func (m *Status) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Status.Unmarshal(m, b)
@@ -228,8 +228,8 @@ func (m *Status) XXX_Unmarshal(b []byte) error {
 func (m *Status) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Status.Marshal(b, m, deterministic)
 }
-func (dst *Status) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Status.Merge(dst, src)
+func (m *Status) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Status.Merge(m, src)
 }
 func (m *Status) XXX_Size() int {
 	return xxx_messageInfo_Status.Size(m)
@@ -267,7 +267,7 @@ func (m *ResponseConfig) Reset()         { *m = ResponseConfig{} }
 func (m *ResponseConfig) String() string { return proto.CompactTextString(m) }
 func (*ResponseConfig) ProtoMessage()    {}
 func (*ResponseConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_110a2a8126ce35fd, []int{5}
+	return fileDescriptor_e2685d0b4b039e80, []int{5}
 }
 func (m *ResponseConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResponseConfig.Unmarshal(m, b)
@@ -275,8 +275,8 @@ func (m *ResponseConfig) XXX_Unmarshal(b []byte) error {
 func (m *ResponseConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResponseConfig.Marshal(b, m, deterministic)
 }
-func (dst *ResponseConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResponseConfig.Merge(dst, src)
+func (m *ResponseConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResponseConfig.Merge(m, src)
 }
 func (m *ResponseConfig) XXX_Size() int {
 	return xxx_messageInfo_ResponseConfig.Size(m)
@@ -322,7 +322,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_110a2a8126ce35fd, []int{6}
+	return fileDescriptor_e2685d0b4b039e80, []int{6}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -330,8 +330,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -367,10 +367,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/headers/http/config.proto", fileDescriptor_config_110a2a8126ce35fd)
+	proto.RegisterFile("v2ray.com/core/transport/internet/headers/http/config.proto", fileDescriptor_e2685d0b4b039e80)
 }
 
-var fileDescriptor_config_110a2a8126ce35fd = []byte{
+var fileDescriptor_e2685d0b4b039e80 = []byte{
 	// 394 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xbf, 0x8a, 0xdb, 0x40,
 	0x10, 0xc6, 0x91, 0xe4, 0xc8, 0xf1, 0x84, 0x84, 0xb0, 0x84, 0xa0, 0x2a, 0x31, 0xaa, 0x8c, 0x8b,

transport/internet/headers/noop/config.pb.go

@@ -25,7 +25,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_be1f5995116b489b, []int{0}
+	return fileDescriptor_b4a070eec05ae9a3, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -33,8 +33,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -55,7 +55,7 @@ func (m *ConnectionConfig) Reset()         { *m = ConnectionConfig{} }
 func (m *ConnectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ConnectionConfig) ProtoMessage()    {}
 func (*ConnectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_be1f5995116b489b, []int{1}
+	return fileDescriptor_b4a070eec05ae9a3, []int{1}
 }
 func (m *ConnectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConnectionConfig.Unmarshal(m, b)
@@ -63,8 +63,8 @@ func (m *ConnectionConfig) XXX_Unmarshal(b []byte) error {
 func (m *ConnectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConnectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ConnectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConnectionConfig.Merge(dst, src)
+func (m *ConnectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConnectionConfig.Merge(m, src)
 }
 func (m *ConnectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ConnectionConfig.Size(m)
@@ -81,10 +81,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/headers/noop/config.proto", fileDescriptor_config_be1f5995116b489b)
+	proto.RegisterFile("v2ray.com/core/transport/internet/headers/noop/config.proto", fileDescriptor_b4a070eec05ae9a3)
 }
 
-var fileDescriptor_config_be1f5995116b489b = []byte{
+var fileDescriptor_b4a070eec05ae9a3 = []byte{
 	// 170 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xce, 0xb1, 0xaa, 0xc2, 0x40,
 	0x10, 0x85, 0x61, 0xee, 0x45, 0x82, 0x6c, 0x25, 0x79, 0x84, 0x94, 0x29, 0x66, 0x21, 0x96, 0x76,

transport/internet/headers/srtp/config.pb.go

@@ -31,7 +31,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_0f831e3f54b6bef6, []int{0}
+	return fileDescriptor_0aa82c2c1e59b567, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -39,8 +39,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -98,10 +98,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/headers/srtp/config.proto", fileDescriptor_config_0f831e3f54b6bef6)
+	proto.RegisterFile("v2ray.com/core/transport/internet/headers/srtp/config.proto", fileDescriptor_0aa82c2c1e59b567)
 }
 
-var fileDescriptor_config_0f831e3f54b6bef6 = []byte{
+var fileDescriptor_0aa82c2c1e59b567 = []byte{
 	// 260 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xd0, 0x31, 0x4b, 0x03, 0x31,
 	0x14, 0x07, 0x70, 0xae, 0xd6, 0xd3, 0x46, 0x5d, 0x32, 0x48, 0x06, 0x85, 0xea, 0x54, 0x3a, 0x24,

transport/internet/headers/tls/config.pb.go

@@ -25,7 +25,7 @@ func (m *PacketConfig) Reset()         { *m = PacketConfig{} }
 func (m *PacketConfig) String() string { return proto.CompactTextString(m) }
 func (*PacketConfig) ProtoMessage()    {}
 func (*PacketConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_5113112ed8e87cff, []int{0}
+	return fileDescriptor_e55187b75c46dc0d, []int{0}
 }
 func (m *PacketConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PacketConfig.Unmarshal(m, b)
@@ -33,8 +33,8 @@ func (m *PacketConfig) XXX_Unmarshal(b []byte) error {
 func (m *PacketConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PacketConfig.Marshal(b, m, deterministic)
 }
-func (dst *PacketConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PacketConfig.Merge(dst, src)
+func (m *PacketConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PacketConfig.Merge(m, src)
 }
 func (m *PacketConfig) XXX_Size() int {
 	return xxx_messageInfo_PacketConfig.Size(m)
@@ -50,10 +50,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/headers/tls/config.proto", fileDescriptor_config_5113112ed8e87cff)
+	proto.RegisterFile("v2ray.com/core/transport/internet/headers/tls/config.proto", fileDescriptor_e55187b75c46dc0d)
 }
 
-var fileDescriptor_config_5113112ed8e87cff = []byte{
+var fileDescriptor_e55187b75c46dc0d = []byte{
 	// 163 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x2a, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,

transport/internet/headers/utp/config.pb.go

@@ -26,7 +26,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_0b0541a345ede0d8, []int{0}
+	return fileDescriptor_326a99ff25d90470, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -34,8 +34,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -58,10 +58,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/headers/utp/config.proto", fileDescriptor_config_0b0541a345ede0d8)
+	proto.RegisterFile("v2ray.com/core/transport/internet/headers/utp/config.proto", fileDescriptor_326a99ff25d90470)
 }
 
-var fileDescriptor_config_0b0541a345ede0d8 = []byte{
+var fileDescriptor_326a99ff25d90470 = []byte{
 	// 177 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x2a, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,

transport/internet/headers/wechat/config.pb.go

@@ -25,7 +25,7 @@ func (m *VideoConfig) Reset()         { *m = VideoConfig{} }
 func (m *VideoConfig) String() string { return proto.CompactTextString(m) }
 func (*VideoConfig) ProtoMessage()    {}
 func (*VideoConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_177a655b45ccb349, []int{0}
+	return fileDescriptor_0ad582a12d5e4846, []int{0}
 }
 func (m *VideoConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoConfig.Unmarshal(m, b)
@@ -33,8 +33,8 @@ func (m *VideoConfig) XXX_Unmarshal(b []byte) error {
 func (m *VideoConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoConfig.Marshal(b, m, deterministic)
 }
-func (dst *VideoConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoConfig.Merge(dst, src)
+func (m *VideoConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoConfig.Merge(m, src)
 }
 func (m *VideoConfig) XXX_Size() int {
 	return xxx_messageInfo_VideoConfig.Size(m)
@@ -50,10 +50,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/headers/wechat/config.proto", fileDescriptor_config_177a655b45ccb349)
+	proto.RegisterFile("v2ray.com/core/transport/internet/headers/wechat/config.proto", fileDescriptor_0ad582a12d5e4846)
 }
 
-var fileDescriptor_config_177a655b45ccb349 = []byte{
+var fileDescriptor_0ad582a12d5e4846 = []byte{
 	// 163 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x2d, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,

transport/internet/headers/wireguard/config.pb.go

@@ -25,7 +25,7 @@ func (m *WireguardConfig) Reset()         { *m = WireguardConfig{} }
 func (m *WireguardConfig) String() string { return proto.CompactTextString(m) }
 func (*WireguardConfig) ProtoMessage()    {}
 func (*WireguardConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_20d981d9a887b445, []int{0}
+	return fileDescriptor_a4c21f616af3c531, []int{0}
 }
 func (m *WireguardConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WireguardConfig.Unmarshal(m, b)
@@ -33,8 +33,8 @@ func (m *WireguardConfig) XXX_Unmarshal(b []byte) error {
 func (m *WireguardConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WireguardConfig.Marshal(b, m, deterministic)
 }
-func (dst *WireguardConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WireguardConfig.Merge(dst, src)
+func (m *WireguardConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WireguardConfig.Merge(m, src)
 }
 func (m *WireguardConfig) XXX_Size() int {
 	return xxx_messageInfo_WireguardConfig.Size(m)
@@ -50,10 +50,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/headers/wireguard/config.proto", fileDescriptor_config_20d981d9a887b445)
+	proto.RegisterFile("v2ray.com/core/transport/internet/headers/wireguard/config.proto", fileDescriptor_a4c21f616af3c531)
 }
 
-var fileDescriptor_config_20d981d9a887b445 = []byte{
+var fileDescriptor_a4c21f616af3c531 = []byte{
 	// 163 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x28, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,

transport/internet/http/config.pb.go

@@ -27,7 +27,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_a3f3281ad645fba7, []int{0}
+	return fileDescriptor_18c29e00ea34cfae, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -35,8 +35,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -66,10 +66,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/http/config.proto", fileDescriptor_config_a3f3281ad645fba7)
+	proto.RegisterFile("v2ray.com/core/transport/internet/http/config.proto", fileDescriptor_18c29e00ea34cfae)
 }
 
-var fileDescriptor_config_a3f3281ad645fba7 = []byte{
+var fileDescriptor_18c29e00ea34cfae = []byte{
 	// 173 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x2e, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,

transport/internet/kcp/config.pb.go

@@ -28,7 +28,7 @@ func (m *MTU) Reset()         { *m = MTU{} }
 func (m *MTU) String() string { return proto.CompactTextString(m) }
 func (*MTU) ProtoMessage()    {}
 func (*MTU) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4bc2f043099e7e59, []int{0}
+	return fileDescriptor_3746d5d763e81577, []int{0}
 }
 func (m *MTU) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MTU.Unmarshal(m, b)
@@ -36,8 +36,8 @@ func (m *MTU) XXX_Unmarshal(b []byte) error {
 func (m *MTU) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MTU.Marshal(b, m, deterministic)
 }
-func (dst *MTU) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MTU.Merge(dst, src)
+func (m *MTU) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MTU.Merge(m, src)
 }
 func (m *MTU) XXX_Size() int {
 	return xxx_messageInfo_MTU.Size(m)
@@ -67,7 +67,7 @@ func (m *TTI) Reset()         { *m = TTI{} }
 func (m *TTI) String() string { return proto.CompactTextString(m) }
 func (*TTI) ProtoMessage()    {}
 func (*TTI) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4bc2f043099e7e59, []int{1}
+	return fileDescriptor_3746d5d763e81577, []int{1}
 }
 func (m *TTI) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TTI.Unmarshal(m, b)
@@ -75,8 +75,8 @@ func (m *TTI) XXX_Unmarshal(b []byte) error {
 func (m *TTI) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TTI.Marshal(b, m, deterministic)
 }
-func (dst *TTI) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TTI.Merge(dst, src)
+func (m *TTI) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TTI.Merge(m, src)
 }
 func (m *TTI) XXX_Size() int {
 	return xxx_messageInfo_TTI.Size(m)
@@ -106,7 +106,7 @@ func (m *UplinkCapacity) Reset()         { *m = UplinkCapacity{} }
 func (m *UplinkCapacity) String() string { return proto.CompactTextString(m) }
 func (*UplinkCapacity) ProtoMessage()    {}
 func (*UplinkCapacity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4bc2f043099e7e59, []int{2}
+	return fileDescriptor_3746d5d763e81577, []int{2}
 }
 func (m *UplinkCapacity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UplinkCapacity.Unmarshal(m, b)
@@ -114,8 +114,8 @@ func (m *UplinkCapacity) XXX_Unmarshal(b []byte) error {
 func (m *UplinkCapacity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UplinkCapacity.Marshal(b, m, deterministic)
 }
-func (dst *UplinkCapacity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UplinkCapacity.Merge(dst, src)
+func (m *UplinkCapacity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UplinkCapacity.Merge(m, src)
 }
 func (m *UplinkCapacity) XXX_Size() int {
 	return xxx_messageInfo_UplinkCapacity.Size(m)
@@ -145,7 +145,7 @@ func (m *DownlinkCapacity) Reset()         { *m = DownlinkCapacity{} }
 func (m *DownlinkCapacity) String() string { return proto.CompactTextString(m) }
 func (*DownlinkCapacity) ProtoMessage()    {}
 func (*DownlinkCapacity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4bc2f043099e7e59, []int{3}
+	return fileDescriptor_3746d5d763e81577, []int{3}
 }
 func (m *DownlinkCapacity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DownlinkCapacity.Unmarshal(m, b)
@@ -153,8 +153,8 @@ func (m *DownlinkCapacity) XXX_Unmarshal(b []byte) error {
 func (m *DownlinkCapacity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DownlinkCapacity.Marshal(b, m, deterministic)
 }
-func (dst *DownlinkCapacity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DownlinkCapacity.Merge(dst, src)
+func (m *DownlinkCapacity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DownlinkCapacity.Merge(m, src)
 }
 func (m *DownlinkCapacity) XXX_Size() int {
 	return xxx_messageInfo_DownlinkCapacity.Size(m)
@@ -184,7 +184,7 @@ func (m *WriteBuffer) Reset()         { *m = WriteBuffer{} }
 func (m *WriteBuffer) String() string { return proto.CompactTextString(m) }
 func (*WriteBuffer) ProtoMessage()    {}
 func (*WriteBuffer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4bc2f043099e7e59, []int{4}
+	return fileDescriptor_3746d5d763e81577, []int{4}
 }
 func (m *WriteBuffer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteBuffer.Unmarshal(m, b)
@@ -192,8 +192,8 @@ func (m *WriteBuffer) XXX_Unmarshal(b []byte) error {
 func (m *WriteBuffer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteBuffer.Marshal(b, m, deterministic)
 }
-func (dst *WriteBuffer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteBuffer.Merge(dst, src)
+func (m *WriteBuffer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteBuffer.Merge(m, src)
 }
 func (m *WriteBuffer) XXX_Size() int {
 	return xxx_messageInfo_WriteBuffer.Size(m)
@@ -223,7 +223,7 @@ func (m *ReadBuffer) Reset()         { *m = ReadBuffer{} }
 func (m *ReadBuffer) String() string { return proto.CompactTextString(m) }
 func (*ReadBuffer) ProtoMessage()    {}
 func (*ReadBuffer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4bc2f043099e7e59, []int{5}
+	return fileDescriptor_3746d5d763e81577, []int{5}
 }
 func (m *ReadBuffer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadBuffer.Unmarshal(m, b)
@@ -231,8 +231,8 @@ func (m *ReadBuffer) XXX_Unmarshal(b []byte) error {
 func (m *ReadBuffer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadBuffer.Marshal(b, m, deterministic)
 }
-func (dst *ReadBuffer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadBuffer.Merge(dst, src)
+func (m *ReadBuffer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadBuffer.Merge(m, src)
 }
 func (m *ReadBuffer) XXX_Size() int {
 	return xxx_messageInfo_ReadBuffer.Size(m)
@@ -261,7 +261,7 @@ func (m *ConnectionReuse) Reset()         { *m = ConnectionReuse{} }
 func (m *ConnectionReuse) String() string { return proto.CompactTextString(m) }
 func (*ConnectionReuse) ProtoMessage()    {}
 func (*ConnectionReuse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4bc2f043099e7e59, []int{6}
+	return fileDescriptor_3746d5d763e81577, []int{6}
 }
 func (m *ConnectionReuse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConnectionReuse.Unmarshal(m, b)
@@ -269,8 +269,8 @@ func (m *ConnectionReuse) XXX_Unmarshal(b []byte) error {
 func (m *ConnectionReuse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConnectionReuse.Marshal(b, m, deterministic)
 }
-func (dst *ConnectionReuse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConnectionReuse.Merge(dst, src)
+func (m *ConnectionReuse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConnectionReuse.Merge(m, src)
 }
 func (m *ConnectionReuse) XXX_Size() int {
 	return xxx_messageInfo_ConnectionReuse.Size(m)
@@ -306,7 +306,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_4bc2f043099e7e59, []int{7}
+	return fileDescriptor_3746d5d763e81577, []int{7}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -314,8 +314,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -394,10 +394,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/kcp/config.proto", fileDescriptor_config_4bc2f043099e7e59)
+	proto.RegisterFile("v2ray.com/core/transport/internet/kcp/config.proto", fileDescriptor_3746d5d763e81577)
 }
 
-var fileDescriptor_config_4bc2f043099e7e59 = []byte{
+var fileDescriptor_3746d5d763e81577 = []byte{
 	// 471 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x5f, 0x6f, 0xd3, 0x3e,
 	0x14, 0x55, 0xd7, 0xae, 0xbf, 0xfe, 0x6e, 0xf7, 0xa7, 0x44, 0x08, 0x45, 0x20, 0xa1, 0xb5, 0x12,

transport/internet/tcp/config.pb.go

@@ -27,7 +27,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_e1d94b8e28411b13, []int{0}
+	return fileDescriptor_eb6d289fc61edd40, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -35,8 +35,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -59,10 +59,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/tcp/config.proto", fileDescriptor_config_e1d94b8e28411b13)
+	proto.RegisterFile("v2ray.com/core/transport/internet/tcp/config.proto", fileDescriptor_eb6d289fc61edd40)
 }
 
-var fileDescriptor_config_e1d94b8e28411b13 = []byte{
+var fileDescriptor_eb6d289fc61edd40 = []byte{
 	// 223 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8e, 0xc1, 0x4a, 0xc4, 0x30,
 	0x10, 0x86, 0x69, 0x95, 0x45, 0x2a, 0xa8, 0xec, 0x49, 0x3c, 0xb9, 0x82, 0xe2, 0x69, 0x22, 0xf1,

transport/internet/tls/config.pb.go

@@ -28,6 +28,7 @@ var Certificate_Usage_name = map[int32]string{
 	1: "AUTHORITY_VERIFY",
 	2: "AUTHORITY_ISSUE",
 }
+
 var Certificate_Usage_value = map[string]int32{
 	"ENCIPHERMENT":     0,
 	"AUTHORITY_VERIFY": 1,
@@ -37,8 +38,9 @@ var Certificate_Usage_value = map[string]int32{
 func (x Certificate_Usage) String() string {
 	return proto.EnumName(Certificate_Usage_name, int32(x))
 }
+
 func (Certificate_Usage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_a8a3761a78452100, []int{0, 0}
+	return fileDescriptor_42ed70cad60a2736, []int{0, 0}
 }
 
 type Certificate struct {
@@ -56,7 +58,7 @@ func (m *Certificate) Reset()         { *m = Certificate{} }
 func (m *Certificate) String() string { return proto.CompactTextString(m) }
 func (*Certificate) ProtoMessage()    {}
 func (*Certificate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_a8a3761a78452100, []int{0}
+	return fileDescriptor_42ed70cad60a2736, []int{0}
 }
 func (m *Certificate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Certificate.Unmarshal(m, b)
@@ -64,8 +66,8 @@ func (m *Certificate) XXX_Unmarshal(b []byte) error {
 func (m *Certificate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Certificate.Marshal(b, m, deterministic)
 }
-func (dst *Certificate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Certificate.Merge(dst, src)
+func (m *Certificate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Certificate.Merge(m, src)
 }
 func (m *Certificate) XXX_Size() int {
 	return xxx_messageInfo_Certificate.Size(m)
@@ -119,7 +121,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_a8a3761a78452100, []int{1}
+	return fileDescriptor_42ed70cad60a2736, []int{1}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -127,8 +129,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -188,10 +190,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/tls/config.proto", fileDescriptor_config_a8a3761a78452100)
+	proto.RegisterFile("v2ray.com/core/transport/internet/tls/config.proto", fileDescriptor_42ed70cad60a2736)
 }
 
-var fileDescriptor_config_a8a3761a78452100 = []byte{
+var fileDescriptor_42ed70cad60a2736 = []byte{
 	// 413 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xd1, 0x6e, 0xd3, 0x30,
 	0x14, 0x86, 0x49, 0x42, 0x2b, 0x76, 0xda, 0x8d, 0xc8, 0x4c, 0x28, 0xe2, 0x86, 0xac, 0x68, 0x52,

transport/internet/websocket/config.pb.go

@@ -27,7 +27,7 @@ func (m *Header) Reset()         { *m = Header{} }
 func (m *Header) String() string { return proto.CompactTextString(m) }
 func (*Header) ProtoMessage()    {}
 func (*Header) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_6884fbb2ab14733a, []int{0}
+	return fileDescriptor_c4869c9c0fc9b72f, []int{0}
 }
 func (m *Header) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Header.Unmarshal(m, b)
@@ -35,8 +35,8 @@ func (m *Header) XXX_Unmarshal(b []byte) error {
 func (m *Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Header.Marshal(b, m, deterministic)
 }
-func (dst *Header) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Header.Merge(dst, src)
+func (m *Header) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Header.Merge(m, src)
 }
 func (m *Header) XXX_Size() int {
 	return xxx_messageInfo_Header.Size(m)
@@ -74,7 +74,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_6884fbb2ab14733a, []int{1}
+	return fileDescriptor_c4869c9c0fc9b72f, []int{1}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Config.Unmarshal(m, b)
@@ -82,8 +82,8 @@ func (m *Config) XXX_Unmarshal(b []byte) error {
 func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
 }
-func (dst *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(dst, src)
+func (m *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(m, src)
 }
 func (m *Config) XXX_Size() int {
 	return xxx_messageInfo_Config.Size(m)
@@ -114,10 +114,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("v2ray.com/core/transport/internet/websocket/config.proto", fileDescriptor_config_6884fbb2ab14733a)
+	proto.RegisterFile("v2ray.com/core/transport/internet/websocket/config.proto", fileDescriptor_c4869c9c0fc9b72f)
 }
 
-var fileDescriptor_config_6884fbb2ab14733a = []byte{
+var fileDescriptor_c4869c9c0fc9b72f = []byte{
 	// 229 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x28, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,