[package] 6in4: fix local address detection on ppp links (#7728)

SVN-Revision: 22605

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 75e7848825c5e4ec60e0345ddd2dfbdcc7cbbb3d..289d28ee3f32234ec53ee6a5f69873097bb403ed 100644 (file)
--- 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 5e416ee0bd557d37b2b649cd91cd934c9272365f..a119138d0f78cd899239bd7778336ed649834177 100755 (executable)
--- 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