diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-12 10:30:05 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-12 10:30:05 +0000 |
| commit | e7b3af1cbaa8e89a29eede0823ab770ead1f107e (patch) | |
| tree | 8f4e754f72d05d1a7072e42f61402a0c33390bbe | |
| parent | 01658f6e25197d603a1fcd0c14eda097316bf5a2 (diff) | |
[package] 6in4: fix local address detection on ppp links (#7728)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22605 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/6in4/Makefile | 2 | ||||
| -rwxr-xr-x | package/6in4/files/6in4.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile index 75e784882..289d28ee3 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 5e416ee0b..a119138d0 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 |