From 6a89cc15c37dd6fef94efabdbfd23708beefc64e Mon Sep 17 00:00:00 2001 From: wwqgtxx Date: Sat, 18 Feb 2023 13:32:26 +0800 Subject: [PATCH] chore: Considering remove GOAMD64=v2 of linux-amd64-compatible close https://github.com/MetaCubeX/Clash.Meta/issues/391 --- Makefile | 6 +++--- listener/tproxy/packet.go | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b1ee532f..f7a637a9 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ darwin-amd64: GOARCH=amd64 GOOS=darwin GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ darwin-amd64-compatible: - GOARCH=amd64 GOOS=darwin GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ + GOARCH=amd64 GOOS=darwin GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ darwin-arm64: GOARCH=arm64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ @@ -69,7 +69,7 @@ linux-amd64: GOARCH=amd64 GOOS=linux GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ linux-amd64-compatible: - GOARCH=amd64 GOOS=linux GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ + GOARCH=amd64 GOOS=linux GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ linux-arm64: GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ @@ -120,7 +120,7 @@ windows-amd64: GOARCH=amd64 GOOS=windows GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe windows-amd64-compatible: - GOARCH=amd64 GOOS=windows GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe + GOARCH=amd64 GOOS=windows GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe windows-arm64: GOARCH=arm64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe diff --git a/listener/tproxy/packet.go b/listener/tproxy/packet.go index e3a20414..2a274f61 100644 --- a/listener/tproxy/packet.go +++ b/listener/tproxy/packet.go @@ -3,12 +3,13 @@ package tproxy import ( "errors" "fmt" + "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/log" - "net" - "net/netip" ) type packet struct {