From 49021f167c18f69bf4a079f5709de013a8441971 Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Tue, 24 Jul 2018 00:54:38 +0800 Subject: [PATCH] doc: update help msg for ws --- README.md | 4 +++- conf.go | 2 ++ dev.go | 2 -- main.go | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a779c05..1a375ab 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,8 @@ Available Schemes: http: http proxy ssr: ssr proxy vmess: vmess proxy + tls: tls transport + ws: websocket transport redir: redirect proxy. (used on linux as a transparent proxy with iptables redirect rules) tcptun: tcp tunnel udptun: udp tunnel @@ -164,7 +166,7 @@ Websocket scheme: ws://host:port[/path] Websocket with a specified proxy protocol: - ws://host:port[/path],proxy://scheme + ws://host:port[/path],scheme:// ws://host:port[/path],http://[user:pass@] ws://host:port[/path],socks5://[user:pass@] ws://host:port[/path],vmess://[security:]uuid@?alterID=num diff --git a/conf.go b/conf.go index ba5b57c..a088936 100644 --- a/conf.go +++ b/conf.go @@ -162,6 +162,8 @@ func usage() { fmt.Fprintf(os.Stderr, " http: http proxy\n") fmt.Fprintf(os.Stderr, " ssr: ssr proxy\n") fmt.Fprintf(os.Stderr, " vmess: vmess proxy\n") + fmt.Fprintf(os.Stderr, " tls: tls transport\n") + fmt.Fprintf(os.Stderr, " ws: websocket transport\n") fmt.Fprintf(os.Stderr, " redir: redirect proxy. (used on linux as a transparent proxy with iptables redirect rules)\n") fmt.Fprintf(os.Stderr, " tcptun: tcp tunnel\n") fmt.Fprintf(os.Stderr, " udptun: udp tunnel\n") diff --git a/dev.go b/dev.go index 7a43b10..538890a 100644 --- a/dev.go +++ b/dev.go @@ -6,8 +6,6 @@ import ( "fmt" "net/http" _ "net/http/pprof" - - _ "github.com/nadoo/glider/proxy/ws" ) func init() { diff --git a/main.go b/main.go index 83846a4..aff4303 100644 --- a/main.go +++ b/main.go @@ -22,6 +22,7 @@ import ( _ "github.com/nadoo/glider/proxy/udptun" _ "github.com/nadoo/glider/proxy/uottun" _ "github.com/nadoo/glider/proxy/vmess" + _ "github.com/nadoo/glider/proxy/ws" ) // VERSION .