Remove prefix 'V' in struct names

This commit is contained in:
V2Ray committed 2015-09-12 22:11:54 +02:00
1 parent cc3fdb6ef4
commit 51670b223d
27 files changed
+201 -201

No files matched your search

+6 -6
View File
@@ -13,9 +13,9 @@ type VMessUser struct {
Email string `json:"email"`
}
func (u *VMessUser) ToVUser() (core.VUser, error) {
id, err := core.UUIDToVID(u.Id)
return core.VUser{id}, err
func (u *VMessUser) ToUser() (core.User, error) {
id, err := core.UUIDToID(u.Id)
return core.User{id}, err
}
type VMessInboundConfig struct {
@@ -35,11 +35,11 @@ type VNextConfig struct {
}
func (config VNextConfig) ToVNextServer() VNextServer {
users := make([]core.VUser, 0, len(config.Users))
users := make([]core.User, 0, len(config.Users))
for _, user := range config.Users {
vuser, err := user.ToVUser()
vuser, err := user.ToUser()
if err != nil {
panic(log.Error("Failed to convert %v to VUser.", user))
panic(log.Error("Failed to convert %v to User.", user))
}
users = append(users, vuser)
}
+6 -6
View File
@@ -13,12 +13,12 @@ import (
)
type VMessInboundHandler struct {
vPoint *core.VPoint
clients *core.VUserSet
vPoint *core.Point
clients *core.UserSet
accepting bool
}
func NewVMessInboundHandler(vp *core.VPoint, clients *core.VUserSet) *VMessInboundHandler {
func NewVMessInboundHandler(vp *core.Point, clients *core.UserSet) *VMessInboundHandler {
handler := new(VMessInboundHandler)
handler.vPoint = vp
handler.clients = clients
@@ -128,14 +128,14 @@ func (handler *VMessInboundHandler) waitForFinish(finish <-chan bool) {
type VMessInboundHandlerFactory struct {
}
func (factory *VMessInboundHandlerFactory) Create(vp *core.VPoint, rawConfig []byte) (core.InboundConnectionHandler, error) {
func (factory *VMessInboundHandlerFactory) Create(vp *core.Point, rawConfig []byte) (core.InboundConnectionHandler, error) {
config, err := loadInboundConfig(rawConfig)
if err != nil {
panic(log.Error("Failed to load VMess inbound config: %v", err))
}
allowedClients := core.NewVUserSet()
allowedClients := core.NewUserSet()
for _, client := range config.AllowedClients {
user, err := client.ToVUser()
user, err := client.ToUser()
if err != nil {
panic(log.Error("Failed to parse user id %s: %v", client.Id, err))
}
+10 -10
View File
@@ -14,19 +14,19 @@ import (
v2net "github.com/v2ray/v2ray-core/net"
)
// VNext is the next VPoint server in the connection chain.
// VNext is the next Point server in the connection chain.
type VNextServer struct {
Address v2net.VAddress // Address of VNext server
Users []core.VUser // User accounts for accessing VNext.
Address v2net.Address // Address of VNext server
Users []core.User // User accounts for accessing VNext.
}
type VMessOutboundHandler struct {
vPoint *core.VPoint
dest v2net.VAddress
vPoint *core.Point
dest v2net.Address
vNextList []VNextServer
}
func NewVMessOutboundHandler(vp *core.VPoint, vNextList []VNextServer, dest v2net.VAddress) *VMessOutboundHandler {
func NewVMessOutboundHandler(vp *core.Point, vNextList []VNextServer, dest v2net.Address) *VMessOutboundHandler {
handler := new(VMessOutboundHandler)
handler.vPoint = vp
handler.dest = dest
@@ -34,7 +34,7 @@ func NewVMessOutboundHandler(vp *core.VPoint, vNextList []VNextServer, dest v2ne
return handler
}
func (handler *VMessOutboundHandler) pickVNext() (v2net.VAddress, core.VUser) {
func (handler *VMessOutboundHandler) pickVNext() (v2net.Address, core.User) {
vNextLen := len(handler.vNextList)
if vNextLen == 0 {
panic("Zero vNext is configured.")
@@ -50,7 +50,7 @@ func (handler *VMessOutboundHandler) pickVNext() (v2net.VAddress, core.VUser) {
return vNext.Address, vNextUser
}
func (handler *VMessOutboundHandler) Start(ray core.OutboundVRay) error {
func (handler *VMessOutboundHandler) Start(ray core.OutboundRay) error {
vNextAddress, vNextUser := handler.pickVNext()
request := new(vmessio.VMessRequest)
@@ -66,7 +66,7 @@ func (handler *VMessOutboundHandler) Start(ray core.OutboundVRay) error {
return nil
}
func (handler *VMessOutboundHandler) startCommunicate(request *vmessio.VMessRequest, dest v2net.VAddress, ray core.OutboundVRay) error {
func (handler *VMessOutboundHandler) startCommunicate(request *vmessio.VMessRequest, dest v2net.Address, ray core.OutboundRay) error {
conn, err := net.Dial("tcp", dest.String())
log.Debug("VMessOutbound dialing tcp: %s", dest.String())
if err != nil {
@@ -155,7 +155,7 @@ func (handler *VMessOutboundHandler) waitForFinish(finish <-chan bool) {
type VMessOutboundHandlerFactory struct {
}
func (factory *VMessOutboundHandlerFactory) Create(vp *core.VPoint, rawConfig []byte, destination v2net.VAddress) (core.OutboundConnectionHandler, error) {
func (factory *VMessOutboundHandlerFactory) Create(vp *core.Point, rawConfig []byte, destination v2net.Address) (core.OutboundConnectionHandler, error) {
config, err := loadOutboundConfig(rawConfig)
if err != nil {
panic(log.Error("Failed to load VMess outbound config: %v", err))