qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-18 07:10:18 +02:00
Code

[package] 6to4: don't start if detected local IPv4 address is RFC1918, allows people to deploy firmwares with 6to4 enabled by default

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27160 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-06-12 18:59:40 +00:00
parent e81bc2b573
commit 9f0d58cb15
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/6to4/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6to4 PKG_NAME:=6to4
PKG_VERSION:=3 PKG_VERSION:=4
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

16
package/6to4/files/6to4.sh
View File

@ -1,5 +1,5 @@
# 6to4.sh - IPv6-in-IPv4 tunnel backend # 6to4.sh - IPv6-in-IPv4 tunnel backend
# Copyright (c) 2010 OpenWrt.org # Copyright (c) 2010-2011 OpenWrt.org
find_6to4_wanif() { find_6to4_wanif() {
local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}" local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}"
@ -18,6 +18,15 @@ find_6to4_prefix() {
printf "2002:%02x%02x:%02x%02x\n" $1 $2 $3 $4 printf "2002:%02x%02x:%02x%02x\n" $1 $2 $3 $4
} }
test_6to4_rfc1918()
{
local oIFS="$IFS"; IFS="."; set -- $1; IFS="$oIFS"
[ $1 -eq 10 ] && return 0
[ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0
[ $1 -eq 172 ] && [ $2 -ge 16 ] && [ $2 -le 31 ] && return 0
return 1
}
set_6to4_radvd_interface() { set_6to4_radvd_interface() {
local cfgid="$1" local cfgid="$1"
local lanif="${2:-lan}" local lanif="${2:-lan}"
@ -136,6 +145,11 @@ setup_interface_6to4() {
} }
} }
test_6to4_rfc1918 "$local4" && {
logger -t "$link" "Local wan ip $local4 is private - aborting"
return
}
[ -n "$local4" ] && { [ -n "$local4" ] && {
logger -t "$link" "Starting ..." logger -t "$link" "Starting ..."