lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-04 16:37:12 -05:00
Code Issues Releases Wiki Activity

allow multiple UDP incoming packets in freedom

Browse Source
This commit is contained in:
Darien Raymond 2016-02-01 11:38:38 +00:00
parent d3ff2b3698
commit 3b1f92b7e8
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/net/timed_io.go
View File

@ -16,7 +16,7 @@ type TimeOutReader struct {
worker io.Reader worker io.Reader
} }
func NewTimeOutReader(timeout int, connection net.Conn) *TimeOutReader { func NewTimeOutReader(timeout int /* seconds */, connection net.Conn) *TimeOutReader {
reader := &TimeOutReader{ reader := &TimeOutReader{
connection: connection, connection: connection,
timeout: -100, timeout: -100,

18
proxy/freedom/freedom.go
View File

@ -1,6 +1,7 @@
package freedom package freedom
import ( import (
"io"
"net" "net"
"sync" "sync"
@ -58,21 +59,14 @@ func (this *FreedomConnection) Dispatch(firstPacket v2net.Packet, ray ray.Outbou
defer readMutex.Unlock() defer readMutex.Unlock()
defer close(output) defer close(output)
response, err := v2io.ReadFrom(conn, nil) var reader io.Reader
log.Info("Freedom receives ", response.Len(), " bytes from ", conn.RemoteAddr()) reader = conn
if response.Len() > 0 {
output <- response
} else {
response.Release()
}
if err != nil {
return
}
if firstPacket.Destination().IsUDP() { if firstPacket.Destination().IsUDP() {
return reader = v2net.NewTimeOutReader(4 /* seconds */, conn)
} }
v2io.RawReaderToChan(output, conn) v2io.RawReaderToChan(output, reader)
}() }()
writeMutex.Lock() writeMutex.Lock()