lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 09:36:34 -05:00
Code Issues Releases Wiki Activity

fix udp for dokodemo and shadowsocks

Browse Source
This commit is contained in:
v2ray 2016-02-01 21:34:07 +01:00
parent 48aa9af631
commit 5e2583ec8d
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
proxy/dokodemo/dokodemo.go
View File

@ -23,6 +23,7 @@ type DokodemoDoor struct {
packetDispatcher dispatcher.PacketDispatcher
tcpListener *hub.TCPHub
udpHub *hub.UDPHub
udpServer *hub.UDPServer
listeningPort v2net.Port
}
@ -89,26 +90,23 @@ func (this *DokodemoDoor) ListenUDP(port v2net.Port) error {
}
this.udpMutex.Lock()
this.udpHub = udpHub
this.udpServer = hub.NewUDPServer(this.packetDispatcher)
this.udpMutex.Unlock()
return nil
}
func (this *DokodemoDoor) handleUDPPackets(payload *alloc.Buffer, dest v2net.Destination) {
packet := v2net.NewPacket(v2net.UDPDestination(this.address, this.port), payload, false)
ray := this.packetDispatcher.DispatchToOutbound(packet)
close(ray.InboundInput())
for resp := range ray.InboundOutput() {
this.udpServer.Dispatch(dest, packet, func(packet v2net.Packet) {
defer packet.Chunk().Release()
this.udpMutex.RLock()
if !this.accepting {
this.udpMutex.RUnlock()
resp.Release()
return
}
this.udpHub.WriteTo(resp.Value, dest)
this.udpHub.WriteTo(packet.Chunk().Value, packet.Destination())
this.udpMutex.RUnlock()
resp.Release()
}
})
}
func (this *DokodemoDoor) ListenTCP(port v2net.Port) error {

16
proxy/shadowsocks/shadowsocks.go
View File

@ -26,6 +26,7 @@ type Shadowsocks struct {
accepting bool
tcpHub *hub.TCPHub
udpHub *hub.UDPHub
udpServer *hub.UDPServer
}
func NewShadowsocks(config *Config, packetDispatcher dispatcher.PacketDispatcher) *Shadowsocks {
@ -77,6 +78,7 @@ func (this *Shadowsocks) Listen(port v2net.Port) error {
log.Error("Shadowsocks: Failed to listen UDP on port ", port, ": ", err)
}
this.udpHub = udpHub
this.udpServer = hub.NewUDPServer(this.packetDispatcher)
}
return nil
@ -107,12 +109,12 @@ func (this *Shadowsocks) handlerUDPPayload(payload *alloc.Buffer, source v2net.D
log.Info("Shadowsocks: Tunnelling request to ", dest)
packet := v2net.NewPacket(dest, request.UDPPayload, false)
ray := this.packetDispatcher.DispatchToOutbound(packet)
close(ray.InboundInput())
for respChunk := range ray.InboundOutput() {
this.udpServer.Dispatch(source, packet, func(packet v2net.Packet) {
defer packet.Chunk().Release()
response := alloc.NewBuffer().Slice(0, this.config.Cipher.IVSize())
defer response.Release()
rand.Read(response.Value)
respIv := response.Value
@ -135,8 +137,7 @@ func (this *Shadowsocks) handlerUDPPayload(payload *alloc.Buffer, source v2net.D
}
writer.Write(request.Port.Bytes())
writer.Write(respChunk.Value)
respChunk.Release()
writer.Write(packet.Chunk().Value)
if request.OTA {
respAuth := NewAuthenticator(HeaderKeyGenerator(key, respIv))
@ -144,8 +145,7 @@ func (this *Shadowsocks) handlerUDPPayload(payload *alloc.Buffer, source v2net.D
}
this.udpHub.WriteTo(response.Value, source)
response.Release()
}
})
}
func (this *Shadowsocks) handleConnection(conn *hub.TCPConn) {