Changeset 75

Timestamp:

09/08/25 17:31:50 (6 days ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Remove DNSBL::export_alt() which I've long since forgotten the intention

for, and which was never more than an opening stub

Remove some debugging/testing statements from export-dnsbl

Location:

trunk/dnsbl

Files:

• DNSBL.pm (modified) (1 diff)
• export-dnsbl (modified) (3 diffs)

trunk/dnsbl/DNSBL.pm

@@ -660 +660 @@
 
 
-sub export_alt {
-  my $self = shift;
-  my $listhosts = shift;
-  my $level = shift || 0;
-  my $container = shift || '0.0.0.0/0';
-  my $oobblock = shift || 0;
-  my $ooborg = shift || 0;
-
-#print "\nDEBUG: called with $level, $container, $oobblock, $ooborg\n";
-# if $level > 2 or $container =~ /^64\.76\./;
-#  my %listhosts;
-
-#  $level = 0 if !$level;
-  if ($level > 3) {
-    warn "getting too deep, breaking off!\n";
-    return;
-  }
-
-  my $sth = $dbh->prepare("select ip,s4list from iplist order by ip");
-  my $bsth = $dbh->prepare("select b.block,b.listme,b.level,o.listme ".
-        "from blocks b inner join orgs o on b.orgid=o.orgid ".
-        "where b.block >> ?");
-  while (my ($ip,$s4list) = $sth->fetchrow_array) {
-    $bsth->execute($ip);
-    while (my ($block,$blisted,$blevel,$olisted) = $bsth->fetchrow_array) {
-      $listhosts->{$ip} |= 0;
-    }
-  }
-  
-} # end export_alt()
-
-
 ## DNSBL::autolist_block()
 # check if a block should be autolisted

trunk/dnsbl/export-dnsbl

@@ -50 +50 @@
 
 $dnsbl->initexport;
-#$dnsbl->export($ipref,$mode,1,'50.22.0.0/15');
-#$dnsbl->export($ipref,$mode);
-$dnsbl->export_alt($ipref2, $mode);
 
+$dnsbl->export($ipref,$mode);
 
 ##fixme - mode should pick actual output, not just export mode
@@ -65 +63 @@
   # more or less raw CIDR block-and-IP info.  rbldnsd format for convenience.
 
-
-
-if (0) {
-#  foreach (sort ipcmp keys %iplist) {
-  foreach (keys %iplist) {
+  foreach (sort ipcmp keys %iplist) {
     my $entry;
     if ($iplist{$_} == -1) {
@@ -96 +90 @@
     print $out;
   }
-}
-
 
 } else {