chore: bump version to 2.2.0

openwrt/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UA3F
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
 
 # PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

openwrt/files/luci/view/ua3f/version.htm

@@ -1,6 +1,6 @@
 <span style="display: inline-flex;">
     <a href="https://github.com/SunBK201/UA3F" target="_blank">
-        Version: <span id="ua3f-current-version">2.1.1</span>
+        Version: <span id="ua3f-current-version">2.2.0</span>
     </a>
     <span id="ua3f-update-status" style="margin-left: 10px;"></span>
 </span>

scripts/build.sh

@@ -8,7 +8,7 @@
 set -e
 
 project_name="ua3f"
-release_version="2.1.1"
+release_version="2.2.0"
 target=main.go
 
 LINUX_ARCHS="amd64 arm arm64 mipsle mips64 riscv64 386 mipsle-softfloat mipsle-hardfloat armv7 armv8"

scripts/ipkg/CONTROL/control

@@ -1,5 +1,5 @@
 Package: ua3f
-Version: 2.1.1-1
+Version: 2.2.0-1
 Depends: luci-compat, ipset, iptables, iptables-mod-tproxy, iptables-mod-extra, iptables-mod-ipopt, iptables-mod-nfqueue, iptables-mod-conntrack-extra, kmod-nf-conntrack-netlink
 Source: /feed/openwrt
 SourceName: UA3F

scripts/ipkg/CONTROL/control-e

@@ -1,5 +1,5 @@
 Package: ua3f
-Version: 2.1.1-1
+Version: 2.2.0-1
 Depends: luci-compat, ipset, iptables, iptables-mod-tproxy, iptables-mod-extra, iptables-mod-ipopt, iptables-mod-nfqueue, iptables-mod-conntrack-extra, kmod-nf-conntrack-netlink
 Source: /feed/openwrt
 SourceName: UA3F

src/internal/netfilter/firewall.go

@@ -29,7 +29,6 @@ const (
 	FAKEIP_RANGE = "198.18.0.0/16,198.18.0.1/15,28.0.0.1/8"
 	HELPER_QUEUE = 10301
 	DESYNC_QUEUE = 10901
-	SO_MARK      = 0xc9
 )
 
 const (

src/internal/server/base/tcp.go

@@ -7,6 +7,8 @@ import (
 	"net"
 )
 
+const SO_MARK = 0xc9
+
 func Connect(addr string, mark int) (target net.Conn, err error) {
 	if target, err = net.Dial("tcp", addr); err != nil {
 		return nil, fmt.Errorf("net.Dial: %v", err)

src/internal/server/base/tcp_linux.go

@@ -11,6 +11,8 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+const SO_MARK = 0xc9
+
 // Connect dials the target address with SO_MARK set and returns the connection.
 func Connect(addr string, mark int) (target net.Conn, err error) {
 	dialer := net.Dialer{

src/internal/server/http/http.go

@@ -10,7 +10,6 @@ import (
 	"github.com/hashicorp/golang-lru/v2/expirable"
 	"github.com/sunbk201/ua3f/internal/config"
 	"github.com/sunbk201/ua3f/internal/log"
-	"github.com/sunbk201/ua3f/internal/netfilter"
 	"github.com/sunbk201/ua3f/internal/rewrite"
 	"github.com/sunbk201/ua3f/internal/rule"
 	"github.com/sunbk201/ua3f/internal/server/base"
@@ -31,7 +30,7 @@ func New(cfg *config.Config, rw *rewrite.Rewriter, rc *statistics.Recorder) *Ser
 			Recorder: rc,
 			Cache:    expirable.NewLRU[string, struct{}](1024, nil, 30*time.Minute),
 		},
-		so_mark: netfilter.SO_MARK,
+		so_mark: base.SO_MARK,
 	}
 }
 

src/internal/server/redirect/redirect_linux.go

@@ -35,7 +35,7 @@ func New(cfg *config.Config, rw *rewrite.Rewriter, rc *statistics.Recorder) *Ser
 			Cache:      expirable.NewLRU[string, struct{}](1024, nil, 30*time.Minute),
 			SkipIpChan: make(chan *net.IP, 512),
 		},
-		so_mark: netfilter.SO_MARK,
+		so_mark: base.SO_MARK,
 	}
 	s.Firewall = netfilter.Firewall{
 		Nftable: &knftables.Table{

src/internal/server/socks5/socks5.go

@@ -12,7 +12,6 @@ import (
 	"github.com/hashicorp/golang-lru/v2/expirable"
 	"github.com/luyuhuang/subsocks/socks"
 	"github.com/sunbk201/ua3f/internal/config"
-	"github.com/sunbk201/ua3f/internal/netfilter"
 	"github.com/sunbk201/ua3f/internal/rewrite"
 	"github.com/sunbk201/ua3f/internal/server/base"
 	"github.com/sunbk201/ua3f/internal/statistics"
@@ -32,7 +31,7 @@ func New(cfg *config.Config, rw *rewrite.Rewriter, rc *statistics.Recorder) *Ser
 			Recorder: rc,
 			Cache:    expirable.NewLRU[string, struct{}](1024, nil, 30*time.Minute),
 		},
-		so_mark: netfilter.SO_MARK,
+		so_mark: base.SO_MARK,
 	}
 }
 

src/internal/server/tproxy/tproxy_linux.go

@@ -41,7 +41,7 @@ func New(cfg *config.Config, rw *rewrite.Rewriter, rc *statistics.Recorder) *Ser
 			Cache:      expirable.NewLRU[string, struct{}](1024, nil, 30*time.Minute),
 			SkipIpChan: make(chan *net.IP, 512),
 		},
-		so_mark:          netfilter.SO_MARK,
+		so_mark:          base.SO_MARK,
 		tproxyFwMark:     "0x1c9",
 		tproxyRouteTable: "0x1c9",
 		ignoreMark: []string{