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

better locking in udp server

pull/362/head
Darien Raymond 2017-01-06 11:40:59 +01:00
parent f2fcc90de2
commit 43cc81e5a8
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
transport/internet/udp/udp_server.go
View File

@ -130,29 +130,34 @@ func (v *Server) locateExistingAndDispatch(name string, payload *buf.Buffer) boo
return false
}
func (v *Server) getInboundRay(dest string, session *proxy.SessionInfo) (*TimedInboundRay, bool) {
v.Lock()
defer v.Unlock()
if entry, found := v.conns[dest]; found {
return entry, true
}
log.Info("UDP|Server: establishing new connection for ", dest)
inboundRay := v.packetDispatcher.DispatchToOutbound(session)
return NewTimedInboundRay(dest, inboundRay, v), false
}
func (v *Server) Dispatch(session *proxy.SessionInfo, payload *buf.Buffer, callback ResponseCallback) {
source := session.Source
destination := session.Destination
// TODO: Add user to destString
destString := source.String() + "-" + destination.String()
log.Debug("UDP Server: Dispatch request: ", destString)
if v.locateExistingAndDispatch(destString, payload) {
return
}
log.Info("UDP Server: establishing new connection for ", destString)
inboundRay := v.packetDispatcher.DispatchToOutbound(session)
timedInboundRay := NewTimedInboundRay(destString, inboundRay, v)
outputStream := timedInboundRay.InboundInput()
log.Debug("UDP|Server: Dispatch request: ", destString)
inboundRay, existing := v.getInboundRay(destString, session)
outputStream := inboundRay.InboundInput()
if outputStream != nil {
outputStream.Write(payload)
}
v.Lock()
v.conns[destString] = timedInboundRay
v.Unlock()
go v.handleConnection(timedInboundRay, source, callback)
if !existing {
go v.handleConnection(inboundRay, source, callback)
}
}
func (v *Server) handleConnection(inboundRay *TimedInboundRay, source v2net.Destination, callback ResponseCallback) {
@ -161,7 +166,7 @@ func (v *Server) handleConnection(inboundRay *TimedInboundRay, source v2net.Dest
if inputStream == nil {
break
}
data, err := inboundRay.InboundOutput().Read()
data, err := inputStream.Read()
if err != nil {
break
}