~/Projects/shadowsocks-go
git clone https://code.lsong.org/shadowsocks-go
Commit
- Commit
- fc1333013e9357506fd90504537bac2d67352d19
- Author
- Riobard <[email protected]>
- Date
- 2017-02-10 15:20:12 +0800 +0800
- Diffstat
README.md | 2 +- main.go | 11 +----------
Merge branch 'master' into dev
diff --git a/README.md b/README.md index f82f47750fddce17ff60fc9cf33a0849a08ebbce..fd66b05ab5c7460a134bf31782edc7d9c4666a3e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ## Install ```sh -go install github.com/shadowsocks/go-shadowsocks2 +go get github.com/shadowsocks/go-shadowsocks2 ``` diff --git a/main.go b/main.go index 4553cc6cd939fa7cd0fd255e5e2915ddc6b27ecb..03e99ff45b1f2b720184fcbd12cc956b713ba3af 100644 --- a/main.go +++ b/main.go @@ -42,7 +42,7 @@ UDPTun string } flag.BoolVar(&config.Verbose, "verbose", false, "verbose mode") - flag.StringVar(&flags.Cipher, "cipher", "", "cipher") + flag.StringVar(&flags.Cipher, "cipher", "aes-128-gcm-16", "available ciphers: "+strings.Join(listCipher(), " ")) flag.StringVar(&flags.Key, "key", "", "base64url-encoded key (derive from password if empty)") flag.IntVar(&flags.Keygen, "keygen", 0, "generate a base64url-encoded random key of given length in byte") flag.StringVar(&flags.Password, "password", "", "password") @@ -65,15 +65,6 @@ } if flags.Client == "" && flags.Server == "" { flag.Usage() - return - } - - if flags.Cipher == "" { - ls := listCipher() - fmt.Fprintf(os.Stderr, "# available ciphers\n") - for _, each := range ls { - fmt.Fprintf(os.Stderr, "%s\n", each) - } return }