Changeset 36

Timestamp:

05/05/11 17:41:02 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

w00t! SpamAssassin's DNSBL checking code mutated at some point in
the past to support bitmask-based DNSBLs up to 24 bits long. Altered
a few constants and the data tagging to tag org and block listme's
separately at the separate levels.

Location:

trunk/dnsbl

Files:

• DNSBL.pm (modified) (4 diffs)
• Makefile (modified) (1 diff)

trunk/dnsbl/DNSBL.pm

@@ -12 +12 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-$VERSION        = 2.0;
+$VERSION        = 2.1;
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
@@ -24 +24 @@
 ## "constants"
 
-# 8 bits available
-# 128 is per-IP shitlist
-# 2 is IP hitlist
+# w00t!  somewhere along the line, by accident or intent, SA's
+# check_dnsbl_sub can now check up to 24 bits of an DNSBL return value!
 # 1 not available so we don't $self->shoot(foot)
 our %bitfields = (
@@ -36 +35 @@
         ip => 2,
     # OOB
-        org => 32,
-        block => 64,
+        org0 => 32,
+        block0 => 64,
+        org1 => 256,
+        org2 => 512,
+        block1 => 1024,
+        block2 => 2048,
     # "I'm a total spamming moron!" - per-IP only!
         slist => 128
@@ -394 +397 @@
 
     $bitmask |= $bitfields{$level-1} if $bcount >= $autolist{$masklen};
-    $bitmask |= $bitfields{block} if $listme;
-    $bitmask |= $bitfields{org} if $listorg;
+    $bitmask |= $bitfields{"block".($level-1)} if $listme;
+    $bitmask |= $bitfields{"org".($level-1)} if $listorg;
   }
 

trunk/dnsbl/Makefile

@@ -12 +12 @@
 
 PKGNAME=dnsbl
-VERSION=0.2.0
+VERSION=0.2.1
 
 all: