From 71c9bd678c26f333cc272f2b52dadf7c1535830e Mon Sep 17 00:00:00 2001
From: v2ray <admin@v2ray.com>
Date: Wed, 29 Jun 2016 23:41:04 +0200
Subject: [PATCH] Fix receiving update

---
 transport/internet/kcp/kcp.go       |  9 +++++++--
 transport/internet/kcp/receiving.go | 10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/transport/internet/kcp/kcp.go b/transport/internet/kcp/kcp.go
index d83bee15..ea3859a1 100644
--- a/transport/internet/kcp/kcp.go
+++ b/transport/internet/kcp/kcp.go
@@ -183,6 +183,7 @@ func (kcp *KCP) DumpReceivingBuf() {
 		kcp.rcv_queue = append(kcp.rcv_queue, seg)
 		kcp.rcv_buf.Advance()
 		kcp.rcv_nxt++
+		kcp.receivingUpdated = true
 	}
 }
 
@@ -288,8 +289,9 @@ func (kcp *KCP) HandleReceivingNext(receivingNext uint32) {
 }
 
 func (kcp *KCP) HandleSendingNext(sendingNext uint32) {
-	kcp.acklist.Clear(sendingNext)
-	kcp.receivingUpdated = true
+	if kcp.acklist.Clear(sendingNext) {
+		kcp.receivingUpdated = true
+	}
 }
 
 func (kcp *KCP) parse_data(newseg *DataSegment) {
@@ -325,6 +327,7 @@ func (kcp *KCP) Input(data []byte) int {
 			kcp.HandleOption(seg.Opt)
 			kcp.HandleSendingNext(seg.SendingNext)
 			kcp.acklist.Add(seg.Number, seg.Timestamp)
+			kcp.receivingUpdated = true
 			kcp.parse_data(seg)
 			kcp.lastPayloadTime = kcp.current
 		case *ACKSegment:
@@ -407,6 +410,7 @@ func (kcp *KCP) flush() {
 	lost := false
 
 	// flush acknowledges
+	//if kcp.receivingUpdated {
 	ackSeg := kcp.acklist.AsSegment()
 	if ackSeg != nil {
 		ackSeg.Conv = kcp.conv
@@ -415,6 +419,7 @@ func (kcp *KCP) flush() {
 		kcp.output.Write(ackSeg)
 		kcp.receivingUpdated = false
 	}
+	//}
 
 	// calculate window size
 	cwnd := _imin_(kcp.snd_una+kcp.snd_wnd, kcp.rmt_wnd)
diff --git a/transport/internet/kcp/receiving.go b/transport/internet/kcp/receiving.go
index 2626846e..16358592 100644
--- a/transport/internet/kcp/receiving.go
+++ b/transport/internet/kcp/receiving.go
@@ -59,7 +59,7 @@ func (this *ACKList) Add(number uint32, timestamp uint32) {
 	this.numbers = append(this.numbers, number)
 }
 
-func (this *ACKList) Clear(una uint32) {
+func (this *ACKList) Clear(una uint32) bool {
 	count := 0
 	for i := 0; i < len(this.numbers); i++ {
 		if this.numbers[i] >= una {
@@ -70,8 +70,12 @@ func (this *ACKList) Clear(una uint32) {
 			count++
 		}
 	}
-	this.numbers = this.numbers[:count]
-	this.timestamps = this.timestamps[:count]
+	if count < len(this.numbers) {
+		this.numbers = this.numbers[:count]
+		this.timestamps = this.timestamps[:count]
+		return true
+	}
+	return false
 }
 
 func (this *ACKList) AsSegment() *ACKSegment {