X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-ddns%2Froot%2Fusr%2Flib%2Fddns%2Fdynamic_dns_lucihelper.sh;h=3fc84748eeb5986542d939efccb5100a434f390f;hp=1782d1f038492dd53ce6cffe594930dd84b0ddb5;hb=1aeb236a94c146d2f5eb2acb9467f3829516c0f0;hpb=f77b1111e4e413b383295dc2c4afd95ae4b0b9a5

diff --git a/applications/luci-ddns/root/usr/lib/ddns/dynamic_dns_lucihelper.sh b/applications/luci-ddns/root/usr/lib/ddns/dynamic_dns_lucihelper.sh
index 1782d1f03..3fc84748e 100755
--- a/applications/luci-ddns/root/usr/lib/ddns/dynamic_dns_lucihelper.sh
+++ b/applications/luci-ddns/root/usr/lib/ddns/dynamic_dns_lucihelper.sh
@@ -1,13 +1,14 @@
 #!/bin/sh
 # /usr/lib/ddns/luci_dns_helper.sh
 #
-# Written by Christian Schoenebeck in August 2014 to support:
-# this script is used by luci-app-ddns
+# Written in August 2014
+# by Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+# This script is used by luci-app-ddns
 # - getting registered IP
 # - check if possible to get local IP
 # - verifing given DNS- or Proxy-Server
 #
-# variables in small chars are read from /etc/config/ddns
+# variables in small chars are read from /etc/config/ddns as parameter given here
 # variables in big chars are defined inside these scripts as gloval vars
 # variables in big chars beginning with "__" are local defined inside functions only
 # set -vx  	#script debugger
@@ -18,13 +19,13 @@
 
 # set -vx  	#script debugger
 
-# preset some variables wrong or not set in dynamic_dns_functions.sh
-SECTION_ID="dynamic_dns_lucihelper"
+# preset some variables, wrong or not set in dynamic_dns_functions.sh
+SECTION_ID="lucihelper"
 LOGFILE="$LOGDIR/$SECTION_ID.log"
-LUCI_HELPER="ACTIV"	# supress verbose and critical logging
+VERBOSE_MODE=0		# no console logging
 # global variables normally set by reading DDNS UCI configuration
-use_logfile=0
-use_syslog=0
+use_syslog=0		# no syslog
+use_logfile=0		# by default no logfile, can be changed here
 
 case "$1" in
 	get_registered_ip)
@@ -34,21 +35,24 @@ case "$1" in
 		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
 		force_dnstcp=${5:-"0"}		# Force TCP on DNS - default 0 - No
 		dns_server=${6:-""}		# DNS server - default No DNS
+		write_log 7 "-----> get_registered_ip IP"
 		get_registered_ip IP
 		[ $? -ne 0 ] && IP=""
 		echo -n "$IP"			# suppress LF
 		;;
 	verify_dns)
-		# $2 == dns-server to verify	# no need for force_dnstcp because
+		# $2 : dns-server to verify	# no need for force_dnstcp because
 						# verify with nc (netcat) uses tcp anyway
 		use_ipv6=${3:-"0"}		# Use IPv6 - default IPv4
 		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
+		write_log 7 "-----> verify_dns '$2'"
 		verify_dns "$2"
 		;;
 	verify_proxy)
-		# $2 == proxy string to verify
+		# $2 : proxy string to verify
 		use_ipv6=${3:-"0"}		# Use IPv6 - default IPv4
 		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
+		write_log 7 "-----> verify_proxy '$2'"
 		verify_proxy "$2"
 		;;
 	get_local_ip)
@@ -62,7 +66,7 @@ case "$1" in
 		proxy="$8"			# proxy if set
 		force_ipversion="0"		# not needed but must be set
 		use_https="0"			# not needed but must be set
-		[ -n "$proxy" -a "$ip_source" == "web" ] && {
+		[ -n "$proxy" -a "$ip_source" = "web" ] && {
 			# proxy defined, used for ip_source=web
 			export HTTP_PROXY="http://$proxy"
 			export HTTPS_PROXY="http://$proxy"
@@ -70,13 +74,17 @@ case "$1" in
 			export https_proxy="http://$proxy"
 		}
 		# don't need IP only the return code
-		[ "$ip_source" == "web" -o  "$ip_source" == "script"] && {		
-			# we wait only 3 seconds for an 
+		[ "$ip_source" = "web" -o  "$ip_source" = "script" ] && {
+			# we wait only 3 seconds for an
 			# answer from "web" or "script"
-			__timeout 3 -- get_local_ip IP
-		} || get_local_ip IP
+			write_log 7 "-----> timeout 3 -- get_local_ip IP"
+			timeout 3 -- get_local_ip IP
+		} || {
+			write_log 7 "-----> get_local_ip IP"
+			get_local_ip IP
+		}
 		;;
-	*)	
-		return 1
+	*)
+		return 255
 		;;
 esac