From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 057dbeebb2bb6eeea485c210f20051c4a6bc52b1 Date: Mon, 24 Jun 2013 11:47:38 +0200 Message-ID: <20130624094739.3C64920621@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0501023177969292258==" List-Id: --===============0501023177969292258== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 057dbeebb2bb6eeea485c210f20051c4a6bc52b1 (commit) from 1d19cd87ec9e87c9bb8337eebce3b58f1cfa2a5d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 057dbeebb2bb6eeea485c210f20051c4a6bc52b1 Author: Michael Tremer Date: Mon Jun 24 11:46:23 2013 +0200 Consider 100.64.0.0/10 as private address space. =20 http://tools.ietf.org/html/rfc6598 http://forum.ipfire.org/index.php?topic=3D7504.0 ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun= ctions.pl index b1b47ab..90eacbd 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -920,9 +920,11 @@ sub GetDyndnsRedIP { close(IP); chomp $ip; =20 + # 100.64.0.0/10 is reserved for dual-stack lite (http://tools.ietf.org/h= tml/rfc6598). if (&General::IpInSubnet ($ip,'10.0.0.0','255.0.0.0') || &General::IpInSubnet ($ip,'172.16.0.0.','255.240.0.0') || - &General::IpInSubnet ($ip,'192.168.0.0','255.255.0.0')) + &General::IpInSubnet ($ip,'192.168.0.0','255.255.0.0') || + &General::IpInSubnet ($ip,'100.64.0.0', '255.192.0.0')) { if ($settings{'BEHINDROUTER'} eq 'FETCH_IP') { my $RealIP =3D &General::FetchPublicIp; hooks/post-receive -- IPFire 2.x development tree --===============0501023177969292258==--