diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2012-04-23 10:12:00 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-04-23 10:12:00 +0000 |
commit | 5d0f47e4bb8313ea3a7e4daaeeca4ba3c387f54e (patch) | |
tree | 0ff76e6ec40c9c0570c0441f26292f2d339a7f26 /package/6to4/files/6to4.sh | |
parent | d4f3677cbad3b83735c37cef2e5655c918c668c3 (diff) | |
download | master-31e0f0ae-5d0f47e4bb8313ea3a7e4daaeeca4ba3c387f54e.tar.gz master-31e0f0ae-5d0f47e4bb8313ea3a7e4daaeeca4ba3c387f54e.tar.bz2 master-31e0f0ae-5d0f47e4bb8313ea3a7e4daaeeca4ba3c387f54e.zip |
6to4: follow RFC 6598 and consider 100.61.0.0/10 a private range (#11323)
SVN-Revision: 31444
Diffstat (limited to 'package/6to4/files/6to4.sh')
-rwxr-xr-x | package/6to4/files/6to4.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh index 6825385648..5cbdce79ab 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" |