lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-20 14:35:23 +00:00
Code Issues Releases Wiki Activity

bug fixes in sending window

Browse Source
This commit is contained in:
v2ray 2016-07-01 12:12:32 +02:00
parent 4c74e25319
commit dc53575540
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
transport/internet/kcp/sending.go
View File

@ -22,6 +22,7 @@ func NewSendingWindow(kcp *KCP, size uint32) *SendingWindow {
data: make([]*DataSegment, size), data: make([]*DataSegment, size),
prev: make([]uint32, size), prev: make([]uint32, size),
next: make([]uint32, size), next: make([]uint32, size),
kcp: kcp,
} }
return window return window
} }
@ -46,16 +47,17 @@ func (this *SendingWindow) First() *DataSegment {
} }
func (this *SendingWindow) Clear(una uint32) { func (this *SendingWindow) Clear(una uint32) {
for this.Len() > 0 { for this.Len() > 0 && this.data[this.start].Number < una {
if this.data[this.start].Number < una { this.Remove(0)
this.Remove(0)
}
} }
} }
func (this *SendingWindow) Remove(idx uint32) { func (this *SendingWindow) Remove(idx uint32) {
pos := (this.start + idx) % this.cap pos := (this.start + idx) % this.cap
seg := this.data[pos] seg := this.data[pos]
if seg == nil {
return
}
seg.Release() seg.Release()
this.data[pos] = nil this.data[pos] = nil
if pos == this.start { if pos == this.start {
@ -77,6 +79,7 @@ func (this *SendingWindow) Remove(idx uint32) {
} }
func (this *SendingWindow) HandleFastAck(number uint32) { func (this *SendingWindow) HandleFastAck(number uint32) {
for i := this.start; ; i = this.next[i] { for i := this.start; ; i = this.next[i] {
seg := this.data[i] seg := this.data[i]
if _itimediff(number, seg.Number) < 0 { if _itimediff(number, seg.Number) < 0 {
@ -92,6 +95,10 @@ func (this *SendingWindow) HandleFastAck(number uint32) {
} }
func (this *SendingWindow) Flush() bool { func (this *SendingWindow) Flush() bool {
if this.Len() == 0 {
return false
}
current := this.kcp.current current := this.kcp.current
resent := uint32(this.kcp.fastresend) resent := uint32(this.kcp.fastresend)
if this.kcp.fastresend <= 0 { if this.kcp.fastresend <= 0 {