GUI: Advanced: DHCP/DNS: exclude ipv6 only servers if ipv6 not enabled

arm-sdk7
pedro 5 years ago
parent f93c0ae2f1
commit a92f887c87

@ -1,39 +1,38 @@
# Layout:
# Name,IP_Address,Port,TLS_Hostname,SPKI
# Single entry = group label
# Name,IP_Address,Port,TLS_Hostname,SPKI,IPv4/IPv6
# Empty lines are ignored
IPv4
AdGuard 1,94.140.14.14,,dns.adguard.com,
AdGuard 2,94.140.15.15,,dns.adguard.com,
AdGuard 1 (unfiltered),94.140.14.140,,dns-unfiltered.adguard.com,
AdGuard 2 (unfiltered),94.140.14.141,,dns-unfiltered.adguard.com,
AdGuard 1 (family),94.140.14.15,,dns-family.adguard.com,
Adguard 2 (family),94.140.15.16,,dns-family.adguard.com,
Canadian Shield 1,149.112.121.10,,private.canadianshield.cira.ca,
Canadian Shield 2,149.112.122.10,,private.canadianshield.cira.ca,
Canadian Shield 1 (protected),149.112.121.20,,protected.canadianshield.cira.ca,
Canadian Shield 2 (protected),149.112.122.20,,protected.canadianshield.cira.ca,
Canadian Shield 1 (family),149.112.121.30,,family.canadianshield.cira.ca,
Canadian Shield 2 (family),149.112.122.30,,family.canadianshield.cira.ca,
CleanBrowsing 1 (security),185.228.168.9,,security-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (security),185.228.169.9,,security-filter-dns.cleanbrowsing.org,
CleanBrowsing 1 (family),185.228.168.168,,family-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (family),185.228.169.168,,family-filter-dns.cleanbrowsing.org,
CleanBrowsing 1 (adult filter),185.228.168.10,,adult-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (adult filter),185.228.169.11,,adult-filter-dns.cleanbrowsing.org,
Cloudflare 1,1.1.1.1,,cloudflare-dns.com,
Cloudflare 2,1.0.0.1,,cloudflare-dns.com,
Cloudflare 1 (family),1.1.1.3,,family.cloudflare-dns.com,
Cloudflare 2 (family),1.0.0.3,,family.cloudflare-dns.com,
Cloudflare 1 (security),1.1.1.2,,security.cloudflare-dns.com,
Cloudflare 2 (security),1.0.0.2,,security.cloudflare-dns.com,
Google 1,8.8.8.8,,dns.google,
Google 2,8.8.4.4,,dns.google,
Quad9 1,9.9.9.9,,dns.quad9.net,
Quad9 2,149.112.112.112,,dns.quad9.net,
# IPv4
AdGuard 1,94.140.14.14,,dns.adguard.com,,IPv4
AdGuard 2,94.140.15.15,,dns.adguard.com,,IPv4
AdGuard 1 (unfiltered),94.140.14.140,,dns-unfiltered.adguard.com,,IPv4
AdGuard 2 (unfiltered),94.140.14.141,,dns-unfiltered.adguard.com,,IPv4
AdGuard 1 (family),94.140.14.15,,dns-family.adguard.com,,IPv4
Adguard 2 (family),94.140.15.16,,dns-family.adguard.com,,IPv4
Canadian Shield 1,149.112.121.10,,private.canadianshield.cira.ca,,IPv4
Canadian Shield 2,149.112.122.10,,private.canadianshield.cira.ca,,IPv4
Canadian Shield 1 (protected),149.112.121.20,,protected.canadianshield.cira.ca,,IPv4
Canadian Shield 2 (protected),149.112.122.20,,protected.canadianshield.cira.ca,,IPv4
Canadian Shield 1 (family),149.112.121.30,,family.canadianshield.cira.ca,,IPv4
Canadian Shield 2 (family),149.112.122.30,,family.canadianshield.cira.ca,,IPv4
CleanBrowsing 1 (security),185.228.168.9,,security-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 2 (security),185.228.169.9,,security-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 1 (family),185.228.168.168,,family-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 2 (family),185.228.169.168,,family-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 1 (adult filter),185.228.168.10,,adult-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 2 (adult filter),185.228.169.11,,adult-filter-dns.cleanbrowsing.org,,IPv4
Cloudflare 1,1.1.1.1,,cloudflare-dns.com,,IPv4
Cloudflare 2,1.0.0.1,,cloudflare-dns.com,,IPv4
Cloudflare 1 (family),1.1.1.3,,family.cloudflare-dns.com,,IPv4
Cloudflare 2 (family),1.0.0.3,,family.cloudflare-dns.com,,IPv4
Cloudflare 1 (security),1.1.1.2,,security.cloudflare-dns.com,,IPv4
Cloudflare 2 (security),1.0.0.2,,security.cloudflare-dns.com,,IPv4
Google 1,8.8.8.8,,dns.google,,IPv4
Google 2,8.8.4.4,,dns.google,,IPv4
Quad9 1,9.9.9.9,,dns.quad9.net,,IPv4
Quad9 2,149.112.112.112,,dns.quad9.net,,IPv4
IPv4 (port 443)
Neutopia,89.234.186.112,443,dns.neutopia.org,wTeXHM8aczvhRSi0cv2qOXkXInoDU+2C+M8MpRyT3OI=
Surfnet/Sinodun 1,145.100.185.15,443,dnsovertls.sinodun.com,62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
Surfnet/Sinodun 2,145.100.185.16,443,dnsovertls1.sinodun.com,cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
# IPv4 (port 443)
Neutopia,89.234.186.112,443,dns.neutopia.org,wTeXHM8aczvhRSi0cv2qOXkXInoDU+2C+M8MpRyT3OI=,IPv4
Surfnet/Sinodun 1,145.100.185.15,443,dnsovertls.sinodun.com,62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=,IPv4
Surfnet/Sinodun 2,145.100.185.16,443,dnsovertls1.sinodun.com,cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=,IPv4

