Merge pull request #768 from chris5560/master
ddns-scripts: update to version 2.1.0-4
This commit is contained in:
Steven Barth
commit
30f004c791
8 changed files with 10038 additions and 197 deletions
|
|
@ -1,128 +0,0 @@
|
|||
Version 2.1.0-3
|
||||
Date 2014-12-07
|
||||
|
||||
- removed special handling for dynamic_dns_helper.sh and url_escape.sed in Makefile/postinst
|
||||
- minor fixes in logging
|
||||
- allow retry_count of "0" to run infinite retrys on error
|
||||
-- https://dev.openwrt.org/ticket/18382
|
||||
- changed naming of .dat and .err file to have one per section, not one per process
|
||||
- defer hotplug helper from 25-ddns to 95-ddns (according initscript START=95)
|
||||
-- https://github.com/openwrt/packages/issues/568 (#568)
|
||||
- fix commandline for busybox wget
|
||||
-- https://dev.openwrt.org/ticket/18411
|
||||
-- https://dev.openwrt.org/ticket/18437
|
||||
-- https://github.com/openwrt/packages/issues/605 (#605)
|
||||
- remove checking answer from ddns provider because there are to many different.
|
||||
Many providers did not follow API from dyndns.com
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.1.0-2
|
||||
Date 2014-11-15
|
||||
|
||||
- moved /usr/lib/ddns/dynamic_dns_lucihelper.sh from luci-app-ddns into this package
|
||||
-- https://github.com/openwrt/luci/issue/251
|
||||
-- https://dev.openwrt.org/ticket/18326
|
||||
-- https://dev.openwrt.org/ticket/18347
|
||||
- fix: dynamic_dns_update.sh did not loop
|
||||
-- https://dev.openwrt.org/ticket/18336
|
||||
- add provider cloudflare.com IPv4 and IPv6 (Thanks to Paul for support and testing)
|
||||
-- https://dev.openwrt.org/ticket/12500
|
||||
- modified detection, if dynamic_dns_fuctions are used by dynamic_dns_lucihelper.sh
|
||||
- redirect stdout of wget,curl,host,nslookup,nc etc to /tmp/ddns_$$.dat and *.err instead of variables
|
||||
- extended error detection in get_local_ip function
|
||||
- modified verify of option ip_script to allow parameters, when calling
|
||||
- add provider selfhost.de IPv4
|
||||
- add provider no-ip.pl (nothing to do with no-ip.com)
|
||||
-- https://github.com/openwrt/packages/issues/542 (#542)
|
||||
IPv4 (tested) and also added for
|
||||
IPv6 (NOT tested) because client IP is autodetected be provider
|
||||
- add getlocalip_sample.sh as sample script for usage of
|
||||
option ip_source 'script' together with
|
||||
option ip_script '/usr/lib/ddns/getlocalip.sh -4'
|
||||
- cleanup whitespaces at line ends
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.1.0-1
|
||||
Date 2014-11-09
|
||||
|
||||
- fixed postinst and prerm in Makefile
|
||||
- implementation of provider specific update scripts into services and services_ipv6 file.
|
||||
first Provider "no-ip.com" - Thanks to DarkStarXxX for request and testing
|
||||
- finished uci/ddns wiki at http://wiki.openwrt.org/doc/uci/ddns
|
||||
- rewritten retry management
|
||||
- rewritten logging including following Issue 469
|
||||
https://github.com/openwrt/packages/issues/469
|
||||
- stop running sections on hotplug ifdown event (like start on ifup)
|
||||
- implement trap detection
|
||||
also kill "sleep" child processes
|
||||
SIGHUP to reload configuration (not really reloading, simply starting a new process)
|
||||
/etc/init.d/ddns reload implemented
|
||||
- code optimization
|
||||
- new provider LoopiaDNS.se Issue 494
|
||||
https://github.com/openwrt/packages/issues/494
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-9
|
||||
Date 2014-10-11
|
||||
|
||||
- add retry loop to verify dns and proxy when script starts
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-8
|
||||
Date 2014-10-06
|
||||
|
||||
- fixes problem CRITICAL ERROR - custom update_script not found
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-7
|
||||
Date 2014-10-05
|
||||
|
||||
- Added support for custom update scripts with new option update_script
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-6
|
||||
Date 2014-10-01
|
||||
|
||||
- url encode USERNAME and PASSWORD in update url
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-5
|
||||
Date 2014-09-30
|
||||
|
||||
- fix send_update() detection of private IPv4
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-4
|
||||
Date 2014-09-29
|
||||
|
||||
- fix ticket #17998: wrongly detect ipv4 start with 10x.x.x.x
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-3
|
||||
Date 2014-09-28
|
||||
|
||||
- add service two-dns.de
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-2
|
||||
Date 2014-09-22
|
||||
|
||||
- fix issue (#337) current/registered ip
|
||||
https://github.com/openwrt/packages/issues/337
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.1-1
|
||||
Date 2014-09-20
|
||||
|
||||
- 1st published version via github
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Version 2.0.0
|
||||
Date 2014-07-16
|
||||
|
||||
- published via OpenWrt TRAC system as zip-file for testing
|
||||
- IPv6 address support
|
||||
- log file support
|
||||
- syslog support for various error levels
|
||||
- verify all given parameters before starting main loop
|
||||
- retry max retry_counter times before terminating scripts
|
||||
|
|
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=ddns-scripts
|
||||
PKG_VERSION:=2.1.0
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
||||
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
|
||||
|
|
@ -55,7 +55,7 @@ define Package/ddns-scripts/install
|
|||
$(INSTALL_BIN) ./files/etc/init.d/* $(1)/etc/init.d/
|
||||
|
||||
$(INSTALL_DIR) $(1)/usr/lib/ddns
|
||||
$(INSTALL_DATA) ./files/usr/lib/ddns/service* $(1)/usr/lib/ddns
|
||||
$(INSTALL_DATA) ./files/usr/lib/ddns/* $(1)/usr/lib/ddns
|
||||
$(INSTALL_BIN) ./files/usr/lib/ddns/*.sh $(1)/usr/lib/ddns
|
||||
endef
|
||||
|
||||
|
|
@ -68,6 +68,7 @@ define Package/ddns-scripts/postinst
|
|||
uci -q get ddns.global > /dev/null || uci -q set ddns.global='ddns'
|
||||
uci -q get ddns.global.date_format > /dev/null || uci -q set ddns.global.date_format='%F %R'
|
||||
uci -q get ddns.global.log_lines > /dev/null || uci -q set ddns.global.log_lines='250'
|
||||
uci -q get ddns.global.allow_local_ip > /dev/null || uci -q set ddns.global.allow_local_ip='0'
|
||||
uci -q commit ddns
|
||||
|
||||
# clear LuCI indexcache
|
||||
|
|
|
|||
|
|
@ -7,11 +7,12 @@ config ddns "global"
|
|||
# option run_dir "/var/run/ddns"
|
||||
# option log_dir "/var/log/ddns"
|
||||
option log_lines "250"
|
||||
option allow_local_ip "0"
|
||||
|
||||
|
||||
config service "myddns_ipv4"
|
||||
option service_name "example.org"
|
||||
option domain "yourhost.example.org"
|
||||
option domain "yourhost.example.com"
|
||||
option username "your_username"
|
||||
option password "your_password"
|
||||
option interface "wan"
|
||||
|
|
@ -20,7 +21,7 @@ config service "myddns_ipv4"
|
|||
|
||||
config service "myddns_ipv6"
|
||||
option update_url "http://[USERNAME]:[PASSWORD]@your.provider.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
||||
option domain "yourhost.dyndns.org"
|
||||
option domain "yourhost.example.com"
|
||||
option username "your_username"
|
||||
option password "your_password"
|
||||
option use_ipv6 "1"
|
||||
|
|
|
|||
|
|
@ -48,6 +48,12 @@ config ddns "global"
|
|||
# default: "250" lines
|
||||
# option log_lines "250"
|
||||
|
||||
###########
|
||||
# Whether to allow to send Private/Special IP's to the DDNS provider
|
||||
# IPv4: 0.x, 10.x, 127.x, 172.16.x-172.31.x, 192.168.x
|
||||
# IPv6: ::, Fxxx:
|
||||
# default: "0" disabled
|
||||
# option allow_local_ip "0"
|
||||
|
||||
#####################################################################
|
||||
# DDNS service settings
|
||||
|
|
|
|||
152
net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
Executable file → Normal file
152
net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
Executable file → Normal file
|
|
@ -12,7 +12,7 @@
|
|||
# - IPv6 DDNS services
|
||||
# - setting DNS Server to retrieve current IP including TCP transport
|
||||
# - Proxy Server to send out updates or retrieving WEB based IP detection
|
||||
# - force_interval=0 to run once (usefull for cron jobs etc.)
|
||||
# - force_interval=0 to run once (useful for cron jobs etc.)
|
||||
# - the usage of BIND's host instead of BusyBox's nslookup if installed (DNS via TCP)
|
||||
# - extended Verbose Mode and log file support for better error detection
|
||||
#
|
||||
|
|
@ -32,17 +32,20 @@
|
|||
SECTION_ID="" # hold config's section name
|
||||
VERBOSE_MODE=1 # default mode is log to console, but easily changed with parameter
|
||||
|
||||
# allow NON-public IP's
|
||||
ALLOW_LOCAL_IP=$(uci -q get ddns.global.allow_local_ip) || ALLOW_LOCAL_IP=0
|
||||
# directory to store run information to.
|
||||
RUNDIR=$(uci -q get ddns.global.run_dir) || RUNDIR="/var/run/ddns"
|
||||
[ -d $RUNDIR ] || mkdir -p -m755 $RUNDIR
|
||||
# NEW # directory to store log files
|
||||
# directory to store log files
|
||||
LOGDIR=$(uci -q get ddns.global.log_dir) || LOGDIR="/var/log/ddns"
|
||||
[ -d $LOGDIR ] || mkdir -p -m755 $LOGDIR
|
||||
LOGFILE="" # NEW # logfile can be enabled as new option
|
||||
LOGFILE="" # logfile - all files are set in dynamic_dns_updater.sh
|
||||
PIDFILE="" # pid file
|
||||
UPDFILE="" # store UPTIME of last update
|
||||
DATFILE="" # save stdout data of WGet and other extern programs called
|
||||
ERRFILE="" # save stderr output of WGet and other extern programs called
|
||||
DATFILE="" # save stdout data of WGet and other external programs called
|
||||
ERRFILE="" # save stderr output of WGet and other external programs called
|
||||
TLDFILE=/usr/lib/ddns/tld_names.dat # TLD file used by split_FQDN
|
||||
|
||||
# number of lines to before rotate logfile
|
||||
LOGLINES=$(uci -q get ddns.global.log_lines) || LOGLINES=250
|
||||
|
|
@ -314,8 +317,8 @@ get_service_data() {
|
|||
done
|
||||
IFS=$__OLD_IFS
|
||||
|
||||
# check is URL or SCRIPT is given
|
||||
__URL=$(echo "$__DATA" | grep "^http:")
|
||||
# check if URL or SCRIPT is given
|
||||
__URL=$(echo "$__DATA" | grep "^http")
|
||||
[ -z "$__URL" ] && __SCRIPT="/usr/lib/ddns/$__DATA"
|
||||
|
||||
eval "$1=\"$__URL\""
|
||||
|
|
@ -340,15 +343,15 @@ get_seconds() {
|
|||
|
||||
timeout() {
|
||||
# copied from http://www.ict.griffith.edu.au/anthony/software/timeout.sh
|
||||
# only did the folloing changes
|
||||
# only did the following changes
|
||||
# - commented out "#!/bin/bash" and usage section
|
||||
# - replace exit by return for usage as function
|
||||
# - some reformating
|
||||
# - some reformatting
|
||||
#
|
||||
# timeout [-SIG] time [--] command args...
|
||||
#
|
||||
# Run the given command until completion, but kill it if it runs too long.
|
||||
# Specifically designed to exit immediatally (no sleep interval) and clean up
|
||||
# Specifically designed to exit immediately (no sleep interval) and clean up
|
||||
# nicely without messages or leaving any extra processes when finished.
|
||||
#
|
||||
# Example use
|
||||
|
|
@ -402,7 +405,7 @@ timeout() {
|
|||
shift # next option
|
||||
done
|
||||
|
||||
# run main command in backgrouds and get its pid
|
||||
# run main command in backgrounds and get its pid
|
||||
"$@" &
|
||||
command_pid=$!
|
||||
|
||||
|
|
@ -443,28 +446,45 @@ timeout() {
|
|||
verify_host_port() {
|
||||
local __HOST=$1
|
||||
local __PORT=$2
|
||||
local __IP __IPV4 __IPV6 __RUNPROG __ERR
|
||||
local __IP __IPV4 __IPV6 __RUNPROG __PROG __ERR
|
||||
# return codes
|
||||
# 1 system specific error
|
||||
# 2 nslookup error
|
||||
# 2 nslookup/host error
|
||||
# 3 nc (netcat) error
|
||||
# 4 unmatched IP version
|
||||
|
||||
[ $# -ne 2 ] && write_log 12 "Error calling 'verify_host_port()' - wrong number of parameters"
|
||||
|
||||
__RUNPROG="/usr/bin/nslookup $__HOST >$DATFILE 2>$ERRFILE"
|
||||
write_log 7 "#> $__RUNPROG"
|
||||
eval $__RUNPROG
|
||||
__ERR=$?
|
||||
# command error
|
||||
[ $__ERR -gt 0 ] && {
|
||||
write_log 3 "DNS Resolver Error - BusyBox nslookup Error '$__ERR'"
|
||||
write_log 7 "$(cat $ERRFILE)"
|
||||
return 2
|
||||
# check if ip or FQDN was given
|
||||
__IPV4=$(echo $__HOST | grep -m 1 -o "$IPV4_REGEX$") # do not detect ip in 0.0.0.0.example.com
|
||||
__IPV6=$(echo $__HOST | grep -m 1 -o "$IPV6_REGEX")
|
||||
# if FQDN given get IP address
|
||||
[ -z "$__IPV4" -a -z "$__IPV6" ] && {
|
||||
if [ -x /usr/bin/host ]; then # use BIND host if installed
|
||||
__PROG="BIND host"
|
||||
__RUNPROG="/usr/bin/host -t ANY $__HOST >$DATFILE 2>$ERRFILE"
|
||||
else # use BusyBox nslookup
|
||||
__PROG="BusyBox nslookup"
|
||||
__RUNPROG="/usr/bin/nslookup $__HOST >$DATFILE 2>$ERRFILE"
|
||||
fi
|
||||
write_log 7 "#> $__RUNPROG"
|
||||
eval $__RUNPROG
|
||||
__ERR=$?
|
||||
# command error
|
||||
[ $__ERR -gt 0 ] && {
|
||||
write_log 3 "DNS Resolver Error - $__PROG Error '$__ERR'"
|
||||
write_log 7 "$(cat $ERRFILE)"
|
||||
return 2
|
||||
}
|
||||
# extract IP address
|
||||
if [ -x /usr/bin/host ]; then # use BIND host if installed
|
||||
__IPV4=$(cat $DATFILE | awk -F "address " '/has address/ {print $2; exit}' )
|
||||
__IPV6=$(cat $DATFILE | awk -F "address " '/has IPv6/ {print $2; exit}' )
|
||||
else # use BusyBox nslookup
|
||||
__IPV4=$(cat $DATFILE | sed -ne "3,\$ { s/^Address[0-9 ]\{0,\}: \($IPV4_REGEX\).*$/\\1/p }")
|
||||
__IPV6=$(cat $DATFILE | sed -ne "3,\$ { s/^Address[0-9 ]\{0,\}: \($IPV6_REGEX\).*$/\\1/p }")
|
||||
fi
|
||||
}
|
||||
# extract IP address
|
||||
__IPV4=$(cat $DATFILE | sed -ne "3,\$ { s/^Address [0-9]*: \($IPV4_REGEX\).*$/\\1/p }")
|
||||
__IPV6=$(cat $DATFILE | sed -ne "3,\$ { s/^Address [0-9]*: \($IPV6_REGEX\).*$/\\1/p }")
|
||||
|
||||
# check IP version if forced
|
||||
if [ $force_ipversion -ne 0 ]; then
|
||||
|
|
@ -487,9 +507,9 @@ verify_host_port() {
|
|||
# connectivity test
|
||||
# run busybox nc to HOST PORT
|
||||
# busybox might be compiled with "FEATURE_PREFER_IPV4_ADDRESS=n"
|
||||
# then nc will try to connect via IPv6 if there is any IPv6 availible on any host interface
|
||||
# not worring, if there is an IPv6 wan address
|
||||
# so if not "force_ipversion" to use_ipv6 then connect test via ipv4, if availible
|
||||
# then nc will try to connect via IPv6 if there is any IPv6 available on any host interface
|
||||
# not worrying, if there is an IPv6 wan address
|
||||
# so if not "force_ipversion" to use_ipv6 then connect test via ipv4, if available
|
||||
[ $force_ipversion -ne 0 -a $use_ipv6 -ne 0 -o -z "$__IPV4" ] && __IP=$__IPV6 || __IP=$__IPV4
|
||||
|
||||
if [ -n "$__NCEXT" ]; then # BusyBox nc compiled with extensions (timeout support)
|
||||
|
|
@ -512,7 +532,7 @@ verify_host_port() {
|
|||
fi
|
||||
}
|
||||
|
||||
# verfiy given DNS server if connectable
|
||||
# verify given DNS server if connectable
|
||||
# $1 DNS server to verify
|
||||
verify_dns() {
|
||||
local __ERR=255 # last error buffer
|
||||
|
|
@ -546,7 +566,7 @@ verify_dns() {
|
|||
return 0
|
||||
}
|
||||
|
||||
# analyse and verfiy given proxy string
|
||||
# analyze and verify given proxy string
|
||||
# $1 Proxy-String to verify
|
||||
verify_proxy() {
|
||||
# complete entry user:password@host:port
|
||||
|
|
@ -643,7 +663,7 @@ do_transfer() {
|
|||
# 2nd choice is cURL IPv4/IPv6/HTTPS
|
||||
# libcurl might be compiled without Proxy Support (default in trunk)
|
||||
elif [ -x /usr/bin/curl ]; then
|
||||
__PROG="/usr/bin/curl -sS -o $DATFILE --stderr $ERRFILE"
|
||||
__PROG="/usr/bin/curl -RsS -o $DATFILE --stderr $ERRFILE"
|
||||
# force ip version to use
|
||||
if [ $force_ipversion -eq 1 ]; then
|
||||
[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6" # force IPv4/IPv6
|
||||
|
|
@ -730,10 +750,14 @@ send_update() {
|
|||
|
||||
[ $# -ne 1 ] && write_log 12 "Error calling 'send_update()' - wrong number of parameters"
|
||||
|
||||
# verify given IP / no private IPv4's / no IPv6 addr starting with fxxx of with ":"
|
||||
[ $use_ipv6 -eq 0 ] && __IP=$(echo $1 | grep -v -E "(^0|^10\.|^127|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-1]\.|^192\.168)")
|
||||
[ $use_ipv6 -eq 1 ] && __IP=$(echo $1 | grep "^[0-9a-eA-E]")
|
||||
[ -z "$__IP" ] && write_log 4 "Private or invalid or no IP '$1' given"
|
||||
if [ $ALLOW_LOCAL_IP -eq 0 ]; then
|
||||
# verify given IP / no private IPv4's / no IPv6 addr starting with fxxx of with ":"
|
||||
[ $use_ipv6 -eq 0 ] && __IP=$(echo $1 | grep -v -E "(^0|^10\.|^127|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-1]\.|^192\.168)")
|
||||
[ $use_ipv6 -eq 1 ] && __IP=$(echo $1 | grep "^[0-9a-eA-E]")
|
||||
[ -z "$__IP" ] && write_log 14 "Private or invalid or no IP '$1' given! Please check your configuration"
|
||||
else
|
||||
__IP="$1"
|
||||
fi
|
||||
|
||||
if [ -n "$update_script" ]; then
|
||||
write_log 7 "parsing script '$update_script'"
|
||||
|
|
@ -751,7 +775,7 @@ send_update() {
|
|||
write_log 7 "DDNS Provider answered:\n$(cat $DATFILE)"
|
||||
|
||||
return 0
|
||||
# TODO analyse providers answer
|
||||
# TODO analyze providers answer
|
||||
# "good" or "nochg" = dyndns.com compatible API
|
||||
# grep -i -E "good|nochg" $DATFILE >/dev/null 2>&1
|
||||
# return $? # "0" if found
|
||||
|
|
@ -915,7 +939,7 @@ get_registered_ip() {
|
|||
if [ "$__PROG" = "BIND host" ]; then
|
||||
__DATA=$(cat $DATFILE | awk -F "address " '/has/ {print $2; exit}' )
|
||||
else
|
||||
__DATA=$(cat $DATFILE | sed -ne "3,\$ { s/^Address [0-9]*: \($__REGEX\).*$/\\1/p }" )
|
||||
__DATA=$(cat $DATFILE | sed -ne "3,\$ { s/^Address[0-9 ]\{0,\}: \($__REGEX\).*$/\\1/p }" )
|
||||
fi
|
||||
[ -n "$__DATA" ] && {
|
||||
write_log 7 "Registered IP '$__DATA' detected"
|
||||
|
|
@ -974,7 +998,7 @@ trap_handler() {
|
|||
write_log 4 "PID '$$' exit WITH ERROR '$__ERR' at $(eval $DATE_PROG)\n"
|
||||
fi ;;
|
||||
1) write_log 6 "PID '$$' received 'SIGHUP' at $(eval $DATE_PROG)"
|
||||
# reload config via starting the script again
|
||||
# reload config via starting the script again
|
||||
eval "/usr/lib/ddns/dynamic_dns_updater.sh $SECTION_ID $VERBOSE_MODE &"
|
||||
exit 0 ;; # and leave this one
|
||||
2) write_log 5 "PID '$$' terminated by 'SIGINT' at $(eval $DATE_PROG)\n";;
|
||||
|
|
@ -999,3 +1023,55 @@ trap_handler() {
|
|||
trap - 0 1 2 3 15
|
||||
[ $1 -gt 0 ] && kill -$1 $$
|
||||
}
|
||||
|
||||
split_FQDN() {
|
||||
# $1 FQDN to split
|
||||
# $2 name of variable to store TLD
|
||||
# $3 name of variable to store (reg)Domain
|
||||
# $4 name of variable to store Host/Subdomain
|
||||
|
||||
[ $# -ne 4 ] && write_log 12 "Error calling 'split_FQDN()' - wrong number of parameters"
|
||||
|
||||
_SET="$@" # save given parameters
|
||||
local _FHOST _FTLD _FOUND
|
||||
local _FDOM=$(echo "$1" | tr [A-Z] [a-z]) # to lower
|
||||
|
||||
set -- $(echo "$_FDOM" | tr "." " ") # replace DOT with SPACE and set as script parameters
|
||||
_FDOM="" # clear variable for later reuse
|
||||
|
||||
while [ -n "$1" ] ; do # as long we have parameters
|
||||
_FTLD=$(echo $@ | tr " " ".") # build back dot separated as TLD
|
||||
# look if match excludes "!" in tld_names.dat
|
||||
grep -E "^!$_FTLD$" $TLDFILE >/dev/null 2>&1 || {
|
||||
# Don't match excludes
|
||||
# check if match any "*" in tld_names.dat
|
||||
grep -E "^*.$_FTLD$" $TLDFILE >/dev/null 2>&1 && {
|
||||
_FOUND="VALID"
|
||||
break # found leave while
|
||||
}
|
||||
# check if exact match in tld_names.dat
|
||||
grep -E "^$_FTLD$" $TLDFILE >/dev/null 2>&1 && {
|
||||
_FOUND="VALID"
|
||||
break # found leave while
|
||||
}
|
||||
}
|
||||
# nothing match so
|
||||
_FHOST="$_FHOST $_FDOM" # append DOMAIN to last found HOST
|
||||
_FDOM="$1" # set 1st parameter as DOMAIN
|
||||
_FTLD="" # clear TLD
|
||||
shift # delete 1st parameter and retry with the rest
|
||||
done
|
||||
|
||||
set -- $_SET # set back parameters from function call
|
||||
[ -n "$_FHOST" ] && _FHOST=$(echo $_FHOST | tr " " ".") # put dots back into HOST
|
||||
[ -n "$_FOUND" ] && {
|
||||
eval "$2=$_FTLD" # set found TLD
|
||||
eval "$3=$_FDOM" # set found registrable domain
|
||||
eval "$4=$_FHOST" # set found HOST/SUBDOMAIN
|
||||
return 0
|
||||
}
|
||||
eval "$2=''" # clear TLD
|
||||
eval "$3=''" # clear registrable domain
|
||||
eval "$4=''" # clear HOST/SUBDOMAIN
|
||||
return 1
|
||||
}
|
||||
|
|
|
|||
3
net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
Executable file → Normal file
3
net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
Executable file → Normal file
|
|
@ -116,7 +116,7 @@ trap "trap_handler 15" 15 # SIGTERM Termination
|
|||
################################################################################
|
||||
|
||||
# verify and load SECTION_ID is exists
|
||||
[ "$(uci_get ddns $SECTION_ID)" != "service" ] && {
|
||||
[ "$(uci -q get ddns.$SECTION_ID)" != "service" ] && {
|
||||
[ $VERBOSE_MODE -le 1 ] && VERBOSE_MODE=2 # force console out and logfile output
|
||||
[ -f $LOGFILE ] && rm -f $LOGFILE # clear logfile before first entry
|
||||
write_log 7 "************ ************** ************** **************"
|
||||
|
|
@ -129,6 +129,7 @@ load_all_config_options "ddns" "$SECTION_ID"
|
|||
write_log 7 "************ ************** ************** **************"
|
||||
write_log 5 "PID '$$' started at $(eval $DATE_PROG)"
|
||||
write_log 7 "uci configuraion:\n$(uci -q show ddns.$SECTION_ID | sort)"
|
||||
write_log 7 "ddns version : $(opkg list-installed ddns-scripts | awk '{print $3}')"
|
||||
case $VERBOSE_MODE in
|
||||
0) write_log 7 "verbose mode : 0 - run normal, NO console output";;
|
||||
1) write_log 7 "verbose mode : 1 - run normal, console mode";;
|
||||
|
|
|
|||
9884
net/ddns-scripts/files/usr/lib/ddns/tld_names.dat
Normal file
9884
net/ddns-scripts/files/usr/lib/ddns/tld_names.dat
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -11,17 +11,19 @@
|
|||
# option domain - your full hostname to update, in cloudflare its subdomain.domain
|
||||
# i.e. myhost.example.com where myhost is the subdomain and example.com is your domain
|
||||
#
|
||||
# Attention !!! script will only work if there is only one subdomain-level at your domain
|
||||
# subdomain2.subdomain1.domain i.e. mail.host.example.com will not work
|
||||
#
|
||||
# variable __IP already defined with the ip-address to use for update
|
||||
#
|
||||
[ $use_https -eq 0 ] && write_log 14 "Cloudflare only support updates via Secure HTTP (HTTPS). Please correct configuration!"
|
||||
|
||||
local __RECID __URL __KEY __KEYS __FOUND __DOMREC
|
||||
local __SUBDOM=$(echo $domain | awk -F "." '{print $1}')
|
||||
local __DOMAIN=$(echo $domain | awk -F "${__SUBDOM}." '{print $2}')
|
||||
local __TMP="/tmp/$$.json"
|
||||
local __RECID __URL __KEY __KEYS __FOUND __SUBDOM __DOMAIN __TLD
|
||||
|
||||
# split given Host/Domain into TLD, registrable domain, and subdomain
|
||||
split_FQDN $domain __TLD __DOMAIN __SUBDOM
|
||||
[ $? -ne 0 -o -z "$__DOMAIN" ] && \
|
||||
write_log 14 "Wrong Host/Domain configuration ($domain). Please correct configuration!"
|
||||
|
||||
# put together what we need
|
||||
__DOMAIN="$__DOMAIN.$__TLD"
|
||||
|
||||
# parse OpenWrt script with
|
||||
# functions for parsing and generating json
|
||||
|
|
@ -29,17 +31,17 @@ local __TMP="/tmp/$$.json"
|
|||
|
||||
# function copied from /usr/share/libubox/jshn.sh
|
||||
# from BB14.09 for backward compatibility to AA12.09
|
||||
json_get_keys() {
|
||||
local __dest="$1"
|
||||
local _tbl_cur
|
||||
grep -i "json_get_keys" /usr/share/libubox/jshn.sh >/dev/null 2>&1 || json_get_keys() {
|
||||
local __dest="$1"
|
||||
local _tbl_cur
|
||||
|
||||
if [ -n "$2" ]; then
|
||||
json_get_var _tbl_cur "$2"
|
||||
else
|
||||
_json_get_var _tbl_cur JSON_CUR
|
||||
fi
|
||||
local __var="${JSON_PREFIX}KEYS_${_tbl_cur}"
|
||||
eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
|
||||
if [ -n "$2" ]; then
|
||||
json_get_var _tbl_cur "$2"
|
||||
else
|
||||
_json_get_var _tbl_cur JSON_CUR
|
||||
fi
|
||||
local __var="${JSON_PREFIX}KEYS_${_tbl_cur}"
|
||||
eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
|
||||
}
|
||||
|
||||
# function to "sed" unwanted string parts from DATFILE
|
||||
|
|
@ -77,15 +79,13 @@ json_select "recs"
|
|||
json_select "objs"
|
||||
json_get_keys __KEYS
|
||||
for __KEY in $__KEYS; do
|
||||
local __ZONE __NAME __DISPLAY __TYPE
|
||||
local __ZONE __DISPLAY __NAME __TYPE
|
||||
json_select "$__KEY"
|
||||
json_get_var __ZONE "zone_name"
|
||||
# json_get_var __ZONE "zone_name" # for debugging
|
||||
# json_get_var __DISPLAY "display_name" # for debugging
|
||||
json_get_var __NAME "name"
|
||||
json_get_var __DISPLAY "display_name"
|
||||
json_get_var __TYPE "type"
|
||||
# if "zone_name" == "name" == "display_name" == $domain, then we found a valid domain record
|
||||
if [ "$__NAME" = "$domain" ]; then
|
||||
[ "$__DISPLAY" = "$__ZONE" ] && __DOMREC=1 || __DOMREC=0
|
||||
# we must verify IPv4 and IPv6 because there might be both for the same host
|
||||
[ \( $use_ipv6 -eq 0 -a "$__TYPE" = "A" \) -o \( $use_ipv6 -eq 1 -a "$__TYPE" = "AAAA" \) ] && {
|
||||
__FOUND=1 # mark found
|
||||
|
|
@ -110,14 +110,14 @@ __URL="${__URL}?a=rec_edit" # -d 'a=rec_edit'
|
|||
__URL="${__URL}&tkn=$password" # -d 'tkn=8afbe6dea02407989af4dd4c97bb6e25'
|
||||
__URL="${__URL}&id=$__RECID" # -d 'id=9001'
|
||||
__URL="${__URL}&email=$username" # -d 'email=sample@example.com'
|
||||
[ $__DOMREC -eq 0 ] && __URL="${__URL}&z=$__DOMAIN" # -d 'z=example.com'
|
||||
[ $__DOMREC -eq 1 ] && __URL="${__URL}&z=$domain" # -d 'z=example.com'
|
||||
__URL="${__URL}&z=$__DOMAIN" # -d 'z=example.com'
|
||||
|
||||
[ $use_ipv6 -eq 0 ] && __URL="${__URL}&type=A" # -d 'type=A' (IPv4)
|
||||
[ $use_ipv6 -eq 1 ] && __URL="${__URL}&type=AAAA" # -d 'type=AAAA' (IPv6)
|
||||
|
||||
[ $__DOMREC -eq 0 ] && __URL="${__URL}&name=$__SUBDOM" # -d 'name=sub' (HOST/SUBDOMAIN)
|
||||
[ $__DOMREC -eq 1 ] && __URL="${__URL}&name=$domain" # -d 'name=example.com'(DOMAIN)
|
||||
# handle subdomain or domain record
|
||||
[ -n "$__SUBDOM" ] && __URL="${__URL}&name=$__SUBDOM" # -d 'name=sub' (HOST/SUBDOMAIN)
|
||||
[ -z "$__SUBDOM" ] && __URL="${__URL}&name=$__DOMAIN" # -d 'name=example.com'(DOMAIN)
|
||||
|
||||
__URL="${__URL}&content=$__IP" # -d 'content=1.2.3.4'
|
||||
__URL="${__URL}&service_mode=0" # -d 'service_mode=0'
|
||||
|
|
|
|||
Loading…
Reference in a new issue