mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

6to4: follow RFC 6598 and consider 100.61.0.0/10 a private range (#11323) 

SVN-Revision: 31444
This commit is contained in:
Jo-Philipp Wich 2012-04-23 10:12:00 +00:00
parent d4f3677cba
commit 5d0f47e4bb
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/6to4/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2010-2011 OpenWrt.org # Copyright (C) 2010-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6to4 PKG_NAME:=6to4
PKG_VERSION:=7 PKG_VERSION:=8
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

4
package/6to4/files.old/6to4.sh
View File

@ -24,6 +24,10 @@ test_6to4_rfc1918()
[ $1 -eq 10 ] && return 0 [ $1 -eq 10 ] && return 0
[ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0 [ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0
[ $1 -eq 172 ] && [ $2 -ge 16 ] && [ $2 -le 31 ] && return 0 [ $1 -eq 172 ] && [ $2 -ge 16 ] && [ $2 -le 31 ] && return 0
# RFC 6598
[ $1 -eq 100 ] && [ $2 -ge 64 ] && [ $2 -le 127 ] && return 0
return 1 return 1
} }

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

@ -31,6 +31,10 @@ test_6to4_rfc1918()
[ $1 -eq 10 ] && return 0 [ $1 -eq 10 ] && return 0
[ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0 [ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0
[ $1 -eq 172 ] && [ $2 -ge 16 ] && [ $2 -le 31 ] && return 0 [ $1 -eq 172 ] && [ $2 -ge 16 ] && [ $2 -le 31 ] && return 0
# RFC 6598
[ $1 -eq 100 ] && [ $2 -ge 64 ] && [ $2 -le 127 ] && return 0
return 1 return 1
} }
@ -221,7 +225,7 @@ proto_6to4_teardown() {
} }
proto_6to4_init_config() { proto_6to4_init_config() {
no_device=1 no_device=1
available=1 available=1
proto_config_add_string "ipaddr" proto_config_add_string "ipaddr"