From d3cbefc99f5cb770cb84e092f160bb60993ab57d Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 22 Feb 2020 13:35:32 +0800 Subject: [PATCH] smartdns: adjust dns settings --- .../root/etc/config/black.list | 5 ++ .../root/etc/config/shadowsocksr | 6 ++ .../luci-app-vssr/root/etc/config/black.list | 5 ++ .../ctcgfw/luci-app-vssr/root/etc/config/vssr | 13 ++--- .../root/etc/config/black.list | 5 ++ .../root/etc/config/shadowsocksr | 6 ++ package/lienol/tcping/Makefile | 37 +++++++------ package/ntlf9t/smartdns/conf/custom.conf | 55 +++++++------------ 8 files changed, 74 insertions(+), 58 deletions(-) diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/root/etc/config/black.list b/package/ctcgfw/luci-app-ssr-plus-Jo/root/etc/config/black.list index 013fb9cc35..e60cdc3a10 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/root/etc/config/black.list +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/root/etc/config/black.list @@ -1,3 +1,4 @@ +1dot1dot1dot1.cloudflare-dns.com 91smartyun.pt adobe.com amazonaws.com @@ -9,10 +10,14 @@ backpackers.com.tw bitfinex.com buzzfeed.com clockwise.ee +cloudflare-dns.com cloudfront.net coindesk.com coinsquare.io cryptocompare.com +dns.google +dns9.quad9.net +doh.opendns.com dropboxstatic.com eurecom.fr gdax.com diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/root/etc/config/shadowsocksr b/package/ctcgfw/luci-app-ssr-plus-Jo/root/etc/config/shadowsocksr index 016d86f371..1fcef37f6a 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/root/etc/config/shadowsocksr +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/root/etc/config/shadowsocksr @@ -71,6 +71,12 @@ config access_control list wan_fw_ips '91.108.4.0/22' list wan_fw_ips '91.108.56.0/22' list wan_fw_ips '109.239.140.0/24' + list wan_fw_ips '1.1.1.1/32' + list wan_fw_ips '1.0.0.1/32' + list wan_fw_ips '8.8.8.8/32' + list wan_fw_ips '8.8.4.4/32' + list wan_fw_ips '9.9.9.9/32' + list wan_fw_ips '146.112.41.2/32' config server_global option enable_server '0' diff --git a/package/ctcgfw/luci-app-vssr/root/etc/config/black.list b/package/ctcgfw/luci-app-vssr/root/etc/config/black.list index 013fb9cc35..e60cdc3a10 100644 --- a/package/ctcgfw/luci-app-vssr/root/etc/config/black.list +++ b/package/ctcgfw/luci-app-vssr/root/etc/config/black.list @@ -1,3 +1,4 @@ +1dot1dot1dot1.cloudflare-dns.com 91smartyun.pt adobe.com amazonaws.com @@ -9,10 +10,14 @@ backpackers.com.tw bitfinex.com buzzfeed.com clockwise.ee +cloudflare-dns.com cloudfront.net coindesk.com coinsquare.io cryptocompare.com +dns.google +dns9.quad9.net +doh.opendns.com dropboxstatic.com eurecom.fr gdax.com diff --git a/package/ctcgfw/luci-app-vssr/root/etc/config/vssr b/package/ctcgfw/luci-app-vssr/root/etc/config/vssr index 7085e95e94..e2b1e17ebe 100644 --- a/package/ctcgfw/luci-app-vssr/root/etc/config/vssr +++ b/package/ctcgfw/luci-app-vssr/root/etc/config/vssr @@ -1,7 +1,4 @@ - - - config global option tunnel_forward '8.8.4.4:53' option tunnel_address '0.0.0.0' @@ -38,6 +35,12 @@ config access_control list wan_fw_ips '91.108.4.0/22' list wan_fw_ips '91.108.56.0/22' list wan_fw_ips '109.239.140.0/24' + list wan_fw_ips '1.1.1.1/32' + list wan_fw_ips '1.0.0.1/32' + list wan_fw_ips '8.8.8.8/32' + list wan_fw_ips '8.8.4.4/32' + list wan_fw_ips '9.9.9.9/32' + list wan_fw_ips '146.112.41.2/32' config server_global option enable_server '0' @@ -71,7 +74,3 @@ config udpspeeder option timeout '8' option udpspeeder_enable '0' - - - - diff --git a/package/lean/luci-app-ssr-plus/root/etc/config/black.list b/package/lean/luci-app-ssr-plus/root/etc/config/black.list index 013fb9cc35..e60cdc3a10 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/config/black.list +++ b/package/lean/luci-app-ssr-plus/root/etc/config/black.list @@ -1,3 +1,4 @@ +1dot1dot1dot1.cloudflare-dns.com 91smartyun.pt adobe.com amazonaws.com @@ -9,10 +10,14 @@ backpackers.com.tw bitfinex.com buzzfeed.com clockwise.ee +cloudflare-dns.com cloudfront.net coindesk.com coinsquare.io cryptocompare.com +dns.google +dns9.quad9.net +doh.opendns.com dropboxstatic.com eurecom.fr gdax.com diff --git a/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr index e6b949e7b1..66448746c9 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr @@ -27,6 +27,12 @@ config access_control list wan_fw_ips '91.108.4.0/22' list wan_fw_ips '91.108.56.0/22' list wan_fw_ips '109.239.140.0/24' + list wan_fw_ips '1.1.1.1/32' + list wan_fw_ips '1.0.0.1/32' + list wan_fw_ips '8.8.8.8/32' + list wan_fw_ips '8.8.4.4/32' + list wan_fw_ips '9.9.9.9/32' + list wan_fw_ips '146.112.41.2/32' config server_global option enable_server '0' diff --git a/package/lienol/tcping/Makefile b/package/lienol/tcping/Makefile index 6933798ff3..6e34f11a68 100644 --- a/package/lienol/tcping/Makefile +++ b/package/lienol/tcping/Makefile @@ -1,39 +1,42 @@ +# +# Copyright (C) 2014 OpenWrt-dist +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + include $(TOPDIR)/rules.mk + PKG_NAME:=tcping -PKG_VERSION:=0.2 -PKG_RELEASE=1 +PKG_VERSION:=0.1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/coolsnowwolf/tcping +PKG_SOURCE_URL:=https://github.com/jlyo/tcping.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=d890cc1bd8e3951390ceeff1ccb092a5d802850c +PKG_SOURCE_VERSION:=79ef6f85d7147d33d0835fac060618ab136503c8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MAINTAINER:=coolsnowwolf +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk define Package/tcping - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libnet-1.2.x - TITLE:=Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes + SECTION:=net + CATEGORY:=Network + TITLE:=tcping measures the latency of a tcp-connection + URL:=https://github.com/jlyo/tcping endef define Package/tcping/description -Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes endef -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/include -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \ - INSTALL_PROG=":" +define Package/tcping/conffiles endef define Package/tcping/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpping $(1)/usr/bin/tcping + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping $(1)/usr/sbin endef $(eval $(call BuildPackage,tcping)) diff --git a/package/ntlf9t/smartdns/conf/custom.conf b/package/ntlf9t/smartdns/conf/custom.conf index 8f24e83334..d0465a6a8c 100644 --- a/package/ntlf9t/smartdns/conf/custom.conf +++ b/package/ntlf9t/smartdns/conf/custom.conf @@ -13,41 +13,28 @@ # List of hosts that supply bogus NX domain results # bogus-nxdomain [ip/subnet] -speed-check-mode ping,tcp:80 +speed-check-mode tcp:80,ping server 140.143.226.193 server 140.143.65.193 server 202.141.178.13:5353 server 202.38.93.153:5353 server 202.141.162.123:5353 -server 208.67.222.222:5353 -group fq_dns -server 208.67.220.220:5353 -group fq_dns server 2001:da8::666 -server 2001:4860:4860::8888 -group fq_dns -server 2001:4860:4860::8844 -group fq_dns -server 2606:4700:4700::1111 -group fq_dns -server 2606:4700:4700::1001 -group fq_dns -server-tcp 9.9.9.9 -group fq_dns -server-tcp 8.8.8.8 -group fq_dns -server-tcp 8.8.4.4 -group fq_dns -server-tcp 2001:4860:4860::8888 -group fq_dns -server-tcp 2001:4860:4860::8844 -group fq_dns -server-tcp 1.1.1.1 -group fq_dns -server-tcp 1.0.0.1 -group fq_dns -server-tcp 2606:4700:4700::1111 -group fq_dns -server-tcp 2606:4700:4700::1001 -group fq_dns +server-tcp 9.9.9.9 -group fq_dns -exclude-default-group +server-tcp 8.8.8.8 -group fq_dns -exclude-default-group +server-tcp 8.8.4.4 -group fq_dns -exclude-default-group +server-tcp 1.1.1.1 -group fq_dns -exclude-default-group +server-tcp 1.0.0.1 -group fq_dns -exclude-default-group -server-tls 8.8.8.8 -host-name dns.google -group fq_dns -server-tls 8.8.4.4 -host-name dns.google -group fq_dns -server-tls 2001:4860:4860::8888 -host-name dns.google -group fq_dns -server-tls 2001:4860:4860::8844 -host-name dns.google -group fq_dns -server-tls dns.google -group fq_dns -server-tls 1.1.1.1 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -server-tls 1.0.0.1 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -server-tls 2606:4700:4700::1111 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -server-tls 2606:4700:4700::1001 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -server-tls 1dot1dot1dot1.cloudflare-dns.com -group fq_dns +server-tls dns.233py.com +server-tls 8.8.8.8 -host-name dns.google -group fq_dns -exclude-default-group +server-tls 8.8.4.4 -host-name dns.google -group fq_dns -exclude-default-group +server-tls dns.google -group fq_dns -exclude-default-group +server-tls 1.1.1.1 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group +server-tls 1.0.0.1 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group +server-tls 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group server-https https://202.141.178.13/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org server-https https://202.38.93.153/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org @@ -56,11 +43,11 @@ server-https https://115.159.131.230/resolve -host-name dns.rubyfish.cn -http-ho server-https https://dns.rubyfish.cn/dns-query server-https https://45.77.180.10/resolve -host-name dns.containerpi.com -http-host dns.containerpi.com server-https https://dns.containerpi.com/dns-query -server-https https://9.9.9.9/dns-query -host-name dns9.quad9.net -http-host dns9.quad9.net -group fq_dns -server-https https://dns9.quad9.net/dns-query -group fq_dns -server-https https://1.1.1.1/dns-query -group fq_dns -server-https https://1.0.0.1/dns-query -group fq_dns -server-https https://cloudflare-dns.com/dns-query -group fq_dns -server-https https://146.112.41.2/dns-query -host-name doh.opendns.com -http-host doh.opendns.com -group fq_dns -server-https https://2620:119:fc::2/dns-query -host-name doh.opendns.com -http-host doh.opendns.com -group fq_dns -server-https https://doh.opendns.com/dns-query -group fq_dns +server-https https://i.233py.com/dns-query +server-https https://9.9.9.9/dns-query -host-name dns9.quad9.net -http-host dns9.quad9.net -group fq_dns -exclude-default-group +server-https https://dns9.quad9.net/dns-query -group fq_dns -exclude-default-group +server-https https://1.1.1.1/dns-query -group fq_dns -exclude-default-group +server-https https://1.0.0.1/dns-query -group fq_dns -exclude-default-group +server-https https://cloudflare-dns.com/dns-query -group fq_dns -exclude-default-group +server-https https://146.112.41.2/dns-query -host-name doh.opendns.com -http-host doh.opendns.com -group fq_dns -exclude-default-group +server-https https://doh.opendns.com/dns-query -group fq_dns -exclude-default-group