idle timeout parsed from config file

p4gefau1t · Mar 21, 2020 · 0629b1b · 0629b1b
1 parent 020a3b6
commit 0629b1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/proxy/client.go b/proxy/client.go
@@ -220,6 +220,9 @@ func (c *Client) Run() error {
 	listener, err := net.Listen("tcp", c.config.LocalAddr.String())
 	//TODO
 	ctx, _ := context.WithCancel(context.Background())
+	if c.config.TCP.MuxIdleTimeout > 0 {
+		go c.checkAndCloseIdleMuxClient()
+	}
 	c.ctx = ctx
 	if err != nil {
 		return err
@@ -231,9 +234,6 @@ func (c *Client) Run() error {
 			logger.Error("error occured when accpeting conn", err)
 			continue
 		}
-		if c.config.TCP.MuxIdleTimeout > 0 {
-			go c.checkAndCloseIdleMuxClient()
-		}
 		if c.config.TCP.Mux {
 			go c.handleMuxConn(conn)
 		} else {

diff --git a/proxy/client_test.go b/proxy/client_test.go
@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"net"
 	"testing"
-	"time"
 
 	"github.com/p4gefau1t/trojan-go/common"
 	"github.com/p4gefau1t/trojan-go/conf"
@@ -39,7 +38,6 @@ func TestClient(t *testing.T) {
 		config: config,
 	}
 	c.Run()
-	time.Sleep(time.Hour)
 }
 
 func TestMuxClient(t *testing.T) {
@@ -66,14 +64,14 @@ func TestMuxClient(t *testing.T) {
 		},
 		Hash: map[string]string{common.SHA224String(password): password},
 	}
+	config.TCP.MuxIdleTimeout = 1
 	config.TLS.CertPool = pool
 	config.TLS.SNI = "localhost"
 
 	c := Client{
 		config: config,
 	}
 	c.Run()
-	time.Sleep(time.Hour)
 }
 
 func TestClientWithJSON(t *testing.T) {
@@ -86,5 +84,4 @@ func TestClientWithJSON(t *testing.T) {
 		config: config,
 	}
 	client.Run()
-	time.Sleep(time.Hour)
 }