mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-16 14:53:12 +00:00
Close connection chan when socks client finishes sending data, and fix a performance issue in VMess decoding.
This commit is contained in:
1 parent
194abb9d6c
commit
e7ce2c7166
8 files changed
+66
-171
No files matched your search
+15
-7
@@ -27,26 +27,34 @@ func (vconn *FreedomConnection) Start(ray core.OutboundRay) error {
|
||||
}
|
||||
log.Debug("Sending outbound tcp: %s", vconn.dest.String())
|
||||
|
||||
finish := make(chan bool, 2)
|
||||
go vconn.DumpInput(conn, input, finish)
|
||||
go vconn.DumpOutput(conn, output, finish)
|
||||
go vconn.CloseConn(conn, finish)
|
||||
readFinish := make(chan bool)
|
||||
writeFinish := make(chan bool)
|
||||
|
||||
go vconn.DumpInput(conn, input, writeFinish)
|
||||
go vconn.DumpOutput(conn, output, readFinish)
|
||||
go vconn.CloseConn(conn, readFinish, writeFinish)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (vconn *FreedomConnection) DumpInput(conn net.Conn, input <-chan []byte, finish chan<- bool) {
|
||||
v2net.ChanToWriter(conn, input)
|
||||
log.Debug("Freedom closing input")
|
||||
finish <- true
|
||||
}
|
||||
|
||||
func (vconn *FreedomConnection) DumpOutput(conn net.Conn, output chan<- []byte, finish chan<- bool) {
|
||||
v2net.ReaderToChan(output, conn)
|
||||
close(output)
|
||||
log.Debug("Freedom closing output")
|
||||
finish <- true
|
||||
}
|
||||
|
||||
func (vconn *FreedomConnection) CloseConn(conn net.Conn, finish <-chan bool) {
|
||||
<-finish
|
||||
<-finish
|
||||
func (vconn *FreedomConnection) CloseConn(conn net.Conn, readFinish <-chan bool, writeFinish <-chan bool) {
|
||||
<-writeFinish
|
||||
if tcpConn, ok := conn.(*net.TCPConn); ok {
|
||||
log.Debug("Closing freedom write.")
|
||||
tcpConn.CloseWrite();
|
||||
}
|
||||
<-readFinish
|
||||
conn.Close()
|
||||
}
|
||||
+9
-13
@@ -76,11 +76,10 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
|
||||
authResponse := socksio.NewAuthenticationResponse(socksio.AuthNoMatchingMethod)
|
||||
socksio.WriteAuthentication(connection, authResponse)
|
||||
|
||||
log.Info("Client doesn't support allowed any auth methods.")
|
||||
log.Warning("Client doesn't support allowed any auth methods.")
|
||||
return ErrorAuthenticationFailed
|
||||
}
|
||||
|
||||
log.Debug("Auth accepted, responding auth.")
|
||||
authResponse := socksio.NewAuthenticationResponse(socksio.AuthNotRequired)
|
||||
socksio.WriteAuthentication(connection, authResponse)
|
||||
|
||||
@@ -96,7 +95,7 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
|
||||
response := socksio.NewSocks5Response()
|
||||
response.Error = socksio.ErrorCommandNotSupported
|
||||
socksio.WriteResponse(connection, response)
|
||||
log.Info("Unsupported socks command %d", request.Command)
|
||||
log.Warning("Unsupported socks command %d", request.Command)
|
||||
return ErrorCommandNotSupported
|
||||
}
|
||||
|
||||
@@ -111,17 +110,17 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
|
||||
case socksio.AddrTypeDomain:
|
||||
response.Domain = request.Domain
|
||||
}
|
||||
log.Debug("Socks response port = %d", response.Port)
|
||||
socksio.WriteResponse(connection, response)
|
||||
|
||||
ray := server.vPoint.NewInboundConnectionAccepted(request.Destination())
|
||||
input := ray.InboundInput()
|
||||
output := ray.InboundOutput()
|
||||
finish := make(chan bool, 2)
|
||||
readFinish := make(chan bool)
|
||||
writeFinish := make(chan bool)
|
||||
|
||||
go server.dumpInput(connection, input, finish)
|
||||
go server.dumpOutput(connection, output, finish)
|
||||
server.waitForFinish(finish)
|
||||
go server.dumpInput(connection, input, readFinish)
|
||||
go server.dumpOutput(connection, output, writeFinish)
|
||||
<-writeFinish
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -129,15 +128,12 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
|
||||
func (server *SocksServer) dumpInput(conn net.Conn, input chan<- []byte, finish chan<- bool) {
|
||||
v2net.ReaderToChan(input, conn)
|
||||
close(input)
|
||||
log.Debug("Socks input closed")
|
||||
finish <- true
|
||||
}
|
||||
|
||||
func (server *SocksServer) dumpOutput(conn net.Conn, output <-chan []byte, finish chan<- bool) {
|
||||
v2net.ChanToWriter(conn, output)
|
||||
log.Debug("Socks output closed")
|
||||
finish <- true
|
||||
}
|
||||
|
||||
func (server *SocksServer) waitForFinish(finish <-chan bool) {
|
||||
<-finish
|
||||
<-finish
|
||||
}
|
||||
+15
-9
@@ -50,6 +50,7 @@ func (handler *VMessInboundHandler) AcceptConnections(listener net.Listener) err
|
||||
|
||||
func (handler *VMessInboundHandler) HandleConnection(connection net.Conn) error {
|
||||
defer connection.Close()
|
||||
|
||||
reader := vmessio.NewVMessRequestReader(handler.clients)
|
||||
|
||||
request, err := reader.Read(connection)
|
||||
@@ -60,7 +61,6 @@ func (handler *VMessInboundHandler) HandleConnection(connection net.Conn) error
|
||||
|
||||
response := vmessio.NewVMessResponse(request)
|
||||
nBytes, err := connection.Write(response[:])
|
||||
log.Debug("Writing VMess response %v", response)
|
||||
if err != nil {
|
||||
return log.Error("Failed to write VMess response (%d bytes): %v", nBytes, err)
|
||||
}
|
||||
@@ -83,11 +83,19 @@ func (handler *VMessInboundHandler) HandleConnection(connection net.Conn) error
|
||||
ray := handler.vPoint.NewInboundConnectionAccepted(request.Address)
|
||||
input := ray.InboundInput()
|
||||
output := ray.InboundOutput()
|
||||
finish := make(chan bool, 2)
|
||||
|
||||
readFinish := make(chan bool)
|
||||
writeFinish := make(chan bool)
|
||||
|
||||
go handler.dumpInput(requestReader, input, finish)
|
||||
go handler.dumpOutput(responseWriter, output, finish)
|
||||
handler.waitForFinish(finish)
|
||||
go handler.dumpInput(requestReader, input, readFinish)
|
||||
go handler.dumpOutput(responseWriter, output, writeFinish)
|
||||
|
||||
<-writeFinish
|
||||
if tcpConn, ok := connection.(*net.TCPConn); ok {
|
||||
log.Debug("VMessIn closing write")
|
||||
tcpConn.CloseWrite();
|
||||
}
|
||||
<-readFinish
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -95,18 +103,16 @@ func (handler *VMessInboundHandler) HandleConnection(connection net.Conn) error
|
||||
func (handler *VMessInboundHandler) dumpInput(reader io.Reader, input chan<- []byte, finish chan<- bool) {
|
||||
v2net.ReaderToChan(input, reader)
|
||||
close(input)
|
||||
log.Debug("VMessIn closing input")
|
||||
finish <- true
|
||||
}
|
||||
|
||||
func (handler *VMessInboundHandler) dumpOutput(writer io.Writer, output <-chan []byte, finish chan<- bool) {
|
||||
v2net.ChanToWriter(writer, output)
|
||||
log.Debug("VMessOut closing output")
|
||||
finish <- true
|
||||
}
|
||||
|
||||
func (handler *VMessInboundHandler) waitForFinish(finish <-chan bool) {
|
||||
<-finish
|
||||
<-finish
|
||||
}
|
||||
|
||||
type VMessInboundHandlerFactory struct {
|
||||
}
|
||||
|
||||
+13
-6
@@ -67,7 +67,7 @@ func (handler *VMessOutboundHandler) Start(ray core.OutboundRay) error {
|
||||
}
|
||||
|
||||
func (handler *VMessOutboundHandler) startCommunicate(request *vmessio.VMessRequest, dest v2net.Address, ray core.OutboundRay) error {
|
||||
conn, err := net.Dial("tcp", dest.String())
|
||||
conn, err := net.DialTCP("tcp", nil, &net.TCPAddr{dest.IP, int(dest.Port), ""})
|
||||
log.Debug("VMessOutbound dialing tcp: %s", dest.String())
|
||||
if err != nil {
|
||||
log.Error("Failed to open tcp (%s): %v", dest.String(), err)
|
||||
@@ -109,22 +109,29 @@ func (handler *VMessOutboundHandler) startCommunicate(request *vmessio.VMessRequ
|
||||
|
||||
input := ray.OutboundInput()
|
||||
output := ray.OutboundOutput()
|
||||
finish := make(chan bool, 2)
|
||||
readFinish := make(chan bool)
|
||||
writeFinish := make(chan bool)
|
||||
|
||||
go handler.dumpInput(encryptRequestWriter, input, finish)
|
||||
go handler.dumpOutput(decryptResponseReader, output, finish)
|
||||
handler.waitForFinish(finish)
|
||||
return nil
|
||||
go handler.dumpInput(encryptRequestWriter, input, readFinish)
|
||||
go handler.dumpOutput(decryptResponseReader, output, writeFinish)
|
||||
|
||||
<-readFinish
|
||||
conn.CloseWrite()
|
||||
log.Debug("VMessOut closing write")
|
||||
<-writeFinish
|
||||
return nil
|
||||
}
|
||||
|
||||
func (handler *VMessOutboundHandler) dumpOutput(reader io.Reader, output chan<- []byte, finish chan<- bool) {
|
||||
v2net.ReaderToChan(output, reader)
|
||||
close(output)
|
||||
log.Debug("VMessOut closing output")
|
||||
finish <- true
|
||||
}
|
||||
|
||||
func (handler *VMessOutboundHandler) dumpInput(writer io.Writer, input <-chan []byte, finish chan<- bool) {
|
||||
v2net.ChanToWriter(writer, input)
|
||||
log.Debug("VMessOut closing input")
|
||||
finish <- true
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user