lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-17 23:06:30 -05:00
Code Issues Releases Wiki Activity

fix receiving window size

Browse Source
This commit is contained in:
Darien Raymond 2018-07-02 15:30:23 +02:00
parent c4491d06d3
commit 6315217572
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,12 +24,18 @@ func (w *ReceivingWindow) Size() uint32 {
return w.size return w.size
} }
func (w *ReceivingWindow) Position(idx uint32) uint32 { func (w *ReceivingWindow) Position(idx uint32) (uint32, bool) {
return (idx + w.start) % w.size if idx >= w.size {
return 0, false
}
return (w.start + idx) % w.size, true
} }
func (w *ReceivingWindow) Set(idx uint32, value *DataSegment) bool { func (w *ReceivingWindow) Set(idx uint32, value *DataSegment) bool {
pos := w.Position(idx) pos, ok := w.Position(idx)
if !ok {
return false
}
if w.list[pos] != nil { if w.list[pos] != nil {
return false return false
} }
@ -38,7 +44,10 @@ func (w *ReceivingWindow) Set(idx uint32, value *DataSegment) bool {
} }
func (w *ReceivingWindow) Remove(idx uint32) *DataSegment { func (w *ReceivingWindow) Remove(idx uint32) *DataSegment {
pos := w.Position(idx) pos, ok := w.Position(idx)
if !ok {
return nil
}
e := w.list[pos] e := w.list[pos]
w.list[pos] = nil w.list[pos] = nil
return e return e
@ -49,7 +58,8 @@ func (w *ReceivingWindow) RemoveFirst() *DataSegment {
} }
func (w *ReceivingWindow) HasFirst() bool { func (w *ReceivingWindow) HasFirst() bool {
return w.list[w.Position(0)] != nil pos, _ := w.Position(0)
return w.list[pos] != nil
} }
func (w *ReceivingWindow) Advance() { func (w *ReceivingWindow) Advance() {
@ -157,10 +167,15 @@ type ReceivingWorker struct {
} }
func NewReceivingWorker(kcp *Connection) *ReceivingWorker { func NewReceivingWorker(kcp *Connection) *ReceivingWorker {
windowsSize := kcp.Config.GetReceivingInFlightSize()
if windowsSize > kcp.Config.GetReceivingBufferSize() {
windowsSize = kcp.Config.GetReceivingBufferSize()
}
worker := &ReceivingWorker{ worker := &ReceivingWorker{
conn: kcp, conn: kcp,
window: NewReceivingWindow(kcp.Config.GetReceivingBufferSize()), window: NewReceivingWindow(kcp.Config.GetReceivingBufferSize()),
windowSize: kcp.Config.GetReceivingInFlightSize(), windowSize: windowsSize,
} }
worker.acklist = NewAckList(worker) worker.acklist = NewAckList(worker)
return worker return worker