3 Commits
1.5 ... 1.6

Author SHA1 Message Date
skywind3000
53e568bd3b update testing 2020-03-26 19:37:48 +08:00
skywind3000
700e2a8161 Merge remote-tracking branch 'remotes/origin/master' 2020-03-26 19:29:51 +08:00
skywind3000
9158f84781 update rto calculation 2020-03-26 19:28:17 +08:00
2 changed files with 7 additions and 4 deletions

6
ikcp.c
View File

@@ -1060,9 +1060,11 @@ void ikcp_flush(ikcpcb *kcp)
segment->xmit++;
kcp->xmit++;
if (kcp->nodelay == 0) {
segment->rto += kcp->rx_rto;
segment->rto += _imax_(segment->rto, (IUINT32)kcp->rx_rto);
} else {
segment->rto += kcp->rx_rto / 2;
IINT32 step = (kcp->nodelay < 2)?
((IINT32)(segment->rto)) : kcp->rx_rto;
segment->rto += step / 2;
}
segment->resendts = current + segment->rto;
lost = 1;

View File

@@ -70,8 +70,8 @@ void test(int mode)
// 第三个参数 interval为内部处理时钟默认设置为 10ms
// 第四个参数 resend为快速重传指标设置为2
// 第五个参数 为是否禁用常规流控,这里禁止
ikcp_nodelay(kcp1, 1, 10, 2, 1);
ikcp_nodelay(kcp2, 1, 10, 2, 1);
ikcp_nodelay(kcp1, 2, 10, 2, 1);
ikcp_nodelay(kcp2, 2, 10, 2, 1);
kcp1->rx_minrto = 10;
kcp1->fastresend = 1;
}
@@ -178,3 +178,4 @@ fast mode result (20207ms):
avgrtt=138 maxrtt=392
*/