Resolve conflicts

This commit is contained in:
Sergei Maklagin
2025-08-15 12:56:52 +03:00
365 changed files with 22978 additions and 4724 deletions

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -49,23 +49,10 @@
"type": "direct",
"tag": "direct"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "wireguard-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -33,24 +33,11 @@
"password": "password",
"multiplexing": "MULTIPLEXING_LOW"
// Dial Fields
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "mieru-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,9 @@
"dns": {
"servers": [
{
"address": "sdns://AQMAAAAAAAAAETk0LjE0MC4xNS4xNTo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
"detour": "direct"
"type": "sdns",
"stamp": "sdns://AQMAAAAAAAAAETk0LjE0MC4xNS4xNTo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
"tag": "default"
}
]
},
@@ -22,23 +23,10 @@
"type": "direct",
"tag": "direct"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "direct",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -45,20 +45,13 @@
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
},
{
"outbound": "tunnel",
"override_tunnel_destination": "f79f7678-55e7-432d-a15f-6e8ab2b7fe13"
}
],
"final": "direct-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -39,24 +39,11 @@
{
"type": "direct",
"tag": "direct-out"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "direct-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -37,22 +37,10 @@
{
"type": "direct",
"tag": "direct-out"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
},
{
"outbound": "tunnel",
"override_tunnel_destination": "487f6073-3300-4819-a07d-39652e45fb4d"

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -30,24 +30,11 @@
{
"type": "direct",
"tag": "direct-out"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "direct-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -43,22 +43,10 @@
{
"type": "direct",
"tag": "direct-out"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
},
{
"tunnel_source": [
"9b65b7e1-04c8-4717-8f45-2aa61fd25937",
@@ -72,6 +60,7 @@
}
],
"final": "direct-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -36,17 +36,8 @@
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "vless-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -39,22 +39,10 @@
{
"type": "direct",
"tag": "direct-out"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
},
{
"inbound": "vless-in",
"outbound": "tunnel",
@@ -62,6 +50,7 @@
}
],
"final": "direct-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -30,24 +30,11 @@
{
"type": "direct",
"tag": "direct-out"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "direct-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -30,24 +30,11 @@
{
"type": "direct",
"tag": "direct-out"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "direct-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -46,28 +46,17 @@
{
"type": "direct",
"tag": "direct-out"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
},
{
"outbound": "tunnel",
"override_tunnel_destination": "9b65b7e1-04c8-4717-8f45-2aa61fd25937"
}
],
"final": "direct-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -51,24 +51,11 @@
],
"default": "direct",
"interrupt_exist_connections": true
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "direct",
"default_domain_resolver": "default",
"auto_detect_interface": true
},
"experimental": {

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -46,24 +46,11 @@
{
"type": "direct",
"tag": "direct"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "warp-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
},
"experimental": {

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -75,24 +75,11 @@
}
},
"packet_encoding": ""
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "vless-out",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}

View File

@@ -5,8 +5,8 @@
"dns": {
"servers": [
{
"address": "local",
"detour": "direct"
"type": "local",
"tag": "default"
}
]
},
@@ -40,24 +40,11 @@
{
"type": "direct",
"tag": "direct"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"port": 53,
"outbound": "dns-out"
}
],
"final": "direct",
"default_domain_resolver": "default",
"auto_detect_interface": true
}
}