diff --git a/app/dns/nameserver_udp.go b/app/dns/nameserver_udp.go index 700bee95686c..db4b43bd6ff3 100644 --- a/app/dns/nameserver_udp.go +++ b/app/dns/nameserver_udp.go @@ -13,7 +13,6 @@ import ( "github.com/amnezia-vpn/amnezia-xray-core/common/net" "github.com/amnezia-vpn/amnezia-xray-core/common/protocol/dns" udp_proto "github.com/amnezia-vpn/amnezia-xray-core/common/protocol/udp" - "github.com/amnezia-vpn/amnezia-xray-core/common/session" "github.com/amnezia-vpn/amnezia-xray-core/common/signal/pubsub" "github.com/amnezia-vpn/amnezia-xray-core/common/task" dns_feature "github.com/amnezia-vpn/amnezia-xray-core/features/dns" diff --git a/app/router/balancing_override.go b/app/router/balancing_override.go index 96c0aea16997..97b475c9c6cc 100644 --- a/app/router/balancing_override.go +++ b/app/router/balancing_override.go @@ -3,7 +3,7 @@ package router import ( sync "sync" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) func (r *Router) OverrideBalancer(balancer string, target string) error { diff --git a/app/router/weight.go b/app/router/weight.go index 1bba645e287f..96b4b7adac47 100644 --- a/app/router/weight.go +++ b/app/router/weight.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) type weightScaler func(value, weight float64) float64 diff --git a/common/mux/server_test.go b/common/mux/server_test.go index 4158bf46f19d..744222215134 100644 --- a/common/mux/server_test.go +++ b/common/mux/server_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - "github.com/xtls/xray-core/common" - "github.com/xtls/xray-core/common/buf" - "github.com/xtls/xray-core/common/mux" - "github.com/xtls/xray-core/common/net" - "github.com/xtls/xray-core/common/session" - "github.com/xtls/xray-core/features/routing" - "github.com/xtls/xray-core/transport" - "github.com/xtls/xray-core/transport/pipe" + "github.com/amnezia-vpn/amnezia-xray-core/common" + "github.com/amnezia-vpn/amnezia-xray-core/common/buf" + "github.com/amnezia-vpn/amnezia-xray-core/common/mux" + "github.com/amnezia-vpn/amnezia-xray-core/common/net" + "github.com/amnezia-vpn/amnezia-xray-core/common/session" + "github.com/amnezia-vpn/amnezia-xray-core/features/routing" + "github.com/amnezia-vpn/amnezia-xray-core/transport" + "github.com/amnezia-vpn/amnezia-xray-core/transport/pipe" ) func newLinkPair() (*transport.Link, *transport.Link) { diff --git a/common/net/address.go b/common/net/address.go index 1567e4d19c5e..6433898f36e5 100644 --- a/common/net/address.go +++ b/common/net/address.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) var ( diff --git a/common/net/port.go b/common/net/port.go index d4a6514c1d5c..569b9fa584bf 100644 --- a/common/net/port.go +++ b/common/net/port.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "strconv" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) // Port represents a network port in TCP and UDP protocol. diff --git a/common/protocol/user.go b/common/protocol/user.go index d6e3a1310c11..0c9a946c25a6 100644 --- a/common/protocol/user.go +++ b/common/protocol/user.go @@ -1,6 +1,6 @@ package protocol -import "github.com/xtls/xray-core/common/errors" +import "github.com/amnezia-vpn/amnezia-xray-core/common/errors" func (u *User) GetTypedAccount() (Account, error) { if u.GetAccount() == nil { diff --git a/common/retry/retry.go b/common/retry/retry.go index 50500ba41f3a..347b61a38257 100644 --- a/common/retry/retry.go +++ b/common/retry/retry.go @@ -3,7 +3,7 @@ package retry // import "github.com/amnezia-vpn/amnezia-xray-core/common/retry" import ( "time" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) var ErrRetryFailed = errors.New("all retry attempts failed") diff --git a/common/type.go b/common/type.go index 8ee8745c719d..28d66e6a0f4c 100644 --- a/common/type.go +++ b/common/type.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) // ConfigCreator is a function to create an object by a config. diff --git a/go.sum b/go.sum index fd4c0a13d718..39b5acecfca8 100644 --- a/go.sum +++ b/go.sum @@ -66,7 +66,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tevino/abool/v2 v2.1.0 h1:7w+Vf9f/5gmKT4m4qkayb33/92M+Um45F2BkHOR+L/c= github.com/tevino/abool/v2 v2.1.0/go.mod h1:+Lmlqk6bHDWHqN1cbxqhwEAwMPXgc8I1SDEamtseuXY= github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI= @@ -128,20 +127,7 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= -google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= -google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= diff --git a/infra/conf/lint.go b/infra/conf/lint.go index f8a6b38c168b..b8efbb3f96bb 100644 --- a/infra/conf/lint.go +++ b/infra/conf/lint.go @@ -1,6 +1,6 @@ package conf -import "github.com/xtls/xray-core/common/errors" +import "github.com/amnezia-vpn/amnezia-xray-core/common/errors" type ConfigureFilePostProcessingStage interface { Process(conf *Config) error diff --git a/infra/conf/loader.go b/infra/conf/loader.go index 1dc2de23bffc..b7a91a7625f1 100644 --- a/infra/conf/loader.go +++ b/infra/conf/loader.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strings" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) type ConfigCreator func() interface{} diff --git a/main/commands/all/convert/convert.go b/main/commands/all/convert/convert.go index 3543b2e9b34a..a7230e2e8604 100644 --- a/main/commands/all/convert/convert.go +++ b/main/commands/all/convert/convert.go @@ -1,7 +1,7 @@ package convert import ( - "github.com/xtls/xray-core/main/commands/base" + "github.com/amnezia-vpn/amnezia-xray-core/main/commands/base" ) // CmdConvert do config convertion diff --git a/main/commands/all/convert/json.go b/main/commands/all/convert/json.go index d20634df2f23..5bd444b0373f 100644 --- a/main/commands/all/convert/json.go +++ b/main/commands/all/convert/json.go @@ -5,10 +5,10 @@ import ( "fmt" "io" - creflect "github.com/xtls/xray-core/common/reflect" - cserial "github.com/xtls/xray-core/common/serial" - "github.com/xtls/xray-core/main/commands/base" - "github.com/xtls/xray-core/main/confloader" + creflect "github.com/amnezia-vpn/amnezia-xray-core/common/reflect" + cserial "github.com/amnezia-vpn/amnezia-xray-core/common/serial" + "github.com/amnezia-vpn/amnezia-xray-core/main/commands/base" + "github.com/amnezia-vpn/amnezia-xray-core/main/confloader" ) var cmdJson = &base.Command{ diff --git a/main/commands/all/convert/protobuf.go b/main/commands/all/convert/protobuf.go index 17d6feae4015..4147e59da03b 100644 --- a/main/commands/all/convert/protobuf.go +++ b/main/commands/all/convert/protobuf.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/xtls/xray-core/common/cmdarg" - creflect "github.com/xtls/xray-core/common/reflect" - "github.com/xtls/xray-core/core" - "github.com/xtls/xray-core/main/commands/base" + "github.com/amnezia-vpn/amnezia-xray-core/common/cmdarg" + creflect "github.com/amnezia-vpn/amnezia-xray-core/common/reflect" + "github.com/amnezia-vpn/amnezia-xray-core/core" + "github.com/amnezia-vpn/amnezia-xray-core/main/commands/base" "google.golang.org/protobuf/proto" ) diff --git a/main/confloader/confloader.go b/main/confloader/confloader.go index 315c500e24cd..dfc8985ad9b2 100644 --- a/main/confloader/confloader.go +++ b/main/confloader/confloader.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) type ( diff --git a/proxy/vless/encoding/encoding.go b/proxy/vless/encoding/encoding.go index 0fd0f33d18d3..14376be7576b 100644 --- a/proxy/vless/encoding/encoding.go +++ b/proxy/vless/encoding/encoding.go @@ -95,7 +95,7 @@ func DecodeRequestHeader(isfb bool, first *buf.Buffer, reader io.Reader, validat if request.User = validator.Get(id); request.User == nil { invalidUserIdCallback(id) - return nil, nil, isfb, newError("invalid request user id") + return nil, nil, isfb, errors.New("invalid request user id") } if isfb { diff --git a/proxy/vless/inbound/inbound.go b/proxy/vless/inbound/inbound.go index 82ee97de2739..41ba9f87fc7d 100644 --- a/proxy/vless/inbound/inbound.go +++ b/proxy/vless/inbound/inbound.go @@ -162,7 +162,7 @@ func New(ctx context.Context, config *Config, dc dns.Client, validator vless.Val listener, err := net.Listen("unix", socketPath) if err != nil { - newError("error setting up UNIX domain socket listener: %v").Base(err).AtError().WriteToLog() + errors.LogError(ctx, "error setting up UNIX domain socket listener: ", err.Error()) return nil, err } @@ -170,7 +170,7 @@ func New(ctx context.Context, config *Config, dc dns.Client, validator vless.Val handler.unixListener = listener - go handler.acceptUnixSocketClients() + go handler.acceptUnixSocketClients(ctx) } return handler, nil @@ -256,7 +256,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s err = errors.New("fallback directly") } else { notifyInvalidUserIdCallback := func(userId uuid.UUID) { - h.notifyUnknownUserAttempt(connection, userId) + h.notifyUnknownUserAttempt(ctx, connection, userId) } request, requestAddons, isfb, err = encoding.DecodeRequestHeader(isfb, first, reader, h.validator, notifyInvalidUserIdCallback) } @@ -635,24 +635,24 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s return nil } -func (h *Handler) acceptUnixSocketClients() { +func (h *Handler) acceptUnixSocketClients(ctx context.Context) { for { conn, err := h.unixListener.Accept() if err != nil { - newError("error accepting UNIX socket connection: %v").Base(err).AtDebug().WriteToLog() + errors.LogDebug(ctx, "error accepting UNIX socket connection: ", err.Error()) continue } - newError("connected notifications UNIX socket").AtDebug().WriteToLog() + errors.LogDebug(ctx, "connected notifications UNIX socket") h.clientMutex.Lock() h.clientConnections[conn] = struct{}{} h.clientMutex.Unlock() - go h.handleUnixSocketClient(conn) + go h.handleUnixSocketClient(ctx, conn) } } -func (h *Handler) handleUnixSocketClient(conn net.Conn) { +func (h *Handler) handleUnixSocketClient(ctx context.Context, conn net.Conn) { defer conn.Close() buffer := make([]byte, 1) @@ -665,13 +665,13 @@ func (h *Handler) handleUnixSocketClient(conn net.Conn) { h.clientMutex.Unlock() return } - newError("error reading from client: %v").Base(err).AtError().WriteToLog() + errors.LogError(ctx, "error reading from client: ", err.Error()) return } } } -func (h *Handler) notifyUnknownUserAttempt(conn net.Conn, attemptedUUID uuid.UUID) { +func (h *Handler) notifyUnknownUserAttempt(ctx context.Context, conn net.Conn, attemptedUUID uuid.UUID) { attemptedUUIDStr := attemptedUUID.String() currentTime := time.Now() h.notificationMutex.Lock() @@ -704,7 +704,7 @@ func (h *Handler) notifyUnknownUserAttempt(conn net.Conn, attemptedUUID uuid.UUI data, err := proto.Marshal(attempt) if err != nil { - newError("error marshalling protobuf message: %v").Base(err).AtError().WriteToLog() + errors.LogError(ctx, "error marshalling protobuf message: ", err.Error()) return } lengthBuf := make([]byte, 4) @@ -715,10 +715,10 @@ func (h *Handler) notifyUnknownUserAttempt(conn net.Conn, attemptedUUID uuid.UUI defer h.clientMutex.Unlock() for clientConn := range h.clientConnections { - newError("writing data to UNIX socket client connection").AtDebug().WriteToLog() + errors.LogDebug(ctx, "writing data to UNIX socket client connection") _, err := clientConn.Write(message) if err != nil { - newError("error writing to client: %v").Base(err).AtError().WriteToLog() + errors.LogError(ctx, "error writing to client: ", err.Error()) clientConn.Close() delete(h.clientConnections, clientConn) } diff --git a/proxy/wireguard/config.go b/proxy/wireguard/config.go index 8995f35eb371..f0b3d6d4b22d 100644 --- a/proxy/wireguard/config.go +++ b/proxy/wireguard/config.go @@ -3,7 +3,7 @@ package wireguard import ( "context" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) func (c *DeviceConfig) preferIP4() bool { diff --git a/testing/scenarios/wireguard_test.go b/testing/scenarios/wireguard_test.go index deaee114ce7a..f573c48c8934 100644 --- a/testing/scenarios/wireguard_test.go +++ b/testing/scenarios/wireguard_test.go @@ -4,19 +4,19 @@ import ( "testing" //"time" - "github.com/xtls/xray-core/app/log" - "github.com/xtls/xray-core/app/proxyman" - "github.com/xtls/xray-core/common" - clog "github.com/xtls/xray-core/common/log" - "github.com/xtls/xray-core/common/net" - "github.com/xtls/xray-core/common/serial" - core "github.com/xtls/xray-core/core" - "github.com/xtls/xray-core/infra/conf" - "github.com/xtls/xray-core/proxy/dokodemo" - "github.com/xtls/xray-core/proxy/freedom" - "github.com/xtls/xray-core/proxy/wireguard" - "github.com/xtls/xray-core/testing/servers/tcp" - "github.com/xtls/xray-core/testing/servers/udp" + "github.com/amnezia-vpn/amnezia-xray-core/app/log" + "github.com/amnezia-vpn/amnezia-xray-core/app/proxyman" + "github.com/amnezia-vpn/amnezia-xray-core/common" + clog "github.com/amnezia-vpn/amnezia-xray-core/common/log" + "github.com/amnezia-vpn/amnezia-xray-core/common/net" + "github.com/amnezia-vpn/amnezia-xray-core/common/serial" + core "github.com/amnezia-vpn/amnezia-xray-core/core" + "github.com/amnezia-vpn/amnezia-xray-core/infra/conf" + "github.com/amnezia-vpn/amnezia-xray-core/proxy/dokodemo" + "github.com/amnezia-vpn/amnezia-xray-core/proxy/freedom" + "github.com/amnezia-vpn/amnezia-xray-core/proxy/wireguard" + "github.com/amnezia-vpn/amnezia-xray-core/testing/servers/tcp" + "github.com/amnezia-vpn/amnezia-xray-core/testing/servers/udp" //"golang.org/x/sync/errgroup" ) diff --git a/transport/internet/browser_dialer/dialer.go b/transport/internet/browser_dialer/dialer.go index 3f85f6a6684f..3948bd59c358 100644 --- a/transport/internet/browser_dialer/dialer.go +++ b/transport/internet/browser_dialer/dialer.go @@ -8,10 +8,10 @@ import ( "net/http" "time" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/platform" + "github.com/amnezia-vpn/amnezia-xray-core/common/uuid" "github.com/gorilla/websocket" - "github.com/xtls/xray-core/common/errors" - "github.com/xtls/xray-core/common/platform" - "github.com/xtls/xray-core/common/uuid" ) //go:embed dialer.html diff --git a/transport/internet/filelocker_other.go b/transport/internet/filelocker_other.go index 36d937c1349d..3360439ec682 100644 --- a/transport/internet/filelocker_other.go +++ b/transport/internet/filelocker_other.go @@ -7,7 +7,7 @@ import ( "context" "os" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" "golang.org/x/sys/unix" ) diff --git a/transport/internet/httpupgrade/httpupgrade_test.go b/transport/internet/httpupgrade/httpupgrade_test.go index a8108fe6ec8d..75b9d4d792c9 100644 --- a/transport/internet/httpupgrade/httpupgrade_test.go +++ b/transport/internet/httpupgrade/httpupgrade_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - "github.com/xtls/xray-core/common" - "github.com/xtls/xray-core/common/net" - "github.com/xtls/xray-core/common/protocol/tls/cert" - "github.com/xtls/xray-core/testing/servers/tcp" - "github.com/xtls/xray-core/transport/internet" - . "github.com/xtls/xray-core/transport/internet/httpupgrade" - "github.com/xtls/xray-core/transport/internet/stat" - "github.com/xtls/xray-core/transport/internet/tls" + "github.com/amnezia-vpn/amnezia-xray-core/common" + "github.com/amnezia-vpn/amnezia-xray-core/common/net" + "github.com/amnezia-vpn/amnezia-xray-core/common/protocol/tls/cert" + "github.com/amnezia-vpn/amnezia-xray-core/testing/servers/tcp" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet" + . "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/httpupgrade" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/stat" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/tls" ) func Test_listenHTTPUpgradeAndDial(t *testing.T) { diff --git a/transport/internet/sockopt_freebsd.go b/transport/internet/sockopt_freebsd.go index 4d490a40b5c1..d8ee1c49b0d4 100644 --- a/transport/internet/sockopt_freebsd.go +++ b/transport/internet/sockopt_freebsd.go @@ -7,7 +7,7 @@ import ( "syscall" "unsafe" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" "golang.org/x/sys/unix" ) diff --git a/transport/internet/sockopt_linux.go b/transport/internet/sockopt_linux.go index c05d7aa80902..1006d995269b 100644 --- a/transport/internet/sockopt_linux.go +++ b/transport/internet/sockopt_linux.go @@ -5,7 +5,7 @@ import ( "strconv" "syscall" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" "golang.org/x/sys/unix" ) diff --git a/transport/internet/sockopt_windows.go b/transport/internet/sockopt_windows.go index c7a79bb607c3..3c7a97a997b5 100644 --- a/transport/internet/sockopt_windows.go +++ b/transport/internet/sockopt_windows.go @@ -6,7 +6,7 @@ import ( "syscall" "unsafe" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) const ( diff --git a/transport/internet/splithttp/browser_client.go b/transport/internet/splithttp/browser_client.go index 8a23682e3d44..937459ee8823 100644 --- a/transport/internet/splithttp/browser_client.go +++ b/transport/internet/splithttp/browser_client.go @@ -6,8 +6,8 @@ import ( "io/ioutil" gonet "net" - "github.com/xtls/xray-core/transport/internet/browser_dialer" - "github.com/xtls/xray-core/transport/internet/websocket" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/browser_dialer" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/websocket" ) // implements splithttp.DialerClient in terms of browser dialer diff --git a/transport/internet/splithttp/client.go b/transport/internet/splithttp/client.go index 3f278aa76c42..9379e358e901 100644 --- a/transport/internet/splithttp/client.go +++ b/transport/internet/splithttp/client.go @@ -10,10 +10,10 @@ import ( "net/http/httptrace" "sync" - "github.com/xtls/xray-core/common" - "github.com/xtls/xray-core/common/errors" - "github.com/xtls/xray-core/common/net" - "github.com/xtls/xray-core/common/signal/done" + "github.com/amnezia-vpn/amnezia-xray-core/common" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/net" + "github.com/amnezia-vpn/amnezia-xray-core/common/signal/done" ) // interface to abstract between use of browser dialer, vs net/http diff --git a/transport/internet/splithttp/config.go b/transport/internet/splithttp/config.go index eb32adf7542e..051df53316a4 100644 --- a/transport/internet/splithttp/config.go +++ b/transport/internet/splithttp/config.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "github.com/xtls/xray-core/common" - "github.com/xtls/xray-core/transport/internet" + "github.com/amnezia-vpn/amnezia-xray-core/common" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet" ) func (c *Config) GetNormalizedPath() string { diff --git a/transport/internet/splithttp/config.proto b/transport/internet/splithttp/config.proto index 249f1e9363aa..094344edabfb 100644 --- a/transport/internet/splithttp/config.proto +++ b/transport/internet/splithttp/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package xray.transport.internet.splithttp; option csharp_namespace = "Xray.Transport.Internet.SplitHttp"; -option go_package = "github.com/xtls/xray-core/transport/internet/splithttp"; +option go_package = "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/splithttp"; option java_package = "com.xray.transport.internet.splithttp"; option java_multiple_files = true; diff --git a/transport/internet/splithttp/config_test.go b/transport/internet/splithttp/config_test.go index 39c3fd95aba7..97c658bebc12 100644 --- a/transport/internet/splithttp/config_test.go +++ b/transport/internet/splithttp/config_test.go @@ -3,7 +3,7 @@ package splithttp_test import ( "testing" - . "github.com/xtls/xray-core/transport/internet/splithttp" + . "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/splithttp" ) func Test_GetNormalizedPath(t *testing.T) { diff --git a/transport/internet/splithttp/dialer.go b/transport/internet/splithttp/dialer.go index 60f8c6289cda..627c718f93d8 100644 --- a/transport/internet/splithttp/dialer.go +++ b/transport/internet/splithttp/dialer.go @@ -9,19 +9,19 @@ import ( "sync" "time" + "github.com/amnezia-vpn/amnezia-xray-core/common" + "github.com/amnezia-vpn/amnezia-xray-core/common/buf" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/net" + "github.com/amnezia-vpn/amnezia-xray-core/common/signal/semaphore" + "github.com/amnezia-vpn/amnezia-xray-core/common/uuid" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/browser_dialer" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/stat" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/tls" + "github.com/amnezia-vpn/amnezia-xray-core/transport/pipe" "github.com/quic-go/quic-go" "github.com/quic-go/quic-go/http3" - "github.com/xtls/xray-core/common" - "github.com/xtls/xray-core/common/buf" - "github.com/xtls/xray-core/common/errors" - "github.com/xtls/xray-core/common/net" - "github.com/xtls/xray-core/common/signal/semaphore" - "github.com/xtls/xray-core/common/uuid" - "github.com/xtls/xray-core/transport/internet" - "github.com/xtls/xray-core/transport/internet/browser_dialer" - "github.com/xtls/xray-core/transport/internet/stat" - "github.com/xtls/xray-core/transport/internet/tls" - "github.com/xtls/xray-core/transport/pipe" "golang.org/x/net/http2" ) diff --git a/transport/internet/splithttp/hub.go b/transport/internet/splithttp/hub.go index 4545db644a2f..4230a4e5db82 100644 --- a/transport/internet/splithttp/hub.go +++ b/transport/internet/splithttp/hub.go @@ -11,16 +11,16 @@ import ( "sync" "time" + "github.com/amnezia-vpn/amnezia-xray-core/common" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/net" + http_proto "github.com/amnezia-vpn/amnezia-xray-core/common/protocol/http" + "github.com/amnezia-vpn/amnezia-xray-core/common/signal/done" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/stat" + v2tls "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/tls" "github.com/quic-go/quic-go" "github.com/quic-go/quic-go/http3" - "github.com/xtls/xray-core/common" - "github.com/xtls/xray-core/common/errors" - "github.com/xtls/xray-core/common/net" - http_proto "github.com/xtls/xray-core/common/protocol/http" - "github.com/xtls/xray-core/common/signal/done" - "github.com/xtls/xray-core/transport/internet" - "github.com/xtls/xray-core/transport/internet/stat" - v2tls "github.com/xtls/xray-core/transport/internet/tls" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" ) diff --git a/transport/internet/splithttp/mux.go b/transport/internet/splithttp/mux.go index 83ab25b0a4f6..3005c617f5e2 100644 --- a/transport/internet/splithttp/mux.go +++ b/transport/internet/splithttp/mux.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "time" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) type muxResource struct { diff --git a/transport/internet/splithttp/mux_test.go b/transport/internet/splithttp/mux_test.go index e59eff0e05c6..7263cdf4d1c4 100644 --- a/transport/internet/splithttp/mux_test.go +++ b/transport/internet/splithttp/mux_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - . "github.com/xtls/xray-core/transport/internet/splithttp" + . "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/splithttp" ) type fakeRoundTripper struct{} diff --git a/transport/internet/splithttp/splithttp_test.go b/transport/internet/splithttp/splithttp_test.go index b01727e03412..24be225ba9af 100644 --- a/transport/internet/splithttp/splithttp_test.go +++ b/transport/internet/splithttp/splithttp_test.go @@ -12,17 +12,17 @@ import ( "testing" "time" + "github.com/amnezia-vpn/amnezia-xray-core/common" + "github.com/amnezia-vpn/amnezia-xray-core/common/buf" + "github.com/amnezia-vpn/amnezia-xray-core/common/net" + "github.com/amnezia-vpn/amnezia-xray-core/common/protocol/tls/cert" + "github.com/amnezia-vpn/amnezia-xray-core/testing/servers/tcp" + "github.com/amnezia-vpn/amnezia-xray-core/testing/servers/udp" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet" + . "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/splithttp" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/stat" + "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/tls" "github.com/google/go-cmp/cmp" - "github.com/xtls/xray-core/common" - "github.com/xtls/xray-core/common/buf" - "github.com/xtls/xray-core/common/net" - "github.com/xtls/xray-core/common/protocol/tls/cert" - "github.com/xtls/xray-core/testing/servers/tcp" - "github.com/xtls/xray-core/testing/servers/udp" - "github.com/xtls/xray-core/transport/internet" - . "github.com/xtls/xray-core/transport/internet/splithttp" - "github.com/xtls/xray-core/transport/internet/stat" - "github.com/xtls/xray-core/transport/internet/tls" "golang.org/x/net/http2" ) diff --git a/transport/internet/splithttp/upload_queue.go b/transport/internet/splithttp/upload_queue.go index 9ac38f8b17a4..844a22ab2520 100644 --- a/transport/internet/splithttp/upload_queue.go +++ b/transport/internet/splithttp/upload_queue.go @@ -8,7 +8,7 @@ import ( "io" "sync" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) type Packet struct { diff --git a/transport/internet/splithttp/upload_queue_test.go b/transport/internet/splithttp/upload_queue_test.go index 8185cd8f9ea1..52ca0f14400b 100644 --- a/transport/internet/splithttp/upload_queue_test.go +++ b/transport/internet/splithttp/upload_queue_test.go @@ -3,8 +3,8 @@ package splithttp_test import ( "testing" - "github.com/xtls/xray-core/common" - . "github.com/xtls/xray-core/transport/internet/splithttp" + "github.com/amnezia-vpn/amnezia-xray-core/common" + . "github.com/amnezia-vpn/amnezia-xray-core/transport/internet/splithttp" ) func Test_regression_readzero(t *testing.T) { diff --git a/transport/internet/tls/config_other.go b/transport/internet/tls/config_other.go index daaf39c755bf..1254199db4ba 100644 --- a/transport/internet/tls/config_other.go +++ b/transport/internet/tls/config_other.go @@ -7,7 +7,7 @@ import ( "crypto/x509" "sync" - "github.com/xtls/xray-core/common/errors" + "github.com/amnezia-vpn/amnezia-xray-core/common/errors" ) type rootCertsCache struct {