fix break connection

update clash core
break connection if set proxy for selector
2020-05-03 00:51:51 +08:00 · 2020-05-03 00:50:34 +08:00 · 2020-05-03 00:50:14 +08:00 · 2020-05-03 00:29:45 +08:00 · 2020-05-03 00:17:55 +08:00
5 changed files with 64 additions and 36 deletions
@@ -10,8 +10,8 @@ buildscript {
        this["gMinSdkVersion"] = 24
        this["gTargetSdkVersion"] = 29

-        this["gVersionCode"] = 10212
-        this["gVersionName"] = "1.2.12"
+        this["gVersionCode"] = 10213
+        this["gVersionName"] = "1.2.13"

        this["gKotlinVersion"] = kotlinVersion
        this["gKotlinCoroutineVersion"] = "1.3.5"
@@ -122,11 +122,26 @@ func SetSelectedProxy(name, proxy string) bool {
 		return false
 	}

+	selected := selector.Now()
+	if selected == proxy {
+		log.Infoln("Set " + name + " -> " + proxy)
+		return true
+	}
+
 	if err := selector.Set(proxy); err != nil {
 		log.Infoln("Set %s: %s", name, err.Error())
 		return false
 	}

+	for _, conn := range tunnel.DefaultManager.Snapshot().Connections {
+		for _, p := range conn.Chain() {
+			if p == name {
+				_ = conn.Close()
+				break
+			}
+		}
+	}
+
 	log.Infoln("Set " + name + " -> " + proxy)

 	return true
@@ -121,7 +121,7 @@ class TunService : VpnService(), CoroutineScope by MainScope() {
                return if (settings.get(ServiceSettings.BYPASS_PRIVATE_NETWORK))
                    resources.getStringArray(R.array.bypass_private_route).toList()
                else
-                    listOf(VLAN_ANY)
+                    resources.getStringArray(R.array.bypass_local_route).toList()
            }
        override val dnsAddress: String
            get() = PRIVATE_VLAN_DNS
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--  exclude 127.0.0.0/8 10.0.0.0/8 192.168.0.0/16 172.18.0.0/16  -->
+    <!-- exclude 127.0.0.0/8 169.254.0.0/16 10.0.0.0/8 192.168.0.0/16 172.18.0.0/16 -->
    <string-array name="bypass_private_route" translatable="false">
-        <item>0.0.0.0/5</item>
+        <item>1.0.0.0/8</item>
+        <item>2.0.0.0/7</item>
+        <item>4.0.0.0/6</item>
        <item>8.0.0.0/7</item>
        <item>11.0.0.0/8</item>
        <item>12.0.0.0/6</item>
@@ -16,7 +18,16 @@
        <item>126.0.0.0/8</item>
        <item>128.0.0.0/3</item>
        <item>160.0.0.0/5</item>
-        <item>168.0.0.0/6</item>
+        <item>168.0.0.0/8</item>
+        <item>169.0.0.0/9</item>
+        <item>169.128.0.0/10</item>
+        <item>169.192.0.0/11</item>
+        <item>169.224.0.0/12</item>
+        <item>169.240.0.0/13</item>
+        <item>169.248.0.0/14</item>
+        <item>169.252.0.0/15</item>
+        <item>169.255.0.0/16</item>
+        <item>170.0.0.0/7</item>
        <item>172.0.0.0/12</item>
        <item>172.32.0.0/11</item>
        <item>172.64.0.0/10</item>
@@ -37,35 +48,37 @@
        <item>196.0.0.0/6</item>
        <item>200.0.0.0/5</item>
        <item>208.0.0.0/4</item>
-        <item>224.0.0.0/4</item>
-        <item>240.0.0.0/5</item>
-        <item>248.0.0.0/6</item>
-        <item>252.0.0.0/7</item>
-        <item>254.0.0.0/8</item>
-        <item>255.0.0.0/9</item>
-        <item>255.128.0.0/10</item>
-        <item>255.192.0.0/11</item>
-        <item>255.224.0.0/12</item>
-        <item>255.240.0.0/13</item>
-        <item>255.248.0.0/14</item>
-        <item>255.252.0.0/15</item>
-        <item>255.254.0.0/16</item>
-        <item>255.255.0.0/17</item>
-        <item>255.255.128.0/18</item>
-        <item>255.255.192.0/19</item>
-        <item>255.255.224.0/20</item>
-        <item>255.255.240.0/21</item>
-        <item>255.255.248.0/22</item>
-        <item>255.255.252.0/23</item>
-        <item>255.255.254.0/24</item>
-        <item>255.255.255.0/25</item>
-        <item>255.255.255.128/26</item>
-        <item>255.255.255.192/27</item>
-        <item>255.255.255.224/28</item>
-        <item>255.255.255.240/29</item>
-        <item>255.255.255.248/30</item>
-        <item>255.255.255.252/31</item>
-        <item>255.255.255.254/32</item>
+        <item>224.0.0.0/3</item>
        <item>172.31.255.252/30</item> <!-- tun device address -->
    </string-array>
+    <!-- exclude 127.0.0.0/8 169.254.0.0/16 -->
+    <string-array name="bypass_local_route" translatable="false">
+        <item>1.0.0.0/8</item>
+        <item>2.0.0.0/7</item>
+        <item>4.0.0.0/6</item>
+        <item>8.0.0.0/5</item>
+        <item>16.0.0.0/4</item>
+        <item>32.0.0.0/3</item>
+        <item>64.0.0.0/3</item>
+        <item>96.0.0.0/4</item>
+        <item>112.0.0.0/5</item>
+        <item>120.0.0.0/6</item>
+        <item>124.0.0.0/7</item>
+        <item>126.0.0.0/8</item>
+        <item>128.0.0.0/3</item>
+        <item>160.0.0.0/5</item>
+        <item>168.0.0.0/8</item>
+        <item>169.0.0.0/9</item>
+        <item>169.128.0.0/10</item>
+        <item>169.192.0.0/11</item>
+        <item>169.224.0.0/12</item>
+        <item>169.240.0.0/13</item>
+        <item>169.248.0.0/14</item>
+        <item>169.252.0.0/15</item>
+        <item>169.255.0.0/16</item>
+        <item>170.0.0.0/7</item>
+        <item>172.0.0.0/6</item>
+        <item>176.0.0.0/4</item>
+        <item>192.0.0.0/2</item>
+    </string-array>
 </resources>
Author	SHA1	Message	Date
Kr328	cdd0e3dd30	fix break connection	2020-05-03 00:51:51 +08:00
Kr328	5823955c71	update clash core	2020-05-03 00:50:34 +08:00
Kr328	714c9a554f	break connection if set proxy for selector	2020-05-03 00:50:14 +08:00
Kr328	e621324b48	update clash core	2020-05-03 00:29:45 +08:00
Kr328	dfe1e7ecd9	exclude 127.0.0.0/8 from route table	2020-05-03 00:17:55 +08:00