unify config formats of all shadowsocks implementations

dearplain · Nov 7, 2012 · 219f0a0 · 219f0a0
1 parent 21d07b0
commit 219f0a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/config.json b/config.json
@@ -1,6 +1,7 @@
 {
-    "Server":"127.0.0.1",
-    "ServerPort":8388,
-    "LocalPort":1080,
-    "Password":"barfoo!"
+    "server":"127.0.0.1",
+    "server_port":8388,
+    "local_port":1080,
+    "password":"barfoo!",
+    "timeout":60
 }
diff --git a/src/shadowsocks/config.go b/src/shadowsocks/config.go
@@ -13,10 +13,10 @@ import (
 	"log"
 )
 type Config struct {
-	Server string
-	ServerPort int
-	LocalPort int
-	Password string
+	Server string `json:"server"`
+	ServerPort int `json:"server_port"`
+	LocalPort int `json:"local_port"`
+	Password string `json:"password"`
 }
 
 func ParseConfig() Config {