Skip to content

Commit f5834dd

Browse files
wwqgtxxwwqgtxx
committed
chore: code cleanup
1 parent 16c95fc commit f5834dd

File tree

5 files changed

+185
-168
lines changed

5 files changed

+185
-168
lines changed

‎common/nnip/netip.go

+20
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,23 @@ func UnMasked(p netip.Prefix) netip.Addr {
5151
}
5252
return addr
5353
}
54+
55+
// PrefixCompare returns an integer comparing two prefixes.
56+
// The result will be 0 if p == p2, -1 if p < p2, and +1 if p > p2.
57+
// modify from https://github.com/golang/go/issues/61642#issuecomment-1848587909
58+
func PrefixCompare(p, p2 netip.Prefix) int {
59+
// compare by validity, address family and prefix base address
60+
if c := p.Masked().Addr().Compare(p2.Masked().Addr()); c != 0 {
61+
return c
62+
}
63+
// compare by prefix length
64+
f1, f2 := p.Bits(), p2.Bits()
65+
if f1 < f2 {
66+
return -1
67+
}
68+
if f1 > f2 {
69+
return 1
70+
}
71+
// compare by prefix address
72+
return p.Addr().Compare(p2.Addr())
73+
}

‎hub/executor/executor.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ func ApplyConfig(cfg *config.Config, force bool) {
9090
}
9191
}
9292

93+
updateExperimental(cfg)
9394
updateUsers(cfg.Users)
9495
updateProxies(cfg.Proxies, cfg.Providers)
9596
updateRules(cfg.Rules, cfg.SubRules, cfg.RuleProviders)
@@ -100,8 +101,6 @@ func ApplyConfig(cfg *config.Config, force bool) {
100101
updateDNS(cfg.DNS, cfg.General.IPv6)
101102
updateListeners(cfg.General, cfg.Listeners, force)
102103
updateIPTables(cfg)
103-
updateTun(cfg.General)
104-
updateExperimental(cfg)
105104
updateTunnels(cfg.Tunnels)
106105

107106
tunnel.OnInnerLoading()
@@ -186,6 +185,7 @@ func updateListeners(general *config.General, listeners map[string]C.InboundList
186185
listener.ReCreateShadowSocks(general.ShadowSocksConfig, tunnel.Tunnel)
187186
listener.ReCreateVmess(general.VmessConfig, tunnel.Tunnel)
188187
listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
188+
listener.ReCreateTun(general.Tun, tunnel.Tunnel)
189189
}
190190

191191
func updateExperimental(c *config.Config) {
@@ -343,12 +343,6 @@ func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
343343
}
344344

345345
}
346-
func updateTun(general *config.General) {
347-
if general == nil {
348-
return
349-
}
350-
listener.ReCreateTun(general.Tun, tunnel.Tunnel)
351-
}
352346

