summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-23 10:12:00 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-23 10:12:00 +0000
commit4a7c3ab00aae7b7f32ae2b6071c456770fb83d91 (patch)
treecf38f78fbc21a787dd45c687591e56ea2ec56848
parent20486e3d6377e8fa0017c534038962c74c03ddbd (diff)
[package] 6to4: follow RFC 6598 and consider 100.61.0.0/10 a private range (#11323)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31444 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/6to4/Makefile4
-rwxr-xr-xpackage/6to4/files.old/6to4.sh4
-rwxr-xr-xpackage/6to4/files/6to4.sh6
3 files changed, 11 insertions, 3 deletions
diff --git a/package/6to4/Makefile b/package/6to4/Makefile
index 45639646c..fc36d0f15 100644
--- a/package/6to4/Makefile
+++ b/package/6to4/Makefile
@@ -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.
# See /LICENSE for more information.
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6to4
-PKG_VERSION:=7
+PKG_VERSION:=8
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/6to4/files.old/6to4.sh b/package/6to4/files.old/6to4.sh
index f7f48e5ba..2329e0bd4 100755
--- a/package/6to4/files.old/6to4.sh
+++ b/package/6to4/files.old/6to4.sh
@@ -24,6 +24,10 @@ test_6to4_rfc1918()
[ $1 -eq 10 ] && return 0
[ $1 -eq 192 ] && [ $2 -eq 168 ] && 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
}
diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index 682538564..5cbdce79a 100755
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -31,6 +31,10 @@ test_6to4_rfc1918()
[ $1 -eq 10 ] && return 0
[ $1 -eq 192 ] && [ $2 -eq 168 ] && 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
}
@@ -221,7 +225,7 @@ proto_6to4_teardown() {
}
proto_6to4_init_config() {
- no_device=1
+ no_device=1
available=1
proto_config_add_string "ipaddr"