From 1fd8ad1f6ff48c78e0e1c118313b46e5d2bdfdfe Mon Sep 17 00:00:00 2001 From: Christian Schoenebeck Date: Wed, 18 Jan 2017 21:54:55 +0100 Subject: [PATCH] [for-15.05] ddns-scripts: backport of 2.7.6-12 - fix detecting local ip from ip command #3834 and https://forum.lede-project.org/t/bugs-in-ddns-scripts/1000 - updated public_suffix_list.dat - minor fixes to services files Signed-off-by: Christian Schoenebeck --- net/ddns-scripts/Makefile | 2 +- net/ddns-scripts/files/dynamic_dns_functions.sh | 12 ++++++++---- net/ddns-scripts/files/public_suffix_list.dat | 14 ++++++++++---- net/ddns-scripts/files/services | 2 +- net/ddns-scripts/files/services_ipv6 | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index c57c9f326f..7c2b388faa 100755 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -12,7 +12,7 @@ PKG_NAME:=ddns-scripts PKG_VERSION:=2.7.6 # Release == build # increase on changes of services files or tld_names.dat -PKG_RELEASE:=11 +PKG_RELEASE:=12 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Christian Schoenebeck diff --git a/net/ddns-scripts/files/dynamic_dns_functions.sh b/net/ddns-scripts/files/dynamic_dns_functions.sh index 001dfa4e63..0f1d9e6127 100755 --- a/net/ddns-scripts/files/dynamic_dns_functions.sh +++ b/net/ddns-scripts/files/dynamic_dns_functions.sh @@ -907,6 +907,8 @@ get_local_ip () { __ERR=$? if [ $__ERR -eq 0 ]; then # DATFILE (sample) + # 10: l2tp-inet: mtu 1456 qdisc fq_codel state UNKNOWN qlen 3\ link/ppp + # 10: l2tp-inet inet 95.30.176.51 peer 95.30.176.1/32 scope global l2tp-inet\ valid_lft forever preferred_lft forever # 5: eth1: mtu 1500 qdisc fq_codel state UP qlen 1000\ link/ether 08:00:27:d0:10:32 brd ff:ff:ff:ff:ff:ff # 5: eth1 inet 172.27.10.128/24 brd 172.27.10.255 scope global eth1\ valid_lft forever preferred_lft forever # 5: eth1 inet 172.55.55.155/24 brd 172.27.10.255 scope global eth1\ valid_lft 12345sec preferred_lft 12345sec @@ -915,9 +917,11 @@ get_local_ip () { # 5: eth1 inet6 fd43:5368:6f6d:6500:a00:27ff:fed0:1032/64 scope global dynamic \ valid_lft 14352sec preferred_lft 14352sec # 5: eth1 inet6 2002:b0c7:f326::a00:27ff:fed0:1032/64 scope global dynamic \ valid_lft 14352sec preferred_lft 14352sec - # remove remove remove replace remove remove - # BROADCAST inet6 fxxx sec forever=>-1 between / and pref.. linestart to inet - sed -i "/BROADCAST/d; /inet6 f/d; s/sec//g; s/forever/-1/g; s/\/.*preferred_lft//g; s/^.*$ip_interface *//g" $DATFILE + # remove remove remove replace replace + # link inet6 fxxx sec forever=>-1 / => ' ' to separate subnet from ip + sed "/link/d; /inet6 f/d; s/sec//g; s/forever/-1/g; s/\// /g" $DATFILE | \ + awk '{ print $3" "$4" "$NF }' > $ERRFILE # temp reuse ERRFILE + # we only need inet? IP prefered time local __TIME4=0; local __TIME6=0 local __TYP __ADR __TIME @@ -932,7 +936,7 @@ get_local_ip () { __DATA4="$__ADR" __TIME4="$__TIME" } - done < $DATFILE + done < $ERRFILE else write_log 3 "ip Error: '$__ERR'" write_log 7 "$(cat $ERRFILE)" # report error diff --git a/net/ddns-scripts/files/public_suffix_list.dat b/net/ddns-scripts/files/public_suffix_list.dat index a2ccee3d0f..523f1507a0 100644 --- a/net/ddns-scripts/files/public_suffix_list.dat +++ b/net/ddns-scripts/files/public_suffix_list.dat @@ -5527,6 +5527,9 @@ net.om org.om pro.om +// onion : https://tools.ietf.org/html/rfc7686 +onion + // org : https://en.wikipedia.org/wiki/.org org @@ -11611,13 +11614,16 @@ us-2.evennode.com // Submitted by Peter Ruibal apps.fbsbx.com -// Fastly Inc. http://www.fastly.com/ -// Submitted by Vladimir Vuksan +// Fastly Inc. : http://www.fastly.com/ +// Submitted by Fastly Security +map.fastly.net +a.prod.fastly.net +global.prod.fastly.net a.ssl.fastly.net b.ssl.fastly.net global.ssl.fastly.net -a.prod.fastly.net -global.prod.fastly.net +fastlylb.net +map.fastlylb.net // Featherhead : https://featherhead.xyz/ // Submitted by Simon Menke diff --git a/net/ddns-scripts/files/services b/net/ddns-scripts/files/services index fd70b071bf..4058f5cf0a 100644 --- a/net/ddns-scripts/files/services +++ b/net/ddns-scripts/files/services @@ -42,7 +42,7 @@ "able.or.kr" "http://able.or.kr/ddns/src/update.php?hostname=[DOMAIN]&myip=[IP]&ddnsuser=[USERNAME]&pwd=[PASSWORD]" -"afraid.org-basicauth" "http://[USERNAME]:[PASSWORD]@freedns.afraid.org/nic/update?hostname=[DOMAIN]&myip=[IP] +"afraid.org-basicauth" "http://[USERNAME]:[PASSWORD]@freedns.afraid.org/nic/update?hostname=[DOMAIN]&myip=[IP]" "afraid.org-keyauth" "http://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]" "all-inkl.com" "http://[USERNAME]:[PASSWORD]@dyndns.kasserver.com/?myip=[IP]" diff --git a/net/ddns-scripts/files/services_ipv6 b/net/ddns-scripts/files/services_ipv6 index f2409d6ff5..bb16622ca5 100644 --- a/net/ddns-scripts/files/services_ipv6 +++ b/net/ddns-scripts/files/services_ipv6 @@ -38,7 +38,7 @@ #.godaddy.com-v1 !!! Please install additional package "ddns-scripts_godaddy.com-v1" #.no-ip.com / noip.com !!! Please install additional package "ddns-scripts_no-ip_com" -"afraid.org-basicauth" "http://[USERNAME]:[PASSWORD]@freedns.afraid.org/nic/update?hostname=[DOMAIN]&myip=[IP] +"afraid.org-basicauth" "http://[USERNAME]:[PASSWORD]@freedns.afraid.org/nic/update?hostname=[DOMAIN]&myip=[IP]" "afraid.org-keyauth" "http://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]" "all-inkl.com" "http://[USERNAME]:[PASSWORD]@dyndns.kasserver.com/?myip=[IP]" -- 2.30.2