github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Move goroutine one level above.

pull/40/head
V2Ray 2015-10-10 01:25:12 +02:00
parent b115df56c0
commit 055c8f1833
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
point.go
View File

@ -97,7 +97,6 @@ func (vp *Point) Start() error {
func (p *Point) DispatchToOutbound(packet v2net.Packet) InboundRay { func (p *Point) DispatchToOutbound(packet v2net.Packet) InboundRay {
ray := NewRay() ray := NewRay()
// TODO: handle error go p.och.Dispatch(packet, ray)
p.och.Dispatch(packet, ray)
return ray return ray
} }

14
proxy/freedom/freedom.go
View File

@ -46,14 +46,12 @@ func (vconn *FreedomConnection) Dispatch(firstPacket v2net.Packet, ray core.Outb
go dumpOutput(conn, output, &readMutex, firstPacket.Destination().IsUDP()) go dumpOutput(conn, output, &readMutex, firstPacket.Destination().IsUDP())
go func() { writeMutex.Lock()
writeMutex.Lock() if tcpConn, ok := conn.(*net.TCPConn); ok {
if tcpConn, ok := conn.(*net.TCPConn); ok { tcpConn.CloseWrite()
tcpConn.CloseWrite() }
} readMutex.Lock()
readMutex.Lock() conn.Close()
conn.Close()
}()
return nil return nil
} }

3
proxy/vmess/vmessout.go
View File

@ -88,8 +88,7 @@ func (handler *VMessOutboundHandler) Dispatch(firstPacket v2net.Packet, ray core
request.RequestKey = buffer[16:32] request.RequestKey = buffer[16:32]
request.ResponseHeader = buffer[32:] request.ResponseHeader = buffer[32:]
go startCommunicate(request, vNextAddress, ray, firstPacket) return startCommunicate(request, vNextAddress, ray, firstPacket)
return nil
} }
func startCommunicate(request *protocol.VMessRequest, dest v2net.Destination, ray core.OutboundRay, firstPacket v2net.Packet) error { func startCommunicate(request *protocol.VMessRequest, dest v2net.Destination, ray core.OutboundRay, firstPacket v2net.Packet) error {