From 8d83a82bb0aaab863c12234215e79fc78c3f421f Mon Sep 17 00:00:00 2001 From: Newman <> Date: Mon, 4 Nov 2019 17:16:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2clashr=E4=B8=BAclash=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- Makefile | 6 +++--- README.md | 20 ++++++++++---------- adapters/inbound/http.go | 2 +- adapters/inbound/https.go | 2 +- adapters/inbound/socket.go | 4 ++-- adapters/inbound/util.go | 4 ++-- adapters/outbound/base.go | 4 ++-- adapters/outbound/direct.go | 2 +- adapters/outbound/fallback.go | 4 ++-- adapters/outbound/http.go | 2 +- adapters/outbound/loadbalance.go | 4 ++-- adapters/outbound/reject.go | 2 +- adapters/outbound/selector.go | 2 +- adapters/outbound/shadowsocks.go | 10 +++++----- adapters/outbound/shadowsocksr.go | 2 +- adapters/outbound/snell.go | 8 ++++---- adapters/outbound/socks5.go | 4 ++-- adapters/outbound/urltest.go | 4 ++-- adapters/outbound/util.go | 6 +++--- adapters/outbound/vmess.go | 4 ++-- build4android/build.sh | 22 +++++++++++----------- component/fakeip/pool.go | 2 +- component/simple-obfs/http.go | 2 +- component/simple-obfs/tls.go | 2 +- component/socks5/socks5.go | 2 +- component/v2ray-plugin/websocket.go | 2 +- component/vmess/aead.go | 2 +- component/vmess/chunk.go | 2 +- config/config.go | 20 ++++++++++---------- config/initial.go | 2 +- config/utils.go | 6 +++--- dns/middleware.go | 4 ++-- dns/resolver.go | 10 +++++----- dns/util.go | 4 ++-- go.mod | 11 ++--------- go.sum | 4 ++++ hub/executor/executor.go | 18 +++++++++--------- hub/hub.go | 4 ++-- hub/route/configs.go | 8 ++++---- hub/route/connections.go | 2 +- hub/route/proxies.go | 6 +++--- hub/route/rules.go | 2 +- hub/route/server.go | 10 +++++----- hub/route/sysproxy.go | 2 +- log/log.go | 2 +- main.go | 6 +++--- proxy/auth/auth.go | 2 +- proxy/http/server.go | 12 ++++++------ proxy/listener.go | 6 +++--- proxy/redir/tcp.go | 8 ++++---- proxy/redir/tcp_darwin.go | 2 +- proxy/redir/tcp_freebsd.go | 2 +- proxy/redir/tcp_linux.go | 2 +- proxy/redir/tcp_windows.go | 2 +- proxy/socks/tcp.go | 12 ++++++------ proxy/socks/udp.go | 8 ++++---- proxy/socks/utils.go | 4 ++-- rules/domain.go | 2 +- rules/domain_keyword.go | 2 +- rules/domain_suffix.go | 2 +- rules/final.go | 2 +- rules/geoip.go | 2 +- rules/ipcidr.go | 2 +- rules/port.go | 2 +- tunnel/connection.go | 4 ++-- tunnel/tracker.go | 2 +- tunnel/tunnel.go | 10 +++++----- tunnel/util.go | 2 +- 69 files changed, 172 insertions(+), 175 deletions(-) diff --git a/.travis.yml b/.travis.yml index 734456114c..bae1468a43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,6 @@ deploy: file: bin/* file_glob: true on: - repo: whojave/clashr + repo: whojave/clash branch: master tags: true diff --git a/Makefile b/Makefile index 35e98ae18e..edcbbd3b1a 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ -NAME=clashR +NAME=clash BINDIR=bin VERSION=$(shell git describe --tags || echo "unknown version") BUILDTIME=$(shell date -u) -GOBUILD=CGO_ENABLED=0 go build -ldflags '-X "github.com/whojave/clashr/constant.Version=$(VERSION)" \ - -X "github.com/whojave/clashr/constant.BuildTime=$(BUILDTIME)" \ +GOBUILD=CGO_ENABLED=0 go build -ldflags '-X "github.com/whojave/clash/constant.Version=$(VERSION)" \ + -X "github.com/whojave/clash/constant.BuildTime=$(BUILDTIME)" \ -w -s' PLATFORM_LIST = \ diff --git a/README.md b/README.md index 765c8d764f..a4a1fecfbb 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@

- Clash + Clash
Clash

A rule-based tunnel in Go.

- - + Travis-CI - - + + - - + +

@@ -32,10 +32,10 @@ Clash Requires Go >= 1.13. You can build it from source: ```sh -$ go get -u -v github.com/whojave/clashr +$ go get -u -v github.com/whojave/clash ``` -Pre-built binaries are available here: [release](https://github.com/whojave/clashr/releases) +Pre-built binaries are available here: [release](https://github.com/whojave/clash/releases) Check Clash version with: @@ -57,7 +57,7 @@ $ pm2 start clash If you have Docker installed, you can run clash directly using `docker-compose`. -[Run clash in docker](https://github.com/whojave/clashr/wiki/Run-clash-in-docker) +[Run clash in docker](https://github.com/whojave/clash/wiki/Run-clash-in-docker) ## Config diff --git a/adapters/inbound/http.go b/adapters/inbound/http.go index 3c002eb967..0243c91233 100644 --- a/adapters/inbound/http.go +++ b/adapters/inbound/http.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) // HTTPAdapter is a adapter for HTTP connection diff --git a/adapters/inbound/https.go b/adapters/inbound/https.go index d561f247c8..010bd81897 100644 --- a/adapters/inbound/https.go +++ b/adapters/inbound/https.go @@ -4,7 +4,7 @@ import ( "net" "net/http" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) // NewHTTPS is HTTPAdapter generator diff --git a/adapters/inbound/socket.go b/adapters/inbound/socket.go index 0d6b7fb06c..cbc67f6cab 100644 --- a/adapters/inbound/socket.go +++ b/adapters/inbound/socket.go @@ -3,8 +3,8 @@ package adapters import ( "net" - "github.com/whojave/clashr/component/socks5" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/component/socks5" + C "github.com/whojave/clash/constant" ) // SocketAdapter is a adapter for socks and redir connection diff --git a/adapters/inbound/util.go b/adapters/inbound/util.go index 4bd9de67f1..b030385357 100644 --- a/adapters/inbound/util.go +++ b/adapters/inbound/util.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "github.com/whojave/clashr/component/socks5" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/component/socks5" + C "github.com/whojave/clash/constant" ) func parseSocksAddr(target socks5.Addr) *C.Metadata { diff --git a/adapters/outbound/base.go b/adapters/outbound/base.go index 06d8f5325a..84844861b1 100644 --- a/adapters/outbound/base.go +++ b/adapters/outbound/base.go @@ -8,8 +8,8 @@ import ( "net/http" "time" - "github.com/whojave/clashr/common/queue" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/common/queue" + C "github.com/whojave/clash/constant" ) var ( diff --git a/adapters/outbound/direct.go b/adapters/outbound/direct.go index 4052aab2f2..bdd2080653 100644 --- a/adapters/outbound/direct.go +++ b/adapters/outbound/direct.go @@ -4,7 +4,7 @@ import ( "context" "net" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type Direct struct { diff --git a/adapters/outbound/fallback.go b/adapters/outbound/fallback.go index a6b5e41aae..3dc8d67ea5 100644 --- a/adapters/outbound/fallback.go +++ b/adapters/outbound/fallback.go @@ -9,8 +9,8 @@ import ( "time" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/common/picker" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/common/picker" ) type Fallback struct { diff --git a/adapters/outbound/http.go b/adapters/outbound/http.go index bfb59f83b7..014a1bc79f 100644 --- a/adapters/outbound/http.go +++ b/adapters/outbound/http.go @@ -13,7 +13,7 @@ import ( "net/http" "strconv" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type Http struct { diff --git a/adapters/outbound/loadbalance.go b/adapters/outbound/loadbalance.go index 9d6fc49f95..2988b4b171 100644 --- a/adapters/outbound/loadbalance.go +++ b/adapters/outbound/loadbalance.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/whojave/clashr/common/murmur3" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/common/murmur3" + C "github.com/whojave/clash/constant" "golang.org/x/net/publicsuffix" ) diff --git a/adapters/outbound/reject.go b/adapters/outbound/reject.go index a0e9563840..dc8f8102e6 100644 --- a/adapters/outbound/reject.go +++ b/adapters/outbound/reject.go @@ -6,7 +6,7 @@ import ( "net" "time" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type Reject struct { diff --git a/adapters/outbound/selector.go b/adapters/outbound/selector.go index 8fc418fe5d..1fc5d0fc0d 100644 --- a/adapters/outbound/selector.go +++ b/adapters/outbound/selector.go @@ -6,7 +6,7 @@ import ( "errors" "net" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type Selector struct { diff --git a/adapters/outbound/shadowsocks.go b/adapters/outbound/shadowsocks.go index 1d3759be70..e4b8c6a7af 100644 --- a/adapters/outbound/shadowsocks.go +++ b/adapters/outbound/shadowsocks.go @@ -8,11 +8,11 @@ import ( "net" "strconv" - "github.com/whojave/clashr/common/structure" - obfs "github.com/whojave/clashr/component/simple-obfs" - "github.com/whojave/clashr/component/socks5" - v2rayObfs "github.com/whojave/clashr/component/v2ray-plugin" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/common/structure" + obfs "github.com/whojave/clash/component/simple-obfs" + "github.com/whojave/clash/component/socks5" + v2rayObfs "github.com/whojave/clash/component/v2ray-plugin" + C "github.com/whojave/clash/constant" "github.com/Dreamacro/go-shadowsocks2/core" ) diff --git a/adapters/outbound/shadowsocksr.go b/adapters/outbound/shadowsocksr.go index 6aed1ee292..b2735e65af 100644 --- a/adapters/outbound/shadowsocksr.go +++ b/adapters/outbound/shadowsocksr.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "errors" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" "github.com/whojave/gossr/obfs" "github.com/whojave/gossr/protocol" "net" diff --git a/adapters/outbound/snell.go b/adapters/outbound/snell.go index cd2d0202cd..749f4a9318 100644 --- a/adapters/outbound/snell.go +++ b/adapters/outbound/snell.go @@ -6,10 +6,10 @@ import ( "net" "strconv" - "github.com/whojave/clashr/common/structure" - obfs "github.com/whojave/clashr/component/simple-obfs" - "github.com/whojave/clashr/component/snell" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/common/structure" + obfs "github.com/whojave/clash/component/simple-obfs" + "github.com/whojave/clash/component/snell" + C "github.com/whojave/clash/constant" ) type Snell struct { diff --git a/adapters/outbound/socks5.go b/adapters/outbound/socks5.go index 309095feab..9aae945987 100644 --- a/adapters/outbound/socks5.go +++ b/adapters/outbound/socks5.go @@ -9,8 +9,8 @@ import ( "net" "strconv" - "github.com/whojave/clashr/component/socks5" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/component/socks5" + C "github.com/whojave/clash/constant" ) type Socks5 struct { diff --git a/adapters/outbound/urltest.go b/adapters/outbound/urltest.go index c4257a2379..912ecbc65f 100644 --- a/adapters/outbound/urltest.go +++ b/adapters/outbound/urltest.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "github.com/whojave/clashr/common/picker" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/common/picker" + C "github.com/whojave/clash/constant" ) type URLTest struct { diff --git a/adapters/outbound/util.go b/adapters/outbound/util.go index c6fb86f6fa..b06f335b91 100644 --- a/adapters/outbound/util.go +++ b/adapters/outbound/util.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/whojave/clashr/component/socks5" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/dns" + "github.com/whojave/clash/component/socks5" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/dns" ) const ( diff --git a/adapters/outbound/vmess.go b/adapters/outbound/vmess.go index 3a0a35e6a5..87e711cddf 100644 --- a/adapters/outbound/vmess.go +++ b/adapters/outbound/vmess.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/whojave/clashr/component/vmess" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/component/vmess" + C "github.com/whojave/clash/constant" ) type Vmess struct { diff --git a/build4android/build.sh b/build4android/build.sh index 4eaf4b635f..258139909c 100755 --- a/build4android/build.sh +++ b/build4android/build.sh @@ -1,15 +1,15 @@ #!/bin/bash # # Build: -# - git clone -b dev https://github.com/whojave/clashr -# - cd clashr +# - git clone -b dev https://github.com/whojave/clash +# - cd clash # - ANDROID_NDK=/path/to/android/ndk /path/to/this/script # export ANDROID_NDK=/home/king/Android/Sdk/ndk/20.0.5594570 # export GOPATH=/usr/lib/go -NAME=clashr +NAME=clash BINDIR=bin VERSION=$(git describe --tags || echo "unknown version") BUILDTIME=$(LANG=C date -u) @@ -24,8 +24,8 @@ export CXX=$ANDROID_CXX export CC=$ANDROID_CC export LD=$ANDROID_LD export CGO_ENABLED=1 -go build -ldflags "-X \"github.com/whojave/clashr/constant.Version=$VERSION\" -X \"github.com/whojave/clashr/constant.BuildTime=$BUILDTIME\" -w -s" \ - -o "build4android/clashr_arm64" +go build -ldflags "-X \"github.com/whojave/clash/constant.Version=$VERSION\" -X \"github.com/whojave/clash/constant.BuildTime=$BUILDTIME\" -w -s" \ + -o "build4android/clash_arm64" ANDROID_CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang @@ -37,8 +37,8 @@ export CXX=$ANDROID_CXX export CC=$ANDROID_CC export LD=$ANDROID_LD export CGO_ENABLED=1 -go build -ldflags "-X \"github.com/whojave/clashr/constant.Version=$VERSION\" -X \"github.com/whojave/clashr/constant.BuildTime=$BUILDTIME\" -w -s" \ - -o "build4android/clashr_armv7a" +go build -ldflags "-X \"github.com/whojave/clash/constant.Version=$VERSION\" -X \"github.com/whojave/clash/constant.BuildTime=$BUILDTIME\" -w -s" \ + -o "build4android/clash_armv7a" ANDROID_CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang @@ -50,8 +50,8 @@ export CC=$ANDROID_CC export LD=$ANDROID_LD export CGO_ENABLED=1 export GOARCH=386 -go build -ldflags "-X \"github.com/whojave/clashr/constant.Version=$VERSION\" -X \"github.com/whojave/clashr/constant.BuildTime=$BUILDTIME\" -w -s" \ - -o "build4android/clashr_x86" +go build -ldflags "-X \"github.com/whojave/clash/constant.Version=$VERSION\" -X \"github.com/whojave/clash/constant.BuildTime=$BUILDTIME\" -w -s" \ + -o "build4android/clash_x86" ANDROID_CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang @@ -63,8 +63,8 @@ export CC=$ANDROID_CC export LD=$ANDROID_LD export CGO_ENABLED=1 export GOARCH=amd64 -go build -ldflags "-X \"github.com/whojave/clashr/constant.Version=$VERSION\" -X \"github.com/whojave/clashr/constant.BuildTime=$BUILDTIME\" -w -s" \ - -o "build4android/clashr_amd64" +go build -ldflags "-X \"github.com/whojave/clash/constant.Version=$VERSION\" -X \"github.com/whojave/clash/constant.BuildTime=$BUILDTIME\" -w -s" \ + -o "build4android/clash_amd64" diff --git a/component/fakeip/pool.go b/component/fakeip/pool.go index 23ea016536..cc31ce3f9b 100644 --- a/component/fakeip/pool.go +++ b/component/fakeip/pool.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "github.com/whojave/clashr/common/cache" + "github.com/whojave/clash/common/cache" ) // Pool is a implementation about fake ip generator without storage diff --git a/component/simple-obfs/http.go b/component/simple-obfs/http.go index 15ccf1ad98..f62c8b3a7e 100644 --- a/component/simple-obfs/http.go +++ b/component/simple-obfs/http.go @@ -9,7 +9,7 @@ import ( "net" "net/http" - "github.com/whojave/clashr/common/pool" + "github.com/whojave/clash/common/pool" ) // HTTPObfs is shadowsocks http simple-obfs implementation diff --git a/component/simple-obfs/tls.go b/component/simple-obfs/tls.go index 61bbb607f6..f76af4d079 100644 --- a/component/simple-obfs/tls.go +++ b/component/simple-obfs/tls.go @@ -8,7 +8,7 @@ import ( "net" "time" - "github.com/whojave/clashr/common/pool" + "github.com/whojave/clash/common/pool" ) func init() { diff --git a/component/socks5/socks5.go b/component/socks5/socks5.go index 30cbbf3a85..5ceefcb708 100644 --- a/component/socks5/socks5.go +++ b/component/socks5/socks5.go @@ -7,7 +7,7 @@ import ( "net" "strconv" - "github.com/whojave/clashr/component/auth" + "github.com/whojave/clash/component/auth" ) // Error represents a SOCKS error diff --git a/component/v2ray-plugin/websocket.go b/component/v2ray-plugin/websocket.go index 2fbaf4dcf5..e3b4167433 100644 --- a/component/v2ray-plugin/websocket.go +++ b/component/v2ray-plugin/websocket.go @@ -5,7 +5,7 @@ import ( "net" "net/http" - "github.com/whojave/clashr/component/vmess" + "github.com/whojave/clash/component/vmess" ) // Option is options of websocket obfs diff --git a/component/vmess/aead.go b/component/vmess/aead.go index d67ae6d188..b342a47e88 100644 --- a/component/vmess/aead.go +++ b/component/vmess/aead.go @@ -6,7 +6,7 @@ import ( "errors" "io" - "github.com/whojave/clashr/common/pool" + "github.com/whojave/clash/common/pool" ) type aeadWriter struct { diff --git a/component/vmess/chunk.go b/component/vmess/chunk.go index 42fb63520c..33bc548833 100644 --- a/component/vmess/chunk.go +++ b/component/vmess/chunk.go @@ -5,7 +5,7 @@ import ( "errors" "io" - "github.com/whojave/clashr/common/pool" + "github.com/whojave/clash/common/pool" ) const ( diff --git a/config/config.go b/config/config.go index cd052a63e6..917bb131e1 100644 --- a/config/config.go +++ b/config/config.go @@ -9,16 +9,16 @@ import ( "path/filepath" "strings" - adapters "github.com/whojave/clashr/adapters/outbound" - "github.com/whojave/clashr/common/structure" - "github.com/whojave/clashr/component/auth" - trie "github.com/whojave/clashr/component/domain-trie" - "github.com/whojave/clashr/component/fakeip" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/dns" - "github.com/whojave/clashr/log" - R "github.com/whojave/clashr/rules" - T "github.com/whojave/clashr/tunnel" + adapters "github.com/whojave/clash/adapters/outbound" + "github.com/whojave/clash/common/structure" + "github.com/whojave/clash/component/auth" + trie "github.com/whojave/clash/component/domain-trie" + "github.com/whojave/clash/component/fakeip" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/dns" + "github.com/whojave/clash/log" + R "github.com/whojave/clash/rules" + T "github.com/whojave/clash/tunnel" yaml "gopkg.in/yaml.v2" ) diff --git a/config/initial.go b/config/initial.go index 71aa547123..d3cab40bca 100644 --- a/config/initial.go +++ b/config/initial.go @@ -9,7 +9,7 @@ import ( "os" "strings" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" log "github.com/sirupsen/logrus" ) diff --git a/config/utils.go b/config/utils.go index 44fca37b41..57442377cb 100644 --- a/config/utils.go +++ b/config/utils.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - C "github.com/whojave/clashr/constant" - adapters "github.com/whojave/clashr/adapters/outbound" - "github.com/whojave/clashr/common/structure" + C "github.com/whojave/clash/constant" + adapters "github.com/whojave/clash/adapters/outbound" + "github.com/whojave/clash/common/structure" ) func trimArr(arr []string) (r []string) { diff --git a/dns/middleware.go b/dns/middleware.go index e2aa015592..c23fe57b9d 100644 --- a/dns/middleware.go +++ b/dns/middleware.go @@ -3,8 +3,8 @@ package dns import ( "strings" - "github.com/whojave/clashr/component/fakeip" - "github.com/whojave/clashr/log" + "github.com/whojave/clash/component/fakeip" + "github.com/whojave/clash/log" D "github.com/miekg/dns" ) diff --git a/dns/resolver.go b/dns/resolver.go index d22416595d..00e54a5ec7 100644 --- a/dns/resolver.go +++ b/dns/resolver.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "github.com/whojave/clashr/common/cache" - "github.com/whojave/clashr/common/picker" - trie "github.com/whojave/clashr/component/domain-trie" - "github.com/whojave/clashr/component/fakeip" - C "github.com/whojave/clashr/constant" + "github.com/whojave/clash/common/cache" + "github.com/whojave/clash/common/picker" + trie "github.com/whojave/clash/component/domain-trie" + "github.com/whojave/clash/component/fakeip" + C "github.com/whojave/clash/constant" D "github.com/miekg/dns" geoip2 "github.com/oschwald/geoip2-golang" diff --git a/dns/util.go b/dns/util.go index 7af50d7410..a5cf34cee0 100644 --- a/dns/util.go +++ b/dns/util.go @@ -6,8 +6,8 @@ import ( "errors" "time" - "github.com/whojave/clashr/common/cache" - "github.com/whojave/clashr/log" + "github.com/whojave/clash/common/cache" + "github.com/whojave/clash/log" yaml "gopkg.in/yaml.v2" D "github.com/miekg/dns" diff --git a/go.mod b/go.mod index b504f58b62..1e6f9429b6 100644 --- a/go.mod +++ b/go.mod @@ -1,27 +1,20 @@ -module github.com/whojave/clashr +module github.com/whojave/clash go 1.13 require ( github.com/Dreamacro/go-shadowsocks2 v0.1.5-0.20191012162057-46254afc8b68 - github.com/dgryski/go-camellia v0.0.0-20140412174459-3be6b3054dd1 // indirect - github.com/dgryski/go-idea v0.0.0-20170306091226-d2fb45a411fb // indirect - github.com/dgryski/go-rc2 v0.0.0-20150621095337-8a9021637152 // indirect - github.com/eapache/queue v1.1.0 // indirect - github.com/ebfe/rc2 v0.0.0-20131011165748-24b9757f5521 // indirect github.com/go-chi/chi v4.0.2+incompatible github.com/go-chi/cors v1.0.0 github.com/go-chi/render v1.0.1 github.com/gofrs/uuid v3.2.0+incompatible github.com/gorilla/websocket v1.4.1 - github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/miekg/dns v1.1.22 github.com/oschwald/geoip2-golang v1.3.0 - github.com/oschwald/maxminddb-golang v1.5.0 // indirect github.com/sirupsen/logrus v1.4.2 github.com/stretchr/testify v1.4.0 + github.com/whojave/clashr v0.0.0-20191022050908-3d7e2af9e5ba // indirect github.com/whojave/gossr v0.0.0-20191022040802-3c6b7e7fcb9c - gitlab.com/yawning/chacha20.git v0.0.0-20190903091407-6d1cb28dc72c // indirect golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e diff --git a/go.sum b/go.sum index df4c8f3d31..2fc77894ad 100644 --- a/go.sum +++ b/go.sum @@ -45,6 +45,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/whojave/clashr v0.0.0-20191022050908-3d7e2af9e5ba h1:bvWL68bD8Ru9UzrXTiv5OrL+F0zvmRYFE0aTXBT+66M= +github.com/whojave/clashr v0.0.0-20191022050908-3d7e2af9e5ba/go.mod h1:aLoCx06YEF5P7Zo0s8dc8dmDJzIPPC5lyFkzKnx8ekM= github.com/whojave/gossr v0.0.0-20191022040802-3c6b7e7fcb9c h1:hYxGzMZJDwQN/k+UbB+vxjA2kKT7WhqptBztqQ1Cj1g= github.com/whojave/gossr v0.0.0-20191022040802-3c6b7e7fcb9c/go.mod h1:xWOcwGsDuBq8DvudbVwDqflR25qUeUyU9hoyAWwqarI= gitlab.com/yawning/chacha20.git v0.0.0-20190903091407-6d1cb28dc72c h1:yrfrd1u7MWIwWIulet2TZPEkeNQhQ/GcPLdPXgiEEr0= @@ -61,6 +63,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9 h1:DPz9iiH3YoKiKhX/ijjoZvT0VFwK2c6CWYWQ7Zyr8TU= golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= @@ -74,6 +77,7 @@ golang.org/x/sys v0.0.0-20190902133755-9109b7679e13/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c h1:S/FtSvpNLtFBgjTqcKsRpsa6aVsI6iztaz1bQd9BJwE= golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/hub/executor/executor.go b/hub/executor/executor.go index 55a47b47bd..5b0f625738 100644 --- a/hub/executor/executor.go +++ b/hub/executor/executor.go @@ -1,15 +1,15 @@ package executor import ( - "github.com/whojave/clashr/component/auth" - trie "github.com/whojave/clashr/component/domain-trie" - "github.com/whojave/clashr/config" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/dns" - "github.com/whojave/clashr/log" - P "github.com/whojave/clashr/proxy" - authStore "github.com/whojave/clashr/proxy/auth" - T "github.com/whojave/clashr/tunnel" + "github.com/whojave/clash/component/auth" + trie "github.com/whojave/clash/component/domain-trie" + "github.com/whojave/clash/config" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/dns" + "github.com/whojave/clash/log" + P "github.com/whojave/clash/proxy" + authStore "github.com/whojave/clash/proxy/auth" + T "github.com/whojave/clash/tunnel" ) // Parse config with default config path diff --git a/hub/hub.go b/hub/hub.go index ba5034794e..d3e724b304 100644 --- a/hub/hub.go +++ b/hub/hub.go @@ -1,8 +1,8 @@ package hub import ( - "github.com/whojave/clashr/hub/executor" - "github.com/whojave/clashr/hub/route" + "github.com/whojave/clash/hub/executor" + "github.com/whojave/clash/hub/route" ) // Parse call at the beginning of clash diff --git a/hub/route/configs.go b/hub/route/configs.go index ea0e3036e9..7b40ade136 100644 --- a/hub/route/configs.go +++ b/hub/route/configs.go @@ -4,10 +4,10 @@ import ( "net/http" "path/filepath" - "github.com/whojave/clashr/hub/executor" - "github.com/whojave/clashr/log" - P "github.com/whojave/clashr/proxy" - T "github.com/whojave/clashr/tunnel" + "github.com/whojave/clash/hub/executor" + "github.com/whojave/clash/log" + P "github.com/whojave/clash/proxy" + T "github.com/whojave/clash/tunnel" "github.com/go-chi/chi" "github.com/go-chi/render" diff --git a/hub/route/connections.go b/hub/route/connections.go index 3482f4c4d0..31a4bca1a4 100644 --- a/hub/route/connections.go +++ b/hub/route/connections.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - T "github.com/whojave/clashr/tunnel" + T "github.com/whojave/clash/tunnel" "github.com/gorilla/websocket" "github.com/go-chi/chi" diff --git a/hub/route/proxies.go b/hub/route/proxies.go index d45a8d7f85..29a1277c63 100644 --- a/hub/route/proxies.go +++ b/hub/route/proxies.go @@ -8,9 +8,9 @@ import ( "strconv" "time" - A "github.com/whojave/clashr/adapters/outbound" - C "github.com/whojave/clashr/constant" - T "github.com/whojave/clashr/tunnel" + A "github.com/whojave/clash/adapters/outbound" + C "github.com/whojave/clash/constant" + T "github.com/whojave/clash/tunnel" "github.com/go-chi/chi" "github.com/go-chi/render" diff --git a/hub/route/rules.go b/hub/route/rules.go index a3dc0a176b..0f8b78fe25 100644 --- a/hub/route/rules.go +++ b/hub/route/rules.go @@ -3,7 +3,7 @@ package route import ( "net/http" - T "github.com/whojave/clashr/tunnel" + T "github.com/whojave/clash/tunnel" "github.com/go-chi/chi" "github.com/go-chi/render" diff --git a/hub/route/server.go b/hub/route/server.go index 09d10955fb..b1569a963e 100644 --- a/hub/route/server.go +++ b/hub/route/server.go @@ -7,9 +7,9 @@ import ( "strings" "time" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/log" - T "github.com/whojave/clashr/tunnel" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/log" + T "github.com/whojave/clash/tunnel" "github.com/go-chi/chi" "github.com/go-chi/cors" @@ -125,8 +125,8 @@ func authentication(next http.Handler) http.Handler { func hello(w http.ResponseWriter, r *http.Request) { render.JSON(w, r, render.M{ - "Hello": "clashR", - "Group": "https://t.me/clashr4ssr", + "Hello": "clash", + "Group": "https://t.me/clash4ssr", "Channel": "https://t.me/peekfun", }) } diff --git a/hub/route/sysproxy.go b/hub/route/sysproxy.go index 751f3ae431..7692a683e6 100644 --- a/hub/route/sysproxy.go +++ b/hub/route/sysproxy.go @@ -3,7 +3,7 @@ package route import ( "github.com/go-chi/chi" "github.com/go-chi/render" - "github.com/whojave/clashr/hub/executor" + "github.com/whojave/clash/hub/executor" "net/http" "os/exec" "strconv" diff --git a/log/log.go b/log/log.go index 2c6fa2abb6..dd5bfec6c1 100644 --- a/log/log.go +++ b/log/log.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/whojave/clashr/common/observable" + "github.com/whojave/clash/common/observable" log "github.com/sirupsen/logrus" ) diff --git a/main.go b/main.go index b92a5389ca..da2af4f928 100644 --- a/main.go +++ b/main.go @@ -9,9 +9,9 @@ import ( "runtime" "syscall" - "github.com/whojave/clashr/config" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/hub" + "github.com/whojave/clash/config" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/hub" log "github.com/sirupsen/logrus" ) diff --git a/proxy/auth/auth.go b/proxy/auth/auth.go index 35d5ee42e1..d7fec682b9 100644 --- a/proxy/auth/auth.go +++ b/proxy/auth/auth.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/whojave/clashr/component/auth" + "github.com/whojave/clash/component/auth" ) var ( diff --git a/proxy/http/server.go b/proxy/http/server.go index 92851f62c0..e0611bce88 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -8,12 +8,12 @@ import ( "strings" "time" - adapters "github.com/whojave/clashr/adapters/inbound" - "github.com/whojave/clashr/common/cache" - "github.com/whojave/clashr/component/auth" - "github.com/whojave/clashr/log" - authStore "github.com/whojave/clashr/proxy/auth" - "github.com/whojave/clashr/tunnel" + adapters "github.com/whojave/clash/adapters/inbound" + "github.com/whojave/clash/common/cache" + "github.com/whojave/clash/component/auth" + "github.com/whojave/clash/log" + authStore "github.com/whojave/clash/proxy/auth" + "github.com/whojave/clash/tunnel" ) var ( diff --git a/proxy/listener.go b/proxy/listener.go index dd6a5d661a..5fcf3fb0db 100644 --- a/proxy/listener.go +++ b/proxy/listener.go @@ -5,9 +5,9 @@ import ( "net" "strconv" - "github.com/whojave/clashr/proxy/http" - "github.com/whojave/clashr/proxy/redir" - "github.com/whojave/clashr/proxy/socks" + "github.com/whojave/clash/proxy/http" + "github.com/whojave/clash/proxy/redir" + "github.com/whojave/clash/proxy/socks" ) var ( diff --git a/proxy/redir/tcp.go b/proxy/redir/tcp.go index 7d4e579d94..9c80547abc 100644 --- a/proxy/redir/tcp.go +++ b/proxy/redir/tcp.go @@ -3,10 +3,10 @@ package redir import ( "net" - "github.com/whojave/clashr/adapters/inbound" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/log" - "github.com/whojave/clashr/tunnel" + "github.com/whojave/clash/adapters/inbound" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/log" + "github.com/whojave/clash/tunnel" ) var ( diff --git a/proxy/redir/tcp_darwin.go b/proxy/redir/tcp_darwin.go index 3c253ac07a..5da14cccfe 100644 --- a/proxy/redir/tcp_darwin.go +++ b/proxy/redir/tcp_darwin.go @@ -5,7 +5,7 @@ import ( "syscall" "unsafe" - "github.com/whojave/clashr/component/socks5" + "github.com/whojave/clash/component/socks5" ) func parserPacket(c net.Conn) (socks5.Addr, error) { diff --git a/proxy/redir/tcp_freebsd.go b/proxy/redir/tcp_freebsd.go index 7eb9647f6e..c0c56f5c80 100644 --- a/proxy/redir/tcp_freebsd.go +++ b/proxy/redir/tcp_freebsd.go @@ -6,7 +6,7 @@ import ( "syscall" "unsafe" - "github.com/whojave/clashr/component/socks5" + "github.com/whojave/clash/component/socks5" ) const ( diff --git a/proxy/redir/tcp_linux.go b/proxy/redir/tcp_linux.go index 04351127ef..db5c804fe7 100644 --- a/proxy/redir/tcp_linux.go +++ b/proxy/redir/tcp_linux.go @@ -6,7 +6,7 @@ import ( "syscall" "unsafe" - "github.com/whojave/clashr/component/socks5" + "github.com/whojave/clash/component/socks5" ) const ( diff --git a/proxy/redir/tcp_windows.go b/proxy/redir/tcp_windows.go index b14d4e7084..387cbf83c1 100644 --- a/proxy/redir/tcp_windows.go +++ b/proxy/redir/tcp_windows.go @@ -4,7 +4,7 @@ import ( "errors" "net" - "github.com/whojave/clashr/component/socks5" + "github.com/whojave/clash/component/socks5" ) func parserPacket(conn net.Conn) (socks5.Addr, error) { diff --git a/proxy/socks/tcp.go b/proxy/socks/tcp.go index f54ba5ad14..f801b24c76 100644 --- a/proxy/socks/tcp.go +++ b/proxy/socks/tcp.go @@ -5,12 +5,12 @@ import ( "io/ioutil" "net" - adapters "github.com/whojave/clashr/adapters/inbound" - "github.com/whojave/clashr/component/socks5" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/log" - authStore "github.com/whojave/clashr/proxy/auth" - "github.com/whojave/clashr/tunnel" + adapters "github.com/whojave/clash/adapters/inbound" + "github.com/whojave/clash/component/socks5" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/log" + authStore "github.com/whojave/clash/proxy/auth" + "github.com/whojave/clash/tunnel" ) var ( diff --git a/proxy/socks/udp.go b/proxy/socks/udp.go index 5898c75c54..bac623fee5 100644 --- a/proxy/socks/udp.go +++ b/proxy/socks/udp.go @@ -4,10 +4,10 @@ import ( "bytes" "net" - adapters "github.com/whojave/clashr/adapters/inbound" - "github.com/whojave/clashr/common/pool" - "github.com/whojave/clashr/component/socks5" - C "github.com/whojave/clashr/constant" + adapters "github.com/whojave/clash/adapters/inbound" + "github.com/whojave/clash/common/pool" + "github.com/whojave/clash/component/socks5" + C "github.com/whojave/clash/constant" ) type SockUDPListener struct { diff --git a/proxy/socks/utils.go b/proxy/socks/utils.go index 5863a401cb..1ec24f06d4 100644 --- a/proxy/socks/utils.go +++ b/proxy/socks/utils.go @@ -4,8 +4,8 @@ import ( "bytes" "net" - "github.com/whojave/clashr/common/pool" - "github.com/whojave/clashr/component/socks5" + "github.com/whojave/clash/common/pool" + "github.com/whojave/clash/component/socks5" ) type fakeConn struct { diff --git a/rules/domain.go b/rules/domain.go index f143022fe0..c7fbe11f00 100644 --- a/rules/domain.go +++ b/rules/domain.go @@ -3,7 +3,7 @@ package rules import ( "strings" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type Domain struct { diff --git a/rules/domain_keyword.go b/rules/domain_keyword.go index 8ed938a726..f1148ff414 100644 --- a/rules/domain_keyword.go +++ b/rules/domain_keyword.go @@ -3,7 +3,7 @@ package rules import ( "strings" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type DomainKeyword struct { diff --git a/rules/domain_suffix.go b/rules/domain_suffix.go index acb2b73848..fdd0ecc8c7 100644 --- a/rules/domain_suffix.go +++ b/rules/domain_suffix.go @@ -3,7 +3,7 @@ package rules import ( "strings" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type DomainSuffix struct { diff --git a/rules/final.go b/rules/final.go index 834e2b5a1f..0a464b9e4f 100644 --- a/rules/final.go +++ b/rules/final.go @@ -1,7 +1,7 @@ package rules import ( - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type Match struct { diff --git a/rules/geoip.go b/rules/geoip.go index 8c0d572793..29f242422a 100644 --- a/rules/geoip.go +++ b/rules/geoip.go @@ -3,7 +3,7 @@ package rules import ( "sync" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" "github.com/oschwald/geoip2-golang" log "github.com/sirupsen/logrus" diff --git a/rules/ipcidr.go b/rules/ipcidr.go index 19f67da7eb..cc66bd71f0 100644 --- a/rules/ipcidr.go +++ b/rules/ipcidr.go @@ -3,7 +3,7 @@ package rules import ( "net" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type IPCIDROption func(*IPCIDR) diff --git a/rules/port.go b/rules/port.go index 845332810e..269508fceb 100644 --- a/rules/port.go +++ b/rules/port.go @@ -3,7 +3,7 @@ package rules import ( "strconv" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type Port struct { diff --git a/tunnel/connection.go b/tunnel/connection.go index 2bd92cd3b9..8adad3abf9 100644 --- a/tunnel/connection.go +++ b/tunnel/connection.go @@ -8,8 +8,8 @@ import ( "strings" "time" - adapters "github.com/whojave/clashr/adapters/inbound" - "github.com/whojave/clashr/common/pool" + adapters "github.com/whojave/clash/adapters/inbound" + "github.com/whojave/clash/common/pool" ) func (t *Tunnel) handleHTTP(request *adapters.HTTPAdapter, outbound net.Conn) { diff --git a/tunnel/tracker.go b/tunnel/tracker.go index f7c2c1ca62..e7299ab229 100644 --- a/tunnel/tracker.go +++ b/tunnel/tracker.go @@ -5,7 +5,7 @@ import ( "time" "github.com/gofrs/uuid" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) type tracker interface { diff --git a/tunnel/tunnel.go b/tunnel/tunnel.go index fbc1655582..135b6765aa 100644 --- a/tunnel/tunnel.go +++ b/tunnel/tunnel.go @@ -6,11 +6,11 @@ import ( "sync" "time" - InboundAdapter "github.com/whojave/clashr/adapters/inbound" - "github.com/whojave/clashr/component/nat" - C "github.com/whojave/clashr/constant" - "github.com/whojave/clashr/dns" - "github.com/whojave/clashr/log" + InboundAdapter "github.com/whojave/clash/adapters/inbound" + "github.com/whojave/clash/component/nat" + C "github.com/whojave/clash/constant" + "github.com/whojave/clash/dns" + "github.com/whojave/clash/log" channels "gopkg.in/eapache/channels.v1" ) diff --git a/tunnel/util.go b/tunnel/util.go index 8772708d5b..aa8974c2a7 100644 --- a/tunnel/util.go +++ b/tunnel/util.go @@ -3,7 +3,7 @@ package tunnel import ( "net" - C "github.com/whojave/clashr/constant" + C "github.com/whojave/clash/constant" ) // TrafficTrack record traffic of net.Conn