From d354ed7a323b2f6a7985811b8a6f3b127d029af1 Mon Sep 17 00:00:00 2001
From: Michael Qu <greennyreborn@gmail.com>
Date: Tue, 8 Oct 2019 23:42:11 +0900
Subject: [PATCH] dnspod support customized command to get wan ip (#1705)

fix dnspod clear log bug
---
 package/lean/luci-app-dnspod/files/dnspod.sh  | 28 +++++++++++++------
 .../files/root/etc/config/dnspod              |  1 +
 .../usr/lib/lua/luci/model/cbi/dnspod.lua     |  1 +
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/package/lean/luci-app-dnspod/files/dnspod.sh b/package/lean/luci-app-dnspod/files/dnspod.sh
index 77295f52d..de0772999 100755
--- a/package/lean/luci-app-dnspod/files/dnspod.sh
+++ b/package/lean/luci-app-dnspod/files/dnspod.sh
@@ -13,7 +13,7 @@ domain=`uci get dnspod.base_arg.main_domain 2>/dev/null`
 #由于*linux会被脚本解析为当前目录下的所有文件，所以请填写\*
 #  sub_domain='\*'
 sub_domain=`uci get dnspod.base_arg.sub_domain 2>/dev/null`
-if [ $sub_domain = "\*" ];then
+if [ $sub_domain = "\*" ]; then
     sub_domain="*"
 fi
 
@@ -24,6 +24,12 @@ if [[ $wait_second =~ ^[1-9][0-9]*$ ]]; then
     wait=$wait_second
 fi
 
+#外网ip获取命令
+command=`uci get dnspod.base_arg.command_to_get_ip 2>/dev/null`
+if [ -z "$command" ]; then
+    command='curl -s whatismyip.akamai.com'
+fi
+
 #检查curl是否安装
 curl_status=`which curl 2>/dev/null`
 [ -n "$curl_status" ] || { echo "curl is not installed";exit 3; }
@@ -32,7 +38,7 @@ os=$(uname -a | egrep -io 'openwrt' | tr [A-Z] [a-z])
 
 API_url="https://dnsapi.cn"
 LOG_FILE="/tmp/dnspod.log"
-MAX_LOG_SIZE=1*1024*1024
+MAX_LOG_SIZE=`expr 1 * 1024 * 1024` # 默认最大限制1M
 PROGRAM=$(basename $0)
 
 format='json'
@@ -45,21 +51,22 @@ last_modified_ip=
 
 getFileSize() {
     local file=$1
-    wc -c $file
+    wc -c $file | awk '{print $1}'
 }
 
 clearLog() {
     local file_size=$(getFileSize $LOG_FILE)
     if [ $file_size -gt $MAX_LOG_SIZE ]; then
         echo "" > $LOG_FILE
+        printMsg "Log file [$LOG_FILE], size: [$file_size bytes]."
+        printMsg "Exceeds max log size [$MAX_LOG_SIZE]. Clear the log."
     fi
-
 }
 
 printMsg() {
     local time=$(date "+%Y-%m-%d %H:%M:%S")
     local msg="$1"
-    if [ $is_svc -eq 1 ];then
+    if [ $is_svc -eq 1 ]; then
         echo "$time: $msg" >> $LOG_FILE
         # logger -t ${PROGRAM} "${msg}"
     else
@@ -69,7 +76,7 @@ printMsg() {
 
 getIp() {
 #    curl -s http://checkip.dyndns.com | sed -n 's/.*: \([0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\).*/\1/p'
-    curl -s whatismyip.akamai.com
+    eval $command
 }
 
 execAPI() {
@@ -107,7 +114,7 @@ updateRecord() {
 checkip() {
     local wan_ip=$1
     printMsg "old ip: [$last_modified_ip], new ip: [$wan_ip]"
-    if [ "$wan_ip" != "$last_modified_ip" ];then
+    if [ "$wan_ip" != "$last_modified_ip" ]; then
         return 8
     else
         return 3
@@ -119,7 +126,7 @@ execSvc() {
     #check that whether the network is ok
     while [ 1 ];do
         ip=$(getIp)
-        if [ -n "$ip" ];then
+        if [ -n "$ip" ]; then
             printMsg "WAN IP: ${ip}"
             break;
         else
@@ -132,7 +139,7 @@ execSvc() {
         clearLog
         ip=$(getIp)
         checkip $ip
-        if [ $? -eq 8 ];then
+        if [ $? -eq 8 ]; then
             updateRecord $ip
             #updateTunnelBroker
         fi
@@ -142,6 +149,7 @@ execSvc() {
 
 execUpdate() {
     local ip=`getIp`
+    printMsg "WAN IP: ${ip}"
     updateRecord $ip
 }
 
@@ -151,9 +159,11 @@ case $1 in
         clearLog;
         printMsg "Start in Service mode, check in every $wait seconds";
         printMsg "domain: ${domain}, sub_domain: ${sub_domain}";
+        printMsg "Use command: [$command] to get wan ip";
         execSvc;;
     *)
         is_svc=0;
         printMsg "Start update record, domain: ${domain}, sub_domain: ${sub_domain}";
+        printMsg "Use command: [$command] to get wan ip";
         execUpdate;;
 esac
diff --git a/package/lean/luci-app-dnspod/files/root/etc/config/dnspod b/package/lean/luci-app-dnspod/files/root/etc/config/dnspod
index 4ec49531f..00876ecfc 100644
--- a/package/lean/luci-app-dnspod/files/root/etc/config/dnspod
+++ b/package/lean/luci-app-dnspod/files/root/etc/config/dnspod
@@ -3,4 +3,5 @@ config base_arg "base_arg"
 	option sub_domain ''
 	option login_token ''
 	option wait_second ''
+	option command_to_get_ip 'curl -s whatismyip.akamai.com'
 
diff --git a/package/lean/luci-app-dnspod/files/root/usr/lib/lua/luci/model/cbi/dnspod.lua b/package/lean/luci-app-dnspod/files/root/usr/lib/lua/luci/model/cbi/dnspod.lua
index 1f5038029..437fd9076 100644
--- a/package/lean/luci-app-dnspod/files/root/usr/lib/lua/luci/model/cbi/dnspod.lua
+++ b/package/lean/luci-app-dnspod/files/root/usr/lib/lua/luci/model/cbi/dnspod.lua
@@ -22,6 +22,7 @@ email = s:option(Value, "login_token", translate("DNSPOD Token"), "格式: ID,To
 main = s:option(Value, "main_domain", translate("主域名"), "想要解析的主域名，例如:baidu.com")
 sub = s:option(Value, "sub_domain", translate("子域名"), "想要解析的子域名，只允许填写一个。如果想解析*子域名，请填写 \\*")
 wait = s:option(Value, "wait_second", translate("更新周期(s)"), "请填写数字，默认为300s")
+command = s:option(Value, "command_to_get_ip", translate("外网ip获取命令"), "默认为 curl -s whatismyip.akamai.com")
 
 local apply = luci.http.formvalue("cbi.apply")
 if apply then