Merge branch 'develop'

cmd/shadowsocks-local/local.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"log"
 	"net"
+	"os"
 	"strconv"
 )
 
@@ -178,7 +179,7 @@ func run(port, password, server string) {
 		log.Fatal(err)
 	}
 	encTbl := ss.GetTable(password)
-	log.Printf("starting local socks5 server at port %v, remote shadowsocks server %s...\n", port, server)
+	log.Printf("starting local socks5 server at port %v, remote shadowsocks server %s ...\n", port, server)
 	for {
 		conn, err := ln.Accept()
 		if err != nil {
@@ -189,6 +190,11 @@ func run(port, password, server string) {
 	}
 }
 
+func enoughOptions(config *ss.Config) bool {
+	return config.Server != "" && config.ServerPort != 0 &&
+		config.LocalPort != 0 && config.Password != ""
+}
+
 func main() {
 	var configFile string
 	var cmdConfig ss.Config
@@ -204,9 +210,18 @@ func main() {
 
 	config, err := ss.ParseConfig(configFile)
 	if err != nil {
-		return
+		enough := enoughOptions(&cmdConfig)
+		if !(enough && os.IsNotExist(err)) {
+			log.Printf("error reading %s: %v\n", configFile, err)
+		}
+		if !enough {
+			return
+		}
+		log.Println("using all options from command line")
+		config = &cmdConfig
+	} else {
+		ss.UpdateConfig(config, &cmdConfig)
 	}
-	ss.UpdateConfig(config, &cmdConfig)
 	ss.SetDebug(debug)
 
 	run(strconv.Itoa(config.LocalPort), config.Password,

cmd/shadowsocks-server/server.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"log"
 	"net"
+	"os"
 	"strconv"
 	"sync/atomic"
 	"time"
@@ -150,6 +151,10 @@ func run(port, password string) {
 	}
 }
 
+func enoughOptions(config *ss.Config) bool {
+	return config.ServerPort != 0 && config.Password != ""
+}
+
 func main() {
 	var configFile string
 	var cmdConfig ss.Config
@@ -164,9 +169,18 @@ func main() {
 
 	config, err := ss.ParseConfig(configFile)
 	if err != nil {
-		return
+		enough := enoughOptions(&cmdConfig)
+		if !(enough && os.IsNotExist(err)) {
+			log.Printf("error reading %s: %v\n", configFile, err)
+		}
+		if !enough {
+			return
+		}
+		log.Println("using all options from command line")
+		config = &cmdConfig
+	} else {
+		ss.UpdateConfig(config, &cmdConfig)
 	}
-	ss.UpdateConfig(config, &cmdConfig)
 	ss.SetDebug(debug)
 
 	if len(config.PortPassword) == 0 {

shadowsocks/config.go

@@ -10,7 +10,6 @@ package shadowsocks
 import (
 	"encoding/json"
 	"io/ioutil"
-	"log"
 	"os"
 	"reflect"
 	"time"
@@ -30,20 +29,17 @@ var readTimeout time.Duration
 func ParseConfig(path string) (config *Config, err error) {
 	file, err := os.Open(path) // For read access.
 	if err != nil {
-		log.Println("error opening config file:", err)
 		return
 	}
 	defer file.Close()
 
 	data, err := ioutil.ReadAll(file)
 	if err != nil {
-		log.Println("error reading config:", err)
 		return
 	}
 
 	config = &Config{}
 	if err = json.Unmarshal(data, config); err != nil {
-		log.Println("can not parse config:", err)
 		return nil, err
 	}
 	readTimeout = time.Duration(config.Timeout) * time.Second