ddns-scripts: Update to Version 2.1.0-1 see description
- 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 Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
This commit is contained in:
parent
43d2457b98
commit
4192651448
12 changed files with 828 additions and 561 deletions
84
net/ddns-scripts/CHANGELOG
Normal file
84
net/ddns-scripts/CHANGELOG
Normal file
|
@ -0,0 +1,84 @@
|
||||||
|
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
|
|
@ -1,8 +1,8 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=ddns-scripts
|
PKG_NAME:=ddns-scripts
|
||||||
PKG_VERSION:=2.0.1
|
PKG_VERSION:=2.1.0
|
||||||
PKG_RELEASE:=9
|
PKG_RELEASE:=1
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
|
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
|
||||||
|
@ -62,7 +62,10 @@ endef
|
||||||
define Package/ddns-scripts/postinst
|
define Package/ddns-scripts/postinst
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# if run within buildroot exit
|
# if run within buildroot exit
|
||||||
[ -n "${IPKG_INSTROOT}" ] && exit 0
|
[ -n "$${IPKG_INSTROOT}" ] && exit 0
|
||||||
|
|
||||||
|
# remove old sed script file
|
||||||
|
[ -f /usr/lib/ddns/url_escape.sed ] && rm -f /usr/lib/ddns/url_escape.sed
|
||||||
|
|
||||||
# add new section "ddns" "global" if not exists
|
# add new section "ddns" "global" if not exists
|
||||||
uci -q get ddns.global > /dev/null || uci -q set ddns.global='ddns'
|
uci -q get ddns.global > /dev/null || uci -q set ddns.global='ddns'
|
||||||
|
@ -79,7 +82,7 @@ endef
|
||||||
define Package/ddns-scripts/prerm
|
define Package/ddns-scripts/prerm
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# if run within buildroot exit
|
# if run within buildroot exit
|
||||||
[ -n "${IPKG_INSTROOT}" ] && exit 0
|
[ -n "$${IPKG_INSTROOT}" ] && exit 0
|
||||||
|
|
||||||
# stop running scripts
|
# stop running scripts
|
||||||
/etc/init.d/ddns disable
|
/etc/init.d/ddns disable
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#
|
#
|
||||||
# Please read ddns.sample
|
# Please read ddns.sample
|
||||||
|
# or http://wiki.openwrt.org/doc/uci/ddns
|
||||||
#
|
#
|
||||||
config ddns "global"
|
config ddns "global"
|
||||||
option date_format "%F %R"
|
option date_format "%F %R"
|
||||||
|
@ -9,8 +10,8 @@ config ddns "global"
|
||||||
|
|
||||||
|
|
||||||
config service "myddns_ipv4"
|
config service "myddns_ipv4"
|
||||||
option service_name "dyndns.org"
|
option service_name "example.org"
|
||||||
option domain "yourhost.dyndns.org"
|
option domain "yourhost.example.org"
|
||||||
option username "your_username"
|
option username "your_username"
|
||||||
option password "your_password"
|
option password "your_password"
|
||||||
option interface "wan"
|
option interface "wan"
|
||||||
|
|
|
@ -127,7 +127,7 @@ config service "myddns"
|
||||||
###########
|
###########
|
||||||
# use HTTPS for secure communication with you DDNS provider
|
# use HTTPS for secure communication with you DDNS provider
|
||||||
# personally found some providers having problems when not sending
|
# personally found some providers having problems when not sending
|
||||||
# updates via HTTPS. Yyou must not specify "https://" in update_url.
|
# updates via HTTPS. You must not specify "https://" in update_url.
|
||||||
# It's modified by the scripts themselves
|
# It's modified by the scripts themselves
|
||||||
# Needs GNU Wget (with SSL support) or cURL to be installed.
|
# Needs GNU Wget (with SSL support) or cURL to be installed.
|
||||||
# default: "0" do not use HTTPS
|
# default: "0" do not use HTTPS
|
||||||
|
@ -139,8 +139,8 @@ config service "myddns"
|
||||||
# the transfer program can find them. (might need package CA-certificates)
|
# the transfer program can find them. (might need package CA-certificates)
|
||||||
# if you don't want to verify servers certificate (insecure) you should
|
# if you don't want to verify servers certificate (insecure) you should
|
||||||
# this parameter to "IGNORE" (in capital letters)
|
# this parameter to "IGNORE" (in capital letters)
|
||||||
# default: "/etc/cacert" path where CA-certificate package is installed
|
# default: (none) path where CA-certificate package is installed
|
||||||
option cacert "/etc/cacert"
|
option cacert "/etc/ssl/certs"
|
||||||
|
|
||||||
###########
|
###########
|
||||||
# for logging and control if everything work fine you can get information inside
|
# for logging and control if everything work fine you can get information inside
|
||||||
|
@ -210,11 +210,10 @@ config service "myddns"
|
||||||
option force_ipversion "0"
|
option force_ipversion "0"
|
||||||
|
|
||||||
###########
|
###########
|
||||||
# normally the current (in the internet) registered ip is detected using the
|
# Normally the current (in the internet) registered ip is detected using the
|
||||||
# local defined name lookup policies (i.e. /etc/resolve.conf etc.)
|
# local defined name lookup policies (i.e. /etc/resolve.conf etc.)
|
||||||
# Specify here a DNS server to use instead of the defaults.
|
# Specify here a DNS server to use instead of the defaults.
|
||||||
# you can use hostname or ip address
|
# you can use hostname or ip address
|
||||||
# IPv6 address must be in squared brackets "[...]"
|
|
||||||
# i.e. "google-public-dns-a.google.com"
|
# i.e. "google-public-dns-a.google.com"
|
||||||
# default: none
|
# default: none
|
||||||
# option dns_server "google-public-dns-a.google.com"
|
# option dns_server "google-public-dns-a.google.com"
|
||||||
|
@ -236,6 +235,7 @@ config service "myddns"
|
||||||
# ip_source='web' (see above) because this request is also
|
# ip_source='web' (see above) because this request is also
|
||||||
# send via the configured proxy !!!
|
# send via the configured proxy !!!
|
||||||
# Syntax: [user:password@]proxy:port !port is required !
|
# Syntax: [user:password@]proxy:port !port is required !
|
||||||
|
# IPv6 address must be in squared brackets "[...]"
|
||||||
# default: none
|
# default: none
|
||||||
# option proxy ''
|
# option proxy ''
|
||||||
|
|
||||||
|
@ -247,7 +247,7 @@ config service "myddns"
|
||||||
# wait this time before verify if update was successful send.
|
# wait this time before verify if update was successful send.
|
||||||
# !!! checks below 5 minutes make no sense because the Internet
|
# !!! checks below 5 minutes make no sense because the Internet
|
||||||
# needs about 5-10 minutes to sync an IP-change to all DNS servers !!!
|
# needs about 5-10 minutes to sync an IP-change to all DNS servers !!!
|
||||||
# accepted unit entry’s: 'seconds' 'minutes' 'hours' 'days'
|
# accepted unit entry’s: 'seconds' 'minutes' 'hours'
|
||||||
# minimum 5 minutes == 300 seconds
|
# minimum 5 minutes == 300 seconds
|
||||||
# default 10 minutes
|
# default 10 minutes
|
||||||
option check_interval '10'
|
option check_interval '10'
|
||||||
|
@ -256,7 +256,7 @@ config service "myddns"
|
||||||
###########
|
###########
|
||||||
# force to send an update to service provider, if no change was detected.
|
# force to send an update to service provider, if no change was detected.
|
||||||
# consult DDNS providers documentation if your DDNS entry might timeout.
|
# consult DDNS providers documentation if your DDNS entry might timeout.
|
||||||
# accepted unit entry’s: 'seconds' 'minutes' 'hours' 'days'
|
# accepted unit entry’s: 'minutes' 'hours' 'days'
|
||||||
# minimum needs to be greater or equal check interval (see above)
|
# minimum needs to be greater or equal check interval (see above)
|
||||||
# A special setting of '0' is allowed, which forces the script to run once.
|
# A special setting of '0' is allowed, which forces the script to run once.
|
||||||
# It sends an update, verify if update was accepted by DNS
|
# It sends an update, verify if update was accepted by DNS
|
||||||
|
@ -276,7 +276,7 @@ config service "myddns"
|
||||||
# if error happen on detecting, sending or updating the
|
# if error happen on detecting, sending or updating the
|
||||||
# script will retry the relevant action.
|
# script will retry the relevant action.
|
||||||
# here you define the time to wait before retry is started
|
# here you define the time to wait before retry is started
|
||||||
# accepted unit entry’s: 'seconds' 'minutes' 'hours' 'days'
|
# accepted unit entry’s: 'seconds' 'minutes'
|
||||||
# default: 60 seconds
|
# default: 60 seconds
|
||||||
option retry_interval '60'
|
option retry_interval '60'
|
||||||
option retry_unit 'seconds'
|
option retry_unit 'seconds'
|
||||||
|
|
|
@ -1,8 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if [ "$ACTION" = "ifup" ]; then
|
# there are other ACTIONs like ifupdate we don't need
|
||||||
. /usr/lib/ddns/dynamic_dns_functions.sh
|
# so parse dynamic_dns_functions.sh only when needed
|
||||||
/etc/init.d/ddns enabled && start_daemon_for_all_ddns_sections "$INTERFACE"
|
case "$ACTION" in
|
||||||
fi
|
ifup)
|
||||||
|
. /usr/lib/ddns/dynamic_dns_functions.sh
|
||||||
|
/etc/init.d/ddns enabled && start_daemon_for_all_ddns_sections "$INTERFACE"
|
||||||
|
;;
|
||||||
|
ifdown)
|
||||||
|
. /usr/lib/ddns/dynamic_dns_functions.sh
|
||||||
|
stop_daemon_for_all_ddns_sections "$INTERFACE"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
|
@ -1,16 +1,26 @@
|
||||||
#!/bin/sh /etc/rc.common
|
#!/bin/sh /etc/rc.common
|
||||||
START=95
|
START=95
|
||||||
|
STOP=10
|
||||||
|
|
||||||
boot() {
|
boot() {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
reload() {
|
||||||
|
killall -1 dynamic_dns_updater.sh # send SIGHUP
|
||||||
|
}
|
||||||
|
|
||||||
|
restart() {
|
||||||
|
stop
|
||||||
|
sleep 1 # give time to shutdown
|
||||||
|
start
|
||||||
|
}
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
. /usr/lib/ddns/dynamic_dns_functions.sh
|
. /usr/lib/ddns/dynamic_dns_functions.sh
|
||||||
start_daemon_for_all_ddns_sections
|
start_daemon_for_all_ddns_sections
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
killall -9 dynamic_dns_updater.sh
|
killall dynamic_dns_updater.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -10,11 +10,12 @@
|
||||||
# by Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
|
# by Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
|
||||||
# to support:
|
# to support:
|
||||||
# - IPv6 DDNS services
|
# - IPv6 DDNS services
|
||||||
# - DNS Server to retrieve registered IP including TCP transport
|
# - DNS Server to retrieve registered IP including TCP transport (Ticket 7820)
|
||||||
# - Proxy Server to send out updates
|
# - Proxy Server to send out updates
|
||||||
# - force_interval=0 to run once
|
# - force_interval=0 to run once (Luci Ticket 538)
|
||||||
# - the usage of BIND's host command instead of BusyBox's nslookup if installed
|
# - the usage of BIND's host command instead of BusyBox's nslookup if installed
|
||||||
# - extended Verbose Mode and log file support for better error detection
|
# - extended Verbose Mode and log file support for better error detection
|
||||||
|
# - wait for interface to fully come up, before the first update is done
|
||||||
#
|
#
|
||||||
# variables in small chars are read from /etc/config/ddns
|
# variables in small chars are read from /etc/config/ddns
|
||||||
# variables in big chars are defined inside these scripts as global vars
|
# variables in big chars are defined inside these scripts as global vars
|
||||||
|
@ -38,7 +39,7 @@
|
||||||
. /usr/lib/ddns/dynamic_dns_functions.sh # global vars are also defined here
|
. /usr/lib/ddns/dynamic_dns_functions.sh # global vars are also defined here
|
||||||
|
|
||||||
SECTION_ID="$1"
|
SECTION_ID="$1"
|
||||||
VERBOSE_MODE=${2:-1} #default mode is log to console
|
VERBOSE_MODE=${2:-1} # default mode is log to console
|
||||||
|
|
||||||
# set file names
|
# set file names
|
||||||
PIDFILE="$RUNDIR/$SECTION_ID.pid" # Process ID file
|
PIDFILE="$RUNDIR/$SECTION_ID.pid" # Process ID file
|
||||||
|
@ -47,15 +48,23 @@ LOGFILE="$LOGDIR/$SECTION_ID.log" # log file
|
||||||
|
|
||||||
# VERBOSE_MODE > 1 delete logfile if exist to create an empty one
|
# VERBOSE_MODE > 1 delete logfile if exist to create an empty one
|
||||||
# only with this data of this run for easier diagnostic
|
# only with this data of this run for easier diagnostic
|
||||||
# new one created by verbose_echo function
|
# new one created by write_log function
|
||||||
[ $VERBOSE_MODE -gt 1 -a -f $LOGFILE ] && rm -f $LOGFILE
|
[ $VERBOSE_MODE -gt 1 -a -f $LOGFILE ] && rm -f $LOGFILE
|
||||||
|
|
||||||
|
# TRAP handler
|
||||||
|
trap "trap_handler 0 \$?" 0 # handle script exit with exit status
|
||||||
|
trap "trap_handler 1" 1 # SIGHUP Hangup / reload config
|
||||||
|
trap "trap_handler 2" 2 # SIGINT Terminal interrupt
|
||||||
|
trap "trap_handler 3" 3 # SIGQUIT Terminal quit
|
||||||
|
#trap "trap_handler 9" 9 # SIGKILL no chance to trap
|
||||||
|
trap "trap_handler 15" 15 # SIGTERM Termination
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Leave this comment here, to clearly document variable names that are expected/possible
|
# Leave this comment here, to clearly document variable names that are expected/possible
|
||||||
# Use load_all_config_options to load config options, which is a much more flexible solution.
|
# Use load_all_config_options to load config options, which is a much more flexible solution.
|
||||||
#
|
#
|
||||||
# config_load "ddns"
|
# config_load "ddns"
|
||||||
# config_get <variable> $SECTION_ID <option]>
|
# config_get <variable> $SECTION_ID <option>
|
||||||
#
|
#
|
||||||
# defined options (also used as variable):
|
# defined options (also used as variable):
|
||||||
#
|
#
|
||||||
|
@ -108,23 +117,23 @@ LOGFILE="$LOGDIR/$SECTION_ID.log" # log file
|
||||||
[ "$(uci_get ddns $SECTION_ID)" != "service" ] && {
|
[ "$(uci_get ddns $SECTION_ID)" != "service" ] && {
|
||||||
[ $VERBOSE_MODE -le 1 ] && VERBOSE_MODE=2 # force console out and logfile output
|
[ $VERBOSE_MODE -le 1 ] && VERBOSE_MODE=2 # force console out and logfile output
|
||||||
[ -f $LOGFILE ] && rm -f $LOGFILE # clear logfile before first entry
|
[ -f $LOGFILE ] && rm -f $LOGFILE # clear logfile before first entry
|
||||||
verbose_echo "\n ************** =: ************** ************** **************"
|
write_log 7 "************ ************** ************** **************"
|
||||||
verbose_echo " STARTED =: PID '$$' at $(eval $DATE_PROG)"
|
write_log 5 "PID '$$' started at $(eval $DATE_PROG)"
|
||||||
verbose_echo " UCI CONFIG =:\n$(uci -q show ddns | grep '=service' | sort)"
|
write_log 7 "uci configuration:\n$(uci -q show ddns | grep '=service' | sort)"
|
||||||
critical_error "Service '$SECTION_ID' not defined"
|
write_log 14 "Service section '$SECTION_ID' not defined"
|
||||||
}
|
}
|
||||||
load_all_config_options "ddns" "$SECTION_ID"
|
load_all_config_options "ddns" "$SECTION_ID"
|
||||||
|
|
||||||
verbose_echo "\n ************** =: ************** ************** **************"
|
write_log 7 "************ ************** ************** **************"
|
||||||
verbose_echo " STARTED =: PID '$$' at $(eval $DATE_PROG)"
|
write_log 5 "PID '$$' started at $(eval $DATE_PROG)"
|
||||||
case $VERBOSE_MODE in
|
case $VERBOSE_MODE in
|
||||||
0) verbose_echo " verbose mode =: '0' - run normal, NO console output";;
|
0) write_log 7 "verbose mode '0' - run normal, NO console output";;
|
||||||
1) verbose_echo " verbose mode =: '1' - run normal, console mode";;
|
1) write_log 7 "verbose mode '1' - run normal, console mode";;
|
||||||
2) verbose_echo " verbose mode =: '2' - run once, NO retry on error";;
|
2) write_log 7 "verbose mode '2' - run once, NO retry on error";;
|
||||||
3) verbose_echo " verbose mode =: '3' - run once, NO retry on error, NOT sending update";;
|
3) write_log 7 "verbose mode '3' - run once, NO retry on error, NOT sending update";;
|
||||||
*) critical_error "ERROR detecting VERBOSE_MODE '$VERBOSE_MODE'"
|
*) write_log 14 "error detecting VERBOSE_MODE '$VERBOSE_MODE'";;
|
||||||
esac
|
esac
|
||||||
verbose_echo " UCI CONFIG =:\n$(uci -q show ddns.$SECTION_ID | sort)"
|
write_log 7 "uci configuraion:\n$(uci -q show ddns.$SECTION_ID | sort)"
|
||||||
|
|
||||||
# set defaults if not defined
|
# set defaults if not defined
|
||||||
[ -z "$enabled" ] && enabled=0
|
[ -z "$enabled" ] && enabled=0
|
||||||
|
@ -142,48 +151,47 @@ verbose_echo " UCI CONFIG =:\n$(uci -q show ddns.$SECTION_ID | sort)"
|
||||||
[ "$ip_source" = "web" -a -z "$ip_url" -a $use_ipv6 -eq 1 ] && ip_url="http://checkipv6.dyndns.com"
|
[ "$ip_source" = "web" -a -z "$ip_url" -a $use_ipv6 -eq 1 ] && ip_url="http://checkipv6.dyndns.com"
|
||||||
[ "$ip_source" = "interface" -a -z "$ip_interface" ] && ip_interface="eth1"
|
[ "$ip_source" = "interface" -a -z "$ip_interface" ] && ip_interface="eth1"
|
||||||
|
|
||||||
# check configuration and enabled state
|
# check enabled state otherwise we don't need to continue
|
||||||
[ -z "$domain" -o -z "$username" -o -z "$password" ] && critical_error "Service Configuration not correctly configured"
|
[ $enabled -eq 0 ] && write_log 14 "Service section disabled!"
|
||||||
[ $enabled -eq 0 ] && critical_error "Service Configuration is disabled"
|
|
||||||
|
|
||||||
# verify script if configured and executable
|
# without domain or username or password we can do nothing for you
|
||||||
|
[ -z "$domain" -o -z "$username" -o -z "$password" ] && write_log 14 "Service section not correctly configured!"
|
||||||
|
urlencode URL_USER "$username" # encode username, might be email or something like this
|
||||||
|
urlencode URL_PASS "$password" # encode password, might have special chars for security reason
|
||||||
|
|
||||||
|
# verify ip_source script if configured and executable
|
||||||
if [ "$ip_source" = "script" ]; then
|
if [ "$ip_source" = "script" ]; then
|
||||||
[ -z "$ip_script" ] && critical_error "No script defined to detect local IP"
|
[ -z "$ip_script" ] && write_log 14 "No script defined to detect local IP!"
|
||||||
[ -x "$ip_script" ] || critical_error "Script to detect local IP not found or not executable"
|
[ -x "$ip_script" ] || write_log 14 "Script to detect local IP not found or not executable!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# compute update interval in seconds
|
# compute update interval in seconds
|
||||||
get_seconds CHECK_SECONDS ${check_interval:-10} ${check_unit:-"minutes"} # default 10 min
|
get_seconds CHECK_SECONDS ${check_interval:-10} ${check_unit:-"minutes"} # default 10 min
|
||||||
get_seconds FORCE_SECONDS ${force_interval:-72} ${force_unit:-"hours"} # default 3 days
|
get_seconds FORCE_SECONDS ${force_interval:-72} ${force_unit:-"hours"} # default 3 days
|
||||||
get_seconds RETRY_SECONDS ${retry_interval:-60} ${retry_unit:-"seconds"} # default 60 sec
|
get_seconds RETRY_SECONDS ${retry_interval:-60} ${retry_unit:-"seconds"} # default 60 sec
|
||||||
verbose_echo "check interval =: $CHECK_SECONDS seconds"
|
[ $CHECK_SECONDS -lt 300 ] && CHECK_SECONDS=300 # minimum 5 minutes
|
||||||
verbose_echo "force interval =: $FORCE_SECONDS seconds"
|
[ $FORCE_SECONDS -gt 0 -a $FORCE_SECONDS -lt $CHECK_SECONDS ] && FORCE_SECONDS=$CHECK_SECONDS # FORCE_SECONDS >= CHECK_SECONDS or 0
|
||||||
verbose_echo "retry interval =: $RETRY_SECONDS seconds"
|
write_log 7 "check interval: $CHECK_SECONDS seconds"
|
||||||
verbose_echo " retry counter =: $retry_count times"
|
write_log 7 "force interval: $FORCE_SECONDS seconds"
|
||||||
|
write_log 7 "retry interval: $RETRY_SECONDS seconds"
|
||||||
|
write_log 7 "retry counter : $retry_count times"
|
||||||
|
|
||||||
# determine what update url we're using if a service_name is supplied
|
# determine what update url we're using if a service_name is supplied
|
||||||
# otherwise update_url is set inside configuration (custom service)
|
# otherwise update_url is set inside configuration (custom update url)
|
||||||
# or update_script is set inside configuration (custom update script)
|
# or update_script is set inside configuration (custom update script)
|
||||||
[ -n "$service_name" ] && get_service_data update_url update_script
|
[ -n "$service_name" ] && get_service_data update_url update_script
|
||||||
[ -z "$update_url" -a -z "$update_script" ] && critical_error "no update_url found/defined or no update_script found/defined"
|
[ -z "$update_url" -a -z "$update_script" ] && write_log 14 "No update_url found/defined or no update_script found/defined!"
|
||||||
[ -n "$update_script" -a ! -f "$update_script" ] && critical_error "custom update_script not found"
|
[ -n "$update_script" -a ! -f "$update_script" ] && write_log 14 "Custom update_script not found!"
|
||||||
|
|
||||||
#kill old process if it exists & set new pid file
|
#kill old process if it exists & set new pid file
|
||||||
if [ -d $RUNDIR ]; then
|
if [ -d $RUNDIR ]; then
|
||||||
#if process is already running, stop it
|
#if process for section is already running, stop it
|
||||||
if [ -e "$PIDFILE" ]; then
|
stop_section_processes "$SECTION_ID"
|
||||||
OLD_PID=$(cat $PIDFILE)
|
[ $? -gt 0 ] && write_log 7 "Send 'SIGTERM' to old process" || write_log 7 "No old process"
|
||||||
ps | grep -q "^[\t ]*$OLD_PID" && {
|
|
||||||
verbose_echo " old process =: PID '$OLD_PID'"
|
|
||||||
kill $OLD_PID
|
|
||||||
} || verbose_echo "old process id =: PID 'none'"
|
|
||||||
else
|
|
||||||
verbose_echo "old process id =: PID 'none'"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
#make dir since it doesn't exist
|
#make dir since it doesn't exist
|
||||||
mkdir -p $RUNDIR
|
mkdir -p $RUNDIR
|
||||||
verbose_echo "old process id =: PID 'none'"
|
write_log 7 "No old process"
|
||||||
fi
|
fi
|
||||||
echo $$ > $PIDFILE
|
echo $$ > $PIDFILE
|
||||||
|
|
||||||
|
@ -201,242 +209,118 @@ get_uptime CURR_TIME
|
||||||
[ $LAST_TIME -gt $CURR_TIME ] && LAST_TIME=0
|
[ $LAST_TIME -gt $CURR_TIME ] && LAST_TIME=0
|
||||||
}
|
}
|
||||||
if [ $LAST_TIME -eq 0 ]; then
|
if [ $LAST_TIME -eq 0 ]; then
|
||||||
verbose_echo " last update =: never"
|
write_log 7 "last update: never"
|
||||||
else
|
else
|
||||||
EPOCH_TIME=$(( $(date +%s) - CURR_TIME + LAST_TIME ))
|
EPOCH_TIME=$(( $(date +%s) - CURR_TIME + LAST_TIME ))
|
||||||
EPOCH_TIME="date -d @$EPOCH_TIME +'$DATE_FORMAT'"
|
EPOCH_TIME="date -d @$EPOCH_TIME +'$DATE_FORMAT'"
|
||||||
verbose_echo " last update =: $(eval $EPOCH_TIME)"
|
write_log 7 "last update: $(eval $EPOCH_TIME)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# we need time here because hotplug.d is fired by netifd
|
# we need time here because hotplug.d is fired by netifd
|
||||||
# but IP addresses are not set by DHCP/DHCPv6 etc.
|
# but IP addresses are not set by DHCP/DHCPv6 etc.
|
||||||
verbose_echo " waiting =: 10 seconds for interfaces to fully come up"
|
write_log 7 "Waiting 10 seconds for interfaces to fully come up"
|
||||||
sleep 10
|
sleep 10 &
|
||||||
|
PID_SLEEP=$!
|
||||||
|
wait $PID_SLEEP # enable trap-handler
|
||||||
|
PID_SLEEP=0
|
||||||
|
|
||||||
# verify DNS server:
|
# verify DNS server
|
||||||
# do with retry's because there might be configurations
|
[ -n "$dns_server" ] && verify_dns "$dns_server"
|
||||||
# not directly could connect to outside dns when interface is already up
|
|
||||||
ERR_VERIFY=0 # reset err counter
|
|
||||||
while [ -n "$dns_server" ]; do
|
|
||||||
[ $ERR_VERIFY -eq 0 ] && verbose_echo "******* VERIFY =: DNS server '$dns_server'"
|
|
||||||
verify_dns "$dns_server"
|
|
||||||
ERR_LAST=$? # save return value
|
|
||||||
[ $ERR_LAST -eq 0 ] && break # everything ok leave while loop
|
|
||||||
ERR_VERIFY=$(( $ERR_VERIFY + 1 ))
|
|
||||||
# if error count > retry_count leave here with critical error
|
|
||||||
[ $ERR_VERIFY -gt $retry_count ] && {
|
|
||||||
case $ERR_LAST in
|
|
||||||
2) critical_error "Invalid DNS server Error: '2' - nslookup can not resolve host";;
|
|
||||||
3) critical_error "Invalid DNS server Error: '3' - nc (netcat) can not connect";;
|
|
||||||
*) critical_error "Invalid DNS server Error: '$ERR_LAST' - unspecific error";;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
case $ERR_LAST in
|
|
||||||
2) syslog_err "Invalid DNS server Error: '2' - nslookup can not resolve host - retry $ERR_VERIFY/$retry_count in $RETRY_SECONDS seconds\n";;
|
|
||||||
3) syslog_err "Invalid DNS server Error: '3' - nc (netcat) can not connect - retry $ERR_VERIFY/$retry_count in $RETRY_SECONDS seconds\n";;
|
|
||||||
*) syslog_err "Invalid DNS server Error: '$ERR_LAST' - unspecific error - retry $ERR_VERIFY/$retry_count in $RETRY_SECONDS seconds\n";;
|
|
||||||
esac
|
|
||||||
[ $VERBOSE_MODE -gt 1 ] && {
|
|
||||||
# VERBOSE_MODE > 1 then NO retry
|
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: Verbose Mode - NO retry\n"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
verbose_echo "******** RETRY =: DNS server '$dns_server' - retry $ERR_VERIFY/$retry_count in $RETRY_SECONDS seconds"
|
|
||||||
sleep $RETRY_SECONDS
|
|
||||||
done
|
|
||||||
|
|
||||||
# verify Proxy server and set environment
|
# verify Proxy server and set environment
|
||||||
# do with retry's because there might be configurations
|
|
||||||
# not directly could connect to outside dns when interface is already up
|
|
||||||
ERR_VERIFY=0 # reset err counter
|
|
||||||
[ -n "$proxy" ] && {
|
[ -n "$proxy" ] && {
|
||||||
[ $ERR_VERIFY -eq 0 ] && verbose_echo "******* VERIFY =: Proxy server 'http://$proxy'"
|
verify_proxy "$proxy" && {
|
||||||
verify_proxy "$proxy"
|
# everything ok set proxy
|
||||||
ERR_LAST=$? # save return value
|
|
||||||
[ $ERR_LAST -eq 0 ] && {
|
|
||||||
# everything ok set proxy and leave while loop
|
|
||||||
export HTTP_PROXY="http://$proxy"
|
export HTTP_PROXY="http://$proxy"
|
||||||
export HTTPS_PROXY="http://$proxy"
|
export HTTPS_PROXY="http://$proxy"
|
||||||
export http_proxy="http://$proxy"
|
export http_proxy="http://$proxy"
|
||||||
export https_proxy="http://$proxy"
|
export https_proxy="http://$proxy"
|
||||||
break
|
|
||||||
}
|
}
|
||||||
ERR_VERIFY=$(( $ERR_VERIFY + 1 ))
|
|
||||||
# if error count > retry_count leave here with critical error
|
|
||||||
[ $ERR_VERIFY -gt $retry_count ] && {
|
|
||||||
case $ERR_LAST in
|
|
||||||
2) critical_error "Invalid Proxy server Error '2' - nslookup can not resolve host";;
|
|
||||||
3) critical_error "Invalid Proxy server Error '3' - nc (netcat) can not connect";;
|
|
||||||
*) critical_error "Invalid Proxy server Error '$ERR_LAST' - unspecific error";;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
case $ERR_LAST in
|
|
||||||
2) syslog_err "Invalid Proxy server Error '2' - nslookup can not resolve host - retry $ERR_VERIFY/$retry_count in $RETRY_SECONDS seconds\n";;
|
|
||||||
3) syslog_err "Invalid Proxy server Error '3' - nc (netcat) can not connect - retry $ERR_VERIFY/$retry_count in $RETRY_SECONDS seconds\n";;
|
|
||||||
*) syslog_err "Invalid Proxy server Error '$ERR_LAST' - unspecific error - retry $ERR_VERIFY/$retry_count in $RETRY_SECONDS seconds\n";;
|
|
||||||
esac
|
|
||||||
[ $VERBOSE_MODE -gt 1 ] && {
|
|
||||||
# VERBOSE_MODE > 1 then NO retry
|
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: Verbose Mode - NO retry\n"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
verbose_echo "******** RETRY =: Proxy server 'http://$proxy' - retry $ERR_VERIFY/$retry_count in $RETRY_SECONDS seconds"
|
|
||||||
sleep $RETRY_SECONDS
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# let's check if there is already an IP registered at the web
|
# let's check if there is already an IP registered at the web
|
||||||
# but ignore errors if not
|
# but ignore errors if not
|
||||||
verbose_echo "******* DETECT =: Registered IP"
|
get_registered_ip REGISTERED_IP "NO_RETRY"
|
||||||
get_registered_ip REGISTERED_IP
|
|
||||||
|
|
||||||
# loop endlessly, checking ip every check_interval and forcing an updating once every force_interval
|
# loop endlessly, checking ip every check_interval and forcing an updating once every force_interval
|
||||||
# NEW: ### Luci Ticket 538
|
write_log 6 "Starting main loop at $(eval $DATE_PROG)"
|
||||||
# a "force_interval" of "0" will run this script only once
|
|
||||||
# the update is only done once when an interface goes up
|
|
||||||
# or you run /etc/init.d/ddns start or you can use a cron job
|
|
||||||
# it will force an update without check when lastupdate happen
|
|
||||||
# but it will verify after "check_interval" if update is seen in the web
|
|
||||||
# and retries on error retry_count times
|
|
||||||
# CHANGES: ### Ticket 16363
|
|
||||||
# modified nslookup / sed / grep to detect registered ip
|
|
||||||
# NEW: ### Ticket 7820
|
|
||||||
# modified nslookup to support non standard dns_server (needs to be defined in /etc/config/ddns)
|
|
||||||
# support for BIND host command.
|
|
||||||
# Wait for interface to fully come up, before the first update is done
|
|
||||||
verbose_echo "*** START LOOP =: $(eval $DATE_PROG)"
|
|
||||||
# we run NOT once
|
|
||||||
[ $FORCE_SECONDS -gt 0 -o $VERBOSE_MODE -le 1 ] && syslog_info "Starting main loop"
|
|
||||||
|
|
||||||
while : ; do
|
while : ; do
|
||||||
|
|
||||||
# read local IP
|
get_local_ip LOCAL_IP # read local IP
|
||||||
verbose_echo "******* DETECT =: Local IP"
|
|
||||||
get_local_ip LOCAL_IP
|
|
||||||
ERR_LAST=$? # save return value
|
|
||||||
# Error in function
|
|
||||||
[ $ERR_LAST -gt 0 ] && {
|
|
||||||
if [ $VERBOSE_MODE -le 1 ]; then # VERBOSE_MODE <= 1 then retry
|
|
||||||
# we can't read local IP
|
|
||||||
ERR_LOCAL_IP=$(( $ERR_LOCAL_IP + 1 ))
|
|
||||||
[ $ERR_LOCAL_IP -gt $retry_count ] && critical_error "Can not detect local IP"
|
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: detecting local IP - retry $ERR_LOCAL_IP/$retry_count in $RETRY_SECONDS seconds\n"
|
|
||||||
syslog_err "Error detecting local IP - retry $ERR_LOCAL_IP/$retry_count in $RETRY_SECONDS seconds"
|
|
||||||
sleep $RETRY_SECONDS
|
|
||||||
continue # jump back to the beginning of while loop
|
|
||||||
else
|
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: detecting local IP - NO retry\n"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
ERR_LOCAL_IP=0 # reset err counter
|
|
||||||
|
|
||||||
# prepare update
|
# prepare update
|
||||||
# never updated or forced immediate then NEXT_TIME = 0
|
# never updated or forced immediate then NEXT_TIME = 0
|
||||||
[ $FORCE_SECONDS -eq 0 -o $LAST_TIME -eq 0 ] \
|
[ $FORCE_SECONDS -eq 0 -o $LAST_TIME -eq 0 ] \
|
||||||
&& NEXT_TIME=0 \
|
&& NEXT_TIME=0 \
|
||||||
|| NEXT_TIME=$(( $LAST_TIME + $FORCE_SECONDS ))
|
|| NEXT_TIME=$(( $LAST_TIME + $FORCE_SECONDS ))
|
||||||
# get current uptime
|
|
||||||
get_uptime CURR_TIME
|
get_uptime CURR_TIME # get current uptime
|
||||||
|
|
||||||
# send update when current time > next time or local ip different from registered ip (as loop on error)
|
# send update when current time > next time or local ip different from registered ip
|
||||||
ERR_SEND=0
|
if [ $CURR_TIME -ge $NEXT_TIME -o "$LOCAL_IP" != "$REGISTERED_IP" ]; then
|
||||||
while [ $CURR_TIME -ge $NEXT_TIME -o "$LOCAL_IP" != "$REGISTERED_IP" ]; do
|
|
||||||
if [ $VERBOSE_MODE -gt 2 ]; then
|
if [ $VERBOSE_MODE -gt 2 ]; then
|
||||||
verbose_echo " VERBOSE MODE =: NO UPDATE send to DDNS provider"
|
write_log 7 "Verbose Mode: $VERBOSE_MODE - NO UPDATE send"
|
||||||
elif [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then
|
elif [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then
|
||||||
verbose_echo "******* UPDATE =: LOCAL: '$LOCAL_IP' <> REGISTERED: '$REGISTERED_IP'"
|
write_log 7 "Update needed - L: '$LOCAL_IP' <> R: '$REGISTERED_IP'"
|
||||||
else
|
else
|
||||||
verbose_echo "******* FORCED =: LOCAL: '$LOCAL_IP' == REGISTERED: '$REGISTERED_IP'"
|
write_log 7 "Forced Update - L: '$LOCAL_IP' == R: '$REGISTERED_IP'"
|
||||||
fi
|
fi
|
||||||
# only send if VERBOSE_MODE < 3
|
|
||||||
ERR_LAST=0
|
ERR_LAST=0
|
||||||
[ $VERBOSE_MODE -lt 3 ] && {
|
[ $VERBOSE_MODE -lt 3 ] && {
|
||||||
send_update "$LOCAL_IP"
|
# only send if VERBOSE_MODE < 3
|
||||||
|
send_update "$LOCAL_IP"
|
||||||
ERR_LAST=$? # save return value
|
ERR_LAST=$? # save return value
|
||||||
}
|
}
|
||||||
|
|
||||||
# Error in function
|
# error sending local IP to provider
|
||||||
if [ $ERR_LAST -gt 0 ]; then
|
# we have no communication error (handled inside send_update/do_transfer)
|
||||||
if [ $VERBOSE_MODE -le 1 ]; then # VERBOSE_MODE <=1 then retry
|
# but update was not recognized
|
||||||
# error sending local IP
|
# do NOT retry after RETRY_SECONDS, do retry after CHECK_SECONDS
|
||||||
ERR_SEND=$(( $ERR_SEND + 1 ))
|
# to early retrys will block most DDNS provider
|
||||||
[ $ERR_SEND -gt $retry_count ] && critical_error "can not send update to DDNS Provider"
|
# providers answer is checked inside send_update() function
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: sending update - retry $ERR_SEND/$retry_count in $RETRY_SECONDS seconds\n"
|
[ $ERR_LAST -eq 0 ] && {
|
||||||
syslog_err "Error sending update - retry $ERR_SEND/$retry_count in $RETRY_SECONDS seconds"
|
get_uptime LAST_TIME # we send update, so
|
||||||
sleep $RETRY_SECONDS
|
|
||||||
continue # re-loop
|
|
||||||
else
|
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: sending update to DDNS service - NO retry\n"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# we send data so save "last time"
|
|
||||||
get_uptime LAST_TIME
|
|
||||||
echo $LAST_TIME > $UPDFILE # save LASTTIME to file
|
echo $LAST_TIME > $UPDFILE # save LASTTIME to file
|
||||||
[ "$LOCAL_IP" != "$REGISTERED_IP" ] \
|
[ "$LOCAL_IP" != "$REGISTERED_IP" ] \
|
||||||
&& syslog_notice "Changed IP: '$LOCAL_IP' successfully send" \
|
&& write_log 6 "Update successful - IP '$LOCAL_IP' send" \
|
||||||
|| syslog_notice "Forced Update: IP: '$LOCAL_IP' successfully send"
|
|| write_log 6 "Forced update successful - IP: '$LOCAL_IP' send"
|
||||||
break # leave while
|
} || write_log 3 "Can not update IP at DDNS Provider"
|
||||||
fi
|
fi
|
||||||
done
|
|
||||||
|
|
||||||
# now we wait for check interval before testing if update was recognized
|
# now we wait for check interval before testing if update was recognized
|
||||||
# only sleep if VERBOSE_MODE <= 2 because nothing send so do not wait
|
# only sleep if VERBOSE_MODE <= 2 because otherwise nothing was send
|
||||||
[ $VERBOSE_MODE -le 2 ] && {
|
[ $VERBOSE_MODE -le 2 ] && {
|
||||||
verbose_echo "****** WAITING =: $CHECK_SECONDS seconds (Check Interval) before continue"
|
write_log 7 "Waiting $CHECK_SECONDS seconds (Check Interval)"
|
||||||
sleep $CHECK_SECONDS
|
sleep $CHECK_SECONDS &
|
||||||
} || verbose_echo " VERBOSE MODE =: NO WAITING for Check Interval\n"
|
PID_SLEEP=$!
|
||||||
|
wait $PID_SLEEP # enable trap-handler
|
||||||
|
PID_SLEEP=0
|
||||||
|
} || write_log 7 "Verbose Mode: $VERBOSE_MODE - NO Check Interval waiting"
|
||||||
|
|
||||||
# read at DDNS service registered IP (in loop on error)
|
REGISTERED_IP="" # clear variable
|
||||||
REGISTERED_IP=""
|
get_registered_ip REGISTERED_IP # get registered/public IP
|
||||||
ERR_REG_IP=0
|
|
||||||
while : ; do
|
|
||||||
verbose_echo "******* DETECT =: Registered IP"
|
|
||||||
get_registered_ip REGISTERED_IP
|
|
||||||
ERR_LAST=$? # save return value
|
|
||||||
|
|
||||||
# No Error in function we leave while loop
|
|
||||||
[ $ERR_LAST -eq 0 ] && break
|
|
||||||
|
|
||||||
# we can't read Registered IP
|
|
||||||
if [ $VERBOSE_MODE -le 1 ]; then # VERBOSE_MODE <=1 then retry
|
|
||||||
ERR_REG_IP=$(( $ERR_REG_IP + 1 ))
|
|
||||||
[ $ERR_REG_IP -gt $retry_count ] && critical_error "can not detect registered local IP"
|
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: detecting Registered IP - retry $ERR_REG_IP/$retry_count in $RETRY_SECONDS seconds\n"
|
|
||||||
syslog_err "Error detecting Registered IP - retry $ERR_REG_IP/$retry_count in $RETRY_SECONDS seconds"
|
|
||||||
sleep $RETRY_SECONDS
|
|
||||||
else
|
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: detecting Registered IP - NO retry\n"
|
|
||||||
break # leave while loop
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# IP's are still different
|
# IP's are still different
|
||||||
if [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then
|
if [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then
|
||||||
if [ $VERBOSE_MODE -le 1 ]; then # VERBOSE_MODE <=1 then retry
|
if [ $VERBOSE_MODE -le 1 ]; then # VERBOSE_MODE <=1 then retry
|
||||||
ERR_UPDATE=$(( $ERR_UPDATE + 1 ))
|
ERR_UPDATE=$(( $ERR_UPDATE + 1 ))
|
||||||
[ $ERR_UPDATE -gt $retry_count ] && critical_error "Registered IP <> Local IP - LocalIP: '$LOCAL_IP' - RegisteredIP: '$REGISTERED_IP'"
|
[ $ERR_UPDATE -gt $retry_count ] && write_log 14 "Updating IP at DDNS provider failed after $retry_count retries"
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: Registered IP <> Local IP - starting retry $ERR_UPDATE/$retry_count\n"
|
write_log 4 "Updating IP at DDNS provider failed - starting retry $ERR_UPDATE/$retry_count"
|
||||||
syslog_warn "Warning: Registered IP <> Local IP - starting retry $ERR_UPDATE/$retry_count"
|
|
||||||
continue # loop to beginning
|
continue # loop to beginning
|
||||||
else
|
else
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: Registered IP <> Local IP - LocalIP: '$LOCAL_IP' - RegisteredIP: '$REGISTERED_IP' - NO retry\n"
|
write_log 4 "Updating IP at DDNS provider failed"
|
||||||
|
write_log 7 "Verbose Mode: $VERBOSE_MODE - NO retry"; exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
else
|
||||||
|
# we checked successful the last update
|
||||||
|
ERR_UPDATE=0 # reset error counter
|
||||||
|
fi
|
||||||
|
|
||||||
# we checked successful the last update
|
# force_update=0 or VERBOSE_MODE > 1 - leave here
|
||||||
ERR_UPDATE=0 # reset error counter
|
[ $VERBOSE_MODE -gt 1 ] && write_log 7 "Verbose Mode: $VERBOSE_MODE - NO reloop"; exit 0
|
||||||
|
[ $FORCE_SECONDS -eq 0 ] && write_log 6 "Configured to run once"; exit 0
|
||||||
# force_update=0 or VERBOSE_MODE > 1 - leave the main loop
|
write_log 6 "Rerun IP check at $(eval $DATE_PROG)"
|
||||||
[ $FORCE_SECONDS -eq 0 -o $VERBOSE_MODE -gt 1 ] && {
|
|
||||||
verbose_echo "****** LEAVING =: $(eval $DATE_PROG)"
|
|
||||||
syslog_info "Leaving"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
verbose_echo "********* LOOP =: $(eval $DATE_PROG)"
|
|
||||||
syslog_info "Rerun IP check"
|
|
||||||
done
|
done
|
||||||
|
# we should never come here there must be a programming error
|
||||||
verbose_echo "****** STOPPED =: PID '$$' at $(eval $DATE_PROG)\n"
|
write_log 12 "Error in 'dynamic_dns_updater.sh - program coding error"
|
||||||
syslog_info "Done"
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
|
@ -1,45 +1,54 @@
|
||||||
# This file contains the update urls for various dynamic dns services.
|
#444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444
|
||||||
# Column one contains the service name, column two contains the update url.
|
#4
|
||||||
# within the update url there are 4 variables you can use: [USERNAME],
|
#4 This file contains the update urls for various dynamic dns services.
|
||||||
# [PASSWORD], [DOMAIN] and [IP]. These are substituted for the username,
|
#4 Column one contains the service name, column two contains the update url.
|
||||||
# password, and domain name specified in the /etc/config/ddns file when an
|
#4 within the update url there are 4 variables you can use: [USERNAME],
|
||||||
# update is performed. The IP is substituted for the current ip address of the
|
#4 [PASSWORD], [DOMAIN] and [IP]. These are substituted for the username,
|
||||||
# router. These variables are case sensitive, while urls generally are not, so
|
#4 password, and domain name specified in the /etc/config/ddns file when an
|
||||||
# if you need to enter the same text in the url (which seems very unlikely) put
|
#4 update is performed. The IP is substituted for the current ip address of the
|
||||||
# that text in lowercase, while the variables should remain in uppercase
|
#4 router. These variables are case sensitive, while urls generally are not, so
|
||||||
|
#4 if you need to enter the same text in the url (which seems very unlikely) put
|
||||||
|
#4 that text in lowercase, while the variables should remain in uppercase
|
||||||
|
#4
|
||||||
|
#4 There are TONS of dynamic dns services out there. There's a huge list of them at:
|
||||||
|
#4 http://www.dmoz.org/Computers/Software/Internet/Servers/Address_Management/Dynamic_DNS_Services/
|
||||||
|
#4 If anyone has time they could update this file to be compatible with a bunch of them
|
||||||
|
#4
|
||||||
|
#4 !!! Since ddns-scripts Version 2.x the update of IPv6 addresses is also supported
|
||||||
|
#4 !!! This file is used for update of IPv4 adresses only. For IPv6 use services_ipv6
|
||||||
|
#4
|
||||||
|
#4 !!! Since ddns-scripts Version 2.x the update via provider specific update scripts is supported.
|
||||||
|
#4 !!! This scripts must be located at /usr/lib/ddns directory if defined inside this file.
|
||||||
|
#4 !!! Use only the script name (without path). Sample:
|
||||||
|
#4 !!! "example.com" "update_sample.sh"
|
||||||
|
#4
|
||||||
|
#444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444
|
||||||
|
|
||||||
"dyndns.org" "http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
"dyndns.org" "http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
||||||
"changeip.com" "http://[USERNAME]:[PASSWORD]@nic.changeip.com/nic/update?u=[USERNAME]&p=[PASSWORD]&cmd=update&hostname=[DOMAIN]&ip=[IP]"
|
"changeip.com" "http://[USERNAME]:[PASSWORD]@nic.changeip.com/nic/update?u=[USERNAME]&p=[PASSWORD]&cmd=update&hostname=[DOMAIN]&ip=[IP]"
|
||||||
"zoneedit.com" "http://[USERNAME]:[PASSWORD]@dynamic.zoneedit.com/auth/dynamic.html?host=[DOMAIN]&dnsto=[IP]"
|
"zoneedit.com" "http://[USERNAME]:[PASSWORD]@dynamic.zoneedit.com/auth/dynamic.html?host=[DOMAIN]&dnsto=[IP]"
|
||||||
"free.editdns.net" "http://dyndns-free.editdns.net/api/dynLinux.php?p=[PASSWORD]&r=[DOMAIN]"
|
"free.editdns.net" "http://dyndns-free.editdns.net/api/dynLinux.php?p=[PASSWORD]&r=[DOMAIN]"
|
||||||
|
|
||||||
#noip is an alias of no-ip, so allow both names for the same service
|
# noip is an alias of no-ip, so allow both names for the same service
|
||||||
"no-ip.com" "http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
# use provider specific update script
|
||||||
"noip.com" "http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
"no-ip.com" "update_no-ip.sh"
|
||||||
|
"noip.com" "update_no-ip.sh"
|
||||||
|
|
||||||
#freedns.afraid.org is weird, you just need an update code, for which we use the password variable
|
#freedns.afraid.org is weird, you just need an update code, for which we use the password variable
|
||||||
"freedns.afraid.org" "http://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]"
|
"freedns.afraid.org" "http://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]"
|
||||||
|
|
||||||
#### ADD YOURS HERE! ######################################################################################
|
|
||||||
# #
|
|
||||||
# There are TONS of dynamic dns services out there. There's a huge list of them at: #
|
|
||||||
# http://www.dmoz.org/Computers/Software/Internet/Servers/Address_Management/Dynamic_DNS_Services/ #
|
|
||||||
# If anyone has time they could update this file to be compatible with a bunch of them #
|
|
||||||
# #
|
|
||||||
###########################################################################################################
|
|
||||||
|
|
||||||
# DNS Max and resellers' update urls
|
# DNS Max and resellers' update urls
|
||||||
"dnsmax.com" "http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=1&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
|
"dnsmax.com" "http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=1&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
|
||||||
"thatip.com" "http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=2&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
|
"thatip.com" "http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=2&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
|
||||||
|
|
||||||
# Hurricane Electric Dynamic DNS
|
# Hurricane Electric Dynamic DNS
|
||||||
"he.net" "http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
"he.net" "http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
|
||||||
# DNSdynamic.org
|
# DNSdynamic.org
|
||||||
"dnsdynamic.org" "http://[USERNAME]:[PASSWORD]@www.dnsdynamic.org/api/?hostname=[DOMAIN]&myip=[IP]"
|
"dnsdynamic.org" "http://[USERNAME]:[PASSWORD]@www.dnsdynamic.org/api/?hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
|
||||||
# dnsExit.com free dynamic DNS update url
|
# dnsExit.com free dynamic DNS update url
|
||||||
"dnsexit.com" "http://www.dnsexit.com/RemoteUpdate.sv?login=[USERNAME]&password=[PASSWORD]&host=[DOMAIN]&myip=[IP]"
|
"dnsexit.com" "http://www.dnsexit.com/RemoteUpdate.sv?login=[USERNAME]&password=[PASSWORD]&host=[DOMAIN]&myip=[IP]"
|
||||||
|
|
||||||
# OVH
|
# OVH
|
||||||
"ovh.com" "http://[USERNAME]:[PASSWORD]@www.ovh.com/nic/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]"
|
"ovh.com" "http://[USERNAME]:[PASSWORD]@www.ovh.com/nic/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
@ -56,7 +65,7 @@
|
||||||
"namecheap.com" "http://dynamicdns.park-your-domain.com/update?host=[USERNAME]&domain=[DOMAIN]&password=[PASSWORD]&ip=[IP]"
|
"namecheap.com" "http://dynamicdns.park-your-domain.com/update?host=[USERNAME]&domain=[DOMAIN]&password=[PASSWORD]&ip=[IP]"
|
||||||
|
|
||||||
# easydns.com dynamic DNS
|
# easydns.com dynamic DNS
|
||||||
"easydns.com" "http://[USERNAME]:[PASSWORD]@api.cp.easydns.com/dyn/tomato.php?hostname=[DOMAIN]&myip=[IP]"
|
"easydns.com" "http://[USERNAME]:[PASSWORD]@api.cp.easydns.com/dyn/tomato.php?hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
|
||||||
# Winco DDNS
|
# Winco DDNS
|
||||||
"ddns.com.br" "http://[DOMAIN]:[PASSWORD]@members.ddns.com.br/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
"ddns.com.br" "http://[DOMAIN]:[PASSWORD]@members.ddns.com.br/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
@ -75,3 +84,6 @@
|
||||||
|
|
||||||
# MyDNS.JP
|
# MyDNS.JP
|
||||||
"mydns.jp" "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV4ADDR=[IP]"
|
"mydns.jp" "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV4ADDR=[IP]"
|
||||||
|
|
||||||
|
# LoopiaDNS
|
||||||
|
"loopia.se" "http://[USERNAME]:[PASSWORD]@dns.loopia.se/XDynDNSServer/XDynDNS.php?system=custom&hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
|
|
@ -1,32 +1,34 @@
|
||||||
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
#666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666
|
||||||
# !!!!! IPv6 Version of original services file !!!!!
|
#6
|
||||||
# !!!!! funtionally and syntax is the same !!!!!
|
#6 This file contains the update urls for various dynamic dns services.
|
||||||
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
#6 Column one contains the service name, column two contains the update url.
|
||||||
# This file contains the update urls for various dynamic dns services.
|
#6 within the update url there are 4 variables you can use: [USERNAME],
|
||||||
# Column one contains the service name, column two contains the update url.
|
#6 [PASSWORD], [DOMAIN] and [IP]. These are substituted for the username,
|
||||||
# within the update url there are 4 variables you can use: [USERNAME],
|
#6 password, and domain name specified in the /etc/config/ddns file when an
|
||||||
# [PASSWORD], [DOMAIN] and [IP]. These are substituted for the username,
|
#6 update is performed. The IP is substituted for the current ip address of the
|
||||||
# password, and domain name specified in the /etc/config/ddns file when an
|
#6 router. These variables are case sensitive, while urls generally are not, so
|
||||||
# update is performed. The IP is substituted for the current ip address of the
|
#6 if you need to enter the same text in the url (which seems very unlikely) put
|
||||||
# router. These variables are case sensitive, while urls generally are not, so
|
#6 that text in lowercase, while the variables should remain in uppercase
|
||||||
# if you need to enter the same text in the url (which seems very unlikely) put
|
#6
|
||||||
# that text in lowercase, while the variables should remain in uppercase
|
#6 There are TONS of dynamic dns services out there. There's a huge list of them at:
|
||||||
|
#6 http://www.dmoz.org/Computers/Software/Internet/Servers/Address_Management/Dynamic_DNS_Services/
|
||||||
|
#6 If anyone has time they could update this file to be compatible with a bunch of them
|
||||||
|
#6
|
||||||
|
#6 !!! Since ddns-scripts Version 2.x the update of IPv6 addresses is also supported
|
||||||
|
#6 !!! This file is used for update of IPv6 adresses only. For IPv4 use services
|
||||||
|
#6
|
||||||
|
#6 !!! Since ddns-scripts Version 2.x the update via provider specific update scripts is supported.
|
||||||
|
#6 !!! This scripts must be located at /usr/lib/ddns directory if defined inside this file.
|
||||||
|
#6 !!! Use only the script name (without path). Sample:
|
||||||
|
#6 !!! "example.com" "update_sample.sh"
|
||||||
|
#6
|
||||||
|
#666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666
|
||||||
|
|
||||||
# tested with
|
#IPv6 @ Securepoint Dynamic-DNS-Service
|
||||||
|
|
||||||
# Securepoint Dynamic-DNS-Service
|
|
||||||
"spdns.de" "http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
"spdns.de" "http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
|
||||||
# Hurricane Electric Dynamic DNS
|
#IPv6 @ Hurricane Electric Dynamic DNS
|
||||||
"he.net" "http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
"he.net" "http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
|
||||||
#### ADD YOURS HERE! ######################################################################################
|
#IPv6 @ MyDNS.JP
|
||||||
# #
|
|
||||||
# There are TONS of dynamic dns services out there. There's a huge list of them at: #
|
|
||||||
# http://www.dmoz.org/Computers/Software/Internet/Servers/Address_Management/Dynamic_DNS_Services/ #
|
|
||||||
# If anyone has time they could update this file to be compatible with a bunch of them #
|
|
||||||
# #
|
|
||||||
###########################################################################################################
|
|
||||||
|
|
||||||
# MyDNS.JP
|
|
||||||
"mydns.jp" "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV6ADDR=[IP]"
|
"mydns.jp" "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV6ADDR=[IP]"
|
||||||
|
|
47
net/ddns-scripts/files/usr/lib/ddns/update_no-ip.sh
Normal file
47
net/ddns-scripts/files/usr/lib/ddns/update_no-ip.sh
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
#
|
||||||
|
# script for sending updates to no-ip.com / noip.com
|
||||||
|
# 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
|
||||||
|
#
|
||||||
|
# This script is parsed by dynamic_dns_functions.sh inside send_update() function
|
||||||
|
#
|
||||||
|
# provider did not reactivate records, if no IP change was recognized
|
||||||
|
# so we send a dummy (localhost) and a seconds later we send the correct IP addr
|
||||||
|
#
|
||||||
|
local __ANSWER __LH
|
||||||
|
local __UPDURL="http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
|
||||||
|
# set IP version dependend dummy (localhost)
|
||||||
|
[ $use_ipv6 -eq 0 ] && __LH="127.0.0.1" || __LH="::1"
|
||||||
|
|
||||||
|
# lets do DUMMY transfer
|
||||||
|
write_log 7 "sending dummy IP to 'no-ip.com'"
|
||||||
|
__URL=$(echo $__UPDURL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
|
||||||
|
-e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__LH#g")
|
||||||
|
[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
|
||||||
|
|
||||||
|
do_transfer __ANSWER "$__URL" || return 1
|
||||||
|
|
||||||
|
write_log 7 "'no-ip.com' answered:\n$__ANSWER"
|
||||||
|
# analyse provider answers
|
||||||
|
# "good [IP_ADR]" = successful
|
||||||
|
# "nochg [IP_ADR]" = no change but OK
|
||||||
|
echo "$__ANSWER" | grep -E "good|nochg" >/dev/null 2>&1 || return 1
|
||||||
|
|
||||||
|
# lets wait a seconds
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
# now send the correct data
|
||||||
|
write_log 7 "sending real IP to 'no-ip.com'"
|
||||||
|
__URL=$(echo $__UPDURL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
|
||||||
|
-e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__IP#g")
|
||||||
|
[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
|
||||||
|
|
||||||
|
do_transfer __ANSWER "$__URL" || return 1
|
||||||
|
|
||||||
|
write_log 7 "'no-ip.com' answered:\n$__ANSWER"
|
||||||
|
# analyse provider answers
|
||||||
|
# "good [IP_ADR]" = successful
|
||||||
|
# "nochg [IP_ADR]" = no change but OK
|
||||||
|
echo "$__ANSWER" | grep -E "good|nochg" >/dev/null 2>&1
|
||||||
|
return $? # "0" if "good" or "nochg" found
|
||||||
|
|
|
@ -16,22 +16,22 @@
|
||||||
#
|
#
|
||||||
# the code here is the copy of the default used inside send_update()
|
# the code here is the copy of the default used inside send_update()
|
||||||
#
|
#
|
||||||
local __USER __PASS __ANSWER
|
local __ANSWER
|
||||||
# tested with spdns.de
|
# tested with spdns.de
|
||||||
local __URL="http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
local __URL="http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
|
||||||
|
|
||||||
# do replaces in URL
|
# do replaces in URL
|
||||||
__urlencode __USER "$username" # encode username, might be email or something like this
|
__URL=$(echo $__URL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
|
||||||
__urlencode __PASS "$password" # encode password, might have special chars for security reason
|
|
||||||
__URL=$(echo $__URL | sed -e "s#\[USERNAME\]#$__USER#g" -e "s#\[PASSWORD\]#$__PASS#g" \
|
|
||||||
-e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__IP#g")
|
-e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__IP#g")
|
||||||
[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
|
[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
|
||||||
|
|
||||||
__do_transfer __ANSWER "$__URL"
|
do_transfer __ANSWER "$__URL" || return 1
|
||||||
__ERR=$?
|
|
||||||
[ $__ERR -gt 0 ] && {
|
write_log 7 "DDNS Provider answered:\n$__ANSWER"
|
||||||
verbose_echo "\n!!!!!!!!! ERROR =: Error sending update to DDNS Provider\n"
|
|
||||||
return 1
|
# analyse provider answers
|
||||||
}
|
# "good [IP_ADR]" = successful
|
||||||
verbose_echo " update send =: DDNS Provider answered\n$__ANSWER"
|
# "nochg [IP_ADR]" = no change but OK
|
||||||
return 0
|
echo "$__ANSWER" | grep -E "good|nochg" >/dev/null 2>&1
|
||||||
|
return $? # "0" if "good" or "nochg" found
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue