Merge branch 'master' into master

This commit is contained in:
Frank Denis 2021-02-23 18:33:42 +01:00 committed by GitHub
commit 6cb0cde886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 15 deletions

View File

@ -20,13 +20,13 @@ try_resolver() {
ERROR_LOG_TMP=".errors"
resolver_name="$1"
stamp="$2"
if dnslookup one.net "$line" >/dev/null 2>&1; then
if dnslookup one.net "$stamp" >/dev/null 2>&1; then
echo "pass: ${resolver_name}"
elif dnslookup one.net "$line" >/dev/null 2>&1; then
elif dnslookup one.net "$stamp" >/dev/null 2>&1; then
echo "pass: ${resolver_name} (1 retry)"
elif dnslookup one.net "$line" >/dev/null 2>&1; then
elif dnslookup one.net "$stamp" >/dev/null 2>&1; then
echo "pass: ${resolver_name} (2 retries)"
elif dnslookup one.net "$line" >/dev/null 2>"$ERROR_LOG_TMP"; then
elif dnslookup one.net "$stamp" >/dev/null 2>"$ERROR_LOG_TMP"; then
echo "pass: ${resolver_name} (3 retries)"
else
if grep -Eq "(no route|unreachable)" "$ERROR_LOG_TMP"; then
@ -88,7 +88,7 @@ while read -r stamp; do
echo "$stamp"
echo
try_resolver "(new entry)" "$stamp"
try_resolver "(new entry)" "$stamp" || exit 1
{
echo 'listen_addresses = ["127.0.0.1:5300"]'

View File

@ -25,13 +25,13 @@ try_resolver() {
ERROR_LOG_TMP=".errors"
resolver_name="$1"
stamp="$2"
if dnslookup one.net "$line" >/dev/null 2>&1; then
if dnslookup one.net "$stamp" >/dev/null 2>&1; then
echo "pass: ${resolver_name}"
elif dnslookup one.net "$line" >/dev/null 2>&1; then
elif dnslookup one.net "$stamp" >/dev/null 2>&1; then
echo "pass: ${resolver_name} (1 retry)"
elif dnslookup one.net "$line" >/dev/null 2>&1; then
elif dnslookup one.net "$stamp" >/dev/null 2>&1; then
echo "pass: ${resolver_name} (2 retries)"
elif dnslookup one.net "$line" >/dev/null 2>"$ERROR_LOG_TMP"; then
elif dnslookup one.net "$stamp" >/dev/null 2>"$ERROR_LOG_TMP"; then
echo "pass: ${resolver_name} (3 retries)"
else
if grep -Eq "(no route|unreachable)" "$ERROR_LOG_TMP"; then

View File

@ -1389,6 +1389,13 @@ https://www.iij.ad.jp/
sdns://AgUAAAAAAAAACjEwMy4yLjU3LjUgmOPV5TavKVjNL38U9wTvSidtJeM81l8uZfXk8nJ8EzARcHVibGljLmRucy5paWouanAKL2Rucy1xdWVyeQ
## indonesia-unfilter-doh
Non-logging and non-Filtering DoH forwarder in Indonesia.
sdns://AgYAAAAAAAAACjExNi4wLjIuODYgMob_ZaZfrzIIXuoTiMNzi6fjeHPJBszjxKKLTMKliYgPZG9oLnRoaXMud2ViLmlkCi9kbnMtcXVlcnk
## jitender
DNSCrypt resolver in Hyderabad, India, Oracle Cloud

View File

@ -1,4 +1,4 @@
untrusted comment: signature from minisign secret key
RWQf6LRCGA9i55DnsLfUU4/Th+i/SSh8miXLF1AtHsdiT32Phh7lguOMquRRdf7qLbzEWcEy0Mhj3BVBd/oHCDwJaKYCUi208wI=
trusted comment: timestamp:1614095736 file:public-resolvers.md
lfpsC1TcJ3hbzBP59gYo/0/OxtRzwzwDQ5W3VyhnW5chtUoNbmORQJVBR3vcNMpc96Q3FN20/A7egO7WQCatBg==
RWQf6LRCGA9i55CZbVYM4kPsuLoz1fYtMkEiTxsCxyPdlcZGnKRtMioHsBKc2s31j7fXSnW4G+tDiDbfupk7vjvVmCIxfVxYaQs=
trusted comment: timestamp:1614101473 file:public-resolvers.md
oI0QooPhYpAep1cX2tjMkVaHT9S9sA76VS5b8tj0oa94Y9GkEhxRp73oRuBXj9e4OeBLc9ZiYemJANMtnxA7AQ==

View File

@ -1413,6 +1413,13 @@ https://www.iij.ad.jp/
sdns://AgUAAAAAAAAACjEwMy4yLjU3LjUgmOPV5TavKVjNL38U9wTvSidtJeM81l8uZfXk8nJ8EzARcHVibGljLmRucy5paWouanAKL2Rucy1xdWVyeQ
## indonesia-unfilter-doh
Non-logging and non-Filtering DoH forwarder in Indonesia.
sdns://AgYAAAAAAAAACjExNi4wLjIuODYgMob_ZaZfrzIIXuoTiMNzi6fjeHPJBszjxKKLTMKliYgPZG9oLnRoaXMud2ViLmlkCi9kbnMtcXVlcnk
## jitender
DNSCrypt resolver in Hyderabad, India, Oracle Cloud

View File

@ -1,4 +1,4 @@
untrusted comment: signature from minisign secret key
RWQf6LRCGA9i53Ukx13HVE5m9kgrhi7/pnIVQx9PAg05ys6q3Wkov8SM/RCz/gwn2/Grk3f5ET7KUMiAu0tgKhLXX4XXmvTqGgk=
trusted comment: timestamp:1614095736 file:public-resolvers.md
q/OuWh2kBZaCEOfzhcgJyDfMyny/jpHPlc+3Hf/oZnm57z/+Uh9dnOhg7NEBaBCkVafLF9LDsWB2xpJzd0PfBg==
RWQf6LRCGA9i59DpGx5EbBG3Aw51GgZgWu984CbhtpaGIdbX759HpZiK97gigVqGAZzKUiN5XKto6yauzf/q4TlH2KdpVUxCDAk=
trusted comment: timestamp:1614101473 file:public-resolvers.md
tULX/W/pKkn2Dj/HbW7VMfMwVhL2VmyvkjBxvBc2umjDNaMk6Ro1/shz7PsaOHp2CvWjSLut7Bz9oKKThm+3AA==