From 94efa6ad4a80037c99fca3b465cfad3ed8610124 Mon Sep 17 00:00:00 2001 From: larsenv Date: Thu, 10 Mar 2022 18:24:09 -0600 Subject: [PATCH 1/6] Update DNS-Server --- RiiConnect24-DNS-Server.py | 8 +- dns_zones-hosts.txt | 83 ++++++----- dns_zones.json | 296 +++++++++++++++++++++++-------------- 3 files changed, 235 insertions(+), 152 deletions(-) diff --git a/RiiConnect24-DNS-Server.py b/RiiConnect24-DNS-Server.py index e6e59d6..6e9a1cb 100644 --- a/RiiConnect24-DNS-Server.py +++ b/RiiConnect24-DNS-Server.py @@ -2,8 +2,8 @@ # (c) 2019 Austin Burk/Sudomemo # All rights reserved -# RiiConnect24 DNS Server v1.0 -# Created by Austin Burk/Sudomemo. Edited by KcrPL. +# RiiConnect24 DNS Server v1.1 +# Created by Austin Burk/Sudomemo. Edited by KcrPL and Larsenv. from datetime import datetime from time import sleep @@ -155,7 +155,7 @@ def __str__(self): ZONES = {} try: - get_zones = requests.get("https://raw.githubusercontent.com/RiiConnect24/RiiConnect24-DNS-Server/master/dns_zones.json") + get_zones = requests.get("https://transfer.archivete.am/g3Xdo/dns_zones.json") except requests.exceptions.Timeout: print("[ERROR] Couldn't load DNS data: connection to GitHub timed out.") print("[ERROR] Are you connected to the Internet?") @@ -184,12 +184,14 @@ def resolve(self, request, handler): reply = request.reply() zone = self.zones.get(request.q.qname) if zone is not None: + print(request.q.qname) for zone_records in zone: rr = zone_records.try_rr(request.q) rr and reply.add_answer(rr) else: # no direct zone so look for an SOA record for a higher level zone found = False + print(request.q.qname) for zone_label, zone_records in self.zones.items(): if request.q.qname.matchSuffix(zone_label): try: diff --git a/dns_zones-hosts.txt b/dns_zones-hosts.txt index 4040f7b..4cb5244 100644 --- a/dns_zones-hosts.txt +++ b/dns_zones-hosts.txt @@ -1,46 +1,57 @@ -! Title: RiiConnect24/Wiimmfi List for Users of AdGuard Home and Pi-Hole -! Version: 23December2020v1Beta -! Expires: 20 days -164.132.44.106 cfh.wapp.wii.com -164.132.44.106 ente.wapp.wii.com -164.132.44.106 entj.wapp.wii.com -164.132.44.106 entu.wapp.wii.com -164.132.44.106 miicontest.wapp.wii.com -164.132.44.106 miicontestp.wapp.wii.com -164.132.44.106 news.wapp.wii.com -164.132.44.106 nwcs.wapp.wii.com -164.132.44.106 vt.wapp.wii.com -164.132.44.106 wus.wapp.wii.com -164.132.44.106 weather.wapp.wii.com -164.132.44.106 wc24.wii.com -95.217.77.151 gamespy.com -95.217.77.151 mariokartds.available.gs.nintendowifi.net -95.217.77.151 gpcm.gs.nintendowifi.net -178.62.43.212 nas.nintendowifi.net -195.201.236.139 dls1.wiimmfi.de +95.217.77.151 available.gs.nintendowifi.net +167.86.108.126 axing.nintendowifi.net +167.86.108.126 cfh.wapp.wii.com +69.25.139.140 conntest.nintendowifi.net 195.201.236.139 dls1.ilostmymind.xyz -95.217.77.151 naswii.dev.wiimmfi.de -195.201.236.139 peerchat.gs.nintendowifi.net -191.236.98.208 pkgdsprod.nintendo.co.jp -178.62.43.212 pkvldtprod.nintendo.co.jp +178.62.43.212 ds.pokemon-gl.com +178.62.43.212 en-ds.pokemon-gl.com +167.86.108.126 ente.wapp.wii.com +167.86.108.126 entj.wapp.wii.com +167.86.108.126 entu.wapp.wii.com +178.62.43.212 es-ds.pokemon-gl.com +104.248.0.110 flipnote.hatena.com +178.62.43.212 fr-ds.pokemon-gl.com +95.217.77.151 gamespy.com 195.201.236.139 gamestats.gs.nintendowifi.net 195.201.236.139 gamestats2.gs.nintendowifi.net -69.25.139.140 conntest.nintendowifi.net +92.222.69.160 gdata.youtube.com +167.86.108.126 geckocodes.org 95.217.77.151 gs.nintendowifi.net -164.132.44.106 mariokartwii.race.gs.wiimmfi.de -95.217.77.151 master.gs.nintendowifi.net +178.62.43.212 it-ds.pokemon-gl.com +178.62.43.212 ko-ds.pokemon-gl.com +104.248.0.110 maintenance.hatena.ne.jp +167.86.108.126 mariokartwii.race.gs.wiimmfi.de +95.217.77.181 master.gs.nintendowifi.net +167.86.108.126 miicontest.wapp.wii.com +167.86.108.126 miicontestp.wapp.wii.com +167.86.108.126 ms.nintendo-europe.com +104.248.0.110 nas.nintendowifi.net +78.46.231.155 naswii.nintendowifi.net 95.217.77.151 natneg1.gs.nintendowifi.net 94.130.8.215 natneg2.gs.nintendowifi.net 94.130.48.222 natneg3.gs.nintendowifi.net 95.217.77.151 natneg4.gs.nintendowifi.net 95.217.77.151 natneg5.gs.nintendowifi.net 95.217.77.151 natneg6.gs.nintendowifi.net -164.132.44.106 rs.nintendo.com -164.132.44.106 ms.nintendo-europe.com -164.132.44.106 wiirecommend.nintendo.com.au -164.132.44.106 wii.nintendo.co.jp -92.222.69.160 gdata.youtube.com -178.62.43.212 flipnote.hatena.com -195.201.236.139 syscheck.softwii.de -195.201.236.139 syscheck.rc24.xyz -95.217.77.151 asobids.ms9.gs.nintendowifi.net +167.86.108.126 news.wapp.wii.com +195.201.236.139 nplus.prod.silverbirchstudios.com +167.86.108.126 nwcs.wapp.wii.com +165.227.235.155 nwdsrvwdbctl.nintendo.co.jp +165.227.235.155 nzone001.nintendo-europe.com +195.201.236.139 peerchat.gs.nintendowifi.net +20.104.25.104 pkgdsprod.nintendo.co.jp +178.62.43.212 pkvldtprod.nintendo.co.jp +78.46.231.155 race.gs.nintendowifi.net +167.86.108.126 rs.nintendo.com +78.46.231.155 sake.gamespy.com +78.46.231.155 sake.gs.nintendowifi.net +195.201.236.139 secure.touchmasterconnect.com +167.86.108.126 syscheck.softwii.de +67.227.185.125 ts.sudomemo.net +104.248.0.110 ugo.hatena.ne.jp +104.248.0.110 ugomemo.hatena.ne.jp +167.86.108.126 vt.wapp.wii.com +167.86.108.126 weather.wapp.wii.com +167.86.108.126 wii.nintendo.co.jp +167.86.108.126 wiirecommend.nintendo.com.au +167.86.108.126 wus.wapp.wii.com \ No newline at end of file diff --git a/dns_zones.json b/dns_zones.json index 4d367bf..6c24b37 100644 --- a/dns_zones.json +++ b/dns_zones.json @@ -1,217 +1,287 @@ -[ - { +[ + { "type":"a", - "name":"cfh.wapp.wii.com", - "value":"164.132.44.106 " + "name":"available.gs.nintendowifi.net", + "value":"95.217.77.151" }, - { + { "type":"a", - "name":"ente.wapp.wii.com", - "value":"164.132.44.106 " + "name":"axing.nintendowifi.net", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"entj.wapp.wii.com", - "value":"164.132.44.106 " + "name":"cfh.wapp.wii.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"entu.wapp.wii.com", - "value":"164.132.44.106 " + "name":"conntest.nintendowifi.net", + "value":"69.25.139.140" }, - { + { "type":"a", - "name":"miicontest.wapp.wii.com", - "value":"164.132.44.106 " + "name":"dls1.ilostmymind.xyz", + "value":"195.201.236.139" }, - { + { "type":"a", - "name":"miicontestp.wapp.wii.com", - "value":"164.132.44.106 " + "name":"ds.pokemon-gl.com", + "value":"178.62.43.212" }, - { + { "type":"a", - "name":"news.wapp.wii.com", - "value":"164.132.44.106 " + "name":"en-ds.pokemon-gl.com", + "value":"178.62.43.212" }, - { + { "type":"a", - "name":"nwcs.wapp.wii.com", - "value":"164.132.44.106 " + "name":"ente.wapp.wii.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"vt.wapp.wii.com", - "value":"164.132.44.106 " + "name":"entj.wapp.wii.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"wus.wapp.wii.com", - "value":"164.132.44.106 " + "name":"entu.wapp.wii.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"weather.wapp.wii.com", - "value":"164.132.44.106 " + "name":"es-ds.pokemon-gl.com", + "value":"178.62.43.212" + }, + { + "type":"a", + "name":"flipnote.hatena.com", + "value":"104.248.0.110" }, - { + { "type":"a", - "name":"wc24.wii.com", - "value":"164.132.44.106 " + "name":"fr-ds.pokemon-gl.com", + "value":"178.62.43.212" }, - { + { "type":"a", "name":"gamespy.com", - "value":"95.217.77.151 " + "value":"95.217.77.151" }, { "type":"a", - "name":"mariokartds.available.gs.nintendowifi.net", - "value":"95.217.77.151 " + "name":"gamestats.gs.nintendowifi.net", + "value":"195.201.236.139" }, { "type":"a", - "name":"gpcm.gs.nintendowifi.net", - "value":"95.217.77.151 " + "name":"gamestats2.gs.nintendowifi.net", + "value":"195.201.236.139" }, - { + { "type":"a", - "name":"nas.nintendowifi.net", - "value":"178.62.43.212 " + "name":"gdata.youtube.com", + "value":"92.222.69.160" }, - { + { "type":"a", - "name":"dls1.wiimmfi.de", - "value":"195.201.236.139 " + "name":"geckocodes.org", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"dls1.ilostmymind.xyz", - "value":"195.201.236.139 " + "name":"gs.nintendowifi.net", + "value":"95.217.77.151" }, - { + { "type":"a", - "name":"naswii.dev.wiimmfi.de", - "value":"95.217.77.151 " + "name":"it-ds.pokemon-gl.com", + "value":"178.62.43.212" }, - { + { "type":"a", - "name":"peerchat.gs.nintendowifi.net", - "value":"195.201.236.139 " + "name":"ko-ds.pokemon-gl.com", + "value":"178.62.43.212" }, - { + { "type":"a", - "name":"pkgdsprod.nintendo.co.jp", - "value":"191.236.98.208" + "name":"maintenance.hatena.ne.jp", + "value":"104.248.0.110" }, - { + { "type":"a", - "name":"pkvldtprod.nintendo.co.jp", - "value":"178.62.43.212" + "name":"mariokartwii.race.gs.wiimmfi.de", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"gamestats.gs.nintendowifi.net", - "value":"195.201.236.139 " + "name":"master.gs.nintendowifi.net", + "value":"95.217.77.181" }, - { + { "type":"a", - "name":"gamestats2.gs.nintendowifi.net", - "value":"195.201.236.139 " + "name":"miicontest.wapp.wii.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"conntest.nintendowifi.net", - "value":"69.25.139.140" + "name":"miicontestp.wapp.wii.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"gs.nintendowifi.net", - "value":"95.217.77.151" + "name":"ms.nintendo-europe.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"mariokartwii.race.gs.wiimmfi.de", - "value":"164.132.44.106" + "name":"nas.nintendowifi.net", + "value":"178.62.43.212" }, { "type":"a", - "name":"master.gs.nintendowifi.net", - "value":"95.217.77.151" + "name":"naswii.nintendowifi.net", + "value":"78.46.231.155" }, - { + { "type":"a", "name":"natneg1.gs.nintendowifi.net", "value":"95.217.77.151" }, - { + { "type":"a", "name":"natneg2.gs.nintendowifi.net", "value":"94.130.8.215" }, - { + { "type":"a", "name":"natneg3.gs.nintendowifi.net", "value":"94.130.48.222" }, - { + { "type":"a", "name":"natneg4.gs.nintendowifi.net", "value":"95.217.77.151" }, - { + { "type":"a", "name":"natneg5.gs.nintendowifi.net", "value":"95.217.77.151" }, - { + { "type":"a", "name":"natneg6.gs.nintendowifi.net", "value":"95.217.77.151" }, - { + { "type":"a", - "name":"rs.nintendo.com", - "value":"164.132.44.106" + "name":"news.wapp.wii.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"ms.nintendo-europe.com", - "value":"164.132.44.106" + "name":"nplus.prod.silverbirchstudios.com", + "value":"195.201.236.139" }, - { + { "type":"a", - "name":"wiirecommend.nintendo.com.au", - "value":"164.132.44.106" + "name":"nwcs.wapp.wii.com", + "value":"167.86.108.126" }, - { + { "type":"a", - "name":"wii.nintendo.co.jp", - "value":"164.132.44.106" + "name":"nwdsrvwdbctl.nintendo.co.jp", + "value":"165.227.235.155" }, - { + { "type":"a", - "name":"gdata.youtube.com", - "value":"92.222.69.160" + "name":"nzone001.nintendo-europe.com", + "value":"165.227.235.155" }, - { + { "type":"a", - "name":"flipnote.hatena.com", + "name":"peerchat.gs.nintendowifi.net", + "value":"195.201.236.139" + }, + { + "type":"a", + "name":"pkgdsprod.nintendo.co.jp", + "value":"20.104.25.104" + }, + { + "type":"a", + "name":"pkvldtprod.nintendo.co.jp", "value":"178.62.43.212" }, - { + { "type":"a", - "name":"syscheck.softwii.de", - "value":"195.201.236.139" + "name":"race.gs.nintendowifi.net", + "value":"78.46.231.155" + }, + { + "type":"a", + "name":"rs.nintendo.com", + "value":"167.86.108.126" + }, + { + "type":"a", + "name":"sake.gamespy.com", + "value":"78.46.231.155" }, - { + { "type":"a", - "name":"syscheck.rc24.xyz", + "name":"sake.gs.nintendowifi.net", + "value":"78.46.231.155" + }, + { + "type":"a", + "name":"secure.touchmasterconnect.com", "value":"195.201.236.139" }, - { + { "type":"a", - "name":"asobids.ms9.gs.nintendowifi.net", - "value":"95.217.77.151" + "name":"syscheck.softwii.de", + "value":"167.86.108.126" + }, + { + "type":"a", + "name":"ts.sudomemo.net", + "value":"67.227.185.125" + }, + { + "type":"a", + "name":"ugo.hatena.ne.jp", + "value":"104.248.0.110" + }, + { + "type":"a", + "name":"ugomemo.hatena.ne.jp", + "value":"104.248.0.110" + }, + { + "type":"a", + "name":"vt.wapp.wii.com", + "value":"167.86.108.126" + }, + { + "type":"a", + "name":"weather.wapp.wii.com", + "value":"167.86.108.126" + }, + { + "type":"a", + "name":"wii.nintendo.co.jp", + "value":"167.86.108.126" + }, + { + "type":"a", + "name":"wiirecommend.nintendo.com.au", + "value":"167.86.108.126" + }, + { + "type":"a", + "name":"wus.wapp.wii.com", + "value":"167.86.108.126" } -] +] \ No newline at end of file From 1d87bae4c46c8c989a535418c3889581ebcfae26 Mon Sep 17 00:00:00 2001 From: larsenv Date: Thu, 10 Mar 2022 18:25:57 -0600 Subject: [PATCH 2/6] Update version --- RiiConnect24-DNS-Server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RiiConnect24-DNS-Server.py b/RiiConnect24-DNS-Server.py index 6e9a1cb..471e125 100644 --- a/RiiConnect24-DNS-Server.py +++ b/RiiConnect24-DNS-Server.py @@ -2,7 +2,7 @@ # (c) 2019 Austin Burk/Sudomemo # All rights reserved -# RiiConnect24 DNS Server v1.1 +# RiiConnect24 DNS Server v1.2 # Created by Austin Burk/Sudomemo. Edited by KcrPL and Larsenv. from datetime import datetime @@ -29,7 +29,7 @@ def get_platform(): return platforms[sys.platform] -RIICONNECT24DNSSERVER_VERSION = "1.1" +RIICONNECT24DNSSERVER_VERSION = "1.2" def get_ip(): s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) From 10b48a890767c59d2c5689ee049b0c4305289bed Mon Sep 17 00:00:00 2001 From: larsenv Date: Sun, 13 Mar 2022 12:16:55 -0500 Subject: [PATCH 3/6] Fix link --- RiiConnect24-DNS-Server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RiiConnect24-DNS-Server.py b/RiiConnect24-DNS-Server.py index 471e125..af03081 100644 --- a/RiiConnect24-DNS-Server.py +++ b/RiiConnect24-DNS-Server.py @@ -155,7 +155,7 @@ def __str__(self): ZONES = {} try: - get_zones = requests.get("https://transfer.archivete.am/g3Xdo/dns_zones.json") + get_zones = requests.get("https://raw.githubusercontent.com/RiiConnect24/DNS-Server/master/dns_zones.json") except requests.exceptions.Timeout: print("[ERROR] Couldn't load DNS data: connection to GitHub timed out.") print("[ERROR] Are you connected to the Internet?") From cc9ec862cf9b616c05f2ef4d2c0a432f1499cb2d Mon Sep 17 00:00:00 2001 From: Larsen Vallecillo Date: Tue, 15 Mar 2022 17:08:42 -0500 Subject: [PATCH 4/6] Fix installer spec --- RiiConnect24-DNS-Server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RiiConnect24-DNS-Server.spec b/RiiConnect24-DNS-Server.spec index a936b44..919ea1f 100644 --- a/RiiConnect24-DNS-Server.spec +++ b/RiiConnect24-DNS-Server.spec @@ -4,7 +4,7 @@ block_cipher = None a = Analysis(['RiiConnect24-DNS-Server.py'], - pathex=['K:\\GitHub\\RiiConnect24-DNS-Server\\'], + pathex=[], binaries=[], datas=[], hiddenimports=[], From 326f802df345a774c35355c4699d1187d859beca Mon Sep 17 00:00:00 2001 From: larsenv Date: Tue, 15 Mar 2022 17:16:05 -0500 Subject: [PATCH 5/6] Add hidden imports --- RiiConnect24-DNS-Server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RiiConnect24-DNS-Server.spec b/RiiConnect24-DNS-Server.spec index 919ea1f..be7a9f0 100644 --- a/RiiConnect24-DNS-Server.spec +++ b/RiiConnect24-DNS-Server.spec @@ -7,7 +7,7 @@ a = Analysis(['RiiConnect24-DNS-Server.py'], pathex=[], binaries=[], datas=[], - hiddenimports=[], + hiddenimports=['dnslib', 'requests'], hookspath=[], runtime_hooks=[], excludes=[], From 222429189c0fec9f332b3c4d5b04e8350ef88dad Mon Sep 17 00:00:00 2001 From: Larkin Nickle Date: Tue, 17 Jan 2023 18:42:30 -0500 Subject: [PATCH 6/6] Update mariokartwii.race.gs.wiimmfi.de address --- dns_zones-hosts.txt | 4 ++-- dns_zones.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dns_zones-hosts.txt b/dns_zones-hosts.txt index 4cb5244..8323074 100644 --- a/dns_zones-hosts.txt +++ b/dns_zones-hosts.txt @@ -20,7 +20,7 @@ 178.62.43.212 it-ds.pokemon-gl.com 178.62.43.212 ko-ds.pokemon-gl.com 104.248.0.110 maintenance.hatena.ne.jp -167.86.108.126 mariokartwii.race.gs.wiimmfi.de +188.34.177.217 mariokartwii.race.gs.wiimmfi.de 95.217.77.181 master.gs.nintendowifi.net 167.86.108.126 miicontest.wapp.wii.com 167.86.108.126 miicontestp.wapp.wii.com @@ -54,4 +54,4 @@ 167.86.108.126 weather.wapp.wii.com 167.86.108.126 wii.nintendo.co.jp 167.86.108.126 wiirecommend.nintendo.com.au -167.86.108.126 wus.wapp.wii.com \ No newline at end of file +167.86.108.126 wus.wapp.wii.com diff --git a/dns_zones.json b/dns_zones.json index 6c24b37..744df78 100644 --- a/dns_zones.json +++ b/dns_zones.json @@ -112,7 +112,7 @@ { "type":"a", "name":"mariokartwii.race.gs.wiimmfi.de", - "value":"167.86.108.126" + "value":"188.34.177.217" }, { "type":"a", @@ -284,4 +284,4 @@ "name":"wus.wapp.wii.com", "value":"167.86.108.126" } -] \ No newline at end of file +]