From 3c1d49edaca36776c1117860afcb5cbc2e08b65b Mon Sep 17 00:00:00 2001 From: Mystical-C <64483945+MysticalDevil@users.noreply.github.com> Date: Fri, 3 Nov 2023 15:15:05 +0800 Subject: [PATCH] Fix all sources --- .golangci.yaml | 2 +- Dockerfile | 2 +- Makefile | 4 +-- README.md | 8 ++--- adapter/adapter.go | 6 ++-- adapter/inbound/http.go | 6 ++-- adapter/inbound/https.go | 4 +-- adapter/inbound/packet.go | 4 +-- adapter/inbound/socket.go | 6 ++-- adapter/inbound/util.go | 4 +-- adapter/outbound/base.go | 4 +-- adapter/outbound/direct.go | 4 +-- adapter/outbound/http.go | 4 +-- adapter/outbound/reject.go | 4 +-- adapter/outbound/shadowsocks.go | 14 ++++---- adapter/outbound/shadowsocksr.go | 16 ++++----- adapter/outbound/snell.go | 10 +++--- adapter/outbound/socks5.go | 6 ++-- adapter/outbound/trojan.go | 8 ++--- adapter/outbound/util.go | 6 ++-- adapter/outbound/vmess.go | 10 +++--- adapter/outboundgroup/common.go | 4 +-- adapter/outboundgroup/fallback.go | 10 +++--- adapter/outboundgroup/loadbalance.go | 12 +++---- adapter/outboundgroup/parser.go | 10 +++--- adapter/outboundgroup/relay.go | 10 +++--- adapter/outboundgroup/selector.go | 10 +++--- adapter/outboundgroup/urltest.go | 10 +++--- adapter/outboundgroup/util.go | 2 +- adapter/parser.go | 6 ++-- adapter/provider/fetcher.go | 4 +-- adapter/provider/healthcheck.go | 4 +-- adapter/provider/parser.go | 6 ++-- adapter/provider/provider.go | 6 ++-- adapter/provider/vehicle.go | 4 +-- common/net/relay.go | 2 +- component/dhcp/conn.go | 2 +- component/dhcp/dhcp.go | 2 +- component/dialer/bind_darwin.go | 2 +- component/dialer/bind_others.go | 2 +- component/dialer/dialer.go | 2 +- component/dialer/mark_nonlinux.go | 2 +- component/fakeip/cachefile.go | 2 +- component/fakeip/memory.go | 2 +- component/fakeip/pool.go | 6 ++-- component/fakeip/pool_test.go | 4 +-- component/iface/iface.go | 2 +- component/mmdb/mmdb.go | 4 +-- component/nat/table.go | 2 +- component/process/process_freebsd_amd64.go | 2 +- component/process/process_linux.go | 2 +- component/process/process_windows.go | 2 +- component/profile/cachefile/cache.go | 6 ++-- component/resolver/resolver.go | 2 +- config/config.go | 26 +++++++-------- config/initial.go | 8 ++--- config/utils.go | 4 +-- constant/adapters.go | 2 +- constant/provider/interface.go | 2 +- context/conn.go | 2 +- context/packetconn.go | 2 +- dns/client.go | 4 +-- dns/dhcp.go | 6 ++-- dns/doh.go | 4 +-- dns/enhancer.go | 6 ++-- dns/filters.go | 4 +-- dns/middleware.go | 12 +++---- dns/resolver.go | 12 +++---- dns/server.go | 6 ++-- dns/util.go | 4 +-- go.mod | 2 +- hub/executor/executor.go | 34 ++++++++++---------- hub/hub.go | 6 ++-- hub/route/configs.go | 14 ++++---- hub/route/connections.go | 2 +- hub/route/provider.go | 4 +-- hub/route/proxies.go | 10 +++--- hub/route/rules.go | 2 +- hub/route/server.go | 8 ++--- listener/auth/auth.go | 2 +- listener/http/client.go | 6 ++-- listener/http/proxy.go | 12 +++---- listener/http/server.go | 4 +-- listener/http/upgrade.go | 8 ++--- listener/listener.go | 16 ++++----- listener/mixed/mixed.go | 14 ++++---- listener/redir/tcp.go | 4 +-- listener/redir/tcp_darwin.go | 2 +- listener/redir/tcp_freebsd.go | 2 +- listener/redir/tcp_linux.go | 2 +- listener/redir/tcp_other.go | 2 +- listener/socks/tcp.go | 12 +++---- listener/socks/udp.go | 12 +++---- listener/socks/utils.go | 4 +-- listener/tproxy/packet.go | 2 +- listener/tproxy/tcp.go | 6 ++-- listener/tproxy/udp.go | 8 ++--- log/log.go | 2 +- main.go | 10 +++--- rule/domain.go | 2 +- rule/domain_keyword.go | 2 +- rule/domain_suffix.go | 2 +- rule/final.go | 2 +- rule/geoip.go | 4 +-- rule/ipcidr.go | 2 +- rule/parser.go | 2 +- rule/port.go | 2 +- rule/process.go | 2 +- test/.golangci.yaml | 2 +- test/clash_test.go | 8 ++--- test/go.mod | 4 +-- test/snell_test.go | 4 +-- test/ss_test.go | 2 +- test/trojan_test.go | 4 +-- test/vmess_test.go | 4 +-- transport/gun/gun.go | 4 +-- transport/shadowsocks/core/cipher.go | 4 +-- transport/shadowsocks/shadowaead/packet.go | 2 +- transport/shadowsocks/shadowaead/stream.go | 2 +- transport/shadowsocks/shadowstream/packet.go | 2 +- transport/simple-obfs/http.go | 2 +- transport/simple-obfs/tls.go | 2 +- transport/snell/cipher.go | 2 +- transport/snell/pool.go | 4 +-- transport/snell/snell.go | 6 ++-- transport/socks4/socks4.go | 2 +- transport/socks5/socks5.go | 2 +- transport/ssr/obfs/http_simple.go | 2 +- transport/ssr/obfs/random_head.go | 2 +- transport/ssr/obfs/tls1.2_ticket_auth.go | 4 +-- transport/ssr/protocol/auth_aes128_md5.go | 2 +- transport/ssr/protocol/auth_aes128_sha1.go | 6 ++-- transport/ssr/protocol/auth_chain_a.go | 8 ++--- transport/ssr/protocol/auth_chain_b.go | 2 +- transport/ssr/protocol/auth_sha1_v4.go | 4 +-- transport/ssr/protocol/base.go | 6 ++-- transport/ssr/protocol/packet.go | 2 +- transport/ssr/protocol/stream.go | 2 +- transport/ssr/tools/random.go | 2 +- transport/trojan/trojan.go | 8 ++--- transport/v2ray-plugin/websocket.go | 2 +- transport/vmess/aead.go | 2 +- transport/vmess/chunk.go | 2 +- transport/vmess/tls.go | 2 +- tunnel/connection.go | 8 ++--- tunnel/statistic/tracker.go | 2 +- tunnel/tunnel.go | 18 +++++------ 147 files changed, 382 insertions(+), 382 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index a076458..f99d136 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -10,7 +10,7 @@ linters-settings: gci: sections: - standard - - prefix(github.com/Dreamacro/clash) + - prefix(github.com/MysticalDevil/clash) - default staticcheck: go: '1.18' diff --git a/Dockerfile b/Dockerfile index 6e67d5d..3912951 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN go mod download && \ mv ./bin/clash-docker /clash FROM alpine:latest -LABEL org.opencontainers.image.source="https://github.com/Dreamacro/clash" +LABEL org.opencontainers.image.source="https://github.com/MysticalDevil/clash" RUN apk add --no-cache ca-certificates tzdata COPY --from=builder /Country.mmdb /root/.config/clash/ diff --git a/Makefile b/Makefile index 36d7b3a..0857ff0 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ NAME=clash BINDIR=bin VERSION=$(shell git describe --tags || echo "unknown version") BUILDTIME=$(shell date -u) -GOBUILD=CGO_ENABLED=0 go build -trimpath -ldflags '-X "github.com/Dreamacro/clash/constant.Version=$(VERSION)" \ - -X "github.com/Dreamacro/clash/constant.BuildTime=$(BUILDTIME)" \ +GOBUILD=CGO_ENABLED=0 go build -trimpath -ldflags '-X "github.com/MysticalDevil/clash/constant.Version=$(VERSION)" \ + -X "github.com/MysticalDevil/clash/constant.BuildTime=$(BUILDTIME)" \ -w -s -buildid=' PLATFORM_LIST = \ diff --git a/README.md b/README.md index 55fb410..bd3f933 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,14 @@ Forked from Dreamacro/clash project <p align="center"> <a href="https://github.com/MysticalDevil/clash/actions"> - <img src="https://img.shields.io/github/workflow/status/Dreamacro/clash/Go?style=flat-square" alt="Github Actions"> + <img src="https://img.shields.io/github/workflow/status/MysticalDevil/clash/Go?style=flat-square" alt="Github Actions"> </a> <a href="https://goreportcard.com/report/github.com/MysticalDevil/clash"> <img src="https://goreportcard.com/badge/github.com/MysticalDevil/clash?style=flat-square"> </a> - <img src="https://img.shields.io/github/go-mod/go-version/Dreamacro/clash?style=flat-square"> + <img src="https://img.shields.io/github/go-mod/go-version/MysticalDevil/clash?style=flat-square"> <a href="https://github.com/MysticalDevil/clash/releases"> - <img src="https://img.shields.io/github/release/Dreamacro/clash/all.svg?style=flat-square"> + <img src="https://img.shields.io/github/release/MysticalDevil/clash/all.svg?style=flat-square"> </a> <a href="https://github.com/MysticalDevil/clash/releases/tag/premium"> <img src="https://img.shields.io/badge/release-Premium-00b4f0?style=flat-square"> @@ -61,4 +61,4 @@ If you want to build an application that uses clash as a library, check out the This software is released under the GPL-3.0 license. -[](https://app.fossa.io/projects/git%2Bgithub.com%2FDreamacro%2Fclash?ref=badge_large) +[](https://app.fossa.io/projects/git%2Bgithub.com%2FMysticalDevil%2Fclash?ref=badge_large) diff --git a/adapter/adapter.go b/adapter/adapter.go index 23dc304..b7e77fb 100644 --- a/adapter/adapter.go +++ b/adapter/adapter.go @@ -9,9 +9,9 @@ import ( "net/url" "time" - "github.com/Dreamacro/clash/common/queue" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/common/queue" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" "go.uber.org/atomic" ) diff --git a/adapter/inbound/http.go b/adapter/inbound/http.go index 89960cf..c75edc2 100644 --- a/adapter/inbound/http.go +++ b/adapter/inbound/http.go @@ -3,9 +3,9 @@ package inbound import ( "net" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/context" - "github.com/Dreamacro/clash/transport/socks5" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/context" + "github.com/MysticalDevil/clash/transport/socks5" ) // NewHTTP receive normal http request and return HTTPContext diff --git a/adapter/inbound/https.go b/adapter/inbound/https.go index e7e9221..e6ed94e 100644 --- a/adapter/inbound/https.go +++ b/adapter/inbound/https.go @@ -4,8 +4,8 @@ import ( "net" "net/http" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/context" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/context" ) // NewHTTPS receive CONNECT request and return ConnContext diff --git a/adapter/inbound/packet.go b/adapter/inbound/packet.go index 80b136c..5881210 100644 --- a/adapter/inbound/packet.go +++ b/adapter/inbound/packet.go @@ -1,8 +1,8 @@ package inbound import ( - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" ) // PacketAdapter is a UDP Packet adapter for socks/redir/tun diff --git a/adapter/inbound/socket.go b/adapter/inbound/socket.go index be71701..317db95 100644 --- a/adapter/inbound/socket.go +++ b/adapter/inbound/socket.go @@ -3,9 +3,9 @@ package inbound import ( "net" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/context" - "github.com/Dreamacro/clash/transport/socks5" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/context" + "github.com/MysticalDevil/clash/transport/socks5" ) // NewSocket receive TCP inbound and return ConnContext diff --git a/adapter/inbound/util.go b/adapter/inbound/util.go index 07577ec..6b3dfd8 100644 --- a/adapter/inbound/util.go +++ b/adapter/inbound/util.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" ) func parseSocksAddr(target socks5.Addr) *C.Metadata { diff --git a/adapter/outbound/base.go b/adapter/outbound/base.go index e911941..8d4f111 100644 --- a/adapter/outbound/base.go +++ b/adapter/outbound/base.go @@ -6,8 +6,8 @@ import ( "errors" "net" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" ) type Base struct { diff --git a/adapter/outbound/direct.go b/adapter/outbound/direct.go index 4c4305f..02d8142 100644 --- a/adapter/outbound/direct.go +++ b/adapter/outbound/direct.go @@ -4,8 +4,8 @@ import ( "context" "net" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" ) type Direct struct { diff --git a/adapter/outbound/http.go b/adapter/outbound/http.go index 44dc705..c3f8bb4 100644 --- a/adapter/outbound/http.go +++ b/adapter/outbound/http.go @@ -13,8 +13,8 @@ import ( "net/url" "strconv" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" ) type Http struct { diff --git a/adapter/outbound/reject.go b/adapter/outbound/reject.go index f475210..327f39d 100644 --- a/adapter/outbound/reject.go +++ b/adapter/outbound/reject.go @@ -6,8 +6,8 @@ import ( "net" "time" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" ) type Reject struct { diff --git a/adapter/outbound/shadowsocks.go b/adapter/outbound/shadowsocks.go index 6ed7805..d052160 100644 --- a/adapter/outbound/shadowsocks.go +++ b/adapter/outbound/shadowsocks.go @@ -7,13 +7,13 @@ import ( "net" "strconv" - "github.com/Dreamacro/clash/common/structure" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/shadowsocks/core" - obfs "github.com/Dreamacro/clash/transport/simple-obfs" - "github.com/Dreamacro/clash/transport/socks5" - v2rayObfs "github.com/Dreamacro/clash/transport/v2ray-plugin" + "github.com/MysticalDevil/clash/common/structure" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/shadowsocks/core" + obfs "github.com/MysticalDevil/clash/transport/simple-obfs" + "github.com/MysticalDevil/clash/transport/socks5" + v2rayObfs "github.com/MysticalDevil/clash/transport/v2ray-plugin" ) type ShadowSocks struct { diff --git a/adapter/outbound/shadowsocksr.go b/adapter/outbound/shadowsocksr.go index 57ef560..10542d1 100644 --- a/adapter/outbound/shadowsocksr.go +++ b/adapter/outbound/shadowsocksr.go @@ -6,13 +6,13 @@ import ( "net" "strconv" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/shadowsocks/core" - "github.com/Dreamacro/clash/transport/shadowsocks/shadowaead" - "github.com/Dreamacro/clash/transport/shadowsocks/shadowstream" - "github.com/Dreamacro/clash/transport/ssr/obfs" - "github.com/Dreamacro/clash/transport/ssr/protocol" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/shadowsocks/core" + "github.com/MysticalDevil/clash/transport/shadowsocks/shadowaead" + "github.com/MysticalDevil/clash/transport/shadowsocks/shadowstream" + "github.com/MysticalDevil/clash/transport/ssr/obfs" + "github.com/MysticalDevil/clash/transport/ssr/protocol" ) type ShadowSocksR struct { @@ -92,7 +92,7 @@ func (ssr *ShadowSocksR) ListenPacketContext(ctx context.Context, metadata *C.Me func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) { // SSR protocol compatibility - // https://github.com/Dreamacro/clash/pull/2056 + // https://github.com/MysticalDevil/clash/pull/2056 if option.Cipher == "none" { option.Cipher = "dummy" } diff --git a/adapter/outbound/snell.go b/adapter/outbound/snell.go index 07f3d89..d43f9d2 100644 --- a/adapter/outbound/snell.go +++ b/adapter/outbound/snell.go @@ -6,11 +6,11 @@ import ( "net" "strconv" - "github.com/Dreamacro/clash/common/structure" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - obfs "github.com/Dreamacro/clash/transport/simple-obfs" - "github.com/Dreamacro/clash/transport/snell" + "github.com/MysticalDevil/clash/common/structure" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + obfs "github.com/MysticalDevil/clash/transport/simple-obfs" + "github.com/MysticalDevil/clash/transport/snell" ) type Snell struct { diff --git a/adapter/outbound/socks5.go b/adapter/outbound/socks5.go index 398ee3b..1c63614 100644 --- a/adapter/outbound/socks5.go +++ b/adapter/outbound/socks5.go @@ -9,9 +9,9 @@ import ( "net" "strconv" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" ) type Socks5 struct { diff --git a/adapter/outbound/trojan.go b/adapter/outbound/trojan.go index 064cd3c..32781e5 100644 --- a/adapter/outbound/trojan.go +++ b/adapter/outbound/trojan.go @@ -8,10 +8,10 @@ import ( "net/http" "strconv" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/gun" - "github.com/Dreamacro/clash/transport/trojan" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/gun" + "github.com/MysticalDevil/clash/transport/trojan" "golang.org/x/net/http2" ) diff --git a/adapter/outbound/util.go b/adapter/outbound/util.go index b376522..4d48aa6 100644 --- a/adapter/outbound/util.go +++ b/adapter/outbound/util.go @@ -6,9 +6,9 @@ import ( "strconv" "time" - "github.com/Dreamacro/clash/component/resolver" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/component/resolver" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" ) func tcpKeepAlive(c net.Conn) { diff --git a/adapter/outbound/vmess.go b/adapter/outbound/vmess.go index ea3681a..98ee527 100644 --- a/adapter/outbound/vmess.go +++ b/adapter/outbound/vmess.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "github.com/Dreamacro/clash/component/dialer" - "github.com/Dreamacro/clash/component/resolver" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/gun" - "github.com/Dreamacro/clash/transport/vmess" + "github.com/MysticalDevil/clash/component/dialer" + "github.com/MysticalDevil/clash/component/resolver" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/gun" + "github.com/MysticalDevil/clash/transport/vmess" "golang.org/x/net/http2" ) diff --git a/adapter/outboundgroup/common.go b/adapter/outboundgroup/common.go index 758c780..c8bc40e 100644 --- a/adapter/outboundgroup/common.go +++ b/adapter/outboundgroup/common.go @@ -3,8 +3,8 @@ package outboundgroup import ( "time" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/constant/provider" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/constant/provider" ) const ( diff --git a/adapter/outboundgroup/fallback.go b/adapter/outboundgroup/fallback.go index 9af4938..307ea4d 100644 --- a/adapter/outboundgroup/fallback.go +++ b/adapter/outboundgroup/fallback.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" - "github.com/Dreamacro/clash/adapter/outbound" - "github.com/Dreamacro/clash/common/singledo" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/adapter/outbound" + "github.com/MysticalDevil/clash/common/singledo" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/constant/provider" ) type Fallback struct { diff --git a/adapter/outboundgroup/loadbalance.go b/adapter/outboundgroup/loadbalance.go index 380b0d0..6e50706 100644 --- a/adapter/outboundgroup/loadbalance.go +++ b/adapter/outboundgroup/loadbalance.go @@ -7,12 +7,12 @@ import ( "fmt" "net" - "github.com/Dreamacro/clash/adapter/outbound" - "github.com/Dreamacro/clash/common/murmur3" - "github.com/Dreamacro/clash/common/singledo" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/adapter/outbound" + "github.com/MysticalDevil/clash/common/murmur3" + "github.com/MysticalDevil/clash/common/singledo" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/constant/provider" "golang.org/x/net/publicsuffix" ) diff --git a/adapter/outboundgroup/parser.go b/adapter/outboundgroup/parser.go index 0ce957e..7f00a13 100644 --- a/adapter/outboundgroup/parser.go +++ b/adapter/outboundgroup/parser.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/Dreamacro/clash/adapter/outbound" - "github.com/Dreamacro/clash/adapter/provider" - "github.com/Dreamacro/clash/common/structure" - C "github.com/Dreamacro/clash/constant" - types "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/adapter/outbound" + "github.com/MysticalDevil/clash/adapter/provider" + "github.com/MysticalDevil/clash/common/structure" + C "github.com/MysticalDevil/clash/constant" + types "github.com/MysticalDevil/clash/constant/provider" ) var ( diff --git a/adapter/outboundgroup/relay.go b/adapter/outboundgroup/relay.go index 03e6982..e2b7e15 100644 --- a/adapter/outboundgroup/relay.go +++ b/adapter/outboundgroup/relay.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/Dreamacro/clash/adapter/outbound" - "github.com/Dreamacro/clash/common/singledo" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/adapter/outbound" + "github.com/MysticalDevil/clash/common/singledo" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/constant/provider" ) type Relay struct { diff --git a/adapter/outboundgroup/selector.go b/adapter/outboundgroup/selector.go index 3975df7..d4ce055 100644 --- a/adapter/outboundgroup/selector.go +++ b/adapter/outboundgroup/selector.go @@ -5,11 +5,11 @@ import ( "encoding/json" "errors" - "github.com/Dreamacro/clash/adapter/outbound" - "github.com/Dreamacro/clash/common/singledo" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/adapter/outbound" + "github.com/MysticalDevil/clash/common/singledo" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/constant/provider" ) type Selector struct { diff --git a/adapter/outboundgroup/urltest.go b/adapter/outboundgroup/urltest.go index 6159749..3b5b277 100644 --- a/adapter/outboundgroup/urltest.go +++ b/adapter/outboundgroup/urltest.go @@ -5,11 +5,11 @@ import ( "encoding/json" "time" - "github.com/Dreamacro/clash/adapter/outbound" - "github.com/Dreamacro/clash/common/singledo" - "github.com/Dreamacro/clash/component/dialer" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/adapter/outbound" + "github.com/MysticalDevil/clash/common/singledo" + "github.com/MysticalDevil/clash/component/dialer" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/constant/provider" ) type urlTestOption func(*URLTest) diff --git a/adapter/outboundgroup/util.go b/adapter/outboundgroup/util.go index 70d7107..fd15695 100644 --- a/adapter/outboundgroup/util.go +++ b/adapter/outboundgroup/util.go @@ -5,7 +5,7 @@ import ( "net" "time" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) func addrToMetadata(rawAddress string) (addr *C.Metadata, err error) { diff --git a/adapter/parser.go b/adapter/parser.go index 4ee7b48..4ff33df 100644 --- a/adapter/parser.go +++ b/adapter/parser.go @@ -3,9 +3,9 @@ package adapter import ( "fmt" - "github.com/Dreamacro/clash/adapter/outbound" - "github.com/Dreamacro/clash/common/structure" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/adapter/outbound" + "github.com/MysticalDevil/clash/common/structure" + C "github.com/MysticalDevil/clash/constant" ) func ParseProxy(mapping map[string]any) (C.Proxy, error) { diff --git a/adapter/provider/fetcher.go b/adapter/provider/fetcher.go index 4a7be8b..4077d84 100644 --- a/adapter/provider/fetcher.go +++ b/adapter/provider/fetcher.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - types "github.com/Dreamacro/clash/constant/provider" - "github.com/Dreamacro/clash/log" + types "github.com/MysticalDevil/clash/constant/provider" + "github.com/MysticalDevil/clash/log" ) var ( diff --git a/adapter/provider/healthcheck.go b/adapter/provider/healthcheck.go index 7a89ffa..e1205d8 100644 --- a/adapter/provider/healthcheck.go +++ b/adapter/provider/healthcheck.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/Dreamacro/clash/common/batch" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/common/batch" + C "github.com/MysticalDevil/clash/constant" "go.uber.org/atomic" ) diff --git a/adapter/provider/parser.go b/adapter/provider/parser.go index 887ac5c..d749057 100644 --- a/adapter/provider/parser.go +++ b/adapter/provider/parser.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/Dreamacro/clash/common/structure" - C "github.com/Dreamacro/clash/constant" - types "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/common/structure" + C "github.com/MysticalDevil/clash/constant" + types "github.com/MysticalDevil/clash/constant/provider" ) var errVehicleType = errors.New("unsupport vehicle type") diff --git a/adapter/provider/provider.go b/adapter/provider/provider.go index e3bc494..2e3f02e 100644 --- a/adapter/provider/provider.go +++ b/adapter/provider/provider.go @@ -8,9 +8,9 @@ import ( "runtime" "time" - "github.com/Dreamacro/clash/adapter" - C "github.com/Dreamacro/clash/constant" - types "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/adapter" + C "github.com/MysticalDevil/clash/constant" + types "github.com/MysticalDevil/clash/constant/provider" "gopkg.in/yaml.v3" ) diff --git a/adapter/provider/vehicle.go b/adapter/provider/vehicle.go index 4f08c31..541666a 100644 --- a/adapter/provider/vehicle.go +++ b/adapter/provider/vehicle.go @@ -9,8 +9,8 @@ import ( "os" "time" - "github.com/Dreamacro/clash/component/dialer" - types "github.com/Dreamacro/clash/constant/provider" + "github.com/MysticalDevil/clash/component/dialer" + types "github.com/MysticalDevil/clash/constant/provider" ) type FileVehicle struct { diff --git a/common/net/relay.go b/common/net/relay.go index 99a0c6a..1e86cc5 100644 --- a/common/net/relay.go +++ b/common/net/relay.go @@ -12,7 +12,7 @@ func Relay(leftConn, rightConn net.Conn) { go func() { // Wrapping to avoid using *net.TCPConn.(ReadFrom) - // See also https://github.com/Dreamacro/clash/pull/1209 + // See also https://github.com/MysticalDevil/clash/pull/1209 _, err := io.Copy(WriteOnlyWriter{Writer: leftConn}, ReadOnlyReader{Reader: rightConn}) leftConn.SetReadDeadline(time.Now()) ch <- err diff --git a/component/dhcp/conn.go b/component/dhcp/conn.go index 90a9e25..a3358a1 100644 --- a/component/dhcp/conn.go +++ b/component/dhcp/conn.go @@ -5,7 +5,7 @@ import ( "net" "runtime" - "github.com/Dreamacro/clash/component/dialer" + "github.com/MysticalDevil/clash/component/dialer" ) func ListenDHCPClient(ctx context.Context, ifaceName string) (net.PacketConn, error) { diff --git a/component/dhcp/dhcp.go b/component/dhcp/dhcp.go index b7e9f50..70933b7 100644 --- a/component/dhcp/dhcp.go +++ b/component/dhcp/dhcp.go @@ -5,7 +5,7 @@ import ( "errors" "net" - "github.com/Dreamacro/clash/component/iface" + "github.com/MysticalDevil/clash/component/iface" "github.com/insomniacslk/dhcp/dhcpv4" ) diff --git a/component/dialer/bind_darwin.go b/component/dialer/bind_darwin.go index 57e09bb..5c3a682 100644 --- a/component/dialer/bind_darwin.go +++ b/component/dialer/bind_darwin.go @@ -4,7 +4,7 @@ import ( "net" "syscall" - "github.com/Dreamacro/clash/component/iface" + "github.com/MysticalDevil/clash/component/iface" "golang.org/x/sys/unix" ) diff --git a/component/dialer/bind_others.go b/component/dialer/bind_others.go index 51b2ef6..b6d68b1 100644 --- a/component/dialer/bind_others.go +++ b/component/dialer/bind_others.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/Dreamacro/clash/component/iface" + "github.com/MysticalDevil/clash/component/iface" ) func lookupLocalAddr(ifaceName string, network string, destination net.IP, port int) (net.Addr, error) { diff --git a/component/dialer/dialer.go b/component/dialer/dialer.go index d2b5695..94043ff 100644 --- a/component/dialer/dialer.go +++ b/component/dialer/dialer.go @@ -5,7 +5,7 @@ import ( "errors" "net" - "github.com/Dreamacro/clash/component/resolver" + "github.com/MysticalDevil/clash/component/resolver" ) func DialContext(ctx context.Context, network, address string, options ...Option) (net.Conn, error) { diff --git a/component/dialer/mark_nonlinux.go b/component/dialer/mark_nonlinux.go index 98645e4..71bd6c1 100644 --- a/component/dialer/mark_nonlinux.go +++ b/component/dialer/mark_nonlinux.go @@ -6,7 +6,7 @@ import ( "net" "sync" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/log" ) var printMarkWarnOnce sync.Once diff --git a/component/fakeip/cachefile.go b/component/fakeip/cachefile.go index 04bdc65..29fd8c8 100644 --- a/component/fakeip/cachefile.go +++ b/component/fakeip/cachefile.go @@ -3,7 +3,7 @@ package fakeip import ( "net" - "github.com/Dreamacro/clash/component/profile/cachefile" + "github.com/MysticalDevil/clash/component/profile/cachefile" ) type cachefileStore struct { diff --git a/component/fakeip/memory.go b/component/fakeip/memory.go index c6c6873..d4a0959 100644 --- a/component/fakeip/memory.go +++ b/component/fakeip/memory.go @@ -3,7 +3,7 @@ package fakeip import ( "net" - "github.com/Dreamacro/clash/common/cache" + "github.com/MysticalDevil/clash/common/cache" ) type memoryStore struct { diff --git a/component/fakeip/pool.go b/component/fakeip/pool.go index 925882b..e71f7b2 100644 --- a/component/fakeip/pool.go +++ b/component/fakeip/pool.go @@ -5,9 +5,9 @@ import ( "net" "sync" - "github.com/Dreamacro/clash/common/cache" - "github.com/Dreamacro/clash/component/profile/cachefile" - "github.com/Dreamacro/clash/component/trie" + "github.com/MysticalDevil/clash/common/cache" + "github.com/MysticalDevil/clash/component/profile/cachefile" + "github.com/MysticalDevil/clash/component/trie" ) type store interface { diff --git a/component/fakeip/pool_test.go b/component/fakeip/pool_test.go index bd03463..9b07a4c 100644 --- a/component/fakeip/pool_test.go +++ b/component/fakeip/pool_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/Dreamacro/clash/component/profile/cachefile" - "github.com/Dreamacro/clash/component/trie" + "github.com/MysticalDevil/clash/component/profile/cachefile" + "github.com/MysticalDevil/clash/component/trie" "github.com/stretchr/testify/assert" "go.etcd.io/bbolt" diff --git a/component/iface/iface.go b/component/iface/iface.go index df29081..81e2124 100644 --- a/component/iface/iface.go +++ b/component/iface/iface.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/Dreamacro/clash/common/singledo" + "github.com/MysticalDevil/clash/common/singledo" ) type Interface struct { diff --git a/component/mmdb/mmdb.go b/component/mmdb/mmdb.go index e120055..26ce884 100644 --- a/component/mmdb/mmdb.go +++ b/component/mmdb/mmdb.go @@ -3,8 +3,8 @@ package mmdb import ( "sync" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/log" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/log" "github.com/oschwald/geoip2-golang" ) diff --git a/component/nat/table.go b/component/nat/table.go index fbb16de..a5a6cb7 100644 --- a/component/nat/table.go +++ b/component/nat/table.go @@ -3,7 +3,7 @@ package nat import ( "sync" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type Table struct { diff --git a/component/process/process_freebsd_amd64.go b/component/process/process_freebsd_amd64.go index f3e6464..a591d16 100644 --- a/component/process/process_freebsd_amd64.go +++ b/component/process/process_freebsd_amd64.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/log" ) // store process name for when dealing with multiple PROCESS-NAME rules diff --git a/component/process/process_linux.go b/component/process/process_linux.go index 1dfd0ed..f37d81a 100644 --- a/component/process/process_linux.go +++ b/component/process/process_linux.go @@ -12,7 +12,7 @@ import ( "unicode" "unsafe" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) // from https://github.com/vishvananda/netlink/blob/bca67dfc8220b44ef582c9da4e9172bf1c9ec973/nl/nl_linux.go#L52-L62 diff --git a/component/process/process_windows.go b/component/process/process_windows.go index 26a389a..55964d7 100644 --- a/component/process/process_windows.go +++ b/component/process/process_windows.go @@ -7,7 +7,7 @@ import ( "syscall" "unsafe" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/log" "golang.org/x/sys/windows" ) diff --git a/component/profile/cachefile/cache.go b/component/profile/cachefile/cache.go index 7111356..ca36b11 100644 --- a/component/profile/cachefile/cache.go +++ b/component/profile/cachefile/cache.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/Dreamacro/clash/component/profile" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/component/profile" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/log" "go.etcd.io/bbolt" ) diff --git a/component/resolver/resolver.go b/component/resolver/resolver.go index d10e39c..e39e5e4 100644 --- a/component/resolver/resolver.go +++ b/component/resolver/resolver.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/Dreamacro/clash/component/trie" + "github.com/MysticalDevil/clash/component/trie" ) var ( diff --git a/config/config.go b/config/config.go index 8b1ed89..a039653 100644 --- a/config/config.go +++ b/config/config.go @@ -8,19 +8,19 @@ import ( "os" "strings" - "github.com/Dreamacro/clash/adapter" - "github.com/Dreamacro/clash/adapter/outbound" - "github.com/Dreamacro/clash/adapter/outboundgroup" - "github.com/Dreamacro/clash/adapter/provider" - "github.com/Dreamacro/clash/component/auth" - "github.com/Dreamacro/clash/component/fakeip" - "github.com/Dreamacro/clash/component/trie" - C "github.com/Dreamacro/clash/constant" - providerTypes "github.com/Dreamacro/clash/constant/provider" - "github.com/Dreamacro/clash/dns" - "github.com/Dreamacro/clash/log" - R "github.com/Dreamacro/clash/rule" - T "github.com/Dreamacro/clash/tunnel" + "github.com/MysticalDevil/clash/adapter" + "github.com/MysticalDevil/clash/adapter/outbound" + "github.com/MysticalDevil/clash/adapter/outboundgroup" + "github.com/MysticalDevil/clash/adapter/provider" + "github.com/MysticalDevil/clash/component/auth" + "github.com/MysticalDevil/clash/component/fakeip" + "github.com/MysticalDevil/clash/component/trie" + C "github.com/MysticalDevil/clash/constant" + providerTypes "github.com/MysticalDevil/clash/constant/provider" + "github.com/MysticalDevil/clash/dns" + "github.com/MysticalDevil/clash/log" + R "github.com/MysticalDevil/clash/rule" + T "github.com/MysticalDevil/clash/tunnel" "gopkg.in/yaml.v3" ) diff --git a/config/initial.go b/config/initial.go index 9d1a2db..d6f793a 100644 --- a/config/initial.go +++ b/config/initial.go @@ -6,13 +6,13 @@ import ( "net/http" "os" - "github.com/Dreamacro/clash/component/mmdb" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/component/mmdb" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/log" ) func downloadMMDB(path string) (err error) { - resp, err := http.Get("https://cdn.jsdelivr.net/gh/Dreamacro/maxmind-geoip@release/Country.mmdb") + resp, err := http.Get("https://cdn.jsdelivr.net/gh/MysticalDevil/maxmind-geoip@release/Country.mmdb") if err != nil { return } diff --git a/config/utils.go b/config/utils.go index 1d49552..e06b6ee 100644 --- a/config/utils.go +++ b/config/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/Dreamacro/clash/adapter/outboundgroup" - "github.com/Dreamacro/clash/common/structure" + "github.com/MysticalDevil/clash/adapter/outboundgroup" + "github.com/MysticalDevil/clash/common/structure" ) func trimArr(arr []string) (r []string) { diff --git a/constant/adapters.go b/constant/adapters.go index dd75442..730a30c 100644 --- a/constant/adapters.go +++ b/constant/adapters.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/Dreamacro/clash/component/dialer" + "github.com/MysticalDevil/clash/component/dialer" ) // Adapter Type diff --git a/constant/provider/interface.go b/constant/provider/interface.go index 53bda7e..e1e33b6 100644 --- a/constant/provider/interface.go +++ b/constant/provider/interface.go @@ -1,7 +1,7 @@ package provider import ( - "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/constant" ) // Vehicle Type diff --git a/context/conn.go b/context/conn.go index ee0f3a9..c8ce5e5 100644 --- a/context/conn.go +++ b/context/conn.go @@ -3,7 +3,7 @@ package context import ( "net" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" "github.com/gofrs/uuid" ) diff --git a/context/packetconn.go b/context/packetconn.go index 3b00514..dde3287 100644 --- a/context/packetconn.go +++ b/context/packetconn.go @@ -3,7 +3,7 @@ package context import ( "net" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" "github.com/gofrs/uuid" ) diff --git a/dns/client.go b/dns/client.go index 5cb1fe0..f690600 100644 --- a/dns/client.go +++ b/dns/client.go @@ -7,8 +7,8 @@ import ( "net" "strings" - "github.com/Dreamacro/clash/component/dialer" - "github.com/Dreamacro/clash/component/resolver" + "github.com/MysticalDevil/clash/component/dialer" + "github.com/MysticalDevil/clash/component/resolver" D "github.com/miekg/dns" ) diff --git a/dns/dhcp.go b/dns/dhcp.go index f964cec..d2c641d 100644 --- a/dns/dhcp.go +++ b/dns/dhcp.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/Dreamacro/clash/component/dhcp" - "github.com/Dreamacro/clash/component/iface" - "github.com/Dreamacro/clash/component/resolver" + "github.com/MysticalDevil/clash/component/dhcp" + "github.com/MysticalDevil/clash/component/iface" + "github.com/MysticalDevil/clash/component/resolver" D "github.com/miekg/dns" ) diff --git a/dns/doh.go b/dns/doh.go index 99c22cb..ac2bd26 100644 --- a/dns/doh.go +++ b/dns/doh.go @@ -7,8 +7,8 @@ import ( "net" "net/http" - "github.com/Dreamacro/clash/component/dialer" - "github.com/Dreamacro/clash/component/resolver" + "github.com/MysticalDevil/clash/component/dialer" + "github.com/MysticalDevil/clash/component/resolver" D "github.com/miekg/dns" ) diff --git a/dns/enhancer.go b/dns/enhancer.go index 76f0f26..29a67ce 100644 --- a/dns/enhancer.go +++ b/dns/enhancer.go @@ -3,9 +3,9 @@ package dns import ( "net" - "github.com/Dreamacro/clash/common/cache" - "github.com/Dreamacro/clash/component/fakeip" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/common/cache" + "github.com/MysticalDevil/clash/component/fakeip" + C "github.com/MysticalDevil/clash/constant" ) type ResolverEnhancer struct { diff --git a/dns/filters.go b/dns/filters.go index 30825a4..addc6b8 100644 --- a/dns/filters.go +++ b/dns/filters.go @@ -4,8 +4,8 @@ import ( "net" "strings" - "github.com/Dreamacro/clash/component/mmdb" - "github.com/Dreamacro/clash/component/trie" + "github.com/MysticalDevil/clash/component/mmdb" + "github.com/MysticalDevil/clash/component/trie" ) type fallbackIPFilter interface { diff --git a/dns/middleware.go b/dns/middleware.go index 9d0da59..6b256be 100644 --- a/dns/middleware.go +++ b/dns/middleware.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "github.com/Dreamacro/clash/common/cache" - "github.com/Dreamacro/clash/component/fakeip" - "github.com/Dreamacro/clash/component/trie" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/context" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/common/cache" + "github.com/MysticalDevil/clash/component/fakeip" + "github.com/MysticalDevil/clash/component/trie" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/context" + "github.com/MysticalDevil/clash/log" D "github.com/miekg/dns" ) diff --git a/dns/resolver.go b/dns/resolver.go index cec415a..aba9a4d 100644 --- a/dns/resolver.go +++ b/dns/resolver.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "github.com/Dreamacro/clash/common/cache" - "github.com/Dreamacro/clash/common/picker" - "github.com/Dreamacro/clash/component/fakeip" - "github.com/Dreamacro/clash/component/resolver" - "github.com/Dreamacro/clash/component/trie" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/common/cache" + "github.com/MysticalDevil/clash/common/picker" + "github.com/MysticalDevil/clash/component/fakeip" + "github.com/MysticalDevil/clash/component/resolver" + "github.com/MysticalDevil/clash/component/trie" + C "github.com/MysticalDevil/clash/constant" D "github.com/miekg/dns" "golang.org/x/sync/singleflight" diff --git a/dns/server.go b/dns/server.go index db90334..cd12d72 100644 --- a/dns/server.go +++ b/dns/server.go @@ -4,9 +4,9 @@ import ( "errors" "net" - "github.com/Dreamacro/clash/common/sockopt" - "github.com/Dreamacro/clash/context" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/common/sockopt" + "github.com/MysticalDevil/clash/context" + "github.com/MysticalDevil/clash/log" D "github.com/miekg/dns" ) diff --git a/dns/util.go b/dns/util.go index d25f573..44e108f 100644 --- a/dns/util.go +++ b/dns/util.go @@ -5,8 +5,8 @@ import ( "net" "time" - "github.com/Dreamacro/clash/common/cache" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/common/cache" + "github.com/MysticalDevil/clash/log" D "github.com/miekg/dns" ) diff --git a/go.mod b/go.mod index 2ee56b9..96d4282 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Dreamacro/clash +module github.com/MysticalDevil/clash go 1.18 diff --git a/hub/executor/executor.go b/hub/executor/executor.go index dc1f860..81d130e 100644 --- a/hub/executor/executor.go +++ b/hub/executor/executor.go @@ -5,23 +5,23 @@ import ( "os" "sync" - "github.com/Dreamacro/clash/adapter" - "github.com/Dreamacro/clash/adapter/outboundgroup" - "github.com/Dreamacro/clash/component/auth" - "github.com/Dreamacro/clash/component/dialer" - "github.com/Dreamacro/clash/component/iface" - "github.com/Dreamacro/clash/component/profile" - "github.com/Dreamacro/clash/component/profile/cachefile" - "github.com/Dreamacro/clash/component/resolver" - "github.com/Dreamacro/clash/component/trie" - "github.com/Dreamacro/clash/config" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/constant/provider" - "github.com/Dreamacro/clash/dns" - P "github.com/Dreamacro/clash/listener" - authStore "github.com/Dreamacro/clash/listener/auth" - "github.com/Dreamacro/clash/log" - "github.com/Dreamacro/clash/tunnel" + "github.com/MysticalDevil/clash/adapter" + "github.com/MysticalDevil/clash/adapter/outboundgroup" + "github.com/MysticalDevil/clash/component/auth" + "github.com/MysticalDevil/clash/component/dialer" + "github.com/MysticalDevil/clash/component/iface" + "github.com/MysticalDevil/clash/component/profile" + "github.com/MysticalDevil/clash/component/profile/cachefile" + "github.com/MysticalDevil/clash/component/resolver" + "github.com/MysticalDevil/clash/component/trie" + "github.com/MysticalDevil/clash/config" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/constant/provider" + "github.com/MysticalDevil/clash/dns" + P "github.com/MysticalDevil/clash/listener" + authStore "github.com/MysticalDevil/clash/listener/auth" + "github.com/MysticalDevil/clash/log" + "github.com/MysticalDevil/clash/tunnel" ) var mux sync.Mutex diff --git a/hub/hub.go b/hub/hub.go index 471fdb5..0ecf28d 100644 --- a/hub/hub.go +++ b/hub/hub.go @@ -1,9 +1,9 @@ package hub import ( - "github.com/Dreamacro/clash/config" - "github.com/Dreamacro/clash/hub/executor" - "github.com/Dreamacro/clash/hub/route" + "github.com/MysticalDevil/clash/config" + "github.com/MysticalDevil/clash/hub/executor" + "github.com/MysticalDevil/clash/hub/route" ) type Option func(*config.Config) diff --git a/hub/route/configs.go b/hub/route/configs.go index 48cb95e..f1c486c 100644 --- a/hub/route/configs.go +++ b/hub/route/configs.go @@ -4,13 +4,13 @@ import ( "net/http" "path/filepath" - "github.com/Dreamacro/clash/component/resolver" - "github.com/Dreamacro/clash/config" - "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/hub/executor" - P "github.com/Dreamacro/clash/listener" - "github.com/Dreamacro/clash/log" - "github.com/Dreamacro/clash/tunnel" + "github.com/MysticalDevil/clash/component/resolver" + "github.com/MysticalDevil/clash/config" + "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/hub/executor" + P "github.com/MysticalDevil/clash/listener" + "github.com/MysticalDevil/clash/log" + "github.com/MysticalDevil/clash/tunnel" "github.com/go-chi/chi/v5" "github.com/go-chi/render" diff --git a/hub/route/connections.go b/hub/route/connections.go index bfe3b42..3507e04 100644 --- a/hub/route/connections.go +++ b/hub/route/connections.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/Dreamacro/clash/tunnel/statistic" + "github.com/MysticalDevil/clash/tunnel/statistic" "github.com/go-chi/chi/v5" "github.com/go-chi/render" diff --git a/hub/route/provider.go b/hub/route/provider.go index 0b59944..4447393 100644 --- a/hub/route/provider.go +++ b/hub/route/provider.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/Dreamacro/clash/constant/provider" - "github.com/Dreamacro/clash/tunnel" + "github.com/MysticalDevil/clash/constant/provider" + "github.com/MysticalDevil/clash/tunnel" "github.com/go-chi/chi/v5" "github.com/go-chi/render" diff --git a/hub/route/proxies.go b/hub/route/proxies.go index bba9e2a..cb519c5 100644 --- a/hub/route/proxies.go +++ b/hub/route/proxies.go @@ -7,11 +7,11 @@ import ( "strconv" "time" - "github.com/Dreamacro/clash/adapter" - "github.com/Dreamacro/clash/adapter/outboundgroup" - "github.com/Dreamacro/clash/component/profile/cachefile" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/tunnel" + "github.com/MysticalDevil/clash/adapter" + "github.com/MysticalDevil/clash/adapter/outboundgroup" + "github.com/MysticalDevil/clash/component/profile/cachefile" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/tunnel" "github.com/go-chi/chi/v5" "github.com/go-chi/render" diff --git a/hub/route/rules.go b/hub/route/rules.go index ea819b6..7f38add 100644 --- a/hub/route/rules.go +++ b/hub/route/rules.go @@ -3,7 +3,7 @@ package route import ( "net/http" - "github.com/Dreamacro/clash/tunnel" + "github.com/MysticalDevil/clash/tunnel" "github.com/go-chi/chi/v5" "github.com/go-chi/render" diff --git a/hub/route/server.go b/hub/route/server.go index d5d8f72..efc51fc 100644 --- a/hub/route/server.go +++ b/hub/route/server.go @@ -8,10 +8,10 @@ import ( "strings" "time" - C "github.com/Dreamacro/clash/constant" - _ "github.com/Dreamacro/clash/constant/mime" - "github.com/Dreamacro/clash/log" - "github.com/Dreamacro/clash/tunnel/statistic" + C "github.com/MysticalDevil/clash/constant" + _ "github.com/MysticalDevil/clash/constant/mime" + "github.com/MysticalDevil/clash/log" + "github.com/MysticalDevil/clash/tunnel/statistic" "github.com/go-chi/chi/v5" "github.com/go-chi/cors" diff --git a/listener/auth/auth.go b/listener/auth/auth.go index 7047311..2eed694 100644 --- a/listener/auth/auth.go +++ b/listener/auth/auth.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/Dreamacro/clash/component/auth" + "github.com/MysticalDevil/clash/component/auth" ) var authenticator auth.Authenticator diff --git a/listener/http/client.go b/listener/http/client.go index 873a9a3..5e35f76 100644 --- a/listener/http/client.go +++ b/listener/http/client.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - "github.com/Dreamacro/clash/adapter/inbound" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/adapter/inbound" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" ) func newClient(source net.Addr, in chan<- C.ConnContext) *http.Client { diff --git a/listener/http/proxy.go b/listener/http/proxy.go index 32701e6..8911f8b 100644 --- a/listener/http/proxy.go +++ b/listener/http/proxy.go @@ -7,12 +7,12 @@ import ( "strings" "time" - "github.com/Dreamacro/clash/adapter/inbound" - "github.com/Dreamacro/clash/common/cache" - N "github.com/Dreamacro/clash/common/net" - C "github.com/Dreamacro/clash/constant" - authStore "github.com/Dreamacro/clash/listener/auth" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/adapter/inbound" + "github.com/MysticalDevil/clash/common/cache" + N "github.com/MysticalDevil/clash/common/net" + C "github.com/MysticalDevil/clash/constant" + authStore "github.com/MysticalDevil/clash/listener/auth" + "github.com/MysticalDevil/clash/log" ) func HandleConn(c net.Conn, in chan<- C.ConnContext, cache *cache.Cache) { diff --git a/listener/http/server.go b/listener/http/server.go index bfdd9f1..ffd9dd2 100644 --- a/listener/http/server.go +++ b/listener/http/server.go @@ -4,8 +4,8 @@ import ( "net" "time" - "github.com/Dreamacro/clash/common/cache" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/common/cache" + C "github.com/MysticalDevil/clash/constant" ) type Listener struct { diff --git a/listener/http/upgrade.go b/listener/http/upgrade.go index 50cdcb0..a4af82c 100644 --- a/listener/http/upgrade.go +++ b/listener/http/upgrade.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" - "github.com/Dreamacro/clash/adapter/inbound" - N "github.com/Dreamacro/clash/common/net" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/adapter/inbound" + N "github.com/MysticalDevil/clash/common/net" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" ) func isUpgradeRequest(req *http.Request) bool { diff --git a/listener/listener.go b/listener/listener.go index b8e54b9..3b2785a 100644 --- a/listener/listener.go +++ b/listener/listener.go @@ -6,14 +6,14 @@ import ( "strconv" "sync" - "github.com/Dreamacro/clash/adapter/inbound" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/listener/http" - "github.com/Dreamacro/clash/listener/mixed" - "github.com/Dreamacro/clash/listener/redir" - "github.com/Dreamacro/clash/listener/socks" - "github.com/Dreamacro/clash/listener/tproxy" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/adapter/inbound" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/listener/http" + "github.com/MysticalDevil/clash/listener/mixed" + "github.com/MysticalDevil/clash/listener/redir" + "github.com/MysticalDevil/clash/listener/socks" + "github.com/MysticalDevil/clash/listener/tproxy" + "github.com/MysticalDevil/clash/log" ) var ( diff --git a/listener/mixed/mixed.go b/listener/mixed/mixed.go index 57fd055..f6dd891 100644 --- a/listener/mixed/mixed.go +++ b/listener/mixed/mixed.go @@ -4,13 +4,13 @@ import ( "net" "time" - "github.com/Dreamacro/clash/common/cache" - N "github.com/Dreamacro/clash/common/net" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/listener/http" - "github.com/Dreamacro/clash/listener/socks" - "github.com/Dreamacro/clash/transport/socks4" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/common/cache" + N "github.com/MysticalDevil/clash/common/net" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/listener/http" + "github.com/MysticalDevil/clash/listener/socks" + "github.com/MysticalDevil/clash/transport/socks4" + "github.com/MysticalDevil/clash/transport/socks5" ) type Listener struct { diff --git a/listener/redir/tcp.go b/listener/redir/tcp.go index 15c98a8..e3de793 100644 --- a/listener/redir/tcp.go +++ b/listener/redir/tcp.go @@ -3,8 +3,8 @@ package redir import ( "net" - "github.com/Dreamacro/clash/adapter/inbound" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/adapter/inbound" + C "github.com/MysticalDevil/clash/constant" ) type Listener struct { diff --git a/listener/redir/tcp_darwin.go b/listener/redir/tcp_darwin.go index 5a2f331..c6ecbba 100644 --- a/listener/redir/tcp_darwin.go +++ b/listener/redir/tcp_darwin.go @@ -5,7 +5,7 @@ import ( "syscall" "unsafe" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/transport/socks5" ) func parserPacket(c net.Conn) (socks5.Addr, error) { diff --git a/listener/redir/tcp_freebsd.go b/listener/redir/tcp_freebsd.go index 12c4ba6..4e08460 100644 --- a/listener/redir/tcp_freebsd.go +++ b/listener/redir/tcp_freebsd.go @@ -6,7 +6,7 @@ import ( "syscall" "unsafe" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/transport/socks5" ) const ( diff --git a/listener/redir/tcp_linux.go b/listener/redir/tcp_linux.go index c4a47d8..c538220 100644 --- a/listener/redir/tcp_linux.go +++ b/listener/redir/tcp_linux.go @@ -6,7 +6,7 @@ import ( "syscall" "unsafe" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/transport/socks5" ) const ( diff --git a/listener/redir/tcp_other.go b/listener/redir/tcp_other.go index a01550c..373130f 100644 --- a/listener/redir/tcp_other.go +++ b/listener/redir/tcp_other.go @@ -6,7 +6,7 @@ import ( "errors" "net" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/transport/socks5" ) func parserPacket(conn net.Conn) (socks5.Addr, error) { diff --git a/listener/socks/tcp.go b/listener/socks/tcp.go index 7cce32e..dc60325 100644 --- a/listener/socks/tcp.go +++ b/listener/socks/tcp.go @@ -4,12 +4,12 @@ import ( "io" "net" - "github.com/Dreamacro/clash/adapter/inbound" - N "github.com/Dreamacro/clash/common/net" - C "github.com/Dreamacro/clash/constant" - authStore "github.com/Dreamacro/clash/listener/auth" - "github.com/Dreamacro/clash/transport/socks4" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/adapter/inbound" + N "github.com/MysticalDevil/clash/common/net" + C "github.com/MysticalDevil/clash/constant" + authStore "github.com/MysticalDevil/clash/listener/auth" + "github.com/MysticalDevil/clash/transport/socks4" + "github.com/MysticalDevil/clash/transport/socks5" ) type Listener struct { diff --git a/listener/socks/udp.go b/listener/socks/udp.go index 8bc439f..fcabea7 100644 --- a/listener/socks/udp.go +++ b/listener/socks/udp.go @@ -3,12 +3,12 @@ package socks import ( "net" - "github.com/Dreamacro/clash/adapter/inbound" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/common/sockopt" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/log" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/adapter/inbound" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/common/sockopt" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/log" + "github.com/MysticalDevil/clash/transport/socks5" ) type UDPListener struct { diff --git a/listener/socks/utils.go b/listener/socks/utils.go index 28dfef7..56421fc 100644 --- a/listener/socks/utils.go +++ b/listener/socks/utils.go @@ -3,8 +3,8 @@ package socks import ( "net" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/transport/socks5" ) type packet struct { diff --git a/listener/tproxy/packet.go b/listener/tproxy/packet.go index 9299df9..b7440dc 100644 --- a/listener/tproxy/packet.go +++ b/listener/tproxy/packet.go @@ -4,7 +4,7 @@ import ( "net" "net/netip" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) type packet struct { diff --git a/listener/tproxy/tcp.go b/listener/tproxy/tcp.go index 1a09f36..5d1c512 100644 --- a/listener/tproxy/tcp.go +++ b/listener/tproxy/tcp.go @@ -3,9 +3,9 @@ package tproxy import ( "net" - "github.com/Dreamacro/clash/adapter/inbound" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/adapter/inbound" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" ) type Listener struct { diff --git a/listener/tproxy/udp.go b/listener/tproxy/udp.go index 6078356..2c4c23b 100644 --- a/listener/tproxy/udp.go +++ b/listener/tproxy/udp.go @@ -4,10 +4,10 @@ import ( "net" "net/netip" - "github.com/Dreamacro/clash/adapter/inbound" - "github.com/Dreamacro/clash/common/pool" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/adapter/inbound" + "github.com/MysticalDevil/clash/common/pool" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" ) type UDPListener struct { diff --git a/log/log.go b/log/log.go index ba706e5..63dad18 100644 --- a/log/log.go +++ b/log/log.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/Dreamacro/clash/common/observable" + "github.com/MysticalDevil/clash/common/observable" log "github.com/sirupsen/logrus" ) diff --git a/main.go b/main.go index 3adfe3d..493915c 100644 --- a/main.go +++ b/main.go @@ -9,11 +9,11 @@ import ( "runtime" "syscall" - "github.com/Dreamacro/clash/config" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/hub" - "github.com/Dreamacro/clash/hub/executor" - "github.com/Dreamacro/clash/log" + "github.com/MysticalDevil/clash/config" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/hub" + "github.com/MysticalDevil/clash/hub/executor" + "github.com/MysticalDevil/clash/log" "go.uber.org/automaxprocs/maxprocs" ) diff --git a/rule/domain.go b/rule/domain.go index 2b2a076..2d214bc 100644 --- a/rule/domain.go +++ b/rule/domain.go @@ -3,7 +3,7 @@ package rules import ( "strings" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type Domain struct { diff --git a/rule/domain_keyword.go b/rule/domain_keyword.go index 046eafe..23e1342 100644 --- a/rule/domain_keyword.go +++ b/rule/domain_keyword.go @@ -3,7 +3,7 @@ package rules import ( "strings" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type DomainKeyword struct { diff --git a/rule/domain_suffix.go b/rule/domain_suffix.go index 0921933..b862102 100644 --- a/rule/domain_suffix.go +++ b/rule/domain_suffix.go @@ -3,7 +3,7 @@ package rules import ( "strings" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type DomainSuffix struct { diff --git a/rule/final.go b/rule/final.go index 80a38f0..fe30be1 100644 --- a/rule/final.go +++ b/rule/final.go @@ -1,7 +1,7 @@ package rules import ( - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type Match struct { diff --git a/rule/geoip.go b/rule/geoip.go index 152d4e6..0bf103c 100644 --- a/rule/geoip.go +++ b/rule/geoip.go @@ -3,8 +3,8 @@ package rules import ( "strings" - "github.com/Dreamacro/clash/component/mmdb" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/component/mmdb" + C "github.com/MysticalDevil/clash/constant" ) type GEOIP struct { diff --git a/rule/ipcidr.go b/rule/ipcidr.go index 42c0c9f..d5c8609 100644 --- a/rule/ipcidr.go +++ b/rule/ipcidr.go @@ -3,7 +3,7 @@ package rules import ( "net" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type IPCIDROption func(*IPCIDR) diff --git a/rule/parser.go b/rule/parser.go index 212029b..dc00203 100644 --- a/rule/parser.go +++ b/rule/parser.go @@ -3,7 +3,7 @@ package rules import ( "fmt" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) func ParseRule(tp, payload, target string, params []string) (C.Rule, error) { diff --git a/rule/port.go b/rule/port.go index 2cc7a7a..11608b3 100644 --- a/rule/port.go +++ b/rule/port.go @@ -3,7 +3,7 @@ package rules import ( "strconv" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type Port struct { diff --git a/rule/process.go b/rule/process.go index 52f0cec..28d9bdc 100644 --- a/rule/process.go +++ b/rule/process.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type Process struct { diff --git a/test/.golangci.yaml b/test/.golangci.yaml index cfaed77..0266f90 100644 --- a/test/.golangci.yaml +++ b/test/.golangci.yaml @@ -10,7 +10,7 @@ linters-settings: gci: sections: - standard - - prefix(github.com/Dreamacro/clash) + - prefix(github.com/MysticalDevil/clash) - default staticcheck: go: '1.18' diff --git a/test/clash_test.go b/test/clash_test.go index 7c9ca05..e210f2d 100644 --- a/test/clash_test.go +++ b/test/clash_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "github.com/Dreamacro/clash/adapter/outbound" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/hub/executor" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/adapter/outbound" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/hub/executor" + "github.com/MysticalDevil/clash/transport/socks5" "github.com/docker/docker/api/types" "github.com/docker/docker/client" diff --git a/test/go.mod b/test/go.mod index 9606d99..ffe9e39 100644 --- a/test/go.mod +++ b/test/go.mod @@ -3,7 +3,7 @@ module clash-test go 1.18 require ( - github.com/Dreamacro/clash v1.10.6 + github.com/MysticalDevil/clash v1.10.6 github.com/docker/docker v20.10.17+incompatible github.com/docker/go-connections v0.4.0 github.com/miekg/dns v1.1.49 @@ -11,7 +11,7 @@ require ( golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 ) -replace github.com/Dreamacro/clash => ../ +replace github.com/MysticalDevil/clash => ../ require ( github.com/Microsoft/go-winio v0.5.2 // indirect diff --git a/test/snell_test.go b/test/snell_test.go index 4c50168..bd994a6 100644 --- a/test/snell_test.go +++ b/test/snell_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/Dreamacro/clash/adapter/outbound" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/adapter/outbound" + C "github.com/MysticalDevil/clash/constant" "github.com/docker/docker/api/types/container" "github.com/stretchr/testify/require" diff --git a/test/ss_test.go b/test/ss_test.go index 1369821..7c37229 100644 --- a/test/ss_test.go +++ b/test/ss_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/Dreamacro/clash/adapter/outbound" + "github.com/MysticalDevil/clash/adapter/outbound" "github.com/docker/docker/api/types/container" "github.com/stretchr/testify/require" diff --git a/test/trojan_test.go b/test/trojan_test.go index 95f8bd5..058099a 100644 --- a/test/trojan_test.go +++ b/test/trojan_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/Dreamacro/clash/adapter/outbound" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/adapter/outbound" + C "github.com/MysticalDevil/clash/constant" "github.com/docker/docker/api/types/container" "github.com/stretchr/testify/require" diff --git a/test/vmess_test.go b/test/vmess_test.go index 3e8d275..cad08b6 100644 --- a/test/vmess_test.go +++ b/test/vmess_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/Dreamacro/clash/adapter/outbound" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/adapter/outbound" + C "github.com/MysticalDevil/clash/constant" "github.com/docker/docker/api/types/container" "github.com/stretchr/testify/require" diff --git a/transport/gun/gun.go b/transport/gun/gun.go index 4398800..6fa15f5 100644 --- a/transport/gun/gun.go +++ b/transport/gun/gun.go @@ -17,8 +17,8 @@ import ( "sync" "time" - "github.com/Dreamacro/clash/common/pool" - C "github.com/Dreamacro/clash/constant" + "github.com/MysticalDevil/clash/common/pool" + C "github.com/MysticalDevil/clash/constant" "go.uber.org/atomic" "golang.org/x/net/http2" diff --git a/transport/shadowsocks/core/cipher.go b/transport/shadowsocks/core/cipher.go index 2f5acf6..b93c5b2 100644 --- a/transport/shadowsocks/core/cipher.go +++ b/transport/shadowsocks/core/cipher.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/Dreamacro/clash/transport/shadowsocks/shadowaead" - "github.com/Dreamacro/clash/transport/shadowsocks/shadowstream" + "github.com/MysticalDevil/clash/transport/shadowsocks/shadowaead" + "github.com/MysticalDevil/clash/transport/shadowsocks/shadowstream" ) type Cipher interface { diff --git a/transport/shadowsocks/shadowaead/packet.go b/transport/shadowsocks/shadowaead/packet.go index 7043ead..1ec698b 100644 --- a/transport/shadowsocks/shadowaead/packet.go +++ b/transport/shadowsocks/shadowaead/packet.go @@ -6,7 +6,7 @@ import ( "io" "net" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) // ErrShortPacket means that the packet is too short for a valid encrypted packet. diff --git a/transport/shadowsocks/shadowaead/stream.go b/transport/shadowsocks/shadowaead/stream.go index e92bdda..4b2d280 100644 --- a/transport/shadowsocks/shadowaead/stream.go +++ b/transport/shadowsocks/shadowaead/stream.go @@ -7,7 +7,7 @@ import ( "io" "net" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) const ( diff --git a/transport/shadowsocks/shadowstream/packet.go b/transport/shadowsocks/shadowstream/packet.go index 0b46dea..cb533c7 100644 --- a/transport/shadowsocks/shadowstream/packet.go +++ b/transport/shadowsocks/shadowstream/packet.go @@ -6,7 +6,7 @@ import ( "io" "net" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) // ErrShortPacket means the packet is too short to be a valid encrypted packet. diff --git a/transport/simple-obfs/http.go b/transport/simple-obfs/http.go index a06bad2..7419740 100644 --- a/transport/simple-obfs/http.go +++ b/transport/simple-obfs/http.go @@ -9,7 +9,7 @@ import ( "net" "net/http" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) // HTTPObfs is shadowsocks http simple-obfs implementation diff --git a/transport/simple-obfs/tls.go b/transport/simple-obfs/tls.go index 1c609c1..4a0dc22 100644 --- a/transport/simple-obfs/tls.go +++ b/transport/simple-obfs/tls.go @@ -8,7 +8,7 @@ import ( "net" "time" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) func init() { diff --git a/transport/snell/cipher.go b/transport/snell/cipher.go index 24999e2..4348773 100644 --- a/transport/snell/cipher.go +++ b/transport/snell/cipher.go @@ -4,7 +4,7 @@ import ( "crypto/aes" "crypto/cipher" - "github.com/Dreamacro/clash/transport/shadowsocks/shadowaead" + "github.com/MysticalDevil/clash/transport/shadowsocks/shadowaead" "golang.org/x/crypto/argon2" "golang.org/x/crypto/chacha20poly1305" diff --git a/transport/snell/pool.go b/transport/snell/pool.go index 54b9234..9072045 100644 --- a/transport/snell/pool.go +++ b/transport/snell/pool.go @@ -5,8 +5,8 @@ import ( "net" "time" - "github.com/Dreamacro/clash/component/pool" - "github.com/Dreamacro/clash/transport/shadowsocks/shadowaead" + "github.com/MysticalDevil/clash/component/pool" + "github.com/MysticalDevil/clash/transport/shadowsocks/shadowaead" ) type Pool struct { diff --git a/transport/snell/snell.go b/transport/snell/snell.go index c6b7a56..91f13d1 100644 --- a/transport/snell/snell.go +++ b/transport/snell/snell.go @@ -8,9 +8,9 @@ import ( "net" "sync" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/transport/shadowsocks/shadowaead" - "github.com/Dreamacro/clash/transport/socks5" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/transport/shadowsocks/shadowaead" + "github.com/MysticalDevil/clash/transport/socks5" ) const ( diff --git a/transport/socks4/socks4.go b/transport/socks4/socks4.go index a294162..2702ac1 100644 --- a/transport/socks4/socks4.go +++ b/transport/socks4/socks4.go @@ -8,7 +8,7 @@ import ( "net" "strconv" - "github.com/Dreamacro/clash/component/auth" + "github.com/MysticalDevil/clash/component/auth" ) const Version = 0x04 diff --git a/transport/socks5/socks5.go b/transport/socks5/socks5.go index 7d4f11a..195be52 100644 --- a/transport/socks5/socks5.go +++ b/transport/socks5/socks5.go @@ -9,7 +9,7 @@ import ( "net/netip" "strconv" - "github.com/Dreamacro/clash/component/auth" + "github.com/MysticalDevil/clash/component/auth" ) // Error represents a SOCKS error diff --git a/transport/ssr/obfs/http_simple.go b/transport/ssr/obfs/http_simple.go index c1ea767..f0f465f 100644 --- a/transport/ssr/obfs/http_simple.go +++ b/transport/ssr/obfs/http_simple.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) func init() { diff --git a/transport/ssr/obfs/random_head.go b/transport/ssr/obfs/random_head.go index b10b01c..20e0d25 100644 --- a/transport/ssr/obfs/random_head.go +++ b/transport/ssr/obfs/random_head.go @@ -6,7 +6,7 @@ import ( "math/rand" "net" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) func init() { diff --git a/transport/ssr/obfs/tls1.2_ticket_auth.go b/transport/ssr/obfs/tls1.2_ticket_auth.go index 10f2786..a3a9cdc 100644 --- a/transport/ssr/obfs/tls1.2_ticket_auth.go +++ b/transport/ssr/obfs/tls1.2_ticket_auth.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/transport/ssr/tools" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/transport/ssr/tools" ) func init() { diff --git a/transport/ssr/protocol/auth_aes128_md5.go b/transport/ssr/protocol/auth_aes128_md5.go index d3bc941..8887295 100644 --- a/transport/ssr/protocol/auth_aes128_md5.go +++ b/transport/ssr/protocol/auth_aes128_md5.go @@ -1,6 +1,6 @@ package protocol -import "github.com/Dreamacro/clash/transport/ssr/tools" +import "github.com/MysticalDevil/clash/transport/ssr/tools" func init() { register("auth_aes128_md5", newAuthAES128MD5, 9) diff --git a/transport/ssr/protocol/auth_aes128_sha1.go b/transport/ssr/protocol/auth_aes128_sha1.go index 7b4da96..b29f535 100644 --- a/transport/ssr/protocol/auth_aes128_sha1.go +++ b/transport/ssr/protocol/auth_aes128_sha1.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/log" - "github.com/Dreamacro/clash/transport/ssr/tools" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/log" + "github.com/MysticalDevil/clash/transport/ssr/tools" ) type ( diff --git a/transport/ssr/protocol/auth_chain_a.go b/transport/ssr/protocol/auth_chain_a.go index 6b12ab9..8bfa2dc 100644 --- a/transport/ssr/protocol/auth_chain_a.go +++ b/transport/ssr/protocol/auth_chain_a.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/log" - "github.com/Dreamacro/clash/transport/shadowsocks/core" - "github.com/Dreamacro/clash/transport/ssr/tools" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/log" + "github.com/MysticalDevil/clash/transport/shadowsocks/core" + "github.com/MysticalDevil/clash/transport/ssr/tools" ) func init() { diff --git a/transport/ssr/protocol/auth_chain_b.go b/transport/ssr/protocol/auth_chain_b.go index 857b2a3..e56bef4 100644 --- a/transport/ssr/protocol/auth_chain_b.go +++ b/transport/ssr/protocol/auth_chain_b.go @@ -4,7 +4,7 @@ import ( "net" "sort" - "github.com/Dreamacro/clash/transport/ssr/tools" + "github.com/MysticalDevil/clash/transport/ssr/tools" ) func init() { diff --git a/transport/ssr/protocol/auth_sha1_v4.go b/transport/ssr/protocol/auth_sha1_v4.go index 30392c9..db5d47d 100644 --- a/transport/ssr/protocol/auth_sha1_v4.go +++ b/transport/ssr/protocol/auth_sha1_v4.go @@ -8,8 +8,8 @@ import ( "math/rand" "net" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/transport/ssr/tools" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/transport/ssr/tools" ) func init() { diff --git a/transport/ssr/protocol/base.go b/transport/ssr/protocol/base.go index 4bf799b..ab91c21 100644 --- a/transport/ssr/protocol/base.go +++ b/transport/ssr/protocol/base.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/log" - "github.com/Dreamacro/clash/transport/shadowsocks/core" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/log" + "github.com/MysticalDevil/clash/transport/shadowsocks/core" ) type Base struct { diff --git a/transport/ssr/protocol/packet.go b/transport/ssr/protocol/packet.go index 249db70..c5c3cd2 100644 --- a/transport/ssr/protocol/packet.go +++ b/transport/ssr/protocol/packet.go @@ -3,7 +3,7 @@ package protocol import ( "net" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) type PacketConn struct { diff --git a/transport/ssr/protocol/stream.go b/transport/ssr/protocol/stream.go index 3c84615..6a247df 100644 --- a/transport/ssr/protocol/stream.go +++ b/transport/ssr/protocol/stream.go @@ -4,7 +4,7 @@ import ( "bytes" "net" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) type Conn struct { diff --git a/transport/ssr/tools/random.go b/transport/ssr/tools/random.go index 338543e..35158cf 100644 --- a/transport/ssr/tools/random.go +++ b/transport/ssr/tools/random.go @@ -3,7 +3,7 @@ package tools import ( "encoding/binary" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) // XorShift128Plus - a pseudorandom number generator diff --git a/transport/trojan/trojan.go b/transport/trojan/trojan.go index ac9f17d..ede6c24 100644 --- a/transport/trojan/trojan.go +++ b/transport/trojan/trojan.go @@ -12,10 +12,10 @@ import ( "net/http" "sync" - "github.com/Dreamacro/clash/common/pool" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/transport/socks5" - "github.com/Dreamacro/clash/transport/vmess" + "github.com/MysticalDevil/clash/common/pool" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/transport/socks5" + "github.com/MysticalDevil/clash/transport/vmess" ) const ( diff --git a/transport/v2ray-plugin/websocket.go b/transport/v2ray-plugin/websocket.go index 7591b4a..25fef84 100644 --- a/transport/v2ray-plugin/websocket.go +++ b/transport/v2ray-plugin/websocket.go @@ -5,7 +5,7 @@ import ( "net" "net/http" - "github.com/Dreamacro/clash/transport/vmess" + "github.com/MysticalDevil/clash/transport/vmess" ) // Option is options of websocket obfs diff --git a/transport/vmess/aead.go b/transport/vmess/aead.go index d4fbf2d..25fee31 100644 --- a/transport/vmess/aead.go +++ b/transport/vmess/aead.go @@ -7,7 +7,7 @@ import ( "io" "sync" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) type aeadWriter struct { diff --git a/transport/vmess/chunk.go b/transport/vmess/chunk.go index ab1adb6..be18e40 100644 --- a/transport/vmess/chunk.go +++ b/transport/vmess/chunk.go @@ -5,7 +5,7 @@ import ( "errors" "io" - "github.com/Dreamacro/clash/common/pool" + "github.com/MysticalDevil/clash/common/pool" ) const ( diff --git a/transport/vmess/tls.go b/transport/vmess/tls.go index e4f29a2..4a5241b 100644 --- a/transport/vmess/tls.go +++ b/transport/vmess/tls.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "net" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" ) type TLSConfig struct { diff --git a/tunnel/connection.go b/tunnel/connection.go index 0384e80..31c371b 100644 --- a/tunnel/connection.go +++ b/tunnel/connection.go @@ -5,10 +5,10 @@ import ( "net" "time" - N "github.com/Dreamacro/clash/common/net" - "github.com/Dreamacro/clash/common/pool" - "github.com/Dreamacro/clash/component/resolver" - C "github.com/Dreamacro/clash/constant" + N "github.com/MysticalDevil/clash/common/net" + "github.com/MysticalDevil/clash/common/pool" + "github.com/MysticalDevil/clash/component/resolver" + C "github.com/MysticalDevil/clash/constant" ) func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error { diff --git a/tunnel/statistic/tracker.go b/tunnel/statistic/tracker.go index 1f5f1f9..e077165 100644 --- a/tunnel/statistic/tracker.go +++ b/tunnel/statistic/tracker.go @@ -4,7 +4,7 @@ import ( "net" "time" - C "github.com/Dreamacro/clash/constant" + C "github.com/MysticalDevil/clash/constant" "github.com/gofrs/uuid" "go.uber.org/atomic" diff --git a/tunnel/tunnel.go b/tunnel/tunnel.go index f9e1301..7dece59 100644 --- a/tunnel/tunnel.go +++ b/tunnel/tunnel.go @@ -9,15 +9,15 @@ import ( "sync" "time" - "github.com/Dreamacro/clash/adapter/inbound" - "github.com/Dreamacro/clash/component/nat" - P "github.com/Dreamacro/clash/component/process" - "github.com/Dreamacro/clash/component/resolver" - C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/constant/provider" - icontext "github.com/Dreamacro/clash/context" - "github.com/Dreamacro/clash/log" - "github.com/Dreamacro/clash/tunnel/statistic" + "github.com/MysticalDevil/clash/adapter/inbound" + "github.com/MysticalDevil/clash/component/nat" + P "github.com/MysticalDevil/clash/component/process" + "github.com/MysticalDevil/clash/component/resolver" + C "github.com/MysticalDevil/clash/constant" + "github.com/MysticalDevil/clash/constant/provider" + icontext "github.com/MysticalDevil/clash/context" + "github.com/MysticalDevil/clash/log" + "github.com/MysticalDevil/clash/tunnel/statistic" ) var ( -- GitLab