From 104418108a50f54f41845a16649cdf876e3cac6a Mon Sep 17 00:00:00 2001
From: Nick Peng <pymumu@gmail.com>
Date: Fri, 4 Jan 2019 20:25:18 +0800
Subject: [PATCH] Bugfix: restore configuration after disable

---
 package/openwrt/files/etc/init.d/smartdns | 27 ++++++++++++++++-------
 src/dns_client.c                          |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/package/openwrt/files/etc/init.d/smartdns b/package/openwrt/files/etc/init.d/smartdns
index ddbc095..11e55b8 100644
--- a/package/openwrt/files/etc/init.d/smartdns
+++ b/package/openwrt/files/etc/init.d/smartdns
@@ -46,6 +46,12 @@ 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`"
+	echo $OLD_SERVER | grep "^$addr" >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		return
+	fi
+
 	uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
 	addrlist="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
 	if [ -z "$addrlist" ] ; then
@@ -168,9 +174,9 @@ load_service() {
 	args=""
 
 	mkdir -p $SMARTDNS_VAR_CONF_DIR
+	rm -f $SMARTDNS_CONF_TMP
 
 	config_get_bool "enabled" "$section" "enabled" '0'
-	[ "$enabled" -gt 0 ] || return 1
 
 	config_get "server_name" "$section" "server_name" ""
 	if [ ! -z "$server_name" ]; then
@@ -248,8 +254,9 @@ load_service() {
 	config_get "redirect" "$section" "redirect" "none"
 	config_get "old_redirect" "$section" "old_redirect" "none"
 	config_get "old_port" "$section" "old_port" "0"
+	config_get "old_enabled" "$section" "old_enabled" "0"
 
-	if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$SMARTDNS_PORT" ]; then
+	if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$SMARTDNS_PORT" ] || [ "$old_enabled" = "1" ]; then
 		if [ "$old_redirect" != "none" ]; then
 			if [ "$old_port" != "0" ]; then
 				clear_iptable "$old_port" "$ipv6_server"
@@ -259,6 +266,16 @@ load_service() {
 			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
+	uci add_list smartdns.@smartdns[0].old_redirect="$redirect" 2>/dev/null
+	uci add_list smartdns.@smartdns[0].old_port="$SMARTDNS_PORT" 2>/dev/null
+	uci add_list smartdns.@smartdns[0].old_enabled="$enabled" 2>/dev/null
+	uci commit smartdns
+
+	[ "$enabled" -gt 0 ] || return 1
 
 	if [ "$redirect" = "redirect" ]; then
 		set_iptable $ipv6_server $tcp_server
@@ -266,12 +283,6 @@ load_service() {
 		set_forward_dnsmasq "$SMARTDNS_PORT"
 	fi
 
-	uci delete smartdns.@smartdns[0].old_redirect 2>/dev/null
-	uci delete smartdns.@smartdns[0].old_port 2>/dev/null
-	uci add_list smartdns.@smartdns[0].old_redirect="$redirect" 2>/dev/null
-	uci add_list smartdns.@smartdns[0].old_port="$SMARTDNS_PORT" 2>/dev/null
-	uci commit smartdns
-
 	config_foreach load_server "server"
 
 	echo "conf-file $ADDRESS_CONF" >> $SMARTDNS_CONF_TMP
diff --git a/src/dns_client.c b/src/dns_client.c
index 10c1054..f1ce9c5 100644
--- a/src/dns_client.c
+++ b/src/dns_client.c
@@ -240,7 +240,7 @@ void _dns_client_server_update_ttl(struct ping_host_struct *ping_host, const cha
 	}
 
 	double rtt = tv->tv_sec * 1000.0 + tv->tv_usec / 1000.0;
-	tlog(TLOG_INFO, "from %15s: seq=%d ttl=%d time=%.3f\n", host, seqno, ttl, rtt);
+	tlog(TLOG_DEBUG, "from %15s: seq=%d ttl=%d time=%.3f\n", host, seqno, ttl, rtt);
 	server_info->ttl = ttl;
 }