From 28a93eed3c125d4aef983cca05c56f93d484fa5d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 12 Aug 2010 10:30:05 +0000 Subject: 6in4: fix local address detection on ppp links (#7728) SVN-Revision: 22605 --- package/6in4/files/6in4.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/6in4/files') diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh index 5e416ee..a119138 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 -- cgit v1.1