[Ipcop-svn] SF.net SVN: ipcop:[7370] ipcop/trunk

[owes]

Revision: 7370
          http://sourceforge.net/p/ipcop/svn/7370
Author:   owes
Date:     2014-03-24 19:06:08 +0000 (Mon, 24 Mar 2014)
Log Message:
-----------
Add recommendation from RFC6598 to list of non-public addresses.

Modified Paths:
--------------
    ipcop/trunk/src/libs/general-functions.pl
    ipcop/trunk/src/scripts/setddns.pl
    ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
    ipcop/trunk/updates/2.1.3/information.xml

Modified: ipcop/trunk/src/libs/general-functions.pl
===================================================================
--- ipcop/trunk/src/libs/general-functions.pl   2014-03-24 18:59:20 UTC (rev 
7369)
+++ ipcop/trunk/src/libs/general-functions.pl   2014-03-24 19:06:08 UTC (rev 
7370)
@@ -22,7 +22,7 @@
 # Copyright (c) 2002/04/13 Steve Bootes - add alias section, helper functions
 # Copyright (c) 2002/08/23 Mark Wormgoor <m...@wormgoor.com> validfqdn()
 # Copyright (c) 2003/09/11 Darren Critchley <darr...@telus.net> srtarray()
-# Copyright (c) 2004-2012 The IPCop Team
+# Copyright (c) 2004-2014 The IPCop Team
 #
 # $Id$
 #
@@ -935,9 +935,11 @@
     close(IP);
     chomp $ip;
 
+    # non-public addresses according to RFC1918 and 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, '172.16.0.0', '255.240.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 = &General::FetchPublicIp;

Modified: ipcop/trunk/src/scripts/setddns.pl
===================================================================
--- ipcop/trunk/src/scripts/setddns.pl  2014-03-24 18:59:20 UTC (rev 7369)
+++ ipcop/trunk/src/scripts/setddns.pl  2014-03-24 19:06:08 UTC (rev 7370)
@@ -73,10 +73,11 @@
     exit 1;
 }
 
-#If IP is reserved network, we are behind a router. May we ask for our real 
public IP ?
+# If IP is reserved network, we are behind a router. May we ask for our real 
public IP ?
 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, '172.16.0.0', '255.240.0.0')
+    || &General::IpInSubnet($ip, '192.168.0.0', '255.255.0.0')
+    || &General::IpInSubnet($ip, '100.64.0.0', '255.192.0.0'))
 {
 
     # We can, but are we authorized by GUI ?

Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3      2014-03-24 18:59:20 UTC 
(rev 7369)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3      2014-03-24 19:06:08 UTC 
(rev 7370)
@@ -8,9 +8,11 @@
 /home/httpd/cgi-bin/updates.cgi
 /home/httpd/cgi-bin/urlfilter.cgi
 /usr/lib/ipcop/firewall-lib.pl
+/usr/lib/ipcop/general-functions.pl
 /usr/local/bin/emailhelper
 /usr/local/bin/installpackage
 /usr/local/bin/makegraphs.pl
+/usr/local/bin/setddns.pl
 /usr/local/bin/vpn-watch
 /usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
 /usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo

Modified: ipcop/trunk/updates/2.1.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.3/information.xml   2014-03-24 18:59:20 UTC (rev 
7369)
+++ ipcop/trunk/updates/2.1.3/information.xml   2014-03-24 19:06:08 UTC (rev 
7370)
@@ -1,8 +1,8 @@
 <ipcop>
     <update>
         <version>2.1.3</version>
-        <releasedate>2014-mm-dd</releasedate>
-        <size>0</size>
+        <releasedate>2014-04-dd</releasedate>
+        <size>10804</size>
         <isoimages>no</isoimages>
         <description>Language updates.&lt;br /&gt;
         Add harfbuzz.&lt;br /&gt;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn