From 3c3cb8e3fdce69c8137d56f1d4b2e2f5f9f24dfd Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Wed, 11 Jul 2018 08:34:15 +0800 Subject: [PATCH] doc: update for vmess and tls --- README.md | 13 +++++++++++-- conf.go | 13 ++++++++++++- proxy/tls/tls.go | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8dd6d73..247fbf2 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ glider -config CONFIGPATH -listen :8080 -verbose ## Usage ```bash -glider v0.6.0 usage: +glider v0.6.2 usage: -checkduration int proxy check duration(seconds) (default 30) -checkwebsite string @@ -148,7 +148,16 @@ VMess scheme: vmess://[security:]uuid@host:port?alterID=num Available methods for vmess: - NONE, (will add aes-128-gcm and chacha20-poly1305 later) + none, aes-128-gcm, chacha20-poly1305 + +TLS scheme: + tls://host:port[?skipVerify=true] + +TLS with a specified proxy protocol: + tls://host:port[?skipVerify=true],proxy://scheme + tls://host:port[?skipVerify=true],http://[user:pass@] + tls://host:port[?skipVerify=true],socks5://[user:pass@] + tls://host:port[?skipVerify=true],vmess://[security:]uuid@?alterID=num Available forward strategies: rr: Round Robin mode diff --git a/conf.go b/conf.go index 6558635..20a83a2 100644 --- a/conf.go +++ b/conf.go @@ -193,7 +193,18 @@ func usage() { fmt.Fprintf(os.Stderr, "\n") fmt.Fprintf(os.Stderr, "Available methods for vmess:\n") - fmt.Fprintf(os.Stderr, " NONE, (will add aes-128-gcm and chacha20-poly1305 later)\n") + fmt.Fprintf(os.Stderr, " none, aes-128-gcm, chacha20-poly1305\n") + fmt.Fprintf(os.Stderr, "\n") + + fmt.Fprintf(os.Stderr, "TLS scheme:\n") + fmt.Fprintf(os.Stderr, " tls://host:port[?skipVerify=true]\n") + fmt.Fprintf(os.Stderr, "\n") + + fmt.Fprintf(os.Stderr, "TLS with a specified proxy protocol:\n") + fmt.Fprintf(os.Stderr, " tls://host:port[?skipVerify=true],proxy://scheme\n") + fmt.Fprintf(os.Stderr, " tls://host:port[?skipVerify=true],http://[user:pass@]\n") + fmt.Fprintf(os.Stderr, " tls://host:port[?skipVerify=true],socks5://[user:pass@]\n") + fmt.Fprintf(os.Stderr, " tls://host:port[?skipVerify=true],vmess://[security:]uuid@?alterID=num\n") fmt.Fprintf(os.Stderr, "\n") fmt.Fprintf(os.Stderr, "Available forward strategies:\n") diff --git a/proxy/tls/tls.go b/proxy/tls/tls.go index d5d453a..d4f8cab 100644 --- a/proxy/tls/tls.go +++ b/proxy/tls/tls.go @@ -35,7 +35,7 @@ func NewTLS(s string, dialer proxy.Dialer) (*TLS, error) { addr := u.Host query := u.Query() - skipVerify := query.Get("InsecureSkipVerify") + skipVerify := query.Get("skipVerify") colonPos := strings.LastIndex(addr, ":") if colonPos == -1 {