re-generate code

v2fly · May 25, 2018 · 68da956 · 68da956
1 parent 12106cd
commit 68da956
Show file tree

Hide file tree

Showing 72 changed files with 3,484 additions and 944 deletions.
diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go
@@ -3,7 +3,7 @@ package commander
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import v2ray_core_common_serial "v2ray.com/core/common/serial"
+import serial "v2ray.com/core/common/serial"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -21,13 +21,35 @@ type Config struct {
 	// Tag of the outbound handler that handles grpc connections.
 	Tag string `protobuf:"bytes,1,opt,name=tag" json:"tag,omitempty"`
 	// Services that supported by this server. All services must implement Service interface.
-	Service []*v2ray_core_common_serial.TypedMessage `protobuf:"bytes,2,rep,name=service" json:"service,omitempty"`
+	Service              []*serial.TypedMessage `protobuf:"bytes,2,rep,name=service" json:"service,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+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_81dbee9f112d6327, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+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_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
 func (m *Config) GetTag() string {
 	if m != nil {
@@ -36,7 +58,7 @@ func (m *Config) GetTag() string {
 	return ""
 }
 
-func (m *Config) GetService() []*v2ray_core_common_serial.TypedMessage {
+func (m *Config) GetService() []*serial.TypedMessage {
 	if m != nil {
 		return m.Service
 	}
@@ -47,9 +69,11 @@ func init() {
 	proto.RegisterType((*Config)(nil), "v2ray.core.app.commander.Config")
 }
 
-func init() { proto.RegisterFile("v2ray.com/core/app/commander/config.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("v2ray.com/core/app/commander/config.proto", fileDescriptor_config_81dbee9f112d6327)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_config_81dbee9f112d6327 = []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,

diff --git a/app/commander/errors.generated.go b/app/commander/errors.generated.go
@@ -2,4 +2,6 @@ package commander
 
 import "v2ray.com/core/common/errors"
 
-func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "Commander") }
+func newError(values ...interface{}) *errors.Error {
+	return errors.New(values...).Path("App", "Commander")
+}
diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go
@@ -16,21 +16,65 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type SessionConfig struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SessionConfig) Reset()                    { *m = SessionConfig{} }
-func (m *SessionConfig) String() string            { return proto.CompactTextString(m) }
-func (*SessionConfig) ProtoMessage()               {}
-func (*SessionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+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_b04006b660896589, []int{0}
+}
+func (m *SessionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SessionConfig.Unmarshal(m, b)
+}
+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_Size() int {
+	return xxx_messageInfo_SessionConfig.Size(m)
+}
+func (m *SessionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_SessionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SessionConfig proto.InternalMessageInfo
 
 type Config struct {
-	Settings *SessionConfig `protobuf:"bytes,1,opt,name=settings" json:"settings,omitempty"`
+	Settings             *SessionConfig `protobuf:"bytes,1,opt,name=settings" json:"settings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+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_b04006b660896589, []int{1}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+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_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
 func (m *Config) GetSettings() *SessionConfig {
 	if m != nil {
@@ -44,9 +88,11 @@ func init() {
 	proto.RegisterType((*Config)(nil), "v2ray.core.app.dispatcher.Config")
 }
 
-func init() { proto.RegisterFile("v2ray.com/core/app/dispatcher/config.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("v2ray.com/core/app/dispatcher/config.proto", fileDescriptor_config_b04006b660896589)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_config_b04006b660896589 = []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,

diff --git a/app/dispatcher/errors.generated.go b/app/dispatcher/errors.generated.go
@@ -2,4 +2,6 @@ package dispatcher
 
 import "v2ray.com/core/common/errors"
 
-func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "Dispatcher") }
+func newError(values ...interface{}) *errors.Error {
+	return errors.New(values...).Path("App", "Dispatcher")
+}
diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go
@@ -3,8 +3,7 @@ package dns
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import v2ray_core_common_net "v2ray.com/core/common/net"
-import v2ray_core_common_net2 "v2ray.com/core/common/net"
+import net "v2ray.com/core/common/net"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,24 +19,46 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type Config struct {
 	// Nameservers used by this DNS. Only traditional UDP servers are support at the moment.
 	// A special value 'localhost' as a domain address can be set to use DNS on local system.
-	NameServers []*v2ray_core_common_net2.Endpoint `protobuf:"bytes,1,rep,name=NameServers" json:"NameServers,omitempty"`
+	NameServers []*net.Endpoint `protobuf:"bytes,1,rep,name=NameServers" json:"NameServers,omitempty"`
 	// Static hosts. Domain to IP.
-	Hosts map[string]*v2ray_core_common_net.IPOrDomain `protobuf:"bytes,2,rep,name=Hosts" json:"Hosts,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Hosts                map[string]*net.IPOrDomain `protobuf:"bytes,2,rep,name=Hosts" json:"Hosts,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+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_862435acfeec6b70, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+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_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
-func (m *Config) GetNameServers() []*v2ray_core_common_net2.Endpoint {
+func (m *Config) GetNameServers() []*net.Endpoint {
 	if m != nil {
 		return m.NameServers
 	}
 	return nil
 }
 
-func (m *Config) GetHosts() map[string]*v2ray_core_common_net.IPOrDomain {
+func (m *Config) GetHosts() map[string]*net.IPOrDomain {
 	if m != nil {
 		return m.Hosts
 	}
@@ -46,11 +67,14 @@ func (m *Config) GetHosts() map[string]*v2ray_core_common_net.IPOrDomain {
 
 func init() {
 	proto.RegisterType((*Config)(nil), "v2ray.core.app.dns.Config")
+	proto.RegisterMapType((map[string]*net.IPOrDomain)(nil), "v2ray.core.app.dns.Config.HostsEntry")
 }
 
-func init() { proto.RegisterFile("v2ray.com/core/app/dns/config.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("v2ray.com/core/app/dns/config.proto", fileDescriptor_config_862435acfeec6b70)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_config_862435acfeec6b70 = []byte{
 	// 286 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x41, 0x4b, 0x33, 0x31,
 	0x10, 0x86, 0xc9, 0x96, 0x16, 0xbe, 0xf4, 0xf2, 0x91, 0x83, 0x2c, 0xbd, 0x58, 0x15, 0xb1, 0x20,