Add server_password option to specify multiple servers.

shadowsocks/config.go

@@ -11,24 +11,32 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"reflect"
 	"time"
 )
 
 type Config struct {
-	Server        interface{}       `json:"server"`
-	ServerPort    int               `json:"server_port"`
-	LocalPort     int               `json:"local_port"`
-	Password      string            `json:"password"`
+	Server     interface{} `json:"server"`
+	ServerPort int         `json:"server_port"`
+	LocalPort  int         `json:"local_port"`
+	Password   string      `json:"password"`
+
+	// following options are only used by server
 	PortPassword  map[string]string `json:"port_password"`
 	Timeout       int               `json:"timeout"`
 	CacheEncTable bool              `json:"cache_enctable"`
+
+	// following options are only used by client
+	ServerPassword map[string]string `json:"server_password"`
 }
 
 var readTimeout time.Duration
 
 func (config *Config) GetServerArray() []string {
+	// Specifying multiple servers in the "server" options is deprecated.
+	// But for backward compatiblity, keep this.
 	if config.Server == nil {
 		return nil
 	}
@@ -38,6 +46,10 @@ func (config *Config) GetServerArray() []string {
 	}
 	arr, ok := config.Server.([]interface{})
 	if ok {
+		if len(arr) > 1 {
+			log.Println("Multiple servers in \"server\" option is deprecated. " +
+				"Please use \"server_password\" instead.")
+		}
 		serverArr := make([]string, len(arr), len(arr))
 		for i, s := range arr {
 			serverArr[i], ok = s.(string)

shadowsocks/config_test.go

@@ -65,6 +65,18 @@ func TestDeprecatedClientMultiServerArray(t *testing.T) {
 	}
 }
 
+func TestClientMultiServerArray(t *testing.T) {
+	config, err := ParseConfig("testdata/client-multi-server.json")
+	if err != nil {
+		t.Error("error parsing client-multi-server.json:", err)
+	}
+
+	if config.ServerPassword["127.0.0.1:8388"] != "foobar" ||
+		config.ServerPassword["127.0.1.1:8389"] != "barfoo" {
+		t.Error("server_password parse error")
+	}
+}
+
 func TestParseConfigEmpty(t *testing.T) {
 	// make sure we will not crash
 	config, err := ParseConfig("testdata/noserver.json")

shadowsocks/testdata/client-multi-server.json

@@ -0,0 +1,7 @@
+{
+	"local_port":1081,
+	"server_password": {
+		"127.0.0.1:8388": "foobar",
+		"127.0.1.1:8389": "barfoo"
+	}
+}