353347
func updateSniffer(sniffer *config.Sniffer) {
354348
if sniffer.Enable {

‎hub/route/configs.go

+3-12
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ type tunSchema struct {
6262
DNSHijack *[]string `yaml:"dns-hijack" json:"dns-hijack"`
6363
AutoRoute *bool `yaml:"auto-route" json:"auto-route"`
6464
AutoDetectInterface *bool `yaml:"auto-detect-interface" json:"auto-detect-interface"`
65-
//RedirectToTun []string `yaml:"-" json:"-"`
6665

6766
MTU *uint32 `yaml:"mtu" json:"mtu,omitempty"`
6867
GSO *bool `yaml:"gso" json:"gso,omitempty"`
@@ -118,21 +117,13 @@ func getConfigs(w http.ResponseWriter, r *http.Request) {
118117
render.JSON(w, r, general)
119118
}
120119

121-
func pointerOrDefault(p *int, def int) int {
120+
func pointerOrDefault[T any](p *T, def T) T {
122121
if p != nil {
123122
return *p
124123
}
125124
return def
126125
}
127126

128-
func pointerOrDefaultString(p *string, def string) string {
129-
if p != nil {
130-
return *p
131-
}
132-
133-
return def
134-
}
135-
136127
func pointerOrDefaultTun(p *tunSchema, def LC.Tun) LC.Tun {
137128
if p != nil {
138129
def.Enable = p.Enable
@@ -336,8 +327,8 @@ func patchConfigs(w http.ResponseWriter, r *http.Request) {
336327
P.ReCreateTProxy(pointerOrDefault(general.TProxyPort, ports.TProxyPort), tunnel.Tunnel)
337328
P.ReCreateMixed(pointerOrDefault(general.MixedPort, ports.MixedPort), tunnel.Tunnel)
338329
P.ReCreateTun(pointerOrDefaultTun(general.Tun, P.LastTunConf), tunnel.Tunnel)
339-
P.ReCreateShadowSocks(pointerOrDefaultString(general.ShadowSocksConfig, ports.ShadowSocksConfig), tunnel.Tunnel)
340-
P.ReCreateVmess(pointerOrDefaultString(general.VmessConfig, ports.VmessConfig), tunnel.Tunnel)
330+
P.ReCreateShadowSocks(pointerOrDefault(general.ShadowSocksConfig, ports.ShadowSocksConfig), tunnel.Tunnel)
331+
P.ReCreateVmess(pointerOrDefault(general.VmessConfig, ports.VmessConfig), tunnel.Tunnel)
341332
P.ReCreateTuic(pointerOrDefaultTuicServer(general.TuicServer, P.LastTuicConf), tunnel.Tunnel)
342333

343334
if general.Mode != nil {

‎listener/config/tun.go

+146-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ package config
33
import (
44
"net/netip"
55

6+
"github.com/metacubex/mihomo/common/nnip"
67
C "github.com/metacubex/mihomo/constant"
8+
9+
"golang.org/x/exp/slices"
710
)
811

912
func StringSliceToNetipPrefixSlice(ss []string) ([]netip.Prefix, error) {
@@ -25,7 +28,6 @@ type Tun struct {
2528
DNSHijack []string `yaml:"dns-hijack" json:"dns-hijack"`
2629
AutoRoute bool `yaml:"auto-route" json:"auto-route"`
2730
AutoDetectInterface bool `yaml:"auto-detect-interface" json:"auto-detect-interface"`
28-
RedirectToTun []string `yaml:"-" json:"-"`
2931

3032
MTU uint32 `yaml:"mtu" json:"mtu,omitempty"`
3133
GSO bool `yaml:"gso" json:"gso,omitempty"`
@@ -60,3 +62,146 @@ type Tun struct {
6062
Inet4RouteExcludeAddress []netip.Prefix `yaml:"inet4-route-exclude-address" json:"inet4-route-exclude-address,omitempty"`
6163
Inet6RouteExcludeAddress []netip.Prefix `yaml:"inet6-route-exclude-address" json:"inet6-route-exclude-address,omitempty"`
6264
}
65+
66+
func (t *Tun) Sort() {
67+
slices.Sort(t.DNSHijack)
68+
69+
slices.SortFunc(t.Inet4Address, nnip.PrefixCompare)
70+
slices.SortFunc(t.Inet6Address, nnip.PrefixCompare)
71+
slices.SortFunc(t.RouteAddress, nnip.PrefixCompare)
72+
slices.Sort(t.RouteAddressSet)
73+
slices.SortFunc(t.RouteExcludeAddress, nnip.PrefixCompare)
74+
slices.Sort(t.RouteExcludeAddressSet)
75+
slices.Sort(t.IncludeInterface)
76+
slices.Sort(t.ExcludeInterface)
77+
slices.Sort(t.IncludeUID)
78+
slices.Sort(t.IncludeUIDRange)
79+
slices.Sort(t.ExcludeUID)
80+
slices.Sort(t.ExcludeUIDRange)
81+
slices.Sort(t.IncludeAndroidUser)
82+
slices.Sort(t.IncludePackage)
83+
slices.Sort(t.ExcludePackage)
84+
85+
slices.SortFunc(t.Inet4RouteAddress, nnip.PrefixCompare)
86+
slices.SortFunc(t.Inet6RouteAddress, nnip.PrefixCompare)
87+
slices.SortFunc(t.Inet4RouteExcludeAddress, nnip.PrefixCompare)
88+
slices.SortFunc(t.Inet6RouteExcludeAddress, nnip.PrefixCompare)
89+
}
90+
91+
func (t *Tun) Equal(other Tun) bool {
92+
if t.Enable != other.Enable {
93+
return false
94+
}
95+
if t.Device != other.Device {
96+
return false
97+
}
98+
if t.Stack != other.Stack {
99+
return false
100+
}
101+
if !slices.Equal(t.DNSHijack, other.DNSHijack) {
102+
return false
103+
}
104+
if t.AutoRoute != other.AutoRoute {
105+
return false
106+
}
107+
if t.AutoDetectInterface != other.AutoDetectInterface {
108+
return false
109+
}
110+
111+
if t.MTU != other.MTU {
112+
return false
113+
}
114+
if t.GSO != other.GSO {
115+
return false
116+
}
117+
if t.GSOMaxSize != other.GSOMaxSize {
118+
return false
119+
}
120+
if !slices.Equal(t.Inet4Address, other.Inet4Address) {
121+
return false
122+
}
123+
if !slices.Equal(t.Inet6Address, other.Inet6Address) {
124+
return false
125+
}
126+
if t.IPRoute2TableIndex != other.IPRoute2TableIndex {
127+
return false
128+
}
129+
if t.IPRoute2RuleIndex != other.IPRoute2RuleIndex {
130+
return false
131+
}
132+
if t.AutoRedirect != other.AutoRedirect {
133+
return false
134+
}
135+
if t.AutoRedirectInputMark != other.AutoRedirectInputMark {
136+
return false
137+
}
138+
if t.AutoRedirectOutputMark != other.AutoRedirectOutputMark {
139+
return false
140+
}
141+
if t.StrictRoute != other.StrictRoute {
142+
return false
143+
}
144+
if !slices.Equal(t.RouteAddress, other.RouteAddress) {
145+
return false
146+
}
147+
if !slices.Equal(t.RouteAddressSet, other.RouteAddressSet) {
148+
return false
149+
}
150+
if !slices.Equal(t.RouteExcludeAddress, other.RouteExcludeAddress) {
151+
return false
152+
}
153+
if !slices.Equal(t.RouteExcludeAddressSet, other.RouteExcludeAddressSet) {
154+
return false
155+
}
156+
if !slices.Equal(t.IncludeInterface, other.IncludeInterface) {
157+
return false
158+
}
159+
if !slices.Equal(t.ExcludeInterface, other.ExcludeInterface) {
160+
return false
161+
}
162+
if !slices.Equal(t.IncludeUID, other.IncludeUID) {
163+
return false
164+
}
165+
if !slices.Equal(t.IncludeUIDRange, other.IncludeUIDRange) {
166+
return false
167+
}
168+
if !slices.Equal(t.ExcludeUID, other.ExcludeUID) {
169+
return false
170+
}
171+
if !slices.Equal(t.ExcludeUIDRange, other.ExcludeUIDRange) {
172+
return false
173+
}
174+
if !slices.Equal(t.IncludeAndroidUser, other.IncludeAndroidUser) {
175+
return false
176+
}
177+
if !slices.Equal(t.IncludePackage, other.IncludePackage) {
178+
return false
179+
}
180+
if !slices.Equal(t.ExcludePackage, other.ExcludePackage) {
181+
return false
182+
}
183+
if t.EndpointIndependentNat != other.EndpointIndependentNat {
184+
return false
185+
}
186+
if t.UDPTimeout != other.UDPTimeout {
187+
return false
188+
}
189+
if t.FileDescriptor != other.FileDescriptor {
190+
return false
191+
}
192+
193+
if !slices.Equal(t.Inet4RouteAddress, other.Inet4RouteAddress) {
194+
return false
195+
}
196+
if !slices.Equal(t.Inet6RouteAddress, other.Inet6RouteAddress) {
197+
return false
198+
}
199+
if !slices.Equal(t.Inet4RouteExcludeAddress, other.Inet4RouteExcludeAddress) {
200+
return false
201+
}
202+
if !slices.Equal(t.Inet6RouteExcludeAddress, other.Inet6RouteExcludeAddress) {
203+
return false
204+
}
205+
206+
return true
207+
}

0 commit comments

Comments
 (0)