ReadMe: Update package list information

Signed-off-by: Rosen Penev <rosenp@gmail.com>

.clang-format

@@ -1,9 +1,9 @@
-#http://clang.llvm.org/docs/ClangFormatStyleOptions.html
+#http://clang.llvm.org/docs/ClangFormatStyleOptions.html
-
+
-BasedOnStyle: LLVM
+BasedOnStyle: LLVM
-IndentWidth: 4
+IndentWidth: 4
-TabWidth: 4
+TabWidth: 4
-UseTab: ForContinuationAndIndentation
+UseTab: ForContinuationAndIndentation
-MaxEmptyLinesToKeep: 1
+MaxEmptyLinesToKeep: 1
-AllowShortFunctionsOnASingleLine: Empty
+AllowShortFunctionsOnASingleLine: Empty
-BreakBeforeBraces: Linux
+BreakBeforeBraces: Linux

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,20 @@
+---
+name: 需求建议
+about: 需求建议描述
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**需求应用场景**
+请描述需求应用的场景和方式。
+
+**建议的方案**
+实现上述场景建议的方案。
+
+**设备信息**
+1. 设备信息（CPU，厂家）  
+
+2. 固件信息
+

.github/ISSUE_TEMPLATE/issue.md

@@ -0,0 +1,29 @@
+---
+name: 问题报告
+about: 问题现象描述
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**问题现象**  
+简要描述问题出现的现象
+
+**运行环境**
+1. 固件型号  
+
+2. 运营商  
+
+**重现步骤**
+1. 上游DNS配置。  
+
+2. 访问的域名。  
+
+
+**信息收集**  
+1. 将/var/log/smrtdns.log日志作为附件上传。  
+2. 如进程异常，请将coredump功能开启，上传coredump信息文件。  
+在自定义界面，开启设置->自定义设置->生成coredump配置，重现问题后提交coredump文件
+coredump文件在/tmp目录下
+

etc/init.d/smartdns

@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ### BEGIN INIT INFO
 # Provides:        smartdns
@@ -19,14 +34,14 @@ test -x $SMARTDNS || exit 5
 
 case $1 in
 	start)
-		$SMARTDNS $SMART_DNS_OPTS
+		$SMARTDNS "$SMART_DNS_OPTS"
 		while true; do
 			if [ -e "$PIDFILE" ]; then
 				break;
 			fi
 			sleep .5
 		done
-		PID="`cat $PIDFILE 2>/dev/null`"
+		PID="$(cat $PIDFILE 2>/dev/null)"
 		if [ -z "$PID" ]; then
 			echo "start smartdns server failed."
 			exit 1
@@ -42,25 +57,25 @@ case $1 in
 			echo "smartdns server is stopped."
 			exit 0
 		fi
-		PID="`cat $PIDFILE 2>/dev/null`"
+		PID="$(cat $PIDFILE 2>/dev/null)"
 		if [ ! -e "/proc/$PID" ] || [ -z "$PID" ]; then
 			echo "smartdns server is stopped"
 			exit 0
 		fi
 
-		kill -TERM $PID
+		kill -TERM "$PID"
 		if [ $? -ne 0 ]; then
 			echo "Stop smartdns server failed."
 			exit 1;
 		fi
-		rm -f $PIDFILE
+		rm -f "$PIDFILE"
 		echo "Stop smartdns server success."
 		;;
 	restart)
-		$0 stop && sleep 1 && $0 start
+		"$0" stop && sleep 1 && "$0" start
 		;;
 	status)
-		PID="`cat $PIDFILE 2>/dev/null`"
+		PID="$(cat "$PIDFILE" 2>/dev/null)"
 		if [ ! -e "/proc/$PID" ] || [ -z "$PID" ]; then
 			echo "smartdns server is not running."
 			exit 1

etc/smartdns/smartdns.conf

@@ -1,4 +1,4 @@
-# dns server name, defaut is host name
+# dns server name, default is host name
 # server-name, 
 # example:
 #   server-name smartdns
@@ -8,14 +8,28 @@
 # conf-file [file]
 # conf-file blacklist-ip.conf
 
-# dns server bind ip and port, default dns server port is 53.
+# dns server bind ip and port, default dns server port is 53, support binding multi ip and port
-# bind [IP]:port, udp server
+# bind udp server
-# bind-tcp [IP]:port, tcp server
+#   bind [IP]:[port] [-group [group]] [-no-rule-addr] [-no-rule-nameserver] [-no-rule-ipset] [-no-speed-check] [-no-cache] [-no-rule-soa] [-no-dualstack-selection]
+# bind tcp server
+#   bind-tcp [IP]:[port] [-group [group]] [-no-rule-addr] [-no-rule-nameserver] [-no-rule-ipset] [-no-speed-check] [-no-cache] [-no-rule-soa] [-no-dualstack-selection]
+# option:
+#   -group: set domain request to use the appropriate server group.
+#   -no-rule-addr: skip address rule.
+#   -no-rule-nameserver: skip nameserver rule.
+#   -no-rule-ipset: skip ipset rule.
+#   -no-speed-check: do not check speed.
+#   -no-cache: skip cache.
+#   -no-rule-soa: Skip address SOA(#) rules.
+#   -no-dualstack-selection: Disable dualstack ip selection.
+#   -force-aaaa-soa: force AAAA query return SOA.
 # example: 
-#   IPV4: :53
+#  IPV4: 
-#   IPV6  [::]:53
+#    bind :53
-# bind-tcp [::]:53
+#    bind :6053 -group office -no-speed-check
-
+#  IPV6:
+#    bind [::]:53
+#    bind-tcp [::]:53
 bind [::]:53
 
 # tcp connection idle timeout
@@ -30,15 +44,33 @@ cache-size 512
 # prefetch-domain [yes|no]
 # prefetch-domain yes
 
+# cache serve expired 
+# serve-expired [yes|no]
+# serve-expired yes
+
+# cache serve expired TTL
+# serve-expired-ttl [num]
+# serve-expired-ttl 0
+
 # List of hosts that supply bogus NX domain results 
 # bogus-nxdomain [ip/subnet]
 
 # List of IPs that will be filtered when nameserver is configured -blacklist-ip parameter
 # blacklist-ip [ip/subnet]
 
+# List of IPs that will be accepted when nameserver is configured -whitelist-ip parameter
+# whitelist-ip [ip/subnet]
+
 # List of IPs that will be ignored
 # ignore-ip [ip/subnet]
 
+# speed check mode
+# speed-check-mode [ping|tcp:port|none|,]
+# example:
+#   speed-check-mode ping,tcp:80
+#   speed-check-mode tcp:443,ping
+#   speed-check-mode none
+
 # force AAAA query return SOA
 # force-AAAA-SOA [yes|no]
 
@@ -72,39 +104,46 @@ log-level info
 # log-num 2
 
 # dns audit
-# audit-enable: enable or disable audit [yes|no]
+# audit-enable [yes|no]: enable or disable audit.
 # audit-enable yes
+# audit-SOA [yes|no]: enable or disable log soa result.
 # audit-size size of each audit file, support k,m,g
 # audit-file /var/log/smartdns-audit.log
 # audit-size 128k
 # audit-num 2
 
 # remote udp dns server list
-# server [IP]:[PORT] [-blacklist-ip] [-check-edns] [-group [group] ...] [-exclude-default-group]
+# server [IP]:[PORT] [-blacklist-ip] [-whitelist-ip] [-check-edns] [-group [group] ...] [-exclude-default-group]
 # default port is 53
 #   -blacklist-ip: filter result with blacklist ip
+#   -whitelist-ip: filter result whth whitelist ip,  result in whitelist-ip will be accepted.
 #   -check-edns: result must exist edns RR, or discard result.
 #   -group [group]: set server to group, use with nameserver /domain/group.
 #   -exclude-default-group: exclude this server from default group.
 # server 8.8.8.8 -blacklist-ip -check-edns -group g1 -group g2
 
 # remote tcp dns server list
-# server-tcp [IP]:[PORT] [-blacklist-ip] [-group [group] ...] [-exclude-default-group]
+# server-tcp [IP]:[PORT] [-blacklist-ip] [-whitelist-ip] [-group [group] ...] [-exclude-default-group]
 # default port is 53
 # server-tcp 8.8.8.8
 
 # remote tls dns server list
-# server-tls [IP]:[PORT] [-blacklist-ip] [-spki-pin [sha256-pin]] [-group [group] ...] [-exclude-default-group]
+# server-tls [IP]:[PORT] [-blacklist-ip] [-whitelist-ip] [-spki-pin [sha256-pin]] [-group [group] ...] [-exclude-default-group]
 #   -spki-pin: TLS spki pin to verify.
-# Get SKPI with this command:
+#   -tls-host-check: cert hostname to verify.
+#   -hostname: TLS sni hostname.
+# Get SPKI with this command:
 #    echo | openssl s_client -connect '[ip]:853' | openssl x509 -pubkey -noout | openssl pkey -pubin -outform der | openssl dgst -sha256 -binary | openssl enc -base64
 # default port is 853
 # server-tls 8.8.8.8
 # server-tls 1.0.0.1
 
 # remote https dns server list
-# server-https https://[host]:[port]/path [-blacklist-ip] [-spki-pin [sha256-pin]] [-group [group] ...] [-exclude-default-group]
+# server-https https://[host]:[port]/path [-blacklist-ip] [-whitelist-ip] [-spki-pin [sha256-pin]] [-group [group] ...] [-exclude-default-group]
 #   -spki-pin: TLS spki pin to verify.
+#   -tls-host-check: cert hostname to verify.
+#   -hostname: TLS sni hostname.
+#   -http-host: http host.
 # default port is 443
 # server-https https://cloudflare-dns.com/dns-query
 
@@ -127,3 +166,11 @@ log-level info
 # ipset /www.example.com/block, set ipset with ipset name of block 
 # ipset /www.example.com/-, ignore this domain
 
+# set domain rules
+# domain-rules /domain/ [-speed-check-mode [...]]
+# rules:
+#   -speed-check-mode [mode]: speed check mode
+#                             speed-check-mode [ping|tcp:port|none|,]
+#   -address [address|-]: same as address option
+#   -nameserver [group|-]: same as nameserver option
+#   -ipset [ipset|-]: same as ipset option

install

@@ -1,7 +1,19 @@
 #!/bin/sh
 #
-# Copyright (C) 2018 Ruilin Peng (Nick) <pymumu@gmail.com>
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
 #
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 INST_DIR=$(cd $(dirname $0);pwd)
 ISWSL=1 # 1 means not WSL, 0 means wsl 
@@ -53,7 +65,7 @@ clean_service()
 
 get_systemd_path()
 {
-	service="`systemctl --no-legend| grep .service | head -n 1 | awk '{print $1}'`"
+	service="`systemctl --no-legend| grep '\.service' | head -n 1 | awk '{print $1}'`"
 	SERVICE_PATH="`systemctl show $service | grep FragmentPath | awk -F'=' '{print $2}'`"
 	dirname $SERVICE_PATH
 }
@@ -82,7 +94,9 @@ install_files()
 	
 	install -v -m 0755 -t $SMARTDNS_INIT_DIR etc/init.d/smartdns 
 	if [ $? -ne 0 ]; then
-		return 1
+		if [ $ISSYSTEMD -ne 0 ]; then
+			return 1
+		fi
 	fi
 
 	if [ $ISSYSTEMD -eq 0 ]; then

package/build-pkg.sh

@@ -0,0 +1,182 @@
+#!/bin/sh
+# Copyright (C) 2018-2019 Nick Peng (pymumu@gmail.com)
+
+CURR_DIR=$(cd $(dirname $0);pwd)
+VER="`date +"1.%Y.%m.%d-%H%M"`"
+CODE_DIR="$CURR_DIR/.."
+IS_BUILD_SMARTDNS=1
+OUTPUTDIR=$CURR_DIR
+export CC
+export STRIP
+
+showhelp()
+{
+	echo "Usage: $0 [OPTION]"
+	echo "Options:"
+	echo " --platform [luci|luci-compat|debian|openwrt|optware|linux]    build for platform. "
+	echo " --arch [all|armhf|arm64|x86-64|...]               build for architecture, e.g. "
+	echo " --cross-tool [cross-tool]                         cross compiler, e.g. mips-openwrt-linux-"
+	echo ""
+	echo "Advance Options:"
+	echo " --static                                          static link smartdns"
+	echo " --only-package                                    only package, not build source"
+	echo " --filearch [arch]                                 output file arch, default: equal --arch"
+	echo " --outputdir [dir]                                 output package to specific directory"
+	echo " "
+	echo "Example:"
+	echo " build luci:"
+	echo "   $0 --platform luci"
+	echo " build luci:"
+	echo "   $0 --platform luci-compat"
+	echo " build debian:"
+	echo "   $0 --platform debian --arch x86-64"
+	echo " build raspbian pi:"
+	echo "   $0 --platform debian --arch armhf"
+	echo " build optware mips:"
+	echo "   $0 --platform optware --arch mipsbig"
+	echo " build openwrt mips:"
+	echo "   $0 --platform openwrt --arch mips_24kc"
+	echo " build generic linux:"
+	echo "   $0 --platform linux --arch x86-64"
+}
+
+build_smartdns()
+{
+	if [ "$PLATFORM" != "luci" ]; then
+		make -C $CODE_DIR/src clean 
+		make -C $CODE_DIR/src all -j8 VER=$VER $MAKE_ARGS
+		if [ $? -ne 0 ]; then
+			echo "make smartdns failed"
+			exit 1
+		fi
+	fi
+
+	$STRIP -d $CODE_DIR/src/smartdns >/dev/null 2>&1
+
+	return 0
+}
+
+
+build()
+{
+	echo "build package for $PLATFORM"
+
+	if [ $IS_BUILD_SMARTDNS -eq 1 ]; then
+		build_smartdns
+		if [ $? -ne 0 ]; then
+			return 1
+		fi
+	fi
+
+	chmod +x $CODE_DIR/package/$PLATFORM/make.sh
+	$CODE_DIR/package/$PLATFORM/make.sh -o $CURR_DIR --arch $ARCH --ver $VER --filearch $FILEARCH -o $OUTPUTDIR
+	if [ $? -ne 0 ]; then
+		echo "build package for $PLATFORM failed"
+		return 1
+	fi
+
+	echo "build package for $PLATFORM success."
+	return 0
+}
+
+main()
+{
+	OPTS=`getopt -o o:h --long arch:,filearch:,ver:,platform:,cross-tool:,static,only-package,outputdir: \
+		-n  "" -- "$@"`
+
+	if [ "$#" -le "1" ]; then
+		showhelp
+		exit 1
+	fi
+
+	if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+	# Note the quotes around `$TEMP': they are essential!
+	eval set -- "$OPTS"
+
+	while true; do
+		case "$1" in
+		--arch)
+			ARCH="$2"
+			shift 2;;
+		--filearch)
+			FILEARCH="$2"
+			shift 2;;
+		--platform)
+			PLATFORM="$2"
+			shift 2;;
+		--cross-tool)
+			CROSS_TOOL="$2"
+			shift 2;;
+		--static)
+			export STATIC="yes"
+			shift 1;;
+		--only-package)
+			IS_BUILD_SMARTDNS=0
+			shift 1;;
+		--outputdir)
+			OUTPUTDIR="$2"
+			shift 2;;
+		--ver)
+			VER="$2"
+			shift 2;;
+		-h | --help )
+			showhelp
+			return 0
+			shift ;;
+		-- ) shift; break ;;
+		* ) break ;;
+		esac
+	done
+
+	if [ -z "$PLATFORM" ]; then
+		echo "please input platform"
+		echo "run $0 -h for help."
+		return 1
+	fi
+	
+	if [ "$PLATFORM" = "luci" ]; then
+		ARCH="all"
+	fi
+
+	if [ -z "$ARCH" ]; then
+		echo "please input arch."
+		echo "run $0 -h for help."
+		return 1
+	fi
+
+	if [ -z "$FILEARCH" ]; then 
+		FILEARCH="$ARCH"
+	fi
+
+	if [ -z "$OUTPUTDIR" ]; then
+		OUTPUTDIR=$CURR_DIR
+	fi
+
+	if [ ! -z "$CROSS_TOOL" ]; then
+		CC="${CROSS_TOOL}gcc"
+		STRIP="${CROSS_TOOL}strip"
+	fi
+
+	if [ -z "$CC" ]; then
+		CC="gcc"
+	fi
+
+	if [ -z "$STRIP" ]; then
+		if [ ! -z "`echo $CC | grep '\-gcc'`" ]; then
+			STRIP="`echo "$CC" | sed 's/-gcc\$/-strip/g'`"
+		else
+			STRIP="strip"
+		fi
+	fi
+
+	if [ ! -e "`which $CC`" ]; then
+		echo "Cannot find compiler $CC"
+		return 1
+	fi
+
+	build
+}
+
+main $@
+exit $?

package/debian/DEBIAN/copyright

@@ -3,5 +3,5 @@ Upstream-Name: smartdns
 Source: http://github.com/pymumu/smartdns
 
 Files: *
-Copyright: 2018 Nick peng
+Copyright: 2018-2019 Nick peng
 License: proprietary

package/debian/make.sh

@@ -1,5 +1,19 @@
-#/bin/sh
+#!/bin/sh
-
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 CURR_DIR=$(cd $(dirname $0);pwd)
 VER="`date +"1.%Y.%m.%d-%H%M"`"
 SMARTDNS_DIR=$CURR_DIR/../../
@@ -11,42 +25,46 @@ showhelp()
 	echo "Options:"
 	echo " -o               output directory."
 	echo " --arch           archtecture."
-    echo " --ver            version."
+	echo " --ver            version."
 	echo " -h               show this message."
 }
 
 build()
 {
-    ROOT=/tmp/smartdns-deiban
+	ROOT=/tmp/smartdns-deiban
-    rm -fr $ROOT
+	rm -fr $ROOT
-    mkdir -p $ROOT
+	mkdir -p $ROOT
-    cd $ROOT/
+	cd $ROOT/
 
-    cp $CURR_DIR/DEBIAN $ROOT/ -af
+	cp $CURR_DIR/DEBIAN $ROOT/ -af
-    CONTROL=$ROOT/DEBIAN/control
+	CONTROL=$ROOT/DEBIAN/control
-    mkdir $ROOT/usr/sbin -p
+	mkdir $ROOT/usr/sbin -p
-    mkdir $ROOT/etc/smartdns/ -p
+	mkdir $ROOT/etc/smartdns/ -p
-    mkdir $ROOT/etc/default/ -p
+	mkdir $ROOT/etc/default/ -p
-    mkdir $ROOT/lib/systemd/system/ -p
+	mkdir $ROOT/lib/systemd/system/ -p
 
-    sed -i "s/Version:.*/Version: $VER/" $ROOT/DEBIAN/control
+	sed -i "s/Version:.*/Version: $VER/" $ROOT/DEBIAN/control
-    sed -i "s/Architecture:.*/Architecture: $ARCH/" $ROOT/DEBIAN/control
+	sed -i "s/Architecture:.*/Architecture: $ARCH/" $ROOT/DEBIAN/control
-    chmod 0755 $ROOT/DEBIAN/prerm
+	chmod 0755 $ROOT/DEBIAN/prerm
 
-    cp $SMARTDNS_DIR/etc/smartdns/smartdns.conf  $ROOT/etc/smartdns/
+	cp $SMARTDNS_DIR/etc/smartdns/smartdns.conf  $ROOT/etc/smartdns/
-    cp $SMARTDNS_DIR/etc/default/smartdns  $ROOT/etc/default/
+	cp $SMARTDNS_DIR/etc/default/smartdns  $ROOT/etc/default/
-    cp $SMARTDNS_DIR/systemd/smartdns.service $ROOT/lib/systemd/system/ 
+	cp $SMARTDNS_DIR/systemd/smartdns.service $ROOT/lib/systemd/system/ 
-    cp $SMARTDNS_DIR/src/smartdns $ROOT/usr/sbin
+	cp $SMARTDNS_DIR/src/smartdns $ROOT/usr/sbin
-    chmod +x $ROOT/usr/sbin/smartdns
+	if [ $? -ne 0 ]; then
+		echo "copy smartdns file failed."
+		return 1
+	fi
+	chmod +x $ROOT/usr/sbin/smartdns
 
-    dpkg -b $ROOT $OUTPUTDIR/smartdns.$VER.$ARCH.deb
+	dpkg -b $ROOT $OUTPUTDIR/smartdns.$VER.$FILEARCH.deb
 
-    rm -fr $ROOT/
+	rm -fr $ROOT/
 }
 
 main()
 {
-	OPTS=`getopt -o o:h --long arch:,ver: \
+	OPTS=`getopt -o o:h --long arch:,ver:,filearch: \
 		-n  "" -- "$@"`
 
 	if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -59,31 +77,38 @@ main()
 		--arch)
 			ARCH="$2"
 			shift 2;;
-        --ver)
+		--filearch)
-            VER="$2"
+			FILEARCH="$2"
-            shift 2;;
+			shift 2;;
+		--ver)
+			VER="$2"
+			shift 2;;
 		-o )
 			OUTPUTDIR="$2"
 			shift 2;;
-        -h | --help )
+		-h | --help )
 			showhelp
 			return 0
 			shift ;;
 		-- ) shift; break ;;
 		* ) break ;;
-  		esac
+		esac
 	done
 
-    if [ -z "$ARCH" ]; then
+	if [ -z "$ARCH" ]; then
-        echo "please input arch."
+		echo "please input arch."
-        return 1;
+		return 1;
-    fi
+	fi
 
-    if [ -z "$OUTPUTDIR" ]; then
+	if [ -z "$FILEARCH" ]; then
-        OUTPUTDIR=$CURR_DIR;
+		FILEARCH=$ARCH
-    fi
+	fi
 
-    build
+	if [ -z "$OUTPUTDIR" ]; then
+		OUTPUTDIR=$CURR_DIR;
+	fi
+
+	build
 }
 
 main $@

package/linux/make.sh

@@ -0,0 +1,98 @@
+#!/bin/sh
+
+CURR_DIR=$(cd $(dirname $0);pwd)
+VER="`date +"1.%Y.%m.%d-%H%M"`"
+SMARTDNS_DIR=$CURR_DIR/../../
+SMARTDNS_BIN=$SMARTDNS_DIR/src/smartdns
+
+showhelp()
+{
+	echo "Usage: make [OPTION]"
+	echo "Options:"
+	echo " -o               output directory."
+	echo " --arch           archtecture."
+	echo " --ver            version."
+	echo " -h               show this message."
+}
+
+build()
+{
+	PKG_ROOT=/tmp/smartdns-linux
+	rm -fr $PKG_ROOT
+	mkdir -p $PKG_ROOT/smartdns
+	cd $PKG_ROOT/
+
+	# Generic x86_64
+	mkdir $PKG_ROOT/smartdns/src -p
+	mkdir $PKG_ROOT/smartdns/package -p
+	cd $SMARTDNS_DIR
+	cp package/windows $PKG_ROOT/smartdns/package/ -a
+	cp etc systemd *.md LICENSE install $PKG_ROOT/smartdns/ -a
+	cp src/smartdns $PKG_ROOT/smartdns/src -a
+	if [ $? -ne 0 ]; then
+		echo "copy smartdns file failed"
+		rm -fr $PKG_ROOT
+		exit 1
+	fi
+	cd $PKG_ROOT
+	tar  zcf $OUTPUTDIR/smartdns.$VER.$FILEARCH.tar.gz smartdns
+	if [ $? -ne 0 ]; then
+		echo "create package failed"
+		rm -fr $PKG_ROOT
+		exit 1
+	fi
+	cd $CURR_DIR
+	rm -fr $PKG_ROOT
+}
+
+main()
+{
+	OPTS=`getopt -o o:h --long arch:,ver:,filearch: \
+		-n  "" -- "$@"`
+
+	if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+	# Note the quotes around `$TEMP': they are essential!
+	eval set -- "$OPTS"
+
+	while true; do
+		case "$1" in
+		--arch)
+			ARCH="$2"
+			shift 2;;
+		--filearch)
+			FILEARCH="$2"
+			shift 2;;
+		--ver)
+			VER="$2"
+			shift 2;;
+		-o )
+			OUTPUTDIR="$2"
+			shift 2;;
+		-h | --help )
+			showhelp
+			return 0
+			shift ;;
+		-- ) shift; break ;;
+		* ) break ;;
+  		esac
+	done
+
+	if [ -z "$ARCH" ]; then
+		echo "please input arch."
+		return 1;
+	fi
+
+	if [ -z "$FILEARCH" ]; then
+		FILEARCH=$ARCH
+	fi
+
+	if [ -z "$OUTPUTDIR" ]; then
+		OUTPUTDIR=$CURR_DIR;
+	fi
+
+	build
+}
+
+main $@
+exit $?

package/luci-compat/control/control

@@ -0,0 +1,8 @@
+Package: luci-app-smartdns
+Version: git-18.201.27126-7bf0367-1
+Depends: libc, smartdns
+Source: feeds/luci/applications/luci-app-smartdns
+Section: luci
+Architecture: all
+Installed-Size: 1040
+Description:  A smartdns server module

package/luci-compat/control/postinst

@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+[ "${IPKG_NO_SCRIPT}" = "1" ] && exit 0
+[ -x ${IPKG_INSTROOT}/lib/functions.sh ] || exit 0
+. ${IPKG_INSTROOT}/lib/functions.sh
+default_postinst $0 $@

package/luci-compat/control/postinst-pkg

@@ -0,0 +1,4 @@
+[ -n "${IPKG_INSTROOT}" ] || {
+	(. /etc/uci-defaults/50_luci-smartdns) && rm -f /etc/uci-defaults/50_luci-smartdns
+	exit 0
+}

package/luci-compat/control/prerm

@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+[ -x ${IPKG_INSTROOT}/lib/functions.sh ] || exit 0
+. ${IPKG_INSTROOT}/lib/functions.sh
+default_prerm $0 $@

package/luci-compat/debian-binary

@@ -0,0 +1 @@
+2.0

package/luci-compat/files/etc/uci-defaults/50_luci-smartdns

@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@smartdns[-1]
+	add ucitrack smartdns
+	set ucitrack.@smartdns[-1].init=smartdns
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0

package/luci-compat/files/luci/controller/smartdns.lua

@@ -0,0 +1,83 @@
+--
+-- Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+--
+-- smartdns is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- smartdns is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module("luci.controller.smartdns", package.seeall)
+local smartdns = require "luci.model.smartdns"
+
+function index()
+	if not nixio.fs.access("/etc/config/smartdns") then
+		return
+	end
+
+	local page
+	page = entry({"admin", "services", "smartdns"}, cbi("smartdns/smartdns"), _("SmartDNS"), 60)
+	page.dependent = true
+	page = entry({"admin", "services", "smartdns", "status"}, call("act_status"))
+	page.leaf = true
+	page = entry({"admin", "services", "smartdns", "upstream"}, cbi("smartdns/upstream"), nil)
+	page.leaf = true
+end
+
+local function is_running()
+	return luci.sys.call("pidof smartdns >/dev/null") == 0
+end
+
+function act_status()
+	local e={}
+	local ipv6_server;
+	local redirect_mode="none";
+
+	e.ipv6_works = 2;
+	e.ipv4_works = 2;
+	e.ipv6_server = 1;
+	e.dnsmasq_forward = 0;
+	redirect_mode = smartdns.get_config_option("smartdns", "smartdns", "redirect", nil);
+	if redirect_mode == "redirect" then
+		e.redirect = 1
+	elseif redirect_mode == "dnsmasq-upstream" then
+		e.redirect = 2
+	else
+		e.redirect = 0
+	end
+
+	e.local_port = smartdns.get_config_option("smartdns", "smartdns", "port", nil);
+	ipv6_server = smartdns.get_config_option("smartdns", "smartdns", "ipv6_server", nil);
+	if e.redirect == 1 then 
+		if e.local_port ~= nil and e.local_port ~= "53" then
+			e.ipv4_works = luci.sys.call("iptables -t nat -nL PREROUTING 2>/dev/null | grep REDIRECT | grep dpt:53 | grep %q >/dev/null 2>&1" % e.local_port) == 0
+			if ipv6_server == "1" then
+				e.ipv6_works = luci.sys.call("ip6tables -t nat -nL PREROUTING 2>/dev/null| grep REDIRECT | grep dpt:53 | grep %q >/dev/null 2>&1" % e.local_port) == 0
+			else 
+				e.ipv6_works = 2
+			end
+		else
+			e.redirect = 0
+		end
+	elseif e.redirect == 2 then
+		local str;
+		local dnsmasq_server = luci.sys.exec("uci get dhcp.@dnsmasq[0].server")
+		if e.local_port ~= nil then
+			str = "127.0.0.1#" .. e.local_port 
+			if  string.sub(dnsmasq_server,1,string.len(str)) == str then 
+				e.dnsmasq_forward = 1
+			end
+		end
+	end
+	e.running = is_running()
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(e)
+end

package/luci-compat/files/luci/i18n/smartdns.zh-cn.po

@@ -0,0 +1,293 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "SmartDNS"
+msgstr "SmartDNS"
+
+msgid "SmartDNS is a local high-performance DNS server"
+msgstr "SmartDNS是一个本地高性能DNS服务器"
+
+msgid "SmartDNS Server"
+msgstr "SmartDNS 服务器"
+
+msgid "SmartDNS is a local high-performance DNS server, supports finding fastest IP, supports ad filtering, and supports avoiding DNS poisoning."
+msgstr "SmartDNS是一个本地高性能DNS服务器，支持返回最快IP，支持广告过滤。"
+
+msgid "Custom Settings"
+msgstr "自定义设置"
+
+msgid "General Settings"
+msgstr "基本设置"
+
+msgid "Settings"
+msgstr "设置"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Generate Coredump"
+msgstr "生成coredump"
+
+msgid "Generate Coredump file when smartdns crash, coredump file is located at /tmp/smartdns.xxx.core."
+msgstr "当smartdns异常时生成coredump文件，coredump文件在/tmp/smartdns.xxx.core."
+
+msgid "Server Name"
+msgstr "服务器名称"
+
+msgid "Smartdns server name"
+msgstr "SmartDNS的服务器名称，默认为smartdns，留空为主机名"
+
+msgid "SmartDNS is a local dns server to find fastest ip."
+msgstr "本地高性能服务器，优化网络访问性能。"
+
+msgid "Enable or disable smartdns server"
+msgstr "启用或禁用SmartDNS服务"
+
+msgid "Local Port"
+msgstr "本地端口"
+
+msgid "Smartdns local server port"
+msgstr "SmartDNS本地服务端口"
+
+msgid "IPV4 53 Port Redirect Failure"
+msgstr "IPV4 53端口重定向失败"
+
+msgid "IPV6 53 Port Redirect Failure"
+msgstr "IPV6 53端口重定向失败"
+
+msgid "Dnsmasq Forwared To Smartdns Failure"
+msgstr "重定向dnsmasq到smartdns失败"
+
+msgid "TCP Server"
+msgstr "TCP服务器"
+
+msgid "Enable TCP DNS Server"
+msgstr "启用TCP服务器"
+
+msgid "IPV6 Server"
+msgstr "IPV6服务器"
+
+msgid "Enable IPV6 DNS Server"
+msgstr "启用IPV6服务器"
+
+msgid "Dual-stack IP Selection"
+msgstr "双栈IP优选"
+
+msgid "Enable IP selection between IPV4 and IPV6"
+msgstr "启用或禁用IPV4，IPV6间的IP优选策略。"
+
+msgid "Domain prefetch"
+msgstr "域名预加载"
+
+msgid "Enable domain prefetch, accelerate domain response speed."
+msgstr "启用域名预加载，加速域名响应速度。"
+
+msgid "Serve expired"
+msgstr "过期缓存服务"
+
+msgid "Attempts to serve old responses from cache with a TTL of 0 in the response without waiting for the actual resolution to finish."
+msgstr "查询性能优化，有请求时尝试回应TTL为0的过期记录，以避免查询等待。"
+
+msgid "Redirect"
+msgstr "重定向"
+
+msgid "SmartDNS redirect mode"
+msgstr "SmartDNS 重定向模式"
+
+msgid "Run as dnsmasq upstream server"
+msgstr "作为dnsmasq的上游服务器"
+
+msgid "Redirect 53 port to SmartDNS"
+msgstr "重定向53端口到SmartDNS"
+
+msgid "Cache Size"
+msgstr "缓存大小"
+
+msgid "DNS domain result cache size"
+msgstr "缓存DNS的结果，缓存大小，配置零则不缓存"
+
+msgid "Domain TTL"
+msgstr "域名TTL"
+
+msgid "TTL for all domain result."
+msgstr "设置所有域名的TTL值"
+
+msgid "Domain TTL Min"
+msgstr "域名TTL最小值"
+
+msgid "Minimum TTL for all domain result."
+msgstr "设置所有域名的TTL最小值"
+
+msgid "Domain TTL Max"
+msgstr "域名TTL最大值"
+
+msgid "Maximum TTL for all domain result."
+msgstr "设置所有域名的TTL最大值"
+
+msgid "smartdns custom settings"
+msgstr "smartdns 自定义设置，具体配置参数参考指导"
+
+msgid "Second Server Settings"
+msgstr "第二DNS服务器"
+
+msgid "Enable or disable second DNS server."
+msgstr "是否启用第二DNS服务器。"
+
+msgid "Skip Speed Check"
+msgstr "跳过测速"
+
+msgid "Do not check speed."
+msgstr "禁用测速。"
+
+msgid "Server Group"
+msgstr "服务器组"
+
+msgid "Query DNS through specific dns server group, such as office, home."
+msgstr "使用指定服务器组查询，比如office, home。"
+
+msgid "Skip Address Rules"
+msgstr "跳过address规则"
+
+msgid "Skip address rules."
+msgstr "跳过address规则。"
+
+msgid "Skip Nameserver Rule"
+msgstr "跳过Nameserver规则"
+
+msgid "Skip nameserver rules."
+msgstr "跳过Nameserver规则。"
+
+msgid "Skip Ipset Rule"
+msgstr "跳过ipset规则"
+
+msgid "Skip ipset rules."
+msgstr "跳过ipset规则。"
+
+msgid "Skip SOA Address Rule"
+msgstr "跳过address SOA(#)规则"
+
+msgid "Skip SOA address rules."
+msgstr "跳过address SOA(#)规则。"
+
+msgid "Skip Dualstack Selection"
+msgstr "跳过双栈优选"
+
+msgid "Skip Dualstack Selection."
+msgstr "跳过双栈优选。"
+
+msgid "Skip Cache"
+msgstr "跳过cache"
+
+msgid "Skip Cache."
+msgstr "跳过cache。"
+
+msgid "Upstream Servers"
+msgstr "上游服务器"
+
+msgid "Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS servers, including multiple foreign DNS servers."
+msgstr "上游DNS服务器列表，支持UDP，TCP协议，请配置多个上游DNS服务器，包括多个国内外服务器"
+
+msgid "DNS Server Name"
+msgstr "DNS服务器名称"
+
+msgid "port"
+msgstr "端口"
+
+msgid "DNS Server port"
+msgstr "DNS服务器端口"
+
+msgid "DNS Server ip"
+msgstr "DNS服务器IP"
+
+msgid "type"
+msgstr "类型"
+
+msgid "DNS Server type"
+msgstr "协议类型"
+
+msgid "Domain Address"
+msgstr "域名地址"
+
+msgid "TLS Hostname Verify"
+msgstr "校验TLS主机名"
+
+msgid "Set TLS hostname to verify."
+msgstr "设置校验TLS主机名。"
+
+msgid "TLS SNI name"
+msgstr "TLS SNI名称"
+
+msgid "HTTP Host"
+msgstr "HTTP主机"
+
+msgid "Sets the server name indication for query."
+msgstr "设置查询时使用的服务器SNI名称。"
+
+msgid "Set the HTTP host used for the query. Use this parameter when the host of the URL address is an IP address."
+msgstr "设置查询时使用的HTTP主机，当URL地址的host是IP地址时，使用此参数。"
+
+msgid "Server Group"
+msgstr "服务器组"
+
+msgid "DNS Server group belongs to, used with nameserver, such as office, home."
+msgstr "DNS服务器所属组， 配合nameserver使用，例如：office，home。"
+
+msgid "IP Blacklist Filtering"
+msgstr "IP黑名单过滤"
+
+msgid "Anti Answer Forgery"
+msgstr "反回答伪造"
+
+msgid "Anti answer forgery, if DNS does not work properly after enabling, please turn off this feature"
+msgstr "反回答伪造，如果启用后DNS工作不正常，请关闭此功能。"
+
+msgid "Filtering IP with blacklist"
+msgstr "使用IP黑名单过滤"
+
+msgid "TLS SPKI Pinning"
+msgstr "TLS SPKI 指纹"
+
+msgid "Used to verify the validity of the TLS server, The value is Base64 encoded SPKI fingerprint, leaving blank to indicate that the validity of TLS is not verified."
+msgstr "用于校验TLS服务器的有效性，数值为Base64编码的SPKI指纹, 留空表示不验证TLS的合法性"
+
+msgid "Additional Server Args"
+msgstr "额外的服务器参数"
+
+msgid "Additional Args for upstream dns servers"
+msgstr "额外的上游DNS服务器参数"
+
+msgid "Upstream DNS Server Configuration"
+msgstr "上游DNS服务器配置"
+
+msgid "Set Specific domain ip address."
+msgstr "指定特定域名的IP地址"
+
+msgid "Specify an IP address to return for any host in the given domains, Queries in the domains are never forwarded and always replied to with the specified IP address which may be IPv4 or IPv6."
+msgstr "配置特定域名返回特定的IP地址，域名查询将不到上游服务器请求，直接返回配置的IP地址，可用于广告屏蔽。"
+
+msgid "IP Blacklist"
+msgstr "IP黑名单"
+
+msgid "Set Specific ip blacklist."
+msgstr "设置IP黑名单列表"
+
+msgid "Configure IP blacklists that will be filtered from the results of specific DNS server."
+msgstr "配置需要从指定域名服务器结果过滤的IP黑名单。"
+
+msgid "Technical Support"
+msgstr "技术支持"
+
+msgid "If you like this software, please buy me a cup of coffee."
+msgstr "如果本软件对你有帮助，请给作者加个蛋。"
+
+msgid "SmartDNS official website"
+msgstr "SmartDNS官方网站"
+
+msgid "open website"
+msgstr "打开网站"
+
+msgid "Donate to smartdns"
+msgstr "捐助smartdns项目"
+
+msgid "Donate"
+msgstr "捐助"

package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua

@@ -1,4 +1,18 @@
--- Copyright 2018 Nick Peng (pymumu@gmail.com)
+--
+-- Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+--
+-- smartdns is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- smartdns is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require ("nixio.fs")
 require ("luci.http")
@@ -16,6 +30,7 @@ s = m:section(TypedSection, "smartdns", translate("Settings"), translate("Genera
 s.anonymous = true
 
 s:tab("settings", translate("General Settings"))
+s:tab("seconddns", translate("Second Server Settings"))
 s:tab("custom", translate("Custom Settings"))
 
 ---- Eanble
@@ -68,6 +83,15 @@ o.cfgvalue    = function(...)
     return Flag.cfgvalue(...) or "0"
 end
 
+---- Domain Serve expired
+o = s:taboption("settings", Flag, "serve_expired", translate("Serve expired"), 
+	translate("Attempts to serve old responses from cache with a TTL of 0 in the response without waiting for the actual resolution to finish."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
 ---- Redirect
 o = s:taboption("settings", ListValue, "redirect", translate("Redirect"), translate("SmartDNS redirect mode"))
 o.placeholder = "none"
@@ -92,10 +116,100 @@ o.placeholder = "300"
 o.default     = 300
 o.optional    = true
 
+---- second dns server
 ---- rr-ttl-max
 o = s:taboption("settings", Value, "rr_ttl_max", translate("Domain TTL Max"), translate("Maximum TTL for all domain result."))
 o.rempty      = true
 
+---- Eanble
+o = s:taboption("seconddns", Flag, "seconddns_enabled", translate("Enable"), translate("Enable or disable second DNS server."))
+o.default     = o.disabled
+o.rempty      = false
+
+---- Port
+o = s:taboption("seconddns", Value, "seconddns_port", translate("Local Port"), translate("Smartdns local server port"))
+o.placeholder = 6553
+o.default     = 6553
+o.datatype    = "port"
+o.rempty      = false
+
+---- Enable TCP server
+o = s:taboption("seconddns", Flag, "seconddns_tcp_server", translate("TCP Server"), translate("Enable TCP DNS Server"))
+o.rmempty     = false
+o.default     = o.enabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "1"
+end
+
+---- dns server group
+o = s:taboption("seconddns", Value, "seconddns_server_group", translate("Server Group"), translate("Query DNS through specific dns server group, such as office, home."))
+o.rmempty     = true
+o.placeholder = "default"
+o.datatype    = "hostname"
+o.rempty      = true
+
+o = s:taboption("seconddns", Flag, "seconddns_no_speed_check", translate("Skip Speed Check"), translate("Do not check speed."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
+---- skip address rules
+o = s:taboption("seconddns", Flag, "seconddns_no_rule_addr", translate("Skip Address Rules"), translate("Skip address rules."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
+---- skip name server rules
+o = s:taboption("seconddns", Flag, "seconddns_no_rule_nameserver", translate("Skip Nameserver Rule"), translate("Skip nameserver rules."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
+---- skip ipset rules
+o = s:taboption("seconddns", Flag, "seconddns_no_rule_ipset", translate("Skip Ipset Rule"), translate("Skip ipset rules."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
+---- skip soa address rule
+o = s:taboption("seconddns", Flag, "seconddns_no_rule_soa", translate("Skip SOA Address Rule"), translate("Skip SOA address rules."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
+o = s:taboption("seconddns", Flag, "seconddns_no_dualstack_selection", translate("Skip Dualstack Selection"), translate("Skip Dualstack Selection."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
+---- skip cache
+o = s:taboption("seconddns", Flag, "seconddns_no_cache", translate("Skip Cache"), translate("Skip Cache."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
+---- Force AAAA SOA
+o = s:taboption("seconddns", Flag, "force_aaaa_soa", translate("Force AAAA SOA"), translate("Force AAAA SOA."))
+o.rmempty     = false
+o.default     = o.disabled
+o.cfgvalue    = function(...)
+    return Flag.cfgvalue(...) or "0"
+end
+
 ----- custom settings
 custom = s:taboption("custom", Value, "Custom Settings",
 	translate(""), 
@@ -163,13 +277,14 @@ o:value("https", translate("https"))
 o.default     = "udp"
 o.rempty      = false
 
--- Doman addresss
+s = m:section(TypedSection, "smartdns", translate("Advanced Settings"), translate("Advanced Settings"));
-s = m:section(TypedSection, "smartdns", translate("Domain Address"), 
+s.anonymous = true;
-	translate("Set Specific domain ip address."))
-s.anonymous = true
 
----- address
+s:tab("domain-address", translate("Domain Address"), translate("Set Specific domain ip address."));
-addr = s:option(Value, "address",
+s:tab("blackip-list", translate("IP Blacklist"), translate("Set Specific ip blacklist."));
+
+-- Doman addresss
+addr = s:taboption("domain-address", Value, "address",
 	translate(""), 
 	translate("Specify an IP address to return for any host in the given domains, Queries in the domains are never forwarded and always replied to with the specified IP address which may be IPv4 or IPv6."))
 
@@ -186,12 +301,7 @@ function addr.write(self, section, value)
 end
 
 -- IP Blacklist
-s = m:section(TypedSection, "smartdns", translate("IP Blacklist"), 
+addr = s:taboption("blackip-list", Value, "blacklist_ip",
-	translate("Set Specific ip blacklist."))
-s.anonymous = true
-
----- blacklist
-addr = s:option(Value, "blacklist_ip",
 	translate(""), 
 	translate("Configure IP blacklists that will be filtered from the results of specific DNS server."))
 
@@ -207,7 +317,7 @@ function addr.write(self, section, value)
 	nixio.fs.writefile("/etc/smartdns/blacklist-ip.conf", value)
 end
 
--- Doman addresss
+-- Technical Support
 s = m:section(TypedSection, "smartdns", translate("Technical Support"), 
 	translate("If you like this software, please buy me a cup of coffee."))
 s.anonymous = true

package/luci-compat/files/luci/model/cbi/smartdns/upstream.lua

@@ -1,3 +1,19 @@
+--
+-- Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+--
+-- smartdns is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- smartdns is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 local sid = arg[1]
 
 m = Map("smartdns", "%s - %s" %{translate("SmartDNS Server"), translate("Upstream DNS Server Configuration")})
@@ -39,23 +55,8 @@ o:value("https", translate("https"))
 o.default     = "udp"
 o.rempty      = false
 
----- SNI host name
-o = s:option(Value, "host_name", translate("TLS SNI name"), translate("Sets the server name indication"))
-o.default     = ""
-o.datatype    = "hostname"
-o.rempty      = true
-o:depends("type", "tls")
-o:depends("type", "https")
-
----- http host
-o = s:option(Value, "http_host", translate("HTTP Host"), translate("Set the HTTP host used for the query. Use this parameter when the host of the URL address is an IP address."))
-o.default     = ""
-o.datatype    = "hostname"
-o.rempty      = true
-o:depends("type", "https")
-
 ---- server group
-o = s:option(Value, "server_group", translate("Server Group"), translate("DNS Server group belongs to, used with nameserver, such as offlce, home."))
+o = s:option(Value, "server_group", translate("Server Group"), translate("DNS Server group belongs to, used with nameserver, such as office, home."))
 o.rmempty     = true
 o.placeholder = "default"
 o.datatype    = "hostname"
@@ -69,6 +70,29 @@ o.cfgvalue    = function(...)
     return Flag.cfgvalue(...) or "0"
 end
 
+---- TLS host verify
+o = s:option(Value, "tls_host_verify", translate("TLS Hostname Verify"), translate("Set TLS hostname to verify."))
+o.default     = ""
+o.datatype    = "string"
+o.rempty      = true
+o:depends("type", "tls")
+o:depends("type", "https")
+
+---- SNI host name
+o = s:option(Value, "host_name", translate("TLS SNI name"), translate("Sets the server name indication for query."))
+o.default     = ""
+o.datatype    = "hostname"
+o.rempty      = true
+o:depends("type", "tls")
+o:depends("type", "https")
+
+---- http host
+o = s:option(Value, "http_host", translate("HTTP Host"), translate("Set the HTTP host used for the query. Use this parameter when the host of the URL address is an IP address."))
+o.default     = ""
+o.datatype    = "hostname"
+o.rempty      = true
+o:depends("type", "https")
+
 ---- anti-Answer-Forgery
 -- o = s:option(Flag, "check_edns", translate("Anti Answer Forgery"), translate("Anti answer forgery, if DNS does not work properly after enabling, please turn off this feature"))
 -- o.rmempty     = false
@@ -86,7 +110,6 @@ o.rempty      = true
 o:depends("type", "tls")
 o:depends("type", "https")
 
-
 ---- other args
 o = s:option(Value, "addition_arg", translate("Additional Server Args"), translate("Additional Args for upstream dns servers"))
 o.default     = ""

package/luci-compat/files/luci/model/smartdns.lua

@@ -0,0 +1,31 @@
+--
+-- Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+--
+-- smartdns is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- smartdns is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require ("nixio.fs")
+require ("luci.http")
+require ("luci.dispatcher")
+require ("nixio.fs")
+
+local uci = require "luci.model.uci".cursor()
+
+module("luci.model.smartdns", package.seeall)
+
+function get_config_option(module, section, option, default)
+	return uci:get_first(module, section, option) or default
+end
+
+return m
+

package/luci-compat/make.sh

@@ -0,0 +1,135 @@
+#!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+CURR_DIR=$(cd $(dirname $0);pwd)
+
+VER="`date +"1.%Y.%m.%d-%H%M"`"
+SMARTDNS_DIR=$CURR_DIR/../../
+PO2LMO=
+
+showhelp()
+{
+	echo "Usage: make [OPTION]"
+	echo "Options:"
+	echo " -o               output directory."
+	echo " --arch           archtecture."
+	echo " --ver            version."
+	echo " -h               show this message."
+}
+
+build_tool()
+{
+	make -C $ROOT/tool/po2lmo -j 
+	PO2LMO="$ROOT/tool/po2lmo/src/po2lmo"
+
+}
+
+clean_tool()
+{
+	make -C $ROOT/tool/po2lmo clean
+}
+
+build()
+{
+
+	ROOT=/tmp/luci-app-smartdns
+	rm -fr $ROOT
+
+	mkdir -p $ROOT
+	cp $CURR_DIR/* $ROOT/ -af
+	cd $ROOT/
+	build_tool
+	mkdir $ROOT/root/usr/lib/lua/ -p
+	cp $ROOT/files/luci $ROOT/root/usr/lib/lua/ -af
+	
+	#Generate Language
+	$PO2LMO $ROOT/files/luci/i18n/smartdns.zh-cn.po $ROOT/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.lmo
+	rm $ROOT/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.po
+
+	cp $ROOT/files/etc $ROOT/root/ -af
+	INST_SIZE="`du -sb $ROOT/root/ | awk '{print $1}'`"
+	
+	sed -i "s/^Architecture.*/Architecture: all/g" $ROOT/control/control
+	sed -i "s/Version:.*/Version: $VER/" $ROOT/control/control
+
+	if [ ! -z "$INST_SIZE" ]; then
+		echo "Installed-Size: $INST_SIZE" >> $ROOT/control/control
+	fi
+
+	cd $ROOT/control
+	chmod +x *
+	tar zcf ../control.tar.gz ./
+	cd $ROOT
+
+	tar zcf $ROOT/data.tar.gz -C root .
+	tar zcf $OUTPUTDIR/luci-app-smartdns.$VER.$FILEARCH.ipk control.tar.gz data.tar.gz debian-binary
+
+	rm -fr $ROOT/
+}
+
+main()
+{
+	OPTS=`getopt -o o:h --long arch:,ver:,filearch: \
+		-n  "" -- "$@"`
+
+	if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+	# Note the quotes around `$TEMP': they are essential!
+	eval set -- "$OPTS"
+
+	while true; do
+		case "$1" in
+		--arch)
+			ARCH="$2"
+			shift 2;;
+		--filearch)
+			FILEARCH="$2"
+			shift 2;;
+		--ver)
+			VER="$2"
+			shift 2;;
+		-o )
+			OUTPUTDIR="$2"
+			shift 2;;
+		-h | --help )
+			showhelp
+			return 0
+			shift ;;
+		-- ) shift; break ;;
+		* ) break ;;
+		esac
+	done
+
+	if [ -z "$ARCH" ]; then
+		echo "please input arch."
+		return 1;
+	fi
+
+	if [ -z "$FILEARCH" ]; then
+		FILEARCH=$ARCH
+	fi
+
+	if [ -z "$OUTPUTDIR" ]; then
+		OUTPUTDIR=$CURR_DIR;
+	fi
+
+	build
+}
+
+main $@
+exit $?
+
+

package/luci-compat/tool/po2lmo/Makefile

@@ -0,0 +1,12 @@
+
+INSTALL = install
+PREFIX  = /usr/bin
+
+po2lmo: src/po2lmo.o src/template_lmo.o
+	$(CC) $(LDFLAGS) -o src/po2lmo src/po2lmo.o src/template_lmo.o
+
+install:
+	$(INSTALL) -m 755 src/po2lmo $(PREFIX)
+
+clean:
+	$(RM) src/po2lmo src/*.o

package/luci-compat/tool/po2lmo/src/po2lmo.c

@@ -0,0 +1,247 @@
+/*
+ * lmo - Lua Machine Objects - PO to LMO conversion tool
+ *
+ *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_lmo.h"
+
+static void die(const char *msg)
+{
+	fprintf(stderr, "Error: %s\n", msg);
+	exit(1);
+}
+
+static void usage(const char *name)
+{
+	fprintf(stderr, "Usage: %s input.po output.lmo\n", name);
+	exit(1);
+}
+
+static void print(const void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+	if( fwrite(ptr, size, nmemb, stream) == 0 )
+		die("Failed to write stdout");
+}
+
+static int extract_string(const char *src, char *dest, int len)
+{
+	int pos = 0;
+	int esc = 0;
+	int off = -1;
+
+	for( pos = 0; (pos < strlen(src)) && (pos < len); pos++ )
+	{
+		if( (off == -1) && (src[pos] == '"') )
+		{
+			off = pos + 1;
+		}
+		else if( off >= 0 )
+		{
+			if( esc == 1 )
+			{
+				switch (src[pos])
+				{
+				case '"':
+				case '\\':
+					off++;
+					break;
+				}
+				dest[pos-off] = src[pos];
+				esc = 0;
+			}
+			else if( src[pos] == '\\' )
+			{
+				dest[pos-off] = src[pos];
+				esc = 1;
+			}
+			else if( src[pos] != '"' )
+			{
+				dest[pos-off] = src[pos];
+			}
+			else
+			{
+				dest[pos-off] = '\0';
+				break;
+			}
+		}
+	}
+
+	return (off > -1) ? strlen(dest) : -1;
+}
+
+static int cmp_index(const void *a, const void *b)
+{
+	uint32_t x = ((const lmo_entry_t *)a)->key_id;
+	uint32_t y = ((const lmo_entry_t *)b)->key_id;
+
+	if (x < y)
+		return -1;
+	else if (x > y)
+		return 1;
+
+	return 0;
+}
+
+static void print_uint32(uint32_t x, FILE *out)
+{
+	uint32_t y = htonl(x);
+	print(&y, sizeof(uint32_t), 1, out);
+}
+
+static void print_index(void *array, int n, FILE *out)
+{
+	lmo_entry_t *e;
+
+	qsort(array, n, sizeof(*e), cmp_index);
+
+	for (e = array; n > 0; n--, e++)
+	{
+		print_uint32(e->key_id, out);
+		print_uint32(e->val_id, out);
+		print_uint32(e->offset, out);
+		print_uint32(e->length, out);
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	char line[4096];
+	char key[4096];
+	char val[4096];
+	char tmp[4096];
+	int state  = 0;
+	int offset = 0;
+	int length = 0;
+	int n_entries = 0;
+	void *array = NULL;
+	lmo_entry_t *entry = NULL;
+	uint32_t key_id, val_id;
+
+	FILE *in;
+	FILE *out;
+
+	if( (argc != 3) || ((in = fopen(argv[1], "r")) == NULL) || ((out = fopen(argv[2], "w")) == NULL) )
+		usage(argv[0]);
+
+	memset(line, 0, sizeof(key));
+	memset(key, 0, sizeof(val));
+	memset(val, 0, sizeof(val));
+
+	while( (NULL != fgets(line, sizeof(line), in)) || (state >= 2 && feof(in)) )
+	{
+		if( state == 0 && strstr(line, "msgid \"") == line )
+		{
+			switch(extract_string(line, key, sizeof(key)))
+			{
+				case -1:
+					die("Syntax error in msgid");
+				case 0:
+					state = 1;
+					break;
+				default:
+					state = 2;
+			}
+		}
+		else if( state == 1 || state == 2 )
+		{
+			if( strstr(line, "msgstr \"") == line || state == 2 )
+			{
+				switch(extract_string(line, val, sizeof(val)))
+				{
+					case -1:
+						state = 4;
+						break;
+					default:
+						state = 3;
+				}
+			}
+			else
+			{
+				switch(extract_string(line, tmp, sizeof(tmp)))
+				{
+					case -1:
+						state = 2;
+						break;
+					default:
+						strcat(key, tmp);
+				}
+			}
+		}
+		else if( state == 3 )
+		{
+			switch(extract_string(line, tmp, sizeof(tmp)))
+			{
+				case -1:
+					state = 4;
+					break;
+				default:
+					strcat(val, tmp);
+			}
+		}
+
+		if( state == 4 )
+		{
+			if( strlen(key) > 0 && strlen(val) > 0 )
+			{
+				key_id = sfh_hash(key, strlen(key));
+				val_id = sfh_hash(val, strlen(val));
+
+				if( key_id != val_id )
+				{
+					n_entries++;
+					array = realloc(array, n_entries * sizeof(lmo_entry_t));
+					entry = (lmo_entry_t *)array + n_entries - 1;
+
+					if (!array)
+						die("Out of memory");
+
+					entry->key_id = key_id;
+					entry->val_id = val_id;
+					entry->offset = offset;
+					entry->length = strlen(val);
+
+					length = strlen(val) + ((4 - (strlen(val) % 4)) % 4);
+
+					print(val, length, 1, out);
+					offset += length;
+				}
+			}
+
+			state = 0;
+			memset(key, 0, sizeof(key));
+			memset(val, 0, sizeof(val));
+		}
+
+		memset(line, 0, sizeof(line));
+	}
+
+	print_index(array, n_entries, out);
+
+	if( offset > 0 )
+	{
+		print_uint32(offset, out);
+		fsync(fileno(out));
+		fclose(out);
+	}
+	else
+	{
+		fclose(out);
+		unlink(argv[2]);
+	}
+
+	fclose(in);
+	return(0);
+}

package/luci-compat/tool/po2lmo/src/template_lmo.c

@@ -0,0 +1,328 @@
+/*
+ * lmo - Lua Machine Objects - Base functions
+ *
+ *   Copyright (C) 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_lmo.h"
+
+/*
+ * Hash function from http://www.azillionmonkeys.com/qed/hash.html
+ * Copyright (C) 2004-2008 by Paul Hsieh
+ */
+
+uint32_t sfh_hash(const char *data, int len)
+{
+	uint32_t hash = len, tmp;
+	int rem;
+
+	if (len <= 0 || data == NULL) return 0;
+
+	rem = len & 3;
+	len >>= 2;
+
+	/* Main loop */
+	for (;len > 0; len--) {
+		hash  += sfh_get16(data);
+		tmp    = (sfh_get16(data+2) << 11) ^ hash;
+		hash   = (hash << 16) ^ tmp;
+		data  += 2*sizeof(uint16_t);
+		hash  += hash >> 11;
+	}
+
+	/* Handle end cases */
+	switch (rem) {
+		case 3: hash += sfh_get16(data);
+			hash ^= hash << 16;
+			hash ^= data[sizeof(uint16_t)] << 18;
+			hash += hash >> 11;
+			break;
+		case 2: hash += sfh_get16(data);
+			hash ^= hash << 11;
+			hash += hash >> 17;
+			break;
+		case 1: hash += *data;
+			hash ^= hash << 10;
+			hash += hash >> 1;
+	}
+
+	/* Force "avalanching" of final 127 bits */
+	hash ^= hash << 3;
+	hash += hash >> 5;
+	hash ^= hash << 4;
+	hash += hash >> 17;
+	hash ^= hash << 25;
+	hash += hash >> 6;
+
+	return hash;
+}
+
+uint32_t lmo_canon_hash(const char *str, int len)
+{
+	char res[4096];
+	char *ptr, prev;
+	int off;
+
+	if (!str || len >= sizeof(res))
+		return 0;
+
+	for (prev = ' ', ptr = res, off = 0; off < len; prev = *str, off++, str++)
+	{
+		if (isspace(*str))
+		{
+			if (!isspace(prev))
+				*ptr++ = ' ';
+		}
+		else
+		{
+			*ptr++ = *str;
+		}
+	}
+
+	if ((ptr > res) && isspace(*(ptr-1)))
+		ptr--;
+
+	return sfh_hash(res, ptr - res);
+}
+
+lmo_archive_t * lmo_open(const char *file)
+{
+	int in = -1;
+	uint32_t idx_offset = 0;
+	struct stat s;
+
+	lmo_archive_t *ar = NULL;
+
+	if (stat(file, &s) == -1)
+		goto err;
+
+	if ((in = open(file, O_RDONLY)) == -1)
+		goto err;
+
+	if ((ar = (lmo_archive_t *)malloc(sizeof(*ar))) != NULL)
+	{
+		memset(ar, 0, sizeof(*ar));
+
+		ar->fd     = in;
+		ar->size = s.st_size;
+
+		fcntl(ar->fd, F_SETFD, fcntl(ar->fd, F_GETFD) | FD_CLOEXEC);
+
+		if ((ar->mmap = mmap(NULL, ar->size, PROT_READ, MAP_SHARED, ar->fd, 0)) == MAP_FAILED)
+			goto err;
+
+		idx_offset = ntohl(*((const uint32_t *)
+		                     (ar->mmap + ar->size - sizeof(uint32_t))));
+
+		if (idx_offset >= ar->size)
+			goto err;
+
+		ar->index  = (lmo_entry_t *)(ar->mmap + idx_offset);
+		ar->length = (ar->size - idx_offset - sizeof(uint32_t)) / sizeof(lmo_entry_t);
+		ar->end    = ar->mmap + ar->size;
+
+		return ar;
+	}
+
+err:
+	if (in > -1)
+		close(in);
+
+	if (ar != NULL)
+	{
+		if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED))
+			munmap(ar->mmap, ar->size);
+
+		free(ar);
+	}
+
+	return NULL;
+}
+
+void lmo_close(lmo_archive_t *ar)
+{
+	if (ar != NULL)
+	{
+		if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED))
+			munmap(ar->mmap, ar->size);
+
+		close(ar->fd);
+		free(ar);
+
+		ar = NULL;
+	}
+}
+
+
+lmo_catalog_t *_lmo_catalogs = NULL;
+lmo_catalog_t *_lmo_active_catalog = NULL;
+
+int lmo_load_catalog(const char *lang, const char *dir)
+{
+	DIR *dh = NULL;
+	char pattern[16];
+	char path[PATH_MAX];
+	struct dirent *de = NULL;
+
+	lmo_archive_t *ar = NULL;
+	lmo_catalog_t *cat = NULL;
+
+	if (!lmo_change_catalog(lang))
+		return 0;
+
+	if (!dir || !(dh = opendir(dir)))
+		goto err;
+
+	if (!(cat = malloc(sizeof(*cat))))
+		goto err;
+
+	memset(cat, 0, sizeof(*cat));
+
+	snprintf(cat->lang, sizeof(cat->lang), "%s", lang);
+	snprintf(pattern, sizeof(pattern), "*.%s.lmo", lang);
+
+	while ((de = readdir(dh)) != NULL)
+	{
+		if (!fnmatch(pattern, de->d_name, 0))
+		{
+			snprintf(path, sizeof(path), "%s/%s", dir, de->d_name);
+			ar = lmo_open(path);
+
+			if (ar)
+			{
+				ar->next = cat->archives;
+				cat->archives = ar;
+			}
+		}
+	}
+
+	closedir(dh);
+
+	cat->next = _lmo_catalogs;
+	_lmo_catalogs = cat;
+
+	if (!_lmo_active_catalog)
+		_lmo_active_catalog = cat;
+
+	return 0;
+
+err:
+	if (dh) closedir(dh);
+	if (cat) free(cat);
+
+	return -1;
+}
+
+int lmo_change_catalog(const char *lang)
+{
+	lmo_catalog_t *cat;
+
+	for (cat = _lmo_catalogs; cat; cat = cat->next)
+	{
+		if (!strncmp(cat->lang, lang, sizeof(cat->lang)))
+		{
+			_lmo_active_catalog = cat;
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+static lmo_entry_t * lmo_find_entry(lmo_archive_t *ar, uint32_t hash)
+{
+	unsigned int m, l, r;
+	uint32_t k;
+
+	l = 0;
+	r = ar->length - 1;
+
+	while (1)
+	{
+		m = l + ((r - l) / 2);
+
+		if (r < l)
+			break;
+
+		k = ntohl(ar->index[m].key_id);
+
+		if (k == hash)
+			return &ar->index[m];
+
+		if (k > hash)
+		{
+			if (!m)
+				break;
+
+			r = m - 1;
+		}
+		else
+		{
+			l = m + 1;
+		}
+	}
+
+	return NULL;
+}
+
+int lmo_translate(const char *key, int keylen, char **out, int *outlen)
+{
+	uint32_t hash;
+	lmo_entry_t *e;
+	lmo_archive_t *ar;
+
+	if (!key || !_lmo_active_catalog)
+		return -2;
+
+	hash = lmo_canon_hash(key, keylen);
+
+	for (ar = _lmo_active_catalog->archives; ar; ar = ar->next)
+	{
+		if ((e = lmo_find_entry(ar, hash)) != NULL)
+		{
+			*out = ar->mmap + ntohl(e->offset);
+			*outlen = ntohl(e->length);
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+void lmo_close_catalog(const char *lang)
+{
+	lmo_archive_t *ar, *next;
+	lmo_catalog_t *cat, *prev;
+
+	for (prev = NULL, cat = _lmo_catalogs; cat; prev = cat, cat = cat->next)
+	{
+		if (!strncmp(cat->lang, lang, sizeof(cat->lang)))
+		{
+			if (prev)
+				prev->next = cat->next;
+			else
+				_lmo_catalogs = cat->next;
+
+			for (ar = cat->archives; ar; ar = next)
+			{
+				next = ar->next;
+				lmo_close(ar);
+			}
+
+			free(cat);
+			break;
+		}
+	}
+}

package/luci-compat/tool/po2lmo/src/template_lmo.h

@@ -0,0 +1,92 @@
+/*
+ * lmo - Lua Machine Objects - General header
+ *
+ *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _TEMPLATE_LMO_H_
+#define _TEMPLATE_LMO_H_
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fnmatch.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <limits.h>
+
+#if (defined(__GNUC__) && defined(__i386__))
+#define sfh_get16(d) (*((const uint16_t *) (d)))
+#else
+#define sfh_get16(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
+					   +(uint32_t)(((const uint8_t *)(d))[0]) )
+#endif
+
+
+struct lmo_entry {
+	uint32_t key_id;
+	uint32_t val_id;
+	uint32_t offset;
+	uint32_t length;
+} __attribute__((packed));
+
+typedef struct lmo_entry lmo_entry_t;
+
+
+struct lmo_archive {
+	int         fd;
+	int	        length;
+	uint32_t    size;
+	lmo_entry_t *index;
+	char        *mmap;
+	char		*end;
+	struct lmo_archive *next;
+};
+
+typedef struct lmo_archive lmo_archive_t;
+
+
+struct lmo_catalog {
+	char lang[6];
+	struct lmo_archive *archives;
+	struct lmo_catalog *next;
+};
+
+typedef struct lmo_catalog lmo_catalog_t;
+
+
+uint32_t sfh_hash(const char *data, int len);
+uint32_t lmo_canon_hash(const char *data, int len);
+
+lmo_archive_t * lmo_open(const char *file);
+void lmo_close(lmo_archive_t *ar);
+
+
+extern lmo_catalog_t *_lmo_catalogs;
+extern lmo_catalog_t *_lmo_active_catalog;
+
+int lmo_load_catalog(const char *lang, const char *dir);
+int lmo_change_catalog(const char *lang);
+int lmo_translate(const char *key, int keylen, char **out, int *outlen);
+void lmo_close_catalog(const char *lang);
+
+#endif

package/luci/control/postinst

@@ -1,4 +1,20 @@
 #!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 [ "${IPKG_NO_SCRIPT}" = "1" ] && exit 0
 [ -x ${IPKG_INSTROOT}/lib/functions.sh ] || exit 0
 . ${IPKG_INSTROOT}/lib/functions.sh

package/luci/control/prerm

@@ -1,4 +1,20 @@
 #!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 [ -x ${IPKG_INSTROOT}/lib/functions.sh ] || exit 0
 . ${IPKG_INSTROOT}/lib/functions.sh
 default_prerm $0 $@

package/luci/files/etc/uci-defaults/50_luci-smartdns

@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 uci -q batch <<-EOF >/dev/null
 	delete ucitrack.@smartdns[-1]

package/luci/files/luci/controller/smartdns.lua

@@ -1,7 +1,20 @@
--- Copyright 2018 Nick Peng (pymumu@gmail.com)
+--
+-- Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+--
+-- smartdns is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- smartdns is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module("luci.controller.smartdns", package.seeall)
-local smartdns = require "luci.model.smartdns"
 
 function index()
 	if not nixio.fs.access("/etc/config/smartdns") then
@@ -9,61 +22,6 @@ function index()
 	end
 
 	local page
-	page = entry({"admin", "services", "smartdns"}, cbi("smartdns/smartdns"), _("SmartDNS"), 60)
+	page = entry({"admin", "services", "smartdns"}, view("smartdns/smartdns"), _("SmartDNS"), 60)
 	page.dependent = true
-	page = entry({"admin", "services", "smartdns", "status"}, call("act_status"))
-	page.leaf = true
-	page = entry({"admin", "services", "smartdns", "upstream"}, cbi("smartdns/upstream"), nil)
-	page.leaf = true
-end
-
-local function is_running()
-	return luci.sys.call("pidof smartdns >/dev/null") == 0
-end
-
-function act_status()
-	local e={}
-	local ipv6_server;
-	local redirect_mode="none";
-
-	e.ipv6_works = 2;
-	e.ipv4_works = 2;
-	e.ipv6_server = 1;
-	e.dnsmasq_forward = 0;
-	redirect_mode = smartdns.get_config_option("smartdns", "smartdns", "redirect", nil);
-	if redirect_mode == "redirect" then
-		e.redirect = 1
-	elseif redirect_mode == "dnsmasq-upstream" then
-		e.redirect = 2
-	else
-		e.redirect = 0
-	end
-
-	e.local_port = smartdns.get_config_option("smartdns", "smartdns", "port", nil);
-	ipv6_server = smartdns.get_config_option("smartdns", "smartdns", "ipv6_server", nil);
-	if e.redirect == 1 then 
-		if e.local_port ~= nil and e.local_port ~= "53" then
-			e.ipv4_works = luci.sys.call("iptables -t nat -nL PREROUTING 2>/dev/null | grep REDIRECT | grep dpt:53 | grep %q >/dev/null 2>&1" % e.local_port) == 0
-			if ipv6_server == "1" then
-				e.ipv6_works = luci.sys.call("ip6tables -t nat -nL PREROUTING 2>/dev/null| grep REDIRECT | grep dpt:53 | grep %q >/dev/null 2>&1" % e.local_port) == 0
-			else 
-				e.ipv6_works = 2
-			end
-		else
-			e.redirect = 0
-		end
-	elseif e.redirect == 2 then
-		local str;
-		local dnsmasq_server = luci.sys.exec("uci get dhcp.@dnsmasq[0].server")
-		if e.local_port ~= nil then
-			str = "127.0.0.1#" .. e.local_port 
-			if  string.sub(dnsmasq_server,1,string.len(str)) == str then 
-				e.dnsmasq_forward = 1
-			end
-		end
-	end
-	e.running = is_running()
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(e)
 end

package/luci/files/luci/htdocs/luci-static/resources/view/smartdns/smartdns.js

@@ -0,0 +1,487 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+'use strict';
+'require fs';
+'require uci';
+'require form';
+'require rpc';
+
+var conf = 'smartdns';
+var callServiceList = rpc.declare({
+	object: 'service',
+	method: 'list',
+	params: ['name'],
+	expect: { '': {} }
+});
+
+function getPidOfSmartdns() {
+	return L.resolveDefault(callServiceList(conf), {})
+		.then(function (res) {
+			var isrunning = false;
+			try {
+				isrunning = res[conf]['instances']['smartdns']['running'];
+			} catch (e) { }
+			return isrunning;
+		});
+}
+
+function getIPTablesRedirect() {
+	return fs.exec('/usr/sbin/iptables', ['-t', 'nat', '-nL', 'PREROUTING']).then(function (res) {
+		if (res.code === 0) {
+			return res.stdout.trim();
+		} else {
+			return "";
+		}
+	});
+}
+
+function getIP6TablesRedirect() {
+	return fs.exec('/usr/sbin/ip6tables', ['-t', 'nat', '-nL', 'PREROUTING']).then(function (res) {
+		if (res.code === 0) {
+			return res.stdout.trim();
+		} else {
+			return "";
+		}
+	});
+}
+
+function smartdnsServiceStatus() {
+	return Promise.all([
+		getPidOfSmartdns(),
+		getIPTablesRedirect(),
+		getIP6TablesRedirect()
+	]);
+}
+
+function smartdnsRenderStatus(res) {
+	var renderHTML = "";
+	var isRunning = res[0];
+	var ipt = res[1];
+	var ip6t = res[2];
+
+	var serverPort = uci.get_first('smartdns', 'smartdns', 'port');
+	var redirectMode = uci.get_first('smartdns', 'smartdns', 'redirect');
+	var ipv6Enabled = uci.get_first('smartdns', 'smartdns', 'ipv6_server');
+
+	if (isRunning) {
+		renderHTML += "<b><font color=green>SmartDNS - " + _("RUNNING") + "</font></b></em>";
+	} else {
+		renderHTML += "<b><font color=red>SmartDNS - " + _("NOT RUNNING") + "</font></b></em>";
+		return renderHTML;
+	}
+
+	if (redirectMode === "dnsmasq-upstream") {
+		var matchLine = "127.0.0.1#" + serverPort;
+		var dnsmasqServer = uci.get_first('dhcp', 'dnsmasq', 'server') || "";
+
+		if (dnsmasqServer.indexOf(matchLine) < 0) {
+			renderHTML += "<br></br><b><font color=red>" + _("Dnsmasq Forwared To Smartdns Failure") + "</font></b>";
+		}
+	} else if (redirectMode === "redirect") {
+		var redirectRules = (ipt || '').split(/\n/).filter(function (rule) {
+			return rule.match(/REDIRECT/) && rule.match(/dpt:53/) && rule.match("ports " + serverPort);
+		});
+
+		if (redirectRules.length <= 0) {
+			renderHTML += "<br></br><b><font color=red>" + _("IPV4 53 Port Redirect Failure") + "</font></b>";
+			if (ipv6Enabled) {
+				var redirectRules = (ip6t || '').split(/\n/).filter(function (rule) {
+					return rule.match(/REDIRECT/) && rule.match(/dpt:53/) && rule.match("ports " + serverPort);
+				});
+				if (redirectRules.length <= 0) {
+					renderHTML += "<br></br><b><font color=red>" + _("IPV6 53 Port Redirect Failure") + "</font></b>";
+				}
+			}
+		}
+	}
+
+	return renderHTML;
+}
+
+return L.view.extend({
+	load: function () {
+		return Promise.all([
+			L.resolveDefault(fs.stat('/etc/config/smartdns'), null),
+			L.resolveDefault(fs.stat('/usr/sbin/smartdns'), {}),
+			uci.load('smartdns'),
+			uci.load('dhcp')
+		]);
+	},
+	render: function (stats) {
+		var m, s, o;
+
+		m = new form.Map('smartdns', _('SmartDNS'));
+		m.title = _("SmartDNS Server");
+		m.description = _("SmartDNS is a local high-performance DNS server, supports finding fastest IP, "
+			+ "supports ad filtering, and supports avoiding DNS poisoning.");
+
+		s = m.section(form.NamedSection, '_status');
+		s.anonymous = true;
+		s.render = function (section_id) {
+			L.Poll.add(function () {
+				return L.resolveDefault(smartdnsServiceStatus()).then(function (res) {
+					var view = document.getElementById("service_status");
+					view.innerHTML = smartdnsRenderStatus(res);
+				});
+			});
+
+			return E('div', { class: 'cbi-map' },
+				E('div', { class: 'cbi-section' }, [
+					E('div', { id: 'service_status' },
+						_('Collecting data ...'))
+				])
+			);
+		}
+
+		// Basic;
+		s = m.section(form.TypedSection, "smartdns", _("Settings"), _("General Settings"));
+		s.anonymous = true;
+
+		s.tab("settings", _("General Settings"));
+		s.tab("seconddns", _("Second Server Settings"));
+		s.tab("custom", _("Custom Settings"));
+
+		// Eanble;
+		o = s.taboption("settings", form.Flag, "enabled", _("Enable"), _("Enable or disable smartdns server"));
+		o.default = o.disabled;
+		o.rempty = false;
+
+		// server name;
+		o = s.taboption("settings", form.Value, "server_name", _("Server Name"), _("Smartdns server name"));
+		o.default = "smartdns";
+		o.datatype = "hostname";
+		o.rempty = false;
+
+		// Port;
+		o = s.taboption("settings", form.Value, "port", _("Local Port"), _("Smartdns local server port"));
+		o.placeholder = 6053;
+		o.default = 6053;
+		o.datatype = "port";
+		o.rempty = false;
+
+		// Enable TCP server;
+		o = s.taboption("settings", form.Flag, "tcp_server", _("TCP Server"), _("Enable TCP DNS Server"));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// Support IPV6;
+		o = s.taboption("settings", form.Flag, "ipv6_server", _("IPV6 Server"), _("Enable IPV6 DNS Server"));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// Support DualStack ip selection;
+		o = s.taboption("settings", form.Flag, "dualstack_ip_selection", _("Dual-stack IP Selection"),
+			_("Enable IP selection between IPV4 and IPV6"));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		o = s.taboption("settings", form.Flag, "prefetch_domain", _("Domain prefetch"),
+		_("Enable domain prefetch, accelerate domain response speed."));
+		o.rmempty = false;
+		o.default = o.disabled;
+		
+		// Domain Serve expired
+		o = s.taboption("settings", form.Flag, "serve_expired", _("Serve expired"),
+			_("Attempts to serve old responses from cache with a TTL of 0 in the response without waiting for the actual resolution to finish."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// Redirect;
+		o = s.taboption("settings", form.ListValue, "redirect", _("Redirect"), _("SmartDNS redirect mode"));
+		o.placeholder = "none";
+		o.value("none", _("none"));
+		o.value("dnsmasq-upstream", _("Run as dnsmasq upstream server"));
+		o.value("redirect", _("Redirect 53 port to SmartDNS"));
+		o.default = "none";
+		o.rempty = false;
+
+		// cache-size;
+		o = s.taboption("settings", form.Value, "cache_size", _("Cache Size"), _("DNS domain result cache size"));
+		o.rempty = true;
+
+		// rr-ttl;
+		o = s.taboption("settings", form.Value, "rr_ttl", _("Domain TTL"), _("TTL for all domain result."));
+		o.rempty = true;
+
+		// rr-ttl-min;
+		o = s.taboption("settings", form.Value, "rr_ttl_min", _("Domain TTL Min"),
+			_("Minimum TTL for all domain result."));
+		o.rempty = true;
+		o.placeholder = "300";
+		o.default = 300;
+		o.optional = true;
+
+		// second dns server;
+		// rr-ttl-max;
+		o = s.taboption("settings", form.Value, "rr_ttl_max", _("Domain TTL Max"),
+			_("Maximum TTL for all domain result."));
+		o.rempty = true;
+
+		// Eanble;
+		o = s.taboption("seconddns", form.Flag, "seconddns_enabled", _("Enable"),
+			_("Enable or disable second DNS server."));
+		o.default = o.disabled;
+		o.rempty = false;
+
+		// Port;
+		o = s.taboption("seconddns", form.Value, "seconddns_port", _("Local Port"), _("Smartdns local server port"));
+		o.placeholder = 6553;
+		o.default = 6553;
+		o.datatype = "port";
+		o.rempty = false;
+
+		// Enable TCP server;
+		o = s.taboption("seconddns", form.Flag, "seconddns_tcp_server", _("TCP Server"), _("Enable TCP DNS Server"));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// dns server group;
+		o = s.taboption("seconddns", form.Value, "seconddns_server_group", _("Server Group"),
+			_("Query DNS through specific dns server group, such as office, home."));
+		o.rmempty = true;
+		o.placeholder = "default";
+		o.datatype = "hostname";
+		o.rempty = true;
+
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_speed_check", _("Skip Speed Check"),
+			_("Do not check speed."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip address rules;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_addr", _("Skip Address Rules"),
+			_("Skip address rules."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip name server rules;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_nameserver", _("Skip Nameserver Rule"),
+			_("Skip nameserver rules."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip ipset rules;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_ipset", _("Skip Ipset Rule"),
+			_("Skip ipset rules."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip soa address rule;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_soa", _("Skip SOA Address Rule"),
+			_("Skip SOA address rules."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_dualstack_selection", _("Skip Dualstack Selection"),
+			_("Skip Dualstack Selection."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip cache;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_cache", _("Skip Cache"), _("Skip Cache."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// Force AAAA SOA
+		o = s.taboption("seconddns", form.Flag, "force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// custom settings;
+		o = s.taboption("custom", form.TextValue, "custom_conf",
+			_(""),
+			_("smartdns custom settings"));
+
+		o.rows = 20;
+		o.cfgvalue = function (section_id) {
+			return fs.trimmed('/etc/smartdns/custom.conf');
+		};
+		o.write = function (section_id, formvalue) {
+			return fs.write('/etc/smartdns/custom.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
+		};
+
+		o = s.taboption("custom", form.Flag, "coredump", _("Generate Coredump"),
+			_("Generate Coredump file when smartdns crash, coredump file is located at /tmp/smartdns.xxx.core."));
+		o.rmempty = false;
+		o.default = o.disabled;
+		// Upstream servers;
+		s = m.section(form.GridSection, "server", _("Upstream Servers"),
+			_("Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS servers, "
+				+ "including multiple foreign DNS servers."));
+		s.anonymous = true;
+		s.addremove = true;
+
+		s.tab('general', _('General Settings'));
+		s.tab('advanced', _('Advanced Settings'));
+
+		// enable flag;
+		o = s.taboption("general", form.Flag, "enabled", _("Enable"), _("Enable"));
+		o.rmempty = false;
+		o.default = o.enabled;
+		o.editable = true;
+
+		// name;
+		o = s.taboption("general", form.Value, "name", _("DNS Server Name"), _("DNS Server Name"));
+
+		// IP address;
+		o = s.taboption("general", form.Value, "ip", _("ip"), _("DNS Server ip"));
+		o.datatype = "or(ipaddr, string)";
+		o.rmempty = false;
+
+		// port;
+		o = s.taboption("general", form.Value, "port", _("port"), _("DNS Server port"));
+		o.placeholder = "default";
+		o.datatype = "port";
+		o.rempty = true;
+		o.depends("type", "udp");
+		o.depends("type", "tcp");
+		o.depends("type", "tls");
+
+		// type;
+		o = s.taboption("general", form.ListValue, "type", _("type"), _("DNS Server type"));
+		o.placeholder = "udp";
+		o.value("udp", _("udp"));
+		o.value("tcp", _("tcp"));
+		o.value("tls", _("tls"));
+		o.value("https", _("https"));
+		o.default = "udp";
+		o.rempty = false;
+
+		// Advanced Options
+		// server group
+		o = s.taboption("advanced", form.Value, "server_group", _("Server Group"), _("DNS Server group belongs to, "
+			+ "used with nameserver, such as office, home."))
+		o.rmempty = true
+		o.placeholder = "default"
+		o.datatype = "hostname"
+		o.rempty = true
+		o.modalonly = true;
+
+		// blacklist_ip
+		o = s.taboption("advanced", form.Flag, "blacklist_ip", _("IP Blacklist Filtering"),
+			_("Filtering IP with blacklist"))
+		o.rmempty = false
+		o.default = o.disabled
+		o.modalonly = true;
+
+		// TLS host verify
+		o = s.taboption("advanced", form.Value, "tls_host_verify", _("TLS Hostname Verify"),
+			_("Set TLS hostname to verify."))
+		o.default = ""
+		o.datatype = "string"
+		o.rempty = true
+		o.modalonly = true;
+		o.depends("type", "tls")
+		o.depends("type", "https")
+
+		// SNI host name
+		o = s.taboption("advanced", form.Value, "host_name", _("TLS SNI name"),
+			_("Sets the server name indication for query."))
+		o.default = ""
+		o.datatype = "hostname"
+		o.rempty = true
+		o.modalonly = true;
+		o.depends("type", "tls")
+		o.depends("type", "https")
+
+		// http host
+		o = s.taboption("advanced", form.Value, "http_host", _("HTTP Host"),
+			_("Set the HTTP host used for the query. Use this parameter when the host of the URL address is an IP address."))
+		o.default = ""
+		o.datatype = "hostname"
+		o.rempty = true
+		o.modalonly = true;
+		o.depends("type", "https")
+
+		// SPKI pin
+		o = s.taboption("advanced", form.Value, "spki_pin", _("TLS SPKI Pinning"),
+			_("Used to verify the validity of the TLS server, The value is Base64 encoded SPKI fingerprint, "
+				+ "leaving blank to indicate that the validity of TLS is not verified."))
+		o.default = ""
+		o.datatype = "string"
+		o.rempty = true
+		o.modalonly = true;
+		o.depends("type", "tls")
+		o.depends("type", "https")
+
+		// other args
+		o = s.taboption("advanced", form.Value, "addition_arg", _("Additional Server Args"),
+			_("Additional Args for upstream dns servers"))
+		o.default = ""
+		o.rempty = true
+		o.modalonly = true;
+
+		// Doman addresss;
+		s = m.section(form.TypedSection, "smartdns", _("Advanced Settings"), _("Advanced Settings"));
+		s.anonymous = true;
+
+		s.tab("domain-address", _("Domain Address"), _("Set Specific domain ip address."));
+		s.tab("blackip-list", _("IP Blacklist"), _("Set Specific ip blacklist."));
+
+		o = s.taboption("domain-address", form.TextValue, "address_conf",
+			_(""),
+			_("Specify an IP address to return for any host in the given domains, Queries in the domains are never "
+				+ "forwarded and always replied to with the specified IP address which may be IPv4 or IPv6."));
+		o.rows = 20;
+		o.cfgvalue = function (section_id) {
+			return fs.trimmed('/etc/smartdns/address.conf');
+		};
+		o.write = function (section_id, formvalue) {
+			return fs.write('/etc/smartdns/address.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
+		};
+
+		// IP Blacklist;
+		// blacklist;
+		o = s.taboption("blackip-list", form.TextValue, "blackip_ip_conf",
+			_(""),
+			_("Configure IP blacklists that will be filtered from the results of specific DNS server."));
+		o.rows = 20;
+		o.cfgvalue = function (section_id) {
+			return fs.trimmed('/etc/smartdns/blacklist-ip.conf');
+		};
+		o.write = function (section_id, formvalue) {
+			return fs.write('/etc/smartdns/blacklist-ip.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
+		};
+
+		// Doman addresss;
+		s = m.section(form.TypedSection, "smartdns", _("Technical Support"),
+			_("If you like this software, please buy me a cup of coffee."));
+		s.anonymous = true;
+
+		o = s.option(form.Button, "web");
+		o.title = _("SmartDNS official website");
+		o.inputtitle = _("open website");
+		o.inputstyle = "apply";
+		o.onclick = function () {
+			window.open("https://pymumu.github.io/smartdns", '_blank');
+		};
+
+		o = s.option(form.Button, "Donate");
+		o.title = _("Donate to smartdns");
+		o.inputtitle = _("Donate");
+		o.inputstyle = "apply";
+		o.onclick = function () {
+			window.open("https://pymumu.github.io/smartdns/#donate", '_blank');
+		};
+
+		return m.render();
+	}
+});
+

package/luci/files/luci/i18n/smartdns.zh-cn.po

@@ -1,222 +1,305 @@
-msgid ""
+msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8\n"
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
-
+
-msgid "SmartDNS"
+msgid "SmartDNS"
-msgstr "SmartDNS"
+msgstr "SmartDNS"
-
+
-msgid "SmartDNS is a local high-performance DNS server"
+msgid "SmartDNS is a local high-performance DNS server"
-msgstr "SmartDNS是一个本地高性能DNS服务器"
+msgstr "SmartDNS是一个本地高性能DNS服务器"
-
+
-msgid "SmartDNS Server"
+msgid "SmartDNS Server"
-msgstr "SmartDNS 服务器"
+msgstr "SmartDNS 服务器"
-
+
-msgid "SmartDNS is a local high-performance DNS server, supports finding fastest IP, supports ad filtering, and supports avoiding DNS poisoning."
+msgid "SmartDNS is a local high-performance DNS server, supports finding fastest IP, supports ad filtering, and supports avoiding DNS poisoning."
-msgstr "SmartDNS是一个本地高性能DNS服务器，支持返回最快IP，支持广告过滤。"
+msgstr "SmartDNS是一个本地高性能DNS服务器，支持返回最快IP，支持广告过滤。"
-
+
-msgid "Custom Settings"
+msgid "Custom Settings"
-msgstr "自定义设置"
+msgstr "自定义设置"
-
+
-msgid "Generate Coredump"
+msgid "General Settings"
-msgstr "生成coredump"
+msgstr "基本设置"
-
+
-msgid "Generate Coredump file when smartdns crash, coredump file is located at /tmp/smartdns.xxx.core."
+msgid "Settings"
-msgstr "当smartdns异常时生成coredump文件，coredump文件在/tmp/smartdns.xxx.core."
+msgstr "设置"
-
+
-msgid "Server Name"
+msgid "Advanced Settings"
-msgstr "服务器名称"
+msgstr "高级设置"
-
+
-msgid "Smartdns server name"
+msgid "RUNNING"
-msgstr "SmartDNS的服务器名称，默认为smartdns，留空为主机名"
+msgstr "运行中"
-
+
-msgid "SmartDNS is a local dns server to find fastest ip."
+msgid "NOT RUNNING"
-msgstr "本地高性能服务器，优化网络访问性能。"
+msgstr "未运行"
-
+
-msgid "Enable or disable smartdns server"
+msgid "Generate Coredump"
-msgstr "启用或禁用SmartDNS服务"
+msgstr "生成coredump"
-
+
-msgid "Local Port"
+msgid "Generate Coredump file when smartdns crash, coredump file is located at /tmp/smartdns.xxx.core."
-msgstr "本地端口"
+msgstr "当smartdns异常时生成coredump文件，coredump文件在/tmp/smartdns.xxx.core."
-
+
-msgid "Smartdns local server port"
+msgid "Server Name"
-msgstr "SmartDNS本地服务端口"
+msgstr "服务器名称"
-
+
-msgid "IPV4 53 Port Redirect Failure"
+msgid "Smartdns server name"
-msgstr "IPV4 53端口重定向失败"
+msgstr "SmartDNS的服务器名称，默认为smartdns，留空为主机名"
-
+
-msgid "IPV6 53 Port Redirect Failure"
+msgid "SmartDNS is a local dns server to find fastest ip."
-msgstr "IPV6 53端口重定向失败"
+msgstr "本地高性能服务器，优化网络访问性能。"
-
+
-msgid "Dnsmasq Forwared To Smartdns Failure"
+msgid "Enable or disable smartdns server"
-msgstr "重定向dnsmasq到smartdns失败"
+msgstr "启用或禁用SmartDNS服务"
-
+
-msgid "TCP Server"
+msgid "Local Port"
-msgstr "TCP服务器"
+msgstr "本地端口"
-
+
-msgid "Enable TCP DNS Server"
+msgid "Smartdns local server port"
-msgstr "启用TCP服务器"
+msgstr "SmartDNS本地服务端口"
-
+
-msgid "IPV6 Server"
+msgid "IPV4 53 Port Redirect Failure"
-msgstr "IPV6服务器"
+msgstr "IPV4 53端口重定向失败"
-
+
-msgid "Enable IPV6 DNS Server"
+msgid "IPV6 53 Port Redirect Failure"
-msgstr "启用IPV6服务器"
+msgstr "IPV6 53端口重定向失败"
-
+
-msgid "Dual-stack IP Selection"
+msgid "Dnsmasq Forwared To Smartdns Failure"
-msgstr "双栈IP优选"
+msgstr "重定向dnsmasq到smartdns失败"
-
+
-msgid "Enable IP selection between IPV4 and IPV6"
+msgid "TCP Server"
-msgstr "启用或禁用IPV4，IPV6间的IP优选策略。"
+msgstr "TCP服务器"
-
+
-msgid "Domain prefetch"
+msgid "Enable TCP DNS Server"
-msgstr "域名预加载"
+msgstr "启用TCP服务器"
-
+
-msgid "Enable domain prefetch, accelerate domain response speed."
+msgid "IPV6 Server"
-msgstr "启用域名预加载，加速域名响应速度。"
+msgstr "IPV6服务器"
-
+
-msgid "Redirect"
+msgid "Enable IPV6 DNS Server"
-msgstr "重定向"
+msgstr "启用IPV6服务器"
-
+
-msgid "SmartDNS redirect mode"
+msgid "Dual-stack IP Selection"
-msgstr "SmartDNS 重定向模式"
+msgstr "双栈IP优选"
-
+
-msgid "Run as dnsmasq upstream server"
+msgid "Enable IP selection between IPV4 and IPV6"
-msgstr "作为dnsmasq的上游服务器"
+msgstr "启用或禁用IPV4，IPV6间的IP优选策略。"
-
+
-msgid "Redirect 53 port to SmartDNS"
+msgid "Domain prefetch"
-msgstr "重定向53端口到SmartDNS"
+msgstr "域名预加载"
-
+
-msgid "Cache Size"
+msgid "Enable domain prefetch, accelerate domain response speed."
-msgstr "缓存大小"
+msgstr "启用域名预加载，加速域名响应速度。"
-
+
-msgid "DNS domain result cache size"
+msgid "Serve expired"
-msgstr "缓存DNS的结果，缓存大小，配置零则不缓存"
+msgstr "缓存过期服务"
-
+
-msgid "Domain TTL"
+msgid "Attempts to serve old responses from cache with a TTL of 0 in the response without waiting for the actual resolution to finish."
-msgstr "域名TTL"
+msgstr "查询性能优化，有请求时尝试回应TTL为0的过期记录，以避免查询等待。"
-
+
-msgid "TTL for all domain result."
+msgid "Redirect"
-msgstr "设置所有域名的TTL值"
+msgstr "重定向"
-
+
-msgid "Domain TTL Min"
+msgid "SmartDNS redirect mode"
-msgstr "域名TTL最小值"
+msgstr "SmartDNS 重定向模式"
-
+
-msgid "Minimum TTL for all domain result."
+msgid "Run as dnsmasq upstream server"
-msgstr "设置所有域名的TTL最小值"
+msgstr "作为dnsmasq的上游服务器"
-
+
-msgid "Domain TTL Max"
+msgid "Redirect 53 port to SmartDNS"
-msgstr "域名TTL最大值"
+msgstr "重定向53端口到SmartDNS"
-
+
-msgid "Maximum TTL for all domain result."
+msgid "Cache Size"
-msgstr "设置所有域名的TTL最大值"
+msgstr "缓存大小"
-
+
-msgid "smartdns custom settings"
+msgid "DNS domain result cache size"
-msgstr "smartdns 自定义设置，具体配置参数参考指导"
+msgstr "缓存DNS的结果，缓存大小，配置零则不缓存"
-
+
-msgid "Upstream Servers"
+msgid "Domain TTL"
-msgstr "上游服务器"
+msgstr "域名TTL"
-
+
-msgid "Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS servers, including multiple foreign DNS servers."
+msgid "TTL for all domain result."
-msgstr "上游DNS服务器列表，支持UDP，TCP协议，请配置多个上游DNS服务器，包括多个国内外服务器"
+msgstr "设置所有域名的TTL值"
-
+
-msgid "DNS Server Name"
+msgid "Domain TTL Min"
-msgstr "DNS服务器名称"
+msgstr "域名TTL最小值"
-
+
-msgid "port"
+msgid "Minimum TTL for all domain result."
-msgstr "端口"
+msgstr "设置所有域名的TTL最小值"
-
+
-msgid "DNS Server port"
+msgid "Domain TTL Max"
-msgstr "DNS服务器端口"
+msgstr "域名TTL最大值"
-
+
-msgid "DNS Server ip"
+msgid "Maximum TTL for all domain result."
-msgstr "DNS服务器IP"
+msgstr "设置所有域名的TTL最大值"
-
+
-msgid "type"
+msgid "smartdns custom settings"
-msgstr "类型"
+msgstr "smartdns 自定义设置，具体配置参数参考指导"
-
+
-msgid "DNS Server type"
+msgid "Second Server Settings"
-msgstr "协议类型"
+msgstr "第二DNS服务器"
-
+
-msgid "Domain Address"
+msgid "Enable or disable second DNS server."
-msgstr "域名地址"
+msgstr "是否启用第二DNS服务器。"
-
+
-msgid "TLS SNI name"
+msgid "Skip Speed Check"
-msgstr "TLS SNI名称"
+msgstr "跳过测速"
-
+
-msgid "HTTP Host"
+msgid "Do not check speed."
-msgstr "HTTP主机"
+msgstr "禁用测速。"
-
+
-msgid "Sets the server name indication"
+msgid "Server Group"
-msgstr "设置服务器SNI名称"
+msgstr "服务器组"
-
+
-msgid "Set the HTTP host used for the query. Use this parameter when the host of the URL address is an IP address."
+msgid "Query DNS through specific dns server group, such as office, home."
-msgstr "设置查询时使用的HTTP主机，当URL地址的host是IP地址时，使用此参数。"
+msgstr "使用指定服务器组查询，比如office, home。"
-
+
-msgid "Server Group"
+msgid "Skip Address Rules"
-msgstr "服务器组"
+msgstr "跳过address规则"
-
+
-msgid "DNS Server group belongs to, used with nameserver, such as offlce, home."
+msgid "Skip address rules."
-msgsr "DNS服务器所属组， 配合nameserver使用，例如：office，home。"
+msgstr "跳过address规则。"
-
+
-msgid "IP Blacklist Filtering"
+msgid "Skip Nameserver Rule"
-msgstr "IP黑名单过滤"
+msgstr "跳过Nameserver规则"
-
+
-msgid "Anti Answer Forgery"
+msgid "Skip nameserver rules."
-msgstr "反回答伪造"
+msgstr "跳过Nameserver规则。"
-
+
-msgid "Anti answer forgery, if DNS does not work properly after enabling, please turn off this feature"
+msgid "Skip Ipset Rule"
-msgstr "反回答伪造，如果启用后DNS工作不正常，请关闭此功能。"
+msgstr "跳过ipset规则"
-
+
-msgid "Filtering IP with blacklist"
+msgid "Skip ipset rules."
-msgstr "使用IP黑名单过滤"
+msgstr "跳过ipset规则。"
-
+
-msgid "TLS SPKI Pinning"
+msgid "Skip SOA Address Rule"
-msgstr "TLS SPKI 指纹"
+msgstr "跳过address SOA(#)规则"
-
+
-msgid "Used to verify the validity of the TLS server, The value is Base64 encoded SPKI fingerprint, leaving blank to indicate that the validity of TLS is not verified."
+msgid "Skip SOA address rules."
-msgstr "用于校验TLS服务器的有效性，数值为Base64编码的SPKI指纹, 留空表示不验证TLS的合法性"
+msgstr "跳过address SOA(#)规则。"
-
+
-msgid "Additional Server Args"
+msgid "Skip Dualstack Selection"
-msgstr "额外的服务器参数"
+msgstr "跳过双栈优选"
-
+
-msgid "Additional Args for upstream dns servers"
+msgid "Skip Dualstack Selection."
-msgstr "额外的上游DNS服务器参数"
+msgstr "跳过双栈优选。"
-
+
-msgid "Upstream DNS Server Configuration"
+msgid "Skip Cache"
-msgstr "上游DNS服务器配置"
+msgstr "跳过cache"
-
+
-msgid "Set Specific domain ip address."
+msgid "Skip Cache."
-msgstr "指定特定域名的IP地址"
+msgstr "跳过cache。"
-
+
-msgid "Specify an IP address to return for any host in the given domains, Queries in the domains are never forwarded and always replied to with the specified IP address which may be IPv4 or IPv6."
+msgid "Force AAAA SOA"
-msgstr "配置特定域名返回特定的IP地址，域名查询将不到上游服务器请求，直接返回配置的IP地址，可用于广告屏蔽。"
+msgstr "停用IPV6地址解析"
-
+
-msgid "IP Blacklist"
+msgid "Force AAAA SOA."
-msgstr "IP黑名单"
+msgstr "停用IPV6地址解析。"
-
+
-msgid "Set Specific ip blacklist."
+msgid "Upstream Servers"
-msgstr "设置IP黑名单列表"
+msgstr "上游服务器"
-
+
-msgid "Configure IP blacklists that will be filtered from the results of specific DNS server."
+msgid "Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS servers, including multiple foreign DNS servers."
-msgstr "配置需要从指定域名服务器结果过滤的IP黑名单。"
+msgstr "上游DNS服务器列表，支持UDP，TCP协议，请配置多个上游DNS服务器，包括多个国内外服务器"
-
+
-msgid "Technical Support"
+msgid "DNS Server Name"
-msgstr "技术支持"
+msgstr "DNS服务器名称"
-
+
-msgid "If you like this software, please buy me a cup of coffee."
+msgid "port"
-msgstr "如果本软件对你有帮助，请给作者加个蛋。"
+msgstr "端口"
-
+
-msgid "SmartDNS official website"
+msgid "DNS Server port"
-msgstr "SmartDNS官方网站"
+msgstr "DNS服务器端口"
-
+
-msgid "open website"
+msgid "DNS Server ip"
-msgstr "打开网站"
+msgstr "DNS服务器IP"
-
+
-msgid "Donate to smartdns"
+msgid "type"
-msgstr "捐助smartdns项目"
+msgstr "类型"
-
+
-msgid "Donate"
+msgid "DNS Server type"
-msgstr "捐助"
+msgstr "协议类型"
-
+
-
+msgid "Domain Address"
-
+msgstr "域名地址"
-
+
+msgid "TLS Hostname Verify"
+msgstr "校验TLS主机名"
+
+msgid "Set TLS hostname to verify."
+msgstr "设置校验TLS主机名。"
+
+msgid "TLS SNI name"
+msgstr "TLS SNI名称"
+
+msgid "HTTP Host"
+msgstr "HTTP主机"
+
+msgid "Sets the server name indication for query."
+msgstr "设置查询时使用的服务器SNI名称。"
+
+msgid "Set the HTTP host used for the query. Use this parameter when the host of the URL address is an IP address."
+msgstr "设置查询时使用的HTTP主机，当URL地址的host是IP地址时，使用此参数。"
+
+msgid "Server Group"
+msgstr "服务器组"
+
+msgid "DNS Server group belongs to, used with nameserver, such as office, home."
+msgstr "DNS服务器所属组， 配合nameserver使用，例如：office，home。"
+
+msgid "IP Blacklist Filtering"
+msgstr "IP黑名单过滤"
+
+msgid "Anti Answer Forgery"
+msgstr "反回答伪造"
+
+msgid "Anti answer forgery, if DNS does not work properly after enabling, please turn off this feature"
+msgstr "反回答伪造，如果启用后DNS工作不正常，请关闭此功能。"
+
+msgid "Filtering IP with blacklist"
+msgstr "使用IP黑名单过滤"
+
+msgid "TLS SPKI Pinning"
+msgstr "TLS SPKI 指纹"
+
+msgid "Used to verify the validity of the TLS server, The value is Base64 encoded SPKI fingerprint, leaving blank to indicate that the validity of TLS is not verified."
+msgstr "用于校验TLS服务器的有效性，数值为Base64编码的SPKI指纹, 留空表示不验证TLS的合法性"
+
+msgid "Additional Server Args"
+msgstr "额外的服务器参数"
+
+msgid "Additional Args for upstream dns servers"
+msgstr "额外的上游DNS服务器参数"
+
+msgid "Upstream DNS Server Configuration"
+msgstr "上游DNS服务器配置"
+
+msgid "Set Specific domain ip address."
+msgstr "指定特定域名的IP地址"
+
+msgid "Specify an IP address to return for any host in the given domains, Queries in the domains are never forwarded and always replied to with the specified IP address which may be IPv4 or IPv6."
+msgstr "配置特定域名返回特定的IP地址，域名查询将不到上游服务器请求，直接返回配置的IP地址，可用于广告屏蔽。"
+
+msgid "IP Blacklist"
+msgstr "IP黑名单"
+
+msgid "Set Specific ip blacklist."
+msgstr "设置IP黑名单列表"
+
+msgid "Configure IP blacklists that will be filtered from the results of specific DNS server."
+msgstr "配置需要从指定域名服务器结果过滤的IP黑名单。"
+
+msgid "Technical Support"
+msgstr "技术支持"
+
+msgid "If you like this software, please buy me a cup of coffee."
+msgstr "如果本软件对你有帮助，请给作者加个蛋。"
+
+msgid "SmartDNS official website"
+msgstr "SmartDNS官方网站"
+
+msgid "open website"
+msgstr "打开网站"
+
+msgid "Donate to smartdns"
+msgstr "捐助smartdns项目"
+
+msgid "Donate"
+msgstr "捐助"

package/luci/files/luci/model/smartdns.lua

@@ -1,17 +0,0 @@
--- Copyright 2018 Nick Peng (pymumu@gmail.com)
-
-require ("nixio.fs")
-require ("luci.http")
-require ("luci.dispatcher")
-require ("nixio.fs")
-
-local uci = require "luci.model.uci".cursor()
-
-module("luci.model.smartdns", package.seeall)
-
-function get_config_option(module, section, option, default)
-	return uci:get_first(module, section, option) or default
-end
-
-return m
-

package/luci/files/usr/share/rpcd/acl.d/luci-app-smartdns.json

@@ -0,0 +1,21 @@
+{
+	"luci-app-smartdns": {
+		"description": "Grant access to LuCI app smartdns",
+		"read": {
+			"file": {
+				"/etc/smartdns/*": [ "read" ],
+				"/usr/sbin/iptables": [ "exec" ],
+				"/usr/sbin/ip6tables": [ "exec" ],
+				"/usr/sbin/smartdns": [ "exec" ]
+			},
+			"ubus": {
+				"service": [ "list" ]
+			}
+		},
+		"write": {
+			"file": {
+				"/etc/smartdns/*": [ "write" ]
+			}
+		}
+	}
+}

package/luci/make.sh

@@ -1,5 +1,19 @@
-#/bin/sh
+#!/bin/sh
-
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 CURR_DIR=$(cd $(dirname $0);pwd)
 
 VER="`date +"1.%Y.%m.%d-%H%M"`"
@@ -12,63 +26,72 @@ showhelp()
 	echo "Options:"
 	echo " -o               output directory."
 	echo " --arch           archtecture."
-    echo " --ver            version."
+	echo " --ver            version."
 	echo " -h               show this message."
 }
 
 build_tool()
 {
-    make -C $ROOT/tool/po2lmo -j 
+	make -C $ROOT/tool/po2lmo -j 
-    PO2LMO="$ROOT/tool/po2lmo/src/po2lmo"
+	PO2LMO="$ROOT/tool/po2lmo/src/po2lmo"
 
 }
 
 clean_tool()
 {
-    make -C $ROOT/tool/po2lmo clean
+	make -C $ROOT/tool/po2lmo clean
 }
 
 build()
 {
 
-    ROOT=/tmp/luci-app-smartdns
+	ROOT=/tmp/luci-app-smartdns
-    rm -fr $ROOT
+	rm -fr $ROOT
 
-    mkdir -p $ROOT
+	mkdir -p $ROOT
-    cp $CURR_DIR/* $ROOT/ -af
+	cp $CURR_DIR/* $ROOT/ -af
-    cd $ROOT/
+	cd $ROOT/
-    build_tool
+	build_tool
-    mkdir $ROOT/root/usr/lib/lua/ -p
+	
-    cp $ROOT/files/luci $ROOT/root/usr/lib/lua/ -af
+	mkdir $ROOT/root/usr/lib/lua/ -p
-    
+	mkdir $ROOT/root/usr/lib/lua/luci/controller/ -p
-    #Generate Language
+	mkdir $ROOT/root/usr/share/rpcd/acl.d/ -p
-    $PO2LMO $ROOT/files/luci/i18n/smartdns.zh-cn.po $ROOT/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.lmo
+	cp $ROOT/files/luci/controller/* $ROOT/root/usr/lib/lua/luci/controller/ -avf
-    rm $ROOT/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.po
+	cp $ROOT/files/luci/i18n $ROOT/root/usr/lib/lua/luci/ -avf
+	cp $ROOT/files/luci/view $ROOT/root/usr/lib/lua/luci/ -avf
 
-    cp $ROOT/files/etc $ROOT/root/ -af
+	mkdir $ROOT/root/www/luci-static/resources/view -p
-    INST_SIZE="`du -sb $ROOT/root/ | awk '{print $1}'`"
+	cp $ROOT/files/luci/htdocs/luci-static/resources/view/* $ROOT/root/www/luci-static/resources/view/ -avf
-    
-    sed -i "s/^Architecture.*/Architecture: $ARCH/g" $ROOT/control/control
-    sed -i "s/Version:.*/Version: $VER/" $ROOT/control/control
 
-    if [ ! -z "$INST_SIZE" ]; then
+	#Generate Language
-        echo "Installed-Size: $INST_SIZE" >> $ROOT/control/control
+	$PO2LMO $ROOT/files/luci/i18n/smartdns.zh-cn.po $ROOT/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.lmo
-    fi
+	rm $ROOT/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.po
 
-    cd $ROOT/control
+	cp $ROOT/files/etc $ROOT/root/ -avf
-    chmod +x *
+	cp $ROOT/files/usr $ROOT/root/ -avf
-    tar zcf ../control.tar.gz ./
+	INST_SIZE="`du -sb $ROOT/root/ | awk '{print $1}'`"
-    cd $ROOT
+	
+	sed -i "s/^Architecture.*/Architecture: all/g" $ROOT/control/control
+	sed -i "s/Version:.*/Version: $VER/" $ROOT/control/control
 
-    tar zcf $ROOT/data.tar.gz -C root .
+	if [ ! -z "$INST_SIZE" ]; then
-    tar zcf $OUTPUTDIR/luci-app-smartdns.$VER.$ARCH.ipk control.tar.gz data.tar.gz debian-binary
+		echo "Installed-Size: $INST_SIZE" >> $ROOT/control/control
+	fi
 
-    rm -fr $ROOT/
+	cd $ROOT/control
+	chmod +x *
+	tar zcf ../control.tar.gz ./
+	cd $ROOT
+
+	tar zcf $ROOT/data.tar.gz -C root .
+	tar zcf $OUTPUTDIR/luci-app-smartdns.$VER.$FILEARCH.ipk control.tar.gz data.tar.gz debian-binary
+
+	rm -fr $ROOT/
 }
 
 main()
 {
-	OPTS=`getopt -o o:h --long arch:,ver: \
+	OPTS=`getopt -o o:h --long arch:,ver:,filearch: \
 		-n  "" -- "$@"`
 
 	if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -81,31 +104,38 @@ main()
 		--arch)
 			ARCH="$2"
 			shift 2;;
-        --ver)
+		--filearch)
-            VER="$2"
+			FILEARCH="$2"
-            shift 2;;
+			shift 2;;
+		--ver)
+			VER="$2"
+			shift 2;;
 		-o )
 			OUTPUTDIR="$2"
 			shift 2;;
-        -h | --help )
+		-h | --help )
 			showhelp
 			return 0
 			shift ;;
 		-- ) shift; break ;;
 		* ) break ;;
-  		esac
+		esac
 	done
 
-    if [ -z "$ARCH" ]; then
+	if [ -z "$ARCH" ]; then
-        echo "please input arch."
+		echo "please input arch."
-        return 1;
+		return 1;
-    fi
+	fi
 
-    if [ -z "$OUTPUTDIR" ]; then
+	if [ -z "$FILEARCH" ]; then
-        OUTPUTDIR=$CURR_DIR;
+		FILEARCH=$ARCH
-    fi
+	fi
 
-    build
+	if [ -z "$OUTPUTDIR" ]; then
+		OUTPUTDIR=$CURR_DIR;
+	fi
+
+	build
 }
 
 main $@

package/openwrt/Makefile

@@ -1,34 +1,59 @@
+#
+# Copyright (c) 2018-2019 Nick Peng (pymumu@gmail.com)
+# This is free software, licensed under the GNU General Public License v3.
+#
+
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=smarttdns
+PKG_NAME:=smartdns
-PKG_VERSION:=2018.7.1.1607
+PKG_VERSION:=1.2019.28
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git
+PKG_SOURCE_VERSION:=982002e836e486fb4e360bc10e84e7e7197caf46
+PKG_MIRROR_HASH:=ae889b521ecf114660ce5597af5c361f5970a7dcb75dadf61b938ba3d2baba54
+
+PKG_MAINTAINER:=Nick Peng <pymumu@gmail.com>
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+MAKE_VARS += VER=$(PKG_VERSION) 
+MAKE_PATH:=src
+
 define Package/smartdns
-	SECTION:=net
+  SECTION:=net
-	CATEGORY:=Network
+  CATEGORY:=Network
-	TITLE:=smartdns
+  TITLE:=smartdns server
-	URL:=https://github.com/pymumu/smartdns
+  DEPENDS:=+libpthread +libopenssl
-	MAINTAINER:=Nick Peng <pymumu@gmail.com>
+  URL:=https://www.github.com/pymumu/smartdns/
-	DEPENDS:=
 endef
 
 define Package/smartdns/description
-	smartdns server, find fastest ip.
+SmartDNS is a local DNS server which accepts DNS query requests from local network clients,
+get DNS query results from multiple upstream DNS servers concurrently, and returns the fastest IP to clients.
+Unlike dnsmasq's all-servers, smartdns returns the fastest IP. 
 endef
 
-define Build/Prepare
+define Package/smartdns/conffiles
-	mkdir -p $(PKG_BUILD_DIR)
+/etc/config/smartdns
-	cp -r ../* $(PKG_BUILD_DIR)
+/etc/smartdns/address.conf
+/etc/smartdns/blacklist-ip.conf
+/etc/smartdns/custom.conf
 endef
 
 define Package/smartdns/install
-	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d $(1)/etc/smartdns
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/smartdns $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/smartdns $(1)/usr/sbin/smartdns
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/package/openwrt/files/etc/init.d/smartdns $(1)/etc/init.d/smartdns
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/address.conf $(1)/etc/smartdns/address.conf
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/blacklist-ip.conf $(1)/etc/smartdns/blacklist-ip.conf
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/custom.conf $(1)/etc/smartdns/custom.conf
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/files/etc/config/smartdns $(1)/etc/config/smartdns
 endef
 
-$(eval $(call BuildPackage, smartdns))
+$(eval $(call BuildPackage,smartdns))

package/openwrt/address.conf

@@ -1,16 +1,16 @@
-# Add domains which you want to force to an IP address here.
+# Add domains which you want to force to an IP address here.
-# The example below send any host in example.com to a local webserver.
+# The example below send any host in example.com to a local webserver.
-# address /domain/[ip|-|-4|-6|#|#4|#6]
+# address /domain/[ip|-|-4|-6|#|#4|#6]
-# address /www.example.com/1.2.3.4, return ip 1.2.3.4 to client
+# address /www.example.com/1.2.3.4, return ip 1.2.3.4 to client
-# address /www.example.com/-, ignore address, query from upstream, suffix 4, for ipv4, 6 for ipv6, none for all
+# address /www.example.com/-, ignore address, query from upstream, suffix 4, for ipv4, 6 for ipv6, none for all
-# address /www.example.com/#, return SOA to client, suffix 4, for ipv4, 6 for ipv6, none for all
+# address /www.example.com/#, return SOA to client, suffix 4, for ipv4, 6 for ipv6, none for all
-
+
-# specific ipset to domain
+# specific ipset to domain
-# ipset /domain/[ipset|-]
+# ipset /domain/[ipset|-]
-# ipset /www.example.com/block, set ipset with ipset name of block 
+# ipset /www.example.com/block, set ipset with ipset name of block 
-# ipset /www.example.com/-, ignore this domain
+# ipset /www.example.com/-, ignore this domain
-
+
-# specific nameserver to domain
+# specific nameserver to domain
-# nameserver /domain/[group|-]
+# nameserver /domain/[group|-]
-# nameserver /www.example.com/office, Set the domain name to use the appropriate server group.
+# nameserver /www.example.com/office, Set the domain name to use the appropriate server group.
-# nameserver /www.example.com/-, ignore this domain
+# nameserver /www.example.com/-, ignore this domain

package/openwrt/blacklist-ip.conf

@@ -1,4 +1,4 @@
-# Add IP blacklist which you want to filtering from some DNS server here.
+# Add IP blacklist which you want to filtering from some DNS server here.
-# The example below filtering ip from the result of DNS server which is configured with -blacklist-ip.
+# The example below filtering ip from the result of DNS server which is configured with -blacklist-ip.
-# blacklist-ip [ip/subnet]
+# blacklist-ip [ip/subnet]
 # blacklist-ip 254.0.0.1/16

package/openwrt/control/postinst

@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 chmod +x /usr/sbin/smartdns
 chmod +x /etc/init.d/smartdns

package/openwrt/control/prerm

@@ -1,4 +1,20 @@
 #!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 . ${IPKG_INSTROOT}/lib/functions.sh
 default_prerm $0 $@
 rm /var/etc/smartdns.conf -f

package/openwrt/custom.conf

@@ -1,14 +1,14 @@
-# Add custom settings here.
+# Add custom settings here.
-
+
-# set log level
+# set log level
-# log-level [level], level=fatal, error, warn, notice, info, debug
+# log-level [level], level=fatal, error, warn, notice, info, debug
-# log-level error
+# log-level error
-
+
-# log-size k,m,g
+# log-size k,m,g
-# log-size 128k
+# log-size 128k
-
+
-# log-file /var/log/smartdns.log
+# log-file /var/log/smartdns.log
-# log-num 2
+# log-num 2
-
+
-# List of hosts that supply bogus NX domain results 
+# List of hosts that supply bogus NX domain results 
 # bogus-nxdomain [ip/subnet]

package/openwrt/files/etc/init.d/smartdns

@@ -1,5 +1,19 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2018 Nick Peng (pymumu@gmail.com)
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 START=99
 NAME=smartdns
@@ -8,7 +22,6 @@ SERVICE_USE_PID=1
 SERVICE_WRITE_PID=1
 SERVICE_DAEMONIZE=1
 SERVICE_PID_FILE="/var/run/smartdns.pid"
-BASECONFIGFILE="/etc/smartdns/smartdns.conf"
 SMARTDNS_CONF_DIR="/etc/smartdns"
 SMARTDNS_VAR_CONF_DIR="/var/etc/smartdns"
 SMARTDNS_CONF="$SMARTDNS_VAR_CONF_DIR/smartdns.conf"
@@ -23,22 +36,19 @@ set_forward_dnsmasq()
 {
 	local PORT="$1"
 	addr="127.0.0.1#$PORT"
-	OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
+	OLD_SERVER="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
-	echo $OLD_SERVER | grep "^$addr" >/dev/null 2>&1
+	if echo "$OLD_SERVER" | grep "^$addr" >/dev/null 2>&1; then
-	if [ $? -eq 0 ]; then
 		return
 	fi
 	uci delete dhcp.@dnsmasq[0].server 2>/dev/null
-	uci add_list dhcp.@dnsmasq[0].server=$addr
+	uci add_list dhcp.@dnsmasq[0].server="$addr"
 	for server in $OLD_SERVER; do
-		if [ "$server" = "$addr" ]; then
+		[ "$server" = "$addr" ] && continue
-			continue
+		uci add_list dhcp.@dnsmasq[0].server="$server"
-		fi
-		uci add_list dhcp.@dnsmasq[0].server=$server
 	done
 	uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
 	uci set dhcp.@dnsmasq[0].noresolv=1
-	uci commit dhcp 
+	uci commit dhcp
 	/etc/init.d/dnsmasq restart
 }
 
@@ -46,18 +56,17 @@ stop_forward_dnsmasq()
 {
 	local OLD_PORT="$1"
 	addr="127.0.0.1#$OLD_PORT"
-	OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
+	OLD_SERVER="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
-	echo $OLD_SERVER | grep "^$addr" >/dev/null 2>&1
+	if echo "$OLD_SERVER" | grep "^$addr" >/dev/null 2>&1; then
-	if [ $? -ne 0 ]; then
 		return
 	fi
 
-	uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
+	uci del_list dhcp.@dnsmasq[0].server="$addr" 2>/dev/null
-	addrlist="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
+	addrlist="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
-	if [ -z "$addrlist" ] ; then
+	[ -z "$addrlist" ] && {
 		uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto 2>/dev/null
 		uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
-	fi
+	}
 	uci commit dhcp
 	/etc/init.d/dnsmasq restart
 }
@@ -67,26 +76,24 @@ set_iptable()
 	local ipv6_server=$1
 	local tcp_server=$2
 
-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
+	IPS="$(ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}')"
 	for IP in $IPS
 	do
-		if [ "$tcp_server" == "1" ]; then
+		if [ "$tcp_server" = "1" ]; then
-			iptables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT >/dev/null 2>&1
+			iptables -t nat -A PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$SMARTDNS_PORT" >/dev/null 2>&1
 		fi
-		iptables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT >/dev/null 2>&1
+		iptables -t nat -A PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$SMARTDNS_PORT" >/dev/null 2>&1
 	done
 
-	if [ "$ipv6_server" == 0 ]; then
+	[ "$ipv6_server" = 0 ] && return
-		return
-	fi
 
-	IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
+	IPS="$(ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}')"
 	for IP in $IPS
 	do
-		if [ "$tcp_server" == "1" ]; then
+		if [ "$tcp_server" = "1" ]; then
-			ip6tables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT >/dev/null 2>&1
+			ip6tables -t nat -A PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$SMARTDNS_PORT" >/dev/null 2>&1
 		fi
-		ip6tables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT >/dev/null 2>&1
+		ip6tables -t nat -A PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$SMARTDNS_PORT" >/dev/null 2>&1
 	done
 
 }
@@ -95,24 +102,22 @@ clear_iptable()
 {
 	local OLD_PORT="$1"
 	local ipv6_server=$2
-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
+	IPS="$(ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}')"
 	for IP in $IPS
 	do
-		iptables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
+		iptables -t nat -D PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$OLD_PORT" >/dev/null 2>&1
-		iptables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
+		iptables -t nat -D PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$OLD_PORT" >/dev/null 2>&1
 	done
 
-	if [ "$ipv6_server" == 0 ]; then
+	[ "$ipv6_server" = 0 ] && return
-		return
-	fi
 
-	IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
+	IPS="$(ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}')"
 	for IP in $IPS
 	do
-		ip6tables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
+		ip6tables -t nat -D PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$OLD_PORT" >/dev/null 2>&1
-		ip6tables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
+		ip6tables -t nat -D PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$OLD_PORT" >/dev/null 2>&1
 	done
-	
+
 }
 
 service_triggers() {
@@ -126,27 +131,43 @@ conf_append()
 	echo "$1 $2" >> $SMARTDNS_CONF_TMP
 }
 
+get_tz()
+{
+	SET_TZ=""
+
+	[ -e "/etc/localtime" ] && return
+
+	for tzfile in /etc/TZ /var/etc/TZ
+	do
+		[ -e "$tzfile" ] || continue
+		tz="$(cat $tzfile 2>/dev/null)"
+	done
+
+	[ -z "$tz" ] && return
+
+	SET_TZ=$tz
+}
+
 load_server()
 {
 	local section="$1"
 	local ADDITIONAL_ARGS=""
 	local DNS_ADDRESS=""
 
-	config_get_bool "enabled" "$section" "enabled" "1"
+	config_get_bool enabled "$section" "enabled" "1"
-	config_get "port" "$section" "port" ""
+	config_get port "$section" "port" ""
-	config_get "type" "$section" "type" "udp"
+	config_get type "$section" "type" "udp"
-	config_get "ip" "$section" "ip" ""
+	config_get ip "$section" "ip" ""
-	config_get "host_name" "$section" "host_name" ""
+	config_get tls_host_verify "$section" "tls_host_verify" ""
-	config_get "http_host" "$section" "http_host" ""
+	config_get host_name "$section" "host_name" ""
-	config_get "server_group" "$section" "server_group" ""
+	config_get http_host "$section" "http_host" ""
-	config_get "blacklist_ip" "$section" "blacklist_ip" "0"
+	config_get server_group "$section" "server_group" ""
-	config_get "check_edns" "$section" "check_edns" "0"
+	config_get blacklist_ip "$section" "blacklist_ip" "0"
-	config_get "spki_pin" "$section" "spki_pin" ""
+	config_get check_edns "$section" "check_edns" "0"
-	config_get "addition_arg" "$section" "addition_arg" ""
+	config_get spki_pin "$section" "spki_pin" ""
+	config_get addition_arg "$section" "addition_arg" ""
 
-	if [ "$enabled" = "0" ]; then
+	[ "$enabled" = "0" ] && return
-		return
-	fi
 
 	if [ -z "$ip" ] || [ -z "$type" ]; then
 		return
@@ -161,152 +182,160 @@ load_server()
 		SERVER="server-https"
 	fi
 
-	if [ ! -z "`echo $ip | grep ":" | grep -v "https://"`" ]; then
+	if echo "$ip" | grep ":" | grep -q -v "https://" >/dev/null 2>&1; then
-		if [ -z "`echo $ip | grep "\["`" ]; then
+		if ! echo "$ip" | grep -q "\\[" >/dev/null 2>&1; then
 			ip="[$ip]"
 		fi
 	fi
 
-	if [ ! -z "$host_name" ]; then
+	[ -z "$tls_host_verify" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -tls-host-verify $tls_host_verify"
-		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -host-name $host_name"
+	[ -z "$host_name" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -host-name $host_name"
-	fi
+	[ -z "$http_host" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -http-host $http_host"
+	[ -z "$server_group" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -group $server_group"
+	[ "$blacklist_ip" = "0" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -blacklist-ip"
+	[ "$check_edns" = "0" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -check-edns"
+	[ -z "$spki_pin" ] || ADDITIONAL_ARGS="$ADDITIONAL_ARGS -spki-pin $spki_pin"
 
-	if [ ! -z "$http_host" ]; then
+	if [ -z "$port" ]; then
-		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -http-host $http_host"
+		DNS_ADDRESS="$ip"
-	fi
-
-	if [ ! -z "$server_group" ]; then
-		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -group $server_group"
-	fi
-
-	if [ "$blacklist_ip" != "0" ]; then
-		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -blacklist-ip"
-	fi
-
-	if [ "$check_edns" != "0" ]; then
-		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -check-edns"
-	fi
-
-	if [ ! -z "$spki_pin" ]; then
-		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -spki-pin $spki_pin"
-	fi
-
-	if [ ! -z "$port" ]; then
-		DNS_ADDRESS="$ip:$port"
 	else
-		DNS_ADDRESS="$ip"
+		DNS_ADDRESS="$ip:$port"
 	fi
 
-	if [ "$type" = "https" ]; then
+	[ "$type" = "https" ] && DNS_ADDRESS="$ip"
-		DNS_ADDRESS="$ip"
-	fi
 
 	conf_append "$SERVER" "$DNS_ADDRESS $ADDITIONAL_ARGS $addition_arg"
 }
 
-load_service() {
+load_second_server()
+{
+	local section="$1"
+	local ARGS=""
+	local ADDR=""
+
+	config_get_bool seconddns_enabled "$section" "seconddns_enabled" "0"
+	[ "$seconddns_enabled" = "0" ] && return
+
+	config_get seconddns_port "$section" "seconddns_port" "6553"
+
+	config_get_bool seconddns_no_speed_check "$section" "seconddns_no_speed_check" "0"
+	[ "$seconddns_no_speed_check" = "1" ] && ARGS="$ARGS -no-speed-check"
+
+	config_get seconddns_server_group "$section" "seconddns_server_group" ""
+	[ -z "$seconddns_server_group" ] || ARGS="$ARGS -group $seconddns_server_group"
+
+	config_get_bool seconddns_no_rule_addr "$section" "seconddns_no_rule_addr" "0"
+	[ "$seconddns_no_rule_addr" = "1" ] && ARGS="$ARGS -no-rule-addr"
+
+	config_get_bool seconddns_no_rule_nameserver "$section" "seconddns_no_rule_nameserver" "0"
+	[ "$seconddns_no_rule_nameserver" = "1" ] && ARGS="$ARGS -no-rule-nameserver"
+
+	config_get_bool seconddns_no_rule_ipset "$section" "seconddns_no_rule_ipset" "0"
+	[ "$seconddns_no_rule_ipset" = "1" ] && ARGS="$ARGS -no-rule-ipset"
+
+	config_get_bool seconddns_no_rule_soa "$section" "seconddns_no_rule_soa" "0"
+	[ "$seconddns_no_rule_soa" = "1" ] && ARGS="$ARGS -no-rule-soa"
+
+	config_get_bool seconddns_no_dualstack_selection "$section" "seconddns_no_dualstack_selection" "0"
+	[ "$seconddns_no_dualstack_selection" = "1" ] && ARGS="$ARGS -no-dualstack-selection"
+
+	config_get_bool seconddns_no_cache "$section" "seconddns_no_cache" "0"
+	[ "$seconddns_no_cache" = "1" ] && ARGS="$ARGS -no-cache"
+
+	config_get_bool force_aaaa_soa "$section" "force_aaaa_soa" "0"
+	[ "$force_aaaa_soa" = "1" ] && ARGS="$ARGS -force-aaaa-soa"
+
+	config_get ipv6_server "$section" "ipv6_server" "1"
+	if [ "$ipv6_server" = "1" ]; then
+		ADDR="[::]"
+	else
+		ADDR=""
+	fi
+
+	conf_append "bind" "$ADDR:$seconddns_port $ARGS"
+	config_get_bool "seconddns_tcp_server" "$section" "seconddns_tcp_server" "1"
+	[ "$seconddns_tcp_server" = "1" ] && conf_append "bind-tcp" "$ADDR:$seconddns_port $ARGS"
+}
+
+load_service()
+{
 	local section="$1"
 	args=""
 
 	mkdir -p $SMARTDNS_VAR_CONF_DIR
 	rm -f $SMARTDNS_CONF_TMP
 
-	config_get_bool "enabled" "$section" "enabled" '0'
+	config_get_bool enabled "$section" "enabled" '0'
 
-	config_get "server_name" "$section" "server_name" ""
+	config_get server_name "$section" "server_name" ""
-	if [ ! -z "$server_name" ]; then
+	[ -z "$server_name" ] || conf_append "server-name" "$server_name"
-		conf_append "server-name" "$server_name"	
-	fi
 
-	config_get "coredump" "$section" "coredump" "0"
+	config_get coredump "$section" "coredump" "0"
-	if [ "$coredump" = "1" ]; then
+	[ "$coredump" = "1" ] && COREDUMP="1"
-		COREDUMP="1"
-	fi
 
-	config_get "port" "$section" "port" "6053"
+	config_get port "$section" "port" "6053"
-	config_get "ipv6_server" "$section" "ipv6_server" "1"
+	config_get ipv6_server "$section" "ipv6_server" "1"
-	config_get "tcp_server" "$section" "tcp_server" "1"
+	config_get tcp_server "$section" "tcp_server" "1"
 	if [ "$ipv6_server" = "1" ]; then
 		conf_append "bind" "[::]:$port"
 	else
 		conf_append "bind" ":$port"
 	fi
 
-	if [ "$tcp_server" = "1" ]; then
+	[ "$tcp_server" = "1" ] && {
 		if [ "$ipv6_server" = "1" ]; then
 			conf_append "bind-tcp" "[::]:$port"
 		else
 			conf_append "bind-tcp" ":$port"
 		fi
-	fi
+	}
-	config_get "dualstack_ip_selection" "$section" "dualstack_ip_selection" "0"
+	config_get dualstack_ip_selection "$section" "dualstack_ip_selection" "0"
-	if [ "$dualstack_ip_selection" = "1" ]; then
+	[ "$dualstack_ip_selection" = "1" ] && conf_append "dualstack-ip-selection" "yes"
-		conf_append "dualstack-ip-selection" "yes"
-	fi
 
-	config_get "prefetch_domain" "$section" "prefetch_domain" "0"
+	config_get prefetch_domain "$section" "prefetch_domain" "0"
-	if [ "$prefetch_domain" = "1" ]; then
+	[ "$prefetch_domain" = "1" ] && conf_append "prefetch-domain" "yes"
-		conf_append "prefetch-domain" "yes"
+
-	fi
+	config_get serve_expired "$section" "serve_expired" "0"
+	[ "$serve_expired" = "1" ] && conf_append "serve-expired" "yes"
 
 	SMARTDNS_PORT="$port"
 
-	config_get "cache_size" "$section" "cache_size" ""
+	config_get cache_size "$section" "cache_size" ""
-	if [ ! -z "$cache_size" ]; then
+	[ -z "$cache_size" ] || conf_append "cache-size" "$cache_size"
-		conf_append "cache-size" "$cache_size"
-	fi
 
-	config_get "rr_ttl" "$section" "rr_ttl" ""
+	config_get rr_ttl "$section" "rr_ttl" ""
-	if [ ! -z "$rr_ttl" ]; then
+	[ -z "$rr_ttl" ] || conf_append "rr-ttl" "$rr_ttl"
-		conf_append "rr-ttl" "$rr_ttl"
-	fi
 
-	config_get "rr_ttl_min" "$section" "rr_ttl_min" ""
+	config_get rr_ttl_min "$section" "rr_ttl_min" ""
-	if [ ! -z "$rr_ttl_min" ]; then
+	[ -z "$rr_ttl_min" ] || conf_append "rr-ttl-min" "$rr_ttl_min"
-		conf_append "rr-ttl-min" "$rr_ttl_min"
-	fi
 
-	config_get "rr_ttl_max" "$section" "rr_ttl_max" ""
+	config_get rr_ttl_max "$section" "rr_ttl_max" ""
-	if [ ! -z "$rr_ttl_max" ]; then
+	[ -z "$rr_ttl_max" ] || conf_append "rr-ttl-max" "$rr_ttl_max"
-		conf_append "rr-ttl-max" "$rr_ttl_max"
-	fi
 
-	config_get "log_size" "$section" "log_size" "64K"
+	config_get log_size "$section" "log_size" "64K"
-	if [ ! -z "$log_size" ]; then
+	[ -z "$log_size" ] || conf_append "log-size" "$log_size"
-		conf_append "log-size" "$log_size"
-	fi
 
-	config_get "log_num" "$section" "log_num" "1"
+	config_get log_num "$section" "log_num" "1"
-	if [ ! -z "$log_num" ]; then
+	[ -z "$log_num" ] || conf_append "log-num" "$log_num"
-		conf_append "log-num" "$log_num"
-	fi
 
-	config_get "log_level" "$section" "log_level" "error"
+	config_get log_level "$section" "log_level" "error"
-	if [ ! -z "$log_level" ]; then
+	[ -z "$log_level" ]|| conf_append "log-level" "$log_level"
-		conf_append "log-level" "$log_level"
-	fi
 
-	config_get "log_file" "$section" "log_file" ""
+	config_get log_file "$section" "log_file" ""
-	if [ ! -z "$log_file" ]; then
+	[ -z "$log_file" ] || conf_append "log-file" "$log_file"
-		conf_append "log-file" "$log_file"
-	fi
 
-	config_get "redirect" "$section" "redirect" "none"
+	config_get redirect "$section" "redirect" "none"
-	config_get "old_redirect" "$section" "old_redirect" "none"
+	config_get old_redirect "$section" "old_redirect" "none"
-	config_get "old_port" "$section" "old_port" "0"
+	config_get old_port "$section" "old_port" "0"
-	config_get "old_enabled" "$section" "old_enabled" "0"
+	config_get old_enabled "$section" "old_enabled" "0"
 
 	if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$SMARTDNS_PORT" ] || [ "$old_enabled" = "1" -a "$enabled" = "0" ]; then
-		if [ "$old_redirect" != "none" ]; then
+		[ "$old_redirect" = "none" ] || {
-			if [ "$old_port" != "0" ]; then
+			[ "$old_port" = "0" ] || clear_iptable "$old_port" "$ipv6_server"
-				clear_iptable "$old_port" "$ipv6_server"
+			[ "$old_redirect" = "dnsmasq-upstream" ] && stop_forward_dnsmasq "$old_port"
-			fi
+		}
-			if [ "$old_redirect" == "dnsmasq-upstream" ]; then
-				stop_forward_dnsmasq "$old_port"
-			fi
-		fi
 	fi
-	
+
 	uci delete smartdns.@smartdns[0].old_redirect 2>/dev/null
 	uci delete smartdns.@smartdns[0].old_port 2>/dev/null
 	uci delete smartdns.@smartdns[0].old_enabled 2>/dev/null
@@ -323,33 +352,40 @@ load_service() {
 		set_forward_dnsmasq "$SMARTDNS_PORT"
 	fi
 
+	load_second_server $section
+
 	config_foreach load_server "server"
 
-	echo "conf-file $ADDRESS_CONF" >> $SMARTDNS_CONF_TMP
+	{
-	echo "conf-file $BLACKLIST_IP_CONF" >> $SMARTDNS_CONF_TMP
+		echo "conf-file $ADDRESS_CONF"
-	echo "conf-file $CUSTOM_CONF" >> $SMARTDNS_CONF_TMP
+		echo "conf-file $BLACKLIST_IP_CONF"
+		echo "conf-file $CUSTOM_CONF"
+	} >> $SMARTDNS_CONF_TMP
 	mv $SMARTDNS_CONF_TMP $SMARTDNS_CONF
 
 	procd_open_instance "smartdns"
-	if [ "$COREDUMP" = "1" ]; then
+	[ "$COREDUMP" = "1" ] && {
 		args="$args -S"
 		procd_set_param limits core="unlimited"
-	fi
+	}
-	
+
+	get_tz
+	[ -z "$SET_TZ" ] || procd_set_param env TZ="$SET_TZ"
+
 	procd_set_param command /usr/sbin/smartdns -f -c $SMARTDNS_CONF $args
-	if [ "$RESPAWN" = "1" ]; then
+	[ "$RESPAWN" = "1" ] &&	procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
-		procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
-	fi
 	procd_set_param file "$SMARTDNS_CONF"
 	procd_close_instance
 }
 
-start_service() {
+start_service()
+{
 	config_load "smartdns"
 	config_foreach load_service "smartdns"
 }
 
-reload_service(){
+reload_service()
+{
 	stop
 	start
 }

package/openwrt/make.sh

@@ -1,5 +1,19 @@
-#/bin/sh
+#!/bin/sh
-
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 CURR_DIR=$(cd $(dirname $0);pwd)
 
 VER="`date +"1.%Y.%m.%d-%H%M"`"
@@ -16,52 +30,57 @@ showhelp()
 	echo "Options:"
 	echo " -o               output directory."
 	echo " --arch           archtecture."
-    echo " --ver            version."
+	echo " --ver            version."
 	echo " -h               show this message."
 }
 
 build()
 {
-    ROOT=/tmp/smartdns-openwrt
+	ROOT=/tmp/smartdns-openwrt
-    rm -fr $ROOT
+	rm -fr $ROOT
 
-    mkdir -p $ROOT
+	mkdir -p $ROOT
-    cp $CURR_DIR/* $ROOT/ -af
+	cp $CURR_DIR/* $ROOT/ -af
-    cd $ROOT/
+	cd $ROOT/
-    mkdir $ROOT/root/usr/sbin -p
+	mkdir $ROOT/root/usr/sbin -p
-    mkdir $ROOT/root/etc/init.d -p
+	mkdir $ROOT/root/etc/init.d -p
-    mkdir $ROOT/root/etc/smartdns/ -p
+	mkdir $ROOT/root/etc/smartdns/ -p
 
-    cp $SMARTDNS_CONF  $ROOT/root/etc/smartdns/
+	cp $SMARTDNS_CONF  $ROOT/root/etc/smartdns/
-    cp $ADDRESS_CONF $ROOT/root/etc/smartdns/
+	cp $ADDRESS_CONF $ROOT/root/etc/smartdns/
-    cp $BLACKLIST_IP_CONF $ROOT/root/etc/smartdns/
+	cp $BLACKLIST_IP_CONF $ROOT/root/etc/smartdns/
-    cp $CUSTOM_CONF $ROOT/root/etc/smartdns/
+	cp $CUSTOM_CONF $ROOT/root/etc/smartdns/
-    cp $CURR_DIR/files/etc $ROOT/root/ -af
+	cp $CURR_DIR/files/etc $ROOT/root/ -af
-    cp $SMARTDNS_BIN $ROOT/root/usr/sbin
+	cp $SMARTDNS_BIN $ROOT/root/usr/sbin
+	if [ $? -ne 0 ]; then
+		echo "copy smartdns file failed."
+		rm -fr $ROOT/
+		return 1
+	fi
 
-    chmod +x $ROOT/root/etc/init.d/smartdns
+	chmod +x $ROOT/root/etc/init.d/smartdns
-    INST_SIZE="`du -sb $ROOT/root/ | awk '{print $1}'`"
+	INST_SIZE="`du -sb $ROOT/root/ | awk '{print $1}'`"
 
-    sed -i "s/^Architecture.*/Architecture: $ARCH/g" $ROOT/control/control
+	sed -i "s/^Architecture.*/Architecture: $ARCH/g" $ROOT/control/control
-    sed -i "s/Version:.*/Version: $VER/" $ROOT/control/control
+	sed -i "s/Version:.*/Version: $VER/" $ROOT/control/control
-    sed -i "s/^\(bind .*\):53/\1:6053/g" $ROOT/root/etc/smartdns/smartdns.conf
+	sed -i "s/^\(bind .*\):53/\1:6053/g" $ROOT/root/etc/smartdns/smartdns.conf
-    if [ ! -z "$INST_SIZE" ]; then
+	if [ ! -z "$INST_SIZE" ]; then
-        echo "Installed-Size: $INST_SIZE" >> $ROOT/control/control
+		echo "Installed-Size: $INST_SIZE" >> $ROOT/control/control
-    fi
+	fi
 
-    cd $ROOT/control
+	cd $ROOT/control
-    chmod +x *
+	chmod +x *
-    tar zcf ../control.tar.gz --owner=0 --group=0 ./
+	tar zcf ../control.tar.gz --owner=0 --group=0 ./
-    cd $ROOT
+	cd $ROOT
 
-    tar zcf $ROOT/data.tar.gz -C root --owner=0 --group=0 .
+	tar zcf $ROOT/data.tar.gz -C root --owner=0 --group=0 .
-    tar zcf $OUTPUTDIR/smartdns.$VER.$ARCH.ipk --owner=0 --group=0 control.tar.gz data.tar.gz debian-binary
+	tar zcf $OUTPUTDIR/smartdns.$VER.$FILEARCH.ipk --owner=0 --group=0 control.tar.gz data.tar.gz debian-binary
-    rm -fr $ROOT/
+	rm -fr $ROOT/
 }
 
 main()
 {
-	OPTS=`getopt -o o:h --long arch:,ver: \
+	OPTS=`getopt -o o:h --long arch:,ver:,filearch: \
 		-n  "" -- "$@"`
 
 	if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -74,31 +93,38 @@ main()
 		--arch)
 			ARCH="$2"
 			shift 2;;
-        --ver)
+		--filearch)
-            VER="$2"
+			FILEARCH="$2"
-            shift 2;;
+			shift 2;;
+		--ver)
+			VER="$2"
+			shift 2;;
 		-o )
 			OUTPUTDIR="$2"
 			shift 2;;
-        -h | --help )
+		-h | --help )
 			showhelp
 			return 0
 			shift ;;
 		-- ) shift; break ;;
 		* ) break ;;
-  		esac
+		esac
 	done
 
-    if [ -z "$ARCH" ]; then
+	if [ -z "$ARCH" ]; then
-        echo "please input arch."
+		echo "please input arch."
-        return 1;
+		return 1;
-    fi
+	fi
 
-    if [ -z "$OUTPUTDIR" ]; then
+	if [ -z "$FILEARCH" ]; then
-        OUTPUTDIR=$CURR_DIR;
+		FILEARCH=$ARCH
-    fi
+	fi
 
-    build
+	if [ -z "$OUTPUTDIR" ]; then
+		OUTPUTDIR=$CURR_DIR;
+	fi
+
+	build
 }
 
 main $@

package/optware/S50smartdns

@@ -1,9 +1,24 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 SMARTDNS_BIN=/opt/usr/sbin/smartdns
 SMARTDNS_CONF=/opt/etc/smartdns/smartdns.conf
-DNSMASQ_CONF=/etc/dnsmasq.conf
+DNSMASQ_CONF="/etc/dnsmasq.conf /var/etc/dnsmasq.conf /etc/storage/dnsmasq/dnsmasq.conf"
-SMARTDNS_PID="/var/run/smartdns.pid"
+SMARTDNS_PID=/var/run/smartdns.pid
 SMARTDNS_PORT=535
 SMARTDNS_OPT=/opt/etc/smartdns/smartdns-opt.conf
 # workmode 
@@ -28,123 +43,184 @@ set_iptable()
 		redirect_tcp=1;
 	fi
 
-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F: '{print $2}'`"
+	IPS="$(ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F: '{print $2}')"
 	for IP in $IPS
 	do
 		if [ $redirect_tcp -eq 1 ]; then
-			iptables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT > /dev/null 2>&1
+			iptables -t nat -A PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$SMARTDNS_PORT" > /dev/null 2>&1
 		fi
-		iptables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT > /dev/null 2>&1
+		iptables -t nat -A PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$SMARTDNS_PORT" > /dev/null 2>&1
 	done
 
 }
 
 clear_iptable()
 {
-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F: '{print $2}'`"
+	IPS="$(ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F: '{print $2}')"
 	for IP in $IPS
 	do
-		iptables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT > /dev/null 2>&1
+		iptables -t nat -D PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$SMARTDNS_PORT" > /dev/null 2>&1
-		iptables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT > /dev/null 2>&1
+		iptables -t nat -D PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$SMARTDNS_PORT" > /dev/null 2>&1
 	done
 	
 }
 
-restart_dnsmasq()
+get_dnsmasq_cmd()
 {
-	CMD="`ps | grep "  dnsmasq" | grep -v grep 2>/dev/null`"
+	CMD="$(ps 2>/dev/null | grep -e '[a-zA-Z]\{0,2\} \{1,\}dnsmasq' | grep -v grep 2>/dev/null)"
-	if [ -z "$CMD" ]; then
+	if [ ! -z "$CMD" ]; then
-		CMD="`ps ax | grep dnsmasq | grep -v grep 2>/dev/null`"
+		return
 	fi
 
+	CMD="$(ps 2>/dev/null | grep '/usr/sbin/dnsmasq' | grep -v grep 2>/dev/null)"
+	if [ ! -z "$CMD" ]; then
+		return
+	fi
+
+	CMD="$(ps 2>/dev/null | grep 'dnsmasq' | grep -v grep 2>/dev/null)"
+	if [ ! -z "$CMD" ]; then
+		return
+	fi
+
+	CMD="$(ps ax 2>/dev/null | grep -e '[a-zA-Z]\{0,2\} \{1,\}dnsmasq' | grep -v grep 2>/dev/null)"
+	if [ ! -z "$CMD" ]; then
+		return
+	fi
+
+	CMD="$(ps ax 2>/dev/null | grep /usr/sbin/dnsmasq | grep -v grep 2>/dev/null)"
+	if [ ! -z "$CMD" ]; then
+		return
+	fi
+
+	CMD="$(ps ax 2>/dev/null | grep 'dnsmasq' | grep -v grep 2>/dev/null)"
+	if [ ! -z "$CMD" ]; then
+		return
+	fi	
+}
+
+restart_dnsmasq()
+{
+	local CMD=""
+
+	get_dnsmasq_cmd
 	if [ -z "$CMD" ]; then
 		echo "cannot find dnsmasq"
 		return 1
 	fi
 
-	PID=`echo "$CMD" | awk '{print $1}'`
+	PID="$(echo "$CMD" | awk '{print $1}')"
 	if [ ! -d "/proc/$PID" ]; then
 		echo "dnsmasq is not running"
 		return 1
 	fi
 
-	kill -9 $PID
+	kill -9 "$PID"
 
-	DNSMASQ_CMD="`echo $CMD | awk '{for(i=5; i<=NF;i++)printf \$i " "}'`"
+	DNSMASQ_CMD="$(echo "$CMD" | awk '{for(i=5; i<=NF;i++)printf $i " "}')"
 
 	$DNSMASQ_CMD
 }
 
 get_server_ip()
 {
-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F: '{print $2}'`"
+	CONF_FILE=$1
-	LOCAL_SERVER_IP=""
+	IPS="$(ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F: '{print $2}')"
 	for IP in $IPS
 	do
 		N=3
 		while [ $N -gt 0 ]
 		do
-			ADDR=`echo $IP | awk -F. "{for(i=1;i<=$N;i++)printf \\$i\".\"}"`
+			ADDR="$(echo "$IP" | awk -F. "{for(i=1;i<="$N";i++)printf \$i\".\"}")"
-			grep "dhcp-range=" $DNSMASQ_CONF | grep $ADDR >/dev/null 2>&1
+			grep "dhcp-range=" "$CONF_FILE" | grep "$ADDR" >/dev/null 2>&1
 			if [ $? -eq 0 ]; then
-					SERVER_TAG="`grep "^dhcp-range *=" $DNSMASQ_CONF | grep $ADDR | awk -F= '{print $2}' | awk -F, '{print $1}'`"
+					SERVER_TAG="$(grep "^dhcp-range *=" "$CONF_FILE" | grep "$ADDR" | awk -F= '{print $2}' | awk -F, '{print $1}')"
 					LOCAL_SERVER_IP="$IP"
-					return 0
+					return 1
 			fi
-			N="`expr $N - 1`"
+			N=$((N-1))
 		done
 	done
 
 	return 1
 }
 
-set_dnsmasq()
+set_dnsmasq_conf()
 {
-	local RESTART_DNSMASQ=0
 	local LOCAL_SERVER_IP=""
 	local SERVER_TAG=""
-	get_server_ip
+	local CONF_FILE=$1
+
+	get_server_ip $CONF_FILE
+
 	if [ "$LOCAL_SERVER_IP" ] && [ "$SERVER_TAG" ]; then
-		grep "dhcp-option *=" $DNSMASQ_CONF | grep "$SERVER_TAG,6,$LOCAL_SERVER_IP" > /dev/null 2>&1
+		grep "dhcp-option *=" "$CONF_FILE" | grep "$SERVER_TAG,6,$LOCAL_SERVER_IP" > /dev/null 2>&1
 		if [ $? -ne 0 ]; then
-			sed -i "/^dhcp-option *=$SERVER_TAG,6,/d" $DNSMASQ_CONF
+			sed -i "/^dhcp-option *=$SERVER_TAG,6,/d" "$CONF_FILE"
-			echo "dhcp-option=$SERVER_TAG,6,$LOCAL_SERVER_IP" >> $DNSMASQ_CONF
+			echo "dhcp-option=$SERVER_TAG,6,$LOCAL_SERVER_IP" >> "$CONF_FILE"
 			RESTART_DNSMASQ=1
 		fi
 	fi
 
-	grep "^port *=0" $DNSMASQ_CONF > /dev/null 2>&1
+	grep "^port *=0" "$CONF_FILE" > /dev/null 2>&1
 	if [ $? -ne 0 ]; then
-		sed -i "/^port *=/d" $DNSMASQ_CONF
+		sed -i "/^port *=/d" "$CONF_FILE"
-		echo "port=0" >> $DNSMASQ_CONF
+		echo "port=0" >> "$CONF_FILE"
 		RESTART_DNSMASQ=1
 	fi
+}
 
+set_dnsmasq()
+{
+	local RESTART_DNSMASQ=0
+
+	for conf in $DNSMASQ_CONF
+	do
+		if [ ! -e "$conf" ]; then
+			continue
+		fi
+
+		set_dnsmasq_conf "$conf"
+	done
+	
 	if [ $RESTART_DNSMASQ -ne 0 ]; then
 		restart_dnsmasq	
 	fi
+}
 
+clear_dnsmasq_conf()
+{
+	local LOCAL_SERVER_IP=""
+	local SERVER_TAG=""
+	local CONF_FILE=$1
+	
+	get_server_ip "$CONF_FILE"
+	if [ "$LOCAL_SERVER_IP" ] && [ "$SERVER_TAG" ]; then
+		grep "dhcp-option *=" "$CONF_FILE" | grep "$SERVER_TAG,6,$LOCAL_SERVER_IP" > /dev/null 2>&1
+		if [ $? -eq 0 ]; then
+			sed -i "/^dhcp-option *=$SERVER_TAG,6,/d" "$CONF_FILE"
+			RESTART_DNSMASQ=1
+		fi
+	fi
+
+	grep "^port *=" "$CONF_FILE" > /dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		sed -i "/^port *=/d" "$CONF_FILE"
+		RESTART_DNSMASQ=1
+	fi
 }
 
 clear_dnsmasq()
 {
 	local RESTART_DNSMASQ=0
-	local LOCAL_SERVER_IP=""
-	local SERVER_TAG=""
-	get_server_ip
-	if [ "$LOCAL_SERVER_IP" ] && [ "$SERVER_TAG" ]; then
-		grep "dhcp-option *=" $DNSMASQ_CONF | grep "$SERVER_TAG,6,$LOCAL_SERVER_IP" > /dev/null 2>&1
-		if [ $? -eq 0 ]; then
-			sed -i "/^dhcp-option *=$SERVER_TAG,6,/d" $DNSMASQ_CONF
-			RESTART_DNSMASQ=1
-		fi
-	fi
 
-	grep "^port *=" $DNSMASQ_CONF > /dev/null 2>&1
+	for conf in $DNSMASQ_CONF
-	if [ $? -eq 0 ]; then
+	do
-		sed -i "/^port *=/d" $DNSMASQ_CONF
+		if [ ! -e "$conf" ]; then
-		RESTART_DNSMASQ=1
+			continue
-	fi
+		fi
+
+		clear_dnsmasq_conf "$conf"
+	done
 
 	if [ $RESTART_DNSMASQ -ne 0 ]; then
 		restart_dnsmasq	
@@ -156,11 +232,11 @@ set_smartdns_port()
 	if [ "$SMARTDNS_WORKMODE" = "0" ]; then
 		return 0
 	elif [ "$SMARTDNS_WORKMODE" = "1" ]; then
-		sed -i "s/^\(bind .*\):53 *\(.*\)\$/\1:$SMARTDNS_PORT \2/g" $SMARTDNS_CONF
+		sed -i "s/^\\(bind .*\\):53 *\\(.*\\)\$/\\1:$SMARTDNS_PORT \\2/g" $SMARTDNS_CONF
-    	sed -i "s/^\(bind-tcp .*\):53 *\(.*\)\$/\1:$SMARTDNS_PORT \2/g" $SMARTDNS_CONF
+		sed -i "s/^\\(bind-tcp .*\\):53 *\\(.*\\)\$/\\1:$SMARTDNS_PORT \\2/g" $SMARTDNS_CONF
 	elif [ "$SMARTDNS_WORKMODE" = "2" ]; then
-		sed -i "s/^\(bind .*\):$SMARTDNS_PORT *\(.*\)\$/\1:53 \2/g" $SMARTDNS_CONF
+		sed -i "s/^\\(bind .*\\):$SMARTDNS_PORT *\\(.*\\)\$/\\1:53 \\2/g" $SMARTDNS_CONF
-    	sed -i "s/^\(bind-tcp .*\):$SMARTDNS_PORT *\(.*\)\$/\1:53 \2/g" $SMARTDNS_CONF
+		sed -i "s/^\\(bind-tcp .*\\):$SMARTDNS_PORT *\\(.*\\)\$/\\1:53 \\2/g" $SMARTDNS_CONF
 	else
 		return 1
 	fi	
@@ -198,6 +274,28 @@ clear_rule()
 	fi
 }
 
+get_tz()
+{
+	if [ -e "/etc/localtime" ]; then
+		return 
+	fi
+	
+	for tzfile in /etc/TZ /var/etc/TZ
+	do
+		if [ ! -e "$tzfile" ]; then
+			continue
+		fi
+		
+		tz="$(cat $tzfile 2>/dev/null)"
+	done
+	
+	if [ -z "$tz" ]; then
+		return	
+	fi
+	
+	export TZ=$tz
+}
+
 case "$1" in
 	start)
 	set_rule
@@ -206,13 +304,14 @@ case "$1" in
 	fi
 
 	set_smartdns_port
+	get_tz
 	$SMARTDNS_BIN -c $SMARTDNS_CONF -p $SMARTDNS_PID
 	if [ $? -ne 0 ]; then
 		clear_rule
 	fi
 	;;
 	status)
-	pid="`cat $SMARTDNS_PID |head -n 1 2>/dev/null`"
+	pid="$(cat $SMARTDNS_PID |head -n 1 2>/dev/null)"
 	if [ -z "$pid" ]; then
 		echo "smartdns not running."
 		return 0
@@ -227,7 +326,7 @@ case "$1" in
 	;;
 	stop)
 	clear_rule
-	pid="`cat $SMARTDNS_PID | head -n 1 2>/dev/null`"
+	pid="$(cat "$SMARTDNS_PID" | head -n 1 2>/dev/null)"
 	if [ -z "$pid" ]; then
 		echo "smartdns not running."
 		return 0
@@ -237,7 +336,7 @@ case "$1" in
 		return 0;
 	fi
 
-	kill -9 $pid 2>/dev/null
+	kill -9 "$pid" 2>/dev/null
 	;;
 	restart)
 	$0 stop

package/optware/control/postinst

@@ -1,4 +1,19 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 chmod +x /opt/usr/sbin/smartdns
 chmod +x /opt/etc/init.d/S50smartdns

package/optware/control/prerm

@@ -1,3 +1,18 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /opt/etc/init.d/S50smartdns stop

package/optware/make.sh

@@ -1,5 +1,19 @@
-#/bin/sh
+#!/bin/sh
-
+#
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+#
+# smartdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# smartdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 CURR_DIR=$(cd $(dirname $0);pwd)
 VER="`date +"1.%Y.%m.%d-%H%M"`"
 SMARTDNS_DIR=$CURR_DIR/../../
@@ -13,44 +27,49 @@ showhelp()
 	echo "Options:"
 	echo " -o               output directory."
 	echo " --arch           archtecture."
-    echo " --ver            version."
+	echo " --ver            version."
 	echo " -h               show this message."
 }
 
 build()
 {
-    ROOT=/tmp/smartdns-optware
+	ROOT=/tmp/smartdns-optware
-    rm -fr $ROOT
+	rm -fr $ROOT
 
-    mkdir -p $ROOT
+	mkdir -p $ROOT
-    cp $CURR_DIR/* $ROOT/ -af
+	cp $CURR_DIR/* $ROOT/ -af
-    cd $ROOT/
+	cd $ROOT/
-    mkdir $ROOT/opt/usr/sbin -p
+	mkdir $ROOT/opt/usr/sbin -p
-    mkdir $ROOT/opt/etc/init.d -p
+	mkdir $ROOT/opt/etc/init.d -p
-    mkdir $ROOT/opt/etc/smartdns/ -p
+	mkdir $ROOT/opt/etc/smartdns/ -p
 
-    cp $SMARTDNS_CONF  $ROOT/opt/etc/smartdns/
+	cp $SMARTDNS_CONF  $ROOT/opt/etc/smartdns/
-    cp $SMARTDNS_OPT $ROOT/opt/etc/smartdns/
+	cp $SMARTDNS_OPT $ROOT/opt/etc/smartdns/
-    cp $CURR_DIR/S50smartdns $ROOT/opt/etc/init.d/
+	cp $CURR_DIR/S50smartdns $ROOT/opt/etc/init.d/
-    cp $SMARTDNS_BIN $ROOT/opt/usr/sbin
+	cp $SMARTDNS_BIN $ROOT/opt/usr/sbin
+	if [ $? -ne 0 ]; then
+		echo "copy smartdns file failed."
+		rm -fr $ROOT/
+		return 1
+	fi
 
-    sed -i "s/# *server-name smartdns/server-name smartdns/g" $ROOT/opt/etc/smartdns/smartdns.conf
+	sed -i "s/# *server-name smartdns/server-name smartdns/g" $ROOT/opt/etc/smartdns/smartdns.conf
-    sed -i "s/^Architecture.*/Architecture: $ARCH/g" $ROOT/control/control
+	sed -i "s/^Architecture.*/Architecture: $ARCH/g" $ROOT/control/control
-    sed -i "s/Version:.*/Version: $VER/" $ROOT/control/control
+	sed -i "s/Version:.*/Version: $VER/" $ROOT/control/control
 
-    cd $ROOT/control
+	cd $ROOT/control
-    chmod +x *
+	chmod +x *
-    tar zcf ../control.tar.gz --owner=0 --group=0 ./ 
+	tar zcf ../control.tar.gz --owner=0 --group=0 ./ 
-    cd $ROOT
+	cd $ROOT
 
-    tar zcf data.tar.gz --owner=0 --group=0 opt
+	tar zcf data.tar.gz --owner=0 --group=0 opt
-    tar zcf $OUTPUTDIR/smartdns.$VER.$ARCH.ipk --owner=0 --group=0 control.tar.gz data.tar.gz debian-binary
+	tar zcf $OUTPUTDIR/smartdns.$VER.$FILEARCH.ipk --owner=0 --group=0 control.tar.gz data.tar.gz debian-binary
-    rm -fr $ROOT/
+	rm -fr $ROOT/
 }
 
 main()
 {
-	OPTS=`getopt -o o:h --long arch:,ver: \
+	OPTS=`getopt -o o:h --long arch:,ver:,filearch: \
 		-n  "" -- "$@"`
 
 	if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -63,31 +82,38 @@ main()
 		--arch)
 			ARCH="$2"
 			shift 2;;
-        --ver)
+		--filearch)
-            VER="$2"
+			FILEARCH="$2"
-            shift 2;;
+			shift 2;;
+		--ver)
+			VER="$2"
+			shift 2;;
 		-o )
 			OUTPUTDIR="$2"
 			shift 2;;
-        -h | --help )
+		-h | --help )
 			showhelp
 			return 0
 			shift ;;
 		-- ) shift; break ;;
 		* ) break ;;
-  		esac
+		esac
 	done
 
-    if [ -z "$ARCH" ]; then
+	if [ -z "$ARCH" ]; then
-        echo "please input arch."
+		echo "please input arch."
-        return 1;
+		return 1;
-    fi
+	fi
 
-    if [ -z "$OUTPUTDIR" ]; then
+	if [ -z "$FILEARCH" ]; then
-        OUTPUTDIR=$CURR_DIR;
+		FILEARCH=$ARCH
-    fi
+	fi
 
-    build
+	if [ -z "$OUTPUTDIR" ]; then
+		OUTPUTDIR=$CURR_DIR;
+	fi
+
+	build
 }
 
 main $@

src/Makefile

@@ -1,20 +1,49 @@
-
+
-BIN=smartdns 
+# Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-OBJS_LIB=lib/rbtree.o lib/art.o lib/bitops.o lib/radix.o lib/conf.o
+#
-OBJS=smartdns.o fast_ping.o dns_client.o dns_server.o dns.o util.o tlog.o dns_conf.o dns_cache.o http_parse.o $(OBJS_LIB)
+# smartdns is free software: you can redistribute it and/or modify
-CFLAGS +=-O2 -g -Wall -Wstrict-prototypes -fno-omit-frame-pointer -Wstrict-aliasing 
+# it under the terms of the GNU General Public License as published by
-CFLAGS +=-Iinclude
+# the Free Software Foundation, either version 3 of the License, or
-CFLAGS += -DBASE_FILE_NAME=\"$(notdir $<)\"
+# (at your option) any later version.
-CXXFLAGS=-O2 -g -Wall -std=c++11 
+#
-CXXFLAGS +=-Iinclude
+# smartdns is distributed in the hope that it will be useful,
-LDFLAGS += -lpthread -lssl -lcrypto
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.PHONY: all
+# GNU General Public License for more details.
-
+#
-all: $(BIN)
+# You should have received a copy of the GNU General Public License
- 
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-$(BIN) : $(OBJS)
+
-	$(CC) $(OBJS) -o $@ $(LDFLAGS)
+BIN=smartdns 
-
+OBJS_LIB=lib/rbtree.o lib/art.o lib/bitops.o lib/radix.o lib/conf.o
-clean:
+OBJS=smartdns.o fast_ping.o dns_client.o dns_server.o dns.o util.o tlog.o dns_conf.o dns_cache.o http_parse.o $(OBJS_LIB)
-	$(RM) $(OBJS) $(BIN)
+
+# cflags
+ifndef CFLAGS
+CFLAGS =-O2 -g -Wall -Wstrict-prototypes -fno-omit-frame-pointer -Wstrict-aliasing 
+endif
+override CFLAGS +=-Iinclude
+override CFLAGS += -DBASE_FILE_NAME=\"$(notdir $<)\"
+ifdef VER
+override CFLAGS += -DSMARTDNS_VERION=\"$(VER)\"
+endif
+
+CXXFLAGS=-O2 -g -Wall -std=c++11 
+override CXXFLAGS +=-Iinclude
+
+# ldflags
+ifeq ($(STATIC), yes)
+override LDFLAGS += -lssl -lcrypto -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -ldl -static
+else
+override LDFLAGS += -lssl -lcrypto -lpthread 
+endif
+
+.PHONY: all
+
+all: $(BIN)
+ 
+$(BIN) : $(OBJS)
+	$(CC) $(OBJS) -o $@ $(LDFLAGS)
+
+clean:
+	$(RM) $(OBJS) $(BIN)

src/dns.h

@@ -1,3 +1,21 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef _DNS_HEAD_H
 #define _DNS_HEAD_H
 

src/dns_cache.c

@@ -1,342 +1,450 @@
-#include "dns_cache.h"
+/*************************************************************************
-#include "tlog.h"
+ *
-#include <pthread.h>
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-
+ *
-struct dns_cache_head {
+ * smartdns is free software: you can redistribute it and/or modify
-	DECLARE_HASHTABLE(cache_hash, 10);
+ * it under the terms of the GNU General Public License as published by
-	struct list_head cache_list;
+ * the Free Software Foundation, either version 3 of the License, or
-	atomic_t num;
+ * (at your option) any later version.
-	int size;
+ *
-	pthread_mutex_t lock;
+ * smartdns is distributed in the hope that it will be useful,
-};
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-static struct dns_cache_head dns_cache_head;
+ * GNU General Public License for more details.
-
+ *
-int dns_cache_init(int size)
+ * You should have received a copy of the GNU General Public License
-{
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	INIT_LIST_HEAD(&dns_cache_head.cache_list);
+ */
-	hash_init(dns_cache_head.cache_hash);
+
-	atomic_set(&dns_cache_head.num, 0);
+#include "dns_cache.h"
-	dns_cache_head.size = size;
+#include "stringutil.h"
-
+#include "tlog.h"
-	pthread_mutex_init(&dns_cache_head.lock, NULL);
+#include <pthread.h>
-
+
-	return 0;
+#define DNS_CACHE_MAX_HITNUM 5000
-}
+#define DNS_CACHE_HITNUM_STEP 2
-
+#define DNS_CACHE_HITNUM_STEP_MAX 6
-static __attribute__((unused)) struct dns_cache *_dns_cache_last(void) 
+
-{
+struct dns_cache_head {
-	return list_last_entry(&dns_cache_head.cache_list, struct dns_cache, list);
+	DECLARE_HASHTABLE(cache_hash, 10);
-}
+	struct list_head cache_list;
-
+	struct list_head inactive_list;
-static struct dns_cache *_dns_cache_first(void)
+	atomic_t num;
-{
+	int size;
-	return list_first_entry_or_null(&dns_cache_head.cache_list, struct dns_cache, list);
+	int enable_inactive;
-}
+	int inactive_list_expired;
-
+	pthread_mutex_t lock;
-static void _dns_cache_delete(struct dns_cache *dns_cache)
+};
-{
+
-	hash_del(&dns_cache->node);
+static struct dns_cache_head dns_cache_head;
-	list_del_init(&dns_cache->list);
+
-	atomic_dec(&dns_cache_head.num);
+int dns_cache_init(int size, int enable_inactive, int inactive_list_expired)
-	free(dns_cache);
+{
-}
+	INIT_LIST_HEAD(&dns_cache_head.cache_list);
-
+	INIT_LIST_HEAD(&dns_cache_head.inactive_list);
-void dns_cache_get(struct dns_cache *dns_cache)
+	hash_init(dns_cache_head.cache_hash);
-{
+	atomic_set(&dns_cache_head.num, 0);
-	if (atomic_inc_return(&dns_cache->ref) == 1) {
+	dns_cache_head.size = size;
-		tlog(TLOG_ERROR, "BUG: dns_cache is invalid.");
+	dns_cache_head.enable_inactive = enable_inactive;
-		return;
+	dns_cache_head.inactive_list_expired = inactive_list_expired;
-	}
+
-}
+	pthread_mutex_init(&dns_cache_head.lock, NULL);
-
+
-void dns_cache_release(struct dns_cache *dns_cache)
+	return 0;
-{
+}
-	if (dns_cache == NULL) {
+
-		return;
+static __attribute__((unused)) struct dns_cache *_dns_cache_last(void)
-	}
+{
-	if (!atomic_dec_and_test(&dns_cache->ref)) {
+	struct dns_cache *dns_cache = NULL;
-		return;
+
-	}
+	dns_cache = list_last_entry(&dns_cache_head.inactive_list, struct dns_cache, list);
-
+	if (dns_cache) {
-	_dns_cache_delete(dns_cache);
+		return dns_cache;
-}
+	}
-
+
-static void _dns_cache_remove(struct dns_cache *dns_cache)
+	return list_last_entry(&dns_cache_head.cache_list, struct dns_cache, list);
-{
+}
-	hash_del(&dns_cache->node);
+
-	list_del_init(&dns_cache->list);
+static struct dns_cache *_dns_cache_first(void)
-	dns_cache_release(dns_cache);
+{
-}
+	struct dns_cache *dns_cache = NULL;
-
+
-int dns_cache_replace(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len, int speed)
+	dns_cache = list_first_entry_or_null(&dns_cache_head.inactive_list, struct dns_cache, list);
-{
+	if (dns_cache) {
-	struct dns_cache *dns_cache = NULL;
+		return dns_cache;
-
+	}
-	if (dns_cache_head.size <= 0) {
+
-		return 0;
+	return list_first_entry_or_null(&dns_cache_head.cache_list, struct dns_cache, list);
-	}
+}
-
+
-	/* lookup existing cache */
+static void _dns_cache_delete(struct dns_cache *dns_cache)
-	dns_cache = dns_cache_lookup(domain, qtype);
+{
-	if (dns_cache == NULL) {
+	hash_del(&dns_cache->node);
-		return 0;
+	list_del_init(&dns_cache->list);
-	}
+	atomic_dec(&dns_cache_head.num);
-
+	free(dns_cache);
-	if (ttl < DNS_CACHE_TTL_MIN) {
+}
-		ttl = DNS_CACHE_TTL_MIN;
+
-	}
+void dns_cache_get(struct dns_cache *dns_cache)
-
+{
-	/* update cache data */
+	if (atomic_inc_return(&dns_cache->ref) == 1) {
-	pthread_mutex_lock(&dns_cache_head.lock);
+		tlog(TLOG_ERROR, "BUG: dns_cache is invalid.");
-	dns_cache->ttl = ttl;
+		return;
-	dns_cache->qtype = qtype;
+	}
-	dns_cache->ttl = ttl;
+}
-	dns_cache->del_pending = 0;
+
-	dns_cache->speed = speed;
+void dns_cache_release(struct dns_cache *dns_cache)
-	time(&dns_cache->insert_time);
+{
-	if (qtype == DNS_T_A) {
+	if (dns_cache == NULL) {
-		if (addr_len != DNS_RR_A_LEN) {
+		return;
-			goto errout_unlock;
+	}
-		}
+	if (!atomic_dec_and_test(&dns_cache->ref)) {
-		memcpy(dns_cache->addr, addr, DNS_RR_A_LEN);
+		return;
-	} else if (qtype == DNS_T_AAAA) {
+	}
-		if (addr_len != DNS_RR_AAAA_LEN) {
+
-			goto errout_unlock;
+	_dns_cache_delete(dns_cache);
-		}
+}
-		memcpy(dns_cache->addr, addr, DNS_RR_AAAA_LEN);
+
-	} else {
+static void _dns_cache_remove(struct dns_cache *dns_cache)
-		goto errout_unlock;
+{
-	}
+	hash_del(&dns_cache->node);
-
+	list_del_init(&dns_cache->list);
-	if (cname) {
+	dns_cache_release(dns_cache);
-		strncpy(dns_cache->cname, cname, DNS_MAX_CNAME_LEN);
+}
-		dns_cache->cname_ttl = cname_ttl;
+
-	}
+static void _dns_cache_move_inactive(struct dns_cache *dns_cache)
-	pthread_mutex_unlock(&dns_cache_head.lock);
+{
-
+	list_del_init(&dns_cache->list);
-	dns_cache_release(dns_cache);
+	list_add_tail(&dns_cache->list, &dns_cache_head.inactive_list);
-	return 0;
+}
-errout_unlock:
+
-	pthread_mutex_unlock(&dns_cache_head.lock);
+int dns_cache_replace(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len, int speed)
-//errout:
+{
-	if (dns_cache) {
+	struct dns_cache *dns_cache = NULL;
-		dns_cache_release(dns_cache);
+
-	}
+	if (dns_cache_head.size <= 0) {
-	return -1;
+		return 0;
-}
+	}
-
+
-int dns_cache_insert(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len, int speed)
+	/* lookup existing cache */
-{
+	dns_cache = dns_cache_lookup(domain, qtype);
-	uint32_t key = 0;
+	if (dns_cache == NULL) {
-	struct dns_cache *dns_cache = NULL;
+		return 0;
-
+	}
-	if (dns_cache_head.size <= 0) {
+
-		return 0;
+	if (ttl < DNS_CACHE_TTL_MIN) {
-	}
+		ttl = DNS_CACHE_TTL_MIN;
-
+	}
-	/* if cache already exists, free */
+
-	dns_cache = dns_cache_lookup(domain, qtype);
+	/* update cache data */
-	if (dns_cache) {
+	pthread_mutex_lock(&dns_cache_head.lock);
-		dns_cache_delete(dns_cache);
+	dns_cache->ttl = ttl;
-		dns_cache_release(dns_cache);
+	dns_cache->qtype = qtype;
-		dns_cache = NULL;
+	dns_cache->ttl = ttl;
-	}
+	dns_cache->del_pending = 0;
-
+	dns_cache->speed = speed;
-	dns_cache = malloc(sizeof(*dns_cache));
+	time(&dns_cache->insert_time);
-	if (dns_cache == NULL) {
+	if (qtype == DNS_T_A) {
-		goto errout;
+		if (addr_len != DNS_RR_A_LEN) {
-	}
+			goto errout_unlock;
-
+		}
-	if (ttl < DNS_CACHE_TTL_MIN) {
+		memcpy(dns_cache->addr, addr, DNS_RR_A_LEN);
-		ttl = DNS_CACHE_TTL_MIN;
+	} else if (qtype == DNS_T_AAAA) {
-	}
+		if (addr_len != DNS_RR_AAAA_LEN) {
-
+			goto errout_unlock;
-	key = hash_string(domain);
+		}
-	key = jhash(&qtype, sizeof(qtype), key);
+		memcpy(dns_cache->addr, addr, DNS_RR_AAAA_LEN);
-	strncpy(dns_cache->domain, domain, DNS_MAX_CNAME_LEN);
+	} else {
-	dns_cache->cname[0] = 0;
+		goto errout_unlock;
-	dns_cache->qtype = qtype;
+	}
-	dns_cache->ttl = ttl;
+
-	atomic_set(&dns_cache->hitnum, 2);
+	if (cname) {
-	dns_cache->del_pending = 0;
+		safe_strncpy(dns_cache->cname, cname, DNS_MAX_CNAME_LEN);
-	dns_cache->speed = speed;
+		dns_cache->cname_ttl = cname_ttl;
-	atomic_set(&dns_cache->ref, 1);
+	}
-	time(&dns_cache->insert_time);
+
-	if (qtype == DNS_T_A) {
+	list_del_init(&dns_cache->list);
-		if (addr_len != DNS_RR_A_LEN) {
+	list_add_tail(&dns_cache->list, &dns_cache_head.cache_list);
-			goto errout;
+	pthread_mutex_unlock(&dns_cache_head.lock);
-		}
+
-		memcpy(dns_cache->addr, addr, DNS_RR_A_LEN);
+	dns_cache_release(dns_cache);
-	} else if (qtype == DNS_T_AAAA) {
+	return 0;
-		if (addr_len != DNS_RR_AAAA_LEN) {
+errout_unlock:
-			goto errout;
+	pthread_mutex_unlock(&dns_cache_head.lock);
-		}
+	// errout:
-		memcpy(dns_cache->addr, addr, DNS_RR_AAAA_LEN);
+	if (dns_cache) {
-	} else {
+		dns_cache_release(dns_cache);
-		goto errout;
+	}
-	}
+	return -1;
-
+}
-	if (cname) {
+
-		strncpy(dns_cache->cname, cname, DNS_MAX_CNAME_LEN);
+int dns_cache_insert(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len, int speed)
-		dns_cache->cname_ttl = cname_ttl;
+{
-	}
+	uint32_t key = 0;
-
+	struct dns_cache *dns_cache = NULL;
-	pthread_mutex_lock(&dns_cache_head.lock);
+
-	hash_add(dns_cache_head.cache_hash, &dns_cache->node, key);
+	if (dns_cache_head.size <= 0) {
-	list_add_tail(&dns_cache->list, &dns_cache_head.cache_list);
+		return 0;
-	INIT_LIST_HEAD(&dns_cache->check_list);
+	}
-
+
-	/* Release extra cache, remove oldest cache record */
+	/* if cache already exists, free */
-	if (atomic_inc_return(&dns_cache_head.num) > dns_cache_head.size) {
+	dns_cache = dns_cache_lookup(domain, qtype);
-		struct dns_cache *del_cache;
+	if (dns_cache) {
-		del_cache = _dns_cache_first();
+		dns_cache_delete(dns_cache);
-		if (del_cache) {
+		dns_cache_release(dns_cache);
-			_dns_cache_remove(del_cache);
+		dns_cache = NULL;
-		}
+	}
-	}
+
-	pthread_mutex_unlock(&dns_cache_head.lock);
+	dns_cache = malloc(sizeof(*dns_cache));
-
+	if (dns_cache == NULL) {
-	return 0;
+		goto errout;
-errout:
+	}
-	if (dns_cache) {
+
-		free(dns_cache);
+	if (ttl < DNS_CACHE_TTL_MIN) {
-	}
+		ttl = DNS_CACHE_TTL_MIN;
-
+	}
-	return -1;
+
-}
+	key = hash_string(domain);
-
+	key = jhash(&qtype, sizeof(qtype), key);
-struct dns_cache *dns_cache_lookup(char *domain, dns_type_t qtype)
+	safe_strncpy(dns_cache->domain, domain, DNS_MAX_CNAME_LEN);
-{
+	dns_cache->cname[0] = 0;
-	uint32_t key = 0;
+	dns_cache->qtype = qtype;
-	struct dns_cache *dns_cache = NULL;
+	dns_cache->ttl = ttl;
-	struct dns_cache *dns_cache_ret = NULL;
+	atomic_set(&dns_cache->hitnum, 3);
-	time_t now;
+	dns_cache->hitnum_update_add = DNS_CACHE_HITNUM_STEP;
-
+	dns_cache->del_pending = 0;
-	if (dns_cache_head.size <= 0) {
+	dns_cache->speed = speed;
-		return NULL;
+	atomic_set(&dns_cache->ref, 1);
-	}
+	time(&dns_cache->insert_time);
-
+	if (qtype == DNS_T_A) {
-	key = hash_string(domain);
+		if (addr_len != DNS_RR_A_LEN) {
-	key = jhash(&qtype, sizeof(qtype), key);
+			goto errout;
-
+		}
-	time(&now);
+		memcpy(dns_cache->addr, addr, DNS_RR_A_LEN);
-	/* find cache */
+	} else if (qtype == DNS_T_AAAA) {
-	pthread_mutex_lock(&dns_cache_head.lock);
+		if (addr_len != DNS_RR_AAAA_LEN) {
-	hash_for_each_possible(dns_cache_head.cache_hash, dns_cache, node, key)
+			goto errout;
-	{
+		}
-		if (dns_cache->qtype != qtype) {
+		memcpy(dns_cache->addr, addr, DNS_RR_AAAA_LEN);
-			continue;
+	} else {
-		}
+		goto errout;
-
+	}
-		if (strncmp(domain, dns_cache->domain, DNS_MAX_CNAME_LEN) != 0) {
+
-			continue;
+	if (cname) {
-		}
+		safe_strncpy(dns_cache->cname, cname, DNS_MAX_CNAME_LEN);
-
+		dns_cache->cname_ttl = cname_ttl;
-		dns_cache_ret = dns_cache;
+	}
-		break;
+
-	}
+	pthread_mutex_lock(&dns_cache_head.lock);
-
+	hash_add(dns_cache_head.cache_hash, &dns_cache->node, key);
-	if (dns_cache_ret) {
+	list_add_tail(&dns_cache->list, &dns_cache_head.cache_list);
-		/* Return NULL if the cache times out */
+	INIT_LIST_HEAD(&dns_cache->check_list);
-		if (now - dns_cache_ret->insert_time > dns_cache_ret->ttl) {
+
-			_dns_cache_remove(dns_cache_ret);
+	/* Release extra cache, remove oldest cache record */
-			dns_cache_ret = NULL;
+	if (atomic_inc_return(&dns_cache_head.num) > dns_cache_head.size) {
-		} else {
+		struct dns_cache *del_cache;
-			dns_cache_get(dns_cache_ret);
+		del_cache = _dns_cache_first();
-		}
+		if (del_cache) {
-	}
+			_dns_cache_remove(del_cache);
-
+		}
-	pthread_mutex_unlock(&dns_cache_head.lock);
+	}
-
+	pthread_mutex_unlock(&dns_cache_head.lock);
-	return dns_cache_ret;
+
-}
+	return 0;
-
+errout:
-int dns_cache_get_ttl(struct dns_cache *dns_cache)
+	if (dns_cache) {
-{
+		free(dns_cache);
-	time_t now;
+	}
-	int ttl = 0;
+
-	time(&now);
+	return -1;
-
+}
-	ttl = dns_cache->insert_time + dns_cache->ttl - now;
+
-	if (ttl < 0) {
+struct dns_cache *dns_cache_lookup(char *domain, dns_type_t qtype)
-		return 0;
+{
-	}
+	uint32_t key = 0;
-
+	struct dns_cache *dns_cache = NULL;
-	return ttl;
+	struct dns_cache *dns_cache_ret = NULL;
-}
+	time_t now;
-
+
-void dns_cache_delete(struct dns_cache *dns_cache)
+	if (dns_cache_head.size <= 0) {
-{
+		return NULL;
-	pthread_mutex_lock(&dns_cache_head.lock);
+	}
-	_dns_cache_remove(dns_cache);
+
-	pthread_mutex_unlock(&dns_cache_head.lock);
+	key = hash_string(domain);
-}
+	key = jhash(&qtype, sizeof(qtype), key);
-
+
-void dns_cache_update(struct dns_cache *dns_cache)
+	time(&now);
-{
+	/* find cache */
-	pthread_mutex_lock(&dns_cache_head.lock);
+	pthread_mutex_lock(&dns_cache_head.lock);
-	if (!list_empty(&dns_cache->list)) {
+	hash_for_each_possible(dns_cache_head.cache_hash, dns_cache, node, key)
-		list_del_init(&dns_cache->list);
+	{
-		list_add_tail(&dns_cache->list, &dns_cache_head.cache_list);
+		if (dns_cache->qtype != qtype) {
-		atomic_inc(&dns_cache->hitnum);
+			continue;
-	}
+		}
-	pthread_mutex_unlock(&dns_cache_head.lock);
+
-}
+		if (strncmp(domain, dns_cache->domain, DNS_MAX_CNAME_LEN) != 0) {
-
+			continue;
-void dns_cache_invalidate(dns_cache_preinvalid_callback callback, int ttl_pre)
+		}
-{
+
-	struct dns_cache *dns_cache = NULL;
+		dns_cache_ret = dns_cache;
-	struct dns_cache *tmp;
+		break;
-	time_t now;
+	}
-	int ttl = 0;
+
-	LIST_HEAD(checklist);
+	if (dns_cache_ret) {
-
+		/* Return NULL if the cache times out */
-	if (dns_cache_head.size <= 0) {
+		if (dns_cache_head.enable_inactive == 0 && (now - dns_cache_ret->insert_time > dns_cache_ret->ttl)) {
-		return;
+			_dns_cache_remove(dns_cache_ret);
-	}
+			dns_cache_ret = NULL;
-
+		} else {
-	time(&now);
+			dns_cache_get(dns_cache_ret);
-	pthread_mutex_lock(&dns_cache_head.lock);
+		}
-	list_for_each_entry_safe(dns_cache, tmp, &dns_cache_head.cache_list, list)
+	}
-	{
+
-		ttl = dns_cache->insert_time + dns_cache->ttl - now;
+	pthread_mutex_unlock(&dns_cache_head.lock);
-		if (ttl > 0 && ttl < ttl_pre) {
+
-			/* If the TTL time is in the pre-timeout range, call callback function */
+	return dns_cache_ret;
-			if (callback && dns_cache->del_pending == 0) {
+}
-				list_add_tail(&dns_cache->check_list, &checklist);
+
-				dns_cache_get(dns_cache);
+int dns_cache_get_ttl(struct dns_cache *dns_cache)
-				dns_cache->del_pending = 1;
+{
-				continue;
+	time_t now;
-			}
+	int ttl = 0;
-		}
+	time(&now);
-
+
-		if (ttl < 0) {
+	ttl = dns_cache->insert_time + dns_cache->ttl - now;
-			_dns_cache_remove(dns_cache);
+	if (ttl < 0) {
-		}
+		return 0;
-	}
+	}
-	pthread_mutex_unlock(&dns_cache_head.lock);
+
-
+	return ttl;
-	list_for_each_entry_safe(dns_cache, tmp, &checklist, check_list)
+}
-	{
+
-		/* run callback */
+void dns_cache_delete(struct dns_cache *dns_cache)
-		if (callback) {
+{
-			callback(dns_cache);
+	pthread_mutex_lock(&dns_cache_head.lock);
-		}
+	_dns_cache_remove(dns_cache);
-		dns_cache_release(dns_cache);
+	pthread_mutex_unlock(&dns_cache_head.lock);
-	}
+}
-}
+
-
+int dns_cache_hitnum_dec_get(struct dns_cache *dns_cache)
-void dns_cache_destroy(void)
+{
-{
+	int hitnum = 0;
-	struct dns_cache *dns_cache = NULL;
+	pthread_mutex_lock(&dns_cache_head.lock);
-	struct dns_cache *tmp;
+	hitnum = atomic_dec_return(&dns_cache->hitnum);
-	pthread_mutex_lock(&dns_cache_head.lock);
+	if (dns_cache->hitnum_update_add > DNS_CACHE_HITNUM_STEP) {
-	list_for_each_entry_safe(dns_cache, tmp, &dns_cache_head.cache_list, list)
+		dns_cache->hitnum_update_add--;
-	{
+	}
-		_dns_cache_delete(dns_cache);
+	pthread_mutex_unlock(&dns_cache_head.lock);
-	}
+
-	pthread_mutex_unlock(&dns_cache_head.lock);
+	return hitnum;
-
+}
-	pthread_mutex_destroy(&dns_cache_head.lock);
+
-}
+void dns_cache_update(struct dns_cache *dns_cache)
+{
+	pthread_mutex_lock(&dns_cache_head.lock);
+	if (!list_empty(&dns_cache->list)) {
+		list_del_init(&dns_cache->list);
+		list_add_tail(&dns_cache->list, &dns_cache_head.cache_list);
+		atomic_add(dns_cache->hitnum_update_add, &dns_cache->hitnum);
+		if (atomic_read(&dns_cache->hitnum) > DNS_CACHE_MAX_HITNUM) {
+			atomic_set(&dns_cache->hitnum, DNS_CACHE_MAX_HITNUM);
+		}
+
+		if (dns_cache->hitnum_update_add < DNS_CACHE_HITNUM_STEP_MAX) {
+			dns_cache->hitnum_update_add++;
+		}
+	}
+	pthread_mutex_unlock(&dns_cache_head.lock);
+}
+
+void _dns_cache_remove_expired_ttl(time_t *now)
+{
+	struct dns_cache *dns_cache = NULL;
+	struct dns_cache *tmp;
+	int ttl = 0;
+
+	list_for_each_entry_safe(dns_cache, tmp, &dns_cache_head.inactive_list, list)
+	{
+		ttl = dns_cache->insert_time + dns_cache->ttl - *now;
+		if (ttl > 0) {
+			continue;
+		}
+
+		if (dns_cache_head.inactive_list_expired + ttl > 0) {
+			continue;
+		}
+
+		_dns_cache_remove(dns_cache);
+	}
+}
+
+void dns_cache_invalidate(dns_cache_preinvalid_callback callback, int ttl_pre)
+{
+	struct dns_cache *dns_cache = NULL;
+	struct dns_cache *tmp;
+	time_t now;
+	int ttl = 0;
+	LIST_HEAD(checklist);
+
+	if (dns_cache_head.size <= 0) {
+		return;
+	}
+
+	time(&now);
+	pthread_mutex_lock(&dns_cache_head.lock);
+	list_for_each_entry_safe(dns_cache, tmp, &dns_cache_head.cache_list, list)
+	{
+		ttl = dns_cache->insert_time + dns_cache->ttl - now;
+		if (ttl > 0 && ttl < ttl_pre) {
+			/* If the TTL time is in the pre-timeout range, call callback function */
+			if (callback && dns_cache->del_pending == 0) {
+				list_add_tail(&dns_cache->check_list, &checklist);
+				dns_cache_get(dns_cache);
+				dns_cache->del_pending = 1;
+				continue;
+			}
+		}
+
+		if (ttl < 0) {
+			if (dns_cache_head.enable_inactive) {
+				_dns_cache_move_inactive(dns_cache);
+			} else {
+				_dns_cache_remove(dns_cache);
+			}
+		}
+	}
+
+	if (dns_cache_head.enable_inactive && dns_cache_head.inactive_list_expired != 0) {
+		_dns_cache_remove_expired_ttl(&now);
+	}
+
+	pthread_mutex_unlock(&dns_cache_head.lock);
+
+	list_for_each_entry_safe(dns_cache, tmp, &checklist, check_list)
+	{
+		/* run callback */
+		if (callback) {
+			callback(dns_cache);
+		}
+		dns_cache_release(dns_cache);
+	}
+}
+
+void dns_cache_destroy(void)
+{
+	struct dns_cache *dns_cache = NULL;
+	struct dns_cache *tmp;
+	pthread_mutex_lock(&dns_cache_head.lock);
+	list_for_each_entry_safe(dns_cache, tmp, &dns_cache_head.inactive_list, list)
+	{
+		_dns_cache_delete(dns_cache);
+	}
+
+	list_for_each_entry_safe(dns_cache, tmp, &dns_cache_head.cache_list, list)
+	{
+		_dns_cache_delete(dns_cache);
+	}
+	pthread_mutex_unlock(&dns_cache_head.lock);
+
+	pthread_mutex_destroy(&dns_cache_head.lock);
+}

src/dns_cache.h

@@ -1,59 +1,87 @@
-#ifndef _SMARTDNS_CACHE_H
+/*************************************************************************
-#define _SMARTDNS_CACHE_H
+ *
-
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-#include "atomic.h"
+ *
-#include "dns.h"
+ * smartdns is free software: you can redistribute it and/or modify
-#include "hash.h"
+ * it under the terms of the GNU General Public License as published by
-#include "hashtable.h"
+ * the Free Software Foundation, either version 3 of the License, or
-#include "list.h"
+ * (at your option) any later version.
-#include <stdlib.h>
+ *
-#include <time.h>
+ * smartdns is distributed in the hope that it will be useful,
-
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#define DNS_CACHE_TTL_MIN 30
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
+ * GNU General Public License for more details.
-struct dns_cache {
+ *
-	struct hlist_node node;
+ * You should have received a copy of the GNU General Public License
-	struct list_head list;
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	struct list_head check_list;
+ */
-	atomic_t ref;
+
-	char domain[DNS_MAX_CNAME_LEN];
+#ifndef _SMARTDNS_CACHE_H
-	char cname[DNS_MAX_CNAME_LEN];
+#define _SMARTDNS_CACHE_H
-	unsigned int cname_ttl;
+
-	unsigned int ttl;;
+#include "atomic.h"
-	int speed;
+#include "dns.h"
-	atomic_t hitnum;
+#include "hash.h"
-	int del_pending;
+#include "hashtable.h"
-	time_t insert_time;
+#include "list.h"
-	dns_type_t qtype;
+#include <stdlib.h>
-	union {
+#include <time.h>
-		unsigned char ipv4_addr[DNS_RR_A_LEN];
+
-		unsigned char ipv6_addr[DNS_RR_AAAA_LEN];
+#ifdef __cpluscplus
-		unsigned char addr[0];
+extern "C" {
-	};
+#endif
-};
+
-
+#define DNS_CACHE_TTL_MIN 30
-int dns_cache_init(int size);
+
-
+struct dns_cache {
-int dns_cache_replace(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len, int speed);
+	struct hlist_node node;
-
+	struct list_head list;
-int dns_cache_insert(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len, int speed);
+	struct list_head check_list;
-
+	atomic_t ref;
-struct dns_cache *dns_cache_lookup(char *domain, dns_type_t qtype);
+	char domain[DNS_MAX_CNAME_LEN];
-
+	char cname[DNS_MAX_CNAME_LEN];
-void dns_cache_delete(struct dns_cache *dns_cache);
+	unsigned int cname_ttl;
-
+	unsigned int ttl;
-void dns_cache_get(struct dns_cache *dns_cache);
+	int speed;
-
+	atomic_t hitnum;
-void dns_cache_release(struct dns_cache *dns_cache);
+	int hitnum_update_add;
-
+	int del_pending;
-void dns_cache_update(struct dns_cache *dns_cache);
+	time_t insert_time;
-
+	dns_type_t qtype;
-typedef void dns_cache_preinvalid_callback(struct dns_cache *dns_cache);
+	union {
-
+		unsigned char ipv4_addr[DNS_RR_A_LEN];
-void dns_cache_invalidate(dns_cache_preinvalid_callback callback, int ttl_pre);
+		unsigned char ipv6_addr[DNS_RR_AAAA_LEN];
-
+		unsigned char addr[0];
-int dns_cache_get_ttl(struct dns_cache *dns_cache);
+	};
-
+};
-void dns_cache_destroy(void);
+
-
+int dns_cache_init(int size, int enable_inactive, int inactive_list_expired);
-#endif // !_SMARTDNS_CACHE_H
+
+int dns_cache_replace(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len, int speed);
+
+int dns_cache_insert(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len, int speed);
+
+struct dns_cache *dns_cache_lookup(char *domain, dns_type_t qtype);
+
+void dns_cache_delete(struct dns_cache *dns_cache);
+
+void dns_cache_get(struct dns_cache *dns_cache);
+
+void dns_cache_release(struct dns_cache *dns_cache);
+
+int dns_cache_hitnum_dec_get(struct dns_cache *dns_cache);
+
+void dns_cache_update(struct dns_cache *dns_cache);
+
+typedef void dns_cache_preinvalid_callback(struct dns_cache *dns_cache);
+
+void dns_cache_invalidate(dns_cache_preinvalid_callback callback, int ttl_pre);
+
+int dns_cache_get_ttl(struct dns_cache *dns_cache);
+
+void dns_cache_destroy(void);
+
+#ifdef __cpluscplus
+}
+#endif
+#endif // !_SMARTDNS_CACHE_H

src/dns_client.c

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _GNU_SOURCE
 #include "dns_client.h"
 #include "atomic.h"
 #include "dns.h"
@@ -29,6 +30,7 @@
 #include "util.h"
 #include <arpa/inet.h>
 #include <errno.h>
+#include <ctype.h>
 #include <fcntl.h>
 #include <linux/filter.h>
 #include <netdb.h>
@@ -44,6 +46,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/epoll.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -57,10 +60,9 @@
 #define DNS_TCP_CONNECT_TIMEOUT (5)
 #define DNS_QUERY_TIMEOUT (500)
 #define DNS_QUERY_RETRY (3)
+#define SOCKET_PRIORITY (6)
+#define SOCKET_IP_TOS (IPTOS_LOWDELAY | IPTOS_RELIABILITY)
 
-#ifndef TCP_FASTOPEN_CONNECT
-#define TCP_FASTOPEN_CONNECT 30
-#endif
 
 /* ECS info */
 struct dns_client_ecs {
@@ -241,9 +243,34 @@ struct dns_query_struct {
 static struct dns_client client;
 static atomic_t dns_client_sid = ATOMIC_INIT(0);
 static LIST_HEAD(pending_servers);
-pthread_mutex_t pending_server_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t pending_server_mutex = PTHREAD_MUTEX_INITIALIZER;
 static int dns_client_has_bootstrap_dns = 0;
 
+const char *_dns_server_get_type_string(dns_server_type_t type) 
+{
+	const char *type_str = "";
+
+	switch (type)
+	{
+	case DNS_SERVER_UDP:
+		type_str = "udp";
+		break;
+	case DNS_SERVER_TCP:
+		type_str = "tcp";
+		break;
+	case DNS_SERVER_TLS:
+		type_str = "tls";
+		break;
+	case DNS_SERVER_HTTPS:
+		type_str = "https";
+		break;
+	default:
+		break;
+	}
+
+	return type_str;
+}
+
 /* get addr info */
 static struct addrinfo *_dns_client_getaddr(const char *host, char *port, int type, int protocol)
 {
@@ -435,7 +462,7 @@ static int _dns_client_add_to_pending_group(char *group_name, char *server_ip, i
 		goto errout;
 	}
 	memset(group, 0, sizeof(*group));
-	strncpy(group->group_name, group_name, DNS_GROUP_NAME_LEN);
+	safe_strncpy(group->group_name, group_name, DNS_GROUP_NAME_LEN);
 
 	pthread_mutex_lock(&pending_server_mutex);
 	list_add_tail(&group->list, &pending->group_list);
@@ -451,7 +478,7 @@ errout:
 }
 
 /* add server to group */
-int _dns_client_add_to_group_pending(char *group_name, char *server_ip, int port, dns_server_type_t server_type, int ispending)
+static int _dns_client_add_to_group_pending(char *group_name, char *server_ip, int port, dns_server_type_t server_type, int ispending)
 {
 	struct dns_server_info *server_info = NULL;
 
@@ -547,7 +574,7 @@ int dns_client_add_group(char *group_name)
 
 	memset(group, 0, sizeof(*group));
 	INIT_LIST_HEAD(&group->head);
-	strncpy(group->group_name, group_name, DNS_GROUP_NAME_LEN);
+	safe_strncpy(group->group_name, group_name, DNS_GROUP_NAME_LEN);
 	key = hash_string(group_name);
 	hash_add(client.group, &group->node, key);
 
@@ -623,6 +650,37 @@ int dns_client_spki_decode(const char *spki, unsigned char *spki_data_out)
 	return spki_data_len;
 }
 
+static char *_dns_client_server_get_tls_host_verify(struct dns_server_info *server_info)
+{
+	char *tls_host_verify = NULL;
+
+	switch (server_info->type) {
+	case DNS_SERVER_UDP: {
+	} break;
+	case DNS_SERVER_HTTPS: {
+		struct client_dns_server_flag_https *flag_https = &server_info->flags.https;
+		tls_host_verify = flag_https->tls_host_verify;
+	} break;
+	case DNS_SERVER_TLS: {
+		struct client_dns_server_flag_tls *flag_tls = &server_info->flags.tls;
+		tls_host_verify = flag_tls->tls_host_verify;
+	} break;
+	case DNS_SERVER_TCP:
+		break;
+	default:
+		return NULL;
+		break;
+	}
+
+	if (tls_host_verify) {
+		if (tls_host_verify[0] == '\0') {
+			return NULL;
+		}
+	}
+
+	return tls_host_verify;
+}
+
 static char *_dns_client_server_get_spki(struct dns_server_info *server_info, int *spki_len)
 {
 	*spki_len = 0;
@@ -640,7 +698,6 @@ static char *_dns_client_server_get_spki(struct dns_server_info *server_info, in
 		spki = flag_tls->spki;
 		*spki_len = flag_tls->spi_len;
 	} break;
-		break;
 	case DNS_SERVER_TCP:
 		break;
 	default:
@@ -660,7 +717,6 @@ static int _dns_client_server_add(char *server_ip, char *server_host, int port,
 {
 	struct dns_server_info *server_info = NULL;
 	struct addrinfo *gai = NULL;
-	unsigned char *spki_data = NULL;
 	int spki_data_len = 0;
 	int ttl = 0;
 	char port_s[8];
@@ -683,9 +739,9 @@ static int _dns_client_server_add(char *server_ip, char *server_host, int port,
 		spki_data_len = flag_https->spi_len;
 		if (flag_https->httphost[0] == 0) {
 			if (server_host) {
-				strncpy(flag_https->httphost, server_host, DNS_MAX_CNAME_LEN);
+				safe_strncpy(flag_https->httphost, server_host, DNS_MAX_CNAME_LEN);
 			} else {
-				strncpy(flag_https->httphost, server_ip, DNS_MAX_CNAME_LEN);
+				safe_strncpy(flag_https->httphost, server_ip, DNS_MAX_CNAME_LEN);
 			}
 		}
 		sock_type = SOCK_STREAM;
@@ -695,7 +751,6 @@ static int _dns_client_server_add(char *server_ip, char *server_host, int port,
 		spki_data_len = flag_tls->spi_len;
 		sock_type = SOCK_STREAM;
 	} break;
-		break;
 	case DNS_SERVER_TCP:
 		sock_type = SOCK_STREAM;
 		break;
@@ -731,7 +786,7 @@ static int _dns_client_server_add(char *server_ip, char *server_host, int port,
 	}
 
 	memset(server_info, 0, sizeof(*server_info));
-	strncpy(server_info->ip, server_ip, sizeof(server_info->ip));
+	safe_strncpy(server_info->ip, server_ip, sizeof(server_info->ip));
 	server_info->port = port;
 	server_info->ai_family = gai->ai_family;
 	server_info->ai_addrlen = gai->ai_addrlen;
@@ -752,7 +807,11 @@ static int _dns_client_server_add(char *server_ip, char *server_host, int port,
 
 	/* if server type is TLS, create ssl context */
 	if (server_type == DNS_SERVER_TLS || server_type == DNS_SERVER_HTTPS) {
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+		server_info->ssl_ctx = SSL_CTX_new(TLS_client_method());
+#else
 		server_info->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+#endif
 		if (server_info->ssl_ctx == NULL) {
 			tlog(TLOG_ERROR, "init ssl failed.");
 			goto errout;
@@ -789,12 +848,10 @@ static int _dns_client_server_add(char *server_ip, char *server_host, int port,
 	atomic_inc(&client.dns_server_num);
 	freeaddrinfo(gai);
 
+	tlog(TLOG_INFO, "add server %s:%d, type: %s", server_ip, port, _dns_server_get_type_string(server_info->type));
+
 	return 0;
 errout:
-	if (spki_data) {
-		free(spki_data);
-	}
-
 	if (server_info) {
 		if (server_info->ssl_ctx) {
 			SSL_CTX_free(server_info->ssl_ctx);
@@ -822,7 +879,6 @@ static void _dns_client_close_socket(struct dns_server_info *server_info)
 
 	if (server_info->ssl) {
 		/* Shutdown ssl */
-		SSL_shutdown(server_info->ssl);
 		SSL_free(server_info->ssl);
 		server_info->ssl = NULL;
 	}
@@ -915,7 +971,7 @@ static int _dns_client_server_pending(char *server_ip, int port, dns_server_type
 	}
 	memset(pending, 0, sizeof(*pending));
 
-	strncpy(pending->host, server_ip, DNS_HOSTNAME_LEN);
+	safe_strncpy(pending->host, server_ip, DNS_HOSTNAME_LEN);
 	pending->port = port;
 	pending->type = server_type;
 	pending->ping_time_v4 = -1;
@@ -939,7 +995,8 @@ errout:
 	return -1;
 }
 
-static int _dns_client_add_server_pending(char *server_ip, char *server_host, int port, dns_server_type_t server_type, struct client_dns_server_flags *flags, int ispending)
+static int _dns_client_add_server_pending(char *server_ip, char *server_host, int port, dns_server_type_t server_type, struct client_dns_server_flags *flags,
+										  int ispending)
 {
 	int ret;
 
@@ -1235,10 +1292,12 @@ static int _dns_client_recv(struct dns_server_info *server_info, unsigned char *
 
 	/* get query reference */
 	query = _dns_client_get_request(packet->head.id, domain);
-	if (query == NULL || (query && has_opt == 0 && server_info->flags.result_flag & DNSSERVER_FLAG_CHECK_EDNS)) {
+	if (query == NULL) {
-		if (query) {
+		return 0;
-			_dns_client_query_release(query);
+	}
-		}
+
+	if (has_opt == 0 && server_info->flags.result_flag & DNSSERVER_FLAG_CHECK_EDNS) {
+		_dns_client_query_release(query);
 		return 0;
 	}
 
@@ -1278,6 +1337,8 @@ static int _dns_client_create_socket_udp(struct dns_server_info *server_info)
 	struct epoll_event event;
 	const int on = 1;
 	const int val = 255;
+	const int priority = SOCKET_PRIORITY;
+	const int ip_tos = SOCKET_IP_TOS;
 
 	fd = socket(server_info->ai_family, SOCK_DGRAM, 0);
 	if (fd < 0) {
@@ -1297,6 +1358,8 @@ static int _dns_client_create_socket_udp(struct dns_server_info *server_info)
 	server_info->status = DNS_SERVER_STATUS_CONNECTIONLESS;
 	setsockopt(server_info->fd, IPPROTO_IP, IP_RECVTTL, &on, sizeof(on));
 	setsockopt(server_info->fd, SOL_IP, IP_TTL, &val, sizeof(val));
+	setsockopt(server_info->fd, SOL_SOCKET, SO_PRIORITY, &priority, sizeof(priority));
+	setsockopt(server_info->fd, IPPROTO_IP, IP_TOS, &ip_tos, sizeof(ip_tos));
 	if (server_info->ai_family == AF_INET6) {
 		/* for recving ip ttl value */
 		setsockopt(server_info->fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on, sizeof(on));
@@ -1318,6 +1381,8 @@ static int _DNS_client_create_socket_tcp(struct dns_server_info *server_info)
 	int fd = 0;
 	struct epoll_event event;
 	int yes = 1;
+	const int priority = SOCKET_PRIORITY;
+	const int ip_tos = SOCKET_IP_TOS;
 
 	fd = socket(server_info->ai_family, SOCK_STREAM, 0);
 	if (fd < 0) {
@@ -1336,6 +1401,11 @@ static int _DNS_client_create_socket_tcp(struct dns_server_info *server_info)
 	}
 
 	setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes));
+	setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &priority, sizeof(priority));
+	setsockopt(fd, IPPROTO_IP, IP_TOS, &ip_tos, sizeof(ip_tos));
+	setsockopt(fd, IPPROTO_TCP, TCP_THIN_DUPACK, &yes, sizeof(yes));
+	setsockopt(fd, IPPROTO_TCP, TCP_THIN_LINEAR_TIMEOUTS, &yes, sizeof(yes));
+	set_sock_keepalive(fd, 15, 3, 4);
 
 	if (connect(fd, (struct sockaddr *)&server_info->addr, server_info->ai_addrlen) != 0) {
 		if (errno != EINPROGRESS) {
@@ -1372,6 +1442,8 @@ static int _DNS_client_create_socket_tls(struct dns_server_info *server_info, ch
 	struct epoll_event event;
 	SSL *ssl = NULL;
 	int yes = 1;
+	const int priority = SOCKET_PRIORITY;
+	const int ip_tos = SOCKET_IP_TOS;
 
 	if (server_info->ssl_ctx == NULL) {
 		tlog(TLOG_ERROR, "create ssl ctx failed.");
@@ -1401,6 +1473,11 @@ static int _DNS_client_create_socket_tls(struct dns_server_info *server_info, ch
 
 	// ? this cause ssl crash ?
 	// setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes));
+	// setsockopt(fd, IPPROTO_TCP, TCP_THIN_DUPACK, &yes, sizeof(yes));
+	// setsockopt(fd, IPPROTO_TCP, TCP_THIN_LINEAR_TIMEOUTS, &yes, sizeof(yes));
+	// set_sock_keepalive(fd, 15, 3, 4);
+	setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &priority, sizeof(priority));
+	setsockopt(fd, IPPROTO_IP, IP_TOS, &ip_tos, sizeof(ip_tos));
 
 	if (connect(fd, (struct sockaddr *)&server_info->addr, server_info->ai_addrlen) != 0) {
 		if (errno != EINPROGRESS) {
@@ -1571,17 +1648,17 @@ static int _dns_client_socket_ssl_send(SSL *ssl, const void *buf, int num)
 		break;
 	case SSL_ERROR_SSL:
 		ssl_err = ERR_get_error();
-		if (ERR_GET_REASON(ssl_err) == SSL_R_UNINITIALIZED) {
+		if (ERR_GET_REASON(ssl_err) == SSL_R_UNINITIALIZED || ERR_GET_REASON(ssl_err) == SSL_R_PROTOCOL_IS_SHUTDOWN) {
 			errno = EAGAIN;
 			return -1;
 		}
 
-		tlog(TLOG_ERROR, "SSL write fail error no:  %s(%ld)\n", ERR_reason_error_string(ssl_err), ssl_err);
+		tlog(TLOG_DEBUG, "SSL write fail error no:  %s(%ld)\n", ERR_reason_error_string(ssl_err), ssl_err);
 		errno = EFAULT;
 		ret = -1;
 		break;
 	case SSL_ERROR_SYSCALL:
-		tlog(TLOG_ERROR, "SSL syscall failed, %s", strerror(errno));
+		tlog(TLOG_DEBUG, "SSL syscall failed, %s", strerror(errno));
 		return ret;
 	default:
 		errno = EFAULT;
@@ -1678,13 +1755,97 @@ static int _dns_client_socket_recv(struct dns_server_info *server_info)
 	}
 }
 
+static int _dns_client_process_tcp_buff(struct dns_server_info *server_info)
+{
+	int len = 0;
+	int dns_packet_len = 0;
+	struct http_head *http_head = NULL;
+	unsigned char *inpacket_data = NULL;
+
+	while (1) {
+		if (server_info->type == DNS_SERVER_HTTPS) {
+			http_head = http_head_init(4096);
+			if (http_head == NULL) {
+				goto errout;
+			}
+
+			len = http_head_parse(http_head, (char *)server_info->recv_buff.data, server_info->recv_buff.len);
+			if (len < 0) {
+				tlog(TLOG_DEBUG, "remote server not supported.");
+				if (len == -1) {
+					break;
+				}
+				goto errout;
+			}
+
+			if (http_head_get_httpcode(http_head) != 200) {
+				tlog(TLOG_WARN, "http server query from %s:%d failed, server return http code : %d, %s", 
+					server_info->ip, server_info->port,
+					http_head_get_httpcode(http_head),
+					http_head_get_httpcode_msg(http_head));
+				goto errout;
+			}
+
+			dns_packet_len = http_head_get_data_len(http_head);
+			inpacket_data = (unsigned char *)http_head_get_data(http_head);
+		} else {
+			/* tcp result format
+			 * | len (short) | dns query result |
+			 */
+			inpacket_data = server_info->recv_buff.data;
+			len = ntohs(*((unsigned short *)(inpacket_data)));
+			if (len <= 0 || len >= DNS_IN_PACKSIZE) {
+				/* data len is invalid */
+				goto errout;
+			}
+
+			if (len > server_info->recv_buff.len - 2) {
+				/* len is not expceded, wait and recv */
+				break;
+			}
+
+			inpacket_data = server_info->recv_buff.data + 2;
+			dns_packet_len = len;
+			len += 2;
+		}
+
+		tlog(TLOG_DEBUG, "recv tcp packet from %s, len = %d", server_info->ip, len);
+		/* process result */
+		if (_dns_client_recv(server_info, inpacket_data, dns_packet_len, &server_info->addr, server_info->ai_addrlen) != 0) {
+			goto errout;
+		}
+
+		if (http_head) {
+			http_head_destroy(http_head);
+			http_head = NULL;
+		}
+
+		server_info->recv_buff.len -= len;
+		if (server_info->recv_buff.len < 0) {
+			tlog(TLOG_ERROR, "Internal error.");
+			abort();
+		}
+
+		/* move to next result */
+		if (server_info->recv_buff.len > 0) {
+			memmove(server_info->recv_buff.data, server_info->recv_buff.data + len, server_info->recv_buff.len);
+		} else {
+			break;
+		}
+	}
+
+	return 0;
+errout:
+	if (http_head) {
+		http_head_destroy(http_head);
+	}
+	return -1;
+}
+
 static int _dns_client_process_tcp(struct dns_server_info *server_info, struct epoll_event *event, unsigned long now)
 {
 	int len;
-	int dns_packet_len = 0;
 	int ret = -1;
-	struct http_head *http_head = NULL;
-	unsigned char *inpacket_data = NULL;
 
 	if (event->events & EPOLLIN) {
 		/* receive from tcp */
@@ -1700,7 +1861,7 @@ static int _dns_client_process_tcp(struct dns_server_info *server_info, struct e
 				goto errout;
 			}
 
-			tlog(TLOG_ERROR, "recv failed, server %s, %s\n", server_info->ip, strerror(errno));
+			tlog(TLOG_ERROR, "recv failed, server %s:%d, %s\n", server_info->ip, server_info->port, strerror(errno));
 			goto errout;
 		}
 
@@ -1721,77 +1882,14 @@ static int _dns_client_process_tcp(struct dns_server_info *server_info, struct e
 		}
 
 		time(&server_info->last_recv);
-
 		server_info->recv_buff.len += len;
-		if (server_info->recv_buff.len < 2) {
+		if (server_info->recv_buff.len <= 2) {
 			/* wait and recv */
 			return 0;
 		}
 
-		while (1) {
+		if (_dns_client_process_tcp_buff(server_info) != 0) {
-			if (server_info->type == DNS_SERVER_HTTPS) {
+			goto errout;
-				http_head = http_head_init(4096);
-				if (http_head == NULL) {
-					goto errout;
-				}
-
-				len = http_head_parse(http_head, (char *)server_info->recv_buff.data, server_info->recv_buff.len);
-				if (len < 0) {
-					http_head_destroy(http_head);
-					if (len == -1) {
-						break;
-					}
-					goto errout;
-				}
-
-				if (http_head_get_httpcode(http_head) != 200) {
-					tlog(TLOG_WARN, "http server query failed, server return http code : %d, %s", http_head_get_httpcode(http_head),
-						 http_head_get_httpcode_msg(http_head));
-					goto errout;
-				}
-
-				dns_packet_len = http_head_get_data_len(http_head);
-				inpacket_data = (unsigned char *)http_head_get_data(http_head);
-			} else {
-				/* tcp result format
-				 * | len (short) | dns query result |
-				 */
-				inpacket_data = server_info->recv_buff.data;
-				len = ntohs(*((unsigned short *)(inpacket_data)));
-				if (len <= 0 || len >= DNS_IN_PACKSIZE) {
-					/* data len is invalid */
-					goto errout;
-				}
-
-				if (len > server_info->recv_buff.len - 2) {
-					/* len is not expceded, wait and recv */
-					break;
-				}
-
-				inpacket_data = server_info->recv_buff.data + 2;
-				dns_packet_len = len;
-				len += 2;
-			}
-			tlog(TLOG_DEBUG, "recv tcp packet from %s, len = %d", server_info->ip, len);
-
-			/* process result */
-			if (_dns_client_recv(server_info, inpacket_data, dns_packet_len, &server_info->addr, server_info->ai_addrlen) != 0) {
-				goto errout;
-			}
-
-			if (http_head) {
-				http_head_destroy(http_head);
-				http_head = NULL;
-			}
-
-			server_info->recv_buff.len -= len;
-
-			/* move to next result */
-			if (server_info->recv_buff.len > 0) {
-				memmove(server_info->recv_buff.data, server_info->recv_buff.data + len, server_info->recv_buff.len);
-			} else {
-				break;
-			}
 		}
 	}
 
@@ -1807,26 +1905,27 @@ static int _dns_client_process_tcp(struct dns_server_info *server_info, struct e
 		if (server_info->status != DNS_SERVER_STATUS_CONNECTED) {
 			server_info->status = DNS_SERVER_STATUS_DISCONNECTED;
 		}
-		pthread_mutex_lock(&client.server_list_lock);
+
 		if (server_info->send_buff.len > 0) {
 			/* send existing send_buffer data  */
 			len = _dns_client_socket_send(server_info);
 			if (len < 0) {
 				if (errno == EAGAIN) {
-					pthread_mutex_unlock(&client.server_list_lock);
 					return 0;
 				}
-				pthread_mutex_unlock(&client.server_list_lock);
 				goto errout;
 			}
 
+			pthread_mutex_lock(&client.server_list_lock);
 			server_info->send_buff.len -= len;
 			if (server_info->send_buff.len > 0) {
 				memmove(server_info->send_buff.data, server_info->send_buff.data + len, server_info->send_buff.len);
+			} else if (server_info->send_buff.len < 0) {
+				tlog(TLOG_ERROR, "Internal Error");
+				abort();
 			}
+			pthread_mutex_unlock(&client.server_list_lock);
 		}
-		pthread_mutex_unlock(&client.server_list_lock);
-
 		/* still remain data, retry */
 		if (server_info->send_buff.len > 0) {
 			return 0;
@@ -1837,20 +1936,14 @@ static int _dns_client_process_tcp(struct dns_server_info *server_info, struct e
 		event.events = EPOLLIN;
 		event.data.ptr = server_info;
 		if (epoll_ctl(client.epoll_fd, EPOLL_CTL_MOD, server_info->fd, &event) != 0) {
-			tlog(TLOG_ERROR, "epoll ctl failed.");
+			tlog(TLOG_ERROR, "epoll ctl failed, %s", strerror(errno));
 			goto errout;
 		}
-
-		return 0;
 	}
 
 	return 0;
 
 errout:
-	if (http_head) {
-		http_head_destroy(http_head);
-	}
-
 	pthread_mutex_lock(&client.server_list_lock);
 	server_info->recv_buff.len = 0;
 	server_info->send_buff.len = 0;
@@ -1869,9 +1962,39 @@ static inline int _dns_client_to_hex(int c)
 	}
 }
 
+static int _dns_client_tls_matchName(const char *host, const char *pattern, int size)
+{
+	int match = -1;
+	int i = 0, j = 0;
+
+	while (i < size && host[j] != '\0') {
+		if (toupper(pattern[i]) == toupper(host[j])) {
+			i++;
+			j++;
+			continue;
+		}
+		if (pattern[i] == '*') {
+			while (host[j] != '.' && host[j] != '\0') {
+				j++;
+			}
+			i++;
+			continue;
+		}
+		break;
+	}
+
+	if (i == size && host[j] == '\0') {
+		match = 0;
+	}
+	
+	return match;
+}
+
 static int _dns_client_tls_verify(struct dns_server_info *server_info)
 {
 	X509 *cert = NULL;
+	X509_PUBKEY *pubkey = NULL;
+	X509_NAME *cert_name = NULL;
 	char peer_CN[256];
 	char cert_fingerprint[256];
 	int i = 0;
@@ -1881,6 +2004,10 @@ static int _dns_client_tls_verify(struct dns_server_info *server_info)
 	unsigned char *key_sha256 = NULL;
 	char *spki = NULL;
 	int spki_len = 0;
+	char *tls_host_verify = NULL;
+	if (server_info->ssl == NULL) {
+		return -1;
+	}
 
 	cert = SSL_get_peer_certificate(server_info->ssl);
 	if (cert == NULL) {
@@ -1888,11 +2015,36 @@ static int _dns_client_tls_verify(struct dns_server_info *server_info)
 		return -1;
 	}
 
-	X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, peer_CN, 256);
+	cert_name = X509_get_subject_name(cert);
+	if (cert_name == NULL) {
+		tlog(TLOG_ERROR, "get subject name failed.");
+		goto errout;
+	}
+
+	if (X509_NAME_get_text_by_NID(cert_name, NID_commonName, peer_CN, 256) == -1) {
+		tlog(TLOG_ERROR, "cannot found x509 name");
+		goto errout;
+	}
+	
 	tlog(TLOG_DEBUG, "peer CN: %s", peer_CN);
 
+	/* check tls host */
+	tls_host_verify = _dns_client_server_get_tls_host_verify(server_info);
+	if (tls_host_verify) {
+		if (_dns_client_tls_matchName(peer_CN, tls_host_verify, strnlen(tls_host_verify, DNS_MAX_CNAME_LEN)) != 0) {
+			tlog(TLOG_INFO, "server %s CN is invalid, peer CN: %s, expect CN: %s", server_info->ip, peer_CN, tls_host_verify);
+			goto errout;
+		}
+	}
+
+	pubkey = X509_get_X509_PUBKEY(cert);
+	if (pubkey == NULL) {
+		tlog(TLOG_ERROR, "get pub key failed.");
+		goto errout;
+	}
+
 	/* get spki pin */
-	key_len = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(cert), NULL);
+	key_len = i2d_X509_PUBKEY(pubkey, NULL);
 	if (key_len <= 0) {
 		tlog(TLOG_ERROR, "get x509 public key failed.");
 		goto errout;
@@ -1905,7 +2057,7 @@ static int _dns_client_tls_verify(struct dns_server_info *server_info)
 		goto errout;
 	}
 
-	i2d_X509_PUBKEY(X509_get_X509_PUBKEY(cert), &key_data_tmp);
+	i2d_X509_PUBKEY(pubkey, &key_data_tmp);
 
 	/* Get the SHA256 value of SPKI */
 	key_sha256 = SSL_SHA256(key_data, key_len, NULL);
@@ -1928,7 +2080,7 @@ static int _dns_client_tls_verify(struct dns_server_info *server_info)
 	tlog(TLOG_DEBUG, "cert SPKI pin(%s): %s", "sha256", cert_fingerprint);
 
 	spki = _dns_client_server_get_spki(server_info, &spki_len);
-	if (spki) {
+	if (spki && spki_len > 0 && spki_len <= SHA256_DIGEST_LENGTH) {
 		/* check SPKI */
 		if (memcmp(spki, key_sha256, spki_len) != 0) {
 			tlog(TLOG_INFO, "server %s cert spki is invalid", server_info->ip);
@@ -1960,6 +2112,11 @@ static int _dns_client_process_tls(struct dns_server_info *server_info, struct e
 	struct epoll_event fd_event;
 	int ssl_ret;
 
+	if (unlikely(server_info->ssl == NULL)) {
+		tlog(TLOG_ERROR, "ssl is invalid.");
+		goto errout;
+	}
+
 	if (server_info->status == DNS_SERVER_STATUS_CONNECTING) {
 		/* do SSL hand shake */
 		ret = SSL_connect(server_info->ssl);
@@ -1978,7 +2135,7 @@ static int _dns_client_process_tls(struct dns_server_info *server_info, struct e
 
 			fd_event.data.ptr = server_info;
 			if (epoll_ctl(client.epoll_fd, EPOLL_CTL_MOD, server_info->fd, &fd_event) != 0) {
-				tlog(TLOG_ERROR, "epoll ctl failed.");
+				tlog(TLOG_ERROR, "epoll ctl failed, %s", strerror(errno));
 				goto errout;
 			}
 
@@ -1991,6 +2148,7 @@ static int _dns_client_process_tls(struct dns_server_info *server_info, struct e
 			tlog(TLOG_DEBUG, "reused session");
 		} else {
 			tlog(TLOG_DEBUG, "new session");
+			pthread_mutex_lock(&client.server_list_lock);
 			if (server_info->ssl_session) {
 				/* free session */
 				SSL_SESSION_free(server_info->ssl_session);
@@ -1999,11 +2157,13 @@ static int _dns_client_process_tls(struct dns_server_info *server_info, struct e
 
 			if (_dns_client_tls_verify(server_info) != 0) {
 				tlog(TLOG_WARN, "peer %s verify failed.", server_info->ip);
+				pthread_mutex_unlock(&client.server_list_lock);
 				goto errout;
 			}
 
 			/* save ssl session for next request */
 			server_info->ssl_session = SSL_get1_session(server_info->ssl);
+			pthread_mutex_unlock(&client.server_list_lock);
 		}
 
 		server_info->status = DNS_SERVER_STATUS_CONNECTED;
@@ -2011,7 +2171,7 @@ static int _dns_client_process_tls(struct dns_server_info *server_info, struct e
 		fd_event.events = EPOLLIN | EPOLLOUT;
 		fd_event.data.ptr = server_info;
 		if (epoll_ctl(client.epoll_fd, EPOLL_CTL_MOD, server_info->fd, &fd_event) != 0) {
-			tlog(TLOG_ERROR, "epoll ctl failed.");
+			tlog(TLOG_ERROR, "epoll ctl failed, %s", strerror(errno));
 			goto errout;
 		}
 	}
@@ -2154,11 +2314,11 @@ static int _dns_client_send_tls(struct dns_server_info *server_info, void *packe
 
 	send_len = _dns_client_socket_ssl_send(server_info->ssl, inpacket, len);
 	if (send_len < 0) {
-		if (errno == EAGAIN || server_info->ssl == NULL) {
+		if (errno == EAGAIN || errno == EPIPE || server_info->ssl == NULL ) {
 			/* save data to buffer, and retry when EPOLLOUT is available */
 			return _dns_client_send_data_to_buffer(server_info, inpacket, len);
 		} else if (server_info->ssl && errno != ENOMEM) {
-			SSL_shutdown(server_info->ssl);
+			SSL_set_shutdown(server_info->ssl, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
 		}
 		return -1;
 	} else if (send_len < len) {
@@ -2204,11 +2364,11 @@ static int _dns_client_send_https(struct dns_server_info *server_info, void *pac
 
 	send_len = _dns_client_socket_ssl_send(server_info->ssl, inpacket, http_len);
 	if (send_len < 0) {
-		if (errno == EAGAIN || server_info->ssl == NULL) {
+		if (errno == EAGAIN || errno == EPIPE || server_info->ssl == NULL ) {
 			/* save data to buffer, and retry when EPOLLOUT is available */
 			return _dns_client_send_data_to_buffer(server_info, inpacket, http_len);
 		} else if (server_info->ssl && errno != ENOMEM) {
-			SSL_shutdown(server_info->ssl);
+			SSL_set_shutdown(server_info->ssl, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
 		}
 		return -1;
 	} else if (send_len < http_len) {
@@ -2375,7 +2535,7 @@ int dns_client_query(char *domain, int qtype, dns_client_callback callback, void
 	atomic_set(&query->dns_request_sent, 0);
 	atomic_set(&query->retry_count, DNS_QUERY_RETRY);
 	hash_init(query->replied_map);
-	strncpy(query->domain, domain, DNS_MAX_CNAME_LEN);
+	safe_strncpy(query->domain, domain, DNS_MAX_CNAME_LEN);
 	query->user_ptr = user_ptr;
 	query->callback = callback;
 	query->qtype = qtype;
@@ -2418,7 +2578,6 @@ errout_del_list:
 	query = NULL;
 errout:
 	if (query) {
-		tlog(TLOG_ERROR, "release %p", query);
 		free(query);
 	}
 	return -1;
@@ -2460,14 +2619,14 @@ static int _dns_client_pending_server_resolve(char *domain, dns_rtcode_t rtcode,
 		pending->ping_time_v4 = -1;
 		if (rtcode == DNS_RC_NOERROR) {
 			pending->ping_time_v4 = ping_time;
-			strncpy(pending->ipv4, ip, DNS_HOSTNAME_LEN);
+			safe_strncpy(pending->ipv4, ip, DNS_HOSTNAME_LEN);
 		}
 	} else if (addr_type == DNS_T_AAAA) {
 		pending->has_v6 = 1;
 		pending->ping_time_v6 = -1;
 		if (rtcode == DNS_RC_NOERROR) {
 			pending->ping_time_v6 = ping_time;
-			strncpy(pending->ipv6, ip, DNS_HOSTNAME_LEN);
+			safe_strncpy(pending->ipv6, ip, DNS_HOSTNAME_LEN);
 		}
 	} else {
 		return -1;
@@ -2542,9 +2701,9 @@ static void _dns_client_add_pending_servers(void)
 		/* if has no bootstrap DNS, just call getaddrinfo to get address */
 		if (dns_client_has_bootstrap_dns == 0) {
 			if (_dns_client_add_pendings(pending, pending->host) != 0) {
+				pthread_mutex_unlock(&pending_server_mutex);
 				tlog(TLOG_ERROR, "add pending DNS server %s failed", pending->host);
 				exit(1);
-				pthread_mutex_unlock(&pending_server_mutex);
 				return;
 			}
 			list_del_init(&pending->list);

src/dns_client.h

@@ -1,8 +1,31 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef _SMART_DNS_CLIENT_H
 #define _SMART_DNS_CLIENT_H
 
 #include "dns.h"
-#define DNS_SERVER_SPKI_LEN  64
+
+#ifdef __cpluscplus
+extern "C" {
+#endif
+
+#define DNS_SERVER_SPKI_LEN 64
 #define DNS_SERVER_GROUP_DEFAULT "default"
 
 typedef enum {
@@ -20,8 +43,9 @@ typedef enum dns_result_type {
 } dns_result_type;
 
 #define DNSSERVER_FLAG_BLACKLIST_IP (0x1 << 0)
-#define DNSSERVER_FLAG_CHECK_EDNS (0x1 << 1)
+#define DNSSERVER_FLAG_WHITELIST_IP (0x1 << 1)
-#define DNSSERVER_FLAG_CHECK_TTL (0x1 << 2)
+#define DNSSERVER_FLAG_CHECK_EDNS (0x1 << 2)
+#define DNSSERVER_FLAG_CHECK_TTL (0x1 << 3)
 
 int dns_client_init(void);
 
@@ -44,6 +68,7 @@ struct client_dns_server_flag_tls {
 	char spki[DNS_SERVER_SPKI_LEN];
 	int spi_len;
 	char hostname[DNS_MAX_CNAME_LEN];
+	char tls_host_verify[DNS_MAX_CNAME_LEN];
 };
 
 struct client_dns_server_flag_https {
@@ -52,6 +77,7 @@ struct client_dns_server_flag_https {
 	char hostname[DNS_MAX_CNAME_LEN];
 	char httphost[DNS_MAX_CNAME_LEN];
 	char path[DNS_MAX_CNAME_LEN];
+	char tls_host_verify[DNS_MAX_CNAME_LEN];
 };
 
 struct client_dns_server_flags {
@@ -84,4 +110,7 @@ int dns_client_remove_group(char *group_name);
 
 int dns_server_num(void);
 
+#ifdef __cpluscplus
+}
+#endif
 #endif

src/dns_conf.h

@@ -1,184 +1,251 @@
-#ifndef _DNS_CONF
+/*************************************************************************
-#define _DNS_CONF
+ *
-
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-#include "art.h"
+ *
-#include "conf.h"
+ * smartdns is free software: you can redistribute it and/or modify
-#include "dns.h"
+ * it under the terms of the GNU General Public License as published by
-#include "dns_client.h"
+ * the Free Software Foundation, either version 3 of the License, or
-#include "hash.h"
+ * (at your option) any later version.
-#include "hashtable.h"
+ *
-#include "list.h"
+ * smartdns is distributed in the hope that it will be useful,
-#include "radix.h"
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#define DNS_MAX_SERVERS 64
+ * GNU General Public License for more details.
-#define DNS_MAX_SERVER_NAME_LEN 128
+ *
-#define DNS_MAX_IPSET_NAMELEN 32
+ * You should have received a copy of the GNU General Public License
-#define DNS_GROUP_NAME_LEN 32
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#define DNS_NAX_GROUP_NUMBER 16
+ */
-#define DNS_MAX_IPLEN 64
+
-#define DNS_MAX_SPKI_LEN 64
+#ifndef _DNS_CONF
-#define DNS_MAX_URL_LEN 256
+#define _DNS_CONF
-#define DNS_MAX_PATH 1024
+
-#define DEFAULT_DNS_PORT 53
+#include "art.h"
-#define DEFAULT_DNS_TLS_PORT 853
+#include "conf.h"
-#define DEFAULT_DNS_HTTPS_PORT 443
+#include "dns.h"
-#define DNS_MAX_CONF_CNAME_LEN 256
+#include "dns_client.h"
-#define SMARTDNS_CONF_FILE "/etc/smartdns/smartdns.conf"
+#include "hash.h"
-#define SMARTDNS_LOG_FILE "/var/log/smartdns.log"
+#include "hashtable.h"
-#define SMARTDNS_AUDIT_FILE "/var/log/smartdns-audit.log"
+#include "list.h"
-
+#include "radix.h"
-enum domain_rule {
+
-	DOMAIN_RULE_FLAGS = 0,
+#ifdef __cpluscplus
-	DOMAIN_RULE_ADDRESS_IPV4,
+extern "C" {
-	DOMAIN_RULE_ADDRESS_IPV6,
+#endif
-	DOMAIN_RULE_IPSET,
+
-	DOMAIN_RULE_NAMESERVER,
+#define DNS_MAX_BIND_IP 16
-	DOMAIN_RULE_MAX,
+#define DNS_MAX_SERVERS 64
-};
+#define DNS_MAX_SERVER_NAME_LEN 128
-
+#define DNS_MAX_IPSET_NAMELEN 32
-#define DOMAIN_FLAG_ADDR_SOA (1 << 0)
+#define DNS_GROUP_NAME_LEN 32
-#define DOMAIN_FLAG_ADDR_IPV4_SOA (1 << 1)
+#define DNS_NAX_GROUP_NUMBER 16
-#define DOMAIN_FLAG_ADDR_IPV6_SOA (1 << 2)
+#define DNS_MAX_IPLEN 64
-#define DOMAIN_FLAG_ADDR_IGN (1 << 3)
+#define DNS_MAX_SPKI_LEN 64
-#define DOMAIN_FLAG_ADDR_IPV4_IGN (1 << 4)
+#define DNS_MAX_URL_LEN 256
-#define DOMAIN_FLAG_ADDR_IPV6_IGN (1 << 5)
+#define DNS_MAX_PATH 1024
-#define DOMAIN_FLAG_IPSET_IGNORE (1 << 6)
+#define DEFAULT_DNS_PORT 53
-#define DOMAIN_FLAG_NAMESERVER_IGNORE (1 << 7)
+#define DEFAULT_DNS_TLS_PORT 853
-
+#define DEFAULT_DNS_HTTPS_PORT 443
-#define SERVER_FLAG_EXCLUDE_DEFAULT (1 << 0)
+#define DNS_MAX_CONF_CNAME_LEN 256
-
+#define SMARTDNS_CONF_FILE "/etc/smartdns/smartdns.conf"
-struct dns_rule_flags {
+#define SMARTDNS_LOG_FILE "/var/log/smartdns.log"
-	unsigned int flags;
+#define SMARTDNS_AUDIT_FILE "/var/log/smartdns-audit.log"
-};
+
-
+enum domain_rule {
-struct dns_address_IPV4 {
+	DOMAIN_RULE_FLAGS = 0,
-	unsigned char ipv4_addr[DNS_RR_A_LEN];
+	DOMAIN_RULE_ADDRESS_IPV4,
-};
+	DOMAIN_RULE_ADDRESS_IPV6,
-
+	DOMAIN_RULE_IPSET,
-struct dns_address_IPV6 {
+	DOMAIN_RULE_NAMESERVER,
-	unsigned char ipv6_addr[DNS_RR_AAAA_LEN];
+	DOMAIN_RULE_CHECKSPEED,
-};
+	DOMAIN_RULE_MAX,
-
+};
-struct dns_ipset_name {
+
-	struct hlist_node node;
+typedef enum {
-	char ipsetname[DNS_MAX_IPSET_NAMELEN];
+	DNS_BIND_TYPE_UDP,
-};
+	DNS_BIND_TYPE_TCP,
-
+	DNS_BIND_TYPE_TLS,
-struct dns_ipset_rule {
+} DNS_BIND_TYPE;
-	const char *ipsetname;
+
-};
+#define DOMAIN_CHECK_NONE 0
-
+#define DOMAIN_CHECK_ICMP 1
-struct dns_domain_rule {
+#define DOMAIN_CHECK_TCP 2
-	void *rules[DOMAIN_RULE_MAX];
+#define DOMAIN_CHECK_NUM 2
-};
+
-
+#define DOMAIN_FLAG_ADDR_SOA (1 << 0)
-struct dns_nameserver_rule {
+#define DOMAIN_FLAG_ADDR_IPV4_SOA (1 << 1)
-	const char *group_name;
+#define DOMAIN_FLAG_ADDR_IPV6_SOA (1 << 2)
-};
+#define DOMAIN_FLAG_ADDR_IGN (1 << 3)
-
+#define DOMAIN_FLAG_ADDR_IPV4_IGN (1 << 4)
-struct dns_server_groups {
+#define DOMAIN_FLAG_ADDR_IPV6_IGN (1 << 5)
-	struct hlist_node node;
+#define DOMAIN_FLAG_IPSET_IGNORE (1 << 6)
-	char group_name[DNS_GROUP_NAME_LEN];
+#define DOMAIN_FLAG_NAMESERVER_IGNORE (1 << 7)
-	int server_num;
+
-	struct dns_servers *servers[DNS_MAX_SERVERS];
+#define SERVER_FLAG_EXCLUDE_DEFAULT (1 << 0)
-};
+
-
+#define BIND_FLAG_NO_RULE_ADDR (1 << 0)
-struct dns_group_table {
+#define BIND_FLAG_NO_RULE_NAMESERVER (1 << 1)
-	DECLARE_HASHTABLE(group, 8);
+#define BIND_FLAG_NO_RULE_IPSET (1 << 2)
-};
+#define BIND_FLAG_NO_RULE_SNIPROXY (1 << 3)
-extern struct dns_group_table dns_group_table;
+#define BIND_FLAG_NO_RULE_SOA (1 << 4)
-
+#define BIND_FLAG_NO_SPEED_CHECK (1 << 5)
-struct dns_servers {
+#define BIND_FLAG_NO_CACHE (1 << 6)
-	char server[DNS_MAX_IPLEN];
+#define BIND_FLAG_NO_DUALSTACK_SELECTION (1 << 7)
-	unsigned short port;
+#define BIND_FLAG_FORCE_AAAA_SOA (1 << 8) 
-	unsigned int result_flag;
+
-	unsigned int server_flag;
+struct dns_rule_flags {
-	int ttl;
+	unsigned int flags;
-	dns_server_type_t type;
+};
-	char spki[DNS_MAX_SPKI_LEN];
+
-	char hostname[DNS_MAX_CNAME_LEN];
+struct dns_address_IPV4 {
-	char httphost[DNS_MAX_CNAME_LEN];
+	unsigned char ipv4_addr[DNS_RR_A_LEN];
-	char path[DNS_MAX_URL_LEN];
+};
-};
+
-
+struct dns_address_IPV6 {
-/* ip address lists of domain */
+	unsigned char ipv6_addr[DNS_RR_AAAA_LEN];
-struct dns_bogus_ip_address {
+};
-	struct hlist_node node;
+
-	dns_type_t addr_type;
+struct dns_ipset_name {
-	union {
+	struct hlist_node node;
-		unsigned char ipv4_addr[DNS_RR_A_LEN];
+	char ipsetname[DNS_MAX_IPSET_NAMELEN];
-		unsigned char ipv6_addr[DNS_RR_AAAA_LEN];
+};
-		unsigned char addr[0];
+
-	};
+struct dns_ipset_rule {
-};
+	const char *ipsetname;
-
+};
-enum address_rule {
+
-	ADDRESS_RULE_BLACKLIST = 1,
+struct dns_domain_rule {
-	ADDRESS_RULE_BOGUS = 2,
+	void *rules[DOMAIN_RULE_MAX];
-	ADDRESS_RULE_IP_IGNORE = 3,
+};
-};
+
-
+struct dns_nameserver_rule {
-struct dns_ip_address_rule {
+	const char *group_name;
-	unsigned int blacklist : 1;
+};
-	unsigned int bogus : 1;
+
-	unsigned int ip_ignore : 1;
+struct dns_server_groups {
-};
+	struct hlist_node node;
-
+	char group_name[DNS_GROUP_NAME_LEN];
-struct dns_edns_client_subnet {
+	int server_num;
-	int enable;
+	struct dns_servers *servers[DNS_MAX_SERVERS];
-	char ip[DNS_MAX_IPLEN];
+};
-	int subnet;
+
-};
+struct dns_domain_check_order {
-
+	char order[DOMAIN_CHECK_NUM];
-struct dns_conf_address_rule {
+	unsigned short tcp_port;
-	radix_tree_t *ipv4;
+};
-	radix_tree_t *ipv6;
+
-};
+struct dns_group_table {
-
+	DECLARE_HASHTABLE(group, 8);
-extern char dns_conf_server_ip[DNS_MAX_IPLEN];
+};
-extern char dns_conf_server_tcp_ip[DNS_MAX_IPLEN];
+extern struct dns_group_table dns_group_table;
-
+
-extern int dns_conf_tcp_idle_time;
+struct dns_servers {
-extern int dns_conf_cachesize;
+	char server[DNS_MAX_IPLEN];
-extern int dns_conf_prefetch;
+	unsigned short port;
-extern struct dns_servers dns_conf_servers[DNS_MAX_SERVERS];
+	unsigned int result_flag;
-extern int dns_conf_server_num;
+	unsigned int server_flag;
-
+	int ttl;
-extern int dns_conf_log_level;
+	dns_server_type_t type;
-extern char dns_conf_log_file[DNS_MAX_PATH];
+	char spki[DNS_MAX_SPKI_LEN];
-extern size_t dns_conf_log_size;
+	char hostname[DNS_MAX_CNAME_LEN];
-extern int dns_conf_log_num;
+	char httphost[DNS_MAX_CNAME_LEN];
-
+	char tls_host_verify[DNS_MAX_CNAME_LEN];
-extern struct dns_server_groups dns_conf_server_groups[DNS_NAX_GROUP_NUMBER];
+	char path[DNS_MAX_URL_LEN];
-extern int dns_conf_server_group_num;
+};
-
+
-extern int dns_conf_audit_enable;
+/* ip address lists of domain */
-extern char dns_conf_audit_file[DNS_MAX_PATH];
+struct dns_bogus_ip_address {
-extern size_t dns_conf_audit_size;
+	struct hlist_node node;
-extern int dns_conf_audit_num;
+	dns_type_t addr_type;
-
+	union {
-extern char dns_conf_server_name[DNS_MAX_SERVER_NAME_LEN];
+		unsigned char ipv4_addr[DNS_RR_A_LEN];
-extern art_tree dns_conf_domain_rule;
+		unsigned char ipv6_addr[DNS_RR_AAAA_LEN];
-extern struct dns_conf_address_rule dns_conf_address_rule;
+		unsigned char addr[0];
-
+	};
-extern int dns_conf_dualstack_ip_selection;
+};
-extern int dns_conf_dualstack_ip_selection_threshold;
+
-
+enum address_rule {
-extern int dns_conf_rr_ttl;
+	ADDRESS_RULE_BLACKLIST = 1,
-extern int dns_conf_rr_ttl_min;
+	ADDRESS_RULE_WHITELIST = 2,
-extern int dns_conf_rr_ttl_max;
+	ADDRESS_RULE_BOGUS = 3,
-extern int dns_conf_force_AAAA_SOA;
+	ADDRESS_RULE_IP_IGNORE = 4,
-extern int dns_conf_ipset_timeout_enable;
+};
-
+
-extern struct dns_edns_client_subnet dns_conf_ipv4_ecs;
+struct dns_ip_address_rule {
-extern struct dns_edns_client_subnet dns_conf_ipv6_ecs;
+	unsigned int blacklist : 1;
-
+	unsigned int whitelist : 1;
-extern char dns_conf_sni_proxy_ip[DNS_MAX_IPLEN];
+	unsigned int bogus : 1;
-
+	unsigned int ip_ignore : 1;
-void dns_server_load_exit(void);
+};
-
+
-int dns_server_load_conf(const char *file);
+struct dns_edns_client_subnet {
-
+	int enable;
-extern int config_addtional_file(void *data, int argc, char *argv[]);
+	char ip[DNS_MAX_IPLEN];
-
+	int subnet;
-#endif // !_DNS_CONF
+};
+
+struct dns_conf_address_rule {
+	radix_tree_t *ipv4;
+	radix_tree_t *ipv6;
+};
+
+struct dns_bind_ip {
+	DNS_BIND_TYPE type;
+	uint32_t flags;
+	char ip[DNS_MAX_IPLEN];
+	const char *group;
+};
+
+extern struct dns_bind_ip dns_conf_bind_ip[DNS_MAX_BIND_IP];
+extern int dns_conf_bind_ip_num;
+
+extern int dns_conf_tcp_idle_time;
+extern int dns_conf_cachesize;
+extern int dns_conf_prefetch;
+extern int dns_conf_serve_expired;
+extern int dns_conf_serve_expired_ttl;
+extern struct dns_servers dns_conf_servers[DNS_MAX_SERVERS];
+extern int dns_conf_server_num;
+
+extern int dns_conf_log_level;
+extern char dns_conf_log_file[DNS_MAX_PATH];
+extern size_t dns_conf_log_size;
+extern int dns_conf_log_num;
+
+extern struct dns_domain_check_order dns_conf_check_order;
+
+extern struct dns_server_groups dns_conf_server_groups[DNS_NAX_GROUP_NUMBER];
+extern int dns_conf_server_group_num;
+
+extern int dns_conf_audit_enable;
+extern int dns_conf_audit_log_SOA;
+extern char dns_conf_audit_file[DNS_MAX_PATH];
+extern size_t dns_conf_audit_size;
+extern int dns_conf_audit_num;
+
+extern char dns_conf_server_name[DNS_MAX_SERVER_NAME_LEN];
+extern art_tree dns_conf_domain_rule;
+extern struct dns_conf_address_rule dns_conf_address_rule;
+
+extern int dns_conf_dualstack_ip_selection;
+extern int dns_conf_dualstack_ip_selection_threshold;
+
+extern int dns_conf_rr_ttl;
+extern int dns_conf_rr_ttl_min;
+extern int dns_conf_rr_ttl_max;
+extern int dns_conf_force_AAAA_SOA;
+extern int dns_conf_ipset_timeout_enable;
+
+extern struct dns_edns_client_subnet dns_conf_ipv4_ecs;
+extern struct dns_edns_client_subnet dns_conf_ipv6_ecs;
+
+extern char dns_conf_sni_proxy_ip[DNS_MAX_IPLEN];
+
+void dns_server_load_exit(void);
+
+int dns_server_load_conf(const char *file);
+
+extern int config_addtional_file(void *data, int argc, char *argv[]);
+#ifdef __cpluscplus
+}
+#endif
+#endif // !_DNS_CONF

src/dns_server.h

@@ -1,3 +1,21 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef _SMART_DNS_SERVER_H
 #define _SMART_DNS_SERVER_H
 

src/fast_ping.h

@@ -1,40 +1,58 @@
-#ifndef FAST_PING_H
+/*************************************************************************
-#define FAST_PING_H
+ *
-
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-#include <netdb.h>
+ *
-#include <sys/time.h>
+ * smartdns is free software: you can redistribute it and/or modify
-#ifdef __cpluscplus
+ * it under the terms of the GNU General Public License as published by
-extern "C" {
+ * the Free Software Foundation, either version 3 of the License, or
-#endif
+ * (at your option) any later version.
-
+ *
-typedef enum {
+ * smartdns is distributed in the hope that it will be useful,
-	PING_TYPE_ICMP = 1,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	PING_TYPE_TCP = 2,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	PING_TYPE_DNS = 3,
+ * GNU General Public License for more details.
-} PING_TYPE;
+ *
-
+ * You should have received a copy of the GNU General Public License
-typedef enum {
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	PING_RESULT_RESPONSE = 1,
+ */
-	PING_RESULT_TIMEOUT = 2,
+
-	PING_RESULT_END = 3,
+#ifndef FAST_PING_H
-} FAST_PING_RESULT;
+#define FAST_PING_H
-
+
-struct ping_host_struct;
+#include <netdb.h>
-typedef void (*fast_ping_result)(struct ping_host_struct *ping_host, const char *host, FAST_PING_RESULT result, struct sockaddr *addr, socklen_t addr_len,
+#include <sys/time.h>
-								 int seqno, int ttl, struct timeval *tv, void *userptr);
+#ifdef __cpluscplus
-
+extern "C" {
-/* start ping */
+#endif
-struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int count, int interval, int timeout, fast_ping_result ping_callback, void *userptr);
+
-
+typedef enum {
-/* stop ping */
+	PING_TYPE_ICMP = 1,
-int fast_ping_stop(struct ping_host_struct *ping_host);
+	PING_TYPE_TCP = 2,
-
+	PING_TYPE_DNS = 3,
-int fast_ping_init(void);
+} PING_TYPE;
-
+
-void fast_ping_exit(void);
+typedef enum {
-
+	PING_RESULT_RESPONSE = 1,
-#ifdef __cpluscplus
+	PING_RESULT_TIMEOUT = 2,
-}
+	PING_RESULT_END = 3,
-#endif
+} FAST_PING_RESULT;
-
+
-#endif // !FAST_PING_H
+struct ping_host_struct;
+typedef void (*fast_ping_result)(struct ping_host_struct *ping_host, const char *host, FAST_PING_RESULT result, struct sockaddr *addr, socklen_t addr_len,
+								 int seqno, int ttl, struct timeval *tv, void *userptr);
+
+/* start ping */
+struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int count, int interval, int timeout, fast_ping_result ping_callback, void *userptr);
+
+/* stop ping */
+int fast_ping_stop(struct ping_host_struct *ping_host);
+
+int fast_ping_init(void);
+
+void fast_ping_exit(void);
+
+#ifdef __cpluscplus
+}
+#endif
+
+#endif // !FAST_PING_H

src/http_parse.c

@@ -1,445 +1,463 @@
-#include "http_parse.h"
+/*************************************************************************
-#include "hash.h"
+ *
-#include "hashtable.h"
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-#include "jhash.h"
+ *
-#include "list.h"
+ * smartdns is free software: you can redistribute it and/or modify
-#include <stdlib.h>
+ * it under the terms of the GNU General Public License as published by
-#include <string.h>
+ * the Free Software Foundation, either version 3 of the License, or
-#include <unistd.h>
+ * (at your option) any later version.
-
+ *
-struct http_head_fields {
+ * smartdns is distributed in the hope that it will be useful,
-	struct hlist_node node;
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	struct list_head list;
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
+ * GNU General Public License for more details.
-	char *name;
+ *
-	char *value;
+ * You should have received a copy of the GNU General Public License
-};
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+ */
-struct http_head {
+
-	HTTP_HEAD_TYPE head_type;
+#include "http_parse.h"
-	HTTP_METHOD method;
+#include "hash.h"
-	char *url;
+#include "hashtable.h"
-	char *version;
+#include "jhash.h"
-	int code;
+#include "list.h"
-	char *code_msg;
+#include <stdlib.h>
-	int buff_size;
+#include <string.h>
-	int buff_len;
+#include <unistd.h>
-	char *buff;
+
-	int head_ok;
+struct http_head_fields {
-	int head_len;
+	struct hlist_node node;
-	char *data;
+	struct list_head list;
-	int data_len;
+
-	int expect_data_len;
+	char *name;
-	struct http_head_fields field_head;
+	char *value;
-	DECLARE_HASHTABLE(field_map, 4);
+};
-};
+
-
+struct http_head {
-/*
+	HTTP_HEAD_TYPE head_type;
- * Returns:
+	HTTP_METHOD method;
- *  >=0  - success http data len
+	char *url;
- *  -1   - Incomplete request
+	char *version;
- *  -2   - parse failed
+	int code;
- */
+	char *code_msg;
-struct http_head *http_head_init(int buffsize)
+	int buff_size;
-{
+	int buff_len;
-	struct http_head *http_head = NULL;
+	char *buff;
-	char *buffer = NULL;
+	int head_ok;
-
+	int head_len;
-	http_head = malloc(sizeof(*http_head));
+	char *data;
-	if (http_head == NULL) {
+	int data_len;
-		goto errout;
+	int expect_data_len;
-	}
+	struct http_head_fields field_head;
-	memset(http_head, 0, sizeof(*http_head));
+	DECLARE_HASHTABLE(field_map, 4);
-	INIT_LIST_HEAD(&http_head->field_head.list);
+};
-	hash_init(http_head->field_map);
+
-
+/*
-	buffer = malloc(buffsize);
+ * Returns:
-	if (buffer == NULL) {
+ *  >=0  - success http data len
-		goto errout;
+ *  -1   - Incomplete request
-	}
+ *  -2   - parse failed
-
+ */
-	http_head->buff = buffer;
+struct http_head *http_head_init(int buffsize)
-	http_head->buff_size = buffsize;
+{
-
+	struct http_head *http_head = NULL;
-	return http_head;
+	char *buffer = NULL;
-
+
-errout:
+	http_head = malloc(sizeof(*http_head));
-	if (buffer) {
+	if (http_head == NULL) {
-		free(buffer);
+		goto errout;
-	}
+	}
-
+	memset(http_head, 0, sizeof(*http_head));
-	if (http_head) {
+	INIT_LIST_HEAD(&http_head->field_head.list);
-		free(http_head);
+	hash_init(http_head->field_map);
-	}
+
-
+	buffer = malloc(buffsize);
-	return NULL;
+	if (buffer == NULL) {
-}
+		goto errout;
-
+	}
-struct http_head_fields *http_head_first_fields(struct http_head *http_head)
+
-{
+	http_head->buff = buffer;
-	struct http_head_fields *first = NULL;
+	http_head->buff_size = buffsize;
-	first = list_first_entry(&http_head->field_head.list, struct http_head_fields, list);
+
-
+	return http_head;
-	if (first->name == NULL && first->value == NULL) {
+
-		return NULL;
+errout:
-	}
+	if (buffer) {
-
+		free(buffer);
-	return first;
+	}
-}
+
-
+	if (http_head) {
-const char *http_head_get_fields_value(struct http_head *http_head, const char *name)
+		free(http_head);
-{
+	}
-	unsigned long key;
+
-	struct http_head_fields *filed;
+	return NULL;
-
+}
-	key = hash_string(name);
+
-	hash_for_each_possible(http_head->field_map, filed, node, key)
+struct http_head_fields *http_head_first_fields(struct http_head *http_head)
-	{
+{
-		if (strncmp(filed->name, name, 128) == 0) {
+	struct http_head_fields *first = NULL;
-			return filed->value;
+	first = list_first_entry(&http_head->field_head.list, struct http_head_fields, list);
-		}
+
-	}
+	if (first->name == NULL && first->value == NULL) {
-
+		return NULL;
-	return NULL;
+	}
-}
+
-
+	return first;
-struct http_head_fields *http_head_next_fields(struct http_head_fields *fields)
+}
-{
+
-	struct http_head_fields *next = NULL;
+const char *http_head_get_fields_value(struct http_head *http_head, const char *name)
-	next = list_next_entry(fields, list);
+{
-
+	unsigned long key;
-	if (next->name == NULL && next->value == NULL) {
+	struct http_head_fields *filed;
-		return NULL;
+
-	}
+	key = hash_string(name);
-
+	hash_for_each_possible(http_head->field_map, filed, node, key)
-	return next;
+	{
-}
+		if (strncmp(filed->name, name, 128) == 0) {
-
+			return filed->value;
-int http_head_lookup_fields(struct http_head_fields *fields, const char **name, const char **value)
+		}
-{
+	}
-	if (fields == NULL) {
+
-		return -1;
+	return NULL;
-	}
+}
-
+
-	if (name) {
+struct http_head_fields *http_head_next_fields(struct http_head_fields *fields)
-		*name = fields->name;
+{
-	}
+	struct http_head_fields *next = NULL;
-
+	next = list_next_entry(fields, list);
-	if (value) {
+
-		*value = fields->value;
+	if (next->name == NULL && next->value == NULL) {
-	}
+		return NULL;
-
+	}
-	return 0;
+
-}
+	return next;
-
+}
-HTTP_METHOD http_head_get_method(struct http_head *http_head)
+
-{
+int http_head_lookup_fields(struct http_head_fields *fields, const char **name, const char **value)
-	return http_head->method;
+{
-}
+	if (fields == NULL) {
-
+		return -1;
-const char *http_head_get_url(struct http_head *http_head) 
+	}
-{
+
-	return http_head->url;
+	if (name) {
-}
+		*name = fields->name;
-
+	}
-const char *http_head_get_httpversion(struct http_head *http_head) 
+
-{
+	if (value) {
-	return http_head->version;
+		*value = fields->value;
-}
+	}
-
+
-int http_head_get_httpcode(struct http_head *http_head)
+	return 0;
-{
+}
-	return http_head->code;
+
-}
+HTTP_METHOD http_head_get_method(struct http_head *http_head)
-
+{
-char *http_head_get_httpcode_msg(struct http_head *http_head)
+	return http_head->method;
-{
+}
-	return http_head->code_msg;
+
-}
+const char *http_head_get_url(struct http_head *http_head)
-
+{
-HTTP_HEAD_TYPE http_head_get_head_type(struct http_head *http_head)
+	return http_head->url;
-{
+}
-	return http_head->head_type;
+
-}
+const char *http_head_get_httpversion(struct http_head *http_head)
-
+{
-char *http_head_get_data(struct http_head *http_head) 
+	return http_head->version;
-{
+}
-	return http_head->data;
+
-}
+int http_head_get_httpcode(struct http_head *http_head)
-
+{
-int http_head_get_data_len(struct http_head *http_head)
+	return http_head->code;
-{
+}
-	return http_head->data_len;
+
-}
+char *http_head_get_httpcode_msg(struct http_head *http_head)
-
+{
-static int _http_head_add_fields(struct http_head *http_head, char *name, char *value)
+	return http_head->code_msg;
-{
+}
-	unsigned long key = 0;
+
-	struct http_head_fields *fields = NULL;
+HTTP_HEAD_TYPE http_head_get_head_type(struct http_head *http_head)
-	fields = malloc(sizeof(*fields));
+{
-	if (fields == NULL) {
+	return http_head->head_type;
-		return -1;
+}
-	}
+
-	memset(fields, 0, sizeof(*fields));
+char *http_head_get_data(struct http_head *http_head)
-
+{
-	fields->name = name;
+	return http_head->data;
-	fields->value = value;
+}
-
+
-	list_add_tail(&fields->list, &http_head->field_head.list);
+int http_head_get_data_len(struct http_head *http_head)
-	key = hash_string(name);
+{
-	hash_add(http_head->field_map, &fields->node, key);
+	return http_head->data_len;
-
+}
-	return 0;
+
-}
+static int _http_head_add_fields(struct http_head *http_head, char *name, char *value)
-
+{
-static int _http_head_parse_response(struct http_head *http_head, char *key, char *value)
+	unsigned long key = 0;
-{
+	struct http_head_fields *fields = NULL;
-	char *field_start = NULL;
+	fields = malloc(sizeof(*fields));
-	char *tmp_ptr = NULL;
+	if (fields == NULL) {
-	char *result = NULL;
+		return -1;
-	char *ret_code = NULL;
+	}
-
+	memset(fields, 0, sizeof(*fields));
-	if (strstr(key, "HTTP/") == NULL) {
+
-		return -1;
+	fields->name = name;
-	}
+	fields->value = value;
-
+
-	for (tmp_ptr = value; *tmp_ptr != 0; tmp_ptr++) {
+	list_add_tail(&fields->list, &http_head->field_head.list);
-		if (field_start == NULL) {
+	key = hash_string(name);
-			field_start = tmp_ptr;
+	hash_add(http_head->field_map, &fields->node, key);
-		}
+
-
+	return 0;
-		if (*tmp_ptr == ' ') {
+}
-			*tmp_ptr = '\0';
+
-			if (ret_code == NULL) {
+static int _http_head_parse_response(struct http_head *http_head, char *key, char *value)
-				ret_code = field_start;
+{
-			} else if (result == NULL) {
+	char *field_start = NULL;
-				result = field_start;
+	char *tmp_ptr = NULL;
-				break;
+	char *result = NULL;
-			}
+	char *ret_code = NULL;
-
+
-			field_start = NULL;
+	if (strstr(key, "HTTP/") == NULL) {
-		}
+		return -1;
-	}
+	}
-
+
-	if (field_start && result == NULL) {
+	for (tmp_ptr = value; *tmp_ptr != 0; tmp_ptr++) {
-		result = field_start;
+		if (field_start == NULL) {
-	}
+			field_start = tmp_ptr;
-
+		}
-	if (ret_code == NULL || result == NULL) {
+
-		return -1;
+		if (*tmp_ptr == ' ') {
-	}
+			*tmp_ptr = '\0';
-
+			if (ret_code == NULL) {
-	http_head->code = atol(ret_code);
+				ret_code = field_start;
-	http_head->code_msg = result;
+			} else if (result == NULL) {
-	http_head->version = key;
+				result = field_start;
-    http_head->head_type = HTTP_HEAD_RESPONSE;
+				break;
-
+			}
-	return 0;
+
-}
+			field_start = NULL;
-
+		}
-static int _http_head_parse_request(struct http_head *http_head, char *key, char *value)
+	}
-{
+
-	int method = HTTP_METHOD_INVALID;
+	if (field_start && result == NULL) {
-	char *url = NULL;
+		result = field_start;
-	char *version = NULL;
+	}
-	char *tmp_ptr = value;
+
-	char *field_start = NULL;
+	if (ret_code == NULL || result == NULL) {
-
+		return -1;
-	if (strncmp(key, "GET", sizeof("GET")) == 0) {
+	}
-		method = HTTP_METHOD_GET;
+
-	} else if (strncmp(key, "POST", sizeof("POST")) == 0) {
+	http_head->code = atol(ret_code);
-		method = HTTP_METHOD_POST;
+	http_head->code_msg = result;
-	} else if (strncmp(key, "PUT", sizeof("PUT")) == 0) {
+	http_head->version = key;
-		method = HTTP_METHOD_PUT;
+	http_head->head_type = HTTP_HEAD_RESPONSE;
-	} else if (strncmp(key, "DELETE", sizeof("DELETE")) == 0) {
+
-		method = HTTP_METHOD_DELETE;
+	return 0;
-	} else if (strncmp(key, "TRACE", sizeof("TRACE")) == 0) {
+}
-		method = HTTP_METHOD_TRACE;
+
-	} else if (strncmp(key, "CONNECT", sizeof("CONNECT")) == 0) {
+static int _http_head_parse_request(struct http_head *http_head, char *key, char *value)
-		method = HTTP_METHOD_CONNECT;
+{
-	} else {
+	int method = HTTP_METHOD_INVALID;
-		return _http_head_parse_response(http_head, key, value);
+	char *url = NULL;
-	}
+	char *version = NULL;
-
+	char *tmp_ptr = value;
-	for (tmp_ptr = value; *tmp_ptr != 0; tmp_ptr++) {
+	char *field_start = NULL;
-		if (field_start == NULL) {
+
-			field_start = tmp_ptr;
+	if (strncmp(key, "GET", sizeof("GET")) == 0) {
-		}
+		method = HTTP_METHOD_GET;
-		if (*tmp_ptr == ' ') {
+	} else if (strncmp(key, "POST", sizeof("POST")) == 0) {
-			*tmp_ptr = '\0';
+		method = HTTP_METHOD_POST;
-			if (url == NULL) {
+	} else if (strncmp(key, "PUT", sizeof("PUT")) == 0) {
-				url = field_start;
+		method = HTTP_METHOD_PUT;
-			}
+	} else if (strncmp(key, "DELETE", sizeof("DELETE")) == 0) {
-
+		method = HTTP_METHOD_DELETE;
-			field_start = NULL;
+	} else if (strncmp(key, "TRACE", sizeof("TRACE")) == 0) {
-		}
+		method = HTTP_METHOD_TRACE;
-	}
+	} else if (strncmp(key, "CONNECT", sizeof("CONNECT")) == 0) {
-
+		method = HTTP_METHOD_CONNECT;
-	if (field_start && version == NULL) {
+	} else {
-		version = field_start;
+		return _http_head_parse_response(http_head, key, value);
-	}
+	}
-
+
-	http_head->method = method;
+	for (tmp_ptr = value; *tmp_ptr != 0; tmp_ptr++) {
-	http_head->url = url;
+		if (field_start == NULL) {
-	http_head->version = version;
+			field_start = tmp_ptr;
-	http_head->head_type = HTTP_HEAD_REQUEST;
+		}
-
+		if (*tmp_ptr == ' ') {
-	return 0;
+			*tmp_ptr = '\0';
-}
+			if (url == NULL) {
-
+				url = field_start;
-static int _http_head_parse(struct http_head *http_head)
+			}
-{
+
-	int i = 0;
+			field_start = NULL;
-	char *key = NULL;
+		}
-	char *value = NULL;
+	}
-	char *data;
+
-	int has_first_line = 0;
+	if (field_start && version == NULL) {
-
+		version = field_start;
-	int inkey = 1;
+	}
-	int invalue = 0;
+
-
+	http_head->method = method;
-	data = http_head->buff;
+	http_head->url = url;
-	for (i = 0; i < http_head->head_len; i++, data++) {
+	http_head->version = version;
-		if (inkey) {
+	http_head->head_type = HTTP_HEAD_REQUEST;
-			if (key == NULL && *data != ' ' && *data != '\r' && *data != '\n') {
+
-				key = data;
+	return 0;
-				continue;
+}
-			}
+
-
+static int _http_head_parse(struct http_head *http_head)
-			if (*data == ':' || *data == ' ') {
+{
-				*data = '\0';
+	int i = 0;
-				inkey = 0;
+	char *key = NULL;
-				invalue = 1;
+	char *value = NULL;
-				continue;
+	char *data;
-			}
+	int has_first_line = 0;
-		}
+
-
+	int inkey = 1;
-		if (invalue) {
+	int invalue = 0;
-			if (value == NULL && *data != ' ') {
+
-				value = data;
+	data = http_head->buff;
-				continue;
+	for (i = 0; i < http_head->head_len; i++, data++) {
-			}
+		if (inkey) {
-
+			if (key == NULL && *data != ' ' && *data != '\r' && *data != '\n') {
-			if (*data == '\r' || *data == '\n') {
+				key = data;
-				*data = '\0';
+				continue;
-				inkey = 1;
+			}
-				invalue = 0;
+
-			}
+			if (*data == ':' || *data == ' ') {
-		}
+				*data = '\0';
-
+				inkey = 0;
-		if (key && value && invalue == 0) {
+				invalue = 1;
-			if (has_first_line == 0) {
+				continue;
-				if (_http_head_parse_request(http_head, key, value) != 0) {
+			}
-					return -2;
+		}
-				}
+
-
+		if (invalue) {
-				has_first_line = 1;
+			if (value == NULL && *data != ' ') {
-			} else {
+				value = data;
-				if (_http_head_add_fields(http_head, key, value) != 0) {
+				continue;
-					return -2;
+			}
-				}
+
-			}
+			if (*data == '\r' || *data == '\n') {
-
+				*data = '\0';
-			key = NULL;
+				inkey = 1;
-			value = NULL;
+				invalue = 0;
-			inkey = 1;
+			}
-			invalue = 0;
+		}
-		}
+
-	}
+		if (key && value && invalue == 0) {
-
+			if (has_first_line == 0) {
-	return 0;
+				if (_http_head_parse_request(http_head, key, value) != 0) {
-}
+					return -2;
-
+				}
-int http_head_parse(struct http_head *http_head, const char *data, int data_len)
+
-{
+				has_first_line = 1;
-	int i = 0;
+			} else {
-	char *buff_end = NULL;
+				if (_http_head_add_fields(http_head, key, value) != 0) {
-	int left_size = 0;
+					return -2;
-	int process_data_len = 0;
+				}
-
+			}
-	left_size = http_head->buff_size - http_head->buff_len;
+
-
+			key = NULL;
-	if (left_size < data_len) {
+			value = NULL;
-		return -3;
+			inkey = 1;
-	}
+			invalue = 0;
-
+		}
-	buff_end = http_head->buff + http_head->buff_len;
+	}
-	if (http_head->head_ok == 0) {
+
-		for (i = 0; i < data_len; i++, data++) {
+	return 0;
-			*(buff_end + i) = *data;
+}
-			if (*data == '\n') {
+
-				if (http_head->buff_len + i < 2) {
+int http_head_parse(struct http_head *http_head, const char *data, int data_len)
-					continue;
+{
-				}
+	int i = 0;
-
+	char *buff_end = NULL;
-				if (*(buff_end + i - 2) == '\n') {
+	int left_size = 0;
-					http_head->head_ok = 1;
+	int process_data_len = 0;
-					http_head->head_len = http_head->buff_len + i - 2;
+
-					i++;
+	left_size = http_head->buff_size - http_head->buff_len;
-					buff_end += i;
+
-					data_len -= i;
+	if (left_size < data_len) {
-					data++;
+		return -3;
-					if (_http_head_parse(http_head) != 0) {
+	}
-						return -2;
+
-					}
+	buff_end = http_head->buff + http_head->buff_len;
-
+	if (http_head->head_ok == 0) {
-					const char *content_len = NULL;
+		for (i = 0; i < data_len; i++, data++) {
-					content_len = http_head_get_fields_value(http_head, "Content-Length");
+			*(buff_end + i) = *data;
-					if (content_len) {
+			if (*data == '\n') {
-						http_head->expect_data_len = atol(content_len);
+				if (http_head->buff_len + i < 2) {
-					} else {
+					continue;
-						http_head->expect_data_len = 0;
+				}
-					}
+
-
+				if (*(buff_end + i - 2) == '\n') {
-					if (http_head->expect_data_len < 0) {
+					http_head->head_ok = 1;
-						return -2;
+					http_head->head_len = http_head->buff_len + i - 2;
-					}
+					i++;
-
+					buff_end += i;
-					break;
+					data_len -= i;
-				}
+					data++;
-			}
+					if (_http_head_parse(http_head) != 0) {
-		}
+						return -2;
-
+					}
-		process_data_len += i;
+
-		if (http_head->head_ok == 0) {
+					const char *content_len = NULL;
-			// Read data again */
+					content_len = http_head_get_fields_value(http_head, "Content-Length");
-			http_head->buff_len += process_data_len;
+					if (content_len) {
-			return -1;
+						http_head->expect_data_len = atol(content_len);
-		}
+					} else {
-	}
+						http_head->expect_data_len = 0;
-
+					}
-	if (http_head->head_ok == 1) {
+
-		int get_data_len = (http_head->expect_data_len > data_len) ? data_len : http_head->expect_data_len;
+					if (http_head->expect_data_len < 0) {
-		if (http_head->data == NULL) {
+						return -2;
-			http_head->data = buff_end;
+					}
-		}
+
-
+					break;
-		memcpy(buff_end, data, get_data_len);
+				}
-		process_data_len += get_data_len;
+			}
-		http_head->data_len += get_data_len;
+		}
-	}
+
-
+		process_data_len += i;
-	http_head->buff_len += process_data_len;
+		if (http_head->head_ok == 0) {
-	if (http_head->data_len < http_head->expect_data_len) {
+			// Read data again */
-		return -1;
+			http_head->buff_len += process_data_len;
-	}
+			return -1;
-
+		}
-	return process_data_len;
+	}
-}
+
-
+	if (http_head->head_ok == 1) {
-void http_head_destroy(struct http_head *http_head)
+		int get_data_len = (http_head->expect_data_len > data_len) ? data_len : http_head->expect_data_len;
-{
+		if (http_head->data == NULL) {
-	struct http_head_fields *fields, *tmp;
+			http_head->data = buff_end;
-
+		}
-	list_for_each_entry_safe(fields, tmp, &http_head->field_head.list, list)
+
-	{
+		memcpy(buff_end, data, get_data_len);
-		list_del(&fields->list);
+		process_data_len += get_data_len;
-		free(fields);
+		http_head->data_len += get_data_len;
-	}
+	}
-
+
-	if (http_head->buff) {
+	http_head->buff_len += process_data_len;
-		free(http_head->buff);
+	if (http_head->data_len < http_head->expect_data_len) {
-	}
+		return -1;
-
+	}
-	free(http_head);
+
-}
+	return process_data_len;
+}
+
+void http_head_destroy(struct http_head *http_head)
+{
+	struct http_head_fields *fields, *tmp;
+
+	list_for_each_entry_safe(fields, tmp, &http_head->field_head.list, list)
+	{
+		list_del(&fields->list);
+		free(fields);
+	}
+
+	if (http_head->buff) {
+		free(http_head->buff);
+	}
+
+	free(http_head);
+}

src/http_parse.h

@@ -1,69 +1,87 @@
-#ifndef HTTP_PARSER_H
+/*************************************************************************
-#define HTTP_PARSER_H
+ *
-
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-#ifdef __cpluscplus
+ *
-extern "C" {
+ * smartdns is free software: you can redistribute it and/or modify
-#endif
+ * it under the terms of the GNU General Public License as published by
-
+ * the Free Software Foundation, either version 3 of the License, or
-struct http_head;
+ * (at your option) any later version.
-struct http_head_fields;
+ *
-
+ * smartdns is distributed in the hope that it will be useful,
-typedef enum HTTP_METHOD {
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	HTTP_METHOD_INVALID = 0,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	HTTP_METHOD_GET,
+ * GNU General Public License for more details.
-	HTTP_METHOD_HEAD,
+ *
-	HTTP_METHOD_POST,
+ * You should have received a copy of the GNU General Public License
-	HTTP_METHOD_PUT,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	HTTP_METHOD_DELETE,
+ */
-	HTTP_METHOD_TRACE,
+
-	HTTP_METHOD_CONNECT,
+#ifndef HTTP_PARSER_H
-} HTTP_METHOD;
+#define HTTP_PARSER_H
-
+
-typedef enum HTTP_HEAD_TYPE {
+#ifdef __cpluscplus
-	HTTP_HEAD_INVALID = 0,
+extern "C" {
-	HTTP_HEAD_REQUEST = 1,
+#endif
-	HTTP_HEAD_RESPONSE = 2,
+
-} HTTP_HEAD_TYPE;
+struct http_head;
-
+struct http_head_fields;
-struct http_head *http_head_init(int buffsize);
+
-
+typedef enum HTTP_METHOD {
-HTTP_HEAD_TYPE http_head_get_head_type(struct http_head *http_head);
+	HTTP_METHOD_INVALID = 0,
-
+	HTTP_METHOD_GET,
-HTTP_METHOD http_head_get_method(struct http_head *http_head);
+	HTTP_METHOD_HEAD,
-
+	HTTP_METHOD_POST,
-const char *http_head_get_url(struct http_head *http_head);
+	HTTP_METHOD_PUT,
-
+	HTTP_METHOD_DELETE,
-const char *http_head_get_httpversion(struct http_head *http_head);
+	HTTP_METHOD_TRACE,
-
+	HTTP_METHOD_CONNECT,
-int http_head_get_httpcode(struct http_head *http_head);
+} HTTP_METHOD;
-
+
-char *http_head_get_httpcode_msg(struct http_head *http_head);
+typedef enum HTTP_HEAD_TYPE {
-
+	HTTP_HEAD_INVALID = 0,
-char *http_head_get_data(struct http_head *http_head);
+	HTTP_HEAD_REQUEST = 1,
-
+	HTTP_HEAD_RESPONSE = 2,
-int http_head_get_data_len(struct http_head *http_head);
+} HTTP_HEAD_TYPE;
-
+
-struct http_head_fields *http_head_first_fields(struct http_head *http_head);
+struct http_head *http_head_init(int buffsize);
-
+
-struct http_head_fields *http_head_next_fields(struct http_head_fields *fields);
+HTTP_HEAD_TYPE http_head_get_head_type(struct http_head *http_head);
-
+
-const char *http_head_get_fields_value(struct http_head *http_head, const char *name);
+HTTP_METHOD http_head_get_method(struct http_head *http_head);
-
+
-int http_head_lookup_fields(struct http_head_fields *fields, const char **name, const char **value);
+const char *http_head_get_url(struct http_head *http_head);
-
+
-/*
+const char *http_head_get_httpversion(struct http_head *http_head);
- * Returns:
+
- *  >=0  - success http data len
+int http_head_get_httpcode(struct http_head *http_head);
- *  -1   - Incomplete request
+
- *  -2   - parse failed
+char *http_head_get_httpcode_msg(struct http_head *http_head);
- *  -3   - buffer is small
+
- */
+char *http_head_get_data(struct http_head *http_head);
-int http_head_parse(struct http_head *http_head, const char *data, int data_len);
+
-
+int http_head_get_data_len(struct http_head *http_head);
-void http_head_destroy(struct http_head *http_head);
+
-
+struct http_head_fields *http_head_first_fields(struct http_head *http_head);
-#ifdef __cpluscplus
+
-}
+struct http_head_fields *http_head_next_fields(struct http_head_fields *fields);
-#endif
+
-
+const char *http_head_get_fields_value(struct http_head *http_head, const char *name);
-#endif // !HTTP_PARSER_H
+
+int http_head_lookup_fields(struct http_head_fields *fields, const char **name, const char **value);
+
+/*
+ * Returns:
+ *  >=0  - success http data len
+ *  -1   - Incomplete request
+ *  -2   - parse failed
+ *  -3   - buffer is small
+ */
+int http_head_parse(struct http_head *http_head, const char *data, int data_len);
+
+void http_head_destroy(struct http_head *http_head);
+
+#ifdef __cpluscplus
+}
+#endif
+
+#endif // !HTTP_PARSER_H

src/include/art.h

@@ -1,240 +1,251 @@
-/*
+/*
-Copyright (c) 2012, Armon Dadgar
+Copyright (c) 2012, Armon Dadgar
-All rights reserved.
+All rights reserved.
-
+
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
+    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
+    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
+      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
+      documentation and/or other materials provided with the distribution.
-    * Neither the name of the organization nor the
+    * Neither the name of the organization nor the
-      names of its contributors may be used to endorse or promote products
+      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
+      derived from this software without specific prior written permission.
-
+
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL ARMON DADGAR BE LIABLE FOR ANY
+DISCLAIMED. IN NO EVENT SHALL ARMON DADGAR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
-#include <stdint.h>
+#include <stdint.h>
-#ifndef ART_H
+#ifndef ART_H
-#define ART_H
+#define ART_H
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-extern "C" {
+extern "C" {
-#endif
+#endif
-
+
-#define NODE4   1
+#define NODE4   1
-#define NODE16  2
+#define NODE16  2
-#define NODE48  3
+#define NODE48  3
-#define NODE256 4
+#define NODE256 4
-
+
-#define MAX_PREFIX_LEN 10
+#define MAX_PREFIX_LEN 10
-
+
-#if defined(__GNUC__) && !defined(__clang__)
+#if defined(__GNUC__) && !defined(__clang__)
-# if __STDC_VERSION__ >= 199901L && 402 == (__GNUC__ * 100 + __GNUC_MINOR__)
+# if __STDC_VERSION__ >= 199901L && 402 == (__GNUC__ * 100 + __GNUC_MINOR__)
-/*
+/*
- * GCC 4.2.2's C99 inline keyword support is pretty broken; avoid. Introduced in
+ * GCC 4.2.2's C99 inline keyword support is pretty broken; avoid. Introduced in
- * GCC 4.2.something, fixed in 4.3.0. So checking for specific major.minor of
+ * GCC 4.2.something, fixed in 4.3.0. So checking for specific major.minor of
- * 4.2 is fine.
+ * 4.2 is fine.
- */
+ */
-#  define BROKEN_GCC_C99_INLINE
+#  define BROKEN_GCC_C99_INLINE
-# endif
+# endif
-#endif
+#endif
-
+
-typedef int(*art_callback)(void *data, const unsigned char *key, uint32_t key_len, void *value);
+typedef int(*art_callback)(void *data, const unsigned char *key, uint32_t key_len, void *value);
-
+
-/**
+/**
- * This struct is included as part
+ * This struct is included as part
- * of all the various node sizes
+ * of all the various node sizes
- */
+ */
-typedef struct {
+typedef struct {
-    uint8_t type;
+    uint8_t type;
-    uint8_t num_children;
+    uint8_t num_children;
-    uint32_t partial_len;
+    uint32_t partial_len;
-    unsigned char partial[MAX_PREFIX_LEN];
+    unsigned char partial[MAX_PREFIX_LEN];
-} art_node;
+} art_node;
-
+
-/**
+/**
- * Small node with only 4 children
+ * Small node with only 4 children
- */
+ */
-typedef struct {
+typedef struct {
-    art_node n;
+    art_node n;
-    unsigned char keys[4];
+    unsigned char keys[4];
-    art_node *children[4];
+    art_node *children[4];
-} art_node4;
+} art_node4;
-
+
-/**
+/**
- * Node with 16 children
+ * Node with 16 children
- */
+ */
-typedef struct {
+typedef struct {
-    art_node n;
+    art_node n;
-    unsigned char keys[16];
+    unsigned char keys[16];
-    art_node *children[16];
+    art_node *children[16];
-} art_node16;
+} art_node16;
-
+
-/**
+/**
- * Node with 48 children, but
+ * Node with 48 children, but
- * a full 256 byte field.
+ * a full 256 byte field.
- */
+ */
-typedef struct {
+typedef struct {
-    art_node n;
+    art_node n;
-    unsigned char keys[256];
+    unsigned char keys[256];
-    art_node *children[48];
+    art_node *children[48];
-} art_node48;
+} art_node48;
-
+
-/**
+/**
- * Full node with 256 children
+ * Full node with 256 children
- */
+ */
-typedef struct {
+typedef struct {
-    art_node n;
+    art_node n;
-    art_node *children[256];
+    art_node *children[256];
-} art_node256;
+} art_node256;
-
+
-/**
+/**
- * Represents a leaf. These are
+ * Represents a leaf. These are
- * of arbitrary size, as they include the key.
+ * of arbitrary size, as they include the key.
- */
+ */
-typedef struct {
+typedef struct {
-    void *value;
+    void *value;
-    uint32_t key_len;
+    uint32_t key_len;
-    unsigned char key[0];
+    unsigned char key[0];
-} art_leaf;
+} art_leaf;
-
+
-/**
+/**
- * Main struct, points to root.
+ * Main struct, points to root.
- */
+ */
-typedef struct {
+typedef struct {
-    art_node *root;
+    art_node *root;
-    uint64_t size;
+    uint64_t size;
-} art_tree;
+} art_tree;
-
+
-/**
+/**
- * Initializes an ART tree
+ * Initializes an ART tree
- * @return 0 on success.
+ * @return 0 on success.
- */
+ */
-int art_tree_init(art_tree *t);
+int art_tree_init(art_tree *t);
-
+
-/**
+/**
- * DEPRECATED
+ * DEPRECATED
- * Initializes an ART tree
+ * Initializes an ART tree
- * @return 0 on success.
+ * @return 0 on success.
- */
+ */
-#define init_art_tree(...) art_tree_init(__VA_ARGS__)
+#define init_art_tree(...) art_tree_init(__VA_ARGS__)
-
+
-/**
+/**
- * Destroys an ART tree
+ * Destroys an ART tree
- * @return 0 on success.
+ * @return 0 on success.
- */
+ */
-int art_tree_destroy(art_tree *t);
+int art_tree_destroy(art_tree *t);
-
+
-/**
+/**
- * DEPRECATED
+ * DEPRECATED
- * Initializes an ART tree
+ * Initializes an ART tree
- * @return 0 on success.
+ * @return 0 on success.
- */
+ */
-#define destroy_art_tree(...) art_tree_destroy(__VA_ARGS__)
+#define destroy_art_tree(...) art_tree_destroy(__VA_ARGS__)
-
+
-/**
+/**
- * Returns the size of the ART tree.
+ * Returns the size of the ART tree.
- */
+ */
-#ifdef BROKEN_GCC_C99_INLINE
+#ifdef BROKEN_GCC_C99_INLINE
-# define art_size(t) ((t)->size)
+# define art_size(t) ((t)->size)
-#else
+#else
-static inline uint64_t art_size(art_tree *t) {
+static inline uint64_t art_size(art_tree *t) {
-    return t->size;
+    return t->size;
-}
+}
-#endif
+#endif
-
+
-/**
+/**
- * Inserts a new value into the ART tree
+ * Inserts a new value into the ART tree
- * @arg t The tree
+ * @arg t The tree
- * @arg key The key
+ * @arg key The key
- * @arg key_len The length of the key
+ * @arg key_len The length of the key
- * @arg value Opaque value.
+ * @arg value Opaque value.
- * @return NULL if the item was newly inserted, otherwise
+ * @return NULL if the item was newly inserted, otherwise
- * the old value pointer is returned.
+ * the old value pointer is returned.
- */
+ */
-void* art_insert(art_tree *t, const unsigned char *key, int key_len, void *value);
+void* art_insert(art_tree *t, const unsigned char *key, int key_len, void *value);
-
+
-/**
+/**
- * Deletes a value from the ART tree
+ * Deletes a value from the ART tree
- * @arg t The tree
+ * @arg t The tree
- * @arg key The key
+ * @arg key The key
- * @arg key_len The length of the key
+ * @arg key_len The length of the key
- * @return NULL if the item was not found, otherwise
+ * @return NULL if the item was not found, otherwise
- * the value pointer is returned.
+ * the value pointer is returned.
- */
+ */
-void* art_delete(art_tree *t, const unsigned char *key, int key_len);
+void* art_delete(art_tree *t, const unsigned char *key, int key_len);
-
+
-/**
+/**
- * Searches for a value in the ART tree
+ * Searches for a value in the ART tree
- * @arg t The tree
+ * @arg t The tree
- * @arg key The key
+ * @arg key The key
- * @arg key_len The length of the key
+ * @arg key_len The length of the key
- * @return NULL if the item was not found, otherwise
+ * @return NULL if the item was not found, otherwise
- * the value pointer is returned.
+ * the value pointer is returned.
- */
+ */
-void* art_search(const art_tree *t, const unsigned char *key, int key_len);
+void* art_search(const art_tree *t, const unsigned char *key, int key_len);
-
+
-/**
+/**
- * Searches substring for a value in the ART tree
+ * Searches substring for a value in the ART tree
- * @arg t The tree
+ * @arg t The tree
- * @arg str The key
+ * @arg str The key
- * @arg str_len The length of the key
+ * @arg str_len The length of the key
- * @return NULL if the item was not found, otherwise
+ * @return NULL if the item was not found, otherwise
- * the value pointer is returned.
+ * the value pointer is returned.
- */
+ */
-void *art_substring(const art_tree *t, const unsigned char *str, int str_len, unsigned char *key, int *key_len);
+void *art_substring(const art_tree *t, const unsigned char *str, int str_len, unsigned char *key, int *key_len);
-
+
-/**
+/**
- * Returns the minimum valued leaf
+ * Wakk substring for a value in the ART tree
- * @return The minimum leaf or NULL
+ * @arg t The tree
- */
+ * @arg str The key
-art_leaf* art_minimum(art_tree *t);
+ * @arg str_len The length of the key
-
+ * @return NULL if the item was not found, otherwise
-/**
+ * the value pointer is returned.
- * Returns the maximum valued leaf
+ */
- * @return The maximum leaf or NULL
+typedef int (*walk_func)(unsigned char *key, uint32_t key_len, void *value, void *arg);
- */
+void art_substring_walk(const art_tree *t, const unsigned char *str, int str_len, walk_func func, void *arg);
-art_leaf* art_maximum(art_tree *t);
+
-
+/**
-/**
+ * Returns the minimum valued leaf
- * Iterates through the entries pairs in the map,
+ * @return The minimum leaf or NULL
- * invoking a callback for each. The call back gets a
+ */
- * key, value for each and returns an integer stop value.
+art_leaf* art_minimum(art_tree *t);
- * If the callback returns non-zero, then the iteration stops.
+
- * @arg t The tree to iterate over
+/**
- * @arg cb The callback function to invoke
+ * Returns the maximum valued leaf
- * @arg data Opaque handle passed to the callback
+ * @return The maximum leaf or NULL
- * @return 0 on success, or the return of the callback.
+ */
- */
+art_leaf* art_maximum(art_tree *t);
-int art_iter(art_tree *t, art_callback cb, void *data);
+
-
+/**
-/**
+ * Iterates through the entries pairs in the map,
- * Iterates through the entries pairs in the map,
+ * invoking a callback for each. The call back gets a
- * invoking a callback for each that matches a given prefix.
+ * key, value for each and returns an integer stop value.
- * The call back gets a key, value for each and returns an integer stop value.
+ * If the callback returns non-zero, then the iteration stops.
- * If the callback returns non-zero, then the iteration stops.
+ * @arg t The tree to iterate over
- * @arg t The tree to iterate over
+ * @arg cb The callback function to invoke
- * @arg prefix The prefix of keys to read
+ * @arg data Opaque handle passed to the callback
- * @arg prefix_len The length of the prefix
+ * @return 0 on success, or the return of the callback.
- * @arg cb The callback function to invoke
+ */
- * @arg data Opaque handle passed to the callback
+int art_iter(art_tree *t, art_callback cb, void *data);
- * @return 0 on success, or the return of the callback.
+
- */
+/**
-int art_iter_prefix(art_tree *t, const unsigned char *prefix, int prefix_len, art_callback cb, void *data);
+ * Iterates through the entries pairs in the map,
-
+ * invoking a callback for each that matches a given prefix.
-#ifdef __cplusplus
+ * The call back gets a key, value for each and returns an integer stop value.
-}
+ * If the callback returns non-zero, then the iteration stops.
-#endif
+ * @arg t The tree to iterate over
-
+ * @arg prefix The prefix of keys to read
-#endif
+ * @arg prefix_len The length of the prefix
+ * @arg cb The callback function to invoke
+ * @arg data Opaque handle passed to the callback
+ * @return 0 on success, or the return of the callback.
+ */
+int art_iter_prefix(art_tree *t, const unsigned char *prefix, int prefix_len, art_callback cb, void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

src/include/atomic.h

@@ -1,3 +1,22 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #ifndef _GENERIC_ATOMIC_H
 #define _GENERIC_ATOMIC_H
 

src/include/bitmap.h

@@ -1,3 +1,22 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #ifndef _PERF_BITOPS_H
 #define _PERF_BITOPS_H
 

src/include/bitops.h

@@ -1,3 +1,22 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #ifndef _GENERIC_BITOPS_H_
 #define _GENERIC_BITOPS_H_
 

src/include/conf.h

@@ -1,123 +1,142 @@
-#ifndef _GENERIC_CONF_H
+/*************************************************************************
-#define _GENERIC_CONF_H
+ *
-
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-#include <unistd.h>
+ *
-
+ * smartdns is free software: you can redistribute it and/or modify
-#define MAX_LINE_LEN 1024
+ * it under the terms of the GNU General Public License as published by
-#define MAX_KEY_LEN 64
+ * the Free Software Foundation, either version 3 of the License, or
-#define CONF_INT_MAX (~(1 << 31))
+ * (at your option) any later version.
-#define CONF_INT_MIN (1 << 31)
+ *
-
+ * smartdns is distributed in the hope that it will be useful,
-#define CONF_RET_OK     0
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#define CONF_RET_ERR   -1
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#define CONF_RET_WARN  -2
+ * GNU General Public License for more details.
-#define CONF_RET_NOENT -3
+ *
-
+ * You should have received a copy of the GNU General Public License
-struct config_item {
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	const char *item;
+ */
-	int (*item_func)(const char *item, void *data, int argc, char *argv[]);
+
-	void *data;
+
-};
+#ifndef _GENERIC_CONF_H
-
+#define _GENERIC_CONF_H
-struct config_item_custom {
+
-	void *custom_data;
+#include <unistd.h>
-	int (*custom_func)(void *data, int argc, char *argv[]);
+
-};
+#define MAX_LINE_LEN 1024
-
+#define MAX_KEY_LEN 64
-struct config_item_int {
+#define CONF_INT_MAX (~(1 << 31))
-	int *data;
+#define CONF_INT_MIN (1 << 31)
-	int min;
+
-	int max;
+#define CONF_RET_OK     0
-};
+#define CONF_RET_ERR   -1
-
+#define CONF_RET_WARN  -2
-struct config_item_string {
+#define CONF_RET_NOENT -3
-	char *data;
+
-	size_t size;
+struct config_item {
-};
+	const char *item;
-
+	int (*item_func)(const char *item, void *data, int argc, char *argv[]);
-struct config_item_yesno {
+	void *data;
-	int *data;
+};
-};
+
-
+struct config_item_custom {
-struct config_item_size {
+	void *custom_data;
-	size_t *data;
+	int (*custom_func)(void *data, int argc, char *argv[]);
-	size_t min;
+};
-	size_t max;
+
-};
+struct config_item_int {
-
+	int *data;
-#define CONF_INT(key, value, min_value, max_value)                                                                                                             \
+	int min;
-	{                                                                                                                                                          \
+	int max;
-		key, conf_int, &(struct config_item_int)                                                                                                               \
+};
-		{                                                                                                                                                      \
+
-			.data = value, .min = min_value, .max = max_value                                                                                                  \
+struct config_item_string {
-		}                                                                                                                                                      \
+	char *data;
-	}
+	size_t size;
-#define CONF_STRING(key, value, len_value)                                                                                                                     \
+};
-	{                                                                                                                                                          \
+
-		key, conf_string, &(struct config_item_string)                                                                                                         \
+struct config_item_yesno {
-		{                                                                                                                                                      \
+	int *data;
-			.data = value, .size = len_value                                                                                                                   \
+};
-		}                                                                                                                                                      \
+
-	}
+struct config_item_size {
-#define CONF_YESNO(key, value)                                                                                                                                 \
+	size_t *data;
-	{                                                                                                                                                          \
+	size_t min;
-		key, conf_yesno, &(struct config_item_yesno)                                                                                                           \
+	size_t max;
-		{                                                                                                                                                      \
+};
-			.data = value                                                                                                                                      \
+
-		}                                                                                                                                                      \
+#define CONF_INT(key, value, min_value, max_value)                                                                                                             \
-	}
+	{                                                                                                                                                          \
-#define CONF_SIZE(key, value, min_value, max_value)                                                                                                            \
+		key, conf_int, &(struct config_item_int)                                                                                                               \
-	{                                                                                                                                                          \
+		{                                                                                                                                                      \
-		key, conf_size, &(struct config_item_size)                                                                                                             \
+			.data = value, .min = min_value, .max = max_value                                                                                                  \
-		{                                                                                                                                                      \
+		}                                                                                                                                                      \
-			.data = value, .min = min_value, .max = max_value                                                                                                  \
+	}
-		}                                                                                                                                                      \
+#define CONF_STRING(key, value, len_value)                                                                                                                     \
-	}
+	{                                                                                                                                                          \
-/*
+		key, conf_string, &(struct config_item_string)                                                                                                         \
- * func: int (*func)(void *data, int argc, char *argv[]);
+		{                                                                                                                                                      \
- */
+			.data = value, .size = len_value                                                                                                                   \
-#define CONF_CUSTOM(key, func, data)                                                                                                                           \
+		}                                                                                                                                                      \
-	{                                                                                                                                                          \
+	}
-		key, conf_custom, &(struct config_item_custom)                                                                                                         \
+#define CONF_YESNO(key, value)                                                                                                                                 \
-		{                                                                                                                                                      \
+	{                                                                                                                                                          \
-			.custom_data = data, .custom_func = func                                                                                                           \
+		key, conf_yesno, &(struct config_item_yesno)                                                                                                           \
-		}                                                                                                                                                      \
+		{                                                                                                                                                      \
-	}
+			.data = value                                                                                                                                      \
-
+		}                                                                                                                                                      \
-#define CONF_END()                                                                                                                                             \
+	}
-	{                                                                                                                                                          \
+#define CONF_SIZE(key, value, min_value, max_value)                                                                                                            \
-		NULL, NULL, NULL                                                                                                                                                \
+	{                                                                                                                                                          \
-	}
+		key, conf_size, &(struct config_item_size)                                                                                                             \
-
+		{                                                                                                                                                      \
-extern int conf_custom(const char *item, void *data, int argc, char *argv[]);
+			.data = value, .min = min_value, .max = max_value                                                                                                  \
-
+		}                                                                                                                                                      \
-extern int conf_int(const char *item, void *data, int argc, char *argv[]);
+	}
-
+/*
-extern int conf_string(const char *item, void *data, int argc, char *argv[]);
+ * func: int (*func)(void *data, int argc, char *argv[]);
-
+ */
-extern int conf_yesno(const char *item, void *data, int argc, char *argv[]);
+#define CONF_CUSTOM(key, func, data)                                                                                                                           \
-
+	{                                                                                                                                                          \
-extern int conf_size(const char *item, void *data, int argc, char *argv[]);
+		key, conf_custom, &(struct config_item_custom)                                                                                                         \
-
+		{                                                                                                                                                      \
-/*
+			.custom_data = data, .custom_func = func                                                                                                           \
- * Example:
+		}                                                                                                                                                      \
- *  int num = 0;
+	}
- *
+
- *  struct config_item itmes [] = {
+#define CONF_END()                                                                                                                                             \
- *       CONF_INT("CONF_NUM", &num, -1, 10),
+	{                                                                                                                                                          \
- *       CONF_END();
+		NULL, NULL, NULL                                                                                                                                                \
- *  }
+	}
- *
+
- *  load_conf(file, items);
+extern int conf_custom(const char *item, void *data, int argc, char *argv[]);
- *
+
- */
+extern int conf_int(const char *item, void *data, int argc, char *argv[]);
-
+
-typedef int(conf_error_handler)(const char *file, int lineno, int ret);
+extern int conf_string(const char *item, void *data, int argc, char *argv[]);
-
+
-int load_conf(const char *file, struct config_item items[], conf_error_handler handler);
+extern int conf_yesno(const char *item, void *data, int argc, char *argv[]);
-
+
-void load_exit(void);
+extern int conf_size(const char *item, void *data, int argc, char *argv[]);
-
+
-const char *conf_get_conf_file(void);
+/*
-
+ * Example:
-#endif // !_GENERIC_CONF_H
+ *  int num = 0;
+ *
+ *  struct config_item itmes [] = {
+ *       CONF_INT("CONF_NUM", &num, -1, 10),
+ *       CONF_END();
+ *  }
+ *
+ *  load_conf(file, items);
+ *
+ */
+
+typedef int(conf_error_handler)(const char *file, int lineno, int ret);
+
+int load_conf(const char *file, struct config_item items[], conf_error_handler handler);
+
+void load_exit(void);
+
+const char *conf_get_conf_file(void);
+
+#endif // !_GENERIC_CONF_H

src/include/findbit.h

@@ -1,5 +1,24 @@
-#ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_
+/*************************************************************************
-#define _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _TOOLS_GENERIC_BITOPS_FIND_H_
+#define _TOOLS_GENERIC_BITOPS_FIND_H_
 
 #ifndef find_next_bit
 /**
@@ -74,4 +93,4 @@ extern unsigned long find_first_bit(const unsigned long *addr,
 unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size);
 #endif
 
-#endif /*_TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_ */
+#endif /*_TOOLS_GENERIC_BITOPS_FIND_H_ */

src/include/gcc_builtin.h

@@ -1,3 +1,22 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #ifndef _TOOLS_LINUX_COMPILER_H_
 #define _TOOLS_LINUX_COMPILER_H_
 

src/include/hash.h

@@ -1,3 +1,22 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #ifndef _GENERIC_HASH_H
 #define _GENERIC_HASH_H
 

src/include/hashtable.h

@@ -1,6 +1,19 @@
-/*
+/*************************************************************************
- * Statically sized hash table implementation
+ *
- * (C) 2012  Sasha Levin <levinsasha928@gmail.com>
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GENERIC_HASHTABLE_H

src/include/jhash.h

@@ -1,3 +1,21 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef _JHASH_H
 #define _JHASH_H
 

src/include/list.h

@@ -1,3 +1,20 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef _GENERIC_LIST_H
 #define _GENERIC_LIST_H

src/include/radix.h

@@ -1,162 +1,162 @@
-/*
+/*
- * Copyright (c) 1999-2000
+ * Copyright (c) 1999-2000
- * 
+ * 
- * The Regents of the University of Michigan ("The Regents") and
+ * The Regents of the University of Michigan ("The Regents") and
- * Merit Network, Inc. All rights reserved.  Redistribution and use
+ * Merit Network, Inc. All rights reserved.  Redistribution and use
- * in source and binary forms, with or without modification, are
+ * in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * permitted provided that the following conditions are met:
- * 
+ * 
- * 1. Redistributions of source code must retain the above 
+ * 1. Redistributions of source code must retain the above 
- * copyright notice, this list of conditions and the 
+ * copyright notice, this list of conditions and the 
- * following disclaimer.
+ * following disclaimer.
- * 
+ * 
- * 2. Redistributions in binary form must reproduce the above 
+ * 2. Redistributions in binary form must reproduce the above 
- * copyright notice, this list of conditions and the 
+ * copyright notice, this list of conditions and the 
- * following disclaimer in the documentation and/or other 
+ * following disclaimer in the documentation and/or other 
- * materials provided with the distribution.
+ * materials provided with the distribution.
- * 
+ * 
- * 3. All advertising materials mentioning features or use of 
+ * 3. All advertising materials mentioning features or use of 
- * this software must display the following acknowledgement:
+ * this software must display the following acknowledgement:
- * 
+ * 
- *   This product includes software developed by the University of
+ *   This product includes software developed by the University of
- *   Michigan, Merit Network, Inc., and their contributors.
+ *   Michigan, Merit Network, Inc., and their contributors.
- * 
+ * 
- * 4. Neither the name of the University, Merit Network, nor the
+ * 4. Neither the name of the University, Merit Network, nor the
- * names of their contributors may be used to endorse or 
+ * names of their contributors may be used to endorse or 
- * promote products derived from this software without 
+ * promote products derived from this software without 
- * specific prior written permission.
+ * specific prior written permission.
- * 
+ * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS"
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TH E REGENTS
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TH E REGENTS
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HO WEVER CAUSED
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HO WEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-/*
+/*
- * Portions Copyright (c) 2004,2005 Damien Miller <djm@mindrot.org>
+ * Portions Copyright (c) 2004,2005 Damien Miller <djm@mindrot.org>
- *
+ *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
+ * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * copyright notice and this permission notice appear in all copies.
- *
+ *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
+ */
-
+
-/* $Id: radix.h,v 1.9 2007/10/24 06:03:08 djm Exp $ */
+/* $Id: radix.h,v 1.9 2007/10/24 06:03:08 djm Exp $ */
-
+
-#ifndef _RADIX_H
+#ifndef _RADIX_H
-#define _RADIX_H
+#define _RADIX_H
-
+
-#if defined(_MSC_VER)
+#if defined(_MSC_VER)
-#include <winsock2.h>
+#include <winsock2.h>
-#include <ws2tcpip.h>
+#include <ws2tcpip.h>
-#else
+#else
-# include <sys/types.h>
+# include <sys/types.h>
-# include <sys/socket.h>
+# include <sys/socket.h>
-# include <netinet/in.h>
+# include <netinet/in.h>
-# include <arpa/inet.h>
+# include <arpa/inet.h>
-# include <netdb.h>
+# include <netdb.h>
-#endif
+#endif
-
+
-#if defined(_MSC_VER)
+#if defined(_MSC_VER)
-# define snprintf _snprintf
+# define snprintf _snprintf
-typedef unsigned __int8		u_int8_t;
+typedef unsigned __int8		u_int8_t;
-typedef unsigned __int16	u_int16_t;
+typedef unsigned __int16	u_int16_t;
-typedef unsigned __int32	u_int32_t;
+typedef unsigned __int32	u_int32_t;
-const char *inet_ntop(int af, const void *src, char *dst, size_t size);
+const char *inet_ntop(int af, const void *src, char *dst, size_t size);
-size_t strlcpy(char *dst, const char *src, size_t size);
+size_t strlcpy(char *dst, const char *src, size_t size);
-#endif
+#endif
-
+
-/*
+/*
- * Originally from MRT include/mrt.h
+ * Originally from MRT include/mrt.h
- * $MRTId: mrt.h,v 1.1.1.1 2000/08/14 18:46:10 labovit Exp $
+ * $MRTId: mrt.h,v 1.1.1.1 2000/08/14 18:46:10 labovit Exp $
- */
+ */
-typedef struct _prefix_t {
+typedef struct _prefix_t {
-	u_int family;			/* AF_INET | AF_INET6 */
+	u_int family;			/* AF_INET | AF_INET6 */
-	u_int bitlen;			/* same as mask? */
+	u_int bitlen;			/* same as mask? */
-	int ref_count;			/* reference count */
+	int ref_count;			/* reference count */
-	union {
+	union {
-		struct in_addr sin;
+		struct in_addr sin;
-		struct in6_addr sin6;
+		struct in6_addr sin6;
-	} add;
+	} add;
-} prefix_t;
+} prefix_t;
-
+
-void Deref_Prefix(prefix_t *prefix);
+void Deref_Prefix(prefix_t *prefix);
-
+
-/*
+/*
- * Originally from MRT include/radix.h
+ * Originally from MRT include/radix.h
- * $MRTId: radix.h,v 1.1.1.1 2000/08/14 18:46:10 labovit Exp $
+ * $MRTId: radix.h,v 1.1.1.1 2000/08/14 18:46:10 labovit Exp $
- */
+ */
-typedef struct _radix_node_t {
+typedef struct _radix_node_t {
-	u_int bit;			/* flag if this node used */
+	u_int bit;			/* flag if this node used */
-	prefix_t *prefix;		/* who we are in radix tree */
+	prefix_t *prefix;		/* who we are in radix tree */
-	struct _radix_node_t *l, *r;	/* left and right children */
+	struct _radix_node_t *l, *r;	/* left and right children */
-	struct _radix_node_t *parent;	/* may be used */
+	struct _radix_node_t *parent;	/* may be used */
-	void *data;			/* pointer to data */
+	void *data;			/* pointer to data */
-} radix_node_t;
+} radix_node_t;
-
+
-typedef struct _radix_tree_t {
+typedef struct _radix_tree_t {
-	radix_node_t *head;
+	radix_node_t *head;
-	u_int maxbits;			/* for IP, 32 bit addresses */
+	u_int maxbits;			/* for IP, 32 bit addresses */
-	int num_active_node;		/* for debug purpose */
+	int num_active_node;		/* for debug purpose */
-} radix_tree_t;
+} radix_tree_t;
-
+
-/* Type of callback function */
+/* Type of callback function */
-typedef void (*rdx_cb_t)(radix_node_t *, void *);
+typedef void (*rdx_cb_t)(radix_node_t *, void *);
-
+
-radix_tree_t *New_Radix(void);
+radix_tree_t *New_Radix(void);
-void Destroy_Radix(radix_tree_t *radix, rdx_cb_t func, void *cbctx);
+void Destroy_Radix(radix_tree_t *radix, rdx_cb_t func, void *cbctx);
-radix_node_t *radix_lookup(radix_tree_t *radix, prefix_t *prefix);
+radix_node_t *radix_lookup(radix_tree_t *radix, prefix_t *prefix);
-void radix_remove(radix_tree_t *radix, radix_node_t *node);
+void radix_remove(radix_tree_t *radix, radix_node_t *node);
-radix_node_t *radix_search_exact(radix_tree_t *radix, prefix_t *prefix);
+radix_node_t *radix_search_exact(radix_tree_t *radix, prefix_t *prefix);
-radix_node_t *radix_search_best(radix_tree_t *radix, prefix_t *prefix);
+radix_node_t *radix_search_best(radix_tree_t *radix, prefix_t *prefix);
-void radix_process(radix_tree_t *radix, rdx_cb_t func, void *cbctx);
+void radix_process(radix_tree_t *radix, rdx_cb_t func, void *cbctx);
-
+
-#define RADIX_MAXBITS 128
+#define RADIX_MAXBITS 128
-
+
-#define RADIX_WALK(Xhead, Xnode) \
+#define RADIX_WALK(Xhead, Xnode) \
-	do { \
+	do { \
-		radix_node_t *Xstack[RADIX_MAXBITS+1]; \
+		radix_node_t *Xstack[RADIX_MAXBITS+1]; \
-		radix_node_t **Xsp = Xstack; \
+		radix_node_t **Xsp = Xstack; \
-		radix_node_t *Xrn = (Xhead); \
+		radix_node_t *Xrn = (Xhead); \
-		while ((Xnode = Xrn)) { \
+		while ((Xnode = Xrn)) { \
-			if (Xnode->prefix)
+			if (Xnode->prefix)
-
+
-#define RADIX_WALK_END \
+#define RADIX_WALK_END \
-			if (Xrn->l) { \
+			if (Xrn->l) { \
-				if (Xrn->r) { \
+				if (Xrn->r) { \
-					*Xsp++ = Xrn->r; \
+					*Xsp++ = Xrn->r; \
-				} \
+				} \
-				Xrn = Xrn->l; \
+				Xrn = Xrn->l; \
-			} else if (Xrn->r) { \
+			} else if (Xrn->r) { \
-				Xrn = Xrn->r; \
+				Xrn = Xrn->r; \
-			} else if (Xsp != Xstack) { \
+			} else if (Xsp != Xstack) { \
-				Xrn = *(--Xsp); \
+				Xrn = *(--Xsp); \
-			} else { \
+			} else { \
-				Xrn = (radix_node_t *) 0; \
+				Xrn = (radix_node_t *) 0; \
-			} \
+			} \
-		} \
+		} \
-	} while (0)
+	} while (0)
-
+
-/* Local additions */
+/* Local additions */
-
+
-prefix_t *prefix_pton(const char *string, long len, prefix_t *prefix, const char **errmsg);
+prefix_t *prefix_pton(const char *string, long len, prefix_t *prefix, const char **errmsg);
-prefix_t *prefix_from_blob(unsigned char *blob, int len, int prefixlen, prefix_t *prefix);
+prefix_t *prefix_from_blob(unsigned char *blob, int len, int prefixlen, prefix_t *prefix);
-const char *prefix_addr_ntop(prefix_t *prefix, char *buf, size_t len);
+const char *prefix_addr_ntop(prefix_t *prefix, char *buf, size_t len);
-const char *prefix_ntop(prefix_t *prefix, char *buf, size_t len);
+const char *prefix_ntop(prefix_t *prefix, char *buf, size_t len);
-
+
-#endif /* _RADIX_H */
+#endif /* _RADIX_H */
-
+

src/include/rbtree.h

@@ -1,288 +1,305 @@
-
+/*************************************************************************
-#ifndef _GENERIC_RBTREE_H
+ *
-#define _GENERIC_RBTREE_H
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-
+ *
-#include <stddef.h>
+ * smartdns is free software: you can redistribute it and/or modify
-
+ * it under the terms of the GNU General Public License as published by
-struct rb_node {
+ * the Free Software Foundation, either version 3 of the License, or
-	unsigned long __rb_parent_color;
+ * (at your option) any later version.
-	struct rb_node *rb_right;
+ *
-	struct rb_node *rb_left;
+ * smartdns is distributed in the hope that it will be useful,
-} __attribute__((aligned(sizeof(long))));
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* The alignment might seem pointless, but allegedly CRIS needs it */
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
+ * GNU General Public License for more details.
-struct rb_root {
+ *
-	struct rb_node *rb_node;
+ * You should have received a copy of the GNU General Public License
-};
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+ */
-#define rb_parent(r) ((struct rb_node *)((r)->__rb_parent_color & ~3))
+
-
+#ifndef _GENERIC_RBTREE_H
-#define RB_ROOT                                                                                                                                                \
+#define _GENERIC_RBTREE_H
-	(struct rb_root)                                                                                                                                           \
+
-	{                                                                                                                                                          \
+#include <stddef.h>
-		NULL,                                                                                                                                                  \
+
-	}
+struct rb_node {
-#define rb_entry(ptr, type, member) container_of(ptr, type, member)
+	unsigned long __rb_parent_color;
-
+	struct rb_node *rb_right;
-#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL)
+	struct rb_node *rb_left;
-
+} __attribute__((aligned(sizeof(long))));
-/* 'empty' nodes are nodes that are known not to be inserted in an rbtree */
+/* The alignment might seem pointless, but allegedly CRIS needs it */
-#define RB_EMPTY_NODE(node) ((node)->__rb_parent_color == (unsigned long)(node))
+
-#define RB_CLEAR_NODE(node) ((node)->__rb_parent_color = (unsigned long)(node))
+struct rb_root {
-
+	struct rb_node *rb_node;
-extern void rb_insert_color(struct rb_node *, struct rb_root *);
+};
-extern void rb_erase(struct rb_node *, struct rb_root *);
+
-
+#define rb_parent(r) ((struct rb_node *)((r)->__rb_parent_color & ~3))
-/* Find logical next and previous nodes in a tree */
+
-extern struct rb_node *rb_next(const struct rb_node *);
+#define RB_ROOT                                                                                                                                                \
-extern struct rb_node *rb_prev(const struct rb_node *);
+	(struct rb_root)                                                                                                                                           \
-extern struct rb_node *rb_first(const struct rb_root *);
+	{                                                                                                                                                          \
-extern struct rb_node *rb_last(const struct rb_root *);
+		NULL,                                                                                                                                                  \
-
+	}
-/* Postorder iteration - always visit the parent after its children */
+#define rb_entry(ptr, type, member) container_of(ptr, type, member)
-extern struct rb_node *rb_first_postorder(const struct rb_root *);
+
-extern struct rb_node *rb_next_postorder(const struct rb_node *);
+#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL)
-
+
-/* Fast replacement of a single node without remove/rebalance/add/rebalance */
+/* 'empty' nodes are nodes that are known not to be inserted in an rbtree */
-extern void rb_replace_node(struct rb_node *victim, struct rb_node *new_node, struct rb_root *root);
+#define RB_EMPTY_NODE(node) ((node)->__rb_parent_color == (unsigned long)(node))
-
+#define RB_CLEAR_NODE(node) ((node)->__rb_parent_color = (unsigned long)(node))
-static inline void rb_link_node(struct rb_node *node, struct rb_node *parent, struct rb_node **rb_link)
+
-{
+extern void rb_insert_color(struct rb_node *, struct rb_root *);
-	node->__rb_parent_color = (unsigned long)parent;
+extern void rb_erase(struct rb_node *, struct rb_root *);
-	node->rb_left = node->rb_right = NULL;
+
-
+/* Find logical next and previous nodes in a tree */
-	*rb_link = node;
+extern struct rb_node *rb_next(const struct rb_node *);
-}
+extern struct rb_node *rb_prev(const struct rb_node *);
-
+extern struct rb_node *rb_first(const struct rb_root *);
-#define rb_entry_safe(ptr, type, member)                                                                                                                       \
+extern struct rb_node *rb_last(const struct rb_root *);
-	({                                                                                                                                                         \
+
-		typeof(ptr) ____ptr = (ptr);                                                                                                                           \
+/* Postorder iteration - always visit the parent after its children */
-		____ptr ? rb_entry(____ptr, type, member) : NULL;                                                                                                      \
+extern struct rb_node *rb_first_postorder(const struct rb_root *);
-	})
+extern struct rb_node *rb_next_postorder(const struct rb_node *);
-
+
-/*
+/* Fast replacement of a single node without remove/rebalance/add/rebalance */
- * Handy for checking that we are not deleting an entry that is
+extern void rb_replace_node(struct rb_node *victim, struct rb_node *new_node, struct rb_root *root);
- * already in a list, found in block/{blk-throttle,cfq-iosched}.c,
+
- * probably should be moved to lib/rbtree.c...
+static inline void rb_link_node(struct rb_node *node, struct rb_node *parent, struct rb_node **rb_link)
- */
+{
-static inline void rb_erase_init(struct rb_node *n, struct rb_root *root)
+	node->__rb_parent_color = (unsigned long)parent;
-{
+	node->rb_left = node->rb_right = NULL;
-	rb_erase(n, root);
+
-	RB_CLEAR_NODE(n);
+	*rb_link = node;
-}
+}
-
+
-
+#define rb_entry_safe(ptr, type, member)                                                                                                                       \
-/*
+	({                                                                                                                                                         \
- * Please note - only struct rb_augment_callbacks and the prototypes for
+		typeof(ptr) ____ptr = (ptr);                                                                                                                           \
- * rb_insert_augmented() and rb_erase_augmented() are intended to be public.
+		____ptr ? rb_entry(____ptr, type, member) : NULL;                                                                                                      \
- * The rest are implementation details you are not expected to depend on.
+	})
- *
+
- * See Documentation/rbtree.txt for documentation and samples.
+/*
- */
+ * Handy for checking that we are not deleting an entry that is
-
+ * already in a list, found in block/{blk-throttle,cfq-iosched}.c,
-struct rb_augment_callbacks {
+ * probably should be moved to lib/rbtree.c...
-	void (*propagate)(struct rb_node *node, struct rb_node *stop);
+ */
-	void (*copy)(struct rb_node *old_node, struct rb_node *new_node);
+static inline void rb_erase_init(struct rb_node *n, struct rb_root *root)
-	void (*rotate)(struct rb_node *old_node, struct rb_node *new_node);
+{
-};
+	rb_erase(n, root);
-
+	RB_CLEAR_NODE(n);
-extern void __rb_insert_augmented(struct rb_node *node, struct rb_root *root,
+}
-	void (*augment_rotate)(struct rb_node *old_node, struct rb_node *new_node));
+
-/*
+
- * Fixup the rbtree and update the augmented information when rebalancing.
+/*
- *
+ * Please note - only struct rb_augment_callbacks and the prototypes for
- * On insertion, the user must update the augmented information on the path
+ * rb_insert_augmented() and rb_erase_augmented() are intended to be public.
- * leading to the inserted node, then call rb_link_node() as usual and
+ * The rest are implementation details you are not expected to depend on.
- * rb_augment_inserted() instead of the usual rb_insert_color() call.
+ *
- * If rb_augment_inserted() rebalances the rbtree, it will callback into
+ * See Documentation/rbtree.txt for documentation and samples.
- * a user provided function to update the augmented information on the
+ */
- * affected subtrees.
+
- */
+struct rb_augment_callbacks {
-static inline void
+	void (*propagate)(struct rb_node *node, struct rb_node *stop);
-rb_insert_augmented(struct rb_node *node, struct rb_root *root,
+	void (*copy)(struct rb_node *old_node, struct rb_node *new_node);
-		    const struct rb_augment_callbacks *augment)
+	void (*rotate)(struct rb_node *old_node, struct rb_node *new_node);
-{
+};
-	__rb_insert_augmented(node, root, augment->rotate);
+
-}
+extern void __rb_insert_augmented(struct rb_node *node, struct rb_root *root,
-
+	void (*augment_rotate)(struct rb_node *old_node, struct rb_node *new_node));
-#define RB_DECLARE_CALLBACKS(rbstatic, rbname, rbstruct, rbfield,	\
+/*
-			     rbtype, rbaugmented, rbcompute)		\
+ * Fixup the rbtree and update the augmented information when rebalancing.
-static inline void							\
+ *
-rbname ## _propagate(struct rb_node *rb, struct rb_node *stop)		\
+ * On insertion, the user must update the augmented information on the path
-{									\
+ * leading to the inserted node, then call rb_link_node() as usual and
-	while (rb != stop) {						\
+ * rb_augment_inserted() instead of the usual rb_insert_color() call.
-		rbstruct *node = rb_entry(rb, rbstruct, rbfield);	\
+ * If rb_augment_inserted() rebalances the rbtree, it will callback into
-		rbtype augmented = rbcompute(node);			\
+ * a user provided function to update the augmented information on the
-		if (node->rbaugmented == augmented)			\
+ * affected subtrees.
-			break;						\
+ */
-		node->rbaugmented = augmented;				\
+static inline void
-		rb = rb_parent(&node->rbfield);				\
+rb_insert_augmented(struct rb_node *node, struct rb_root *root,
-	}								\
+		    const struct rb_augment_callbacks *augment)
-}									\
+{
-static inline void							\
+	__rb_insert_augmented(node, root, augment->rotate);
-rbname ## _copy(struct rb_node *rb_old, struct rb_node *rb_new)		\
+}
-{									\
+
-	rbstruct *old_node = rb_entry(rb_old, rbstruct, rbfield);		\
+#define RB_DECLARE_CALLBACKS(rbstatic, rbname, rbstruct, rbfield,	\
-	rbstruct *new_node = rb_entry(rb_new, rbstruct, rbfield);		\
+			     rbtype, rbaugmented, rbcompute)		\
-	new_node->rbaugmented = old_node->rbaugmented;				\
+static inline void							\
-}									\
+rbname ## _propagate(struct rb_node *rb, struct rb_node *stop)		\
-static void								\
+{									\
-rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new)	\
+	while (rb != stop) {						\
-{									\
+		rbstruct *node = rb_entry(rb, rbstruct, rbfield);	\
-	rbstruct *old_node = rb_entry(rb_old, rbstruct, rbfield);		\
+		rbtype augmented = rbcompute(node);			\
-	rbstruct *new_node = rb_entry(rb_new, rbstruct, rbfield);		\
+		if (node->rbaugmented == augmented)			\
-	new_node->rbaugmented = old_node->rbaugmented;				\
+			break;						\
-	old_node->rbaugmented = rbcompute(old_node);				\
+		node->rbaugmented = augmented;				\
-}									\
+		rb = rb_parent(&node->rbfield);				\
-rbstatic const struct rb_augment_callbacks rbname = {			\
+	}								\
-	rbname ## _propagate, rbname ## _copy, rbname ## _rotate	\
+}									\
-};
+static inline void							\
-
+rbname ## _copy(struct rb_node *rb_old, struct rb_node *rb_new)		\
-
+{									\
-#define	RB_RED		0
+	rbstruct *old_node = rb_entry(rb_old, rbstruct, rbfield);		\
-#define	RB_BLACK	1
+	rbstruct *new_node = rb_entry(rb_new, rbstruct, rbfield);		\
-
+	new_node->rbaugmented = old_node->rbaugmented;				\
-#define __rb_parent(pc)    ((struct rb_node *)(pc & ~3))
+}									\
-
+static void								\
-#define __rb_color(pc)     ((pc) & 1)
+rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new)	\
-#define __rb_is_black(pc)  __rb_color(pc)
+{									\
-#define __rb_is_red(pc)    (!__rb_color(pc))
+	rbstruct *old_node = rb_entry(rb_old, rbstruct, rbfield);		\
-#define rb_color(rb)       __rb_color((rb)->__rb_parent_color)
+	rbstruct *new_node = rb_entry(rb_new, rbstruct, rbfield);		\
-#define rb_is_red(rb)      __rb_is_red((rb)->__rb_parent_color)
+	new_node->rbaugmented = old_node->rbaugmented;				\
-#define rb_is_black(rb)    __rb_is_black((rb)->__rb_parent_color)
+	old_node->rbaugmented = rbcompute(old_node);				\
-
+}									\
-static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
+rbstatic const struct rb_augment_callbacks rbname = {			\
-{
+	rbname ## _propagate, rbname ## _copy, rbname ## _rotate	\
-	rb->__rb_parent_color = rb_color(rb) | (unsigned long)p;
+};
-}
+
-
+
-static inline void rb_set_parent_color(struct rb_node *rb,
+#define	RB_RED		0
-				       struct rb_node *p, int color)
+#define	RB_BLACK	1
-{
+
-	rb->__rb_parent_color = (unsigned long)p | color;
+#define __rb_parent(pc)    ((struct rb_node *)(pc & ~3))
-}
+
-
+#define __rb_color(pc)     ((pc) & 1)
-static inline void
+#define __rb_is_black(pc)  __rb_color(pc)
-__rb_change_child(struct rb_node *old_node, struct rb_node *new_node,
+#define __rb_is_red(pc)    (!__rb_color(pc))
-		  struct rb_node *parent, struct rb_root *root)
+#define rb_color(rb)       __rb_color((rb)->__rb_parent_color)
-{
+#define rb_is_red(rb)      __rb_is_red((rb)->__rb_parent_color)
-	if (parent) {
+#define rb_is_black(rb)    __rb_is_black((rb)->__rb_parent_color)
-		if (parent->rb_left == old_node)
+
-			parent->rb_left = new_node;
+static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
-		else
+{
-			parent->rb_right = new_node;
+	rb->__rb_parent_color = rb_color(rb) | (unsigned long)p;
-	} else
+}
-		root->rb_node = new_node;
+
-}
+static inline void rb_set_parent_color(struct rb_node *rb,
-
+				       struct rb_node *p, int color)
-extern void __rb_erase_color(struct rb_node *parent, struct rb_root *root,
+{
-	void (*augment_rotate)(struct rb_node *old_node, struct rb_node *new_node));
+	rb->__rb_parent_color = (unsigned long)p | color;
-
+}
-static inline struct rb_node *
+
-__rb_erase_augmented(struct rb_node *node, struct rb_root *root,
+static inline void
-		     const struct rb_augment_callbacks *augment)
+__rb_change_child(struct rb_node *old_node, struct rb_node *new_node,
-{
+		  struct rb_node *parent, struct rb_root *root)
-	struct rb_node *child = node->rb_right, *tmp = node->rb_left;
+{
-	struct rb_node *parent, *rebalance;
+	if (parent) {
-	unsigned long pc;
+		if (parent->rb_left == old_node)
-
+			parent->rb_left = new_node;
-	if (!tmp) {
+		else
-		/*
+			parent->rb_right = new_node;
-		 * Case 1: node to erase has no more than 1 child (easy!)
+	} else
-		 *
+		root->rb_node = new_node;
-		 * Note that if there is one child it must be red due to 5)
+}
-		 * and node must be black due to 4). We adjust colors locally
+
-		 * so as to bypass __rb_erase_color() later on.
+extern void __rb_erase_color(struct rb_node *parent, struct rb_root *root,
-		 */
+	void (*augment_rotate)(struct rb_node *old_node, struct rb_node *new_node));
-		pc = node->__rb_parent_color;
+
-		parent = __rb_parent(pc);
+static inline struct rb_node *
-		__rb_change_child(node, child, parent, root);
+__rb_erase_augmented(struct rb_node *node, struct rb_root *root,
-		if (child) {
+		     const struct rb_augment_callbacks *augment)
-			child->__rb_parent_color = pc;
+{
-			rebalance = NULL;
+	struct rb_node *child = node->rb_right, *tmp = node->rb_left;
-		} else
+	struct rb_node *parent, *rebalance;
-			rebalance = __rb_is_black(pc) ? parent : NULL;
+	unsigned long pc;
-		tmp = parent;
+
-	} else if (!child) {
+	if (!tmp) {
-		/* Still case 1, but this time the child is node->rb_left */
+		/*
-		tmp->__rb_parent_color = pc = node->__rb_parent_color;
+		 * Case 1: node to erase has no more than 1 child (easy!)
-		parent = __rb_parent(pc);
+		 *
-		__rb_change_child(node, tmp, parent, root);
+		 * Note that if there is one child it must be red due to 5)
-		rebalance = NULL;
+		 * and node must be black due to 4). We adjust colors locally
-		tmp = parent;
+		 * so as to bypass __rb_erase_color() later on.
-	} else {
+		 */
-		struct rb_node *successor = child, *child2;
+		pc = node->__rb_parent_color;
-		tmp = child->rb_left;
+		parent = __rb_parent(pc);
-		if (!tmp) {
+		__rb_change_child(node, child, parent, root);
-			/*
+		if (child) {
-			 * Case 2: node's successor is its right child
+			child->__rb_parent_color = pc;
-			 *
+			rebalance = NULL;
-			 *    (n)          (s)
+		} else
-			 *    / \          / \
+			rebalance = __rb_is_black(pc) ? parent : NULL;
-			 *  (x) (s)  ->  (x) (c)
+		tmp = parent;
-			 *        \
+	} else if (!child) {
-			 *        (c)
+		/* Still case 1, but this time the child is node->rb_left */
-			 */
+		tmp->__rb_parent_color = pc = node->__rb_parent_color;
-			parent = successor;
+		parent = __rb_parent(pc);
-			child2 = successor->rb_right;
+		__rb_change_child(node, tmp, parent, root);
-			augment->copy(node, successor);
+		rebalance = NULL;
-		} else {
+		tmp = parent;
-			/*
+	} else {
-			 * Case 3: node's successor is leftmost under
+		struct rb_node *successor = child, *child2;
-			 * node's right child subtree
+		tmp = child->rb_left;
-			 *
+		if (!tmp) {
-			 *    (n)          (s)
+			/*
-			 *    / \          / \
+			 * Case 2: node's successor is its right child
-			 *  (x) (y)  ->  (x) (y)
+			 *
-			 *      /            /
+			 *    (n)          (s)
-			 *    (p)          (p)
+			 *    / \          / \
-			 *    /            /
+			 *  (x) (s)  ->  (x) (c)
-			 *  (s)          (c)
+			 *        \
-			 *    \
+			 *        (c)
-			 *    (c)
+			 */
-			 */
+			parent = successor;
-			do {
+			child2 = successor->rb_right;
-				parent = successor;
+			augment->copy(node, successor);
-				successor = tmp;
+		} else {
-				tmp = tmp->rb_left;
+			/*
-			} while (tmp);
+			 * Case 3: node's successor is leftmost under
-			parent->rb_left = child2 = successor->rb_right;
+			 * node's right child subtree
-			successor->rb_right = child;
+			 *
-			rb_set_parent(child, successor);
+			 *    (n)          (s)
-			augment->copy(node, successor);
+			 *    / \          / \
-			augment->propagate(parent, successor);
+			 *  (x) (y)  ->  (x) (y)
-		}
+			 *      /            /
-
+			 *    (p)          (p)
-		successor->rb_left = tmp = node->rb_left;
+			 *    /            /
-		rb_set_parent(tmp, successor);
+			 *  (s)          (c)
-
+			 *    \
-		pc = node->__rb_parent_color;
+			 *    (c)
-		tmp = __rb_parent(pc);
+			 */
-		__rb_change_child(node, successor, tmp, root);
+			do {
-		if (child2) {
+				parent = successor;
-			successor->__rb_parent_color = pc;
+				successor = tmp;
-			rb_set_parent_color(child2, parent, RB_BLACK);
+				tmp = tmp->rb_left;
-			rebalance = NULL;
+			} while (tmp);
-		} else {
+			parent->rb_left = child2 = successor->rb_right;
-			unsigned long pc2 = successor->__rb_parent_color;
+			successor->rb_right = child;
-			successor->__rb_parent_color = pc;
+			rb_set_parent(child, successor);
-			rebalance = __rb_is_black(pc2) ? parent : NULL;
+			augment->copy(node, successor);
-		}
+			augment->propagate(parent, successor);
-		tmp = successor;
+		}
-	}
+
-
+		successor->rb_left = tmp = node->rb_left;
-	augment->propagate(tmp, NULL);
+		rb_set_parent(tmp, successor);
-	return rebalance;
+
-}
+		pc = node->__rb_parent_color;
-
+		tmp = __rb_parent(pc);
-static inline void
+		__rb_change_child(node, successor, tmp, root);
-rb_erase_augmented(struct rb_node *node, struct rb_root *root,
+		if (child2) {
-		   const struct rb_augment_callbacks *augment)
+			successor->__rb_parent_color = pc;
-{
+			rb_set_parent_color(child2, parent, RB_BLACK);
-	struct rb_node *rebalance = __rb_erase_augmented(node, root, augment);
+			rebalance = NULL;
-	if (rebalance)
+		} else {
-		__rb_erase_color(rebalance, root, augment->rotate);
+			unsigned long pc2 = successor->__rb_parent_color;
-}
+			successor->__rb_parent_color = pc;
-
+			rebalance = __rb_is_black(pc2) ? parent : NULL;
-#endif /* _GENERIC_RBTREE_H */
+		}
-
+		tmp = successor;
+	}
+
+	augment->propagate(tmp, NULL);
+	return rebalance;
+}
+
+static inline void
+rb_erase_augmented(struct rb_node *node, struct rb_root *root,
+		   const struct rb_augment_callbacks *augment)
+{
+	struct rb_node *rebalance = __rb_erase_augmented(node, root, augment);
+	if (rebalance)
+		__rb_erase_color(rebalance, root, augment->rotate);
+}
+
+#endif /* _GENERIC_RBTREE_H */
+

src/include/stringutil.h

@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _GENERIC_STRING_UITL_H
+#define _GENERIC_STRING_UITL_H
+
+#include <stddef.h>
+#include <string.h>
+
+static inline char *safe_strncpy(char *dest, const char *src, size_t n) 
+{
+#if __GNUC__  > 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
+	char *ret = strncpy(dest, src, n - 1);
+    if (n > 0) {
+	    dest[n - 1] = '\0';
+    }
+#if __GNUC__  > 7
+#pragma GCC diagnostic pop
+#endif
+	return ret;
+}
+
+
+#endif

src/lib/bitops.c

@@ -1,3 +1,20 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "bitmap.h"
 #include "bitops.h"

src/lib/conf.c

@@ -1,292 +1,311 @@
-#include "conf.h"
+/*************************************************************************
-#include <getopt.h>
+ *
-#include <stdio.h>
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
-#include <stdlib.h>
+ *
-#include <string.h>
+ * smartdns is free software: you can redistribute it and/or modify
-#include <unistd.h>
+ * it under the terms of the GNU General Public License as published by
-
+ * the Free Software Foundation, either version 3 of the License, or
-static const char *currrent_conf_file = NULL;
+ * (at your option) any later version.
-
+ *
-const char *conf_get_conf_file(void)
+ * smartdns is distributed in the hope that it will be useful,
-{
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	return currrent_conf_file;
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-}
+ * GNU General Public License for more details.
-
+ *
-int conf_custom(const char *item, void *data, int argc, char *argv[])
+ * You should have received a copy of the GNU General Public License
-{
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	struct config_item_custom *item_custom = data;
+ */
-	return item_custom->custom_func(item_custom->custom_data, argc, argv);
+
-}
+#include "conf.h"
-
+#include <getopt.h>
-int conf_int(const char *item, void *data, int argc, char *argv[])
+#include <stdio.h>
-{
+#include <stdlib.h>
-	struct config_item_int *item_int = data;
+#include <string.h>
-	int value = 0;
+#include <unistd.h>
-	if (argc < 2) {
+
-		return -1;
+static const char *currrent_conf_file = NULL;
-	}
+
-
+const char *conf_get_conf_file(void)
-	value = atoi(argv[1]);
+{
-
+	return currrent_conf_file;
-	if (value < item_int->min) {
+}
-		value = item_int->min;
+
-	} else if (value > item_int->max) {
+int conf_custom(const char *item, void *data, int argc, char *argv[])
-		value = item_int->max;
+{
-	}
+	struct config_item_custom *item_custom = data;
-
+	return item_custom->custom_func(item_custom->custom_data, argc, argv);
-	*(item_int->data) = value;
+}
-
+
-	return 0;
+int conf_int(const char *item, void *data, int argc, char *argv[])
-}
+{
-
+	struct config_item_int *item_int = data;
-int conf_string(const char *item, void *data, int argc, char *argv[])
+	int value = 0;
-{
+	if (argc < 2) {
-	struct config_item_string *item_string = data;
+		return -1;
-
+	}
-	if (argc < 2) {
+
-		return -1;
+	value = atoi(argv[1]);
-	}
+
-
+	if (value < item_int->min) {
-	strncpy(item_string->data, argv[1], item_string->size);
+		value = item_int->min;
-
+	} else if (value > item_int->max) {
-	return 0;
+		value = item_int->max;
-}
+	}
-
+
-int conf_yesno(const char *item, void *data, int argc, char *argv[])
+	*(item_int->data) = value;
-{
+
-	struct config_item_yesno *item_yesno = data;
+	return 0;
-	int yes = 0;
+}
-
+
-	if (argc < 2) {
+int conf_string(const char *item, void *data, int argc, char *argv[])
-		return -1;
+{
-	}
+	struct config_item_string *item_string = data;
-
+
-	char *value = argv[1];
+	if (argc < 2) {
-	if (strncmp("auto", value, sizeof("auto")) == 0 || strncmp("AUTO", value, sizeof("AUTO")) == 0) {
+		return -1;
-		return 0;
+	}
-	}
+
-
+	strncpy(item_string->data, argv[1], item_string->size);
-	if (strncmp("yes", value, sizeof("yes")) == 0 || strncmp("YES", value, sizeof("YES")) == 0) {
+
-		yes = 1;
+	return 0;
-	} else if (strncmp("no", value, sizeof("no")) == 0 || strncmp("NO", value, sizeof("NO")) == 0) {
+}
-		yes = 0;
+
-	}
+int conf_yesno(const char *item, void *data, int argc, char *argv[])
-
+{
-	*(item_yesno->data) = yes;
+	struct config_item_yesno *item_yesno = data;
-
+	int yes = 0;
-	return 0;
+
-}
+	if (argc < 2) {
-
+		return -1;
-int conf_size(const char *item, void *data, int argc, char *argv[])
+	}
-{
+
-	/* read dns cache size */
+	char *value = argv[1];
-	int base = 1;
+	if (strncmp("auto", value, sizeof("auto")) == 0 || strncmp("AUTO", value, sizeof("AUTO")) == 0) {
-	size_t size = 0;
+		return 0;
-	int num = 0;
+	}
-	struct config_item_size *item_size = data;
+
-	char *value = argv[1];
+	if (strncmp("yes", value, sizeof("yes")) == 0 || strncmp("YES", value, sizeof("YES")) == 0) {
-
+		yes = 1;
-	if (strstr(value, "k") || strstr(value, "K")) {
+	} else if (strncmp("no", value, sizeof("no")) == 0 || strncmp("NO", value, sizeof("NO")) == 0) {
-		base = 1024;
+		yes = 0;
-	} else if (strstr(value, "m") || strstr(value, "M")) {
+	}
-		base = 1024 * 1024;
+
-	} else if (strstr(value, "g") || strstr(value, "G")) {
+	*(item_yesno->data) = yes;
-		base = 1024 * 1024 * 1024;
+
-	}
+	return 0;
-
+}
-	num = atoi(value);
+
-	if (num < 0) {
+int conf_size(const char *item, void *data, int argc, char *argv[])
-		return -1;
+{
-	}
+	/* read dns cache size */
-
+	int base = 1;
-	size = num * base;
+	size_t size = 0;
-	if (size > item_size->max) {
+	int num = 0;
-		size = item_size->max;
+	struct config_item_size *item_size = data;
-	} else if (size < item_size->min) {
+	char *value = argv[1];
-		size = item_size->min;
+
-	}
+	if (strstr(value, "k") || strstr(value, "K")) {
-
+		base = 1024;
-	*(item_size->data) = size;
+	} else if (strstr(value, "m") || strstr(value, "M")) {
-
+		base = 1024 * 1024;
-	return 0;
+	} else if (strstr(value, "g") || strstr(value, "G")) {
-}
+		base = 1024 * 1024 * 1024;
-
+	}
-void conf_getopt_reset(void)
+
-{
+	num = atoi(value);
-	static struct option long_options[] = {{"-", 0, 0, 0}, {0, 0, 0, 0}};
+	if (num < 0) {
-	int argc = 2;
+		return -1;
-	char *argv[3] = {"reset", "", 0};
+	}
-
+
-	optind = 1;
+	size = num * base;
-	opterr = 0;
+	if (size > item_size->max) {
-	getopt_long(argc, argv, "", long_options, NULL);
+		size = item_size->max;
-	optind = 1;
+	} else if (size < item_size->min) {
-	opterr = 0;
+		size = item_size->min;
-}
+	}
-
+
-int conf_parse_args(char *key, char *value, int *argc, char **argv)
+	*(item_size->data) = size;
-{
+
-	char *start = NULL;
+	return 0;
-	char *ptr = value;
+}
-	int count = 0;
+
-	int sep_flag = ' ';
+void conf_getopt_reset(void)
-
+{
-	argv[0] = key;
+	static struct option long_options[] = {{"-", 0, 0, 0}, {0, 0, 0, 0}};
-	count++;
+	int argc = 2;
-
+	char *argv[3] = {"reset", "", 0};
-	while (*ptr != '\0') {
+
-		if (*ptr == '\\') {
+	optind = 0;
-			char *tmp = ptr + 1;
+	opterr = 0;
-			while (*tmp != '\0') {
+	optopt = 0;
-				*(tmp - 1) = *tmp;
+	getopt_long(argc, argv, "", long_options, NULL);
-				tmp++;
+	optind = 0;
-			}
+	opterr = 0;
-			ptr++;
+	optopt = 0;
-			continue;
+}
-		}
+
-
+int conf_parse_args(char *key, char *value, int *argc, char **argv)
-		if (*ptr == '"' && start == NULL) {
+{
-			sep_flag = '"';
+	char *start = NULL;
-			start = NULL;
+	char *ptr = value;
-		}
+	int count = 0;
-
+	int sep_flag = ' ';
-		if (*ptr != sep_flag && start == NULL) {
+
-			start = ptr;
+	argv[0] = key;
-			ptr++;
+	count++;
-			continue;
+
-		}
+	while (*ptr != '\0') {
-
+		if (*ptr == '\\') {
-		if (*ptr == sep_flag && start == NULL) {
+			char *tmp = ptr + 1;
-			ptr++;
+			while (*tmp != '\0') {
-			continue;
+				*(tmp - 1) = *tmp;
-		}
+				tmp++;
-
+			}
-		if (*ptr == sep_flag && start) {
+			ptr++;
-			argv[count] = start;
+			continue;
-			*ptr = '\0';
+		}
-			ptr++;
+
-			start = ptr;
+		if (*ptr == '"' && start == NULL) {
-			count++;
+			sep_flag = '"';
-			sep_flag = ' ';
+			start = NULL;
-			start = NULL;
+		}
-			continue;
+
-		}
+		if (*ptr != sep_flag && start == NULL) {
-
+			start = ptr;
-		ptr++;
+			ptr++;
-	}
+			continue;
-
+		}
-	if (start != ptr && start) {
+
-		argv[count] = start;
+		if (*ptr == sep_flag && start == NULL) {
-		count++;
+			ptr++;
-	}
+			continue;
-
+		}
-	*argc = count;
+
-	argv[count + 1] = 0;
+		if (*ptr == sep_flag && start) {
-
+			argv[count] = start;
-	return 0;
+			*ptr = '\0';
-}
+			ptr++;
-
+			count++;
-void load_exit(void)
+			sep_flag = ' ';
-{
+			start = NULL;
-	return;
+			continue;
-}
+		}
-
+
-int load_conf_printf(const char *file, int lineno, int ret)
+		ptr++;
-{
+	}
-	if (ret != CONF_RET_OK) {
+
-		printf("process config file '%s' failed at line %d.", file, lineno);
+	if (start != ptr && start) {
-		if (ret == CONF_RET_ERR || ret == CONF_RET_NOENT) {
+		argv[count] = start;
-			return -1;
+		count++;
-		}
+	}
-
+
-		return 0;
+	*argc = count;
-	}
+	argv[count] = 0;
-
+
-	return 0;
+	return 0;
-}
+}
-
+
-int load_conf_file(const char *file, struct config_item *items, conf_error_handler handler)
+void load_exit(void)
-{
+{
-	FILE *fp = NULL;
+	return;
-	char line[MAX_LINE_LEN];
+}
-	char key[MAX_KEY_LEN];
+
-	char value[MAX_LINE_LEN];
+int load_conf_printf(const char *file, int lineno, int ret)
-	int filed_num = 0;
+{
-	int i;
+	if (ret != CONF_RET_OK) {
-	int argc;
+		printf("process config file '%s' failed at line %d.", file, lineno);
-	char *argv[1024];
+		if (ret == CONF_RET_ERR || ret == CONF_RET_NOENT) {
-	int ret = 0;
+			return -1;
-	int call_ret = 0;
+		}
-	int line_no = 0;
+
-
+		return 0;
-	if (handler == NULL) {
+	}
-		handler = load_conf_printf;
+
-	}
+	return 0;
-
+}
-	fp = fopen(file, "r");
+
-	if (fp == NULL) {
+int load_conf_file(const char *file, struct config_item *items, conf_error_handler handler)
-		return -1;
+{
-	}
+	FILE *fp = NULL;
-
+	char line[MAX_LINE_LEN];
-	line_no = 0;
+	char key[MAX_KEY_LEN];
-	while (fgets(line, MAX_LINE_LEN, fp)) {
+	char value[MAX_LINE_LEN];
-		line_no++;
+	int filed_num = 0;
-		filed_num = sscanf(line, "%63s %1023[^\r\n]s", key, value);
+	int i;
-		if (filed_num <= 0) {
+	int argc;
-			continue;
+	char *argv[1024];
-		}
+	int ret = 0;
-
+	int call_ret = 0;
-		/* comment, skip */
+	int line_no = 0;
-		if (key[0] == '#') {
+
-			continue;
+	if (handler == NULL) {
-		}
+		handler = load_conf_printf;
-
+	}
-		/* if field format is not key = value, error */
+
-		if (filed_num != 2) {
+	fp = fopen(file, "r");
-			goto errout;
+	if (fp == NULL) {
-		}
+		return -1;
-
+	}
-		for (i = 0;; i++) {
+
-			if (items[i].item == NULL) {
+	line_no = 0;
-				handler(file, line_no, CONF_RET_NOENT);
+	while (fgets(line, MAX_LINE_LEN, fp)) {
-				break;
+		line_no++;
-			}
+		filed_num = sscanf(line, "%63s %1023[^\r\n]s", key, value);
-
+		if (filed_num <= 0) {
-			if (strncmp(items[i].item, key, MAX_KEY_LEN) != 0) {
+			continue;
-				continue;
+		}
-			}
+
-
+		/* comment, skip */
-			if (conf_parse_args(key, value, &argc, argv) != 0) {
+		if (key[0] == '#') {
-				continue;
+			continue;
-			}
+		}
-
+
-			conf_getopt_reset();
+		/* if field format is not key = value, error */
-			/* call item function */
+		if (filed_num != 2) {
-			currrent_conf_file = file;
+			goto errout;
-			call_ret = items[i].item_func(items[i].item, items[i].data, argc, argv);
+		}
-			ret = handler(file, line_no, call_ret);
+
-			if (ret != 0) {
+		for (i = 0;; i++) {
-				conf_getopt_reset();
+			if (items[i].item == NULL) {
-				goto errout;
+				handler(file, line_no, CONF_RET_NOENT);
-			}
+				break;
-
+			}
-			conf_getopt_reset();
+
-
+			if (strncmp(items[i].item, key, MAX_KEY_LEN) != 0) {
-			break;
+				continue;
-		}
+			}
-	}
+
-
+			if (conf_parse_args(key, value, &argc, argv) != 0) {
-	fclose(fp);
+				continue;
-
+			}
-	return 0;
+
-errout:
+			conf_getopt_reset();
-	if (fp) {
+			/* call item function */
-		fclose(fp);
+			currrent_conf_file = file;
-	}
+			call_ret = items[i].item_func(items[i].item, items[i].data, argc, argv);
-	return -1;
+			ret = handler(file, line_no, call_ret);
-}
+			if (ret != 0) {
-
+				conf_getopt_reset();
-int load_conf(const char *file, struct config_item items[], conf_error_handler handler)
+				goto errout;
-{
+			}
-	return load_conf_file(file, items, handler);
+
-}
+			conf_getopt_reset();
+
+			break;
+		}
+	}
+
+	fclose(fp);
+
+	return 0;
+errout:
+	if (fp) {
+		fclose(fp);
+	}
+	return -1;
+}
+
+int load_conf(const char *file, struct config_item items[], conf_error_handler handler)
+{
+	return load_conf_file(file, items, handler);
+}

src/lib/stringutil.c

@@ -0,0 +1,17 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */

src/smartdns.c

@@ -1,423 +1,445 @@
-/*************************************************************************
+/*************************************************************************
- *
+ *
- * Copyright (C) 2018 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
- *
+ *
- * smartdns is free software: you can redistribute it and/or modify
+ * smartdns is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (at your option) any later version.
- *
+ *
- * smartdns is distributed in the hope that it will be useful,
+ * smartdns is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU General Public License for more details.
- *
+ *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+ */
-
+
-#define _GNU_SOURCE
+#define _GNU_SOURCE
-#include "art.h"
+#include "art.h"
-#include "atomic.h"
+#include "atomic.h"
-#include "dns_client.h"
+#include "dns_client.h"
-#include "dns_conf.h"
+#include "dns_conf.h"
-#include "dns_server.h"
+#include "dns_server.h"
-#include "fast_ping.h"
+#include "fast_ping.h"
-#include "hashtable.h"
+#include "hashtable.h"
-#include "list.h"
+#include "list.h"
-#include "rbtree.h"
+#include "rbtree.h"
-#include "tlog.h"
+#include "tlog.h"
-#include "util.h"
+#include "util.h"
-#include <errno.h>
+#include <errno.h>
-#include <fcntl.h>
+#include <fcntl.h>
-#include <libgen.h>
+#include <libgen.h>
-#include <openssl/err.h>
+#include <openssl/err.h>
-#include <openssl/ssl.h>
+#include <openssl/ssl.h>
-#include <signal.h>
+#include <signal.h>
-#include <stdio.h>
+#include <stdio.h>
-#include <stdlib.h>
+#include <stdlib.h>
-#include <string.h>
+#include <string.h>
-#include <sys/stat.h>
+#include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/types.h>
-#include <ucontext.h>
+#include <ucontext.h>
-
+
-#define RESOLVE_FILE "/etc/resolv.conf"
+#define RESOLVE_FILE "/etc/resolv.conf"
-#define MAX_LINE_LEN 1024
+#define MAX_LINE_LEN 1024
-#define MAX_KEY_LEN 64
+#define MAX_KEY_LEN 64
-#define SMARTDNS_PID_FILE "/var/run/smartdns.pid"
+#define SMARTDNS_PID_FILE "/var/run/smartdns.pid"
-#define TMP_BUFF_LEN_32 32
+#define TMP_BUFF_LEN_32 32
-
+
-static int verbose_screen;
+static int verbose_screen;
-
+
-static void _help(void)
+static void _help(void)
-{
+{
-	/* clang-format off */
+	/* clang-format off */
-	char *help = ""
+	char *help = ""
-		"Usage: smartdns [OPTION]...\n"
+		"Usage: smartdns [OPTION]...\n"
-		"Start smartdns server.\n"
+		"Start smartdns server.\n"
-		"  -f            run forground.\n"
+		"  -f            run forground.\n"
-		"  -c [conf]     config file.\n"
+		"  -c [conf]     config file.\n"
-		"  -p [pid]      pid file path\n"
+		"  -p [pid]      pid file path\n"
-		"  -S            ignore segment fault signal.\n"
+		"  -S            ignore segment fault signal.\n"
-		"  -v            verbose screent.\n"
+		"  -x            verbose screen.\n"
-		"  -h            show this help message.\n"
+		"  -v            dispaly version.\n"
-
+		"  -h            show this help message.\n"
-		"Online help: http://pymumu.github.io/smartdns\n"
+
-		"Copyright (C) Nick Peng <pymumu@gmail.com>\n"
+		"Online help: http://pymumu.github.io/smartdns\n"
-		;
+		"Copyright (C) Nick Peng <pymumu@gmail.com>\n"
-	/* clang-format on */
+		;
-	printf("%s", help);
+	/* clang-format on */
-}
+	printf("%s", help);
-
+}
-static int _smartdns_load_from_resolv(void)
+
-{
+static void _show_version(void)
-	FILE *fp = NULL;
+{
-	char line[MAX_LINE_LEN];
+	char str_ver[256] = {0};
-	char key[MAX_KEY_LEN];
+#ifdef SMARTDNS_VERION
-	char value[MAX_LINE_LEN];
+	const char *ver = SMARTDNS_VERION;
-	char ns_ip[DNS_MAX_IPLEN];
+	snprintf(str_ver, sizeof(str_ver), "%s", ver);
-	int port = PORT_NOT_DEFINED;
+#else
-	int ret = -1;
+	struct tm tm;
-
+	get_compiled_time(&tm);
-	int filed_num = 0;
+	snprintf(str_ver, sizeof(str_ver), "1.%.4d%.2d%.2d-%.2d%.2d", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min);
-	int line_num = 0;
+#endif
-
+	printf("smartdns %s\n", str_ver);
-	fp = fopen(RESOLVE_FILE, "r");
+}
-	if (fp == NULL) {
+
-		tlog(TLOG_ERROR, "open %s failed, %s", RESOLVE_FILE, strerror(errno));
+static int _smartdns_load_from_resolv(void)
-		return -1;
+{
-	}
+	FILE *fp = NULL;
-
+	char line[MAX_LINE_LEN];
-	while (fgets(line, MAX_LINE_LEN, fp)) {
+	char key[MAX_KEY_LEN];
-		line_num++;
+	char value[MAX_LINE_LEN];
-		filed_num = sscanf(line, "%63s %1023[^\r\n]s", key, value);
+	char ns_ip[DNS_MAX_IPLEN];
-
+	int port = PORT_NOT_DEFINED;
-		if (filed_num != 2) {
+	int ret = -1;
-			continue;
+
-		}
+	int filed_num = 0;
-
+	int line_num = 0;
-		if (strncmp(key, "nameserver", MAX_KEY_LEN) != 0) {
+
-			continue;
+	fp = fopen(RESOLVE_FILE, "r");
-		}
+	if (fp == NULL) {
-
+		tlog(TLOG_ERROR, "open %s failed, %s", RESOLVE_FILE, strerror(errno));
-		if (parse_ip(value, ns_ip, &port) != 0) {
+		return -1;
-			continue;
+	}
-		}
+
-
+	while (fgets(line, MAX_LINE_LEN, fp)) {
-		if (port == PORT_NOT_DEFINED) {
+		line_num++;
-			port = DEFAULT_DNS_PORT;
+		filed_num = sscanf(line, "%63s %1023[^\r\n]s", key, value);
-		}
+
-
+		if (filed_num != 2) {
-		strncpy(dns_conf_servers[dns_conf_server_num].server, ns_ip, DNS_MAX_IPLEN);
+			continue;
-		dns_conf_servers[dns_conf_server_num].port = port;
+		}
-		dns_conf_servers[dns_conf_server_num].type = DNS_SERVER_UDP;
+
-		dns_conf_server_num++;
+		if (strncmp(key, "nameserver", MAX_KEY_LEN) != 0) {
-		ret = 0;
+			continue;
-	}
+		}
-
+
-	fclose(fp);
+		if (parse_ip(value, ns_ip, &port) != 0) {
-
+			continue;
-	return ret;
+		}
-}
+
-
+		if (port == PORT_NOT_DEFINED) {
-static int _smartdns_add_servers(void)
+			port = DEFAULT_DNS_PORT;
-{
+		}
-	int i = 0;
+
-	int j = 0;
+		safe_strncpy(dns_conf_servers[dns_conf_server_num].server, ns_ip, DNS_MAX_IPLEN);
-	int ret = 0;
+		dns_conf_servers[dns_conf_server_num].port = port;
-	struct dns_server_groups *group = NULL;
+		dns_conf_servers[dns_conf_server_num].type = DNS_SERVER_UDP;
-	struct dns_servers *server = NULL;
+		dns_conf_server_num++;
-	struct client_dns_server_flags flags;
+		ret = 0;
-
+	}
-	for (i = 0; i < dns_conf_server_num; i++) {
+
-		memset(&flags, 0, sizeof(flags));
+	fclose(fp);
-		switch (dns_conf_servers[i].type) {
+
-		case DNS_SERVER_UDP: {
+	return ret;
-			struct client_dns_server_flag_udp *flag_udp = &flags.udp;
+}
-			flag_udp->ttl = dns_conf_servers[i].ttl;
+
-		} break;
+static int _smartdns_add_servers(void)
-		case DNS_SERVER_HTTPS: {
+{
-			struct client_dns_server_flag_https *flag_http = &flags.https;
+	int i = 0;
-			flag_http->spi_len = dns_client_spki_decode(dns_conf_servers[i].spki, (unsigned char *)flag_http->spki);
+	int j = 0;
-			strncpy(flag_http->hostname, dns_conf_servers[i].hostname, sizeof(flag_http->hostname));
+	int ret = 0;
-			strncpy(flag_http->path, dns_conf_servers[i].path, sizeof(flag_http->path));
+	struct dns_server_groups *group = NULL;
-			strncpy(flag_http->httphost, dns_conf_servers[i].httphost, sizeof(flag_http->httphost));
+	struct dns_servers *server = NULL;
-		} break;
+	struct client_dns_server_flags flags;
-		case DNS_SERVER_TLS: {
+
-			struct client_dns_server_flag_tls *flag_tls = &flags.tls;
+	for (i = 0; i < dns_conf_server_num; i++) {
-			flag_tls->spi_len = dns_client_spki_decode(dns_conf_servers[i].spki, (unsigned char *)flag_tls->spki);
+		memset(&flags, 0, sizeof(flags));
-			strncpy(flag_tls->hostname, dns_conf_servers[i].hostname, sizeof(flag_tls->hostname));
+		switch (dns_conf_servers[i].type) {
-		} break;
+		case DNS_SERVER_UDP: {
-			break;
+			struct client_dns_server_flag_udp *flag_udp = &flags.udp;
-		case DNS_SERVER_TCP:
+			flag_udp->ttl = dns_conf_servers[i].ttl;
-			break;
+		} break;
-		default:
+		case DNS_SERVER_HTTPS: {
-			return -1;
+			struct client_dns_server_flag_https *flag_http = &flags.https;
-			break;
+			flag_http->spi_len = dns_client_spki_decode(dns_conf_servers[i].spki, (unsigned char *)flag_http->spki);
-		}
+			safe_strncpy(flag_http->hostname, dns_conf_servers[i].hostname, sizeof(flag_http->hostname));
-
+			safe_strncpy(flag_http->path, dns_conf_servers[i].path, sizeof(flag_http->path));
-		flags.type = dns_conf_servers[i].type;
+			safe_strncpy(flag_http->httphost, dns_conf_servers[i].httphost, sizeof(flag_http->httphost));
-		flags.server_flag = dns_conf_servers[i].server_flag;
+			safe_strncpy(flag_http->tls_host_verify, dns_conf_servers[i].tls_host_verify, sizeof(flag_http->tls_host_verify));
-		flags.result_flag = dns_conf_servers[i].result_flag;
+		} break;
-		ret = dns_client_add_server(dns_conf_servers[i].server, dns_conf_servers[i].port, dns_conf_servers[i].type, &flags);
+		case DNS_SERVER_TLS: {
-		if (ret != 0) {
+			struct client_dns_server_flag_tls *flag_tls = &flags.tls;
-			tlog(TLOG_ERROR, "add server failed, %s:%d", dns_conf_servers[i].server, dns_conf_servers[i].port);
+			flag_tls->spi_len = dns_client_spki_decode(dns_conf_servers[i].spki, (unsigned char *)flag_tls->spki);
-			return -1;
+			safe_strncpy(flag_tls->hostname, dns_conf_servers[i].hostname, sizeof(flag_tls->hostname));
-		}
+			safe_strncpy(flag_tls->tls_host_verify, dns_conf_servers[i].tls_host_verify, sizeof(flag_tls->tls_host_verify));
-	}
+		} break;
-
+		case DNS_SERVER_TCP:
-	hash_for_each(dns_group_table.group, i, group, node)
+			break;
-	{
+		default:
-		ret = dns_client_add_group(group->group_name);
+			return -1;
-		if (ret != 0) {
+			break;
-			tlog(TLOG_ERROR, "add group failed, %s", group->group_name);
+		}
-			return -1;
+
-		}
+		flags.type = dns_conf_servers[i].type;
-
+		flags.server_flag = dns_conf_servers[i].server_flag;
-		for (j = 0; j < group->server_num; j++) {
+		flags.result_flag = dns_conf_servers[i].result_flag;
-			server = group->servers[j];
+		ret = dns_client_add_server(dns_conf_servers[i].server, dns_conf_servers[i].port, dns_conf_servers[i].type, &flags);
-			if (server == NULL) {
+		if (ret != 0) {
-				continue;
+			tlog(TLOG_ERROR, "add server failed, %s:%d", dns_conf_servers[i].server, dns_conf_servers[i].port);
-			}
+			return -1;
-			ret = dns_client_add_to_group(group->group_name, server->server, server->port, server->type);
+		}
-			if (ret != 0) {
+	}
-				tlog(TLOG_ERROR, "add server %s to group %s failed", server->server, group->group_name);
+
-				return -1;
+	hash_for_each(dns_group_table.group, i, group, node)
-			}
+	{
-		}
+		ret = dns_client_add_group(group->group_name);
-	}
+		if (ret != 0) {
-
+			tlog(TLOG_ERROR, "add group failed, %s", group->group_name);
-	return 0;
+			return -1;
-}
+		}
-
+
-static int _smartdns_set_ecs_ip(void)
+		for (j = 0; j < group->server_num; j++) {
-{
+			server = group->servers[j];
-	int ret = 0;
+			if (server == NULL) {
-	if (dns_conf_ipv4_ecs.enable) {
+				continue;
-		ret |= dns_client_set_ecs(dns_conf_ipv4_ecs.ip, dns_conf_ipv4_ecs.subnet);
+			}
-	}
+			ret = dns_client_add_to_group(group->group_name, server->server, server->port, server->type);
-
+			if (ret != 0) {
-	if (dns_conf_ipv6_ecs.enable) {
+				tlog(TLOG_ERROR, "add server %s to group %s failed", server->server, group->group_name);
-		ret |= dns_client_set_ecs(dns_conf_ipv6_ecs.ip, dns_conf_ipv6_ecs.subnet);
+				return -1;
-	}
+			}
-
+		}
-	return ret;
+	}
-}
+
-
+	return 0;
-static int _smartdns_init_ssl(void)
+}
-{
+
-	SSL_load_error_strings();
+static int _smartdns_set_ecs_ip(void)
-	SSL_library_init();
+{
-	OpenSSL_add_all_algorithms();
+	int ret = 0;
-	SSL_CRYPTO_thread_setup();
+	if (dns_conf_ipv4_ecs.enable) {
-
+		ret |= dns_client_set_ecs(dns_conf_ipv4_ecs.ip, dns_conf_ipv4_ecs.subnet);
-	return 0;
+	}
-}
+
-
+	if (dns_conf_ipv6_ecs.enable) {
-static int _smartdns_destroy_ssl(void)
+		ret |= dns_client_set_ecs(dns_conf_ipv6_ecs.ip, dns_conf_ipv6_ecs.subnet);
-{
+	}
-	SSL_CRYPTO_thread_cleanup();
+
-	ERR_free_strings();
+	return ret;
-	EVP_cleanup();
+}
-
+
-	return 0;
+static int _smartdns_init_ssl(void)
-}
+{
-
+#if OPENSSL_API_COMPAT < 0x10100000L
-static int _smartdns_init(void)
+	SSL_load_error_strings();
-{
+	SSL_library_init();
-	int ret;
+	OpenSSL_add_all_algorithms();
-	char *logfile = SMARTDNS_LOG_FILE;
+	SSL_CRYPTO_thread_setup();
-
+#endif
-	if (dns_conf_log_file[0] != 0) {
+	return 0;
-		logfile = dns_conf_log_file;
+}
-	}
+
-
+static int _smartdns_destroy_ssl(void)
-	ret = tlog_init(logfile, dns_conf_log_size, dns_conf_log_num, 1, 0, 0);
+{
-	if (ret != 0) {
+#if OPENSSL_API_COMPAT < 0x10100000L
-		tlog(TLOG_ERROR, "start tlog failed.\n");
+	SSL_CRYPTO_thread_cleanup();
-		goto errout;
+	ERR_free_strings();
-	}
+	EVP_cleanup();
-
+#endif
-	tlog_setlogscreen(verbose_screen);
+	return 0;
-	tlog_setlevel(dns_conf_log_level);
+}
-
+
-	tlog(TLOG_NOTICE, "smartdns starting...(Copyright (C) Nick Peng <pymumu@gmail.com>, build:%s %s)", __DATE__, __TIME__);
+static int _smartdns_init(void)
-
+{
-	if (_smartdns_init_ssl() != 0) {
+	int ret;
-		tlog(TLOG_ERROR, "init ssl failed.");
+	char *logfile = SMARTDNS_LOG_FILE;
-		goto errout;
+
-	}
+	if (dns_conf_log_file[0] != 0) {
-
+		logfile = dns_conf_log_file;
-	if (dns_conf_server_num <= 0) {
+	}
-		if (_smartdns_load_from_resolv() != 0) {
+
-			tlog(TLOG_ERROR, "load dns from resolv failed.");
+	ret = tlog_init(logfile, dns_conf_log_size, dns_conf_log_num, 0, 0);
-			goto errout;
+	if (ret != 0) {
-		}
+		tlog(TLOG_ERROR, "start tlog failed.\n");
-	}
+		goto errout;
-
+	}
-	ret = fast_ping_init();
+
-	if (ret != 0) {
+	tlog_setlogscreen(verbose_screen);
-		tlog(TLOG_ERROR, "start ping failed.\n");
+	tlog_setlevel(dns_conf_log_level);
-		goto errout;
+
-	}
+	tlog(TLOG_NOTICE, "smartdns starting...(Copyright (C) Nick Peng <pymumu@gmail.com>, build:%s %s)", __DATE__, __TIME__);
-
+
-	ret = dns_server_init();
+	if (_smartdns_init_ssl() != 0) {
-	if (ret != 0) {
+		tlog(TLOG_ERROR, "init ssl failed.");
-		tlog(TLOG_ERROR, "start dns server failed.\n");
+		goto errout;
-		goto errout;
+	}
-	}
+
-
+	if (dns_conf_server_num <= 0) {
-	ret = dns_client_init();
+		if (_smartdns_load_from_resolv() != 0) {
-	if (ret != 0) {
+			tlog(TLOG_ERROR, "load dns from resolv failed.");
-		tlog(TLOG_ERROR, "start dns client failed.\n");
+			goto errout;
-		goto errout;
+		}
-	}
+	}
-	ret = _smartdns_add_servers();
+
-	if (ret != 0) {
+	ret = fast_ping_init();
-		tlog(TLOG_ERROR, "add servers failed.");
+	if (ret != 0) {
-		goto errout;
+		tlog(TLOG_ERROR, "start ping failed.\n");
-	}
+		goto errout;
-
+	}
-	ret = _smartdns_set_ecs_ip();
+
-	if (ret != 0) {
+	ret = dns_server_init();
-		tlog(TLOG_WARN, "set ecs ip address failed.");
+	if (ret != 0) {
-	}
+		tlog(TLOG_ERROR, "start dns server failed.\n");
-
+		goto errout;
-	return 0;
+	}
-errout:
+
-
+	ret = dns_client_init();
-	return -1;
+	if (ret != 0) {
-}
+		tlog(TLOG_ERROR, "start dns client failed.\n");
-
+		goto errout;
-static int _smartdns_run(void)
+	}
-{
+	ret = _smartdns_add_servers();
-	return dns_server_run();
+	if (ret != 0) {
-}
+		tlog(TLOG_ERROR, "add servers failed.");
-
+		goto errout;
-static void _smartdns_exit(void)
+	}
-{
+
-	dns_server_exit();
+	ret = _smartdns_set_ecs_ip();
-	dns_client_exit();
+	if (ret != 0) {
-	fast_ping_exit();
+		tlog(TLOG_WARN, "set ecs ip address failed.");
-	_smartdns_destroy_ssl();
+	}
-	tlog_exit();
+
-	dns_server_load_exit();
+	return 0;
-}
+errout:
-
+
-static void _sig_exit(int signo)
+	return -1;
-{
+}
-	dns_server_stop();
+
-}
+static int _smartdns_run(void)
-
+{
-static void _sig_error_exit(int signo, siginfo_t *siginfo, void *ct)
+	return dns_server_run();
-{
+}
-	unsigned long PC = 0;
+
-	ucontext_t *context = ct;
+static void _smartdns_exit(void)
-#if defined(__i386__)
+{
-	int *pgregs = (int *)(&(context->uc_mcontext.gregs));
+	dns_server_exit();
-	PC = pgregs[REG_EIP];
+	dns_client_exit();
-#elif defined(__x86_64__)
+	fast_ping_exit();
-	int *pgregs = (int *)(&(context->uc_mcontext.gregs));
+	_smartdns_destroy_ssl();
-	PC = pgregs[REG_RIP];
+	tlog_exit();
-#elif defined(__arm__)
+	dns_server_load_exit();
-	PC = context->uc_mcontext.arm_pc;
+}
-#elif defined(__aarch64__)
+
-	PC = context->uc_mcontext.pc;
+static void _sig_exit(int signo)
-#elif defined(__mips__)
+{
-	PC = context->uc_mcontext.pc;
+	dns_server_stop();
-#endif
+}
-	tlog(TLOG_FATAL, "process exit with signal %d, code = %d, errno = %d, pid = %d, self = %d, pc = %#lx, addr = %#lx, build(%s %s)\n", signo, siginfo->si_code,
+
-		 siginfo->si_errno, siginfo->si_pid, getpid(), PC, (unsigned long)siginfo->si_addr, __DATE__, __TIME__);
+static void _sig_error_exit(int signo, siginfo_t *siginfo, void *ct)
-
+{
-	sleep(1);
+	unsigned long PC = 0;
-	_exit(0);
+	ucontext_t *context = ct;
-}
+#if defined(__i386__)
-
+	int *pgregs = (int *)(&(context->uc_mcontext.gregs));
-static int sig_list[] = {SIGSEGV, SIGABRT, SIGBUS, SIGILL, SIGFPE};
+	PC = pgregs[REG_EIP];
-
+#elif defined(__x86_64__)
-static int sig_num = sizeof(sig_list) / sizeof(int);
+	int *pgregs = (int *)(&(context->uc_mcontext.gregs));
-
+	PC = pgregs[REG_RIP];
-static void _reg_signal(void)
+#elif defined(__arm__)
-{
+	PC = context->uc_mcontext.arm_pc;
-	struct sigaction act, old;
+#elif defined(__aarch64__)
-	int i = 0;
+	PC = context->uc_mcontext.pc;
-	act.sa_sigaction = _sig_error_exit;
+#elif defined(__mips__)
-	sigemptyset(&act.sa_mask);
+	PC = context->uc_mcontext.pc;
-	act.sa_flags = SA_RESTART | SA_SIGINFO;
+#endif
-
+	tlog(TLOG_FATAL, "process exit with signal %d, code = %d, errno = %d, pid = %d, self = %d, pc = %#lx, addr = %#lx, build(%s %s)\n", signo, siginfo->si_code,
-	for (i = 0; i < sig_num; i++) {
+		 siginfo->si_errno, siginfo->si_pid, getpid(), PC, (unsigned long)siginfo->si_addr, __DATE__, __TIME__);
-		sigaction(sig_list[i], &act, &old);
+
-	}
+	sleep(1);
-}
+	_exit(0);
-
+}
-int main(int argc, char *argv[])
+
-{
+static int sig_list[] = {SIGSEGV, SIGABRT, SIGBUS, SIGILL, SIGFPE};
-	int ret;
+
-	int is_forground = 0;
+static int sig_num = sizeof(sig_list) / sizeof(int);
-	int opt;
+
-	char config_file[MAX_LINE_LEN];
+static void _reg_signal(void)
-	char pid_file[MAX_LINE_LEN];
+{
-	int signal_ignore = 0;
+	struct sigaction act, old;
-
+	int i = 0;
-	strncpy(config_file, SMARTDNS_CONF_FILE, MAX_LINE_LEN);
+	act.sa_sigaction = _sig_error_exit;
-	strncpy(pid_file, SMARTDNS_PID_FILE, MAX_LINE_LEN);
+	sigemptyset(&act.sa_mask);
-
+	act.sa_flags = SA_RESTART | SA_SIGINFO;
-	while ((opt = getopt(argc, argv, "fhc:p:Sv")) != -1) {
+
-		switch (opt) {
+	for (i = 0; i < sig_num; i++) {
-		case 'f':
+		sigaction(sig_list[i], &act, &old);
-			is_forground = 1;
+	}
-			break;
+}
-		case 'c':
+
-			snprintf(config_file, sizeof(config_file), "%s", optarg);
+int main(int argc, char *argv[])
-			break;
+{
-		case 'p':
+	int ret;
-			snprintf(pid_file, sizeof(pid_file), "%s", optarg);
+	int is_forground = 0;
-			break;
+	int opt;
-		case 'S':
+	char config_file[MAX_LINE_LEN];
-			signal_ignore = 1;
+	char pid_file[MAX_LINE_LEN];
-			break;
+	int signal_ignore = 0;
-		case 'v':
+
-			verbose_screen = 1;
+	safe_strncpy(config_file, SMARTDNS_CONF_FILE, MAX_LINE_LEN);
-			break;
+	safe_strncpy(pid_file, SMARTDNS_PID_FILE, MAX_LINE_LEN);
-		case 'h':
+
-			_help();
+	while ((opt = getopt(argc, argv, "fhc:p:Svx")) != -1) {
-			return 1;
+		switch (opt) {
-		}
+		case 'f':
-	}
+			is_forground = 1;
-
+			break;
-	if (is_forground == 0) {
+		case 'c':
-		if (daemon(0, 0) < 0) {
+			snprintf(config_file, sizeof(config_file), "%s", optarg);
-			fprintf(stderr, "run daemon process failed, %s\n", strerror(errno));
+			break;
-			return 1;
+		case 'p':
-		}
+			snprintf(pid_file, sizeof(pid_file), "%s", optarg);
-	}
+			break;
-
+		case 'S':
-	if (signal_ignore == 0) {
+			signal_ignore = 1;
-		_reg_signal();
+			break;
-	}
+		case 'x':
-
+			verbose_screen = 1;
-	if (dns_server_load_conf(config_file) != 0) {
+			break;
-		fprintf(stderr, "load config failed.\n");
+		case 'v':
-		goto errout;
+			_show_version();
-	}
+			return 0;
-
+			break;
-	if (create_pid_file(pid_file) != 0) {
+		case 'h':
-		goto errout;
+			_help();
-	}
+			return 1;
-
+		}
-	ret = _smartdns_init();
+	}
-	if (ret != 0) {
+
-		usleep(100000);
+	if (is_forground == 0) {
-		goto errout;
+		if (daemon(0, 0) < 0) {
-	}
+			fprintf(stderr, "run daemon process failed, %s\n", strerror(errno));
-
+			return 1;
-	signal(SIGINT, _sig_exit);
+		}
-	signal(SIGPIPE, SIG_IGN);
+	}
-	atexit(_smartdns_exit);
+
-
+	if (signal_ignore == 0) {
-	return _smartdns_run();
+		_reg_signal();
-
+	}
-errout:
+
-
+	if (create_pid_file(pid_file) != 0) {
-	return 1;
+		goto errout;
-}
+	}
+
+	if (dns_server_load_conf(config_file) != 0) {
+		fprintf(stderr, "load config failed.\n");
+		goto errout;
+	}
+
+	ret = _smartdns_init();
+	if (ret != 0) {
+		usleep(100000);
+		goto errout;
+	}
+
+	signal(SIGINT, _sig_exit);
+	signal(SIGPIPE, SIG_IGN);
+	atexit(_smartdns_exit);
+
+	return _smartdns_run();
+
+errout:
+
+	return 1;
+}

src/tlog.h

@@ -1,6 +1,6 @@
 /*
  * tinylog
- * Copyright (C) 2018 Ruilin Peng (Nick) <pymumu@gmail.com>
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>
  * https://github.com/pymumu/tinylog
  */
 
@@ -24,21 +24,44 @@ typedef enum {
 
 struct tlog_time {
     int year;
-    int mon;
+    unsigned int usec;
-    int mday;
+    unsigned char mon;
-    int hour;
+    unsigned char mday;
-    int min;
+    unsigned char hour;
-    int sec;
+    unsigned char min;
-    int usec;
+    unsigned char sec;
-};
+} __attribute__((packed));
+
+#ifndef TLOG_MAX_LINE_LEN
+#define TLOG_MAX_LINE_LEN (1024)
+#endif
+
+/* TLOG FLAGS LIST */
+/* set tlog not compress file when archive */
+#define TLOG_NOCOMPRESS (1 << 0)
+
+/* Set the segmentation mode to process the log, Used by the callback function to return a full log*/
+#define TLOG_SEGMENT (1 << 1)
+
+/*
+ multiwrite: enable multi process write mode.
+            NOTICE: maxlogsize in all prcesses must be same when enable this mode.
+ */
+#define TLOG_MULTI_WRITE (1 << 2)
+
+/* Not Block if buffer is insufficient. */
+#define TLOG_NONBLOCK (1 << 3)
+
+/* enable log to screen */
+#define TLOG_SCREEN (1 << 4)
 
 struct tlog_info {
-    const char *level;
+    tlog_level level;
     const char *file;
     const char *func;
     int line;
     struct tlog_time time;
-};
+} __attribute__((packed));
 
 /*
 Function: Print log
@@ -51,9 +74,12 @@ format: Log formats
 #define tlog(level, format, ...) tlog_ext(level, BASE_FILE_NAME, __LINE__, __func__, NULL, format, ##__VA_ARGS__)
 
 extern int tlog_ext(tlog_level level, const char *file, int line, const char *func, void *userptr, const char *format, ...)
-    __attribute__((format(printf, 6, 7)));
+    __attribute__((format(printf, 6, 7))) __attribute__((nonnull (6)));
 extern int tlog_vext(tlog_level level, const char *file, int line, const char *func, void *userptr, const char *format, va_list ap);
 
+/* write buff to log file */
+extern int tlog_write_log(char *buff, int bufflen);
+
 /* set log level */
 extern int tlog_setlevel(tlog_level level);
 
@@ -63,17 +89,18 @@ extern void tlog_setlogscreen(int enable);
 /* enalbe early log to screen */
 extern void tlog_set_early_printf(int enable);
 
+/* Get log level in string */
+extern const char *tlog_get_level_string(tlog_level level);
+
 /*
 Function: Initialize log module
 logfile: log file.
 maxlogsize: The maximum size of a single log file.
 maxlogcount: Number of archived logs.
-block: Blocked if buffer is not sufficient.
 buffsize: Buffer size, zero for default (128K)
-multiwrite: enable multi process write mode.
+flag: read tlog flags
-            NOTICE: maxlogsize in all prcesses must be same when enable this mode.
  */
-extern int tlog_init(const char *logfile, int maxlogsize, int maxlogcount, int block, int buffsize, int multiwrite);
+extern int tlog_init(const char *logfile, int maxlogsize, int maxlogcount, int buffsize, unsigned int flag);
 
 /* flush pending log message, and exit tlog */
 extern void tlog_exit(void);
@@ -89,6 +116,12 @@ read _tlog_format for example.
 typedef int (*tlog_format_func)(char *buff, int maxlen, struct tlog_info *info, void *userptr, const char *format, va_list ap);
 extern int tlog_reg_format_func(tlog_format_func func);
 
+/* register log output callback 
+ Note: info is invalid when flag TLOG_SEGMENT is not set.
+ */
+typedef int (*tlog_log_output_func)(struct tlog_info *info, char *buff, int bufflen, void *private_data);
+extern int tlog_reg_log_output_func(tlog_log_output_func output, void *private_data);
+
 struct tlog_log;
 typedef struct tlog_log tlog_log;
 /*
@@ -96,15 +129,16 @@ Function: open a new log stream, handler should close by tlog_close
 logfile: log file.
 maxlogsize: The maximum size of a single log file.
 maxlogcount: Number of archived logs.
-block: Blocked if buffer is not sufficient.
 buffsize: Buffer size, zero for default (128K)
-multiwrite: enable multi process write mode.
+flag: read tlog flags
-            NOTICE: maxlogsize in all prcesses must be same when enable this mode.
-
 return: log stream handler.
  */
-extern tlog_log *tlog_open(const char *logfile, int maxlogsize, int maxlogcount, int block, int buffsize, int multiwrite);
+extern tlog_log *tlog_open(const char *logfile, int maxlogsize, int maxlogcount, int buffsize, unsigned int flag);
 
+/* write buff to log file */
+extern int tlog_write(struct tlog_log *log, char *buff, int bufflen);
+
+/* close log stream */
 extern void tlog_close(tlog_log *log);
 
 /*
@@ -112,7 +146,7 @@ Function: Print log to log stream
 log: log stream
 format: Log formats
 */
-extern int tlog_printf(tlog_log *log, const char *format, ...) __attribute__((format(printf, 2, 3)));
+extern int tlog_printf(tlog_log *log, const char *format, ...) __attribute__((format(printf, 2, 3))) __attribute__((nonnull (1, 2)));
 
 /*
 Function: Print log to log stream with ap
@@ -125,6 +159,16 @@ extern int tlog_vprintf(tlog_log *log, const char *format, va_list ap);
 /* enalbe log to screen */
 extern void tlog_logscreen(tlog_log *log, int enable);
 
+/* register output callback */
+typedef int (*tlog_output_func)(struct tlog_log *log, char *buff, int bufflen);
+extern int tlog_reg_output_func(tlog_log *log, tlog_output_func output);
+
+/* set private data */
+extern void tlog_set_private(tlog_log *log, void *private_data);
+
+/* get private data */
+extern void *tlog_get_private(tlog_log *log);
+
 /* get local time */
 extern int tlog_localtime(struct tlog_time *tm);
 

src/util.c

@@ -1,3 +1,21 @@
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -7,9 +25,11 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/netlink.h>
+#include <linux/capability.h>
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
 #include <pthread.h>
+#include <netinet/tcp.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -17,6 +37,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include <sys/prctl.h>
 
 #define TMP_BUFF_LEN_32 32
 
@@ -65,6 +86,7 @@ struct ipset_netlink_msg {
 };
 
 static int ipset_fd;
+static int pidfile_fd;
 
 unsigned long get_tick_count(void)
 {
@@ -125,6 +147,7 @@ int getaddr_by_host(char *host, struct sockaddr *addr, socklen_t *addr_len)
 		result->ai_addrlen = *addr_len;
 	}
 
+	addr->sa_family = result->ai_family;
 	memcpy(addr, result->ai_addr, result->ai_addrlen);
 	*addr_len = result->ai_addrlen;
 
@@ -138,6 +161,75 @@ errout:
 	return -1;
 }
 
+int getsocknet_inet(int fd, struct sockaddr *addr, socklen_t *addr_len)
+{
+	struct sockaddr_storage addr_store;
+	socklen_t addr_store_len = sizeof(addr_store);
+	if (getsockname(fd, (struct sockaddr *)&addr_store, &addr_store_len) != 0) {
+		goto errout;
+	}
+
+	switch (addr_store.ss_family) {
+	case AF_INET: {
+		struct sockaddr_in *addr_in;
+		addr_in = (struct sockaddr_in *)addr;
+		addr_in->sin_family = AF_INET;
+		*addr_len = sizeof(struct sockaddr_in);
+		memcpy(addr, addr_in, sizeof(struct sockaddr_in));
+	} break;
+	case AF_INET6: {
+		struct sockaddr_in6 *addr_in6;
+		addr_in6 = (struct sockaddr_in6 *)addr;
+		if (IN6_IS_ADDR_V4MAPPED(&addr_in6->sin6_addr)) {
+			struct sockaddr_in addr_in4;
+			memset(&addr_in4, 0, sizeof(addr_in4));
+			memcpy(&addr_in4.sin_addr.s_addr, addr_in6->sin6_addr.s6_addr + 12, sizeof(addr_in4.sin_addr.s_addr));
+			addr_in4.sin_family = AF_INET;
+			addr_in4.sin_port = 0;
+			*addr_len = sizeof(struct sockaddr_in);
+			memcpy(addr, &addr_in4, sizeof(struct sockaddr_in));
+		} else {
+			addr_in6->sin6_family = AF_INET6;
+			*addr_len = sizeof(struct sockaddr_in6);
+			memcpy(addr, addr_in6, sizeof(struct sockaddr_in6));
+		}
+	} break;
+	default:
+		goto errout;
+		break;
+	}
+	return 0;
+errout:
+	return -1;
+}
+
+int fill_sockaddr_by_ip(unsigned char *ip, int ip_len, int port, struct sockaddr *addr, socklen_t *addr_len)
+{
+	if (ip == NULL || addr == NULL || addr_len == NULL) {
+		return -1;
+	}
+
+	if (ip_len == IPV4_ADDR_LEN) {
+		struct sockaddr_in *addr_in = NULL;
+		addr->sa_family = AF_INET;
+		addr_in = (struct sockaddr_in *)addr;
+		addr_in->sin_port = htons(port);
+		addr_in->sin_family = AF_INET;
+		memcpy(&addr_in->sin_addr.s_addr, ip, ip_len);
+		*addr_len = 16;
+	} else if (ip_len == IPV6_ADDR_LEN) {
+		struct sockaddr_in6 *addr_in6 = NULL;
+		addr->sa_family = AF_INET6;
+		addr_in6 = (struct sockaddr_in6 *)addr;
+		addr_in6->sin6_port = htons(port);
+		addr_in6->sin6_family = AF_INET6;
+		memcpy(addr_in6->sin6_addr.s6_addr, ip, ip_len);
+		*addr_len = 28;
+	}
+
+	return -1;
+}
+
 int parse_ip(const char *value, char *ip, int *port)
 {
 	int offset = 0;
@@ -327,7 +419,7 @@ int parse_uri(char *value, char *scheme, char *host, int *port, char *path)
 	process_ptr += field_len;
 
 	if (path) {
-		strcpy(path, process_ptr);
+		strncpy(path, process_ptr, PATH_MAX);
 	} 
 	return 0;
 }
@@ -350,7 +442,7 @@ int set_fd_nonblock(int fd, int nonblock)
 	return 0;
 }
 
-char *reverse_string(char *output, char *input, int len)
+char *reverse_string(char *output, const char *input, int len, int to_lower_case)
 {
 	char *begin = output;
 	if (len <= 0) {
@@ -361,6 +453,12 @@ char *reverse_string(char *output, char *input, int len)
 	len--;
 	while (len >= 0) {
 		*output = *(input + len);
+		if (to_lower_case) {
+			if (*output >= 'A' && *output <= 'Z') {
+				/* To lower case */
+         		*output = *output + 32;
+      		}
+		}
 		output++;
 		len--;
 	}
@@ -473,7 +571,7 @@ static int _ipset_operate(const char *ipsetname, const unsigned char addr[], int
 	nested[0]->len = (void *)buffer + NETLINK_ALIGN(netlink_head->nlmsg_len) - (void *)nested[0];
 
 	for (;;) {
-		rc = sendto(ipset_fd, buffer, netlink_head->nlmsg_len, 0, (struct sockaddr *)&snl, sizeof(snl));
+		rc = sendto(ipset_fd, buffer, netlink_head->nlmsg_len, 0, (const struct sockaddr *)&snl, sizeof(snl));
 		if (rc >= 0) {
 			break;
 		}
@@ -575,6 +673,12 @@ int create_pid_file(const char *pid_file)
 		goto errout;
 	}
 
+	if (pidfile_fd > 0) {
+		close(pidfile_fd);
+	}
+
+	pidfile_fd = fd;
+
 	return 0;
 errout:
 	if (fd > 0) {
@@ -583,6 +687,7 @@ errout:
 	return -1;
 }
 
+#if OPENSSL_API_COMPAT < 0x10100000
 #define THREAD_STACK_SIZE (16 * 1024)
 static pthread_mutex_t *lock_cs;
 static long *lock_count;
@@ -639,6 +744,7 @@ void SSL_CRYPTO_thread_cleanup(void)
 	OPENSSL_free(lock_cs);
 	OPENSSL_free(lock_count);
 }
+#endif
 
 #define SERVER_NAME_LEN 256
 #define TLS_HEADER_LEN 5
@@ -647,25 +753,10 @@ void SSL_CRYPTO_thread_cleanup(void)
 #ifndef MIN
 #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
 #endif
-typedef struct Protocol {
-    const char *const name;
-    const uint16_t default_port;
-    int (*const parse_packet)(const char*, size_t, char *, const char **);
-    const char *const abort_message;
-    const size_t abort_message_len;
-} protocol_t;
 
 static int parse_extensions(const char *, size_t, char *, const char **);
 static int parse_server_name_extension(const char *, size_t, char *, const char **);
 
-const struct Protocol *const tls_protocol;
-
-static const protocol_t tls_protocol_st = {
-	.default_port = 443,
-	.parse_packet = &parse_tls_header,
-};
-const protocol_t *const tls_protocol = &tls_protocol_st;
-
 /* Parse a TLS packet for the Server Name Indication extension in the client
  * hello handshake, returning the first servername found (pointer to static
  * array)
@@ -833,3 +924,47 @@ static int parse_server_name_extension(const char *data, size_t data_len, char *
 
 	return -2;
 }
+
+void get_compiled_time(struct tm *tm) 
+{ 
+    char s_month[5];
+    int month, day, year;
+	int hour, min, sec;
+    static const char *month_names = "JanFebMarAprMayJunJulAugSepOctNovDec";
+
+    sscanf(__DATE__, "%5s %d %d", s_month, &day, &year);
+    month = (strstr(month_names, s_month) - month_names) / 3;
+	sscanf(__TIME__, "%d:%d:%d", &hour, &min, &sec);
+    tm->tm_year = year - 1900;
+    tm->tm_mon = month;
+    tm->tm_mday = day;
+    tm->tm_isdst = -1;
+	tm->tm_hour = hour;
+	tm->tm_min = min;
+	tm->tm_sec = sec;
+}
+
+int has_network_raw_cap(void)
+{
+	int fd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+	if (fd < 0) {
+		return 0;
+	}
+
+	close(fd);
+	return 1;
+}
+
+int set_sock_keepalive(int fd, int keepidle, int keepinterval, int keepcnt)
+{
+	const int yes = 1;
+	if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &yes, sizeof(yes))!= 0) {
+		return -1;
+	}
+
+	setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &keepidle, sizeof(keepidle));
+	setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &keepinterval, sizeof(keepinterval));
+	setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &keepcnt, sizeof(keepcnt));
+
+	return 0;
+}

src/util.h

@@ -1,9 +1,42 @@
-
+/*************************************************************************
+ *
+ * Copyright (C) 2018-2020 Ruilin Peng (Nick) <pymumu@gmail.com>.
+ *
+ * smartdns is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * smartdns is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef SMART_DNS_UTIL_H
 #define SMART_DNS_UTIL_H
 
 #include <netdb.h>
+#include <time.h>
+#include "stringutil.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /*__cplusplus */
+
+#ifndef TCP_FASTOPEN_CONNECT
+#define TCP_FASTOPEN_CONNECT 30
+#endif
+#ifndef TCP_THIN_LINEAR_TIMEOUTS
+#define TCP_THIN_LINEAR_TIMEOUTS 16 
+#endif
+
+#ifndef TCP_THIN_DUPACK
+#define TCP_THIN_DUPACK		 17 
+#endif
 
 #define PORT_NOT_DEFINED -1
 #define MAX_IP_LEN 64
@@ -14,6 +47,10 @@ char *gethost_by_addr(char *host, int maxsize, struct sockaddr *addr);
 
 int getaddr_by_host(char *host, struct sockaddr *addr, socklen_t *addr_len);
 
+int getsocknet_inet(int fd, struct sockaddr *addr, socklen_t *addr_len);
+
+int fill_sockaddr_by_ip(unsigned char *ip, int ip_len, int port, struct sockaddr *addr, socklen_t *addr_len);
+
 int parse_ip(const char *value, char *ip, int *port);
 
 int check_is_ipaddr(const char *ip);
@@ -22,7 +59,7 @@ int parse_uri(char *value, char *scheme, char *host, int *port, char *path);
 
 int set_fd_nonblock(int fd, int nonblock);
 
-char *reverse_string(char *output, char *input, int len);
+char *reverse_string(char *output, const char *input, int len, int to_lower_case);
 
 void print_stack(void);
 
@@ -55,4 +92,13 @@ int create_pid_file(const char *pid_file);
  */
 int parse_tls_header(const char *data, size_t data_len, char *hostname, const char **hostname_ptr);
 
+void get_compiled_time(struct tm *tm);
+
+int has_network_raw_cap(void);
+
+int set_sock_keepalive(int fd, int keepidle, int keepinterval, int keepcnt);
+
+#ifdef __cplusplus
+}
+#endif /*__cplusplus */
 #endif