Add cache_enctable option.

shadowsocks/config.go

@@ -16,12 +16,13 @@ import (
 )
 
 type Config struct {
-	Server       string            `json:"server"`
-	ServerPort   int               `json:"server_port"`
-	LocalPort    int               `json:"local_port"`
-	Password     string            `json:"password"`
-	PortPassword map[string]string `json:"port_password"`
-	Timeout      int               `json:"timeout"`
+	Server        string            `json:"server"`
+	ServerPort    int               `json:"server_port"`
+	LocalPort     int               `json:"local_port"`
+	Password      string            `json:"password"`
+	PortPassword  map[string]string `json:"port_password"`
+	Timeout       int               `json:"timeout"`
+	CacheEncTable bool              `json:"cache_enctable"`
 }
 
 var readTimeout time.Duration

shadowsocks/config_test.go

@@ -5,21 +5,27 @@ import (
 )
 
 func TestParseConfig1Password(t *testing.T) {
-	config := ParseConfig("testdata/config-one-passwd.json")
+	config, err := ParseConfig("testdata/config-one-passwd.json")
+	if err != nil {
+		t.Error("error parsing single password config:", err)
+	}
 
 	if config.Password != "barfoo!" {
 		t.Error("wrong password from config")
 	}
-	if config.Debug != true {
-		t.Error("debug option wrong")
-	}
 	if config.Timeout != 60 {
 		t.Error("tiemout wrong")
 	}
+	if !config.CacheEncTable {
+		t.Error("cache_enctable should be true")
+	}
 }
 
 func TestParseConfigMultiPassword(t *testing.T) {
-	config := ParseConfig("testdata/config-multi-passwd.json")
+	config, err := ParseConfig("testdata/config-multi-passwd.json")
+	if err != nil {
+		t.Error("error parsing multi password config:", err)
+	}
 
 	if config.Password != "barfoo!" {
 		t.Error("wrong password from config")

shadowsocks/testdata/config-one-passwd.json

@@ -4,5 +4,5 @@
     "local_port":1081,
     "password":"barfoo!",
     "timeout":60,
-    "debug": true
+    "cache_enctable": true
 }