Merge branch 'master' into stable

README.md

@@ -25,22 +25,23 @@ go get -u -v github.com/shadowsocks/go-shadowsocks2
 
 ### Server
 
-Start a server listening on port 8488 using `aes-128-gcm` AEAD cipher with password `your-password`.
+Start a server listening on port 8488 using `AEAD_CHACHA20_POLY1305` AEAD cipher with password `your-password`.
 
 ```sh
-go-shadowsocks2 -s ss://aes-128-gcm:your-password@:8488 -verbose
+go-shadowsocks2 -s ss://AEAD_CHACHA20_POLY1305:your-password@:8488 -verbose
 ```
 
 
 ### Client
 
 Start a client connecting to the above server. The client listens on port 1080 for incoming SOCKS5 
-connections, and tunnels UDP packets received on port 1080 and port 1081 to 8.8.8.8:53 and 8.8.4.4:53 
+connections, and tunnels both UDP and TCP on port 8053 and port 8054 to 8.8.8.8:53 and 8.8.4.4:53 
 respectively. 
 
 ```sh
-go-shadowsocks2 -c ss://aes-128-gcm:your-password@[server_address]:8488 \
-    -socks :1080 -udptun :1080=8.8.8.8:53,:1081=8.8.4.4:53 -verbose
+go-shadowsocks2 -c ss://AEAD_CHACHA20_POLY1305:your-password@[server_address]:8488 \
+     -verbose -socks :1080 -udptun :8053=8.8.8.8:53,:8054=8.8.4.4:53 \
+                           -tcptun :8053=8.8.8.8:53,:8054=8.8.4.4:53
 ```
 
 Replace `[server_address]` with the server's public address.
@@ -57,16 +58,16 @@ A random key is almost always better than a password. Generate a base64url-encod
 go-shadowsocks2 -keygen 16
 ```
 
-Start a server listening on port 8848 using `aes-128-gcm` AEAD cipher with the key generated above.
+Start a server listening on port 8848 using `AEAD_AES_128_GCM` AEAD cipher with the key generated above.
 
 ```sh
-go-shadowsocks2 -s :8488 -cipher aes-128-gcm -key k5yEIX5ciUDpkpdtvZm7zQ== -verbose
+go-shadowsocks2 -s :8488 -cipher AEAD_AES_128_GCM -key k5yEIX5ciUDpkpdtvZm7zQ== -verbose
 ```
 
 And the corresponding client to connect to it.
 
 ```sh
-go-shadowsocks2 -c [server_address]:8488 -cipher aes-128-gcm -key k5yEIX5ciUDpkpdtvZm7zQ== -verbose
+go-shadowsocks2 -c [server_address]:8488 -cipher AEAD_AES_128_GCM -key k5yEIX5ciUDpkpdtvZm7zQ== -verbose
 ```
 
 
@@ -80,7 +81,7 @@ Start a client listening on port 1082 for redirected TCP connections and port 10
 TCP IPv6 connections.
 
 ```sh
-go-shadowsocks2 -c [server_address]:8488 -cipher aes-128-gcm -key k5yEIX5ciUDpkpdtvZm7zQ== \
+go-shadowsocks2 -c [server_address]:8488 -cipher AEAD_AES_128_GCM -key k5yEIX5ciUDpkpdtvZm7zQ== \
     -redir :1082 -redir6 :1083
 ```
 
@@ -102,7 +103,7 @@ Start a client on the same machine with the server. The client listens on port 1
 and tunnels to localhost:5201 where iperf3 is listening.
 
 ```sh
-go-shadowsocks2 -c [server_address]:8488 -cipher aes-128-gcm -key k5yEIX5ciUDpkpdtvZm7zQ== \
+go-shadowsocks2 -c [server_address]:8488 -cipher AEAD_AES_128_GCM -key k5yEIX5ciUDpkpdtvZm7zQ== \
     -tcptun :1090=localhost:5201
 ```
 

main.go

@@ -51,7 +51,7 @@ func main() {
 	flag.StringVar(&flags.Password, "password", "", "password")
 	flag.StringVar(&flags.Server, "s", "", "server listen address or url")
 	flag.StringVar(&flags.Client, "c", "", "client connect address or url")
-	flag.StringVar(&flags.Socks, "socks", ":1080", "(client-only) SOCKS listen address")
+	flag.StringVar(&flags.Socks, "socks", "", "(client-only) SOCKS listen address")
 	flag.StringVar(&flags.RedirTCP, "redir", "", "(client-only) redirect TCP from this address")
 	flag.StringVar(&flags.RedirTCP6, "redir6", "", "(client-only) redirect TCP IPv6 from this address")
 	flag.StringVar(&flags.TCPTun, "tcptun", "", "(client-only) TCP tunnel (laddr1=raddr1,laddr2=raddr2,...)")