Chore: bump version

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.5.0"
+    kotlin("jvm") version "1.5.10"
     `java-gradle-plugin`
 }
 
@@ -9,20 +9,10 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
-
-    compileOnly(gradleApi())
-
-    api(kotlin("gradle-plugin"))
-    api(kotlin("serialization"))
-    api("com.android.tools.build:gradle:4.2.1") {
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
-        exclude("org.jetbrains.kotlin", "kotlin-reflect")
-    }
-    api("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.5.0-1.0.0-alpha10") {
-        exclude("com.android.tools.build", "gradle")
-    }
+    implementation(kotlin("gradle-plugin"))
+    implementation(kotlin("serialization"))
+    implementation("com.android.tools.build:gradle:4.2.1")
+    implementation("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.5.10-1.0.0-beta01")
 }
 
 gradlePlugin {

buildSrc/src/main/java/Build.kt

@@ -1,7 +1,7 @@
 import org.gradle.api.Project
 
-const val buildVersionCode = 204005
-const val buildVersionName = "2.4.5"
+const val buildVersionCode = 204006
+const val buildVersionName = "2.4.6"
 
 const val buildMinSdkVersion = 21
 const val buildTargetSdkVersion = 30

core/src/main/cpp/main.c

@@ -98,15 +98,15 @@ Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyInstalledAppChanged(J
 JNIEXPORT void JNICALL
 Java_com_github_kr328_clash_core_bridge_Bridge_nativeStartTun(JNIEnv *env, jobject thiz,
                                                               jint fd, jint mtu,
-                                                              jstring gateway, jstring dns,
+                                                              jstring dns, jstring blocking,
                                                               jobject cb) {
     TRACE_METHOD();
 
-    scoped_string _gateway = get_string(gateway);
+    scoped_string _blocking = get_string(blocking);
     scoped_string _dns = get_string(dns);
     jobject _interface = new_global(cb);
 
-    startTun(fd, mtu, _gateway, _dns, _interface);
+    startTun(fd, mtu, _dns, _blocking, _interface);
 }
 
 JNIEXPORT void JNICALL

core/src/main/golang/tun/tcp.go

@@ -20,6 +20,7 @@ func (a *adapter) tcp() {
 	defer log.Infoln("[ATUN] TCP listener exited")
 	defer a.stack.Close()
 
+accept:
 	for {
 		conn, err := a.stack.TCP().Accept()
 		if err != nil {
@@ -34,9 +35,11 @@ func (a *adapter) tcp() {
 			continue
 		}
 
-		// drop all connections connect to gateway
-		if a.gateway.Contains(tAddr.IP) {
-			continue
+		// drop all connections connect to blocking list
+		for _, b := range a.blocking {
+			if b.Contains(tAddr.IP) {
+				continue accept
+			}
 		}
 
 		metadata := &C.Metadata{

core/src/main/golang/tun/tun.go

@@ -3,6 +3,7 @@ package tun
 import (
 	"net"
 	"os"
+	"strings"
 	"sync"
 	"syscall"
 
@@ -10,13 +11,13 @@ import (
 )
 
 type adapter struct {
-	device  *os.File
-	stack   tun2socket.Stack
-	gateway *net.IPNet
-	dns     net.IP
-	mtu     int
-	once    sync.Once
-	stop    func()
+	device   *os.File
+	stack    tun2socket.Stack
+	blocking []*net.IPNet
+	dns      net.IP
+	mtu      int
+	once     sync.Once
+	stop     func()
 }
 
 var lock sync.Mutex
@@ -27,7 +28,7 @@ func (a *adapter) close() {
 	_ = a.device.Close()
 }
 
-func Start(fd, mtu int, gateway, dns string, stop func()) error {
+func Start(fd, mtu int, dns string, blocking string, stop func()) error {
 	lock.Lock()
 	defer lock.Unlock()
 
@@ -46,16 +47,28 @@ func Start(fd, mtu int, gateway, dns string, stop func()) error {
 	}
 
 	dn := net.ParseIP(dns)
-	_, gw, _ := net.ParseCIDR(gateway)
+
+	var blk []*net.IPNet
+
+	for _, b := range strings.Split(blocking, ";") {
+		_, n, err := net.ParseCIDR(b)
+		if err != nil {
+			device.Close()
+
+			return err
+		}
+
+		blk = append(blk, n)
+	}
 
 	instance = &adapter{
-		device:  device,
-		stack:   stack,
-		gateway: gw,
-		dns:     dn,
-		mtu:     mtu,
-		once:    sync.Once{},
-		stop:    stop,
+		device:   device,
+		stack:    stack,
+		blocking: blk,
+		dns:      dn,
+		mtu:      mtu,
+		once:     sync.Once{},
+		stop:     stop,
 	}
 
 	go instance.rx()

core/src/main/golang/tun/udp.go

@@ -44,6 +44,7 @@ func (a *adapter) udp() {
 	defer log.Infoln("[ATUN] UDP receiver exited")
 	defer a.stack.Close()
 
+read:
 	for {
 		buf := pool.Get(a.mtu)
 
@@ -60,11 +61,11 @@ func (a *adapter) udp() {
 			continue
 		}
 
-		// drop all packets send to gateway
-		if a.gateway.Contains(tAddr.IP) {
-			pool.Put(buf)
-
-			continue
+		// drop all packet send to blocking list
+		for _, b := range a.blocking {
+			if b.Contains(tAddr.IP) {
+				continue read
+			}
 		}
 
 		pkt := &packet{

core/src/main/java/com/github/kr328/clash/core/Clash.kt

@@ -61,12 +61,12 @@ object Clash {
     fun startTun(
         fd: Int,
         mtu: Int,
-        gateway: String,
         dns: String,
+        blocking: String,
         markSocket: (Int) -> Boolean,
         querySocketUid: (protocol: Int, source: InetSocketAddress, target: InetSocketAddress) -> Int
     ) {
-        Bridge.nativeStartTun(fd, mtu, gateway, dns, object : TunInterface {
+        Bridge.nativeStartTun(fd, mtu, dns, blocking, object : TunInterface {
             override fun markSocket(fd: Int) {
                 markSocket(fd)
             }

core/src/main/java/com/github/kr328/clash/core/bridge/Bridge.kt

@@ -17,7 +17,7 @@ object Bridge {
     external fun nativeQueryTrafficTotal(): Long
     external fun nativeNotifyDnsChanged(dnsList: String)
     external fun nativeNotifyInstalledAppChanged(uidList: String)
-    external fun nativeStartTun(fd: Int, mtu: Int, gateway: String, dns: String, cb: TunInterface)
+    external fun nativeStartTun(fd: Int, mtu: Int, dns: String, blocking: String, cb: TunInterface)
     external fun nativeStopTun()
     external fun nativeStartHttp(listenAt: String): String?
     external fun nativeStopHttp()

design/src/main/java/com/github/kr328/clash/design/NetworkSettingsDesign.kt

@@ -70,6 +70,13 @@ class NetworkSettingsDesign(
                 configure = vpnDependencies::add,
             )
 
+            switch(
+                value = srvStore::blockLoopback,
+                title = R.string.block_loopback,
+                summary = R.string.block_loopback_summary,
+                configure = vpnDependencies::add,
+            )
+
             if (Build.VERSION.SDK_INT >= 29) {
                 switch(
                     value = srvStore::systemProxy,

design/src/main/res/values-zh-rHK/strings.xml

@@ -211,4 +211,6 @@
     <string name="sources">源代碼</string>
     <string name="clash_core">Clash 核心</string>
     <string name="name_server_policy">Name Server 策略</string>
+    <string name="block_loopback">阻止本地迴環</string>
+    <string name="block_loopback_summary">阻止本地迴環連接</string>
 </resources>

design/src/main/res/values-zh-rTW/strings.xml

@@ -211,4 +211,6 @@
     <string name="sources">源代碼</string>
     <string name="clash_core">Clash 核心</string>
     <string name="name_server_policy">Name Server 策略</string>
+    <string name="block_loopback">阻止本地迴環</string>
+    <string name="block_loopback_summary">阻止本地迴環連接</string>
 </resources>

design/src/main/res/values-zh/strings.xml

@@ -211,4 +211,6 @@
     <string name="sources">源代码</string>
     <string name="clash_core">Clash 核心</string>
     <string name="name_server_policy">Name Server 策略</string>
+    <string name="block_loopback">阻止本地回环</string>
+    <string name="block_loopback_summary">阻止本地回环连接</string>
 </resources>

design/src/main/res/values/strings.xml

@@ -119,6 +119,8 @@
     <string name="bypass_private_network_summary">Bypass private network addresses</string>
     <string name="dns_hijacking">DNS Hijacking</string>
     <string name="dns_hijacking_summary">Handle all dns packet</string>
+    <string name="block_loopback">Block Loopback</string>
+    <string name="block_loopback_summary">Block loopback connections</string>
     <string name="system_proxy">System Proxy</string>
     <string name="system_proxy_summary">Attach http proxy to VpnService</string>
     <string name="access_control_mode">Access Control Mode</string>

service/src/main/java/com/github/kr328/clash/service/ProfileWorker.kt

@@ -14,7 +14,6 @@ import com.github.kr328.clash.common.compat.pendingIntentFlags
 import com.github.kr328.clash.common.constants.Components
 import com.github.kr328.clash.common.constants.Intents
 import com.github.kr328.clash.common.id.UndefinedIds
-import com.github.kr328.clash.common.log.Log
 import com.github.kr328.clash.common.util.setUUID
 import com.github.kr328.clash.common.util.uuid
 import com.github.kr328.clash.service.data.ImportedDao
@@ -148,17 +147,12 @@ class ProfileWorker : BaseService() {
 
         NotificationManagerCompat.from(applicationContext)
             .notify(id, notification)
-
-        Log.d("notify processing $name: id = $id")
-
         try {
             block()
         } finally {
             withContext(NonCancellable) {
                 NotificationManagerCompat.from(applicationContext)
                     .cancel(id)
-
-                Log.d("notify processed $name: id = $id")
             }
         }
     }
@@ -190,8 +184,6 @@ class ProfileWorker : BaseService() {
 
         NotificationManagerCompat.from(this)
             .notify(id, notification)
-
-        Log.d("notify completed $name: id = $id")
     }
 
     private fun failed(uuid: UUID, name: String, reason: String) {
@@ -207,8 +199,6 @@ class ProfileWorker : BaseService() {
 
         NotificationManagerCompat.from(this)
             .notify(id, notification)
-
-        Log.d("notify failed $name: id = $id")
     }
 
     companion object {

service/src/main/java/com/github/kr328/clash/service/TunService.kt

@@ -216,11 +216,16 @@ class TunService : VpnService(), CoroutineScope by CoroutineScope(Dispatchers.De
                 }
             }
 
+            val blocking = mutableListOf("$TUN_GATEWAY/$TUN_SUBNET_PREFIX")
+            if (store.blockLoopback) {
+                blocking.add(NET_SUBNET_LOOPBACK)
+            }
+
             TunModule.TunDevice(
                 fd = establish()?.detachFd()
                     ?: throw NullPointerException("Establish VPN rejected by system"),
                 mtu = TUN_MTU,
-                gateway = "$TUN_GATEWAY/$TUN_SUBNET_PREFIX",
+                blocking = blocking.joinToString(";"),
                 dns = if (store.dnsHijacking) NET_ANY else TUN_DNS,
             )
         }
@@ -234,5 +239,6 @@ class TunService : VpnService(), CoroutineScope by CoroutineScope(Dispatchers.De
         private const val TUN_GATEWAY = "172.19.0.1"
         private const val TUN_DNS = "172.19.0.2"
         private const val NET_ANY = "0.0.0.0"
+        private const val NET_SUBNET_LOOPBACK = "127.0.0.0/8"
     }
 }

service/src/main/java/com/github/kr328/clash/service/clash/module/TunModule.kt

@@ -16,7 +16,7 @@ class TunModule(private val vpn: VpnService) : Module<Unit>(vpn) {
     data class TunDevice(
         val fd: Int,
         val mtu: Int,
-        val gateway: String,
+        val blocking: String,
         val dns: String,
     )
 
@@ -57,8 +57,8 @@ class TunModule(private val vpn: VpnService) : Module<Unit>(vpn) {
         Clash.startTun(
             fd = device.fd,
             mtu = device.mtu,
-            gateway = device.gateway,
             dns = device.dns,
+            blocking = device.blocking,
             markSocket = vpn::protect,
             querySocketUid = this::queryUid
         )

service/src/main/java/com/github/kr328/clash/service/store/ServiceStore.kt

@@ -46,6 +46,11 @@ class ServiceStore(context: Context) {
         defaultValue = false
     )
 
+    var blockLoopback by store.boolean(
+        key = "block_loopback",
+        defaultValue = true
+    )
+
     var dynamicNotification by store.boolean(
         key = "dynamic_notification",
         defaultValue = true