lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-04 08:15:21 -05:00
Code Issues Releases Wiki Activity

prefer interface over struct

Browse Source
This commit is contained in:
V2Ray
2015-09-20 18:22:29 +02:00
parent 823cbf1509
commit cb16047cf0
12 changed files with 88 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/freedom/freedom.go
View File

@@ -9,10 +9,10 @@ import (
)
type FreedomConnection struct {
dest *v2net.Destination
dest v2net.Destination
}
func NewFreedomConnection(dest *v2net.Destination) *FreedomConnection {
func NewFreedomConnection(dest v2net.Destination) *FreedomConnection {
return &FreedomConnection{
dest: dest,
}

2
proxy/freedom/freedomfactory.go
View File

@@ -8,7 +8,7 @@ import (
type FreedomFactory struct {
}
func (factory FreedomFactory) Create(vp *core.Point, config []byte, dest *v2net.Destination) (core.OutboundConnectionHandler, error) {
func (factory FreedomFactory) Create(vp *core.Point, config []byte, dest v2net.Destination) (core.OutboundConnectionHandler, error) {
return NewFreedomConnection(dest), nil
}

4
proxy/socks/protocol/socks.go
View File

@@ -278,7 +278,7 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
return
}
func (request *Socks5Request) Destination() *v2net.Destination {
func (request *Socks5Request) Destination() v2net.Destination {
var address v2net.Address
switch request.AddrType {
case AddrTypeIPv4:
@@ -290,7 +290,7 @@ func (request *Socks5Request) Destination() *v2net.Destination {
default:
panic("Unknown address type")
}
return v2net.NewDestination(v2net.NetTCP, address)
return v2net.NewTCPDestination(address)
}
const (

4
proxy/socks/socks.go
View File

@@ -70,7 +70,7 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
return err
}
var dest *v2net.Destination
var dest v2net.Destination
// TODO refactor this part
if err == protocol.ErrorSocksVersion4 {
@@ -85,7 +85,7 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
return ErrorCommandNotSupported
}
dest = v2net.NewDestination(v2net.NetTCP, v2net.IPAddress(auth4.IP[:], auth4.Port))
dest = v2net.NewTCPDestination(v2net.IPAddress(auth4.IP[:], auth4.Port))
} else {
expectedAuthMethod := protocol.AuthNotRequired
if server.config.AuthMethod == JsonAuthMethodUserPass {

7
proxy/vmess/config.go
View File

@@ -51,12 +51,13 @@ func (config VNextConfig) ToVNextServer() VNextServer {
if ip == nil {
panic(log.Error("Unable to parse VNext IP: %s", config.Address))
}
network := v2net.NetTCP
address := v2net.IPAddress(ip, config.Port)
dest := v2net.NewTCPDestination(address)
if config.Network == "udp" {
network = v2net.NetUDP
dest = v2net.NewUDPDestination(address)
}
return VNextServer{
Destination: v2net.NewDestination(network, v2net.IPAddress(ip, config.Port)),
Destination: dest,
Users: users,
}
}

8
proxy/vmess/protocol/vmess.go
View File

@@ -50,8 +50,12 @@ type VMessRequest struct {
Address v2net.Address
}
func (request *VMessRequest) Destination() *v2net.Destination {
return v2net.NewDestination(request.Command, request.Address)
func (request *VMessRequest) Destination() v2net.Destination {
if request.Command == CmdTCP {
return v2net.NewTCPDestination(request.Address)
} else {
return v2net.NewUDPDestination(request.Address)
}
}
type VMessRequestReader struct {

2
proxy/vmess/vmess_test.go
View File

@@ -68,7 +68,7 @@ func TestVMessInAndOut(t *testing.T) {
err = pointB.Start()
assert.Error(err).IsNil()
dest := v2net.NewDestination(v2net.NetTCP, v2net.IPAddress([]byte{1, 2, 3, 4}, 80))
dest := v2net.NewTCPDestination(v2net.IPAddress([]byte{1, 2, 3, 4}, 80))
ich.Communicate(dest)
assert.Bytes([]byte(data2Send)).Equals(och.Data2Send.Bytes())
assert.Bytes(ich.DataReturned.Bytes()).Equals(och.Data2Return)

20
proxy/vmess/vmessout.go
View File

@@ -17,17 +17,17 @@ import (
// VNext is the next Point server in the connection chain.
type VNextServer struct {
Destination *v2net.Destination // Address of VNext server
Users []user.User // User accounts for accessing VNext.
Destination v2net.Destination // Address of VNext server
Users []user.User // User accounts for accessing VNext.
}
type VMessOutboundHandler struct {
vPoint *core.Point
dest *v2net.Destination
dest v2net.Destination
vNextList []VNextServer
}
func NewVMessOutboundHandler(vp *core.Point, vNextList []VNextServer, dest *v2net.Destination) *VMessOutboundHandler {
func NewVMessOutboundHandler(vp *core.Point, vNextList []VNextServer, dest v2net.Destination) *VMessOutboundHandler {
return &VMessOutboundHandler{
vPoint: vp,
dest: dest,
@@ -35,7 +35,7 @@ func NewVMessOutboundHandler(vp *core.Point, vNextList []VNextServer, dest *v2ne
}
}
func (handler *VMessOutboundHandler) pickVNext() (*v2net.Destination, user.User) {
func (handler *VMessOutboundHandler) pickVNext() (v2net.Destination, user.User) {
vNextLen := len(handler.vNextList)
if vNextLen == 0 {
panic("VMessOut: Zero vNext is configured.")
@@ -54,10 +54,14 @@ func (handler *VMessOutboundHandler) pickVNext() (*v2net.Destination, user.User)
func (handler *VMessOutboundHandler) Start(ray core.OutboundRay) error {
vNextAddress, vNextUser := handler.pickVNext()
command := protocol.CmdTCP
if handler.dest.IsUDP() {
command = protocol.CmdUDP
}
request := &protocol.VMessRequest{
Version: protocol.Version,
UserId: vNextUser.Id,
Command: handler.dest.NetworkByte(),
Command: command,
Address: handler.dest.Address(),
}
rand.Read(request.RequestIV[:])
@@ -68,7 +72,7 @@ func (handler *VMessOutboundHandler) Start(ray core.OutboundRay) error {
return nil
}
func startCommunicate(request *protocol.VMessRequest, dest *v2net.Destination, ray core.OutboundRay) error {
func startCommunicate(request *protocol.VMessRequest, dest v2net.Destination, ray core.OutboundRay) error {
input := ray.OutboundInput()
output := ray.OutboundOutput()
@@ -155,7 +159,7 @@ func handleResponse(conn *net.TCPConn, request *protocol.VMessRequest, output ch
type VMessOutboundHandlerFactory struct {
}
func (factory *VMessOutboundHandlerFactory) Create(vp *core.Point, rawConfig []byte, destination *v2net.Destination) (core.OutboundConnectionHandler, error) {
func (factory *VMessOutboundHandlerFactory) Create(vp *core.Point, rawConfig []byte, destination v2net.Destination) (core.OutboundConnectionHandler, error) {
config, err := loadOutboundConfig(rawConfig)
if err != nil {
panic(log.Error("Failed to load VMess outbound config: %v", err))