chore: code cleanup

MetaCubeX · Aug 24, 2024 · f5834dd · f5834dd
1 parent 16c95fc
commit f5834dd
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 168 deletions.
diff --git a/common/nnip/netip.go b/common/nnip/netip.go
@@ -51,3 +51,23 @@ func UnMasked(p netip.Prefix) netip.Addr {
 	}
 	return addr
 }
+
+// PrefixCompare returns an integer comparing two prefixes.
+// The result will be 0 if p == p2, -1 if p < p2, and +1 if p > p2.
+// modify from https://github.com/golang/go/issues/61642#issuecomment-1848587909
+func PrefixCompare(p, p2 netip.Prefix) int {
+	// compare by validity, address family and prefix base address
+	if c := p.Masked().Addr().Compare(p2.Masked().Addr()); c != 0 {
+		return c
+	}
+	// compare by prefix length
+	f1, f2 := p.Bits(), p2.Bits()
+	if f1 < f2 {
+		return -1
+	}
+	if f1 > f2 {
+		return 1
+	}
+	// compare by prefix address
+	return p.Addr().Compare(p2.Addr())
+}
diff --git a/hub/executor/executor.go b/hub/executor/executor.go
@@ -90,6 +90,7 @@ func ApplyConfig(cfg *config.Config, force bool) {
 		}
 	}
 
+	updateExperimental(cfg)
 	updateUsers(cfg.Users)
 	updateProxies(cfg.Proxies, cfg.Providers)
 	updateRules(cfg.Rules, cfg.SubRules, cfg.RuleProviders)
@@ -100,8 +101,6 @@ func ApplyConfig(cfg *config.Config, force bool) {
 	updateDNS(cfg.DNS, cfg.General.IPv6)
 	updateListeners(cfg.General, cfg.Listeners, force)
 	updateIPTables(cfg)
-	updateTun(cfg.General)
-	updateExperimental(cfg)
 	updateTunnels(cfg.Tunnels)
 
 	tunnel.OnInnerLoading()
@@ -186,6 +185,7 @@ func updateListeners(general *config.General, listeners map[string]C.InboundList
 	listener.ReCreateShadowSocks(general.ShadowSocksConfig, tunnel.Tunnel)
 	listener.ReCreateVmess(general.VmessConfig, tunnel.Tunnel)
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
+	listener.ReCreateTun(general.Tun, tunnel.Tunnel)
 }
 
 func updateExperimental(c *config.Config) {
@@ -343,12 +343,6 @@ func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
 	}
 
 }
