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

send more ack numbers if not full

Browse Source
This commit is contained in:
Darien Raymond 2016-11-28 22:06:32 +01:00
parent 5ffabe1148
commit 2dc74faf19
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
transport/internet/kcp/receiving.go
View File

@ -60,14 +60,17 @@ type AckList struct {
timestamps []uint32 timestamps []uint32
numbers []uint32 numbers []uint32
nextFlush []uint32 nextFlush []uint32
flushCandidates []uint32
} }
func NewAckList(writer SegmentWriter) *AckList { func NewAckList(writer SegmentWriter) *AckList {
return &AckList{ return &AckList{
writer: writer, writer: writer,
timestamps: make([]uint32, 0, 32), timestamps: make([]uint32, 0, 32),
numbers: make([]uint32, 0, 32), numbers: make([]uint32, 0, 32),
nextFlush: make([]uint32, 0, 32), nextFlush: make([]uint32, 0, 32),
flushCandidates: make([]uint32, 0, 128),
} }
} }
@ -98,9 +101,14 @@ func (v *AckList) Clear(una uint32) {
} }
func (v *AckList) Flush(current uint32, rto uint32) { func (v *AckList) Flush(current uint32, rto uint32) {
v.flushCandidates = v.flushCandidates[:0]
seg := NewAckSegment() seg := NewAckSegment()
for i := 0; i < len(v.numbers) && !seg.IsFull(); i++ { for i := 0; i < len(v.numbers) && !seg.IsFull(); i++ {
if v.nextFlush[i] > current { if v.nextFlush[i] > current {
if len(v.flushCandidates) < cap(v.flushCandidates) {
v.flushCandidates = append(v.flushCandidates, v.numbers[i])
}
continue continue
} }
seg.PutNumber(v.numbers[i]) seg.PutNumber(v.numbers[i])
@ -112,6 +120,12 @@ func (v *AckList) Flush(current uint32, rto uint32) {
v.nextFlush[i] = current + timeout v.nextFlush[i] = current + timeout
} }
if seg.Count > 0 { if seg.Count > 0 {
for _, number := range v.flushCandidates {
if seg.IsFull() {
break
}
seg.PutNumber(number)
}
v.writer.Write(seg) v.writer.Write(seg)
seg.Release() seg.Release()
} }