From aaa8dc97b4ce7a2283f1eddfc2e033c243be33c4 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sat, 13 Jul 2019 16:40:39 +0800
Subject: [PATCH] fix problems with DNS

---
 .../luasrc/controller/flowoffload.lua         |  2 +-
 .../root/etc/init.d/flowoffload               | 35 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua
index eb907166a1..883092cbc5 100755
--- a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua
+++ b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua
@@ -25,7 +25,7 @@ local function is_fullcone()
 end
 
 local function is_dns()
-	return luci.sys.call("[ `uci get flowoffload.@flow[0].dnscache_enable 2>/dev/null -ne 3` ] && pgrep dnscache >/dev/null || pgrep AdGuardHome >/dev/null") == 0
+	return luci.sys.call("[ `uci get flowoffload.@flow[0].dnscache_enable 2>/dev/null` -ne 3 ] && pgrep dnscache >/dev/null || pgrep AdGuardHome >/dev/null") == 0
 end
 
 local function is_ad()
diff --git a/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload b/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload
index 251beaeaa6..32b8f82e77 100755
--- a/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload
+++ b/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload
@@ -23,26 +23,26 @@ start_pdnsd() {
 	
 	cat > /var/etc/dnscache.conf <<EOF
 global {
-    perm_cache=1024;        # dns缓存大小，单位KB，建议不要写的太大
-    cache_dir="/var/dnscache";     # 缓存文件的位置
+    perm_cache=1024;        # dns缂撳瓨澶у皬锛屽崟浣岾B锛屽缓璁笉瑕佸啓鐨勫お澶�
+    cache_dir="/var/dnscache";     # 缂撳瓨鏂囦欢鐨勪綅缃�
     pid_file = /var/run/dnscache.pid;
-    server_ip = ${lan_addr};        # pdnsd监听的网卡，0.0.0.0是全部网卡
-    server_port=5333;           # pdnsd监听的端口，不要和别的服务冲突即可
+    server_ip = 127.0.0.1;        # pdnsd鐩戝惉鐨勭綉鍗★紝0.0.0.0鏄叏閮ㄧ綉鍗�
+    server_port=5333;           # pdnsd鐩戝惉鐨勭鍙ｏ紝涓嶈鍜屽埆鐨勬湇鍔″啿绐佸嵆鍙�
     status_ctl = on;
-    paranoid=on;                  # 二次请求模式，如果请求主DNS服务器返回的是垃圾地址，就向备用服务器请求
+    paranoid=on;                  # 浜屾璇锋眰妯″紡锛屽鏋滆姹備富DNS鏈嶅姟鍣ㄨ繑鍥炵殑鏄瀮鍦惧湴鍧�锛屽氨鍚戝鐢ㄦ湇鍔″櫒璇锋眰
     query_method=udp_only;      
     neg_domain_pol = off;  
-    par_queries = 400;          # 最多同时请求数
-    min_ttl = 1h;               # DNS结果最短缓存时间
-    max_ttl = 1w;               # DNS结果最长缓存时间
-    timeout = 10;               # DNS请求超时时间，单位秒
+    par_queries = 400;          # 鏈�澶氬悓鏃惰姹傛暟
+    min_ttl = 1h;               # DNS缁撴灉鏈�鐭紦瀛樻椂闂�
+    max_ttl = 1w;               # DNS缁撴灉鏈�闀跨紦瀛樻椂闂�
+    timeout = 10;               # DNS璇锋眰瓒呮椂鏃堕棿锛屽崟浣嶇
 }
 
 server {  
     label = "routine";         
-    ip = $DNS_SERVER;     # 这里为主要上级 dns 的 ip 地址，建议填写一个当地最快的DNS地址  
-    timeout = 5;              # DNS请求超时时间
-    reject = 74.125.127.102,  # 以下是脏IP，也就是DNS污染一般会返回的结果，如果收到如下DNS结果会触发二次请求（TCP协议一般不会碰到脏IP）
+    ip = $DNS_SERVER;     # 杩欓噷涓轰富瑕佷笂绾� dns 鐨� ip 鍦板潃锛屽缓璁～鍐欎竴涓綋鍦版渶蹇殑DNS鍦板潃  
+    timeout = 5;              # DNS璇锋眰瓒呮椂鏃堕棿
+    reject = 74.125.127.102,  # 浠ヤ笅鏄剰IP锛屼篃灏辨槸DNS姹℃煋涓�鑸細杩斿洖鐨勭粨鏋滐紝濡傛灉鏀跺埌濡備笅DNS缁撴灉浼氳Е鍙戜簩娆¤姹傦紙TCP鍗忚涓�鑸笉浼氱鍒拌剰IP锛�
         74.125.155.102,  
         74.125.39.102,  
         74.125.39.113,  
@@ -105,9 +105,9 @@ server {
 }
 
 server {  
-    label = "special";                  # 这个随便写  
-    ip = 117.50.10.10,52.80.52.52,119.29.29.29; # 这里为备用DNS服务器的 ip 地址  
-    port = 5353;                        # 推荐使用53以外的端口（DNS服务器必须支持） 
+    label = "special";                  # 杩欎釜闅忎究鍐�  
+    ip = 117.50.10.10,52.80.52.52,119.29.29.29; # 杩欓噷涓哄鐢―NS鏈嶅姟鍣ㄧ殑 ip 鍦板潃  
+    port = 5353;                        # 鎺ㄨ崘浣跨敤53浠ュ鐨勭鍙ｏ紙DNS鏈嶅姟鍣ㄥ繀椤绘敮鎸侊級 
     proxy_only = on;
     timeout = 5;  
 }  
@@ -138,10 +138,9 @@ start_dnsforwarder() {
 	IPV6DNS_SERVER=$(uci get flowoffload.@flow[0].ipv6dns_server 2>/dev/null)
 	dnscache_enable=$(uci get flowoffload.@flow[0].dnscache_enable 2>/dev/null)
 	if [ $dnscache_enable = "2" ];  then
-		
-		localserver=$(echo -e "${lan_addr}:5333")
+		localserver=$(echo -e "127.0.0.1:5333")
 	elif [ $dnscache_enable = "3" ];  then
-		localserver=$(echo -e "${lan_addr}:5383")
+		localserver=$(echo -e "127.0.0.1:5383")
 	fi
 
 	cp -a /usr/bin/dnsforwarder /usr/sbin/dnscache