github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

rename server spec user

pull/314/head
Darien Raymond 2016-09-25 22:57:27 +02:00
parent c5f09c64a2
commit 922e761bef
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/protocol/server_spec.go
View File

@ -62,7 +62,7 @@ func NewServerSpec(newAccount NewAccountFactory, dest v2net.Destination, valid V
func NewServerSpecFromPB(newAccount NewAccountFactory, spec ServerSpecPB) *ServerSpec { func NewServerSpecFromPB(newAccount NewAccountFactory, spec ServerSpecPB) *ServerSpec {
dest := v2net.TCPDestination(spec.Address.AsAddress(), v2net.Port(spec.Port)) dest := v2net.TCPDestination(spec.Address.AsAddress(), v2net.Port(spec.Port))
return NewServerSpec(newAccount, dest, AlwaysValid(), spec.Users...) return NewServerSpec(newAccount, dest, AlwaysValid(), spec.User...)
} }
func (this *ServerSpec) Destination() v2net.Destination { func (this *ServerSpec) Destination() v2net.Destination {

35
common/protocol/server_spec.pb.go
View File

@ -34,7 +34,7 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type ServerSpecPB struct { type ServerSpecPB struct {
Address *com_v2ray_core_common_net.AddressPB `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` 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"` Port uint32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"`
Users []*User `protobuf:"bytes,3,rep,name=users" json:"users,omitempty"` User []*User `protobuf:"bytes,3,rep,name=user" json:"user,omitempty"`
} }
func (m *ServerSpecPB) Reset() { *m = ServerSpecPB{} } func (m *ServerSpecPB) Reset() { *m = ServerSpecPB{} }
@ -49,9 +49,9 @@ func (m *ServerSpecPB) GetAddress() *com_v2ray_core_common_net.AddressPB {
return nil return nil
} }
func (m *ServerSpecPB) GetUsers() []*User { func (m *ServerSpecPB) GetUser() []*User {
if m != nil { if m != nil {
return m.Users return m.User
} }
return nil return nil
} }
@ -63,19 +63,18 @@ func init() {
func init() { proto.RegisterFile("v2ray.com/core/common/protocol/server_spec.proto", fileDescriptor0) } func init() { proto.RegisterFile("v2ray.com/core/common/protocol/server_spec.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{ var fileDescriptor0 = []byte{
// 209 bytes of a gzipped FileDescriptorProto // 207 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8e, 0x3f, 0x4b, 0xc5, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8e, 0x31, 0x4b, 0xc7, 0x30,
0x14, 0xc5, 0x89, 0xf5, 0x1f, 0x51, 0x97, 0x4c, 0xa5, 0x83, 0x14, 0x11, 0xac, 0xcb, 0x8d, 0xd4, 0x14, 0xc4, 0x89, 0x2d, 0x2a, 0x51, 0x97, 0x4c, 0xa5, 0x83, 0x14, 0x11, 0xac, 0xcb, 0x8b, 0xd4,
0xcd, 0x41, 0xb0, 0x9f, 0xa0, 0xb4, 0xb8, 0xb8, 0x48, 0x4d, 0xef, 0x66, 0x7a, 0xc3, 0x4d, 0x2c, 0xc5, 0x49, 0xb0, 0x9f, 0xa0, 0xb4, 0xb8, 0xb8, 0x48, 0x4d, 0xdf, 0x66, 0xfa, 0xc2, 0x4b, 0x2c,
0xf8, 0x65, 0xfc, 0xac, 0xf2, 0x92, 0x97, 0xad, 0xbc, 0xb7, 0x1d, 0x0e, 0xe7, 0x77, 0xce, 0x91, 0xf8, 0x5d, 0xfc, 0xb0, 0x62, 0x62, 0xb6, 0xf2, 0xff, 0x6f, 0xc7, 0x71, 0xbf, 0xbb, 0x93, 0x0f,
0x4f, 0x6b, 0xcb, 0xd3, 0x2f, 0x18, 0xb2, 0xda, 0x10, 0xa3, 0x36, 0x64, 0x2d, 0x2d, 0xda, 0x31, 0x5b, 0xc7, 0xf3, 0x37, 0x18, 0xb2, 0xda, 0x10, 0xa3, 0x36, 0x64, 0x2d, 0xad, 0xda, 0x31, 0x05,
0x05, 0x32, 0xf4, 0xad, 0x3d, 0xf2, 0x8a, 0xfc, 0xe9, 0x1d, 0x1a, 0x88, 0xa6, 0xba, 0x35, 0x64, 0x32, 0xf4, 0xa9, 0x3d, 0xf2, 0x86, 0xfc, 0xee, 0x1d, 0x1a, 0x88, 0xa6, 0xba, 0x36, 0x64, 0x21,
0x21, 0x53, 0x8c, 0x90, 0x08, 0xc8, 0x44, 0xf5, 0xb0, 0xdd, 0xb8, 0x60, 0xd0, 0xd3, 0x3c, 0x33, 0x53, 0x8c, 0x90, 0x08, 0xc8, 0x44, 0x7d, 0xb7, 0xdf, 0xb8, 0x62, 0xd0, 0xf3, 0xb2, 0x30, 0x7a,
0x7a, 0x9f, 0xb2, 0xd5, 0xe3, 0x91, 0xe9, 0x1f, 0x8f, 0x9c, 0xa2, 0x77, 0x7f, 0x42, 0x5e, 0x8f, 0x9f, 0xb2, 0xf5, 0xfd, 0x91, 0xe9, 0x2f, 0x8f, 0x9c, 0xa2, 0x37, 0x3f, 0x42, 0x5e, 0x4e, 0xf1,
0xf1, 0xc9, 0xe8, 0xd0, 0xf4, 0x9d, 0x7a, 0x95, 0x17, 0xfb, 0xb2, 0x52, 0xd4, 0xa2, 0xb9, 0x6a, 0xc9, 0xe4, 0xd0, 0x0c, 0xbd, 0x7a, 0x96, 0x67, 0xff, 0x65, 0x95, 0x68, 0x44, 0x7b, 0xd1, 0xdd,
0xef, 0x61, 0xfb, 0xd6, 0x82, 0x01, 0xde, 0x52, 0xb2, 0xef, 0x86, 0x0c, 0x29, 0x25, 0x4f, 0x1d, 0xc2, 0xfe, 0xad, 0x15, 0x03, 0xbc, 0xa4, 0xe4, 0xd0, 0x8f, 0x19, 0x52, 0x4a, 0x96, 0x8e, 0x38,
0x71, 0x28, 0x4f, 0x6a, 0xd1, 0xdc, 0x0c, 0x51, 0xab, 0x17, 0x79, 0xb6, 0x9b, 0xf4, 0x65, 0x51, 0x54, 0x27, 0x8d, 0x68, 0xaf, 0xc6, 0xa8, 0xd5, 0x93, 0x2c, 0xff, 0x26, 0xab, 0xa2, 0x29, 0x0e,
0x17, 0x07, 0x1a, 0xf3, 0x3f, 0x78, 0xf7, 0xc8, 0x43, 0x42, 0x3a, 0xf9, 0x71, 0x99, 0xfd, 0xaf, 0x14, 0xe6, 0x7b, 0xf0, 0xea, 0x91, 0xc7, 0x48, 0xf4, 0xf2, 0xed, 0x3c, 0xdb, 0x1f, 0xa7, 0x51,
0xf3, 0xa8, 0x9e, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xde, 0x92, 0x28, 0x40, 0x5b, 0x01, 0x00, 0x3d, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x38, 0x55, 0xf5, 0x59, 0x01, 0x00, 0x00,
0x00,
} }

2
common/protocol/server_spec.proto
View File

@ -9,5 +9,5 @@ option go_package = "protocol";
message ServerSpecPB { message ServerSpecPB {
com.v2ray.core.common.net.AddressPB address = 1; com.v2ray.core.common.net.AddressPB address = 1;
uint32 port = 2; uint32 port = 2;
repeated com.v2ray.core.common.protocol.User users = 3; repeated com.v2ray.core.common.protocol.User user = 3;
} }

2
proxy/socks/config_json.go
View File

@ -58,7 +58,7 @@ func (this *ClientConfig) UnmarshalJSON(data []byte) error {
return err return err
} }
user.Account = anyAccount user.Account = anyAccount
server.Users = append(server.Users, user) server.User = append(server.User, user)
} }
this.Server[idx] = server this.Server[idx] = server
} }

2
proxy/vmess/outbound/config_json.go
View File

@ -71,7 +71,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
return common.ErrBadConfiguration return common.ErrBadConfiguration
} }
user.Account = anyAccount user.Account = anyAccount
spec.Users = append(spec.Users, user) spec.User = append(spec.User, user)
} }
serverSpecs[idx] = spec serverSpecs[idx] = spec
} }