mirror of
https://github.com/openlibrecommunity/olcng.git
synced 2026-07-03 14:05:17 +02:00
Refactoring of private IP lists
This commit is contained in:
@@ -172,14 +172,6 @@ object AppConfig {
|
|||||||
const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
|
const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
|
||||||
const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
|
const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
|
||||||
|
|
||||||
|
|
||||||
val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
|
|
||||||
val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
|
|
||||||
val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
|
|
||||||
val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
|
|
||||||
val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
|
|
||||||
val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
|
|
||||||
|
|
||||||
const val DEFAULT_PORT = 443
|
const val DEFAULT_PORT = 443
|
||||||
const val DEFAULT_SECURITY = "auto"
|
const val DEFAULT_SECURITY = "auto"
|
||||||
const val DEFAULT_LEVEL = 8
|
const val DEFAULT_LEVEL = 8
|
||||||
@@ -188,4 +180,19 @@ object AppConfig {
|
|||||||
const val REALITY = "reality"
|
const val REALITY = "reality"
|
||||||
const val HEADER_TYPE_HTTP = "http"
|
const val HEADER_TYPE_HTTP = "http"
|
||||||
|
|
||||||
|
val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
|
||||||
|
val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
|
||||||
|
val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
|
||||||
|
val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
|
||||||
|
val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
|
||||||
|
val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
|
||||||
|
|
||||||
|
val PRIVATE_IP_LIST = arrayListOf(
|
||||||
|
"10.0.0.0/8",
|
||||||
|
"172.16.0.0/12",
|
||||||
|
"192.168.0.0/16",
|
||||||
|
"169.254.0.0/16",
|
||||||
|
"224.0.0.0/4"
|
||||||
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
|
|||||||
//builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
|
//builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
|
||||||
val bypassLan = SettingsManager.routingRulesetsBypassLan()
|
val bypassLan = SettingsManager.routingRulesetsBypassLan()
|
||||||
if (bypassLan) {
|
if (bypassLan) {
|
||||||
resources.getStringArray(R.array.bypass_private_ip_address).forEach {
|
AppConfig.PRIVATE_IP_LIST.forEach {
|
||||||
val addr = it.split('/')
|
val addr = it.split('/')
|
||||||
builder.addRoute(addr[0], addr[1].toInt())
|
builder.addRoute(addr[0], addr[1].toInt())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -124,43 +124,6 @@
|
|||||||
<item>xtls-rprx-vision-udp443</item>
|
<item>xtls-rprx-vision-udp443</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
|
||||||
<!-- minimum list https://serverfault.com/a/304791 -->
|
|
||||||
<string-array name="bypass_private_ip_address" translatable="false">
|
|
||||||
<item>0.0.0.0/5</item>
|
|
||||||
<item>8.0.0.0/7</item>
|
|
||||||
<item>11.0.0.0/8</item>
|
|
||||||
<item>12.0.0.0/6</item>
|
|
||||||
<item>16.0.0.0/4</item>
|
|
||||||
<item>32.0.0.0/3</item>
|
|
||||||
<item>64.0.0.0/2</item>
|
|
||||||
<item>128.0.0.0/3</item>
|
|
||||||
<item>160.0.0.0/5</item>
|
|
||||||
<item>168.0.0.0/6</item>
|
|
||||||
<item>172.0.0.0/12</item>
|
|
||||||
<item>172.32.0.0/11</item>
|
|
||||||
<item>172.64.0.0/10</item>
|
|
||||||
<item>172.128.0.0/9</item>
|
|
||||||
<item>173.0.0.0/8</item>
|
|
||||||
<item>174.0.0.0/7</item>
|
|
||||||
<item>176.0.0.0/4</item>
|
|
||||||
<item>192.0.0.0/9</item>
|
|
||||||
<item>192.128.0.0/11</item>
|
|
||||||
<item>192.160.0.0/13</item>
|
|
||||||
<item>192.169.0.0/16</item>
|
|
||||||
<item>192.170.0.0/15</item>
|
|
||||||
<item>192.172.0.0/14</item>
|
|
||||||
<item>192.176.0.0/12</item>
|
|
||||||
<item>192.192.0.0/10</item>
|
|
||||||
<item>193.0.0.0/8</item>
|
|
||||||
<item>194.0.0.0/7</item>
|
|
||||||
<item>196.0.0.0/6</item>
|
|
||||||
<item>200.0.0.0/5</item>
|
|
||||||
<item>208.0.0.0/4</item>
|
|
||||||
<item>240.0.0.0/4</item>
|
|
||||||
</string-array>
|
|
||||||
|
|
||||||
|
|
||||||
<string-array name="language_select" translatable="false">
|
<string-array name="language_select" translatable="false">
|
||||||
<item>auto</item>
|
<item>auto</item>
|
||||||
<item>English</item>
|
<item>English</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user