Remove duplicated rules

SagerNet · Feb 2, 2024 · 38c945f · 38c945f
1 parent a276461
commit 38c945f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 35 deletions.
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/sagernet/sing v0.3.0
 	github.com/scjalliance/comshim v0.0.0-20230315213746-5e51f40bd3b9
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
-	golang.org/x/net v0.19.0
+	golang.org/x/net v0.20.0
 	golang.org/x/sys v0.16.0
 )
 

diff --git a/go.sum b/go.sum
@@ -19,8 +19,8 @@ github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695AP
 github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=

diff --git a/tun_linux.go b/tun_linux.go
@@ -450,14 +450,6 @@ func (t *NativeTun) rules() []*netlink.Rule {
 				it.Family = unix.AF_INET
 				rules = append(rules, it)
 				priority++
-
-				it = netlink.NewRule()
-				it.Priority = priority
-				it.OifName = includeInterface
-				it.Goto = matchPriority
-				it.Family = unix.AF_INET
-				rules = append(rules, it)
-				priority++
 			}
 			if p6 {
 				it = netlink.NewRule()
@@ -467,14 +459,6 @@ func (t *NativeTun) rules() []*netlink.Rule {
 				it.Family = unix.AF_INET6
 				rules = append(rules, it)
 				priority6++
-
-				it = netlink.NewRule()
-				it.Priority = priority6
-				it.OifName = includeInterface
-				it.Goto = matchPriority
-				it.Family = unix.AF_INET6
-				rules = append(rules, it)
-				priority6++
 			}
 		}
 		if p4 {
@@ -515,14 +499,6 @@ func (t *NativeTun) rules() []*netlink.Rule {
 				it.Family = unix.AF_INET
 				rules = append(rules, it)
 				priority++
-
-				it = netlink.NewRule()
-				it.Priority = priority
-				it.OifName = excludeInterface
-				it.Goto = nopPriority
-				it.Family = unix.AF_INET
-				rules = append(rules, it)
-				priority++
 			}
 			if p6 {
 				it = netlink.NewRule()
@@ -532,14 +508,6 @@ func (t *NativeTun) rules() []*netlink.Rule {
 				it.Family = unix.AF_INET6
 				rules = append(rules, it)
 				priority6++
-
-				it = netlink.NewRule()
-				it.Priority = priority6
-				it.OifName = excludeInterface
-				it.Goto = nopPriority
-				it.Family = unix.AF_INET6
-				rules = append(rules, it)
-				priority6++
 			}
 		}
 	}