github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

remove nodelay function

pull/215/head
v2ray 2016-07-02 23:59:43 +02:00
parent 951b278ac7
commit 7bc6d8af88
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,6 @@ func NewConnection(conv uint16, writerCloser io.WriteCloser, local *net.UDPAddr,
Writer: writerCloser, Writer: writerCloser,
} }
conn.kcp = NewKCP(conv, authWriter) conn.kcp = NewKCP(conv, authWriter)
conn.kcp.NoDelay(effectiveConfig.Tti, 2, effectiveConfig.Congestion)
conn.kcp.current = conn.Elapsed() conn.kcp.current = conn.Elapsed()
go conn.updateTask() go conn.updateTask()

20
transport/internet/kcp/kcp.go
View File

@ -44,7 +44,7 @@ type KCP struct {
snd_buf *SendingWindow snd_buf *SendingWindow
receivingWorker *ReceivingWorker receivingWorker *ReceivingWorker
fastresend int32 fastresend uint32
congestionControl bool congestionControl bool
output *BufferedSegmentWriter output *BufferedSegmentWriter
} }
@ -65,6 +65,8 @@ func NewKCP(conv uint16, output *AuthenticationWriter) *KCP {
kcp.snd_buf = NewSendingWindow(kcp, effectiveConfig.GetSendingWindowSize()) kcp.snd_buf = NewSendingWindow(kcp, effectiveConfig.GetSendingWindowSize())
kcp.cwnd = kcp.snd_wnd kcp.cwnd = kcp.snd_wnd
kcp.receivingWorker = NewReceivingWorker(kcp) kcp.receivingWorker = NewReceivingWorker(kcp)
kcp.fastresend = 2
kcp.congestionControl = effectiveConfig.Congestion
return kcp return kcp
} }
@ -356,22 +358,6 @@ func (kcp *KCP) Update(current uint32) {
kcp.flush() kcp.flush()
} }
// NoDelay options
// fastest: ikcp_nodelay(kcp, 1, 20, 2, 1)
// nodelay: 0:disable(default), 1:enable
// interval: internal update timer interval in millisec, default is 100ms
// resend: 0:disable fast resend(default), 1:enable fast resend
// nc: 0:normal congestion control(default), 1:disable congestion control
func (kcp *KCP) NoDelay(interval uint32, resend int, congestionControl bool) int {
kcp.interval = interval
if resend >= 0 {
kcp.fastresend = int32(resend)
}
kcp.congestionControl = congestionControl
return 0
}
// WaitSnd gets how many packet is waiting to be sent // WaitSnd gets how many packet is waiting to be sent
func (kcp *KCP) WaitSnd() uint32 { func (kcp *KCP) WaitSnd() uint32 {
return uint32(kcp.snd_buf.Len()) + kcp.snd_queue.Len() return uint32(kcp.snd_buf.Len()) + kcp.snd_queue.Len()