@ -1,74 +1,73 @@
# Layout:
# Name,IP_Address,Port,TLS_Hostname,SPKI
# Single entry = group label
# Name,IP_Address,Port,TLS_Hostname,SPKI,IPv4/IPv6
# Empty lines are ignored
IPv4
AdGuard 1,94.140.14.14,,dns.adguard.com,
AdGuard 2,94.140.15.15,,dns.adguard.com,
AdGuard 1 (unfiltered),94.140.14.140,,dns-unfiltered.adguard.com,
AdGuard 2 (unfiltered),94.140.14.141,,dns-unfiltered.adguard.com,
AdGuard 1 (family),94.140.14.15,,dns-family.adguard.com,
Adguard 2 (family),94.140.15.16,,dns-family.adguard.com,
Canadian Shield 1,149.112.121.10,,private.canadianshield.cira.ca,
Canadian Shield 2,149.112.122.10,,private.canadianshield.cira.ca,
Canadian Shield 1 (protected),149.112.121.20,,protected.canadianshield.cira.ca,
Canadian Shield 2 (protected),149.112.122.20,,protected.canadianshield.cira.ca,
Canadian Shield 1 (family),149.112.121.30,,family.canadianshield.cira.ca,
Canadian Shield 2 (family),149.112.122.30,,family.canadianshield.cira.ca,
CleanBrowsing 1 (security),185.228.168.9,,security-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (security),185.228.169.9,,security-filter-dns.cleanbrowsing.org,
CleanBrowsing 1 (family),185.228.168.168,,family-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (family),185.228.169.168,,family-filter-dns.cleanbrowsing.org,
CleanBrowsing 1 (adult filter),185.228.168.10,,adult-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (adult filter),185.228.169.11,,adult-filter-dns.cleanbrowsing.org,
Cloudflare 1,1.1.1.1,,cloudflare-dns.com,
Cloudflare 2,1.0.0.1,,cloudflare-dns.com,
Cloudflare 1 (family),1.1.1.3,,family.cloudflare-dns.com,
Cloudflare 2 (family),1.0.0.3,,family.cloudflare-dns.com,
Cloudflare 1 (security),1.1.1.2,,security.cloudflare-dns.com,
Cloudflare 2 (security),1.0.0.2,,security.cloudflare-dns.com,
Google 1,8.8.8.8,,dns.google,
Google 2,8.8.4.4,,dns.google,
Quad9 1,9.9.9.9,,dns.quad9.net,
Quad9 2,149.112.112.112,,dns.quad9.net,
# IPv4
AdGuard 1,94.140.14.14,,dns.adguard.com,,IPv4
AdGuard 2,94.140.15.15,,dns.adguard.com,,IPv4
AdGuard 1 (unfiltered),94.140.14.140,,dns-unfiltered.adguard.com,,IPv4
AdGuard 2 (unfiltered),94.140.14.141,,dns-unfiltered.adguard.com,,IPv4
AdGuard 1 (family),94.140.14.15,,dns-family.adguard.com,,IPv4
Adguard 2 (family),94.140.15.16,,dns-family.adguard.com,,IPv4
Canadian Shield 1,149.112.121.10,,private.canadianshield.cira.ca,,IPv4
Canadian Shield 2,149.112.122.10,,private.canadianshield.cira.ca,,IPv4
Canadian Shield 1 (protected),149.112.121.20,,protected.canadianshield.cira.ca,,IPv4
Canadian Shield 2 (protected),149.112.122.20,,protected.canadianshield.cira.ca,,IPv4
Canadian Shield 1 (family),149.112.121.30,,family.canadianshield.cira.ca,,IPv4
Canadian Shield 2 (family),149.112.122.30,,family.canadianshield.cira.ca,,IPv4
CleanBrowsing 1 (security),185.228.168.9,,security-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 2 (security),185.228.169.9,,security-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 1 (family),185.228.168.168,,family-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 2 (family),185.228.169.168,,family-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 1 (adult filter),185.228.168.10,,adult-filter-dns.cleanbrowsing.org,,IPv4
CleanBrowsing 2 (adult filter),185.228.169.11,,adult-filter-dns.cleanbrowsing.org,,IPv4
Cloudflare 1,1.1.1.1,,cloudflare-dns.com,,IPv4
Cloudflare 2,1.0.0.1,,cloudflare-dns.com,,IPv4
Cloudflare 1 (family),1.1.1.3,,family.cloudflare-dns.com,,IPv4
Cloudflare 2 (family),1.0.0.3,,family.cloudflare-dns.com,,IPv4
Cloudflare 1 (security),1.1.1.2,,security.cloudflare-dns.com,,IPv4
Cloudflare 2 (security),1.0.0.2,,security.cloudflare-dns.com,,IPv4
Google 1,8.8.8.8,,dns.google,,IPv4
Google 2,8.8.4.4,,dns.google,,IPv4
Quad9 1,9.9.9.9,,dns.quad9.net,,IPv4
Quad9 2,149.112.112.112,,dns.quad9.net,,IPv4
IPv4 (port 443)
Neutopia,89.234.186.112,443,dns.neutopia.org,wTeXHM8aczvhRSi0cv2qOXkXInoDU+2C+M8MpRyT3OI=
Surfnet/Sinodun 1,145.100.185.15,443,dnsovertls.sinodun.com,62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
Surfnet/Sinodun 2,145.100.185.16,443,dnsovertls1.sinodun.com,cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
# IPv4 (port 443)
Neutopia,89.234.186.112,443,dns.neutopia.org,wTeXHM8aczvhRSi0cv2qOXkXInoDU+2C+M8MpRyT3OI=,IPv4
Surfnet/Sinodun 1,145.100.185.15,443,dnsovertls.sinodun.com,62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=,IPv4
Surfnet/Sinodun 2,145.100.185.16,443,dnsovertls1.sinodun.com,cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=,IPv4
IPv6
AdGuard 1,2a10:50c0::ad1:ff,,dns.adguard.com,
AdGuard 2,2a10:50c0::ad2:ff,,dns.adguard.com,
AdGuard 1 (unfiltered),2a10:50c0::1:ff,,dns-unfiltered.adguard.com,
AdGuard 2 (unfiltered),2a10:50c0::2:ff,,dns-unfiltered.adguard.com,
AdGuard 1 (family),2a10:50c0::bad1:ff,,dns-family.adguard.com,
Adguard 2 (family),2a10:50c0::bad2:ff,,dns-family.adguard.com,
Canadian Shield 1,2620:10A:80BB::10,,private.canadianshield.cira.ca,
Canadian Shield 2,2620:10A:80BC::10,,private.canadianshield.cira.ca,
Canadian Shield 1 (protected),2620:10A:80BB::20,,protected.canadianshield.cira.ca,
Canadian Shield 2 (protected),2620:10A:80BC::20,,protected.canadianshield.cira.ca,
Canadian Shield 1 (family),2620:10A:80BB::30,,family.canadianshield.cira.ca,
Canadian Shield 2 (family),2620:10A:80BC::30,,family.canadianshield.cira.ca,
CleanBrowsing 1 (security),2a0d:2a00:1::2,,security-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (security),2a0d:2a00:2::2,,security-filter-dns.cleanbrowsing.org,
CleanBrowsing 1 (family),2a0d:2a00:1::0,,family-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (family),2a0d:2a00:2::0,,family-filter-dns.cleanbrowsing.org,
CleanBrowsing 1 (adult filter),2a0d:2a00:1::1,,adult-filter-dns.cleanbrowsing.org,
CleanBrowsing 2 (adult filter),2a0d:2a00:2::1,,adult-filter-dns.cleanbrowsing.org,
Cloudflare 1,2606:4700:4700::1111,,cloudflare-dns.com,
Cloudflare 2,2606:4700:4700::1001,,cloudflare-dns.com,
Cloudflare 1 (family),2606:4700:4700::1113,,family.cloudflare-dns.com,
Cloudflare 2 (family),2606:4700:4700::1003,,family.cloudflare-dns.com,
Cloudflare 1 (security),2606:4700:4700::1112,,security.cloudflare-dns.com,
Cloudflare 2 (security),2606:4700:4700::1002,,security.cloudflare-dns.com,
Google 1,2001:4860:4860::8888,,dns.google,
Google 2,2001:4860:4860::8844,,dns.google,
Quad9 1,2620:fe::fe,,dns.quad9.net,
Quad9 2,2620:fe::9,,dns.quad9.net,
# IPv6
AdGuard 1,2a10:50c0::ad1:ff,,dns.adguard.com,,IPv6
AdGuard 2,2a10:50c0::ad2:ff,,dns.adguard.com,,IPv6
AdGuard 1 (unfiltered),2a10:50c0::1:ff,,dns-unfiltered.adguard.com,,IPv6
AdGuard 2 (unfiltered),2a10:50c0::2:ff,,dns-unfiltered.adguard.com,,IPv6
AdGuard 1 (family),2a10:50c0::bad1:ff,,dns-family.adguard.com,,IPv6
Adguard 2 (family),2a10:50c0::bad2:ff,,dns-family.adguard.com,,IPv6
Canadian Shield 1,2620:10A:80BB::10,,private.canadianshield.cira.ca,,IPv6
Canadian Shield 2,2620:10A:80BC::10,,private.canadianshield.cira.ca,,IPv6
Canadian Shield 1 (protected),2620:10A:80BB::20,,protected.canadianshield.cira.ca,,IPv6
Canadian Shield 2 (protected),2620:10A:80BC::20,,protected.canadianshield.cira.ca,,IPv6
Canadian Shield 1 (family),2620:10A:80BB::30,,family.canadianshield.cira.ca,,IPv6
Canadian Shield 2 (family),2620:10A:80BC::30,,family.canadianshield.cira.ca,,IPv6
CleanBrowsing 1 (security),2a0d:2a00:1::2,,security-filter-dns.cleanbrowsing.org,,IPv6
CleanBrowsing 2 (security),2a0d:2a00:2::2,,security-filter-dns.cleanbrowsing.org,,IPv6
CleanBrowsing 1 (family),2a0d:2a00:1::0,,family-filter-dns.cleanbrowsing.org,,IPv6
CleanBrowsing 2 (family),2a0d:2a00:2::0,,family-filter-dns.cleanbrowsing.org,,IPv6
CleanBrowsing 1 (adult filter),2a0d:2a00:1::1,,adult-filter-dns.cleanbrowsing.org,,IPv6
CleanBrowsing 2 (adult filter),2a0d:2a00:2::1,,adult-filter-dns.cleanbrowsing.org,,IPv6
Cloudflare 1,2606:4700:4700::1111,,cloudflare-dns.com,,IPv6
Cloudflare 2,2606:4700:4700::1001,,cloudflare-dns.com,,IPv6
Cloudflare 1 (family),2606:4700:4700::1113,,family.cloudflare-dns.com,,IPv6
Cloudflare 2 (family),2606:4700:4700::1003,,family.cloudflare-dns.com,,IPv6
Cloudflare 1 (security),2606:4700:4700::1112,,security.cloudflare-dns.com,,IPv6
Cloudflare 2 (security),2606:4700:4700::1002,,security.cloudflare-dns.com,,IPv6
Google 1,2001:4860:4860::8888,,dns.google,,IPv6
Google 2,2001:4860:4860::8844,,dns.google,,IPv6
Quad9 1,2620:fe::fe,,dns.quad9.net,,IPv6
Quad9 2,2620:fe::9,,dns.quad9.net,,IPv6
IPv6 (port 443)
Neutopia,2a00:5884:8209::2,443,dns.neutopia.org,wTeXHM8aczvhRSi0cv2qOXkXInoDU+2C+M8MpRyT3OI=
Surfnet/Sinodun 1,2001:610:1:40ba:145:100:185:15,443,dnsovertls.sinodun.com,62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
Surfnet/Sinodun 2,2001:610:1:40ba:145:100:185:16,443,dnsovertls1.sinodun.com,cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
# IPv6 (port 443)
Neutopia,2a00:5884:8209::2,443,dns.neutopia.org,wTeXHM8aczvhRSi0cv2qOXkXInoDU+2C+M8MpRyT3OI=,IPv6
Surfnet/Sinodun 1,2001:610:1:40ba:145:100:185:15,443,dnsovertls.sinodun.com,62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=,IPv6
Surfnet/Sinodun 2,2001:610:1:40ba:145:100:185:16,443,dnsovertls1.sinodun.com,cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=,IPv6

