You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/08/16 04:01:46 UTC

svn commit: rev 36426 - spamassassin/trunk/lib/Mail/SpamAssassin

Author: quinlan
Date: Sun Aug 15 19:01:46 2004
New Revision: 36426

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
Log:
bug 3631: update reserved IP list


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm	Sun Aug 15 19:01:46 2004
@@ -64,12 +64,14 @@
 # from them; however we do not, so we should ignore them.
 # 
 # sources:
-#   IANA =  <http://www.iana.org/assignments/ipv4-address-space>,
+#   IANA  = <http://www.iana.org/assignments/ipv4-address-space>,
 #           <http://duxcw.com/faq/network/privip.htm>,
 #   APIPA = <http://duxcw.com/faq/network/autoip.htm>,
-#   3330 =  <ftp://ftp.rfc-editor.org/in-notes/rfc3330.txt>
+#   3330  = <ftp://ftp.rfc-editor.org/in-notes/rfc3330.txt>
+#   CYMRU = <http://www.cymru.com/Documents/bogon-list.html>
 #
 # Last update
+#   2004-07-23 Daniel Quinlan - added CYMRU source, sorted, many updates
 #   2004-05-22 Daniel Quinlan - removed 58/8 and 59/8
 #   2004-03-08 Justin Mason - reimplemented removed code
 #   2003-11-07 bug 1784 changes removed due to relicensing
@@ -81,25 +83,27 @@
 #              msgid:<5....@192.168.50.2>
 #
 use constant IP_IN_RESERVED_RANGE => qr{^(?:
+# private use ranges
   192\.168|			   # 192.168/16:       Private Use (3330)
   10|				   # 10/8:             Private Use (3330)
   172\.(?:1[6-9]|2[0-9]|3[01])|	   # 172.16-172.31/16: Private Use (3330)
   169\.254|			   # 169.254/16:       Private Use (APIPA)
   127|				   # 127/8:            Private Use (localhost)
+# reserved/multicast ranges
   [01257]|			   # 000-002/8, 005/8, 007/8: IANA Reserved
   2[37]|			   # 023/8, 027/8:     IANA Reserved
   3[1679]|			   # 031/8, 036/8, 037/8, 039/8: IANA Reserved
-  4[12]|			   # 041/8, 042/8:     IANA Reserved
-  7[2-9]|			   # 072-079/8:        IANA Reserved
-				   # [ignoring 72 as ARIN growth space]
-  8[6-9]|			   # 086-089/8:        IANA Reserved
-				   # [ignoring 85 as RIPE growth space]
-  9[0-9]|			   #  -
-  1[01][0-9]|			   #  -
+  4[129]|			   # 041/8, 042/8, 049/8: IANA Reserved
+  50|				   # 050/8:            IANA Reserved
+  7[1-9]|			   # 071-079/8:        IANA Reserved
+  89|				   # 089/8:            IANA Reserved
+  9[0-9]|			   # 090-099/8:        IANA Reserved
+  1[01][0-9]|			   # 100-119/8:        IANA Reserved
   12[0-6]|			   # 126/8:            IANA Reserved
+  1(?:7[3-9]|8[0-79]|90)	   # 173-187/8, 189/8, 190/8: IANA Reserved
   192\.0\.2|			   # 192.0.2/24:       Reserved (3330)
-  198\.1[89]|			   # 198.18/15:        Reserved (3330)
   197|				   # 197/8:            IANA Reserved
+  198\.1[89]|			   # 198.18/15:        Reserved (3330)
   22[3-9]|			   # 223-239/8:        IANA Rsvd, Mcast
   23[0-9]|			   # 230-239/8:        IANA Multicast
   24[0-9]|			   # 240-249/8:        IANA Reserved