From af6abfa3e309ffb48e4e1e2f6245ea40ffc38d9c Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Mon, 26 Sep 2016 15:14:39 +0200 Subject: [PATCH] update proto generated code --- app/dns/config.pb.go | 50 +++++------ common/net/address.pb.go | 18 ++-- common/net/destination.pb.go | 27 +++--- common/net/network.pb.go | 27 +++--- common/net/port.pb.go | 23 ++--- common/protocol/server_spec.pb.go | 41 ++++----- common/protocol/user.pb.go | 28 +++--- proxy/blackhole/config.pb.go | 45 +++++----- proxy/dokodemo/config.pb.go | 56 ++++++------ proxy/freedom/config.pb.go | 27 +++--- proxy/http/config.pb.go | 19 ++-- proxy/shadowsocks/config.pb.go | 73 +++++++-------- proxy/socks/config.pb.go | 84 +++++++++--------- proxy/vmess/account.pb.go | 17 ++-- proxy/vmess/inbound/config.pb.go | 54 ++++++------ proxy/vmess/outbound/config.pb.go | 35 ++++---- transport/internet/authenticator.pb.go | 29 +++--- .../internet/authenticators/noop/config.pb.go | 21 ++--- .../internet/authenticators/srtp/config.pb.go | 35 ++++---- .../internet/authenticators/utp/config.pb.go | 25 +++--- transport/internet/kcp/config.pb.go | 88 +++++++++---------- 21 files changed, 418 insertions(+), 404 deletions(-) diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go index 7aa10dd6d..dadc89241 100644 --- a/app/dns/config.pb.go +++ b/app/dns/config.pb.go @@ -16,8 +16,8 @@ package dns import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import com_v2ray_core_common_net "v2ray.com/core/common/net" -import com_v2ray_core_common_net2 "v2ray.com/core/common/net" +import v2ray_core_common_net "v2ray.com/core/common/net" +import v2ray_core_common_net2 "v2ray.com/core/common/net" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -31,8 +31,8 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Config struct { - NameServers []*com_v2ray_core_common_net2.DestinationPB `protobuf:"bytes,1,rep,name=NameServers,json=nameServers" json:"NameServers,omitempty"` - Hosts map[string]*com_v2ray_core_common_net.AddressPB `protobuf:"bytes,2,rep,name=Hosts,json=hosts" json:"Hosts,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + NameServers []*v2ray_core_common_net2.DestinationPB `protobuf:"bytes,1,rep,name=NameServers,json=nameServers" json:"NameServers,omitempty"` + Hosts map[string]*v2ray_core_common_net.AddressPB `protobuf:"bytes,2,rep,name=Hosts,json=hosts" json:"Hosts,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *Config) Reset() { *m = Config{} } @@ -40,14 +40,14 @@ func (m *Config) String() string { return proto.CompactTextString(m) func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } -func (m *Config) GetNameServers() []*com_v2ray_core_common_net2.DestinationPB { +func (m *Config) GetNameServers() []*v2ray_core_common_net2.DestinationPB { if m != nil { return m.NameServers } return nil } -func (m *Config) GetHosts() map[string]*com_v2ray_core_common_net.AddressPB { +func (m *Config) GetHosts() map[string]*v2ray_core_common_net.AddressPB { if m != nil { return m.Hosts } @@ -55,28 +55,28 @@ func (m *Config) GetHosts() map[string]*com_v2ray_core_common_net.AddressPB { } func init() { - proto.RegisterType((*Config)(nil), "com.v2ray.core.app.dns.Config") + proto.RegisterType((*Config)(nil), "v2ray.core.app.dns.Config") } func init() { proto.RegisterFile("v2ray.com/core/app/dns/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 263 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4b, 0xf4, 0x30, - 0x10, 0x86, 0x49, 0x4b, 0x17, 0xbe, 0xf4, 0xf2, 0xd1, 0x83, 0x94, 0x9e, 0x8a, 0x0a, 0x56, 0x84, - 0x09, 0xd4, 0x8b, 0xec, 0x45, 0xac, 0x0a, 0xe2, 0x41, 0x96, 0x7a, 0xf3, 0x20, 0xc4, 0x66, 0xd4, - 0xa2, 0x9d, 0x84, 0x24, 0x16, 0xfa, 0xc3, 0xbd, 0xcb, 0x36, 0x48, 0x61, 0x51, 0x6f, 0x43, 0x78, - 0xde, 0x67, 0x26, 0x2f, 0x3f, 0x18, 0x6b, 0x2b, 0x27, 0xe8, 0xf4, 0x20, 0x3a, 0x6d, 0x51, 0x48, - 0x63, 0x84, 0x22, 0x27, 0x3a, 0x4d, 0xcf, 0xfd, 0x0b, 0x18, 0xab, 0xbd, 0xce, 0xf6, 0x3a, 0x3d, - 0xc0, 0x37, 0x68, 0x11, 0xa4, 0x31, 0xa0, 0xc8, 0x15, 0x47, 0x3b, 0xe1, 0x4e, 0x0f, 0x83, 0x26, - 0x41, 0xe8, 0x85, 0x54, 0xca, 0xa2, 0x73, 0x41, 0x50, 0x9c, 0xfc, 0x0e, 0x2a, 0x74, 0xbe, 0x27, - 0xe9, 0x7b, 0x4d, 0x01, 0xde, 0xff, 0x64, 0x7c, 0x75, 0x39, 0xaf, 0xcf, 0x6e, 0x79, 0x7a, 0x27, - 0x07, 0xbc, 0x47, 0x3b, 0xa2, 0x75, 0x39, 0x2b, 0xe3, 0x2a, 0xad, 0x2b, 0xd8, 0x39, 0x27, 0xd8, - 0x80, 0xd0, 0xc3, 0xd5, 0x62, 0xdb, 0x34, 0x6d, 0x4a, 0x4b, 0x38, 0x3b, 0xe7, 0xc9, 0x8d, 0x76, - 0xde, 0xe5, 0xd1, 0x6c, 0x39, 0x86, 0x9f, 0x3f, 0x05, 0x61, 0x35, 0xcc, 0xec, 0x35, 0x79, 0x3b, - 0xb5, 0xc9, 0xeb, 0x76, 0x2e, 0x1e, 0x39, 0x5f, 0x1e, 0xb3, 0xff, 0x3c, 0x7e, 0xc3, 0x29, 0x67, - 0x25, 0xab, 0xfe, 0xb5, 0xdb, 0x31, 0x5b, 0xf3, 0x64, 0x94, 0xef, 0x1f, 0x98, 0x47, 0x25, 0xab, - 0xd2, 0xfa, 0xf0, 0x8f, 0x33, 0x2f, 0x42, 0x3b, 0x9b, 0xa6, 0x0d, 0x91, 0x75, 0x74, 0xc6, 0x9a, - 0xe4, 0x21, 0x56, 0xe4, 0x9e, 0x56, 0x73, 0x0b, 0xa7, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfb, - 0x3a, 0xf6, 0xb1, 0x9a, 0x01, 0x00, 0x00, + // 270 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0xcb, 0x4a, 0xc4, 0x30, + 0x14, 0x86, 0x49, 0x4b, 0x07, 0x4c, 0x37, 0x92, 0x85, 0x94, 0xae, 0x8a, 0x17, 0x2c, 0x0a, 0x09, + 0x54, 0x10, 0xd1, 0x95, 0xf5, 0x82, 0x2b, 0x29, 0x75, 0x37, 0xbb, 0xd8, 0x1c, 0xb5, 0x68, 0x4f, + 0x4a, 0x12, 0x0b, 0x7d, 0x64, 0xdf, 0x42, 0xda, 0x20, 0x15, 0x9d, 0xd9, 0x1d, 0xc2, 0xf7, 0x5f, + 0xf2, 0xd3, 0x83, 0xa1, 0x30, 0x72, 0xe4, 0x8d, 0xee, 0x44, 0xa3, 0x0d, 0x08, 0xd9, 0xf7, 0x42, + 0xa1, 0x15, 0x8d, 0xc6, 0x97, 0xf6, 0x95, 0xf7, 0x46, 0x3b, 0xcd, 0xd8, 0x0f, 0x64, 0x80, 0xcb, + 0xbe, 0xe7, 0x0a, 0x6d, 0x7a, 0xfc, 0x47, 0xd8, 0xe8, 0xae, 0xd3, 0x28, 0x10, 0x9c, 0x90, 0x4a, + 0x19, 0xb0, 0xd6, 0x8b, 0xd3, 0xd3, 0xed, 0xa0, 0x02, 0xeb, 0x5a, 0x94, 0xae, 0xd5, 0xe8, 0xe1, + 0xfd, 0x2f, 0x42, 0x57, 0x37, 0x73, 0x34, 0xbb, 0xa7, 0xf1, 0xa3, 0xec, 0xe0, 0x09, 0xcc, 0x00, + 0xc6, 0x26, 0x24, 0x0b, 0xf3, 0xb8, 0x38, 0xe4, 0xbf, 0xaa, 0x78, 0x27, 0x8e, 0xe0, 0xf8, 0xed, + 0xe2, 0x54, 0x95, 0x75, 0x8c, 0x8b, 0x90, 0x5d, 0xd1, 0xe8, 0x41, 0x5b, 0x67, 0x93, 0x60, 0x76, + 0x38, 0xe2, 0xff, 0x3f, 0xc3, 0x7d, 0x24, 0x9f, 0xb9, 0x3b, 0x74, 0x66, 0xac, 0xa3, 0xb7, 0xe9, + 0x4e, 0xd7, 0x94, 0x2e, 0x8f, 0x6c, 0x97, 0x86, 0xef, 0x30, 0x26, 0x24, 0x23, 0xf9, 0x4e, 0x3d, + 0x9d, 0xec, 0x9c, 0x46, 0x83, 0xfc, 0xf8, 0x84, 0x24, 0xc8, 0x48, 0x1e, 0x17, 0xd9, 0x96, 0x7a, + 0xd7, 0x7e, 0x91, 0xaa, 0xac, 0x3d, 0x7e, 0x19, 0x5c, 0x90, 0xf2, 0x84, 0xee, 0x35, 0xba, 0xdb, + 0x50, 0xa7, 0x8c, 0x7d, 0x9f, 0x6a, 0x9a, 0x64, 0x1d, 0x2a, 0xb4, 0xcf, 0xab, 0x79, 0x9e, 0xb3, + 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17, 0x9a, 0x1d, 0xee, 0xaf, 0x01, 0x00, 0x00, } diff --git a/common/net/address.pb.go b/common/net/address.pb.go index ed2d9f7cd..28742d494 100644 --- a/common/net/address.pb.go +++ b/common/net/address.pb.go @@ -148,21 +148,21 @@ func _AddressPB_OneofSizer(msg proto.Message) (n int) { } func init() { - proto.RegisterType((*AddressPB)(nil), "com.v2ray.core.common.net.AddressPB") + proto.RegisterType((*AddressPB)(nil), "v2ray.core.common.net.AddressPB") } func init() { proto.RegisterFile("v2ray.com/core/common/net/address.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 148 bytes of a gzipped FileDescriptorProto + // 159 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x4f, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0xd6, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4c, 0xce, 0xcf, 0xd5, 0x83, 0x29, 0x2e, 0x4a, 0xd5, 0x83, 0x28, - 0xd4, 0xcb, 0x4b, 0x2d, 0x51, 0x72, 0xe2, 0xe2, 0x74, 0x84, 0xa8, 0x0d, 0x70, 0x12, 0x12, 0xe0, - 0x62, 0xca, 0x2c, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0xf1, 0x60, 0x08, 0x62, 0xca, 0x2c, 0x10, - 0x92, 0xe0, 0x62, 0x4b, 0xc9, 0xcf, 0x4d, 0xcc, 0xcc, 0x93, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0xf4, - 0x60, 0x08, 0x82, 0xf2, 0x9d, 0x38, 0xb9, 0xd8, 0xa1, 0x96, 0x38, 0xb1, 0x46, 0x31, 0xe7, 0xa5, - 0x96, 0x24, 0xb1, 0x81, 0x2d, 0x33, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x04, 0x63, 0x74, - 0x97, 0x00, 0x00, 0x00, + 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0x29, 0x2c, 0x4a, 0xd5, 0x83, 0x28, 0xd2, 0xcb, 0x4b, 0x2d, + 0x51, 0x72, 0xe2, 0xe2, 0x74, 0x84, 0xa8, 0x0b, 0x70, 0x12, 0x12, 0xe0, 0x62, 0xca, 0x2c, 0x90, + 0x60, 0x54, 0x60, 0xd4, 0xe0, 0xf1, 0x60, 0x08, 0x62, 0xca, 0x2c, 0x10, 0x92, 0xe0, 0x62, 0x4b, + 0xc9, 0xcf, 0x4d, 0xcc, 0xcc, 0x93, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0xf4, 0x60, 0x08, 0x82, 0xf2, + 0x9d, 0x38, 0xb9, 0xd8, 0xa1, 0x16, 0x38, 0xe9, 0x71, 0x49, 0x26, 0xe7, 0xe7, 0xea, 0x61, 0xb5, + 0xc0, 0x89, 0x07, 0x66, 0x3c, 0xc8, 0x15, 0x51, 0xcc, 0x79, 0xa9, 0x25, 0x49, 0x6c, 0x60, 0x17, + 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa1, 0xd1, 0xe6, 0x14, 0xbc, 0x00, 0x00, 0x00, } diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go index bc25c3d25..044f5bf04 100644 --- a/common/net/destination.pb.go +++ b/common/net/destination.pb.go @@ -14,7 +14,7 @@ var _ = fmt.Errorf var _ = math.Inf type DestinationPB struct { - Network Network `protobuf:"varint,1,opt,name=network,enum=com.v2ray.core.common.net.Network" json:"network,omitempty"` + Network Network `protobuf:"varint,1,opt,name=network,enum=v2ray.core.common.net.Network" json:"network,omitempty"` Address *AddressPB `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"` Port uint32 `protobuf:"varint,3,opt,name=port" json:"port,omitempty"` } @@ -32,24 +32,25 @@ func (m *DestinationPB) GetAddress() *AddressPB { } func init() { - proto.RegisterType((*DestinationPB)(nil), "com.v2ray.core.common.net.DestinationPB") + proto.RegisterType((*DestinationPB)(nil), "v2ray.core.common.net.DestinationPB") } func init() { proto.RegisterFile("v2ray.com/core/common/net/destination.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 199 bytes of a gzipped FileDescriptorProto + // 209 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2e, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x4f, 0x49, 0x2d, 0x2e, 0xc9, 0xcc, 0x4b, 0x2c, 0xc9, 0xcc, - 0xcf, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4c, 0xce, 0xcf, 0xd5, 0x83, 0x69, 0x28, - 0x4a, 0xd5, 0x83, 0x28, 0xd6, 0xcb, 0x4b, 0x2d, 0x91, 0x52, 0xc7, 0x6d, 0x4e, 0x5e, 0x6a, 0x49, - 0x79, 0x7e, 0x51, 0x36, 0xc4, 0x0c, 0x7c, 0x0a, 0x13, 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x21, - 0x0a, 0x95, 0x16, 0x32, 0x72, 0xf1, 0xba, 0x20, 0x9c, 0x10, 0xe0, 0x24, 0x64, 0xc3, 0xc5, 0x0e, - 0x35, 0x4b, 0x82, 0x51, 0x81, 0x51, 0x83, 0xcf, 0x48, 0x49, 0x0f, 0xa7, 0x83, 0xf4, 0xfc, 0x20, - 0x2a, 0x83, 0x60, 0x5a, 0x84, 0xec, 0xb8, 0xd8, 0xa1, 0x16, 0x48, 0x30, 0x29, 0x30, 0x6a, 0x70, - 0x1b, 0xa9, 0xe0, 0xd1, 0xed, 0x08, 0x51, 0x19, 0xe0, 0x14, 0x04, 0xd3, 0x24, 0x24, 0xc4, 0xc5, - 0x52, 0x90, 0x5f, 0x54, 0x22, 0xc1, 0xac, 0xc0, 0xa8, 0xc1, 0x1b, 0x04, 0x66, 0x3b, 0xb1, 0x46, - 0x31, 0xe7, 0xa5, 0x96, 0x24, 0xb1, 0x81, 0x5d, 0x6c, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xec, - 0x8b, 0x02, 0x91, 0x4d, 0x01, 0x00, 0x00, + 0xcf, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0x29, 0x2e, 0x4a, 0xd5, 0x83, 0x28, + 0xd4, 0xcb, 0x4b, 0x2d, 0x91, 0x52, 0xc7, 0x6d, 0x46, 0x5e, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0x36, + 0x44, 0x3f, 0x3e, 0x85, 0x89, 0x29, 0x29, 0x45, 0xa9, 0xc5, 0xc5, 0x10, 0x85, 0x4a, 0x33, 0x19, + 0xb9, 0x78, 0x5d, 0x10, 0xd6, 0x07, 0x38, 0x09, 0x59, 0x70, 0xb1, 0x43, 0xcd, 0x92, 0x60, 0x54, + 0x60, 0xd4, 0xe0, 0x33, 0x92, 0xd3, 0xc3, 0xea, 0x18, 0x3d, 0x3f, 0x88, 0xaa, 0x20, 0x98, 0x72, + 0x21, 0x2b, 0x2e, 0x76, 0xa8, 0xe1, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x0a, 0x38, 0x74, + 0x3a, 0x42, 0x54, 0x05, 0x38, 0x05, 0xc1, 0x34, 0x08, 0x09, 0x71, 0xb1, 0x14, 0xe4, 0x17, 0x95, + 0x48, 0x30, 0x2b, 0x30, 0x6a, 0xf0, 0x06, 0x81, 0xd9, 0x4e, 0x46, 0x5c, 0x92, 0xc9, 0xf9, 0xb9, + 0xd8, 0xcd, 0x70, 0x12, 0x40, 0x76, 0x35, 0xc8, 0x2b, 0x51, 0xcc, 0x79, 0xa9, 0x25, 0x49, 0x6c, + 0x60, 0x6f, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe2, 0xd7, 0x78, 0x9a, 0x6e, 0x01, 0x00, + 0x00, } diff --git a/common/net/network.pb.go b/common/net/network.pb.go index 7927fd2eb..39462fbd3 100644 --- a/common/net/network.pb.go +++ b/common/net/network.pb.go @@ -47,7 +47,7 @@ func (x Network) String() string { func (Network) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } type NetworkList struct { - Network []Network `protobuf:"varint,1,rep,packed,name=network,enum=com.v2ray.core.common.net.Network" json:"network,omitempty"` + Network []Network `protobuf:"varint,1,rep,packed,name=network,enum=v2ray.core.common.net.Network" json:"network,omitempty"` } func (m *NetworkList) Reset() { *m = NetworkList{} } @@ -56,24 +56,25 @@ func (*NetworkList) ProtoMessage() {} func (*NetworkList) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } func init() { - proto.RegisterType((*NetworkList)(nil), "com.v2ray.core.common.net.NetworkList") - proto.RegisterEnum("com.v2ray.core.common.net.Network", Network_name, Network_value) + proto.RegisterType((*NetworkList)(nil), "v2ray.core.common.net.NetworkList") + proto.RegisterEnum("v2ray.core.common.net.Network", Network_name, Network_value) } func init() { proto.RegisterFile("v2ray.com/core/common/net/network.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 192 bytes of a gzipped FileDescriptorProto + // 203 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0x01, 0xe1, 0xf2, 0xfc, 0xa2, 0x6c, 0xbd, 0x82, 0xa2, 0xfc, 0x92, - 0x7c, 0x21, 0xc9, 0xe4, 0xfc, 0x5c, 0x3d, 0x98, 0xe2, 0xa2, 0x54, 0x3d, 0x88, 0x42, 0xbd, 0xbc, - 0xd4, 0x12, 0x25, 0x6f, 0x2e, 0x6e, 0x3f, 0x88, 0x5a, 0x9f, 0xcc, 0xe2, 0x12, 0x21, 0x1b, 0x2e, - 0x76, 0xa8, 0x56, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x3e, 0x23, 0x25, 0x3d, 0x9c, 0x7a, 0xf5, 0xa0, - 0x1a, 0x83, 0x60, 0x5a, 0xb4, 0x7c, 0xb8, 0xd8, 0xa1, 0x62, 0x42, 0xdc, 0x5c, 0xec, 0xa1, 0x79, - 0xd9, 0x79, 0xf9, 0xe5, 0x79, 0x02, 0x0c, 0x42, 0x5c, 0x5c, 0x6c, 0x41, 0x89, 0xe5, 0x21, 0xce, - 0x01, 0x02, 0x8c, 0x42, 0xec, 0x5c, 0xcc, 0x20, 0x06, 0x13, 0x88, 0x11, 0xea, 0x12, 0x20, 0xc0, - 0x0c, 0x62, 0x78, 0x3b, 0x07, 0x08, 0xb0, 0x08, 0xf1, 0x72, 0x71, 0x86, 0xa7, 0x26, 0x05, 0xe7, - 0x27, 0x67, 0xa7, 0x96, 0x08, 0xb0, 0x3a, 0xb1, 0x46, 0x31, 0xe7, 0xa5, 0x96, 0x24, 0xb1, 0x81, - 0xfd, 0x60, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x1a, 0x8a, 0xb3, 0xee, 0x00, 0x00, 0x00, + 0x7c, 0x21, 0x51, 0x98, 0xc2, 0xa2, 0x54, 0x3d, 0x88, 0x22, 0xbd, 0xbc, 0xd4, 0x12, 0x25, 0x77, + 0x2e, 0x6e, 0x3f, 0x88, 0x3a, 0x9f, 0xcc, 0xe2, 0x12, 0x21, 0x0b, 0x2e, 0x76, 0xa8, 0x36, 0x09, + 0x46, 0x05, 0x66, 0x0d, 0x3e, 0x23, 0x39, 0x3d, 0xac, 0xfa, 0xf4, 0xa0, 0x9a, 0x82, 0x60, 0xca, + 0xb5, 0x7c, 0xb8, 0xd8, 0xa1, 0x62, 0x42, 0xdc, 0x5c, 0xec, 0xa1, 0x79, 0xd9, 0x79, 0xf9, 0xe5, + 0x79, 0x02, 0x0c, 0x42, 0x5c, 0x5c, 0x6c, 0x41, 0x89, 0xe5, 0x21, 0xce, 0x01, 0x02, 0x8c, 0x42, + 0xec, 0x5c, 0xcc, 0x20, 0x06, 0x13, 0x88, 0x11, 0xea, 0x12, 0x20, 0xc0, 0x0c, 0x62, 0x78, 0x3b, + 0x07, 0x08, 0xb0, 0x08, 0xf1, 0x72, 0x71, 0x86, 0xa7, 0x26, 0x05, 0xe7, 0x27, 0x67, 0xa7, 0x96, + 0x08, 0xb0, 0x3a, 0xe9, 0x71, 0x49, 0x26, 0xe7, 0xe7, 0x62, 0xb7, 0xdb, 0x89, 0x07, 0x6a, 0x51, + 0x00, 0xc8, 0x63, 0x51, 0xcc, 0x79, 0xa9, 0x25, 0x49, 0x6c, 0x60, 0x4f, 0x1a, 0x03, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x6e, 0x52, 0xf1, 0x92, 0x0f, 0x01, 0x00, 0x00, } diff --git a/common/net/port.pb.go b/common/net/port.pb.go index b90459082..62df25468 100644 --- a/common/net/port.pb.go +++ b/common/net/port.pb.go @@ -25,20 +25,21 @@ func (*PortRange) ProtoMessage() {} func (*PortRange) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} } func init() { - proto.RegisterType((*PortRange)(nil), "com.v2ray.core.common.net.PortRange") + proto.RegisterType((*PortRange)(nil), "v2ray.core.common.net.PortRange") } func init() { proto.RegisterFile("v2ray.com/core/common/net/port.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 137 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x34, 0xcc, 0xb1, 0x0a, 0xc2, 0x40, - 0x0c, 0x87, 0x71, 0x7a, 0x56, 0xc1, 0x03, 0x1d, 0x6e, 0xaa, 0x9b, 0x88, 0x83, 0x53, 0x02, 0xfa, - 0x06, 0x0e, 0xce, 0x52, 0x9c, 0xdc, 0xea, 0x11, 0x9d, 0x92, 0x7f, 0x09, 0x41, 0xf0, 0xed, 0x85, - 0x8a, 0xeb, 0xc7, 0x8f, 0x2f, 0xef, 0xdf, 0x47, 0x1f, 0x3e, 0x54, 0xa1, 0x5c, 0xe1, 0xc2, 0x15, - 0xaa, 0x30, 0x36, 0x09, 0x1e, 0xe1, 0x41, 0xa3, 0x23, 0x50, 0x36, 0x15, 0x4a, 0x7f, 0xe9, 0x42, - 0x3f, 0x45, 0x26, 0xb1, 0xe3, 0xbc, 0xbc, 0xc2, 0xa3, 0x1f, 0xec, 0x25, 0xa5, 0xe4, 0xf6, 0xe2, - 0xd0, 0xae, 0xd9, 0x36, 0x87, 0x55, 0xdf, 0x3e, 0x1d, 0x5a, 0xd6, 0x39, 0xdd, 0xd0, 0xa5, 0xa9, - 0xa4, 0xc0, 0x79, 0x7e, 0x9f, 0x99, 0xc4, 0x63, 0x31, 0x9d, 0x4f, 0xdf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xc3, 0x9d, 0x1a, 0x33, 0x81, 0x00, 0x00, 0x00, + // 148 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x29, 0x33, 0x2a, 0x4a, + 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, + 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x2f, 0xc8, 0x2f, 0x2a, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, + 0x17, 0x12, 0x85, 0xa9, 0x2a, 0x4a, 0xd5, 0x83, 0xa8, 0xd0, 0xcb, 0x4b, 0x2d, 0x51, 0xd2, 0xe7, + 0xe2, 0x0c, 0xc8, 0x2f, 0x2a, 0x09, 0x4a, 0xcc, 0x4b, 0x4f, 0x15, 0x12, 0xe2, 0x62, 0x71, 0x2b, + 0xca, 0xcf, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0d, 0x62, 0x49, 0x2b, 0xca, 0xcf, 0x15, 0xe2, + 0xe3, 0x62, 0x0a, 0xc9, 0x97, 0x60, 0x02, 0x8b, 0x30, 0x95, 0xe4, 0x3b, 0x69, 0x73, 0x49, 0x26, + 0xe7, 0xe7, 0xea, 0x61, 0x35, 0xcd, 0x09, 0x6c, 0x56, 0x00, 0xc8, 0xbe, 0x28, 0xe6, 0xbc, 0xd4, + 0x92, 0x24, 0x36, 0xb0, 0xdd, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x28, 0x7b, 0x9b, 0xb3, + 0xa3, 0x00, 0x00, 0x00, } diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go index 2f9d688bc..d1d118c90 100644 --- a/common/protocol/server_spec.pb.go +++ b/common/protocol/server_spec.pb.go @@ -18,7 +18,7 @@ package protocol import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import com_v2ray_core_common_net "v2ray.com/core/common/net" +import v2ray_core_common_net "v2ray.com/core/common/net" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -32,9 +32,9 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type ServerSpecPB struct { - Address *com_v2ray_core_common_net.AddressPB `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` - Port uint32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"` - User []*User `protobuf:"bytes,3,rep,name=user" json:"user,omitempty"` + Address *v2ray_core_common_net.AddressPB `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` + Port uint32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"` + User []*User `protobuf:"bytes,3,rep,name=user" json:"user,omitempty"` } func (m *ServerSpecPB) Reset() { *m = ServerSpecPB{} } @@ -42,7 +42,7 @@ func (m *ServerSpecPB) String() string { return proto.CompactTextStri func (*ServerSpecPB) ProtoMessage() {} func (*ServerSpecPB) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } -func (m *ServerSpecPB) GetAddress() *com_v2ray_core_common_net.AddressPB { +func (m *ServerSpecPB) GetAddress() *v2ray_core_common_net.AddressPB { if m != nil { return m.Address } @@ -57,24 +57,25 @@ func (m *ServerSpecPB) GetUser() []*User { } func init() { - proto.RegisterType((*ServerSpecPB)(nil), "com.v2ray.core.common.protocol.ServerSpecPB") + proto.RegisterType((*ServerSpecPB)(nil), "v2ray.core.common.protocol.ServerSpecPB") } func init() { proto.RegisterFile("v2ray.com/core/common/protocol/server_spec.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 207 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8e, 0x31, 0x4b, 0xc7, 0x30, - 0x14, 0xc4, 0x89, 0x2d, 0x2a, 0x51, 0x97, 0x4c, 0xa5, 0x83, 0x14, 0x11, 0xac, 0xcb, 0x8b, 0xd4, - 0xc5, 0x49, 0xb0, 0x9f, 0xa0, 0xb4, 0xb8, 0xb8, 0x48, 0x4d, 0xdf, 0x66, 0xfa, 0xc2, 0x4b, 0x2c, - 0xf8, 0x5d, 0xfc, 0xb0, 0x62, 0x62, 0xb6, 0xf2, 0xff, 0x6f, 0xc7, 0x71, 0xbf, 0xbb, 0x93, 0x0f, - 0x5b, 0xc7, 0xf3, 0x37, 0x18, 0xb2, 0xda, 0x10, 0xa3, 0x36, 0x64, 0x2d, 0xad, 0xda, 0x31, 0x05, - 0x32, 0xf4, 0xa9, 0x3d, 0xf2, 0x86, 0xfc, 0xee, 0x1d, 0x1a, 0x88, 0xa6, 0xba, 0x36, 0x64, 0x21, - 0x53, 0x8c, 0x90, 0x08, 0xc8, 0x44, 0x7d, 0xb7, 0xdf, 0xb8, 0x62, 0xd0, 0xf3, 0xb2, 0x30, 0x7a, - 0x9f, 0xb2, 0xf5, 0xfd, 0x91, 0xe9, 0x2f, 0x8f, 0x9c, 0xa2, 0x37, 0x3f, 0x42, 0x5e, 0x4e, 0xf1, - 0xc9, 0xe4, 0xd0, 0x0c, 0xbd, 0x7a, 0x96, 0x67, 0xff, 0x65, 0x95, 0x68, 0x44, 0x7b, 0xd1, 0xdd, - 0xc2, 0xfe, 0xad, 0x15, 0x03, 0xbc, 0xa4, 0xe4, 0xd0, 0x8f, 0x19, 0x52, 0x4a, 0x96, 0x8e, 0x38, - 0x54, 0x27, 0x8d, 0x68, 0xaf, 0xc6, 0xa8, 0xd5, 0x93, 0x2c, 0xff, 0x26, 0xab, 0xa2, 0x29, 0x0e, - 0x14, 0xe6, 0x7b, 0xf0, 0xea, 0x91, 0xc7, 0x48, 0xf4, 0xf2, 0xed, 0x3c, 0xdb, 0x1f, 0xa7, 0x51, - 0x3d, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x38, 0x55, 0xf5, 0x59, 0x01, 0x00, 0x00, + // 216 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8e, 0x3f, 0x4b, 0xc7, 0x30, + 0x10, 0x86, 0x89, 0xbf, 0xa2, 0x12, 0x15, 0x21, 0x53, 0xe9, 0x20, 0xc1, 0xc5, 0xba, 0x24, 0x52, + 0x9d, 0x74, 0x32, 0x9f, 0xa0, 0xb4, 0xb8, 0xb8, 0x48, 0x4d, 0x6f, 0x33, 0xbd, 0x70, 0x89, 0x05, + 0xbf, 0x87, 0x1f, 0x58, 0x9a, 0x18, 0x10, 0xfc, 0xb7, 0x1d, 0x77, 0xcf, 0xbd, 0xef, 0xc3, 0xaf, + 0xd6, 0x8e, 0xa6, 0x37, 0x65, 0xd1, 0x69, 0x8b, 0x04, 0xda, 0xa2, 0x73, 0xb8, 0x68, 0x4f, 0x18, + 0xd1, 0xe2, 0x8b, 0x0e, 0x40, 0x2b, 0xd0, 0x53, 0xf0, 0x60, 0x55, 0x5a, 0x8a, 0xa6, 0x7c, 0x10, + 0xa8, 0x4c, 0xab, 0x42, 0x37, 0x17, 0x3f, 0xa7, 0x2d, 0x10, 0xf5, 0x34, 0xcf, 0x04, 0x21, 0x64, + 0xb6, 0xb9, 0xfc, 0xa7, 0xf6, 0x35, 0x00, 0x65, 0xf4, 0xfc, 0x9d, 0xf1, 0xe3, 0x31, 0x59, 0x8c, + 0x1e, 0x6c, 0x6f, 0xc4, 0x2d, 0x3f, 0xf8, 0x0c, 0xab, 0x99, 0x64, 0xed, 0x51, 0x27, 0xd5, 0x77, + 0xa5, 0x05, 0xa2, 0xba, 0xcf, 0x54, 0x6f, 0x86, 0xf2, 0x20, 0x04, 0xaf, 0x3c, 0x52, 0xac, 0xf7, + 0x24, 0x6b, 0x4f, 0x86, 0x34, 0x8b, 0x1b, 0x5e, 0x6d, 0x75, 0xf5, 0x4e, 0xee, 0x7e, 0x09, 0x2b, + 0x5a, 0xea, 0x21, 0x00, 0x0d, 0x89, 0x36, 0x77, 0xfc, 0xcc, 0xa2, 0xfb, 0x03, 0x36, 0xa7, 0x5f, + 0xac, 0xb7, 0xdd, 0xe3, 0x61, 0x39, 0x3d, 0xef, 0xa7, 0xe9, 0xfa, 0x23, 0x00, 0x00, 0xff, 0xff, + 0x30, 0xc6, 0x1e, 0xae, 0x7e, 0x01, 0x00, 0x00, } diff --git a/common/protocol/user.pb.go b/common/protocol/user.pb.go index 49421c69a..2e09ad986 100644 --- a/common/protocol/user.pb.go +++ b/common/protocol/user.pb.go @@ -33,23 +33,23 @@ func (m *User) GetAccount() *google_protobuf.Any { } func init() { - proto.RegisterType((*User)(nil), "com.v2ray.core.common.protocol.User") + proto.RegisterType((*User)(nil), "v2ray.core.common.protocol.User") } func init() { proto.RegisterFile("v2ray.com/core/common/protocol/user.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 179 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x34, 0x8e, 0xcb, 0xaa, 0xc2, 0x30, - 0x10, 0x86, 0xc9, 0x39, 0x5e, 0x23, 0x6e, 0x4a, 0x17, 0xd5, 0x85, 0x14, 0x57, 0x75, 0x33, 0x81, - 0xfa, 0x04, 0xfa, 0x08, 0x05, 0x37, 0xee, 0xd2, 0x61, 0x2c, 0x42, 0x92, 0x91, 0xf4, 0x02, 0x79, - 0x7b, 0xb1, 0x21, 0xbb, 0xf9, 0x66, 0xbe, 0xe1, 0xff, 0xe5, 0x65, 0xaa, 0xbd, 0x0e, 0x80, 0x6c, - 0x15, 0xb2, 0x27, 0x85, 0x6c, 0x2d, 0x3b, 0xf5, 0xf1, 0x3c, 0x30, 0xb2, 0x51, 0x63, 0x4f, 0x1e, - 0x66, 0xca, 0x4e, 0xc8, 0x16, 0x92, 0xee, 0x09, 0xa2, 0x0a, 0x49, 0x3d, 0x1e, 0x3a, 0xe6, 0xce, - 0x50, 0xfc, 0x6d, 0xc7, 0x97, 0xd2, 0x2e, 0xc4, 0xeb, 0xb9, 0x95, 0x8b, 0x47, 0x4f, 0x3e, 0xcb, - 0xe5, 0xd2, 0xd0, 0x44, 0xa6, 0x10, 0xa5, 0xa8, 0xf6, 0x4d, 0x84, 0xdf, 0x96, 0xac, 0x7e, 0x9b, - 0xe2, 0xaf, 0x14, 0xd5, 0xb6, 0x89, 0x90, 0x81, 0x5c, 0x6b, 0x44, 0x1e, 0xdd, 0x50, 0xfc, 0x97, - 0xa2, 0xda, 0xd5, 0x39, 0xc4, 0x00, 0x48, 0x01, 0x70, 0x73, 0xa1, 0x49, 0xd2, 0x5d, 0x3e, 0x37, - 0xa9, 0x4a, 0xbb, 0x9a, 0xa7, 0xeb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x7e, 0xbf, 0xfa, 0xde, - 0x00, 0x00, 0x00, + // 192 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x8e, 0xbd, 0xea, 0xc2, 0x30, + 0x14, 0xc5, 0xc9, 0xff, 0x43, 0x6d, 0xc4, 0xa5, 0x74, 0xa8, 0x1d, 0xa4, 0x38, 0xd5, 0xe5, 0x06, + 0x2a, 0x3e, 0x80, 0x7d, 0x02, 0x29, 0xb8, 0xb8, 0xa5, 0xe1, 0x5a, 0x84, 0x24, 0x57, 0xd2, 0x0f, + 0xe8, 0xdb, 0x4b, 0x1b, 0x32, 0xba, 0xe5, 0x77, 0xf2, 0xbb, 0x9c, 0xc3, 0x4f, 0x63, 0xe9, 0xe4, + 0x04, 0x8a, 0x8c, 0x50, 0xe4, 0x50, 0x28, 0x32, 0x86, 0xac, 0x78, 0x3b, 0xea, 0x49, 0x91, 0x16, + 0x43, 0x87, 0x0e, 0x16, 0x8a, 0xb3, 0xa0, 0x3a, 0x04, 0xaf, 0x41, 0xd0, 0xb2, 0x7d, 0x4b, 0xd4, + 0x6a, 0xf4, 0x77, 0xcd, 0xf0, 0x14, 0xd2, 0x4e, 0xfe, 0xf7, 0xd8, 0xf0, 0xbf, 0x7b, 0x87, 0x2e, + 0x4e, 0xf8, 0xbf, 0xc6, 0x11, 0x75, 0xca, 0x72, 0x56, 0xec, 0x6a, 0x0f, 0x73, 0x8a, 0x46, 0xbe, + 0x74, 0xfa, 0x93, 0xb3, 0x22, 0xaa, 0x3d, 0xc4, 0xc0, 0xd7, 0x52, 0x29, 0x1a, 0x6c, 0x9f, 0xfe, + 0xe6, 0xac, 0xd8, 0x96, 0x09, 0xf8, 0x02, 0x08, 0x05, 0x70, 0xb5, 0x53, 0x1d, 0xa4, 0xea, 0xc2, + 0x0f, 0x8a, 0x0c, 0x7c, 0x1f, 0x58, 0x45, 0xf3, 0x86, 0xdb, 0x4c, 0x8f, 0x4d, 0x08, 0x9b, 0xd5, + 0xf2, 0x3a, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd8, 0xfc, 0x46, 0xc6, 0x05, 0x01, 0x00, 0x00, } diff --git a/proxy/blackhole/config.pb.go b/proxy/blackhole/config.pb.go index ca92fcfac..f8bda6523 100644 --- a/proxy/blackhole/config.pb.go +++ b/proxy/blackhole/config.pb.go @@ -70,7 +70,7 @@ func (*HTTPResponse) ProtoMessage() {} func (*HTTPResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } type Response struct { - Type Response_Type `protobuf:"varint,1,opt,name=type,enum=com.v2ray.core.proxy.blackhole.Response_Type" json:"type,omitempty"` + Type Response_Type `protobuf:"varint,1,opt,name=type,enum=v2ray.core.proxy.blackhole.Response_Type" json:"type,omitempty"` Settings *google_protobuf.Any `protobuf:"bytes,2,opt,name=settings" json:"settings,omitempty"` } @@ -103,31 +103,32 @@ func (m *Config) GetResponse() *Response { } func init() { - proto.RegisterType((*NoneResponse)(nil), "com.v2ray.core.proxy.blackhole.NoneResponse") - proto.RegisterType((*HTTPResponse)(nil), "com.v2ray.core.proxy.blackhole.HTTPResponse") - proto.RegisterType((*Response)(nil), "com.v2ray.core.proxy.blackhole.Response") - proto.RegisterType((*Config)(nil), "com.v2ray.core.proxy.blackhole.Config") - proto.RegisterEnum("com.v2ray.core.proxy.blackhole.Response_Type", Response_Type_name, Response_Type_value) + proto.RegisterType((*NoneResponse)(nil), "v2ray.core.proxy.blackhole.NoneResponse") + proto.RegisterType((*HTTPResponse)(nil), "v2ray.core.proxy.blackhole.HTTPResponse") + proto.RegisterType((*Response)(nil), "v2ray.core.proxy.blackhole.Response") + proto.RegisterType((*Config)(nil), "v2ray.core.proxy.blackhole.Config") + proto.RegisterEnum("v2ray.core.proxy.blackhole.Response_Type", Response_Type_name, Response_Type_value) } func init() { proto.RegisterFile("v2ray.com/core/proxy/blackhole/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 249 bytes of a gzipped FileDescriptorProto + // 261 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x90, 0x41, 0x4b, 0xc3, 0x30, - 0x18, 0x86, 0xad, 0x94, 0x51, 0x53, 0x19, 0x23, 0x78, 0x98, 0x3b, 0xc8, 0xe8, 0xa9, 0x20, 0x7e, - 0x91, 0xfa, 0x0b, 0xa6, 0x1e, 0x3c, 0x0d, 0x29, 0x3d, 0x79, 0x6b, 0xc3, 0xb7, 0x3a, 0xec, 0xf2, - 0x85, 0x34, 0x8a, 0xf9, 0x2d, 0xfe, 0x59, 0x49, 0x66, 0x73, 0x94, 0xdd, 0xf2, 0x92, 0xf7, 0xc9, - 0xfb, 0x10, 0x76, 0xfb, 0x55, 0x99, 0xd6, 0x81, 0xa4, 0x83, 0x90, 0x64, 0x50, 0x68, 0x43, 0xdf, - 0x4e, 0x74, 0x43, 0x2b, 0x3f, 0xde, 0x69, 0x40, 0x21, 0x49, 0xed, 0xf6, 0x3d, 0x68, 0x43, 0x96, - 0xf8, 0x8d, 0xa4, 0x03, 0x4c, 0x80, 0x41, 0x08, 0x65, 0x88, 0xe5, 0xd5, 0x75, 0x4f, 0xd4, 0x0f, - 0xe1, 0x11, 0x4b, 0xdd, 0xe7, 0x4e, 0xb4, 0xca, 0x1d, 0xd1, 0x62, 0xce, 0x2e, 0xb7, 0xa4, 0xb0, - 0xc6, 0x51, 0x93, 0x1a, 0xd1, 0xe7, 0x97, 0xa6, 0x79, 0x8d, 0xf9, 0x27, 0x61, 0xd9, 0x14, 0xf8, - 0x86, 0xa5, 0xd6, 0x69, 0x5c, 0x26, 0xeb, 0xa4, 0x9c, 0x57, 0x77, 0xf0, 0xff, 0x2c, 0x4c, 0x1c, - 0x34, 0x4e, 0x63, 0x1d, 0x50, 0x7e, 0xcf, 0xb2, 0x11, 0xad, 0xdd, 0xab, 0x7e, 0x5c, 0x9e, 0xaf, - 0x93, 0x32, 0xaf, 0xae, 0xe0, 0x68, 0x07, 0x93, 0x1d, 0x6c, 0x94, 0xab, 0x63, 0xab, 0x58, 0xb1, - 0xd4, 0xf3, 0x3c, 0x63, 0xa9, 0x37, 0x5d, 0x9c, 0xf9, 0x93, 0x77, 0x5c, 0x24, 0xc5, 0x96, 0xcd, - 0x9e, 0xc2, 0x47, 0xf0, 0x67, 0x96, 0x99, 0xbf, 0xb9, 0xa0, 0x97, 0x57, 0xe5, 0xa9, 0x7a, 0x75, - 0x24, 0x1f, 0xf3, 0xb7, 0x8b, 0x78, 0xdf, 0xcd, 0x82, 0xd0, 0xc3, 0x6f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x09, 0xa5, 0x68, 0x2e, 0x8b, 0x01, 0x00, 0x00, + 0x18, 0x86, 0xad, 0x8c, 0x51, 0xbf, 0xca, 0x18, 0xc5, 0xc3, 0xec, 0x41, 0x46, 0xf1, 0x30, 0x11, + 0xbe, 0x48, 0xbd, 0x78, 0x11, 0x74, 0x5e, 0xc4, 0x83, 0x8c, 0xd2, 0x93, 0xb7, 0x36, 0x64, 0x75, + 0xd8, 0xe5, 0x0b, 0x69, 0x14, 0xf3, 0x4b, 0xfc, 0xbb, 0x92, 0xd4, 0xe6, 0xa6, 0x78, 0xcb, 0x1b, + 0xde, 0x27, 0xef, 0x43, 0xe0, 0xf2, 0xa3, 0xd0, 0xb5, 0x45, 0x4e, 0x7b, 0xc6, 0x49, 0x0b, 0xa6, + 0x34, 0x7d, 0x5a, 0xd6, 0x74, 0x35, 0x7f, 0x7b, 0xa5, 0x4e, 0x30, 0x4e, 0x72, 0xbb, 0x6b, 0x51, + 0x69, 0x32, 0x94, 0x66, 0x63, 0x59, 0x0b, 0xf4, 0x45, 0x0c, 0xc5, 0xec, 0xb4, 0x25, 0x6a, 0x3b, + 0xff, 0x80, 0xa1, 0xe6, 0x7d, 0xcb, 0x6a, 0x69, 0x07, 0x2c, 0x9f, 0xc1, 0xf1, 0x33, 0x49, 0x51, + 0x8a, 0x5e, 0x91, 0xec, 0x85, 0xcb, 0x8f, 0x55, 0xb5, 0x09, 0xf9, 0x2b, 0x82, 0x78, 0x0c, 0xe9, + 0x2d, 0x4c, 0x8c, 0x55, 0x62, 0x11, 0x2d, 0xa3, 0xd5, 0xac, 0xb8, 0xc0, 0xdf, 0x27, 0x71, 0x64, + 0xb0, 0xb2, 0x4a, 0x94, 0x1e, 0x4b, 0xaf, 0x20, 0xee, 0x85, 0x31, 0x3b, 0xd9, 0xf6, 0x8b, 0xc3, + 0x65, 0xb4, 0x4a, 0x8a, 0x13, 0x1c, 0xcc, 0x70, 0x34, 0xc3, 0x7b, 0x69, 0xcb, 0xd0, 0xca, 0x33, + 0x98, 0x38, 0x3e, 0x8d, 0x61, 0xe2, 0x2c, 0xe7, 0x07, 0xee, 0xe4, 0xfc, 0xe6, 0x51, 0xfe, 0x04, + 0xd3, 0x07, 0xff, 0x01, 0xe9, 0x1d, 0xc4, 0xfa, 0x67, 0xce, 0xab, 0x25, 0xc5, 0xf9, 0x7f, 0xd4, + 0xca, 0x40, 0xad, 0x6f, 0xe0, 0x8c, 0xd3, 0xfe, 0x0f, 0x68, 0x9d, 0x0c, 0x5b, 0x1b, 0xe7, 0xf9, + 0x72, 0x14, 0xee, 0x9b, 0xa9, 0x37, 0xbf, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x62, 0xb1, 0x35, + 0x74, 0xac, 0x01, 0x00, 0x00, } diff --git a/proxy/dokodemo/config.pb.go b/proxy/dokodemo/config.pb.go index 094c396ff..a4c08a8cf 100644 --- a/proxy/dokodemo/config.pb.go +++ b/proxy/dokodemo/config.pb.go @@ -16,8 +16,8 @@ package dokodemo import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import com_v2ray_core_common_net "v2ray.com/core/common/net" -import com_v2ray_core_common_net1 "v2ray.com/core/common/net" +import v2ray_core_common_net "v2ray.com/core/common/net" +import v2ray_core_common_net1 "v2ray.com/core/common/net" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -31,11 +31,11 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Config struct { - Address *com_v2ray_core_common_net.AddressPB `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` - Port uint32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"` - NetworkList *com_v2ray_core_common_net1.NetworkList `protobuf:"bytes,3,opt,name=network_list,json=networkList" json:"network_list,omitempty"` - Timeout uint32 `protobuf:"varint,4,opt,name=timeout" json:"timeout,omitempty"` - FollowRedirect bool `protobuf:"varint,5,opt,name=follow_redirect,json=followRedirect" json:"follow_redirect,omitempty"` + Address *v2ray_core_common_net.AddressPB `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` + Port uint32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"` + NetworkList *v2ray_core_common_net1.NetworkList `protobuf:"bytes,3,opt,name=network_list,json=networkList" json:"network_list,omitempty"` + Timeout uint32 `protobuf:"varint,4,opt,name=timeout" json:"timeout,omitempty"` + FollowRedirect bool `protobuf:"varint,5,opt,name=follow_redirect,json=followRedirect" json:"follow_redirect,omitempty"` } func (m *Config) Reset() { *m = Config{} } @@ -43,14 +43,14 @@ func (m *Config) String() string { return proto.CompactTextString(m) func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } -func (m *Config) GetAddress() *com_v2ray_core_common_net.AddressPB { +func (m *Config) GetAddress() *v2ray_core_common_net.AddressPB { if m != nil { return m.Address } return nil } -func (m *Config) GetNetworkList() *com_v2ray_core_common_net1.NetworkList { +func (m *Config) GetNetworkList() *v2ray_core_common_net1.NetworkList { if m != nil { return m.NetworkList } @@ -58,28 +58,28 @@ func (m *Config) GetNetworkList() *com_v2ray_core_common_net1.NetworkList { } func init() { - proto.RegisterType((*Config)(nil), "com.v2ray.core.proxy.dokodemo.Config") + proto.RegisterType((*Config)(nil), "v2ray.core.proxy.dokodemo.Config") } func init() { proto.RegisterFile("v2ray.com/core/proxy/dokodemo/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 257 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x4d, 0x4b, 0x03, 0x31, - 0x10, 0x86, 0x59, 0xad, 0x6d, 0x49, 0xfd, 0x80, 0x9c, 0x82, 0x20, 0x14, 0x11, 0xbb, 0x78, 0x48, - 0xa0, 0xde, 0x05, 0xeb, 0x49, 0x10, 0x91, 0x3d, 0x7a, 0x29, 0x35, 0x3b, 0x95, 0xd0, 0x4d, 0x66, - 0x99, 0x1d, 0xad, 0xfd, 0xcb, 0xfe, 0x0a, 0x21, 0xd9, 0x20, 0xf4, 0xd0, 0x5b, 0x66, 0x78, 0xf2, - 0xbc, 0x6f, 0x22, 0xee, 0xbe, 0xe7, 0xb4, 0xda, 0x69, 0x8b, 0xde, 0x58, 0x24, 0x30, 0x2d, 0xe1, - 0xcf, 0xce, 0xd4, 0xb8, 0xc1, 0x1a, 0x3c, 0x1a, 0x8b, 0x61, 0xed, 0x3e, 0x75, 0x4b, 0xc8, 0x28, - 0xaf, 0x2c, 0x7a, 0x9d, 0x79, 0x02, 0x1d, 0x59, 0x9d, 0xd9, 0xcb, 0xd9, 0x9e, 0xca, 0xa2, 0xf7, - 0x18, 0x4c, 0x00, 0x36, 0xab, 0xba, 0x26, 0xe8, 0xba, 0xe4, 0x39, 0x04, 0x06, 0xe0, 0x2d, 0xd2, - 0x26, 0x81, 0xd7, 0xbf, 0x85, 0x18, 0x3e, 0xc5, 0x06, 0xf2, 0x41, 0x8c, 0x7a, 0x89, 0x2a, 0xa6, - 0x45, 0x39, 0x99, 0xdf, 0xe8, 0xbd, 0x36, 0xc9, 0xa2, 0x03, 0xb0, 0x7e, 0x4c, 0xe4, 0xdb, 0xa2, - 0xca, 0x97, 0xa4, 0x14, 0x83, 0x16, 0x89, 0xd5, 0xd1, 0xb4, 0x28, 0xcf, 0xaa, 0x78, 0x96, 0xcf, - 0xe2, 0xb4, 0xcf, 0x5b, 0x36, 0xae, 0x63, 0x75, 0x1c, 0xc5, 0xb7, 0x07, 0xc4, 0xaf, 0x09, 0x7f, - 0x71, 0x1d, 0x57, 0x93, 0xf0, 0x3f, 0x48, 0x25, 0x46, 0xec, 0x3c, 0xe0, 0x17, 0xab, 0x41, 0x4c, - 0xc8, 0xa3, 0x9c, 0x89, 0x8b, 0x35, 0x36, 0x0d, 0x6e, 0x97, 0x04, 0xb5, 0x23, 0xb0, 0xac, 0x4e, - 0xa6, 0x45, 0x39, 0xae, 0xce, 0xd3, 0xba, 0xea, 0xb7, 0x0b, 0xf1, 0x3e, 0xce, 0x5f, 0xf9, 0x31, - 0x8c, 0xef, 0xbf, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x85, 0x0f, 0xd2, 0x20, 0x9e, 0x01, 0x00, - 0x00, + // 269 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x4d, 0x4b, 0xc3, 0x40, + 0x10, 0x86, 0x89, 0xd6, 0xb6, 0x6c, 0xfd, 0x80, 0x3d, 0xad, 0x82, 0x10, 0x7a, 0x69, 0xf0, 0xb0, + 0x0b, 0x15, 0x3c, 0x78, 0x33, 0xe2, 0x4d, 0xa4, 0xe4, 0xe8, 0xa5, 0xd4, 0xcd, 0x54, 0x42, 0xb3, + 0x3b, 0x61, 0x32, 0x5a, 0xfb, 0x77, 0xfd, 0x25, 0xe2, 0x6e, 0x82, 0x22, 0xd4, 0xdb, 0xce, 0xcb, + 0xb3, 0xcf, 0x0c, 0xaf, 0xb8, 0x7a, 0x9f, 0xd3, 0x6a, 0xa7, 0x2d, 0x3a, 0x63, 0x91, 0xc0, 0x34, + 0x84, 0x1f, 0x3b, 0x53, 0xe2, 0x06, 0x4b, 0x70, 0x68, 0x2c, 0xfa, 0x75, 0xf5, 0xaa, 0x1b, 0x42, + 0x46, 0x79, 0xde, 0xb3, 0x04, 0x3a, 0x70, 0xba, 0xe7, 0x2e, 0x66, 0x7f, 0x34, 0x16, 0x9d, 0x43, + 0x6f, 0x3c, 0xb0, 0x59, 0x95, 0x25, 0x41, 0xdb, 0x46, 0xc7, 0x7f, 0xa0, 0x07, 0xde, 0x22, 0x6d, + 0x22, 0x38, 0xfd, 0x4c, 0xc4, 0xf0, 0x3e, 0x6c, 0x97, 0xb7, 0x62, 0xd4, 0x49, 0x54, 0x92, 0x26, + 0xd9, 0x64, 0x9e, 0xea, 0x5f, 0x97, 0x44, 0x83, 0xf6, 0xc0, 0xfa, 0x2e, 0x52, 0x8b, 0xbc, 0xe8, + 0x3f, 0x48, 0x29, 0x06, 0x0d, 0x12, 0xab, 0x83, 0x34, 0xc9, 0x4e, 0x8a, 0xf0, 0x96, 0x0f, 0xe2, + 0xb8, 0xdb, 0xb5, 0xac, 0xab, 0x96, 0xd5, 0x61, 0x90, 0x4e, 0xf7, 0x48, 0x9f, 0x22, 0xfa, 0x58, + 0xb5, 0x5c, 0x4c, 0xfc, 0xcf, 0x20, 0x95, 0x18, 0x71, 0xe5, 0x00, 0xdf, 0x58, 0x0d, 0x82, 0xbd, + 0x1f, 0xe5, 0x4c, 0x9c, 0xad, 0xb1, 0xae, 0x71, 0xbb, 0x24, 0x28, 0x2b, 0x02, 0xcb, 0xea, 0x28, + 0x4d, 0xb2, 0x71, 0x71, 0x1a, 0xe3, 0xa2, 0x4b, 0xf3, 0x1b, 0x71, 0x69, 0xd1, 0xe9, 0xbd, 0xbd, + 0xe6, 0x93, 0x58, 0xc1, 0xe2, 0xbb, 0x92, 0xe7, 0x71, 0x1f, 0xbf, 0x0c, 0x43, 0x47, 0xd7, 0x5f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xf0, 0xa7, 0xda, 0x7b, 0xbe, 0x01, 0x00, 0x00, } diff --git a/proxy/freedom/config.pb.go b/proxy/freedom/config.pb.go index 4df74210b..eb07692de 100644 --- a/proxy/freedom/config.pb.go +++ b/proxy/freedom/config.pb.go @@ -50,7 +50,7 @@ func (x Config_DomainStrategy) String() string { func (Config_DomainStrategy) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} } type Config struct { - DomainStrategy Config_DomainStrategy `protobuf:"varint,1,opt,name=domainStrategy,enum=com.v2ray.core.proxy.freedom.Config_DomainStrategy" json:"domainStrategy,omitempty"` + DomainStrategy Config_DomainStrategy `protobuf:"varint,1,opt,name=domainStrategy,enum=v2ray.core.proxy.freedom.Config_DomainStrategy" json:"domainStrategy,omitempty"` Timeout uint32 `protobuf:"varint,2,opt,name=timeout" json:"timeout,omitempty"` } @@ -60,24 +60,25 @@ func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func init() { - proto.RegisterType((*Config)(nil), "com.v2ray.core.proxy.freedom.Config") - proto.RegisterEnum("com.v2ray.core.proxy.freedom.Config_DomainStrategy", Config_DomainStrategy_name, Config_DomainStrategy_value) + proto.RegisterType((*Config)(nil), "v2ray.core.proxy.freedom.Config") + proto.RegisterEnum("v2ray.core.proxy.freedom.Config_DomainStrategy", Config_DomainStrategy_name, Config_DomainStrategy_value) } func init() { proto.RegisterFile("v2ray.com/core/proxy/freedom/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 188 bytes of a gzipped FileDescriptorProto + // 199 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2c, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8, 0xd4, 0x4f, 0x2b, 0x4a, 0x4d, 0x4d, 0x01, 0x0b, 0xe5, 0xa5, 0x65, 0xa6, 0xeb, 0x15, 0x14, 0xe5, - 0x97, 0xe4, 0x0b, 0xc9, 0x24, 0xe7, 0xe7, 0xea, 0xc1, 0x94, 0x17, 0xa5, 0xea, 0x81, 0x95, 0xea, - 0x41, 0x95, 0x2a, 0xad, 0x60, 0xe4, 0x62, 0x73, 0x06, 0x2b, 0x17, 0x8a, 0xe6, 0xe2, 0x4b, 0xc9, - 0xcf, 0x4d, 0xcc, 0xcc, 0x0b, 0x2e, 0x29, 0x4a, 0x2c, 0x49, 0x4d, 0xaf, 0x94, 0x60, 0x54, 0x60, - 0xd4, 0xe0, 0x33, 0x32, 0xd6, 0xc3, 0x67, 0x82, 0x1e, 0x44, 0xb7, 0x9e, 0x0b, 0x8a, 0xd6, 0x20, - 0x34, 0xa3, 0x84, 0x24, 0xb8, 0xd8, 0x4b, 0x32, 0x73, 0x53, 0xf3, 0x4b, 0x4b, 0x24, 0x98, 0x14, - 0x18, 0x35, 0x78, 0x83, 0x60, 0x5c, 0x25, 0x75, 0x2e, 0x3e, 0x54, 0xbd, 0x42, 0x9c, 0x5c, 0xac, - 0x8e, 0xc1, 0xf1, 0x9e, 0xc1, 0x02, 0x0c, 0x42, 0x5c, 0x5c, 0x6c, 0xa1, 0xc1, 0xae, 0xf1, 0x9e, - 0x01, 0x02, 0x8c, 0x4e, 0x9c, 0x51, 0xec, 0x50, 0x3b, 0x93, 0xd8, 0xc0, 0x5e, 0x33, 0x06, 0x04, - 0x00, 0x00, 0xff, 0xff, 0x62, 0xf0, 0x2b, 0xbf, 0x07, 0x01, 0x00, 0x00, + 0x97, 0xe4, 0x0b, 0x49, 0xc0, 0x94, 0x16, 0xa5, 0xea, 0x81, 0x95, 0xe9, 0x41, 0x95, 0x29, 0x2d, + 0x61, 0xe4, 0x62, 0x73, 0x06, 0x2b, 0x15, 0x0a, 0xe7, 0xe2, 0x4b, 0xc9, 0xcf, 0x4d, 0xcc, 0xcc, + 0x0b, 0x2e, 0x29, 0x4a, 0x2c, 0x49, 0x4d, 0xaf, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x33, 0xd2, + 0xd7, 0xc3, 0xa5, 0x5b, 0x0f, 0xa2, 0x53, 0xcf, 0x05, 0x45, 0x5b, 0x10, 0x9a, 0x31, 0x42, 0x12, + 0x5c, 0xec, 0x25, 0x99, 0xb9, 0xa9, 0xf9, 0xa5, 0x25, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xbc, 0x41, + 0x30, 0xae, 0x92, 0x3a, 0x17, 0x1f, 0xaa, 0x5e, 0x21, 0x4e, 0x2e, 0x56, 0xc7, 0xe0, 0x78, 0xcf, + 0x60, 0x01, 0x06, 0x21, 0x2e, 0x2e, 0xb6, 0xd0, 0x60, 0xd7, 0x78, 0xcf, 0x00, 0x01, 0x46, 0x27, + 0x13, 0x2e, 0x99, 0xe4, 0xfc, 0x5c, 0x9c, 0x0e, 0x71, 0xe2, 0x86, 0xb8, 0x24, 0x00, 0xe4, 0xdb, + 0x28, 0x76, 0xa8, 0x68, 0x12, 0x1b, 0xd8, 0xf7, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, + 0x2d, 0x5d, 0x28, 0x2a, 0x01, 0x00, 0x00, } diff --git a/proxy/http/config.pb.go b/proxy/http/config.pb.go index 899e5f86c..db9cefcfc 100644 --- a/proxy/http/config.pb.go +++ b/proxy/http/config.pb.go @@ -49,21 +49,22 @@ func (*ClientConfig) ProtoMessage() {} func (*ClientConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func init() { - proto.RegisterType((*ServerConfig)(nil), "com.v2ray.core.proxy.http.ServerConfig") - proto.RegisterType((*ClientConfig)(nil), "com.v2ray.core.proxy.http.ClientConfig") + proto.RegisterType((*ServerConfig)(nil), "v2ray.core.proxy.http.ServerConfig") + proto.RegisterType((*ClientConfig)(nil), "v2ray.core.proxy.http.ClientConfig") } func init() { proto.RegisterFile("v2ray.com/core/proxy/http/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 136 bytes of a gzipped FileDescriptorProto + // 147 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2b, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8, 0xd4, 0xcf, 0x28, 0x29, 0x29, 0xd0, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x92, 0x4c, 0xce, 0xcf, 0xd5, 0x83, 0xa9, 0x2d, 0x4a, 0xd5, 0x03, 0xab, 0xd3, - 0x03, 0xa9, 0x53, 0xd2, 0xe0, 0xe2, 0x09, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x72, 0x06, 0x6b, 0x10, - 0x92, 0xe0, 0x62, 0x2f, 0xc9, 0xcc, 0x4d, 0xcd, 0x2f, 0x2d, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, - 0x0d, 0x82, 0x71, 0x95, 0xf8, 0xb8, 0x78, 0x9c, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0x20, 0x2a, 0x9d, - 0xd8, 0xa2, 0x58, 0x40, 0x26, 0x24, 0xb1, 0x81, 0xed, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, - 0x1e, 0x85, 0x9f, 0xf9, 0x8d, 0x00, 0x00, 0x00, + 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xa9, 0x2b, 0x4a, 0xd5, 0x03, 0xab, 0xd1, 0x03, 0xa9, 0x51, 0xd2, + 0xe0, 0xe2, 0x09, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x72, 0x06, 0x2b, 0x16, 0x92, 0xe0, 0x62, 0x2f, + 0xc9, 0xcc, 0x4d, 0xcd, 0x2f, 0x2d, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0d, 0x82, 0x71, 0x95, + 0xf8, 0xb8, 0x78, 0x9c, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0x20, 0x2a, 0x9d, 0xf4, 0xb8, 0x24, 0x93, + 0xf3, 0x73, 0xf5, 0xb0, 0x1a, 0xeb, 0xc4, 0x0d, 0x51, 0x14, 0x00, 0xb2, 0x3a, 0x8a, 0x05, 0x24, + 0x94, 0xc4, 0x06, 0x76, 0x87, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x71, 0x5d, 0x1f, 0xb1, + 0x00, 0x00, 0x00, } diff --git a/proxy/shadowsocks/config.pb.go b/proxy/shadowsocks/config.pb.go index 11ea541bf..3e2ad4a1b 100644 --- a/proxy/shadowsocks/config.pb.go +++ b/proxy/shadowsocks/config.pb.go @@ -18,8 +18,8 @@ package shadowsocks import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import com_v2ray_core_common_protocol "v2ray.com/core/common/protocol" -import com_v2ray_core_common_protocol1 "v2ray.com/core/common/protocol" +import v2ray_core_common_protocol "v2ray.com/core/common/protocol" +import v2ray_core_common_protocol1 "v2ray.com/core/common/protocol" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -64,7 +64,7 @@ func (CipherType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []i type Account struct { Password string `protobuf:"bytes,1,opt,name=password" json:"password,omitempty"` - CipherType CipherType `protobuf:"varint,2,opt,name=cipher_type,json=cipherType,enum=com.v2ray.core.proxy.shadowsocks.CipherType" json:"cipher_type,omitempty"` + CipherType CipherType `protobuf:"varint,2,opt,name=cipher_type,json=cipherType,enum=v2ray.core.proxy.shadowsocks.CipherType" json:"cipher_type,omitempty"` } func (m *Account) Reset() { *m = Account{} } @@ -73,8 +73,8 @@ func (*Account) ProtoMessage() {} func (*Account) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } type ServerConfig struct { - UdpEnabled bool `protobuf:"varint,1,opt,name=udp_enabled,json=udpEnabled" json:"udp_enabled,omitempty"` - User *com_v2ray_core_common_protocol.User `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"` + UdpEnabled bool `protobuf:"varint,1,opt,name=udp_enabled,json=udpEnabled" json:"udp_enabled,omitempty"` + User *v2ray_core_common_protocol.User `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"` } func (m *ServerConfig) Reset() { *m = ServerConfig{} } @@ -82,7 +82,7 @@ func (m *ServerConfig) String() string { return proto.CompactTextStri func (*ServerConfig) ProtoMessage() {} func (*ServerConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } -func (m *ServerConfig) GetUser() *com_v2ray_core_common_protocol.User { +func (m *ServerConfig) GetUser() *v2ray_core_common_protocol.User { if m != nil { return m.User } @@ -90,7 +90,7 @@ func (m *ServerConfig) GetUser() *com_v2ray_core_common_protocol.User { } type ClientConfig struct { - Server []*com_v2ray_core_common_protocol1.ServerSpecPB `protobuf:"bytes,1,rep,name=server" json:"server,omitempty"` + Server []*v2ray_core_common_protocol1.ServerSpecPB `protobuf:"bytes,1,rep,name=server" json:"server,omitempty"` } func (m *ClientConfig) Reset() { *m = ClientConfig{} } @@ -98,7 +98,7 @@ func (m *ClientConfig) String() string { return proto.CompactTextStri func (*ClientConfig) ProtoMessage() {} func (*ClientConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } -func (m *ClientConfig) GetServer() []*com_v2ray_core_common_protocol1.ServerSpecPB { +func (m *ClientConfig) GetServer() []*v2ray_core_common_protocol1.ServerSpecPB { if m != nil { return m.Server } @@ -106,37 +106,38 @@ func (m *ClientConfig) GetServer() []*com_v2ray_core_common_protocol1.ServerSpec } func init() { - proto.RegisterType((*Account)(nil), "com.v2ray.core.proxy.shadowsocks.Account") - proto.RegisterType((*ServerConfig)(nil), "com.v2ray.core.proxy.shadowsocks.ServerConfig") - proto.RegisterType((*ClientConfig)(nil), "com.v2ray.core.proxy.shadowsocks.ClientConfig") - proto.RegisterEnum("com.v2ray.core.proxy.shadowsocks.CipherType", CipherType_name, CipherType_value) + proto.RegisterType((*Account)(nil), "v2ray.core.proxy.shadowsocks.Account") + proto.RegisterType((*ServerConfig)(nil), "v2ray.core.proxy.shadowsocks.ServerConfig") + proto.RegisterType((*ClientConfig)(nil), "v2ray.core.proxy.shadowsocks.ClientConfig") + proto.RegisterEnum("v2ray.core.proxy.shadowsocks.CipherType", CipherType_name, CipherType_value) } func init() { proto.RegisterFile("v2ray.com/core/proxy/shadowsocks/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 363 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xcf, 0x6f, 0xda, 0x30, - 0x14, 0xc7, 0x17, 0x40, 0xc0, 0x5e, 0x60, 0xcb, 0x7c, 0x42, 0x5c, 0x16, 0xa1, 0x1d, 0xd8, 0xb4, - 0x39, 0x2c, 0xd3, 0x26, 0xae, 0x21, 0x03, 0x51, 0x55, 0xa5, 0x55, 0x00, 0x55, 0xaa, 0x2a, 0x45, - 0xc1, 0x71, 0x4b, 0x54, 0x12, 0x5b, 0x76, 0x02, 0xcd, 0x7f, 0x5f, 0xd5, 0x21, 0x14, 0xd1, 0x03, - 0x37, 0xfb, 0xe9, 0x7d, 0xde, 0xf7, 0x07, 0xfc, 0xda, 0xda, 0x22, 0xc8, 0x31, 0x61, 0xb1, 0x45, - 0x98, 0xa0, 0x16, 0x17, 0xec, 0x39, 0xb7, 0xe4, 0x3a, 0x08, 0xd9, 0x4e, 0x32, 0xf2, 0x24, 0x2d, - 0xc2, 0x92, 0x87, 0xe8, 0x11, 0x73, 0xc1, 0x52, 0x86, 0x4c, 0xc2, 0x62, 0x5c, 0x22, 0x82, 0x62, - 0xb5, 0x8e, 0x8f, 0xd6, 0xbb, 0xdf, 0x4f, 0x0e, 0x12, 0x16, 0xc7, 0x2c, 0xb1, 0x14, 0x4e, 0xd8, - 0xc6, 0xca, 0x24, 0x15, 0xc5, 0xb1, 0xee, 0xe0, 0xcc, 0xaa, 0xa4, 0x62, 0x4b, 0x85, 0x2f, 0x39, - 0x25, 0x05, 0xd1, 0x4b, 0xa1, 0xe1, 0x10, 0xc2, 0xb2, 0x24, 0x45, 0x5d, 0x68, 0xf2, 0x40, 0xca, - 0x1d, 0x13, 0x61, 0x47, 0x33, 0xb5, 0xfe, 0x47, 0xef, 0xf0, 0x47, 0x57, 0xa0, 0x93, 0x88, 0xaf, - 0xa9, 0xf0, 0xd3, 0x9c, 0xd3, 0x4e, 0xc5, 0xd4, 0xfa, 0x9f, 0xec, 0x9f, 0xf8, 0x9c, 0x77, 0xec, - 0x2a, 0x68, 0x91, 0x73, 0xea, 0x01, 0x39, 0xbc, 0x7b, 0x11, 0xb4, 0xe6, 0xca, 0x8a, 0xab, 0xaa, - 0x40, 0x5f, 0x41, 0xcf, 0x42, 0xee, 0xd3, 0x24, 0x58, 0x6d, 0x68, 0xa1, 0xde, 0xf4, 0x20, 0x0b, - 0xf9, 0xb8, 0x98, 0xa0, 0x21, 0xd4, 0x5e, 0x63, 0x2a, 0x61, 0xdd, 0xfe, 0x76, 0x2a, 0x5c, 0xe4, - 0xc4, 0x65, 0x4e, 0xbc, 0x94, 0x54, 0x78, 0x8a, 0xe8, 0x2d, 0xa0, 0xe5, 0x6e, 0x22, 0x9a, 0xa4, - 0x7b, 0xa9, 0xff, 0x50, 0x2f, 0x5a, 0xe8, 0x68, 0x66, 0xb5, 0xaf, 0xbf, 0x0f, 0x71, 0x7a, 0xab, - 0x30, 0x3a, 0xe7, 0x94, 0xdc, 0x8c, 0xbc, 0x3d, 0xfb, 0xe3, 0x1e, 0xe0, 0x2d, 0x1a, 0xd2, 0xa1, - 0xb1, 0x9c, 0x5d, 0xce, 0xae, 0x6f, 0x67, 0xc6, 0x07, 0xf4, 0x19, 0x74, 0x67, 0x3c, 0xf7, 0x7f, - 0xdb, 0x43, 0xdf, 0x9d, 0x8c, 0x0c, 0xad, 0x1c, 0xd8, 0x7f, 0xff, 0xa9, 0x41, 0x05, 0xb5, 0xa0, - 0xe9, 0x4e, 0x1d, 0x77, 0xea, 0xd8, 0x03, 0xa3, 0x8a, 0xbe, 0x40, 0xbb, 0xfc, 0xf9, 0x17, 0xe3, - 0xc9, 0xc2, 0xa8, 0x8d, 0xda, 0x77, 0xfa, 0x51, 0x89, 0xab, 0xba, 0xf2, 0xf2, 0xe7, 0x25, 0x00, - 0x00, 0xff, 0xff, 0x37, 0xac, 0x76, 0x71, 0x5a, 0x02, 0x00, 0x00, + // 370 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x50, 0xdd, 0xaf, 0xd2, 0x30, + 0x14, 0x77, 0xf7, 0xde, 0x5c, 0xf0, 0x14, 0x75, 0xf6, 0x89, 0x10, 0x13, 0x17, 0x9e, 0xa6, 0x89, + 0x1d, 0xce, 0x8f, 0xf8, 0xe0, 0x83, 0xdb, 0x02, 0x81, 0x98, 0x20, 0x19, 0x10, 0x13, 0x63, 0xb2, + 0x8c, 0xae, 0x0a, 0x91, 0xad, 0x4d, 0xbb, 0x81, 0xfb, 0xef, 0x0d, 0x2d, 0x43, 0xe4, 0x01, 0xdf, + 0x7a, 0x4e, 0x7f, 0x9f, 0x07, 0x5e, 0xed, 0x7c, 0x99, 0xd6, 0x84, 0xf2, 0xdc, 0xa3, 0x5c, 0x32, + 0x4f, 0x48, 0xfe, 0xbb, 0xf6, 0xd4, 0x3a, 0xcd, 0xf8, 0x5e, 0x71, 0xfa, 0x4b, 0x79, 0x94, 0x17, + 0x3f, 0x36, 0x3f, 0x89, 0x90, 0xbc, 0xe4, 0xf8, 0x59, 0x03, 0x97, 0x8c, 0x68, 0x28, 0x39, 0x83, + 0xf6, 0x5e, 0x5c, 0x88, 0x51, 0x9e, 0xe7, 0xbc, 0xf0, 0x34, 0x95, 0xf2, 0xad, 0x57, 0x29, 0x26, + 0x8d, 0x50, 0x6f, 0xf0, 0x1f, 0xa8, 0x62, 0x72, 0xc7, 0x64, 0xa2, 0x04, 0xa3, 0x86, 0xd1, 0x17, + 0xd0, 0x0a, 0x28, 0xe5, 0x55, 0x51, 0xe2, 0x1e, 0xb4, 0x45, 0xaa, 0xd4, 0x9e, 0xcb, 0xac, 0x6b, + 0x39, 0x96, 0xfb, 0x30, 0x3e, 0xcd, 0x78, 0x02, 0x88, 0x6e, 0xc4, 0x9a, 0xc9, 0xa4, 0xac, 0x05, + 0xeb, 0xde, 0x38, 0x96, 0xfb, 0xd8, 0x77, 0xc9, 0xb5, 0xdc, 0x24, 0xd2, 0x84, 0x45, 0x2d, 0x58, + 0x0c, 0xf4, 0xf4, 0xee, 0x33, 0xe8, 0xcc, 0x75, 0x8c, 0x48, 0x9f, 0x00, 0x3f, 0x07, 0x54, 0x65, + 0x22, 0x61, 0x45, 0xba, 0xda, 0x32, 0xe3, 0xdc, 0x8e, 0xa1, 0xca, 0xc4, 0xd0, 0x6c, 0xf0, 0x5b, + 0xb8, 0x3b, 0x54, 0xd4, 0xa6, 0xc8, 0x77, 0xce, 0x4d, 0x4d, 0x3f, 0xd2, 0xf4, 0x23, 0x4b, 0xc5, + 0x64, 0xac, 0xd1, 0xfd, 0x19, 0x74, 0xa2, 0xed, 0x86, 0x15, 0xe5, 0xd1, 0xe6, 0x13, 0xdc, 0x9b, + 0xf6, 0x5d, 0xcb, 0xb9, 0x75, 0xd1, 0xbf, 0xe1, 0x2f, 0x75, 0x4c, 0xc0, 0xb9, 0x60, 0x74, 0x16, + 0xc6, 0x47, 0xde, 0xcb, 0xef, 0x00, 0x7f, 0x2b, 0x61, 0x04, 0xad, 0xe5, 0xf4, 0xf3, 0xf4, 0xcb, + 0xd7, 0xa9, 0xfd, 0x00, 0x3f, 0x01, 0x14, 0x0c, 0xe7, 0xc9, 0x6b, 0xff, 0x43, 0x12, 0x8d, 0x42, + 0xdb, 0x6a, 0x16, 0xfe, 0xbb, 0xf7, 0x7a, 0x71, 0x83, 0x3b, 0xd0, 0x8e, 0xc6, 0x41, 0x34, 0x0e, + 0xfc, 0x81, 0x7d, 0x8b, 0x9f, 0xc2, 0xa3, 0x66, 0x4a, 0x26, 0xc3, 0xd1, 0xc2, 0xbe, 0x0b, 0x3f, + 0x82, 0x43, 0x79, 0x7e, 0xf5, 0xa2, 0x21, 0x32, 0x5d, 0x66, 0x87, 0x98, 0xdf, 0xd0, 0xd9, 0xcf, + 0xea, 0x5e, 0x47, 0x7f, 0xf3, 0x27, 0x00, 0x00, 0xff, 0xff, 0x62, 0xda, 0x5c, 0xcd, 0x79, 0x02, + 0x00, 0x00, } diff --git a/proxy/socks/config.pb.go b/proxy/socks/config.pb.go index 232be80e8..17eb84189 100644 --- a/proxy/socks/config.pb.go +++ b/proxy/socks/config.pb.go @@ -18,8 +18,8 @@ package socks import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import com_v2ray_core_common_net "v2ray.com/core/common/net" -import com_v2ray_core_common_protocol1 "v2ray.com/core/common/protocol" +import v2ray_core_common_net "v2ray.com/core/common/net" +import v2ray_core_common_protocol1 "v2ray.com/core/common/protocol" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -64,11 +64,11 @@ func (*Account) ProtoMessage() {} func (*Account) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } type ServerConfig struct { - AuthType AuthType `protobuf:"varint,1,opt,name=auth_type,json=authType,enum=com.v2ray.core.proxy.socks.AuthType" json:"auth_type,omitempty"` - Accounts map[string]string `protobuf:"bytes,2,rep,name=accounts" json:"accounts,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Address *com_v2ray_core_common_net.AddressPB `protobuf:"bytes,3,opt,name=address" json:"address,omitempty"` - UdpEnabled bool `protobuf:"varint,4,opt,name=udp_enabled,json=udpEnabled" json:"udp_enabled,omitempty"` - Timeout uint32 `protobuf:"varint,5,opt,name=timeout" json:"timeout,omitempty"` + AuthType AuthType `protobuf:"varint,1,opt,name=auth_type,json=authType,enum=v2ray.core.proxy.socks.AuthType" json:"auth_type,omitempty"` + Accounts map[string]string `protobuf:"bytes,2,rep,name=accounts" json:"accounts,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Address *v2ray_core_common_net.AddressPB `protobuf:"bytes,3,opt,name=address" json:"address,omitempty"` + UdpEnabled bool `protobuf:"varint,4,opt,name=udp_enabled,json=udpEnabled" json:"udp_enabled,omitempty"` + Timeout uint32 `protobuf:"varint,5,opt,name=timeout" json:"timeout,omitempty"` } func (m *ServerConfig) Reset() { *m = ServerConfig{} } @@ -83,7 +83,7 @@ func (m *ServerConfig) GetAccounts() map[string]string { return nil } -func (m *ServerConfig) GetAddress() *com_v2ray_core_common_net.AddressPB { +func (m *ServerConfig) GetAddress() *v2ray_core_common_net.AddressPB { if m != nil { return m.Address } @@ -91,7 +91,7 @@ func (m *ServerConfig) GetAddress() *com_v2ray_core_common_net.AddressPB { } type ClientConfig struct { - Server []*com_v2ray_core_common_protocol1.ServerSpecPB `protobuf:"bytes,1,rep,name=server" json:"server,omitempty"` + Server []*v2ray_core_common_protocol1.ServerSpecPB `protobuf:"bytes,1,rep,name=server" json:"server,omitempty"` } func (m *ClientConfig) Reset() { *m = ClientConfig{} } @@ -99,7 +99,7 @@ func (m *ClientConfig) String() string { return proto.CompactTextStri func (*ClientConfig) ProtoMessage() {} func (*ClientConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } -func (m *ClientConfig) GetServer() []*com_v2ray_core_common_protocol1.ServerSpecPB { +func (m *ClientConfig) GetServer() []*v2ray_core_common_protocol1.ServerSpecPB { if m != nil { return m.Server } @@ -107,41 +107,41 @@ func (m *ClientConfig) GetServer() []*com_v2ray_core_common_protocol1.ServerSpec } func init() { - proto.RegisterType((*Account)(nil), "com.v2ray.core.proxy.socks.Account") - proto.RegisterType((*ServerConfig)(nil), "com.v2ray.core.proxy.socks.ServerConfig") - proto.RegisterType((*ClientConfig)(nil), "com.v2ray.core.proxy.socks.ClientConfig") - proto.RegisterEnum("com.v2ray.core.proxy.socks.AuthType", AuthType_name, AuthType_value) + proto.RegisterType((*Account)(nil), "v2ray.core.proxy.socks.Account") + proto.RegisterType((*ServerConfig)(nil), "v2ray.core.proxy.socks.ServerConfig") + proto.RegisterType((*ClientConfig)(nil), "v2ray.core.proxy.socks.ClientConfig") + proto.RegisterEnum("v2ray.core.proxy.socks.AuthType", AuthType_name, AuthType_value) } func init() { proto.RegisterFile("v2ray.com/core/proxy/socks/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 419 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x91, 0x5f, 0x8b, 0xd3, 0x40, - 0x14, 0xc5, 0x4d, 0x6b, 0x37, 0xd9, 0xdb, 0xae, 0x94, 0xc1, 0x87, 0x90, 0x17, 0x43, 0x51, 0x0c, - 0x22, 0x13, 0xa9, 0x20, 0xa2, 0x20, 0xa4, 0xbb, 0x0b, 0x3e, 0xb9, 0x65, 0x5a, 0x11, 0x7c, 0x29, - 0xb3, 0x93, 0xab, 0x5b, 0x36, 0x99, 0x19, 0x66, 0x26, 0xd5, 0x7c, 0x58, 0xbf, 0x8b, 0x6c, 0x26, - 0x59, 0xfc, 0xb7, 0xbe, 0xcd, 0xcd, 0x3d, 0xf7, 0xe4, 0x9e, 0xdf, 0x85, 0xa7, 0x87, 0xa5, 0xe1, - 0x2d, 0x15, 0xaa, 0xce, 0x85, 0x32, 0x98, 0x6b, 0xa3, 0xbe, 0xb7, 0xb9, 0x55, 0xe2, 0xda, 0xe6, - 0x42, 0xc9, 0x2f, 0xfb, 0xaf, 0x54, 0x1b, 0xe5, 0x14, 0x49, 0x84, 0xaa, 0xe9, 0x20, 0x36, 0x48, - 0x3b, 0x21, 0xed, 0x84, 0xc9, 0x9f, 0x26, 0x42, 0xd5, 0xb5, 0x92, 0xb9, 0x44, 0x97, 0xf3, 0xb2, - 0x34, 0x68, 0xad, 0x37, 0x49, 0x5e, 0xfc, 0x5b, 0xd8, 0x35, 0x85, 0xaa, 0x72, 0x8b, 0xe6, 0x80, - 0x66, 0x67, 0x35, 0x0a, 0x3f, 0xb1, 0x28, 0x20, 0x2c, 0x84, 0x50, 0x8d, 0x74, 0x24, 0x81, 0xa8, - 0xb1, 0x68, 0x24, 0xaf, 0x31, 0x0e, 0xd2, 0x20, 0x3b, 0x66, 0xb7, 0xf5, 0x4d, 0x4f, 0x73, 0x6b, - 0xbf, 0x29, 0x53, 0xc6, 0x23, 0xdf, 0x1b, 0xea, 0xc5, 0x8f, 0x11, 0xcc, 0x36, 0x9d, 0xf1, 0x69, - 0x17, 0x88, 0x14, 0x70, 0xcc, 0x1b, 0x77, 0xb5, 0x73, 0xad, 0xf6, 0x4e, 0x0f, 0x96, 0x8f, 0xe9, - 0xdd, 0xf1, 0x68, 0xd1, 0xb8, 0xab, 0x6d, 0xab, 0x91, 0x45, 0xbc, 0x7f, 0x11, 0x06, 0x11, 0xf7, - 0x6b, 0xd9, 0x78, 0x94, 0x8e, 0xb3, 0xe9, 0xf2, 0xd5, 0xff, 0x1c, 0x7e, 0xfd, 0x3d, 0xed, 0xf3, - 0xd8, 0x73, 0xe9, 0x4c, 0xcb, 0x6e, 0x7d, 0xc8, 0x3b, 0x08, 0x7b, 0x5a, 0xf1, 0x38, 0x0d, 0xb2, - 0xe9, 0xdf, 0x4b, 0x79, 0x5c, 0x54, 0xa2, 0xa3, 0x85, 0x57, 0xae, 0x57, 0x6c, 0x18, 0x22, 0x8f, - 0x60, 0xda, 0x94, 0x7a, 0x87, 0x92, 0x5f, 0x56, 0x58, 0xc6, 0xf7, 0xd3, 0x20, 0x8b, 0x18, 0x34, - 0xa5, 0x3e, 0xf7, 0x5f, 0x48, 0x0c, 0xa1, 0xdb, 0xd7, 0xa8, 0x1a, 0x17, 0x4f, 0xd2, 0x20, 0x3b, - 0x61, 0x43, 0x99, 0xbc, 0x85, 0x93, 0xdf, 0xb6, 0x22, 0x73, 0x18, 0x5f, 0x63, 0xdb, 0x63, 0xbe, - 0x79, 0x92, 0x87, 0x30, 0x39, 0xf0, 0xaa, 0xc1, 0x1e, 0xaf, 0x2f, 0xde, 0x8c, 0x5e, 0x07, 0x8b, - 0x2d, 0xcc, 0x4e, 0xab, 0x3d, 0x4a, 0xd7, 0xe3, 0x3d, 0x83, 0x23, 0x7f, 0xc7, 0x38, 0xe8, 0xc8, - 0x3c, 0xbf, 0x23, 0xc6, 0x70, 0xf5, 0x9e, 0xce, 0x46, 0xa3, 0x58, 0xaf, 0x58, 0x3f, 0xfb, 0xec, - 0x09, 0x44, 0x03, 0x77, 0x32, 0x85, 0xf0, 0xc3, 0xc5, 0xae, 0xf8, 0xb8, 0x7d, 0x3f, 0xbf, 0x47, - 0x66, 0x10, 0xad, 0x8b, 0xcd, 0xe6, 0xd3, 0x05, 0x3b, 0x9b, 0x07, 0xab, 0xf0, 0xf3, 0xa4, 0x43, - 0x7c, 0x79, 0xd4, 0xd9, 0xbd, 0xfc, 0x19, 0x00, 0x00, 0xff, 0xff, 0x13, 0x18, 0x73, 0xfe, 0xd1, - 0x02, 0x00, 0x00, + // 428 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0x51, 0x6b, 0xdb, 0x30, + 0x10, 0xc7, 0xe7, 0x64, 0x69, 0xdc, 0x73, 0x3a, 0x82, 0x18, 0xc3, 0xf8, 0x65, 0x26, 0x30, 0x66, + 0xf6, 0x20, 0x97, 0xec, 0x65, 0x74, 0x0c, 0xe6, 0x74, 0x85, 0x3d, 0xb5, 0xc6, 0xe9, 0x18, 0xec, + 0x25, 0xa8, 0xf2, 0x6d, 0x0d, 0xb5, 0x25, 0x21, 0xc9, 0xd9, 0xfc, 0x31, 0xf7, 0x8d, 0x46, 0x2c, + 0xbb, 0xac, 0x25, 0x7d, 0xd3, 0xe9, 0xfe, 0xf7, 0xbf, 0xbb, 0xdf, 0xc1, 0xdb, 0xdd, 0x52, 0xb3, + 0x96, 0x72, 0x59, 0xa7, 0x5c, 0x6a, 0x4c, 0x95, 0x96, 0x7f, 0xda, 0xd4, 0x48, 0x7e, 0x67, 0x52, + 0x2e, 0xc5, 0xcf, 0xed, 0x2f, 0xaa, 0xb4, 0xb4, 0x92, 0xbc, 0x1a, 0x84, 0x1a, 0x69, 0x27, 0xa2, + 0x9d, 0x28, 0x7a, 0x6c, 0xc0, 0x65, 0x5d, 0x4b, 0x91, 0x0a, 0xb4, 0x29, 0x2b, 0x4b, 0x8d, 0xc6, + 0x38, 0x83, 0xe8, 0xf4, 0xb0, 0xb0, 0x4b, 0x72, 0x59, 0xa5, 0x06, 0xf5, 0x0e, 0xf5, 0xc6, 0x28, + 0xe4, 0xae, 0x62, 0x91, 0xc1, 0x34, 0xe3, 0x5c, 0x36, 0xc2, 0x92, 0x08, 0xfc, 0xc6, 0xa0, 0x16, + 0xac, 0xc6, 0xd0, 0x8b, 0xbd, 0xe4, 0xb8, 0xb8, 0x8f, 0xf7, 0x39, 0xc5, 0x8c, 0xf9, 0x2d, 0x75, + 0x19, 0x8e, 0x5c, 0x6e, 0x88, 0x17, 0x7f, 0x47, 0x30, 0x5b, 0x77, 0xc6, 0xe7, 0xdd, 0x32, 0xe4, + 0x13, 0x1c, 0xb3, 0xc6, 0xde, 0x6e, 0x6c, 0xab, 0x9c, 0xd3, 0x8b, 0x65, 0x4c, 0x0f, 0xaf, 0x46, + 0xb3, 0xc6, 0xde, 0x5e, 0xb7, 0x0a, 0x0b, 0x9f, 0xf5, 0x2f, 0x72, 0x09, 0x3e, 0x73, 0x23, 0x99, + 0x70, 0x14, 0x8f, 0x93, 0x60, 0xb9, 0x7c, 0xaa, 0xfa, 0xff, 0xb6, 0xb4, 0xdf, 0xc3, 0x5c, 0x08, + 0xab, 0xdb, 0xe2, 0xde, 0x83, 0x9c, 0xc1, 0xb4, 0xa7, 0x14, 0x8e, 0x63, 0x2f, 0x09, 0x1e, 0x0e, + 0xe3, 0x10, 0x51, 0x81, 0x96, 0x66, 0x4e, 0x95, 0xaf, 0x8a, 0xa1, 0x80, 0xbc, 0x86, 0xa0, 0x29, + 0xd5, 0x06, 0x05, 0xbb, 0xa9, 0xb0, 0x0c, 0x9f, 0xc7, 0x5e, 0xe2, 0x17, 0xd0, 0x94, 0xea, 0xc2, + 0xfd, 0x90, 0x10, 0xa6, 0x76, 0x5b, 0xa3, 0x6c, 0x6c, 0x38, 0x89, 0xbd, 0xe4, 0xa4, 0x18, 0xc2, + 0xe8, 0x23, 0x9c, 0x3c, 0x98, 0x88, 0xcc, 0x61, 0x7c, 0x87, 0x6d, 0x8f, 0x76, 0xff, 0x24, 0x2f, + 0x61, 0xb2, 0x63, 0x55, 0x83, 0x3d, 0x52, 0x17, 0x9c, 0x8d, 0x3e, 0x78, 0x8b, 0x1c, 0x66, 0xe7, + 0xd5, 0x16, 0x85, 0xed, 0x91, 0x7e, 0x86, 0x23, 0x77, 0xbb, 0xd0, 0xeb, 0x88, 0x24, 0x07, 0x56, + 0x18, 0xae, 0xdc, 0x53, 0x59, 0x2b, 0xe4, 0xf9, 0xaa, 0xe8, 0xeb, 0xde, 0xbd, 0x01, 0x7f, 0x60, + 0x4d, 0x02, 0x98, 0x5e, 0x5e, 0x6d, 0xb2, 0x6f, 0xd7, 0x5f, 0xe7, 0xcf, 0xc8, 0x0c, 0xfc, 0x3c, + 0x5b, 0xaf, 0xbf, 0x5f, 0x15, 0x5f, 0xe6, 0xde, 0xea, 0x14, 0x22, 0x2e, 0xeb, 0x27, 0x78, 0xaf, + 0x02, 0x37, 0x4e, 0xbe, 0xef, 0xf4, 0x63, 0xd2, 0xfd, 0xdd, 0x1c, 0x75, 0x7d, 0xdf, 0xff, 0x0b, + 0x00, 0x00, 0xff, 0xff, 0xb4, 0x25, 0x49, 0xd6, 0xe6, 0x02, 0x00, 0x00, } diff --git a/proxy/vmess/account.pb.go b/proxy/vmess/account.pb.go index 6abfd1b39..6e3877b48 100644 --- a/proxy/vmess/account.pb.go +++ b/proxy/vmess/account.pb.go @@ -39,20 +39,21 @@ func (*AccountPB) ProtoMessage() {} func (*AccountPB) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func init() { - proto.RegisterType((*AccountPB)(nil), "com.v2ray.core.proxy.vmess.AccountPB") + proto.RegisterType((*AccountPB)(nil), "v2ray.core.proxy.vmess.AccountPB") } func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/account.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 142 bytes of a gzipped FileDescriptorProto + // 153 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x28, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8, 0xd4, 0x2f, 0xcb, 0x4d, 0x2d, 0x2e, 0xd6, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0xd1, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4a, 0xce, 0xcf, 0xd5, 0x83, 0xa9, 0x2e, 0x4a, 0xd5, 0x03, - 0xab, 0xd4, 0x03, 0xab, 0x54, 0x32, 0xe3, 0xe2, 0x74, 0x84, 0x28, 0x0e, 0x70, 0x12, 0xe2, 0xe3, - 0x62, 0xca, 0x4c, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x62, 0xca, 0x4c, 0x11, 0x92, 0xe4, - 0xe2, 0x48, 0xcc, 0x29, 0x49, 0x2d, 0x8a, 0xcf, 0x4c, 0x91, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x0d, - 0x62, 0x07, 0xf3, 0x3d, 0x53, 0x9c, 0xd8, 0xa3, 0x58, 0xc1, 0x06, 0x24, 0xb1, 0x81, 0xed, 0x30, - 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x3e, 0xde, 0x4b, 0x8f, 0x00, 0x00, 0x00, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x83, 0xa9, 0x2c, 0x4a, 0xd5, 0x03, 0xab, 0xd2, 0x03, 0xab, + 0x52, 0x32, 0xe3, 0xe2, 0x74, 0x84, 0x28, 0x0c, 0x70, 0x12, 0xe2, 0xe3, 0x62, 0xca, 0x4c, 0x91, + 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x62, 0xca, 0x4c, 0x11, 0x92, 0xe4, 0xe2, 0x48, 0xcc, 0x29, + 0x49, 0x2d, 0x8a, 0xcf, 0x4c, 0x91, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x0d, 0x62, 0x07, 0xf3, 0x3d, + 0x53, 0x9c, 0x0c, 0xb9, 0xa4, 0x92, 0xf3, 0x73, 0xf5, 0xb0, 0x9b, 0xea, 0xc4, 0x03, 0x33, 0x13, + 0x64, 0x77, 0x14, 0x2b, 0x58, 0x30, 0x89, 0x0d, 0xec, 0x12, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xe2, 0x1e, 0x29, 0x36, 0xb5, 0x00, 0x00, 0x00, } diff --git a/proxy/vmess/inbound/config.pb.go b/proxy/vmess/inbound/config.pb.go index 33d7ab0b7..20b2b746f 100644 --- a/proxy/vmess/inbound/config.pb.go +++ b/proxy/vmess/inbound/config.pb.go @@ -18,7 +18,7 @@ package inbound import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import com_v2ray_core_common_protocol "v2ray.com/core/common/protocol" +import v2ray_core_common_protocol "v2ray.com/core/common/protocol" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -51,9 +51,9 @@ func (*DefaultConfig) ProtoMessage() {} func (*DefaultConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } type Config struct { - User []*com_v2ray_core_common_protocol.User `protobuf:"bytes,1,rep,name=user" json:"user,omitempty"` - Default *DefaultConfig `protobuf:"bytes,2,opt,name=default" json:"default,omitempty"` - Detour *DetourConfig `protobuf:"bytes,3,opt,name=detour" json:"detour,omitempty"` + User []*v2ray_core_common_protocol.User `protobuf:"bytes,1,rep,name=user" json:"user,omitempty"` + Default *DefaultConfig `protobuf:"bytes,2,opt,name=default" json:"default,omitempty"` + Detour *DetourConfig `protobuf:"bytes,3,opt,name=detour" json:"detour,omitempty"` } func (m *Config) Reset() { *m = Config{} } @@ -61,7 +61,7 @@ func (m *Config) String() string { return proto.CompactTextString(m) func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } -func (m *Config) GetUser() []*com_v2ray_core_common_protocol.User { +func (m *Config) GetUser() []*v2ray_core_common_protocol.User { if m != nil { return m.User } @@ -83,31 +83,31 @@ func (m *Config) GetDetour() *DetourConfig { } func init() { - proto.RegisterType((*DetourConfig)(nil), "com.v2ray.core.proxy.vmess.inbound.DetourConfig") - proto.RegisterType((*DefaultConfig)(nil), "com.v2ray.core.proxy.vmess.inbound.DefaultConfig") - proto.RegisterType((*Config)(nil), "com.v2ray.core.proxy.vmess.inbound.Config") + proto.RegisterType((*DetourConfig)(nil), "v2ray.core.proxy.vmess.inbound.DetourConfig") + proto.RegisterType((*DefaultConfig)(nil), "v2ray.core.proxy.vmess.inbound.DefaultConfig") + proto.RegisterType((*Config)(nil), "v2ray.core.proxy.vmess.inbound.Config") } func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/inbound/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 274 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x90, 0x31, 0x4f, 0xf3, 0x40, - 0x0c, 0x86, 0x95, 0xf4, 0xfb, 0x12, 0xea, 0x52, 0x86, 0x88, 0x21, 0x30, 0xa0, 0x2a, 0x62, 0x28, - 0x8b, 0x0f, 0xc2, 0xc2, 0x88, 0xa0, 0x03, 0x88, 0x2d, 0x12, 0x0b, 0x0b, 0x4a, 0x2f, 0x2e, 0x8a, - 0x94, 0xc4, 0xd5, 0xe5, 0x12, 0xd1, 0x9f, 0xca, 0xbf, 0x41, 0x38, 0x17, 0x21, 0xba, 0xc0, 0xe8, - 0x3b, 0x3f, 0x8f, 0x5f, 0x1b, 0x54, 0x9f, 0x9a, 0x7c, 0x87, 0x9a, 0x6b, 0xa5, 0xd9, 0x90, 0xda, - 0x1a, 0x7e, 0xdf, 0xa9, 0xbe, 0xa6, 0xb6, 0x55, 0x65, 0xb3, 0xe6, 0xae, 0x29, 0x94, 0xe6, 0x66, - 0x53, 0xbe, 0xe1, 0xd6, 0xb0, 0xe5, 0x28, 0xd1, 0x5c, 0xe3, 0x08, 0x19, 0x42, 0x01, 0x50, 0x00, - 0x74, 0xc0, 0xe9, 0xc5, 0x9e, 0x54, 0x73, 0x5d, 0x73, 0xa3, 0x44, 0xa0, 0xb9, 0x52, 0x5d, 0x4b, - 0x66, 0xd0, 0x25, 0x67, 0x70, 0xb8, 0x22, 0xcb, 0x9d, 0xb9, 0x97, 0x21, 0xd1, 0x11, 0xf8, 0x96, - 0x63, 0x6f, 0xe1, 0x2d, 0xa7, 0x99, 0x6f, 0x39, 0xb9, 0x85, 0xf9, 0x8a, 0x36, 0x79, 0x57, 0x59, - 0xd7, 0x70, 0x02, 0x07, 0x79, 0x65, 0xc9, 0xbc, 0x96, 0x85, 0xb4, 0xcd, 0xb3, 0x50, 0xea, 0xc7, - 0x22, 0x3a, 0x86, 0xff, 0x15, 0xf5, 0x54, 0xc5, 0xbe, 0xbc, 0x0f, 0x45, 0xf2, 0xe1, 0x41, 0xe0, - 0xd8, 0x1b, 0xf8, 0xf7, 0x35, 0x3a, 0xf6, 0x16, 0x93, 0xe5, 0x2c, 0x3d, 0xc7, 0xbd, 0x55, 0x86, - 0x98, 0x38, 0xc6, 0xc4, 0xe7, 0x96, 0x4c, 0x26, 0x44, 0xf4, 0x04, 0x61, 0x31, 0xc4, 0x10, 0xf9, - 0x2c, 0xbd, 0xc2, 0xdf, 0xef, 0x80, 0x3f, 0x92, 0x67, 0xa3, 0x21, 0x7a, 0x80, 0xa0, 0x90, 0x9d, - 0xe3, 0x89, 0xb8, 0x2e, 0xff, 0xe6, 0xfa, 0xbe, 0x52, 0xe6, 0xf8, 0xbb, 0xe9, 0x4b, 0xe8, 0xfe, - 0xd7, 0x81, 0xc4, 0xbe, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x81, 0xbc, 0xcb, 0xd1, 0x01, - 0x00, 0x00, + // 283 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x4b, 0xc3, 0x40, + 0x10, 0xc5, 0x49, 0xab, 0x89, 0x4e, 0xac, 0x87, 0xe0, 0x21, 0x7a, 0x28, 0x21, 0xa7, 0x0a, 0xba, + 0x0b, 0xd1, 0x93, 0x27, 0xa9, 0x01, 0xf1, 0x26, 0x01, 0x2f, 0x5e, 0x24, 0xdd, 0x4c, 0x25, 0x90, + 0x64, 0xca, 0x66, 0x13, 0xec, 0x87, 0xf4, 0x3b, 0x49, 0x27, 0x1b, 0xfc, 0x73, 0xb0, 0xc7, 0x19, + 0xde, 0xef, 0xcd, 0x7b, 0x03, 0xb2, 0x4f, 0x74, 0xbe, 0x15, 0x8a, 0x6a, 0xa9, 0x48, 0xa3, 0xdc, + 0x68, 0xfa, 0xd8, 0xca, 0xbe, 0xc6, 0xb6, 0x95, 0x65, 0xb3, 0xa2, 0xae, 0x29, 0xa4, 0xa2, 0x66, + 0x5d, 0xbe, 0x8b, 0x8d, 0x26, 0x43, 0xc1, 0x7c, 0x04, 0x34, 0x0a, 0x16, 0x0b, 0x16, 0x0b, 0x2b, + 0xbe, 0xb8, 0xfc, 0x63, 0xa8, 0xa8, 0xae, 0xa9, 0x91, 0x0c, 0x2b, 0xaa, 0x64, 0xd7, 0xa2, 0x1e, + 0xac, 0xe2, 0x39, 0x9c, 0xa4, 0x68, 0xa8, 0xd3, 0x0f, 0x7c, 0x20, 0x38, 0x85, 0x89, 0xa1, 0xd0, + 0x89, 0x9c, 0xc5, 0x71, 0x36, 0x31, 0x14, 0xdf, 0xc3, 0x2c, 0xc5, 0x75, 0xde, 0x55, 0xc6, 0x0a, + 0xce, 0xe1, 0x28, 0xaf, 0x0c, 0xea, 0xb7, 0xb2, 0x60, 0xd9, 0x2c, 0xf3, 0x78, 0x7e, 0x2a, 0x82, + 0x33, 0x38, 0xac, 0xb0, 0xc7, 0x2a, 0x9c, 0xf0, 0x7e, 0x18, 0xe2, 0x4f, 0x07, 0x5c, 0xcb, 0xde, + 0xc2, 0xc1, 0xee, 0x74, 0xe8, 0x44, 0xd3, 0x85, 0x9f, 0x44, 0xe2, 0x47, 0x8d, 0x21, 0xa2, 0x18, + 0x23, 0x8a, 0x97, 0x16, 0x75, 0xc6, 0xea, 0xe0, 0x11, 0xbc, 0x62, 0x88, 0xc0, 0xc6, 0x7e, 0x72, + 0x2d, 0xfe, 0xef, 0x2f, 0x7e, 0x25, 0xce, 0x46, 0x3a, 0x48, 0xc1, 0x2d, 0xb8, 0x6b, 0x38, 0x65, + 0x9f, 0xab, 0xfd, 0x3e, 0xdf, 0x9f, 0xc9, 0x2c, 0xbb, 0xbc, 0x83, 0x58, 0x51, 0xbd, 0x07, 0x5d, + 0xfa, 0x03, 0xf5, 0xbc, 0xeb, 0xf3, 0xea, 0xd9, 0xed, 0xca, 0xe5, 0x7e, 0x37, 0x5f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xf7, 0x79, 0xbc, 0x25, 0xf2, 0x01, 0x00, 0x00, } diff --git a/proxy/vmess/outbound/config.pb.go b/proxy/vmess/outbound/config.pb.go index 8687c80d3..504b72d05 100644 --- a/proxy/vmess/outbound/config.pb.go +++ b/proxy/vmess/outbound/config.pb.go @@ -16,7 +16,7 @@ package outbound import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import com_v2ray_core_common_protocol1 "v2ray.com/core/common/protocol" +import v2ray_core_common_protocol1 "v2ray.com/core/common/protocol" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -30,7 +30,7 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Config struct { - Receiver []*com_v2ray_core_common_protocol1.ServerSpecPB `protobuf:"bytes,1,rep,name=Receiver,json=receiver" json:"Receiver,omitempty"` + Receiver []*v2ray_core_common_protocol1.ServerSpecPB `protobuf:"bytes,1,rep,name=Receiver,json=receiver" json:"Receiver,omitempty"` } func (m *Config) Reset() { *m = Config{} } @@ -38,7 +38,7 @@ func (m *Config) String() string { return proto.CompactTextString(m) func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } -func (m *Config) GetReceiver() []*com_v2ray_core_common_protocol1.ServerSpecPB { +func (m *Config) GetReceiver() []*v2ray_core_common_protocol1.ServerSpecPB { if m != nil { return m.Receiver } @@ -46,23 +46,24 @@ func (m *Config) GetReceiver() []*com_v2ray_core_common_protocol1.ServerSpecPB { } func init() { - proto.RegisterType((*Config)(nil), "com.v2ray.core.proxy.vmess.outbound.Config") + proto.RegisterType((*Config)(nil), "v2ray.core.proxy.vmess.outbound.Config") } func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/outbound/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 179 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0xce, 0xb1, 0x8a, 0xc2, 0x40, - 0x10, 0xc6, 0x71, 0x8e, 0x83, 0x10, 0xf6, 0xba, 0x54, 0xc7, 0x55, 0x87, 0x36, 0x16, 0x32, 0x23, - 0xf1, 0x0d, 0x62, 0x63, 0x29, 0x49, 0x67, 0x23, 0x66, 0x1c, 0x25, 0xe0, 0x66, 0x96, 0xd9, 0x64, - 0x31, 0x6f, 0x2f, 0x6c, 0xdc, 0x26, 0xfd, 0xfc, 0x7f, 0xdf, 0x98, 0x5d, 0x28, 0xf5, 0x3a, 0x01, - 0x89, 0x45, 0x12, 0x65, 0x74, 0x2a, 0xaf, 0x09, 0x83, 0x65, 0xef, 0x51, 0xc6, 0xa1, 0x95, 0xb1, - 0xbf, 0x21, 0x49, 0x7f, 0xef, 0x1e, 0xe0, 0x54, 0x06, 0x29, 0xd6, 0x24, 0x16, 0x52, 0xa5, 0x0c, - 0xb1, 0x80, 0x58, 0x40, 0x2a, 0xfe, 0x96, 0x2c, 0x89, 0xb5, 0xd2, 0x63, 0x14, 0x48, 0x9e, 0xe8, - 0x59, 0x03, 0xeb, 0xc5, 0x3b, 0xa6, 0x99, 0x5d, 0xd5, 0x26, 0x3b, 0xc4, 0x99, 0xe2, 0x68, 0xf2, - 0x9a, 0x89, 0xbb, 0xc0, 0xfa, 0xfb, 0xf5, 0xff, 0xbd, 0xf9, 0x29, 0xb7, 0xb0, 0xd8, 0x9c, 0x39, - 0x48, 0x1c, 0x34, 0x91, 0x6b, 0x1c, 0xd3, 0xa9, 0xaa, 0x73, 0xfd, 0xd4, 0x95, 0x39, 0xe7, 0xe9, - 0xa3, 0x36, 0x8b, 0xc7, 0xfb, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x12, 0x96, 0x23, 0xf1, - 0x00, 0x00, 0x00, + // 193 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0xce, 0x31, 0x6b, 0xc3, 0x30, + 0x10, 0x05, 0x60, 0x4a, 0xc1, 0x18, 0x79, 0xf3, 0x54, 0xba, 0xb4, 0xb4, 0x8b, 0xa7, 0x53, 0x71, + 0xd7, 0x4e, 0x6e, 0xe6, 0x60, 0xec, 0x2d, 0x4b, 0x88, 0x2f, 0x97, 0x60, 0x88, 0x7c, 0xe2, 0x64, + 0x8b, 0xf8, 0xdf, 0x87, 0xc8, 0x11, 0x84, 0x2c, 0x59, 0x8f, 0xf7, 0xbe, 0x77, 0xea, 0xc7, 0x97, + 0xb2, 0x9b, 0x01, 0xd9, 0x68, 0x64, 0x21, 0x6d, 0x85, 0xcf, 0xb3, 0xf6, 0x86, 0x9c, 0xd3, 0x3c, + 0x8d, 0x1d, 0x4f, 0xc3, 0x5e, 0x23, 0x0f, 0x87, 0xfe, 0x08, 0x56, 0x78, 0xe4, 0xfc, 0x23, 0x36, + 0x84, 0x20, 0xa4, 0x21, 0xa4, 0x21, 0xa6, 0xdf, 0x1f, 0x49, 0x64, 0x63, 0x78, 0xd0, 0xa1, 0x8d, + 0x7c, 0xd2, 0x8e, 0xc4, 0x93, 0x6c, 0x9d, 0x25, 0x5c, 0xc8, 0xaf, 0xb5, 0x4a, 0xfe, 0xc3, 0x44, + 0xbe, 0x52, 0x69, 0x43, 0x48, 0xbd, 0x27, 0x79, 0x7b, 0xf9, 0x7c, 0x2d, 0xb2, 0xb2, 0x80, 0xbb, + 0xbd, 0x85, 0x82, 0x48, 0x41, 0x1b, 0xa8, 0xd6, 0x12, 0xd6, 0x55, 0x93, 0xca, 0xad, 0x59, 0xfd, + 0xa9, 0x6f, 0x64, 0x03, 0x4f, 0x1e, 0xad, 0xb2, 0x65, 0xb4, 0xbe, 0x6a, 0x9b, 0x34, 0x9e, 0xbb, + 0x24, 0xf0, 0xbf, 0x97, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x86, 0x34, 0xb5, 0x1b, 0x01, 0x00, + 0x00, } diff --git a/transport/internet/authenticator.pb.go b/transport/internet/authenticator.pb.go index b7e1f8d1d..c504e821b 100644 --- a/transport/internet/authenticator.pb.go +++ b/transport/internet/authenticator.pb.go @@ -47,7 +47,7 @@ func (m *AuthenticatorConfig) GetSettings() *google_protobuf.Any { } func init() { - proto.RegisterType((*AuthenticatorConfig)(nil), "com.v2ray.core.transport.internet.AuthenticatorConfig") + proto.RegisterType((*AuthenticatorConfig)(nil), "v2ray.core.transport.internet.AuthenticatorConfig") } func init() { @@ -55,17 +55,18 @@ func init() { } var fileDescriptor0 = []byte{ - // 183 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0xce, 0xc1, 0x4a, 0x87, 0x40, - 0x10, 0xc7, 0x71, 0x8c, 0x08, 0xdb, 0x6e, 0x5b, 0x07, 0xeb, 0x64, 0x9d, 0x3c, 0xcd, 0x86, 0xd1, - 0x03, 0x58, 0x6f, 0xe0, 0xb1, 0x4e, 0xeb, 0x32, 0x6e, 0x0b, 0x39, 0x23, 0xe3, 0x18, 0xf8, 0xf6, - 0x81, 0xb2, 0xf2, 0xbf, 0xcd, 0xe1, 0xf7, 0xf9, 0x32, 0xe6, 0xfd, 0xaf, 0x15, 0xbf, 0x41, 0xe0, - 0xc9, 0x05, 0x16, 0x74, 0x2a, 0x9e, 0x96, 0x99, 0x45, 0x5d, 0x22, 0x45, 0x21, 0x54, 0xe7, 0x57, - 0xfd, 0x41, 0xd2, 0x14, 0xbc, 0xb2, 0xc0, 0x2c, 0xac, 0x6c, 0x9f, 0x03, 0x4f, 0x90, 0xa9, 0x20, - 0x9c, 0x0c, 0x32, 0x7b, 0x7a, 0x8c, 0xcc, 0xf1, 0x17, 0xdd, 0x0e, 0x86, 0x75, 0x74, 0x9e, 0xb6, - 0x43, 0xbf, 0x7c, 0x9b, 0xfb, 0xee, 0x32, 0xfa, 0xc9, 0x34, 0xa6, 0x68, 0xad, 0xb9, 0x26, 0x3f, - 0x61, 0x55, 0xd4, 0x45, 0x73, 0xdb, 0xef, 0xb7, 0x7d, 0x35, 0xe5, 0x82, 0xaa, 0x89, 0xe2, 0x52, - 0x5d, 0xd5, 0x45, 0x73, 0xd7, 0x3e, 0xc0, 0x11, 0x86, 0x1c, 0x86, 0x8e, 0xb6, 0xfe, 0x5c, 0x7d, - 0x98, 0xaf, 0x32, 0xff, 0x30, 0xdc, 0xec, 0x9b, 0xb7, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2f, - 0x12, 0x08, 0x8a, 0xe6, 0x00, 0x00, 0x00, + // 197 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x8e, 0xc1, 0x4a, 0xc4, 0x40, + 0x0c, 0x40, 0xa9, 0x88, 0xac, 0xe3, 0x6d, 0xf4, 0xb0, 0x0a, 0xc2, 0xea, 0x69, 0x4f, 0x19, 0xa9, + 0xf8, 0x01, 0xad, 0x3f, 0x20, 0x3d, 0xea, 0x69, 0x3a, 0xa4, 0xe3, 0x80, 0x4d, 0x4a, 0x9a, 0x0a, + 0xfd, 0x7b, 0xb1, 0x65, 0x8a, 0x5e, 0xf6, 0x16, 0xc8, 0x7b, 0x2f, 0x31, 0x2f, 0xdf, 0xa5, 0xf8, + 0x19, 0x02, 0xf7, 0x2e, 0xb0, 0xa0, 0x53, 0xf1, 0x34, 0x0e, 0x2c, 0xea, 0x12, 0x29, 0x0a, 0xa1, + 0x3a, 0x3f, 0xe9, 0x27, 0x92, 0xa6, 0xe0, 0x95, 0x05, 0x06, 0x61, 0x65, 0x7b, 0x9f, 0x35, 0x41, + 0xd8, 0x14, 0xc8, 0xca, 0xdd, 0x6d, 0x64, 0x8e, 0x5f, 0xe8, 0x16, 0xb8, 0x9d, 0x3a, 0xe7, 0x69, + 0x5e, 0xcd, 0xc7, 0x0f, 0x73, 0x5d, 0xfd, 0x0d, 0xbe, 0x32, 0x75, 0x29, 0x5a, 0x6b, 0xce, 0xc9, + 0xf7, 0xb8, 0x2f, 0x0e, 0xc5, 0xf1, 0xb2, 0x59, 0x66, 0xfb, 0x64, 0x76, 0x23, 0xaa, 0x26, 0x8a, + 0xe3, 0xfe, 0xec, 0x50, 0x1c, 0xaf, 0xca, 0x1b, 0x58, 0xc3, 0x90, 0xc3, 0x50, 0xd1, 0xdc, 0x6c, + 0x54, 0x5d, 0x99, 0x87, 0xc0, 0x3d, 0x9c, 0x7c, 0xae, 0xb6, 0xff, 0xee, 0xbf, 0xfd, 0x96, 0xde, + 0x77, 0x79, 0xdb, 0x5e, 0x2c, 0xe9, 0xe7, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x59, 0x3f, 0x6f, + 0x4b, 0x19, 0x01, 0x00, 0x00, } diff --git a/transport/internet/authenticators/noop/config.pb.go b/transport/internet/authenticators/noop/config.pb.go index 674ed2fd2..c1cde8abf 100644 --- a/transport/internet/authenticators/noop/config.pb.go +++ b/transport/internet/authenticators/noop/config.pb.go @@ -37,7 +37,7 @@ func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func init() { - proto.RegisterType((*Config)(nil), "com.v2ray.core.transport.internet.authenticators.noop.Config") + proto.RegisterType((*Config)(nil), "v2ray.core.transport.internet.authenticators.noop.Config") } func init() { @@ -45,13 +45,14 @@ func init() { } var fileDescriptor0 = []byte{ - // 128 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0xcc, 0x41, 0x0a, 0xc2, 0x40, - 0x0c, 0x05, 0xd0, 0x8d, 0x0c, 0xd2, 0xa5, 0x47, 0xf0, 0x00, 0x09, 0x28, 0x5e, 0xa0, 0xde, 0xc2, - 0x5d, 0x0c, 0x51, 0x67, 0xd1, 0xfc, 0x21, 0x8d, 0x82, 0xb7, 0x97, 0x16, 0x46, 0xe8, 0xf6, 0x2d, - 0xde, 0x30, 0x7e, 0x4e, 0x21, 0x5f, 0x52, 0x4c, 0xac, 0x08, 0xe3, 0x0c, 0xf1, 0xb9, 0x21, 0x92, - 0xab, 0xa7, 0x85, 0x5b, 0xb2, 0xbc, 0xf3, 0x65, 0x9e, 0x55, 0x25, 0x11, 0x33, 0x3b, 0xd0, 0x58, - 0xe1, 0x8f, 0xfa, 0xa4, 0x16, 0x48, 0x1c, 0x2e, 0x8a, 0x89, 0xfa, 0x13, 0x46, 0xff, 0x83, 0xfa, - 0x41, 0xdb, 0x83, 0x96, 0xe3, 0xb8, 0x1f, 0xca, 0x75, 0x6d, 0xc6, 0x72, 0xdb, 0x2d, 0x72, 0x2f, - 0xeb, 0x77, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0x83, 0x2b, 0x5a, 0x85, 0x95, 0x00, 0x00, 0x00, + // 143 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0xce, 0x31, 0x0a, 0x02, 0x31, + 0x10, 0x85, 0xe1, 0x46, 0x16, 0x89, 0x9d, 0x47, 0xf0, 0x00, 0x33, 0xa8, 0x78, 0x81, 0xd8, 0x59, + 0x59, 0xdb, 0xc5, 0x30, 0x6a, 0x8a, 0x9d, 0x17, 0x66, 0x47, 0xc1, 0xdb, 0x4b, 0x56, 0x56, 0xb0, + 0xdc, 0xf6, 0xc1, 0xff, 0xf1, 0x42, 0x7c, 0xed, 0x2c, 0xbd, 0x29, 0xa3, 0xe7, 0x0c, 0x13, 0x76, + 0x4b, 0x3a, 0x54, 0x98, 0x73, 0x51, 0x17, 0x53, 0x71, 0x4e, 0x4f, 0x7f, 0x88, 0x7a, 0xc9, 0xc9, + 0x61, 0x03, 0x2b, 0x50, 0x39, 0x43, 0x6f, 0xe5, 0x4e, 0xd5, 0xe0, 0x58, 0x6f, 0x27, 0xc3, 0x84, + 0x7e, 0x3d, 0x4d, 0x3d, 0xfd, 0xf7, 0xd4, 0xfa, 0xcd, 0x32, 0x74, 0xc7, 0x91, 0x88, 0xa7, 0x70, + 0xc8, 0xe8, 0x69, 0x36, 0x11, 0x57, 0x5f, 0xe0, 0xdc, 0x2e, 0x5c, 0x16, 0x6d, 0xba, 0x76, 0xe3, + 0x9f, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0xd9, 0xdf, 0x5d, 0xf9, 0xd5, 0x00, 0x00, 0x00, } diff --git a/transport/internet/authenticators/srtp/config.pb.go b/transport/internet/authenticators/srtp/config.pb.go index 4f52f0f3c..a622e6a67 100644 --- a/transport/internet/authenticators/srtp/config.pb.go +++ b/transport/internet/authenticators/srtp/config.pb.go @@ -43,7 +43,7 @@ func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func init() { - proto.RegisterType((*Config)(nil), "com.v2ray.core.transport.internet.authenticators.srtp.Config") + proto.RegisterType((*Config)(nil), "v2ray.core.transport.internet.authenticators.srtp.Config") } func init() { @@ -51,20 +51,21 @@ func init() { } var fileDescriptor0 = []byte{ - // 237 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x8f, 0xc1, 0x4a, 0x73, 0x31, - 0x10, 0x85, 0xb9, 0xff, 0x5f, 0xa3, 0x8d, 0xba, 0xc9, 0x42, 0xb2, 0x50, 0xa8, 0xae, 0xba, 0x4a, - 0x40, 0xf1, 0x05, 0xda, 0x37, 0x28, 0xae, 0xdc, 0x94, 0x98, 0x3b, 0xd6, 0xa0, 0x77, 0x26, 0x4c, - 0xa6, 0xc5, 0xfb, 0x5e, 0x3e, 0xa0, 0x24, 0xf4, 0x2a, 0x2e, 0xcf, 0x77, 0x38, 0x1f, 0x33, 0x7a, - 0x75, 0xb8, 0xe7, 0x30, 0xba, 0x48, 0x83, 0x8f, 0xc4, 0xe0, 0x85, 0x03, 0x96, 0x4c, 0x2c, 0x3e, - 0xa1, 0x00, 0x23, 0x88, 0x0f, 0x7b, 0x79, 0x03, 0x94, 0x14, 0x83, 0x10, 0x17, 0x5f, 0x58, 0xb2, - 0x8f, 0x84, 0xaf, 0x69, 0xe7, 0x32, 0x93, 0x90, 0x79, 0x8c, 0x34, 0xb8, 0xc9, 0xc3, 0xe0, 0x7e, - 0x1c, 0x6e, 0x72, 0xb8, 0xbf, 0x0e, 0x57, 0x1d, 0x77, 0x5f, 0x9d, 0x56, 0xeb, 0xe6, 0x31, 0x56, - 0x9f, 0x1e, 0x80, 0x4b, 0x22, 0xb4, 0xdd, 0xa2, 0x5b, 0x5e, 0x6e, 0xa6, 0x58, 0x9b, 0x1c, 0xfa, - 0x3e, 0xe1, 0xce, 0xfe, 0x5b, 0x74, 0xcb, 0xb3, 0xcd, 0x14, 0xcd, 0xb5, 0x9e, 0xc3, 0xa7, 0x00, - 0xb6, 0xd5, 0xff, 0xd6, 0xfd, 0x02, 0x73, 0xa3, 0x75, 0x2c, 0x1c, 0xb7, 0x91, 0xf6, 0x28, 0x76, - 0xd6, 0xa4, 0xf3, 0x4a, 0xd6, 0x15, 0x98, 0x2b, 0xad, 0x86, 0xc0, 0xef, 0xc0, 0xf6, 0xa4, 0x2d, - 0x8f, 0xc9, 0xdc, 0xea, 0x8b, 0x1c, 0xc6, 0x0f, 0x0a, 0xfd, 0x56, 0xc6, 0x0c, 0x56, 0xb5, 0xe1, - 0xf9, 0x91, 0x3d, 0x8d, 0x19, 0x56, 0xea, 0x79, 0x56, 0xcf, 0x7f, 0x51, 0xed, 0xf9, 0x87, 0xef, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xdc, 0x7b, 0x73, 0x42, 0x01, 0x00, 0x00, + // 249 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x90, 0xb1, 0x4e, 0xc3, 0x30, + 0x10, 0x86, 0x15, 0x28, 0x81, 0xba, 0xb0, 0x78, 0x40, 0x1e, 0x40, 0x2a, 0x4c, 0x9d, 0x6c, 0x01, + 0xe2, 0x05, 0xd2, 0x8d, 0x09, 0x55, 0x4c, 0x2c, 0x95, 0x71, 0x8e, 0x62, 0x41, 0x7c, 0xd6, 0xf9, + 0x5a, 0x91, 0xf7, 0xe2, 0x01, 0x91, 0x4d, 0x02, 0x62, 0xec, 0xf8, 0x7f, 0xa7, 0xef, 0x97, 0xee, + 0x17, 0xcd, 0xee, 0x96, 0x6c, 0xaf, 0x1d, 0x76, 0xc6, 0x21, 0x81, 0x61, 0xb2, 0x21, 0x45, 0x24, + 0x36, 0x3e, 0x30, 0x50, 0x00, 0x36, 0x76, 0xcb, 0x6f, 0x10, 0xd8, 0x3b, 0xcb, 0x48, 0xc9, 0x24, + 0xe2, 0x68, 0x1c, 0x86, 0x57, 0xbf, 0xd1, 0x91, 0x90, 0x51, 0xde, 0x8c, 0x1d, 0x04, 0xfa, 0xd7, + 0xd7, 0xa3, 0xaf, 0xff, 0xfb, 0x3a, 0xfb, 0xd7, 0x5f, 0x95, 0xa8, 0x97, 0xa5, 0x43, 0x2a, 0x71, + 0xbc, 0x03, 0x4a, 0x1e, 0x83, 0xaa, 0xe6, 0xd5, 0xe2, 0x6c, 0x35, 0xc6, 0x7c, 0x89, 0xb6, 0x6d, + 0x7d, 0xd8, 0xa8, 0x83, 0x79, 0xb5, 0x38, 0x59, 0x8d, 0x51, 0x5e, 0x88, 0x29, 0x7c, 0x32, 0x84, + 0x62, 0x1d, 0x96, 0xdb, 0x1f, 0x90, 0x97, 0x42, 0xb8, 0x44, 0x6e, 0xed, 0x70, 0x1b, 0x58, 0x4d, + 0x4a, 0xe9, 0x34, 0x93, 0x65, 0x06, 0xf2, 0x5c, 0xd4, 0x9d, 0xa5, 0x77, 0x20, 0x75, 0x54, 0xcc, + 0x21, 0xc9, 0x2b, 0x71, 0x1a, 0x6d, 0xff, 0x81, 0xb6, 0x5d, 0x73, 0x1f, 0x41, 0xd5, 0x45, 0x9c, + 0x0d, 0xec, 0xa9, 0x8f, 0xd0, 0x3c, 0x88, 0x7b, 0x87, 0x9d, 0xde, 0xfb, 0xdf, 0x66, 0xf6, 0xf3, + 0xec, 0x63, 0xde, 0xeb, 0x79, 0x92, 0xd1, 0x4b, 0x5d, 0xc6, 0xbb, 0xfb, 0x0e, 0x00, 0x00, 0xff, + 0xff, 0xaa, 0xef, 0x11, 0xea, 0x82, 0x01, 0x00, 0x00, } diff --git a/transport/internet/authenticators/utp/config.pb.go b/transport/internet/authenticators/utp/config.pb.go index 13f564b5f..94ad59745 100644 --- a/transport/internet/authenticators/utp/config.pb.go +++ b/transport/internet/authenticators/utp/config.pb.go @@ -38,7 +38,7 @@ func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func init() { - proto.RegisterType((*Config)(nil), "com.v2ray.core.transport.internet.authenticators.utp.Config") + proto.RegisterType((*Config)(nil), "v2ray.core.transport.internet.authenticators.utp.Config") } func init() { @@ -46,15 +46,16 @@ func init() { } var fileDescriptor0 = []byte{ - // 149 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0xcd, 0x31, 0x0a, 0xc2, 0x40, - 0x10, 0x46, 0x61, 0x82, 0x18, 0x21, 0x60, 0x93, 0x2a, 0xa5, 0xa4, 0xb2, 0x9a, 0x01, 0xf5, 0x02, - 0xea, 0x0d, 0x2c, 0xed, 0xd6, 0x65, 0xd4, 0x2d, 0x32, 0xb3, 0x4c, 0xfe, 0x0d, 0x78, 0x7b, 0x21, - 0x10, 0xc1, 0xf2, 0x35, 0xdf, 0x6b, 0xce, 0xd3, 0xc1, 0xc3, 0x87, 0xa2, 0x0d, 0x1c, 0xcd, 0x85, - 0xe1, 0x41, 0xc7, 0x6c, 0x0e, 0x4e, 0x0a, 0x71, 0x15, 0x70, 0x28, 0x78, 0x8b, 0x22, 0xc5, 0x00, - 0xf3, 0x91, 0x0b, 0x32, 0x47, 0xd3, 0x67, 0x7a, 0x51, 0x76, 0x83, 0xb5, 0xa7, 0x68, 0x03, 0x2d, - 0x8c, 0x0b, 0xfd, 0x08, 0x5a, 0x08, 0xfa, 0x27, 0xa8, 0x20, 0xf7, 0x7d, 0x53, 0x5f, 0x67, 0xa5, - 0xed, 0x9a, 0xcd, 0x24, 0x3e, 0x26, 0xd3, 0xae, 0xda, 0x55, 0xfb, 0xed, 0x6d, 0xc9, 0xcb, 0xfa, - 0xbe, 0x2a, 0xc8, 0x8f, 0x7a, 0xfe, 0x1c, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xba, 0xf9, 0x6d, - 0x52, 0xac, 0x00, 0x00, 0x00, + // 164 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0xce, 0xb1, 0xaa, 0xc2, 0x40, + 0x10, 0x85, 0x61, 0xc2, 0x85, 0x5c, 0x58, 0xb1, 0x49, 0x95, 0x52, 0x52, 0x59, 0xcd, 0x88, 0xfa, + 0x02, 0xc6, 0xc6, 0x52, 0x2c, 0xed, 0xd6, 0x65, 0xd4, 0x2d, 0x32, 0xb3, 0x4c, 0x66, 0x03, 0xbe, + 0xbd, 0x18, 0x89, 0x60, 0x69, 0x79, 0x8a, 0xff, 0xe3, 0xb8, 0xdd, 0xb0, 0x56, 0xff, 0x80, 0x20, + 0x1d, 0x06, 0x51, 0x42, 0x53, 0xcf, 0x7d, 0x12, 0x35, 0x8c, 0x6c, 0xa4, 0x4c, 0x86, 0x3e, 0xdb, + 0x9d, 0xd8, 0x62, 0xf0, 0x26, 0xda, 0x63, 0xb6, 0x84, 0x41, 0xf8, 0x1a, 0x6f, 0x90, 0x54, 0x4c, + 0xaa, 0xd5, 0x44, 0x28, 0xc1, 0x27, 0x87, 0x29, 0x87, 0xef, 0x1c, 0xb2, 0xa5, 0xa6, 0x71, 0xe5, + 0x7e, 0x14, 0xaa, 0xda, 0xfd, 0x0f, 0xa4, 0x7d, 0x14, 0xae, 0x8b, 0x45, 0xb1, 0x9c, 0x9f, 0xa6, + 0xd9, 0x1e, 0xdc, 0x36, 0x48, 0x07, 0xbf, 0xda, 0xed, 0xec, 0x2d, 0x1f, 0x5f, 0xd7, 0xce, 0x7f, + 0xd9, 0xd2, 0xa5, 0x1c, 0x6f, 0x6e, 0x9e, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x9e, 0x7f, 0x08, + 0xeb, 0x00, 0x00, 0x00, } diff --git a/transport/internet/kcp/config.pb.go b/transport/internet/kcp/config.pb.go index 367fa04b3..76a020b38 100644 --- a/transport/internet/kcp/config.pb.go +++ b/transport/internet/kcp/config.pb.go @@ -22,7 +22,7 @@ package kcp import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import com_v2ray_core_transport_internet "v2ray.com/core/transport/internet" +import v2ray_core_transport_internet "v2ray.com/core/transport/internet" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -96,14 +96,14 @@ func (*ReadBuffer) ProtoMessage() {} func (*ReadBuffer) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } type Config struct { - Mtu *MTU `protobuf:"bytes,1,opt,name=mtu" json:"mtu,omitempty"` - Tti *TTI `protobuf:"bytes,2,opt,name=tti" json:"tti,omitempty"` - UplinkCapacity *UplinkCapacity `protobuf:"bytes,3,opt,name=uplink_capacity,json=uplinkCapacity" json:"uplink_capacity,omitempty"` - DownlinkCapacity *DownlinkCapacity `protobuf:"bytes,4,opt,name=downlink_capacity,json=downlinkCapacity" json:"downlink_capacity,omitempty"` - Congestion bool `protobuf:"varint,5,opt,name=congestion" json:"congestion,omitempty"` - WriteBuffer *WriteBuffer `protobuf:"bytes,6,opt,name=write_buffer,json=writeBuffer" json:"write_buffer,omitempty"` - ReadBuffer *ReadBuffer `protobuf:"bytes,7,opt,name=read_buffer,json=readBuffer" json:"read_buffer,omitempty"` - HeaderConfig *com_v2ray_core_transport_internet.AuthenticatorConfig `protobuf:"bytes,8,opt,name=header_config,json=headerConfig" json:"header_config,omitempty"` + Mtu *MTU `protobuf:"bytes,1,opt,name=mtu" json:"mtu,omitempty"` + Tti *TTI `protobuf:"bytes,2,opt,name=tti" json:"tti,omitempty"` + UplinkCapacity *UplinkCapacity `protobuf:"bytes,3,opt,name=uplink_capacity,json=uplinkCapacity" json:"uplink_capacity,omitempty"` + DownlinkCapacity *DownlinkCapacity `protobuf:"bytes,4,opt,name=downlink_capacity,json=downlinkCapacity" json:"downlink_capacity,omitempty"` + Congestion bool `protobuf:"varint,5,opt,name=congestion" json:"congestion,omitempty"` + WriteBuffer *WriteBuffer `protobuf:"bytes,6,opt,name=write_buffer,json=writeBuffer" json:"write_buffer,omitempty"` + ReadBuffer *ReadBuffer `protobuf:"bytes,7,opt,name=read_buffer,json=readBuffer" json:"read_buffer,omitempty"` + HeaderConfig *v2ray_core_transport_internet.AuthenticatorConfig `protobuf:"bytes,8,opt,name=header_config,json=headerConfig" json:"header_config,omitempty"` } func (m *Config) Reset() { *m = Config{} } @@ -153,7 +153,7 @@ func (m *Config) GetReadBuffer() *ReadBuffer { return nil } -func (m *Config) GetHeaderConfig() *com_v2ray_core_transport_internet.AuthenticatorConfig { +func (m *Config) GetHeaderConfig() *v2ray_core_transport_internet.AuthenticatorConfig { if m != nil { return m.HeaderConfig } @@ -161,43 +161,43 @@ func (m *Config) GetHeaderConfig() *com_v2ray_core_transport_internet.Authentica } func init() { - proto.RegisterType((*MTU)(nil), "com.v2ray.core.transport.internet.kcp.MTU") - proto.RegisterType((*TTI)(nil), "com.v2ray.core.transport.internet.kcp.TTI") - proto.RegisterType((*UplinkCapacity)(nil), "com.v2ray.core.transport.internet.kcp.UplinkCapacity") - proto.RegisterType((*DownlinkCapacity)(nil), "com.v2ray.core.transport.internet.kcp.DownlinkCapacity") - proto.RegisterType((*WriteBuffer)(nil), "com.v2ray.core.transport.internet.kcp.WriteBuffer") - proto.RegisterType((*ReadBuffer)(nil), "com.v2ray.core.transport.internet.kcp.ReadBuffer") - proto.RegisterType((*Config)(nil), "com.v2ray.core.transport.internet.kcp.Config") + proto.RegisterType((*MTU)(nil), "v2ray.core.transport.internet.kcp.MTU") + proto.RegisterType((*TTI)(nil), "v2ray.core.transport.internet.kcp.TTI") + proto.RegisterType((*UplinkCapacity)(nil), "v2ray.core.transport.internet.kcp.UplinkCapacity") + proto.RegisterType((*DownlinkCapacity)(nil), "v2ray.core.transport.internet.kcp.DownlinkCapacity") + proto.RegisterType((*WriteBuffer)(nil), "v2ray.core.transport.internet.kcp.WriteBuffer") + proto.RegisterType((*ReadBuffer)(nil), "v2ray.core.transport.internet.kcp.ReadBuffer") + proto.RegisterType((*Config)(nil), "v2ray.core.transport.internet.kcp.Config") } func init() { proto.RegisterFile("v2ray.com/core/transport/internet/kcp/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 404 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x93, 0xd1, 0xab, 0xda, 0x30, - 0x14, 0xc6, 0x71, 0x55, 0x27, 0xa7, 0xea, 0x5c, 0xd9, 0x43, 0xd9, 0x60, 0x38, 0x61, 0x43, 0xf6, - 0x90, 0xb2, 0x0e, 0xb7, 0x97, 0xbd, 0x4c, 0xf7, 0xe2, 0x83, 0x2f, 0xa1, 0x65, 0xb0, 0xc1, 0x24, - 0xa6, 0x51, 0x43, 0x35, 0x29, 0x31, 0x55, 0xdc, 0x9f, 0x7d, 0xff, 0x82, 0x4b, 0x53, 0x7b, 0xad, - 0x82, 0xf7, 0xf6, 0xbe, 0x19, 0x73, 0xbe, 0xdf, 0x49, 0xbf, 0xef, 0x1c, 0xf0, 0xf7, 0xbe, 0x22, - 0x47, 0x44, 0xe5, 0xd6, 0xa3, 0x52, 0x31, 0x4f, 0x2b, 0x22, 0x76, 0x89, 0x54, 0xda, 0xe3, 0x42, - 0x33, 0x25, 0x98, 0xf6, 0x62, 0x9a, 0x78, 0x54, 0x8a, 0x25, 0x5f, 0xa1, 0x44, 0x49, 0x2d, 0x9d, - 0x8f, 0x54, 0x6e, 0x51, 0xa1, 0x53, 0x0c, 0x3d, 0x68, 0x50, 0xa1, 0x41, 0x31, 0x4d, 0xde, 0x8e, - 0x9e, 0x46, 0x93, 0x54, 0xaf, 0x99, 0xd0, 0x9c, 0x12, 0x2d, 0x55, 0x4e, 0x1f, 0xbc, 0x03, 0x6b, - 0x16, 0x84, 0xce, 0x1b, 0x68, 0xec, 0xc9, 0x26, 0x65, 0x6e, 0xad, 0x5f, 0x1b, 0x76, 0x70, 0x7e, - 0xc8, 0x2e, 0x83, 0x60, 0x7a, 0xe3, 0xf2, 0x13, 0x74, 0xc3, 0x64, 0xc3, 0x45, 0x3c, 0x21, 0x09, - 0xa1, 0x5c, 0x1f, 0x6f, 0xd4, 0x0d, 0xa1, 0xf7, 0x4b, 0x1e, 0x44, 0x85, 0xca, 0x0f, 0x60, 0xff, - 0x56, 0x5c, 0xb3, 0x71, 0xba, 0x5c, 0x32, 0xe5, 0x38, 0x50, 0xdf, 0xf1, 0xff, 0x45, 0x8d, 0xf9, - 0x3d, 0xe8, 0x03, 0x60, 0x46, 0xa2, 0x47, 0x2a, 0xee, 0xea, 0xd0, 0x9c, 0x18, 0xff, 0x9c, 0x1f, - 0x60, 0x6d, 0x75, 0x6a, 0x6e, 0x6d, 0xff, 0x33, 0xaa, 0xe4, 0x23, 0x9a, 0x05, 0x21, 0xce, 0x64, - 0x99, 0x5a, 0x6b, 0xee, 0xbe, 0x78, 0x96, 0x3a, 0x08, 0xa6, 0x38, 0x93, 0x39, 0xff, 0xe0, 0x55, - 0x6a, 0xdc, 0x99, 0xd3, 0xd3, 0x47, 0xbb, 0x96, 0x21, 0x8d, 0x2a, 0x92, 0x2e, 0xbd, 0xc5, 0xdd, - 0xf4, 0xd2, 0xeb, 0x08, 0x5e, 0x47, 0x27, 0x57, 0xcf, 0x1d, 0xea, 0xa6, 0xc3, 0xf7, 0x8a, 0x1d, - 0xae, 0x53, 0xc1, 0xbd, 0xe8, 0x3a, 0xa7, 0xf7, 0x00, 0x54, 0x8a, 0x15, 0xdb, 0x69, 0x2e, 0x85, - 0xdb, 0xe8, 0xd7, 0x86, 0x2d, 0x5c, 0xfa, 0xc7, 0x09, 0xa1, 0x7d, 0xc8, 0x12, 0x9b, 0x2f, 0x4c, - 0x20, 0x6e, 0xd3, 0x3c, 0xc0, 0xaf, 0xf8, 0x80, 0x52, 0xd8, 0xd8, 0x3e, 0x94, 0x92, 0xc7, 0x60, - 0x2b, 0x46, 0xa2, 0x82, 0xfa, 0xd2, 0x50, 0xbf, 0x54, 0xa4, 0x9e, 0xe7, 0x03, 0x83, 0x3a, 0xcf, - 0xca, 0x5f, 0xe8, 0xac, 0x19, 0x89, 0x98, 0x9a, 0xe7, 0xdb, 0xe5, 0xb6, 0x0c, 0xf5, 0x5b, 0x05, - 0xea, 0xcf, 0xf2, 0xde, 0xe4, 0xb3, 0x85, 0xdb, 0x39, 0x2c, 0x3f, 0x8d, 0x1b, 0x7f, 0xac, 0x98, - 0x26, 0x8b, 0xa6, 0xd9, 0xa9, 0xaf, 0xf7, 0x01, 0x00, 0x00, 0xff, 0xff, 0x29, 0x6b, 0x1b, 0xbd, - 0xe7, 0x03, 0x00, 0x00, + // 411 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x93, 0x51, 0xab, 0xda, 0x30, + 0x1c, 0xc5, 0x71, 0xf5, 0xba, 0xcb, 0xbf, 0xf7, 0xde, 0xb9, 0xb2, 0x87, 0xb2, 0xc1, 0x50, 0x61, + 0xe2, 0xcb, 0x52, 0x56, 0x19, 0x6c, 0x8f, 0xd3, 0xbd, 0xf8, 0xe0, 0xd8, 0x42, 0x45, 0xf0, 0xc5, + 0xc5, 0x34, 0x6a, 0xa8, 0x26, 0x25, 0xa6, 0x8a, 0xfb, 0xa0, 0xfb, 0x3c, 0xa3, 0xa9, 0x9d, 0x55, + 0xf0, 0xb6, 0x6f, 0x4d, 0x73, 0xce, 0x2f, 0xed, 0x39, 0xf9, 0x83, 0xbf, 0xf7, 0x15, 0x39, 0x22, + 0x2a, 0xb7, 0x1e, 0x95, 0x8a, 0x79, 0x5a, 0x11, 0xb1, 0x8b, 0xa5, 0xd2, 0x1e, 0x17, 0x9a, 0x29, + 0xc1, 0xb4, 0x17, 0xd1, 0xd8, 0xa3, 0x52, 0x2c, 0xf9, 0x0a, 0xc5, 0x4a, 0x6a, 0xe9, 0xb4, 0x73, + 0x8f, 0x62, 0xe8, 0xbf, 0x1e, 0xe5, 0x7a, 0x14, 0xd1, 0xf8, 0xed, 0xe7, 0x72, 0x2c, 0x49, 0xf4, + 0x9a, 0x09, 0xcd, 0x29, 0xd1, 0x52, 0x65, 0xe4, 0xce, 0x3b, 0xb0, 0xc6, 0xc1, 0xc4, 0x79, 0x03, + 0x77, 0x7b, 0xb2, 0x49, 0x98, 0x5b, 0x6b, 0xd5, 0x7a, 0x8f, 0x38, 0x5b, 0xa4, 0x9b, 0x41, 0x30, + 0xba, 0xb1, 0xd9, 0x85, 0xa7, 0x49, 0xbc, 0xe1, 0x22, 0x1a, 0x92, 0x98, 0x50, 0xae, 0x8f, 0x37, + 0x74, 0x3d, 0x68, 0x7e, 0x97, 0x07, 0x51, 0x41, 0xd9, 0x06, 0x7b, 0xaa, 0xb8, 0x66, 0x83, 0x64, + 0xb9, 0x64, 0xca, 0x71, 0xa0, 0xbe, 0xe3, 0x7f, 0x72, 0x8d, 0x79, 0xee, 0xb4, 0x00, 0x30, 0x23, + 0xe1, 0x33, 0x8a, 0xbf, 0x75, 0x68, 0x0c, 0x4d, 0x76, 0xce, 0x17, 0xb0, 0xb6, 0x3a, 0x31, 0xbb, + 0xb6, 0xdf, 0x45, 0xa5, 0x19, 0xa2, 0x71, 0x30, 0xc1, 0xa9, 0x25, 0x75, 0x6a, 0xcd, 0xdd, 0x17, + 0x95, 0x9d, 0x41, 0x30, 0xc2, 0xa9, 0xc5, 0x99, 0xc1, 0xab, 0xc4, 0xa4, 0x32, 0xa7, 0xa7, 0x9f, + 0x75, 0x2d, 0x43, 0xf9, 0x54, 0x81, 0x72, 0x99, 0x27, 0x7e, 0x4a, 0x2e, 0xf3, 0xfd, 0x0d, 0xaf, + 0xc3, 0x53, 0x92, 0x67, 0x7a, 0xdd, 0xd0, 0xfb, 0x15, 0xe8, 0xd7, 0x2d, 0xe0, 0x66, 0x78, 0xdd, + 0xcb, 0x7b, 0x00, 0x2a, 0xc5, 0x8a, 0xed, 0x34, 0x97, 0xc2, 0xbd, 0x6b, 0xd5, 0x7a, 0xf7, 0xb8, + 0xf0, 0xc6, 0xf9, 0x05, 0x0f, 0x87, 0xb4, 0xa1, 0xf9, 0xc2, 0x14, 0xe0, 0x36, 0xcc, 0xe1, 0xa8, + 0xc2, 0xe1, 0x85, 0x62, 0xb1, 0x7d, 0x28, 0xb4, 0xfc, 0x03, 0x6c, 0xc5, 0x48, 0x98, 0x13, 0x5f, + 0x1a, 0xe2, 0xc7, 0x0a, 0xc4, 0xf3, 0x3d, 0xc0, 0xa0, 0xce, 0x77, 0x62, 0x0a, 0x8f, 0x6b, 0x46, + 0x42, 0xa6, 0xe6, 0xd9, 0x04, 0xb9, 0xf7, 0x86, 0xe8, 0x97, 0x10, 0xbf, 0x15, 0x67, 0x23, 0xbb, + 0x3f, 0xf8, 0x21, 0x03, 0x65, 0xab, 0xc1, 0x57, 0xf8, 0x40, 0xe5, 0xb6, 0xfc, 0xc3, 0x06, 0x76, + 0x66, 0xf8, 0x99, 0xce, 0xd7, 0xcc, 0x8a, 0x68, 0xbc, 0x68, 0x98, 0x59, 0xeb, 0xff, 0x0b, 0x00, + 0x00, 0xff, 0xff, 0xe8, 0xba, 0x79, 0x48, 0xfb, 0x03, 0x00, 0x00, }