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

SVN-Revision: 22605
This commit is contained in:
Jo-Philipp Wich 2010-08-12 10:30:05 +00:00
parent 2d175dcdce
commit 28a93eed3c
2 changed files with 3 additions and 3 deletions

View file

@ -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

View file

@ -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