lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 18:17:52 -05:00
Code Issues Releases Wiki Activity

fix KCP

Browse Source
This commit is contained in:
v2ray 2016-06-17 23:09:26 +02:00
parent 87cb0d5dc9
commit 7a84c930d4
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
transport/internet/kcp/connection.go
View File

@ -69,7 +69,6 @@ type UDPSession struct {
rd time.Time // read deadline rd time.Time // read deadline
wd time.Time // write deadline wd time.Time // write deadline
chReadEvent chan struct{} chReadEvent chan struct{}
chWriteEvent chan struct{}
writer io.WriteCloser writer io.WriteCloser
since int64 since int64
} }
@ -79,7 +78,6 @@ func newUDPSession(conv uint32, writerCloser io.WriteCloser, local *net.UDPAddr,
sess := new(UDPSession) sess := new(UDPSession)
sess.local = local sess.local = local
sess.chReadEvent = make(chan struct{}, 1) sess.chReadEvent = make(chan struct{}, 1)
sess.chWriteEvent = make(chan struct{}, 1)
sess.remote = remote sess.remote = remote
sess.block = block sess.block = block
sess.writer = writerCloser sess.writer = writerCloser
@ -95,7 +93,10 @@ func newUDPSession(conv uint32, writerCloser io.WriteCloser, local *net.UDPAddr,
opt = OptionClose opt = OptionClose
} }
ext.Prepend([]byte{byte(cmd), byte(opt)}) ext.Prepend([]byte{byte(cmd), byte(opt)})
sess.output(ext) go sess.output(ext)
}
if sess.state == ConnStateReadyToClose && sess.kcp.WaitSnd() == 0 {
go sess.NotifyTermination()
} }
}) })
sess.kcp.WndSize(effectiveConfig.Sndwnd, effectiveConfig.Rcvwnd) sess.kcp.WndSize(effectiveConfig.Sndwnd, effectiveConfig.Rcvwnd)
@ -130,24 +131,17 @@ func (s *UDPSession) Read(b []byte) (int, error) {
return 0, errTimeout return 0, errTimeout
} }
} }
nBytes := s.kcp.Recv(b)
if nBytes > 0 {
s.Unlock() s.Unlock()
s.kcpAccess.Lock()
nBytes := s.kcp.Recv(b)
s.kcpAccess.Unlock()
if nBytes > 0 {
return nBytes, nil return nBytes, nil
} }
var timeout <-chan time.Time
if !s.rd.IsZero() {
delay := s.rd.Sub(time.Now())
timeout = time.After(delay)
}
s.Unlock()
select { select {
case <-s.chReadEvent: case <-s.chReadEvent:
case <-timeout: case <-time.After(time.Second):
return 0, errTimeout
} }
} }
} }
@ -182,7 +176,8 @@ func (s *UDPSession) Write(b []byte) (int, error) {
return 0, errTimeout return 0, errTimeout
} }
time.Sleep(time.Duration(s.kcp.WaitSnd()*5) * time.Millisecond) // Sending windows is 1024 for the moment. This amount is not gonna sent in 1 sec.
time.Sleep(time.Second)
} }
} }
@ -207,11 +202,13 @@ func (this *UDPSession) NotifyTermination() {
this.Unlock() this.Unlock()
break break
} }
this.Unlock()
buffer := alloc.NewSmallBuffer().Clear() buffer := alloc.NewSmallBuffer().Clear()
buffer.AppendBytes(byte(CommandTerminate), byte(OptionClose), byte(0), byte(0), byte(0), byte(0)) buffer.AppendBytes(byte(CommandTerminate), byte(OptionClose), byte(0), byte(0), byte(0), byte(0))
this.output(buffer) this.output(buffer)
time.Sleep(time.Second) time.Sleep(time.Second)
this.Unlock()
} }
this.Terminate() this.Terminate()
} }
@ -284,9 +281,15 @@ func (s *UDPSession) output(payload *alloc.Buffer) {
func (s *UDPSession) updateTask() { func (s *UDPSession) updateTask() {
for s.state != ConnStateClosed { for s.state != ConnStateClosed {
current := s.Elapsed() current := s.Elapsed()
s.kcpAccess.Lock()
s.kcp.Update(current) s.kcp.Update(current)
interval := s.kcp.Check(s.Elapsed()) interval := s.kcp.Check(s.Elapsed())
time.Sleep(time.Duration(interval) * time.Millisecond) s.kcpAccess.Unlock()
sleep := interval - current
if sleep < 10 {
sleep = 10
}
time.Sleep(time.Duration(sleep) * time.Millisecond)
} }
} }
@ -297,13 +300,6 @@ func (s *UDPSession) notifyReadEvent() {
} }
} }
func (s *UDPSession) notifyWriteEvent() {
select {
case s.chWriteEvent <- struct{}{}:
default:
}
}
func (this *UDPSession) MarkPeerClose() { func (this *UDPSession) MarkPeerClose() {
this.Lock() this.Lock()
defer this.Unlock() defer this.Unlock()