diff --git a/README.md b/README.md index c33a0c0..eb6237a 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,11 @@ gost - GO Simple Tunnel ###GO语言实现的安全隧道 ####特性 -1. 支持标准socks5协议(rfc1928)。 -2. 多种加密方式(tls, 以及aes-256-cfb, des-cfb, rc4-md5等shadowsocks兼容的加密方式)。 -3. 客户端兼容shadowsocks协议。 -4. 支持设置上层http代理 +1. 客户端可同时用作http(s), socks5代理。 +2. 服务器端使用标准的socks5协议,可直接作为socks5代理。 +3. 多种加密方式(tls, aes-256-cfb, des-cfb, rc4-md5等)。 +4. 客户端兼容shadowsocks协议,可作为shadowsocks服务器。 +5. 支持设置上层http代理。 ####参数说明 > -L=":8080": listen address @@ -20,15 +21,15 @@ gost - GO Simple Tunnel > -key="key.pem": key.pem file for tls -> -m="tls": cipher method +> -m="tls": tunnel cipher method -> -p="ginuerzh@gmail.com": cipher password +> -p="ginuerzh@gmail.com": tunnel cipher password > -sm="rc4-md5": shadowsocks cipher method > -sp="ginuerzh@gmail.com": shadowsocks cipher password -> -ss=false: shadowsocks compatible +> -ss=false: run as shadowsocks server ####使用方法 diff --git a/client.go b/client.go index 112c7a3..d6de0de 100644 --- a/client.go +++ b/client.go @@ -122,7 +122,7 @@ func cliHandle(conn net.Conn) { n, err := io.ReadAtLeast(conn, b, 2) if err != nil { - log.Println(err) + //log.Println(err) return } @@ -297,7 +297,7 @@ func handleHttp(req *http.Request, conn net.Conn, sconn net.Conn) { } if err := Transport(conn, sconn); err != nil { - log.Println(err) + //log.Println(err) } } @@ -327,7 +327,7 @@ func handleShadow(conn, sconn net.Conn) { } if err := Transport(conn, sconn); err != nil { - log.Println(err) + //log.Println(err) } } diff --git a/main.go b/main.go index 508f55a..d850bd7 100644 --- a/main.go +++ b/main.go @@ -20,11 +20,11 @@ func init() { flag.StringVar(&Proxy, "P", "", "proxy for forward") flag.StringVar(&Saddr, "S", "", "the server that connecting to") flag.StringVar(&Laddr, "L", ":8080", "listen address") - flag.StringVar(&Method, "m", "tls", "cipher method") - flag.StringVar(&Password, "p", "ginuerzh@gmail.com", "cipher password") + flag.StringVar(&Method, "m", "tls", "tunnel cipher method") + flag.StringVar(&Password, "p", "ginuerzh@gmail.com", "tunnel cipher password") flag.StringVar(&CertFile, "cert", "cert.pem", "cert.pem file for tls") flag.StringVar(&KeyFile, "key", "key.pem", "key.pem file for tls") - flag.BoolVar(&Shadows, "ss", false, "shadowsocks compatible") + flag.BoolVar(&Shadows, "ss", false, "run as shadowsocks server") flag.StringVar(&SMethod, "sm", "rc4-md5", "shadowsocks cipher method") flag.StringVar(&SPassword, "sp", "ginuerzh@gmail.com", "shadowsocks cipher password") flag.Parse()