@ -51,7 +51,7 @@ function active_resolvers(ip, port, domain, pinset) {
continue;
var row = s[j].split('>');
if (row.length == 4 && ip == row[0] && port == row[1] && domain == row[2] && pinset == row[3])
return 1;
return 1;
}
}
return 0;
@ -376,9 +376,14 @@ function init() {
W('<tr><td class="title indent2">Upstream resolvers<br> (max. 8)<\/td><td class="content" id="_stubby_servers"><table class="tomato-grid" id="stubby-grid">');
W('<tr class="header"><td class="co1">On<\/td><td class="co2">Server<\/td><\/tr><\/tr>');
var ip, port, server, domain, pinset, active, t;
var ip, port, server, domain, pinset, active, type, t;
for (var i = 0; i < up_servers_arr.length; ++i) {
server = up_servers_arr[i][0];
type = up_servers_arr[i][5];
if ((type.indexOf('IPv6') != -1) && (nvram.ipv6_service == ''))
continue;
server = '['+type+'] '+up_servers_arr[i][0];
ip = up_servers_arr[i][1];
port = up_servers_arr[i][2];
domain = up_servers_arr[i][3];
@ -389,14 +394,14 @@ function init() {
W('<tr class="'+tclass+'">\n'+
'<td class="co1">'+
'<input type="checkbox" name="upstream_active_'+i+'" id="_upstream_active_'+i+'" '+(ip ? '' : 'disabled="disabled"')+(active ? ' checked="checked"' : '')+' onclick="verifyFields(this, 0)">'+
'<input type="checkbox" name="upstream_active_'+i+'" id="_upstream_active_'+i+'" '+(active ? ' checked="checked"' : '')+' onclick="verifyFields(this, 0)">'+
'<input type="hidden" name="upstream_server_'+i+'" id="_upstream_server_'+i+'" value="'+server+'">'+
'<input type="hidden" name="upstream_ip_'+i+'" id="_upstream_ip_'+i+'" value="'+ip+'">'+
'<input type="hidden" name="upstream_port_'+i+'" id="_upstream_port_'+i+'" value="'+port+'">'+
'<input type="hidden" name="upstream_domain_'+i+'" id="_upstream_domain_'+i+'" value="'+domain+'">'+
'<input type="hidden" name="upstream_pinsetv_'+i+'" id="_upstream_pinset_'+i+'" value="'+pinset+'">'+
'<\/td>\n'+
'<td class="co2"'+(ip ? ' title="'+t+'" style="cursor:help"' : '')+'>'+(ip ? server : '<b>'+server+'<\/b>')+'<\/td>\n'+
'<td class="co2"'+(ip ? ' title="'+t+'" style="cursor:help"' : '')+'>'+server+'<\/td>\n'+
'<\/tr>\n');
}
@ -445,7 +450,7 @@ function init() {
{ title: 'Announce IPv6 on LAN (SLAAC)', name: 'f_ipv6_radvd', type: 'checkbox', value: nvram.ipv6_radvd == '1' },
{ title: 'Announce IPv6 on LAN (DHCP)', name: 'f_ipv6_dhcpd', type: 'checkbox', value: nvram.ipv6_dhcpd == '1' },
{ title: 'Fast RA mode', name: 'f_ipv6_fast_ra', type: 'checkbox', value: nvram.ipv6_fast_ra == '1' },
{ title: 'DHCP IPv6 lease time', name: 'f_ipv6_lease_time', type: 'text', maxlen: 3, size: 8, suffix: ' <small> (in hours)<\/small>', value: nvram.ipv6_lease_time || 12, hidden: (nvram['ipv6_service'] == 'native-pd') },
{ title: 'DHCP IPv6 lease time', name: 'f_ipv6_lease_time', type: 'text', maxlen: 3, size: 8, suffix: ' <small> (in hours)<\/small>', value: nvram.ipv6_lease_time || 12, hidden: (nvram.ipv6_service == 'native-pd') },
/* IPV6-END */
{ title: 'Mute dhcpv4 logging', name: 'f_dnsmasq_q4', type: 'checkbox', value: (nvram.dnsmasq_q & 1) },
/* IPV6-BEGIN */

Loading…
Cancel
Save