add token into stream v2

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 go:
-    - 1.9.x
     - 1.10.x
     - 1.11.x
+    - 1.12.x
 
 before_install:
     - go get -t -v ./...
@@ -11,7 +11,7 @@ install:
     - go get github.com/xtaci/smux
 
 script:
-    - go test -coverprofile=coverage.txt -covermode=atomic -bench .
+    - go test -coverprofile=coverage.txt -covermode=atomic -bench . -v
 
 after_success:
     - bash <(curl -s https://codecov.io/bash)

frame.go

@@ -14,6 +14,9 @@ const ( // cmds
 	cmdFIN             // stream close, a.k.a EOF mark
 	cmdPSH             // data push
 	cmdNOP             // no operation
+	cmdACK             // for test RTT
+	cmdFUL             // buffer full
+	cmdEMP             // buffer empty
 )
 
 const (

mux.go

@@ -1,7 +1,6 @@
 package smux
 
 import (
-	"fmt"
 	"io"
 	"time"
 
@@ -24,15 +23,27 @@ type Config struct {
 	// MaxReceiveBuffer is used to control the maximum
 	// number of data in the buffer pool
 	MaxReceiveBuffer int
+
+	// Enable Stream buffer
+	EnableStreamBuffer bool
+
+	// maximum bytes that each Stream can use
+	MaxStreamBuffer int
+
+	// for initial boost
+	BoostTimeout time.Duration
 }
 
 // DefaultConfig is used to return a default configuration
 func DefaultConfig() *Config {
 	return &Config{
-		KeepAliveInterval: 10 * time.Second,
-		KeepAliveTimeout:  30 * time.Second,
-		MaxFrameSize:      32768,
-		MaxReceiveBuffer:  4194304,
+		KeepAliveInterval:  2500 * time.Millisecond,
+		KeepAliveTimeout:   7500 * time.Millisecond, // RTT usually < 7500ms
+		MaxFrameSize:       32768,
+		MaxReceiveBuffer:   4 * 1024 * 1024,
+		EnableStreamBuffer: true,
+		MaxStreamBuffer:    200 * 8 * 1024,
+		BoostTimeout:       10 * time.Second,
 	}
 }
 
@@ -41,9 +52,6 @@ func VerifyConfig(config *Config) error {
 	if config.KeepAliveInterval == 0 {
 		return errors.New("keep-alive interval must be positive")
 	}
-	if config.KeepAliveTimeout < config.KeepAliveInterval {
-		return fmt.Errorf("keep-alive timeout must be larger than keep-alive interval")
-	}
 	if config.MaxFrameSize <= 0 {
 		return errors.New("max frame size must be positive")
 	}
@@ -53,6 +61,9 @@ func VerifyConfig(config *Config) error {
 	if config.MaxReceiveBuffer <= 0 {
 		return errors.New("max receive buffer must be positive")
 	}
+	if config.MaxStreamBuffer <= 0 {
+		return errors.New("max stream receive buffer must be positive")
+	}
 	return nil
 }
 

mux_test.go

@@ -26,32 +26,31 @@ func TestConfig(t *testing.T) {
 	}
 
 	config = DefaultConfig()
-	config.KeepAliveInterval = 10
-	config.KeepAliveTimeout = 5
+	config.MaxFrameSize = 0
 	err = VerifyConfig(config)
 	t.Log(err)
 	if err == nil {
 		t.Fatal(err)
 	}
 
 	config = DefaultConfig()
-	config.MaxFrameSize = 0
+	config.MaxFrameSize = 65536
 	err = VerifyConfig(config)
 	t.Log(err)
 	if err == nil {
 		t.Fatal(err)
 	}
 
 	config = DefaultConfig()
-	config.MaxFrameSize = 65536
+	config.MaxReceiveBuffer = 0
 	err = VerifyConfig(config)
 	t.Log(err)
 	if err == nil {
 		t.Fatal(err)
 	}
 
 	config = DefaultConfig()
-	config.MaxReceiveBuffer = 0
+	config.MaxStreamBuffer = 0
 	err = VerifyConfig(config)
 	t.Log(err)
 	if err == nil {