Changeset 37 for trunk

Timestamp:

11/23/11 15:44:55 (12 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Forgot to update the actual data-export lines when I added the
extra layers of bitmasking. rbldnsd does not like eg
"127.0.0.1050" as an IP to return...

File:

• trunk/dnsbl/export-dnsbl (modified) (2 diffs)

trunk/dnsbl/export-dnsbl

@@ -60 +60 @@
   # more or less raw CIDR block-and-IP info.  rbldnsd format for convenience.
   foreach (sort ipcmp keys %iplist) {
-    my $out = "$_:127.0.0.$iplist{$_}:".
+    my $entry;
+    if ($iplist{$_} > 256) {
+      if ($iplist{$_} > 65536) {
+        $entry .= int($iplist{$_}/65536).".";
+        $iplist{$_} = $iplist{$_} % 65536;
+      } else {
+        $entry .= "0.";
+      }
+      $entry .= int($iplist{$_}/256).".";
+      $iplist{$_} = $iplist{$_} % 256;
+    } else {
+      $entry .= "0.0.";
+    }
+    $entry .= $iplist{$_};
+    my $out = "$_:127.$entry:".
         ($iplist{$_} & 2 ?
                 ($config{iplisted} ? $config{iplisted} : '$ relayed a reported spam') :
@@ -70 +84 @@
 } else {
   foreach (sort ipcmp keys %iplist) {
+    my $entry;
+    if ($iplist{$_} > 256) {
+      if ($iplist{$_} > 65536) {
+        $entry .= int($iplist{$_}/65536).".";
+        $iplist{$_} = $iplist{$_} % 65536;
+      } else {
+        $entry .= "0.";
+      }
+      $entry .= int($iplist{$_}/256).".";
+      $iplist{$_} = $iplist{$_} % 256;
+    } else {
+      $entry .= "0.0.";
+    }
+    $entry .= $iplist{$_};
     my ($o1,$o2,$o3,$o4) = (/^(\d+)\.([\d*]+)(?:\.([\d*]+)(?:\.([\d*]+))?)?$/);
     print "+".(defined($o4) ? "$o4." : '').(defined($o3) ? "$o3." : '').(defined($o2) ? "$o2." : '').
-        "$o1.spamhosts.company.com:127.0.0.$iplist{$_}:900:::\n";
+        "$o1.spamhosts.company.com:127.0.0.$entry:900:::\n";
   }
 }