1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-16 01:17:30 -05:00

Add more error check and declare the field name in composite literal.

This commit is contained in:
Charles 2015-09-16 23:07:05 +08:00
parent cc3f374623
commit 5495b8bea5
6 changed files with 56 additions and 25 deletions

6
id.go
View File

@ -32,7 +32,11 @@ func NewID(id string) (ID, error) {
md5hash.Write([]byte("c48619fe-8f02-49e0-b9e9-edf763e17e21")) md5hash.Write([]byte("c48619fe-8f02-49e0-b9e9-edf763e17e21"))
cmdKey := md5.Sum(nil) cmdKey := md5.Sum(nil)
return ID{id, idBytes, cmdKey[:]}, nil return ID{
String: id,
Bytes: idBytes,
cmdKey: cmdKey[:],
}, nil
} }
func (v ID) TimeRangeHash(rangeSec int) ([]byte, int64) { func (v ID) TimeRangeHash(rangeSec int) ([]byte, int64) {

View File

@ -129,7 +129,10 @@ type Socks5UserPassResponse struct {
} }
func NewSocks5UserPassResponse(status byte) Socks5UserPassResponse { func NewSocks5UserPassResponse(status byte) Socks5UserPassResponse {
return Socks5UserPassResponse{socksVersion, status} return Socks5UserPassResponse{
version: socksVersion,
status: status,
}
} }
func WriteUserPassResponse(writer io.Writer, response Socks5UserPassResponse) error { func WriteUserPassResponse(writer io.Writer, response Socks5UserPassResponse) error {

View File

@ -20,18 +20,20 @@ type Address struct {
func IPAddress(ip []byte, port uint16) Address { func IPAddress(ip []byte, port uint16) Address {
// TODO: check IP length // TODO: check IP length
return Address{ return Address{
AddrTypeIP, Type: AddrTypeIP,
net.IP(ip), IP: net.IP(ip),
"", Domain: "",
port} Port: port,
}
} }
func DomainAddress(domain string, port uint16) Address { func DomainAddress(domain string, port uint16) Address {
return Address{ return Address{
AddrTypeDomain, Type: AddrTypeDomain,
nil, IP: nil,
domain, Domain: domain,
port} Port: port,
}
} }
func (addr Address) IsIPv4() bool { func (addr Address) IsIPv4() bool {

View File

@ -49,16 +49,14 @@ func (server *SocksServer) Listen(port uint16) error {
return nil return nil
} }
func (server *SocksServer) AcceptConnections(listener net.Listener) error { func (server *SocksServer) AcceptConnections(listener net.Listener) {
for server.accepting { for server.accepting {
connection, err := listener.Accept() connection, err := listener.Accept()
if err != nil { if err != nil {
log.Error("Error on accepting socks connection: %v", err) log.Error("Error on accepting socks connection: %v", err)
return err
} }
go server.HandleConnection(connection) go server.HandleConnection(connection)
} }
return nil
} }
func (server *SocksServer) HandleConnection(connection net.Conn) error { func (server *SocksServer) HandleConnection(connection net.Conn) error {
@ -79,15 +77,21 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
if !auth.HasAuthMethod(expectedAuthMethod) { if !auth.HasAuthMethod(expectedAuthMethod) {
authResponse := socksio.NewAuthenticationResponse(socksio.AuthNoMatchingMethod) authResponse := socksio.NewAuthenticationResponse(socksio.AuthNoMatchingMethod)
socksio.WriteAuthentication(connection, authResponse) err = socksio.WriteAuthentication(connection, authResponse)
if err != nil {
log.Error("Error on socksio write authentication: %v", err)
return err
}
log.Warning("Client doesn't support allowed any auth methods.") log.Warning("Client doesn't support allowed any auth methods.")
return ErrorAuthenticationFailed return ErrorAuthenticationFailed
} }
authResponse := socksio.NewAuthenticationResponse(expectedAuthMethod) authResponse := socksio.NewAuthenticationResponse(expectedAuthMethod)
socksio.WriteAuthentication(connection, authResponse) err = socksio.WriteAuthentication(connection, authResponse)
if err != nil {
log.Error("Error on socksio write authentication: %v", err)
return err
}
if server.config.AuthMethod == JsonAuthMethodUserPass { if server.config.AuthMethod == JsonAuthMethodUserPass {
upRequest, err := socksio.ReadUserPassRequest(reader) upRequest, err := socksio.ReadUserPassRequest(reader)
if err != nil { if err != nil {
@ -99,7 +103,11 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
status = byte(0xFF) status = byte(0xFF)
} }
upResponse := socksio.NewSocks5UserPassResponse(status) upResponse := socksio.NewSocks5UserPassResponse(status)
socksio.WriteUserPassResponse(connection, upResponse) err = socksio.WriteUserPassResponse(connection, upResponse)
if err != nil {
log.Error("Error on socksio write user pass response: %v", err)
return err
}
if status != byte(0) { if status != byte(0) {
return ErrorInvalidUser return ErrorInvalidUser
} }
@ -116,7 +124,11 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
if request.Command == socksio.CmdBind || request.Command == socksio.CmdUdpAssociate { if request.Command == socksio.CmdBind || request.Command == socksio.CmdUdpAssociate {
response := socksio.NewSocks5Response() response := socksio.NewSocks5Response()
response.Error = socksio.ErrorCommandNotSupported response.Error = socksio.ErrorCommandNotSupported
socksio.WriteResponse(connection, response) err = socksio.WriteResponse(connection, response)
if err != nil {
log.Error("Error on socksio write response: %v", err)
return err
}
log.Warning("Unsupported socks command %d", request.Command) log.Warning("Unsupported socks command %d", request.Command)
return ErrorCommandNotSupported return ErrorCommandNotSupported
} }
@ -132,8 +144,11 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
case socksio.AddrTypeDomain: case socksio.AddrTypeDomain:
response.Domain = request.Domain response.Domain = request.Domain
} }
socksio.WriteResponse(connection, response) err = socksio.WriteResponse(connection, response)
if err != nil {
log.Error("Error on socksio write response: %v", err)
return err
}
ray := server.vPoint.NewInboundConnectionAccepted(request.Destination()) ray := server.vPoint.NewInboundConnectionAccepted(request.Destination())
input := ray.InboundInput() input := ray.InboundInput()
output := ray.InboundOutput() output := ray.InboundOutput()

View File

@ -16,7 +16,10 @@ type VMessUser struct {
func (u *VMessUser) ToUser() (core.User, error) { func (u *VMessUser) ToUser() (core.User, error) {
id, err := core.NewID(u.Id) id, err := core.NewID(u.Id)
return core.User{id}, err return core.User{
Id: id,
Email: "",
}, err
} }
type VMessInboundConfig struct { type VMessInboundConfig struct {
@ -49,8 +52,9 @@ func (config VNextConfig) ToVNextServer() VNextServer {
panic(log.Error("Unable to parse VNext IP: %s", config.Address)) panic(log.Error("Unable to parse VNext IP: %s", config.Address))
} }
return VNextServer{ return VNextServer{
v2net.IPAddress(ip, config.Port), Address: v2net.IPAddress(ip, config.Port),
users} Users: users,
}
} }
type VMessOutboundConfig struct { type VMessOutboundConfig struct {

5
ray.go
View File

@ -10,7 +10,10 @@ type Ray struct {
} }
func NewRay() Ray { func NewRay() Ray {
return Ray{make(chan []byte, bufferSize), make(chan []byte, bufferSize)} return Ray{
Input: make(chan []byte, bufferSize),
Output: make(chan []byte, bufferSize),
}
} }
type OutboundRay interface { type OutboundRay interface {