mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-16 14:53:12 +00:00
Remove prefix 'V' in struct names
This commit is contained in:
1 parent
cc3fdb6ef4
commit
51670b223d
27 files changed
+201
-201
No files matched your search
+10
-10
@@ -9,19 +9,19 @@ import (
|
||||
v2net "github.com/v2ray/v2ray-core/net"
|
||||
)
|
||||
|
||||
type VFreeConnection struct {
|
||||
dest v2net.VAddress
|
||||
type FreedomConnection struct {
|
||||
dest v2net.Address
|
||||
}
|
||||
|
||||
func NewVFreeConnection(dest v2net.VAddress) *VFreeConnection {
|
||||
conn := new(VFreeConnection)
|
||||
func NewFreedomConnection(dest v2net.Address) *FreedomConnection {
|
||||
conn := new(FreedomConnection)
|
||||
conn.dest = dest
|
||||
return conn
|
||||
}
|
||||
|
||||
func (vconn *VFreeConnection) Start(vRay core.OutboundVRay) error {
|
||||
input := vRay.OutboundInput()
|
||||
output := vRay.OutboundOutput()
|
||||
func (vconn *FreedomConnection) Start(ray core.OutboundRay) error {
|
||||
input := ray.OutboundInput()
|
||||
output := ray.OutboundOutput()
|
||||
conn, err := net.Dial("tcp", vconn.dest.String())
|
||||
if err != nil {
|
||||
return log.Error("Failed to open tcp: %s", vconn.dest.String())
|
||||
@@ -35,7 +35,7 @@ func (vconn *VFreeConnection) Start(vRay core.OutboundVRay) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (vconn *VFreeConnection) DumpInput(conn net.Conn, input <-chan []byte, finish chan<- bool) {
|
||||
func (vconn *FreedomConnection) DumpInput(conn net.Conn, input <-chan []byte, finish chan<- bool) {
|
||||
for {
|
||||
data, open := <-input
|
||||
if !open {
|
||||
@@ -48,7 +48,7 @@ func (vconn *VFreeConnection) DumpInput(conn net.Conn, input <-chan []byte, fini
|
||||
}
|
||||
}
|
||||
|
||||
func (vconn *VFreeConnection) DumpOutput(conn net.Conn, output chan<- []byte, finish chan<- bool) {
|
||||
func (vconn *FreedomConnection) DumpOutput(conn net.Conn, output chan<- []byte, finish chan<- bool) {
|
||||
for {
|
||||
buffer := make([]byte, 512)
|
||||
nBytes, err := conn.Read(buffer)
|
||||
@@ -63,7 +63,7 @@ func (vconn *VFreeConnection) DumpOutput(conn net.Conn, output chan<- []byte, fi
|
||||
}
|
||||
}
|
||||
|
||||
func (vconn *VFreeConnection) CloseConn(conn net.Conn, finish <-chan bool) {
|
||||
func (vconn *FreedomConnection) CloseConn(conn net.Conn, finish <-chan bool) {
|
||||
for i := 0; i < 2; i++ {
|
||||
<-finish
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
type FreedomFactory struct {
|
||||
}
|
||||
|
||||
func (factory FreedomFactory) Create(vp *core.VPoint, config []byte, dest v2net.VAddress) (core.OutboundConnectionHandler, error) {
|
||||
return NewVFreeConnection(dest), nil
|
||||
func (factory FreedomFactory) Create(vp *core.Point, config []byte, dest v2net.Address) (core.OutboundConnectionHandler, error) {
|
||||
return NewFreedomConnection(dest), nil
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
||||
+2
-2
@@ -19,11 +19,11 @@ var (
|
||||
// SocksServer is a SOCKS 5 proxy server
|
||||
type SocksServer struct {
|
||||
accepting bool
|
||||
vPoint *core.VPoint
|
||||
vPoint *core.Point
|
||||
config SocksConfig
|
||||
}
|
||||
|
||||
func NewSocksServer(vp *core.VPoint, rawConfig []byte) *SocksServer {
|
||||
func NewSocksServer(vp *core.Point, rawConfig []byte) *SocksServer {
|
||||
server := new(SocksServer)
|
||||
server.vPoint = vp
|
||||
config, err := loadConfig(rawConfig)
|
||||
|
||||
@@ -17,12 +17,12 @@ func TestSocksTcpConnect(t *testing.T) {
|
||||
port := uint16(12384)
|
||||
|
||||
uuid := "2418d087-648d-4990-86e8-19dca1d006d3"
|
||||
vid, err := core.UUIDToVID(uuid)
|
||||
id, err := core.UUIDToID(uuid)
|
||||
assert.Error(err).IsNil()
|
||||
|
||||
config := core.VConfig{
|
||||
port,
|
||||
[]core.VUser{core.VUser{vid}},
|
||||
[]core.User{core.User{id}},
|
||||
"",
|
||||
[]core.VNext{}}
|
||||
|
||||
@@ -30,7 +30,7 @@ func TestSocksTcpConnect(t *testing.T) {
|
||||
och.Data2Send = bytes.NewBuffer(make([]byte, 1024))
|
||||
och.Data2Return = []byte("The data to be returned to socks server.")
|
||||
|
||||
vpoint, err := core.NewVPoint(&config, SocksServerFactory{}, och)
|
||||
vpoint, err := core.NewPoint(&config, SocksServerFactory{}, och)
|
||||
assert.Error(err).IsNil()
|
||||
|
||||
err = vpoint.Start()
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
type SocksServerFactory struct {
|
||||
}
|
||||
|
||||
func (factory SocksServerFactory) Create(vp *core.VPoint, config []byte) (core.InboundConnectionHandler, error) {
|
||||
func (factory SocksServerFactory) Create(vp *core.Point, config []byte) (core.InboundConnectionHandler, error) {
|
||||
return NewSocksServer(vp, config), nil
|
||||
}
|
||||
|
||||
|
||||
+9
-9
@@ -10,43 +10,43 @@ const (
|
||||
AddrTypeDomain = byte(0x03)
|
||||
)
|
||||
|
||||
type VAddress struct {
|
||||
type Address struct {
|
||||
Type byte
|
||||
IP net.IP
|
||||
Domain string
|
||||
Port uint16
|
||||
}
|
||||
|
||||
func IPAddress(ip []byte, port uint16) VAddress {
|
||||
func IPAddress(ip []byte, port uint16) Address {
|
||||
// TODO: check IP length
|
||||
return VAddress{
|
||||
return Address{
|
||||
AddrTypeIP,
|
||||
net.IP(ip),
|
||||
"",
|
||||
port}
|
||||
}
|
||||
|
||||
func DomainAddress(domain string, port uint16) VAddress {
|
||||
return VAddress{
|
||||
func DomainAddress(domain string, port uint16) Address {
|
||||
return Address{
|
||||
AddrTypeDomain,
|
||||
nil,
|
||||
domain,
|
||||
port}
|
||||
}
|
||||
|
||||
func (addr VAddress) IsIPv4() bool {
|
||||
func (addr Address) IsIPv4() bool {
|
||||
return addr.Type == AddrTypeIP && len(addr.IP) == net.IPv4len
|
||||
}
|
||||
|
||||
func (addr VAddress) IsIPv6() bool {
|
||||
func (addr Address) IsIPv6() bool {
|
||||
return addr.Type == AddrTypeIP && len(addr.IP) == net.IPv6len
|
||||
}
|
||||
|
||||
func (addr VAddress) IsDomain() bool {
|
||||
func (addr Address) IsDomain() bool {
|
||||
return addr.Type == AddrTypeDomain
|
||||
}
|
||||
|
||||
func (addr VAddress) String() string {
|
||||
func (addr Address) String() string {
|
||||
var host string
|
||||
switch addr.Type {
|
||||
case AddrTypeIP:
|
||||
|
||||
+6
-6
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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
@@ -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))
|
||||
|
||||
Reference in new issue
Block a user