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

remove nodelay settings

pull/215/head
v2ray 2016-06-25 17:32:09 +02:00
parent 6257dfa247
commit 15f190d268
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ func NewConnection(conv uint32, writerCloser io.WriteCloser, local *net.UDPAddr,
mtu := uint32(effectiveConfig.Mtu - block.HeaderSize() - headerSize) mtu := uint32(effectiveConfig.Mtu - block.HeaderSize() - headerSize)
conn.kcp = NewKCP(conv, mtu, conn.output) conn.kcp = NewKCP(conv, mtu, conn.output)
conn.kcp.WndSize(effectiveConfig.GetSendingWindowSize(), effectiveConfig.GetReceivingWindowSize()) conn.kcp.WndSize(effectiveConfig.GetSendingWindowSize(), effectiveConfig.GetReceivingWindowSize())
conn.kcp.NoDelay(1, effectiveConfig.Tti, 2, effectiveConfig.Congestion) conn.kcp.NoDelay(effectiveConfig.Tti, 2, effectiveConfig.Congestion)
conn.kcp.current = conn.Elapsed() conn.kcp.current = conn.Elapsed()
conn.writeBufferSize = effectiveConfig.WriteBuffer / effectiveConfig.Mtu conn.writeBufferSize = effectiveConfig.WriteBuffer / effectiveConfig.Mtu

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

@ -140,10 +140,10 @@ type KCP struct {
conv, mtu, mss, state uint32 conv, mtu, mss, state uint32
snd_una, snd_nxt, rcv_nxt uint32 snd_una, snd_nxt, rcv_nxt uint32
ts_recent, ts_lastack, ssthresh uint32 ts_recent, ts_lastack, ssthresh uint32
rx_rttval, rx_srtt, rx_rto, rx_minrto uint32 rx_rttval, rx_srtt, rx_rto uint32
snd_wnd, rcv_wnd, rmt_wnd, cwnd, probe uint32 snd_wnd, rcv_wnd, rmt_wnd, cwnd, probe uint32
current, interval, ts_flush, xmit uint32 current, interval, ts_flush, xmit uint32
nodelay, updated uint32 updated uint32
ts_probe, probe_wait uint32 ts_probe, probe_wait uint32
dead_link, incr uint32 dead_link, incr uint32
@ -172,7 +172,6 @@ func NewKCP(conv uint32, mtu uint32, output Output) *KCP {
kcp.mss = kcp.mtu - IKCP_OVERHEAD kcp.mss = kcp.mtu - IKCP_OVERHEAD
kcp.buffer = make([]byte, (kcp.mtu+IKCP_OVERHEAD)*3) kcp.buffer = make([]byte, (kcp.mtu+IKCP_OVERHEAD)*3)
kcp.rx_rto = IKCP_RTO_DEF kcp.rx_rto = IKCP_RTO_DEF
kcp.rx_minrto = IKCP_RTO_MIN
kcp.interval = IKCP_INTERVAL kcp.interval = IKCP_INTERVAL
kcp.ts_flush = IKCP_INTERVAL kcp.ts_flush = IKCP_INTERVAL
kcp.ssthresh = IKCP_THRESH_INIT kcp.ssthresh = IKCP_THRESH_INIT
@ -629,10 +628,6 @@ func (kcp *KCP) flush() {
if kcp.fastresend <= 0 { if kcp.fastresend <= 0 {
resent = 0xffffffff resent = 0xffffffff
} }
//rtomin := (kcp.rx_rto >> 3)
//if kcp.nodelay != 0 {
// rtomin = 0
//}
// flush data segments // flush data segments
for _, segment := range kcp.snd_buf { for _, segment := range kcp.snd_buf {
@ -646,11 +641,7 @@ func (kcp *KCP) flush() {
needsend = true needsend = true
segment.xmit++ segment.xmit++
kcp.xmit++ kcp.xmit++
//if kcp.nodelay == 0 {
segment.rto += kcp.rx_rto segment.rto += kcp.rx_rto
//} else {
// segment.rto += kcp.rx_rto / 2
//}
segment.resendts = current + segment.rto + kcp.interval segment.resendts = current + segment.rto + kcp.interval
//lost = true //lost = true
} else if segment.fastack >= resent { } else if segment.fastack >= resent {
@ -803,15 +794,7 @@ func (kcp *KCP) Check(current uint32) uint32 {
// interval: internal update timer interval in millisec, default is 100ms // interval: internal update timer interval in millisec, default is 100ms
// resend: 0:disable fast resend(default), 1:enable fast resend // resend: 0:disable fast resend(default), 1:enable fast resend
// nc: 0:normal congestion control(default), 1:disable congestion control // nc: 0:normal congestion control(default), 1:disable congestion control
func (kcp *KCP) NoDelay(nodelay, interval, resend int, congestionControl bool) int { func (kcp *KCP) NoDelay(interval, resend int, congestionControl bool) int {
if nodelay >= 0 {
kcp.nodelay = uint32(nodelay)
if nodelay != 0 {
kcp.rx_minrto = IKCP_RTO_NDL
} else {
kcp.rx_minrto = IKCP_RTO_MIN
}
}
if interval >= 0 { if interval >= 0 {
if interval > 5000 { if interval > 5000 {
interval = 5000 interval = 5000