From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 12 Aug 2010 10:30:05 +0000 (+0000)
Subject: 6in4: fix local address detection on ppp links (#7728)
X-Git-Tag: reboot~19162
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28a93eed3c125d4aef983cca05c56f93d484fa5d;p=oweals%2Fopenwrt.git

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

SVN-Revision: 22605
---

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