# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1250555911 -10800
# Node ID 8df5d52436a18e7a7a407ad8b352fdb91b7ada96
# Parent  42889eed0ce8943d8d1c3595e519746d3b58c343
More work towards DroneBL support.

diff -r 42889eed0ce8 -r 8df5d52436a1 maltfilter
--- a/maltfilter	Tue Aug 18 03:21:30 2009 +0300
+++ b/maltfilter	Tue Aug 18 03:38:31 2009 +0300
@@ -518,15 +518,13 @@
 sub dronebl_process
 {
   return unless ($settings{"DRONEBL"} > 0);
-  return if ($settings{"DRY_RUN"});
 
   # Create submission data
   my $xml = "<?xml version=\"1.0\"?>\n<request key=\"".$settings{"DRONEBL_RPC_KEY"}."\">\n";
   my $entries = 0;
   while (my ($ip, $entry) = each(%dronebl)) {
     if ($entry->{"sent"} == 0 && $entry->{"tries"} < 3) {
-      $xml .= "<add ip=\"".$ip."\" type=\"1\" />\n";
-#      $xml .= "<add ip=\"".$ip."\" type=\"".$entry->{"type"}."\" />\n";
+      $xml .= "<add ip=\"".$ip."\" type=\"".$entry->{"type"}."\" />\n";
       $entries++;
     }
   }
@@ -534,10 +532,13 @@
 
   # Bait out if no entries to submit
   return unless ($entries > 0);
-  mlog(1, "[DroneBL] Trying to submit $entries entries.\n");
+  if ($settings{"DRY_RUN"}) {
+    mlog(1, "[DroneBL] Would submit $entries entries.\n");
+#    return;
+  } else {
+    mlog(1, "[DroneBL] Trying to submit $entries entries.\n");
+  }
 
-return;
-    
   # Submit via HTTP XML-RPC
   my $tmp = LWP::UserAgent->new;
   $tmp->agent("Maltfilter/".$progversion);