-func updateTun(general *config.General) {
-	if general == nil {
-		return
-	}
-	listener.ReCreateTun(general.Tun, tunnel.Tunnel)
-}
 
 func updateSniffer(sniffer *config.Sniffer) {
 	if sniffer.Enable {

diff --git a/hub/route/configs.go b/hub/route/configs.go
@@ -62,7 +62,6 @@ type tunSchema struct {
 	DNSHijack           *[]string   `yaml:"dns-hijack" json:"dns-hijack"`
 	AutoRoute           *bool       `yaml:"auto-route" json:"auto-route"`
 	AutoDetectInterface *bool       `yaml:"auto-detect-interface" json:"auto-detect-interface"`
-	//RedirectToTun       []string   		  `yaml:"-" json:"-"`
 
 	MTU        *uint32 `yaml:"mtu" json:"mtu,omitempty"`
 	GSO        *bool   `yaml:"gso" json:"gso,omitempty"`
@@ -118,21 +117,13 @@ func getConfigs(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, general)
 }
 
-func pointerOrDefault(p *int, def int) int {
+func pointerOrDefault[T any](p *T, def T) T {
 	if p != nil {
 		return *p
 	}
 	return def
 }
 
-func pointerOrDefaultString(p *string, def string) string {
-	if p != nil {
-		return *p
-	}
-
-	return def
-}
-
 func pointerOrDefaultTun(p *tunSchema, def LC.Tun) LC.Tun {
 	if p != nil {
 		def.Enable = p.Enable
@@ -336,8 +327,8 @@ func patchConfigs(w http.ResponseWriter, r *http.Request) {
 	P.ReCreateTProxy(pointerOrDefault(general.TProxyPort, ports.TProxyPort), tunnel.Tunnel)
 	P.ReCreateMixed(pointerOrDefault(general.MixedPort, ports.MixedPort), tunnel.Tunnel)
 	P.ReCreateTun(pointerOrDefaultTun(general.Tun, P.LastTunConf), tunnel.Tunnel)
-	P.ReCreateShadowSocks(pointerOrDefaultString(general.ShadowSocksConfig, ports.ShadowSocksConfig), tunnel.Tunnel)
-	P.ReCreateVmess(pointerOrDefaultString(general.VmessConfig, ports.VmessConfig), tunnel.Tunnel)
+	P.ReCreateShadowSocks(pointerOrDefault(general.ShadowSocksConfig, ports.ShadowSocksConfig), tunnel.Tunnel)
+	P.ReCreateVmess(pointerOrDefault(general.VmessConfig, ports.VmessConfig), tunnel.Tunnel)
 	P.ReCreateTuic(pointerOrDefaultTuicServer(general.TuicServer, P.LastTuicConf), tunnel.Tunnel)
 
 	if general.Mode != nil {

diff --git a/listener/config/tun.go b/listener/config/tun.go
@@ -3,7 +3,10 @@ package config
 import (
 	"net/netip"
 
+	"github.com/metacubex/mihomo/common/nnip"
 	C "github.com/metacubex/mihomo/constant"
+
+	"golang.org/x/exp/slices"
 )
 
 func StringSliceToNetipPrefixSlice(ss []string) ([]netip.Prefix, error) {
@@ -25,7 +28,6 @@ type Tun struct {
 	DNSHijack           []string   `yaml:"dns-hijack" json:"dns-hijack"`
 	AutoRoute           bool       `yaml:"auto-route" json:"auto-route"`
 	AutoDetectInterface bool       `yaml:"auto-detect-interface" json:"auto-detect-interface"`
-	RedirectToTun       []string   `yaml:"-" json:"-"`
 
 	MTU                    uint32         `yaml:"mtu" json:"mtu,omitempty"`
 	GSO                    bool           `yaml:"gso" json:"gso,omitempty"`
@@ -60,3 +62,146 @@ type Tun struct {
 	Inet4RouteExcludeAddress []netip.Prefix `yaml:"inet4-route-exclude-address" json:"inet4-route-exclude-address,omitempty"`
 	Inet6RouteExcludeAddress []netip.Prefix `yaml:"inet6-route-exclude-address" json:"inet6-route-exclude-address,omitempty"`
 }
+
+func (t *Tun) Sort() {
+	slices.Sort(t.DNSHijack)
+
+	slices.SortFunc(t.Inet4Address, nnip.PrefixCompare)
+	slices.SortFunc(t.Inet6Address, nnip.PrefixCompare)
+	slices.SortFunc(t.RouteAddress, nnip.PrefixCompare)
+	slices.Sort(t.RouteAddressSet)
+	slices.SortFunc(t.RouteExcludeAddress, nnip.PrefixCompare)
+	slices.Sort(t.RouteExcludeAddressSet)
+	slices.Sort(t.IncludeInterface)
+	slices.Sort(t.ExcludeInterface)
+	slices.Sort(t.IncludeUID)
+	slices.Sort(t.IncludeUIDRange)
+	slices.Sort(t.ExcludeUID)
+	slices.Sort(t.ExcludeUIDRange)
+	slices.Sort(t.IncludeAndroidUser)
+	slices.Sort(t.IncludePackage)
+	slices.Sort(t.ExcludePackage)
+
+	slices.SortFunc(t.Inet4RouteAddress, nnip.PrefixCompare)
+	slices.SortFunc(t.Inet6RouteAddress, nnip.PrefixCompare)
+	slices.SortFunc(t.Inet4RouteExcludeAddress, nnip.PrefixCompare)
+	slices.SortFunc(t.Inet6RouteExcludeAddress, nnip.PrefixCompare)
+}
+
+func (t *Tun) Equal(other Tun) bool {
+	if t.Enable != other.Enable {
+		return false
+	}
+	if t.Device != other.Device {
+		return false
+	}
+	if t.Stack != other.Stack {
+		return false
+	}
+	if !slices.Equal(t.DNSHijack, other.DNSHijack) {
+		return false
+	}
+	if t.AutoRoute != other.AutoRoute {
+		return false
+	}
+	if t.AutoDetectInterface != other.AutoDetectInterface {
+		return false
+	}
+
+	if t.MTU != other.MTU {
+		return false
+	}
+	if t.GSO != other.GSO {
+		return false
+	}
+	if t.GSOMaxSize != other.GSOMaxSize {
+		return false
+	}
+	if !slices.Equal(t.Inet4Address, other.Inet4Address) {
+		return false
+	}
+	if !slices.Equal(t.Inet6Address, other.Inet6Address) {
+		return false
+	}
+	if t.IPRoute2TableIndex != other.IPRoute2TableIndex {
+		return false
+	}
+	if t.IPRoute2RuleIndex != other.IPRoute2RuleIndex {
+		return false
+	}
+	if t.AutoRedirect != other.AutoRedirect {
+		return false
+	}
+	if t.AutoRedirectInputMark != other.AutoRedirectInputMark {
+		return false
+	}
+	if t.AutoRedirectOutputMark != other.AutoRedirectOutputMark {
+		return false
+	}
+	if t.StrictRoute != other.StrictRoute {
+		return false
+	}
+	if !slices.Equal(t.RouteAddress, other.RouteAddress) {
+		return false
+	}
+	if !slices.Equal(t.RouteAddressSet, other.RouteAddressSet) {
+		return false
+	}
+	if !slices.Equal(t.RouteExcludeAddress, other.RouteExcludeAddress) {
+		return false
+	}
+	if !slices.Equal(t.RouteExcludeAddressSet, other.RouteExcludeAddressSet) {
+		return false
+	}
+	if !slices.Equal(t.IncludeInterface, other.IncludeInterface) {
+		return false
+	}
+	if !slices.Equal(t.ExcludeInterface, other.ExcludeInterface) {
+		return false
+	}
+	if !slices.Equal(t.IncludeUID, other.IncludeUID) {
+		return false
+	}
+	if !slices.Equal(t.IncludeUIDRange, other.IncludeUIDRange) {
+		return false
+	}
+	if !slices.Equal(t.ExcludeUID, other.ExcludeUID) {
+		return false
+	}
+	if !slices.Equal(t.ExcludeUIDRange, other.ExcludeUIDRange) {
+		return false
+	}
+	if !slices.Equal(t.IncludeAndroidUser, other.IncludeAndroidUser) {
+		return false
+	}
+	if !slices.Equal(t.IncludePackage, other.IncludePackage) {
+		return false
+	}
+	if !slices.Equal(t.ExcludePackage, other.ExcludePackage) {
+		return false
+	}
+	if t.EndpointIndependentNat != other.EndpointIndependentNat {
+		return false
+	}
+	if t.UDPTimeout != other.UDPTimeout {
+		return false
+	}
+	if t.FileDescriptor != other.FileDescriptor {
+		return false
+	}
+
+	if !slices.Equal(t.Inet4RouteAddress, other.Inet4RouteAddress) {
+		return false
+	}
+	if !slices.Equal(t.Inet6RouteAddress, other.Inet6RouteAddress) {
+		return false
+	}
+	if !slices.Equal(t.Inet4RouteExcludeAddress, other.Inet4RouteExcludeAddress) {
+		return false
+	}
+	if !slices.Equal(t.Inet6RouteExcludeAddress, other.Inet6RouteExcludeAddress) {
+		return false
+	}
+
+	return true
+}