lede-packages-rs

commit d093904bc1d47e65bba6e262ee4823090e94a415
parent ee211f94ec292f7ec3d563fcbc147359b6cf8290
Author: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Date:   Sun, 15 Jan 2017 10:30:38 +0100

ddns-scripts: fix detecting local ip from ip command

fix detecting local ip from ip command #3834

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

Diffstat:
M
net/ddns-scripts/Makefile
 | 
2
+-
M
net/ddns-scripts/files/dynamic_dns_functions.sh
 | 
8
+++++---

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git 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 <christian.schoenebeck@gmail.com>
diff --git 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: <POINTOPOINT,MULTICAST,NOARP,UP,LOWER_UP> 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: <BROADCAST,MULTICAST,UP,LOWER_UP> 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,9 @@ 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          remove                  remove
+					#	 link     inet6 fxxx    sec      forever=>-1    between / and pref..      linestart to inet
+					sed -i "/link/d; /inet6 f/d; s/sec//g; s/forever/-1/g; s/\/.*preferred_lft//g; s/^.*$ip_interface *//g" $DATFILE
 
 					local __TIME4=0;  local __TIME6=0
 					local __TYP __ADR __TIME