lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-02-04 23:35:24 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/v2ray/v2ray-core

Browse Source
This commit is contained in:
Darien Raymond
2018-04-02 20:01:05 +02:00
parent 08dab81eb2 43e389d287
commit 81a147e540
19 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/http/server.go Normal file → Executable file
View File

@@ -21,7 +21,7 @@ import (
"v2ray.com/core/transport/internet"
)
// Server is a HTTP proxy server.
// Server is an HTTP proxy server.
type Server struct {
config *ServerConfig
v *core.Instance

2
proxy/proxy.go Normal file → Executable file
View File

@@ -41,7 +41,7 @@ type UserManager interface {
// AddUser adds a new user.
AddUser(context.Context, *protocol.User) error
// RemoveUser removes an user by email.
// RemoveUser removes a user by email.
RemoveUser(context.Context, string) error
}

2
proxy/vmess/account.pb.go Normal file → Executable file
View File

@@ -17,7 +17,7 @@ var _ = math.Inf
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type Account struct {
// ID of the account, in the form of an UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
// ID of the account, in the form of a UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
// Number of alternative IDs. Client and server must share the same number.
AlterId uint32 `protobuf:"varint,2,opt,name=alter_id,json=alterId" json:"alter_id,omitempty"`

2
proxy/vmess/account.proto Normal file → Executable file
View File

@@ -9,7 +9,7 @@ option java_multiple_files = true;
import "v2ray.com/core/common/protocol/headers.proto";
message Account {
// ID of the account, in the form of an UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
// ID of the account, in the form of a UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
string id = 1;
// Number of alternative IDs. Client and server must share the same number.
uint32 alter_id = 2;