diff --git a/.golangci.yaml b/.golangci.yaml index a0764585c3c9490db45a8c89e72348954a3bae0e..f99d1361b3fd32083d047e1a3655c39dab1c291e 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 6e67d5d4c1097dfefc9066c3879b1aa406b0a5c5..3912951a895e861507e3819f9f2599b549fe3dbd 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 36d7b3a27243ff19ce87911946782e6b50339e9a..0857ff0ff039a3496dc1bfa267d7a194ea1dfbbd 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 55fb4105d743f442a19e66e605e664246adf1a0a..bd3f9338f242218ef8eb00adc2ec9971b46caf29 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 23dc304afa27d5accbad5d818935404a79901b7a..b7e77fb38bcf056779a43905fa9d37e52f13fff8 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 89960cf3408ce90a1d1d6686b5b87757a4eacafe..c75edc2730a35ee22d21b8713b6eb900ca338a3d 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 e7e92211de7dc245a56047f9b9a015d29d39df78..e6ed94e2a94b2e5d6ff2e4593a9496e670d7ab4c 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 80b136cd607f4e7be8d18c87f7c34dbac20872b1..5881210986ce40926c62f3c30a893de25b539f1b 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 be717017e05cc021b0d9b51456ceb0714072c473..317db959a47900cd2e3cf1082bd7504e05d9a580 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 07577ec0eaa4b440c963cce74a8669f24c563965..6b3dfd86c0e53d3fa1f132718cee46ef31f77655 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 e9119415ec65676ea352fa5b579ae29ad7c34d1e..8d4f111af9ac6a822a2058109b353326aafe7ee9 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 4c4305f572f56dae650db1001b59726cfae10b27..02d8142c303a74c21a896d1a7899bcfa115aacbd 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 44dc705a0a6cc71bd929e64dfdee7d94a563b4c6..c3f8bb421867325427c3a9458e36e04d12033a8a 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 f475210491e7ff3d0e28e5a8999c7af3d8a46346..327f39d71e494ab24e1df16869b8724bdcd01052 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 6ed78050667735417fdb4bd040d946049d75089f..d05216074162731461bc0f2ea8a635150f74347b 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 57ef56046a7958d37514d7ff8f217bc74cbb275b..10542d1de313e31fb708ba5226ef4378e873b477 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 07f3d89d7376c613f86131e232195ede39ed1e5f..d43f9d25322567dcc02b2c5b264a59ba39995e27 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 398ee3b262fa27880200622c2e225e532904db83..1c63614c8d6a10cc6d642eaaddaa881899cc797d 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 064cd3c20fceeb281089f64681ac4bb88023a83c..32781e5c5fd54192a99af40108819820313622e1 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 b376522fa73fd9013fcfcec9bed311864b670f48..4d48aa6d123af7a1d2399b018235d58720df0b23 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 ea3681a3cf3677c8d25dbe3bdfc985af7c50939f..98ee52746442bb58ec3fdd4aa2efa0e94ed4bc40 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 758c7801a5ae1775b97de4a04fdc16474a5ca187..c8bc40e2d7de12c90f35f9b0c00d643ec14a3c51 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 9af493823dc1d327ff3a2b7c71684152c1155ac2..307ea4d008e15ce45df4134c942bddd56eedc4b1 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 380b0d06b2fbf694bd7843f358c986cd14f07a84..6e507061686928d49f93b03ebedeade509e16dc1 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 0ce957ef8fc350b6c4315fe5b752c4ba8803dbfa..7f00a13b0fbc823a5df318d9405af02d0307ca4e 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 03e6982ad5f3e0a6a92f759f87f2d52e14bbb2d4..e2b7e156bcd8f6f808e8d8b6cef67aa435b4f419 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 3975df773c7415562d1e6949e0a68bf7ab4656a9..d4ce0558fdf3d0cedaa85dc79d834fdfc56c6cd0 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 61597498ab56d56862d81bd1ecf060126644f7f4..3b5b277decf48981e4041ed96b6a9e5bc305bc8d 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 70d7107842076a74caceaf612f1d0b18677297e2..fd15695a93e48c73db56b3e9ecdb336c31694df7 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 4ee7b4867a589dfcddad5ba32cc770c26bbef547..4ff33df040de476d3a63a2657cfc2bb7d97b0f0d 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 4a7be8b1037e45bcf7fcf92b0cb7522dd73898b3..4077d8434d43ac944093e4bd24047c4a9541e94f 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 7a89ffa32291399fdd8c0e6c6ab6bc27b107e782..e1205d8cdda88919672611aa9cc3cd496c7404c6 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 887ac5cdc7d56e8b71521b683cced85b63c37bcc..d749057e20e74943d0c0f752950c2558fb783010 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 e3bc49476fae9d1562be1fd1250359f6d595e9e4..2e3f02eab00e1151cdd53c07937b3eaa2750e70b 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 4f08c317e3bec817322a3de999d60a70668c6a61..541666a18a5c7f4a2b9a2497775b5779268dc0fe 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 99a0c6add31f1f560368b6a1e182c24dbfa868d6..1e86cc55fa2a38ccfdcee1294a661fd0a50753dc 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 90a9e25b50215eb7a8c49d2e56b19f18b24c060e..a3358a131bfd7124107514a018daa9bf1fac1c71 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 b7e9f5069dd0487da15792a8f8d51c0c455692bd..70933b77b829e9966546f6de10702acc117ee832 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 57e09bb594d997f4433c76b6373f5bb21db094dd..5c3a6824dd79fd360333d807ea43e12e57043c30 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 51b2ef688e359a26128be24de082a958f7514508..b6d68b189d17e85e9f915e8d935ec5145fc58d59 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 d2b56959c32e3a41470a9de37adce12a0ebfec8e..94043ffc5e8606051461f747e0519c375ebf7419 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 98645e48274f46c1ea51ba2638ff9d3953b061ed..71bd6c1a1a9edf4d413d90ca7a28ec8b7a5d6c15 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 04bdc65cf6b75a10dfd5207952ced33dba01124e..29fd8c8f8494be23ad88ac99a15a9684c57f777d 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 c6c6873db1eefa875b890ae55858e6e233da9f73..d4a0959438d109bc66546dacf35305cbe9b91d08 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 925882bb97f85efac1b1151ecc5c9683430e6fc0..e71f7b290959870a7e014d3cc065b9578c3c882a 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 bd0346368a303755b80eebc10110ed15aeb272e9..9b07a4ce87d4225f348933c626f33be4b162dbd8 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 df2908119fb7ab9dfc9afaa87f0762ee9307d023..81e21246cf30446eefcc5fbe715082a34d225131 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 e120055d8d333dc57cfe547f752ea842b5292ca1..26ce884610019eed23aa6af61448158a6b260074 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 fbb16deca2193c4c0d02a9d4aa01c5dd523354f5..a5a6cb7f8adac81c52941761b30d6aedf1334f4f 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 f3e646463cb9e04725e17e27cf7dac7e60f98528..a591d16db7e275e68cc499665f26936e3af54819 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 1dfd0eda5251bacc42da5a55ae1be4cf14640120..f37d81af5ac8380b6d5dbb9b3aa618f5fdf32d7b 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 26a389a09ac3c83f996b5a34776493b4f21d8837..55964d7afaae24f5ee2b029a53711e5ac7d37cc3 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 7111356721ff3e87db5bb86bf5b9efc8d835bd5c..ca36b11a404c2c5f28afbf6c4c96541eede54494 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 d10e39cb9ec16a7f9a180c7731cf4f0dad6800dd..e39e5e485232f8e1edd632f9e3705c6b1afe59b8 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 8b1ed89c524148673849d07631ab45166bfd94fd..a0396532f9097e4cd73fe1952673c7831b1ad112 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 9d1a2db10083f9614ad466a8e123c26da4eeaf0e..d6f793a998d527c934113c055bb2e19a6c119d00 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 1d49552fea8f76504a0e49afc598bc311685fc07..e06b6ee5ae402428860618ebaba955f2e1497c85 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 dd7544272707c552fc410a0960b5c400f26b2f59..730a30cfebe5fb4b7a125e64a0221dbeb2f7414a 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 53bda7eac1f1d9c9e75c2c4a4a30024bd8f017e1..e1e33b6f0aa6dfc5f78cee065254279fe451dec4 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 ee0f3a9da2100f91fff7396c16f3bf6de9a8eca6..c8ce5e5f41a6afe0c7d58642932f380486a7a0d4 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 3b0051415dcf2d2d89af63c64e8976ab0f1c521b..dde3287bdf87ad8200825c7bc5c1f4b7ba4a6e9c 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 5cb1fe029514ebe935f485a115172f4da6bfca27..f690600d0876d0ed5618605ac70e839736ab73a8 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 f964cec8c5eacbb56f312057b7913c4539d5f921..d2c641d9895fcf3aaf8916b5216d094c6df88fe2 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 99c22cb1e74a33c543fdfe299d73d7ba5e42f5bd..ac2bd26aff89dda3042a22f19f0eac0e60d95b33 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 76f0f26281fe6c4a066c7a5f73a9697db3cb2dee..29a67cec377189342948d68380df33ac0694324c 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 30825a44afda6206b6599fb31886b260c67b6702..addc6b81641cb0ccbace8f2c832c895d23d1c372 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 9d0da5968fc9fc1edb146528cf8cc43a8b25ead1..6b256be471520cf08bf27909f5aeabace51e9b8f 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 cec415ac653e62917b3db580a68068892479d57b..aba9a4d93a50f4e37569bc65c70b469668f8e469 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 db903349c4cc62df733b9ae06d4194fce5f3f85d..cd12d725dcb262605ef24ddc27505f7a2d7f24f9 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 d25f5731d7761048daab831f27ecd500ef868feb..44e108fe6765fce2480e8decf9846a1820eaa2f3 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 2ee56b9988e305e88b89bbc8e145e76bbfec2958..96d4282b3ff5ca447779b80d9cf5b590e4b84774 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 dc1f86014c635ac5c511334ca9a230e591b3a4b2..81d130e19ce8c01d35b108d120c5eaf35891668b 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 471fdb5e17d0c03e86be502779f9afec2b50492e..0ecf28d55ef9febd6a0a43e9baf8ce3af6cd356f 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 48cb95eda93c5bf59bcc8ab35468f80049c91e17..f1c486c5f0f9cc3a6c4fe9613a1ce1611d240bfb 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 bfe3b42dca459673cfdf3aeece881aa92a39b32b..3507e04c862371b56ba7ee25f371f8a8df9fa444 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 0b599445a49d2b0a8c1e0fe41f3a961bdfcd6ad0..444739336f452ac4656b968e2a98c1fbdb1c5730 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 bba9e2a8080b4b6fb2411923bef721872a80c814..cb519c56f199e9f61e36f6b506724fd6fbf148aa 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 ea819b68809a67e185d36feb15be30d8a9a9efdf..7f38adde7cbfdec8cd9b70a6b0a1bdbc10ec8d95 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 d5d8f726c9b820015376e0f2b2f82ec12f378c4b..efc51fcea65df7f9f5646246ffbda2e2e3b9e9fb 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 70473114d207bf5d7d5fb159a7beb03ef65a829c..2eed694290463d93ba3c549db2fbec215c83fa78 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 873a9a3c9b3fd669c695ebf501ece9fa0e0f7243..5e35f7666ef987b7d5b7d3334e636075e7f5ae9f 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 32701e62f0d84664d0cbfbd3e44312297a68e720..8911f8b9dcbc6e42059af09049d4860623d09ea0 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 bfdd9f1b6ad22db2a1546bade677c3c91570f9d2..ffd9dd2e78b5ce4d3c6429e26cddad834dee11db 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 50cdcb0f3b87511e1deb04c585317b52005f47ac..a4af82ce8392e64ba36406a1d940c9afc6675d06 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 b8e54b9504ea9946dbcf235fa86d92d2dbcfbaee..3b2785ab772a5fd88ecc018af7a8b65bdad1ef4c 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 57fd055e05a66e44914813cfb18ebe488c9c84a6..f6dd8912d483f3d6851f386bed542df3879955d3 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 15c98a8f3a417f5b33100805a4763f8905472960..e3de79324e485860f20b35717cf637b9a53aa357 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 5a2f331c3b88a86f881a615fb30d0c4711f8f19a..c6ecbba7a053b8f4842a75c660ec73ce95031dc6 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 12c4ba6aeebe7d84766f8b7e56507e0b85fa6ddb..4e08460f782409ed86f6606fbedae5efe1203224 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 c4a47d8e9b8ad24ea39a9ed38ea00d3c3d24e8d5..c5382201bcdb067534568f8a3be2984db738ff72 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 a01550c792b2264bdc16b8f94669f0cde31da4fc..373130f91af88898f68f52352b97752414791ed4 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 7cce32eec77f267e54dc95a287b214e233c75c53..dc60325e094a8ba4489e17d271aa1909eb0e4bb9 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 8bc439fb4ce3d1d8b1335772f77bda7118391b75..fcabea750e79d61c77a58660937008f68cc06827 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 28dfef72306bc1df62cd0b57170a4f1274ace072..56421fca008f7ea803f0d591114ac97952132b34 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 9299df9dece6e3e8f6d2d9f7fcdaa2cd1a910469..b7440dc1a44efb9bb8635e842272931f9d3b5d0b 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 1a09f36632d65e6669cf81022bf98c8e37973d3a..5d1c512a3b52d857ea301da019904c011d748086 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 60783563c8250029bd4a59717980cc5be6abf9bc..2c4c23b45d9275423a33a907bfdff3d3ad43158e 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 ba706e5f6af1ab9bd0350b33c843e994e8392b2f..63dad1844616badee293dc6374b5745624b30961 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 3adfe3d42ced54f07620bf8709ade6673d2e6f5b..493915c7885cbeabbb0a82e08e1fb72eb5c6e59f 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 2b2a076bc1f49d84350f777c2cced7070e12fc66..2d214bc15b90096e19f3739728579872af86de96 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 046eafe487f64b30dbcd76c9a45f5a7a89e126a8..23e13421b996706c18ee4acc94efeec77efdbae8 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 09219338669dfa0dfe94e2d52a6abd43a7f632d0..b86210200c2dc52c7e767c013b70306b09e81427 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 80a38f0363bc6690ff3f760ab1f930428fda16c5..fe30be19c494b69958ac19320521d4a4536e305c 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 152d4e631bb5c94d490b6f2400a56dd8c12cae6f..0bf103c0dff9dcf5e095925dd29954c6a4c4253e 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 42c0c9fb7125f2bd6ba7a0dfee07941e14e87db3..d5c86092cef67d2d00c67d327ec060f6e7f632d8 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 212029bf210854bf271a57a6e9e876f69e3d3ec8..dc00203b67c47ee80f5339982102394c1cfb07dc 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 2cc7a7a22337f217fad2efbd5621572d3a908b5e..11608b3afb9114a5767cda1cc4c55b0bd01c7a91 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 52f0cec2b28c4e6a7e281de610054c5112cecdb3..28d9bdcd1c55964c3eca6d83d042edbf6b2b670f 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 cfaed7700dc510746167ee30b0e7a2589ab66852..0266f90d808ae4f585220aa44900493b22b976f0 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 7c9ca05127378ec8adeab2f3ecd260a7087cab72..e210f2d4307f0c1697243b98de4ac12ee7e8dbde 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 9606d992ef48d5b9ae8030b25f591f8dbb819946..ffe9e3952b341dff1fe0cb1c32f7e4fee100423e 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 4c50168490a85b1e0d63e7a3a4bf5dc5ee239e7a..bd994a6f1aa273a4c3a0e3549da699164141b280 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 13698210739993ee8b837bda5ea0b596435bc83e..7c37229efcefab8ef2b1dd56dc7c16e48621658e 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 95f8bd56b3f77790b153adbbfc6b4656e47771bc..058099aa698ab9a023bb519e90d96574e6633b9c 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 3e8d27591b9522bd30d4a8d83f235ba668ef8013..cad08b62ef0d060ce175ebc24331be9c1c3b14d4 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 43988004ba2f42e1ceb4e31dfe14ba8d06b365f4..6fa15f5dfcdca2b4f16bfc24b14c6f5551536d36 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 2f5acf63189b086c9ad28f9d94579fd700e7e04e..b93c5b2c6c4db02379b9cd408dfb2176ceb4b30b 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 7043ead7cb8deacfcbff29f70cf4d446bbddbf29..1ec698b5bd5cacdcc3f3f67fc9ad36955f9b06ed 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 e92bddabb32f8c06f76b3ee7db1f922f21959009..4b2d2807189b29b42b2e5fb1926e444d1baaf43f 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 0b46dea1551883c3a566d7833c7e28df65627a53..cb533c766e943651a72ddf8c21a55f8dc5dc4fbf 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 a06bad2394fee5a7193a9ec5cff75f42d7cfcf2d..7419740f10de96d624f15550c9a7fcee3c6e3d76 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 1c609c15a878781601b7b8e10518304e6db52433..4a0dc22fe17ebe889b3aa70d06dc73874670a7d9 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 24999e2837f0451fc3ce4bce904824a960012f5d..43487735dff4d1251940760efc6f101ab4723fd4 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 54b92344958106294d9b9a21abee23d659024a4d..90720450b76d76a8307ee8e44a5a1bf131f1b347 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 c6b7a569027cf3ea42e99290bd8473e4699f638e..91f13d1c1adb66a250d2c0173427cd8d4ab8dbfb 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 a29416241a17d0a6ddef8417c9e64e6cdd33c2fd..2702ac1dfd09393f19e4ab16f28844e8b8677bcb 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 7d4f11aeee30d6de3e6734c18678d36da1ee9cd6..195be52181248d0c0705bb58f683d05abe0de9c8 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 c1ea76738f9f2ac381a871c82345443d52337af7..f0f465f1414ed64c878b2d0abb77c19033cf6bbb 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 b10b01c56b77cb65cfc494a70e29fa2803e2b8c6..20e0d2544abcc14d0d4d41825d974af82a6b7313 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 10f2786addc8bd9f0166d6bbbbf818ea118ead42..a3a9cdc176a67dcca22c115f0f068015e17465f1 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 d3bc941727fc1a65e6db7be672aed8b96cc11147..8887295fcce58dcbe1f5c5b164e2db36ca90ebaf 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 7b4da962c3de24dda8390eeefe5249f4fdccc7a9..b29f535dddeae12e042a211e08354519afcd2c00 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 6b12ab9bc9dbc420c9e60ce300a4fafe54793d6d..8bfa2dc43e90c6a3e05e1b188fed6b4969a48891 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 857b2a3aa1c1ad39fce1373cab3e7584bc699ecc..e56bef44d7e0c55b3d4bb651ce1b21d4e364f57e 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 30392c9e776d7595330e4e1b78c151dced9af9f1..db5d47d20a6fc84f32ad147697c9c3c223a4e0e0 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 4bf799b3526f2658a79b444de08ff82b238b6f19..ab91c21c0a8218b0aa62cbaff459a89557c1323b 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 249db70a261afce6b8e450056a5eb848ea6309bc..c5c3cd2bed8f0951ff69092bd4b8d8517425acbe 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 3c846157a7d7646e71a73bec9f3fc03355362d85..6a247dfbd9e7f6a661b8239bf30cdc603876e8fc 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 338543ea6e5b4510ffc0aa16f4d8e3ac02b015a6..35158cf1fcba9e91acd46b92842da7d23eec6f3f 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 ac9f17dd0aadcb5816b4fbffe84c86cb4dd44b94..ede6c24943cf2afc037e505448447f49c8982090 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 7591b4a865d3715f7760973900efc319abc9f55d..25fef842c4ac65a95f5f0fe653c4f47f63e24d8e 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 d4fbf2d9bcae05a80cba79cbe79d14bcd8681c72..25fee310b612da2be5ddd2b15fe4a0d9e0864729 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 ab1adb6df29f2a264d9fffc21d6e17bd20a5e3f5..be18e408c9d27d574e1d6d3da62e67efc27f6d92 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 e4f29a2febc5f981bbb056eae083857c8ead1002..4a5241b37819936537093fc7d2d9e8378de1ee94 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 0384e805cd5bc2f3ba580e063f8d3fa542a1d69e..31c371bd9ed3ab24e65882d00c7c05f6e27e6053 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 1f5f1f9ccbba3da5f3af00d7deaa12651c4b841c..e077165573f334fcfe8adfe3869c739b993b4e85 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 f9e13016829c91d63486cbe1137592eb11c6107b..7dece59d5768c0f4d33b0143a11c24d7841b2cbe 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 (