From 5da745c5bd0195bba702c0661fe6555f54e39f09 Mon Sep 17 00:00:00 2001
From: Jim Ma <majinjing3@gmail.com>
Date: Sun, 17 Sep 2017 23:50:25 +0800
Subject: [PATCH] avoid delaying the GotaFrame forever

---
 conn.go   | 30 ++++++++++++++++++++++++++++++
 tunnel.go |  9 +++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/conn.go b/conn.go
index eecf552..7a53ef6 100644
--- a/conn.go
+++ b/conn.go
@@ -416,6 +416,12 @@ func (cm *ConnManager) dispatch() {
 		}
 	}()
 
+	newCCIDDelayCount := make(map[CCID]struct {
+		sleepNanosecond time.Duration
+		delayCount      int
+	})
+	newCCIDMaxDelayCount := 100
+
 	for gf := range cm.readFromTunnelC {
 		Verbosef("CM: Received frame from tunnel: %s", gf)
 
@@ -439,6 +445,8 @@ func (cm *ConnManager) dispatch() {
 			case <-time.After(10 * time.Nanosecond):
 				log.Warnf("CM: Conn handler receive Gota Frame timeout: %s, delivery the Gota Frame async", gf)
 				go func(gf *GotaFrame, ch *ConnHandler) {
+					// TODO "send on closed channel" panic
+					defer Recover()
 					ch.ReadFromTunnelC <- gf
 				}(gf, ch)
 			}
@@ -448,6 +456,22 @@ func (cm *ConnManager) dispatch() {
 		// fast open feature
 		// TODO maybe a bug for multiple init seq num for fast open
 		if cm.fastOpen && !gf.IsControl() && gf.SeqNum == FastOpenInitSeqNum {
+			delay, ok := newCCIDDelayCount[NewCCID(gf.clientID, gf.ConnID)]
+			if !ok {
+				newCCIDDelayCount[NewCCID(gf.clientID, gf.ConnID)] = struct {
+					sleepNanosecond time.Duration
+					delayCount      int
+				}{
+					FastOpenDelayNanosecond,
+					1,
+				}
+				delay = newCCIDDelayCount[NewCCID(gf.clientID, gf.ConnID)]
+			}
+			if delay.delayCount >= newCCIDMaxDelayCount {
+				log.Warnf("CM: Max delay count reached for Gota Frame: %s", gf)
+				continue
+			}
+
 			if cm.mode == ActiveMode {
 				log.Warnf("CM: ActiveMode should not receive this frame, may be a bug, Gota Frame: %s", gf)
 				continue
@@ -459,6 +483,12 @@ func (cm *ConnManager) dispatch() {
 				time.Sleep(FastOpenDelayNanosecond * time.Nanosecond)
 				cm.readFromTunnelC <- gf
 			}(gf)
+
+			delay.delayCount += 1
+			if delay.sleepNanosecond*time.Nanosecond < 8*time.Second {
+				delay.sleepNanosecond *= 2
+			}
+			newCCIDDelayCount[NewCCID(gf.clientID, gf.ConnID)] = delay
 			continue
 		}
 
diff --git a/tunnel.go b/tunnel.go
index a9b6841..89b98dd 100644
--- a/tunnel.go
+++ b/tunnel.go
@@ -499,8 +499,13 @@ func (tm *TunnelManager) cleanUpReadPool() {
 		tm.poolLock.Lock()
 		rp, ok := tm.readPool[cid]
 		if ok {
-			gf := &GotaFrame{}
-			<-rp <- gf
+			go func(rp chan chan *GotaFrame) {
+				gf := &GotaFrame{}
+				select {
+				case <-rp <- gf:
+				case <-time.After(30 * time.Second):
+				}
+			}(rp)
 			/*
 				Loop:
 					for {