aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-08-12 10:30:05 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-08-12 10:30:05 +0000
commit28a93eed3c125d4aef983cca05c56f93d484fa5d (patch)
treeda448002b94503bca88f299db0494622235311dd
parent2d175dcdcefdd236336c834fb842ab132ee66d0d (diff)
downloadupstream-28a93eed3c125d4aef983cca05c56f93d484fa5d.tar.gz
upstream-28a93eed3c125d4aef983cca05c56f93d484fa5d.tar.bz2
upstream-28a93eed3c125d4aef983cca05c56f93d484fa5d.zip
6in4: fix local address detection on ppp links (#7728)
SVN-Revision: 22605
-rw-r--r--package/6in4/Makefile2
-rwxr-xr-xpackage/6in4/files/6in4.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 75e7848825..289d28ee3f 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6in4
-PKG_VERSION:=3
+PKG_VERSION:=4
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index 5e416ee0bd..a119138d0f 100755
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -2,13 +2,13 @@
# Copyright (c) 2010 OpenWrt.org
find_6in4_wanif() {
- local if=$(ip -4 r l e 0/0); if="${if#default via * dev }"; if="${if%% *}"
+ local if=$(ip -4 r l e 0/0); if="${if#default* dev }"; if="${if%% *}"
[ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if"
}
find_6in4_wanip() {
local ip=$(ip -4 a s dev "$1"); ip="${ip#*inet }"
- echo "${ip%%/[0-9]* brd *}"
+ echo "${ip%%[^0-9.]*}"
}
# Hook into scan_interfaces() to synthesize a .device option