Changeset 3 for trunk/dnsbl/export-dnsbl

Timestamp:

09/09/09 15:18:13 (15 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Fix another behavioural bug in export - don't export all classful entries

in a CIDR block if that block isn't OOB or volume-listed itself

Irrelevant test-case selections added in browse.cgi and export-dnsbl
Fix export for rbldnsd by passing the mode to export() on full export
Checkpoint segment of export-dnsbl that may not be needed due to above

File:

• trunk/dnsbl/export-dnsbl (modified) (1 diff)

trunk/dnsbl/export-dnsbl

@@ -19 +19 @@
 my $ipref = \%iplist;
 
-my $mode = $ARGV[0] || 'cidr';
+my $mode = $ARGV[0] || 'tiny';
 
 #$dnsbl->export($ipref,$mode,1,'65.60/18');
 #$dnsbl->export($ipref,$mode,1,'67.136.0.0/14');
 #$dnsbl->export($ipref,$mode,1,'83.76/15');
-#$dnsbl->export($ipref,$mode,1,'95.154.192.0/18');
-$dnsbl->export($ipref);
+#$dnsbl->export($ipref,$mode,1,'76.73.0.0/17');
+#$dnsbl->export($ipref,$mode,1,'174.36.0.0/15');
+$dnsbl->export($ipref,$mode);
 
 ##fixme - mode should pick actual output, not just export mode
 if ($mode eq 'cidr') {
+  # more or less raw CIDR block-and-IP info
   foreach (sort ipcmp keys %iplist) {
-    print "$_\t$iplist{$_}\n";
+    print "$_:127.0.0.$iplist{$_}:".
+        ($iplist{$_} & 2 ? '$ relayed a reported spam' : 'Netblock listed on one or more criteria')."\n";
   }
+} elsif ($mode eq 'rbldnsd') {
+  # need extra cmd args
+  die "need subgroup spec (iplist, cidrlist) as well\n" if !$ARGV[1];
+  if ($ARGV[1] eq 'iplist') {
+    foreach (sort ipcmp keys %iplist) {
+      print "$_:127.0.0.$iplist{$_}:\$ relayed a reported spam\n" if $iplist{$_} & 2;
+    }
+  } elsif ($ARGV[1] eq 'cidrlist') {
+    foreach (sort ipcmp keys %iplist) {
+      print "$_:127.0.0.$iplist{$_}:Netblock listed on one or more criteria\n" if ! ($iplist{$_} & 2);
+    }
+  }
+  # no output if second arg is unknown.
 } else {
   foreach (sort ipcmp keys %iplist) {