stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

migliorate impostazioni resolverDNS

Browse Source
This commit is contained in:
greko17
2019-12-09 19:21:33 +01:00
committed by marco
parent 2308088e56
commit 2a479ca0c3
5 changed files with 98 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specials/checkhost.py
+4 -3
View File
@@ -34,6 +34,7 @@ class Kdicc():
self.view_msg = view_msg
self.lst_site_check_dns = lst_site_check_dns
self.urls = []
logger.info("check #### INIZIO INIT#### ")
def check_Ip(self):
"""
@@ -189,13 +190,13 @@ class Kdicc():
dialog = xbmcgui.Dialog()
if config.get_setting('checkdns'):
risposta= dialog.yesno(addonname, txt, nolabel='Disattiva', yeslabel='Ricordami')
risposta= dialog.yesno(addonname, txt, nolabel=config.get_localized_string(707403), yeslabel=config.get_localized_string(707404))
if risposta == False:
config.set_setting('checkdns', False)
dialog.textviewer(addonname+ ' '+config.get_localized_string(707403), config.get_localized_string(707404))
dialog.textviewer(addonname+' '+config.get_localized_string(707405), config.get_localized_string(707406))
else:
txt = config.get_localized_string(707402)
dialog.notification(addonname, txt, xbmcgui.NOTIFICATION_INFO, 5000)
dialog.notification(addonname, txt, xbmcgui.NOTIFICATION_INFO, 10000)
"""
def richiamato in launcher.py
"""
specials/resolverdns.py
+21 -19
View File
@@ -4,7 +4,8 @@
from platformcode import config
from core import support
if config.get_setting('resolver_dns') or config.get_setting('resolver_dns_custom'):
##if config.get_setting('resolver_dns') or config.get_setting('resolver_dns_custom'):
if config.get_setting('resolver_dns'):
from lib import dns
import dns.resolver
from dns.resolver import override_system_resolver
@@ -18,25 +19,26 @@ if config.get_setting('resolver_dns') or config.get_setting('resolver_dns_custom
legge le impostazioni dalla configurazione
e setta i relativi DNS
"""
nameservers_dns = config.get_setting('resolver_dns_service')
support.log("NAME SERVER1: {}".format(nameservers_dns))
if config.get_setting('resolver_dns_custom') and not config.get_setting('resolver_dns'):
res.nameservers = [config.get_setting('resolver_dns_custom1'),config.get_setting('resolver_dns_custom2')]
elif nameservers_dns == 1:# 'Google'
res.nameservers = ['8.8.8.8', '2001:4860:4860::8888',
'8.8.4.4', '2001:4860:4860::8844']
elif nameservers_dns == 2:#'OpenDns Home ip(v4)':
res.nameservers = ['208.67.222.222', '208.67.222.220']
elif nameservers_dns == 3:#'OpenDns Family Shield ip(v4)':
res.nameservers = ['208.67.222.123', '208.67.220.123']
elif nameservers_dns == 4:#'OpenDns ip(v6)':
#https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6-
res.nameservers = ['2620:119:35::35', '2620:119:53::53']
elif nameservers_dns == 0:#'Cloudflare':
res.nameservers = ['1.1.1.1', '2606:4700:4700::1111',
'1.0.0.1', '2606:4700:4700::1001']
if config.get_setting('resolver_dns_custom') and not config.get_setting('resolver_dns_service_choose'):
res.nameservers = [config.get_setting('resolver_dns_custom1'),config.get_setting('resolver_dns_custom2')]
else:
nameservers_dns = config.get_setting('resolver_dns_service')
# config.get_setting('resolver_dns_service_choose') == true
if nameservers_dns == 1:# 'Google'
res.nameservers = ['8.8.8.8', '2001:4860:4860::8888',
'8.8.4.4', '2001:4860:4860::8844']
elif nameservers_dns == 2:#'OpenDns Home ip(v4)'
res.nameservers = ['208.67.222.222', '208.67.222.220']
elif nameservers_dns == 3:#'OpenDns Family Shield ip(v4)':
res.nameservers = ['208.67.222.123', '208.67.220.123']
elif nameservers_dns == 4:#'OpenDns ip(v6)'
#https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6-
res.nameservers = ['2620:119:35::35', '2620:119:53::53']
else:#if nameservers_dns == 0:#'Cloudflare'
res.nameservers = ['1.1.1.1', '2606:4700:4700::1111',
'1.0.0.1', '2606:4700:4700::1001']
# log di verifica dei DNS impostati, d'aiuto quando gli utenti smanettano...
support.log("NAME SERVER2: {}".format(res.nameservers))
override_system_resolver(res)