bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] ddns_scripts: use network_get_ipaddr() to determine currently effective IP from ip_network

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31939 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-05-28 03:38:44 +00:00
parent 8e475b8179
commit d671785a36
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ddns-scripts/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-scripts PKG_NAME:=ddns-scripts
PKG_VERSION:=1.0.0 PKG_VERSION:=1.0.0
PKG_RELEASE:=19 PKG_RELEASE:=20
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

12
net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
View File

@ -8,8 +8,8 @@
. /etc/functions.sh . /lib/functions.sh
include /lib/network . /lib/functions/network.sh
#loads all options for a given package and section #loads all options for a given package and section
@ -64,13 +64,13 @@ get_current_ip()
then then
ip_network="wan" ip_network="wan"
fi fi
scan_interfaces
config_load /var/state/network
config_get ip_interface $ip_network ifname
fi fi
current_ip=''; current_ip='';
if [ "$ip_source" = "network" ] || [ "$ip_source" = "interface" ] if [ "$ip_source" = "network" ]
then
network_get_ipaddr current_ip "$ip_network" || return
elif [ "$ip_source" = "interface" ]
then then
current_ip=$(ifconfig $ip_interface | grep -o 'inet addr:[0-9.]*' | grep -o "$ip_regex") current_ip=$(ifconfig $ip_interface | grep -o 'inet addr:[0-9.]*' | grep -o "$ip_regex")
elif [ "$ip_source" = "script" ] elif [ "$ip_source" = "script" ]