Remaining fix after rebase upstream

amnezia-vpn · Oct 29, 2024 · 6a2cd93 · 6a2cd93
1 parent 1f2e11f
commit 6a2cd93
Show file tree

Hide file tree

Showing 39 changed files with 116 additions and 131 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -162,15 +162,15 @@ 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
 		}
 
 		os.Chmod(socketPath, 0600)
 
 		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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ import ( @@
     	"net"
     	"strings"
-    	"github.com/xtls/xray-core/common/errors"
+    	"github.com/amnezia-vpn/amnezia-xray-core/common/errors"
     )
     var (
@@ Expand Down @@