Changeset 8


Ignore:
Timestamp:
10/02/09 11:22:09 (15 years ago)
Author:
Kris Deugau
Message:

/trunk/dnsbl

Update extract-data with a whack more Yahoo! netblocks
Always discard URIs already listed on uribl.com or uribl.company.com

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dnsbl/extract-data

    r2 r8  
    206206
    207207# Yahoo! may ... yadda yadda yadda  (geeze they've got a whack of netblocks for mail...)
    208   #IP-Network                    98.136.0.0/14
    209   #IP-Network-Block              098.136.000.000 - 098.139.255.255
    210   #Org-Name                      Yahoo! Inc.
     208 #IP-Network                    98.136.0.0/14
    211209  my $yahoo1 = new NetAddr::IP "98.136.0.0/14";
    212210  next if $relayip->within($yahoo1);
    213   #IP-Network                    66.196.64.0/18
    214   #IP-Network-Block              066.196.064.000 - 066.196.127.255
    215   #Org-Name                      Inktomi Corporation
    216   # Inktomi ~~ Yahoo!
     211 #IP-Network                    66.196.64.0/18
     212 #Org-Name                      Inktomi Corporation
     213 # Inktomi ~~ Yahoo!
    217214  my $yahoo2 = new NetAddr::IP "66.196.64.0/18";
    218215  next if $relayip->within($yahoo2);
    219   #IP-Network                    67.195.0.0/16
    220   #IP-Network-Block              067.195.000.000 - 067.195.255.255
    221   #Org-Name                      Yahoo! Inc.
     216 #IP-Network                    67.195.0.0/16
    222217  my $yahoo3 = new NetAddr::IP "67.195.0.0/16";
    223218  next if $relayip->within($yahoo3);
    224   #IP-Network                    69.147.64.0/18
    225   #IP-Network-Block              069.147.064.000 - 069.147.127.255
    226   #Org-Name                      Yahoo! Inc.
     219 #IP-Network                    69.147.64.0/18
    227220  my $yahoo4 = new NetAddr::IP "69.147.64.0/18";
    228221  next if $relayip->within($yahoo4);
    229   #IP-Network                    206.190.32.0/19
    230   #IP-Network-Block              206.190.032.000 - 206.190.063.255
    231   #Org-Name                      Yahoo! Broadcast Services, Inc.
     222 #IP-Network                    206.190.32.0/19
     223 #Org-Name                      Yahoo! Broadcast Services, Inc.
    232224  my $yahoo5 = new NetAddr::IP "206.190.32.0/18";
    233225  next if $relayip->within($yahoo5);
    234   #IP-Network                    68.142.192.0/18
    235   #IP-Network-Block              068.142.192.000 - 068.142.255.255
    236   #Org-Name                      Inktomi Corporation
     226 #IP-Network                    68.142.192.0/18
     227 #Org-Name                      Inktomi Corporation
    237228  my $yahoo6 = new NetAddr::IP "68.142.192.0/18";
    238229  next if $relayip->within($yahoo6);
    239   #IP-Network                    216.252.96.0/19
    240   #IP-Network-Block              216.252.096.000 - 216.252.127.255
    241   #Org-Name                      Yahoo! Inc.
     230 #IP-Network                    216.252.96.0/19
    242231  my $yahoo7 = new NetAddr::IP "216.252.96.0/19";
    243232  next if $relayip->within($yahoo7);
    244   #inetnum:      124.83.128.0 - 124.83.255.255
    245   #descr:        Yahoo! Japan
     233 #inetnum:      124.83.128.0 - 124.83.255.255
    246234  my $yahoo8 = new NetAddr::IP "124.83.128.0/17";
    247235  next if $relayip->within($yahoo8);
     236 #inetnum:        217.146.184.0 - 217.146.191.47
     237  my $yahoo9 = new NetAddr::IP "217.146.184.0/21";
     238  next if $relayip->within($yahoo9);
     239 #inetnum:      124.108.96.0 - 124.108.111.255
     240  my $yahoo10 = new NetAddr::IP "124.108.96.0/20";
     241  next if $relayip->within($yahoo10);
     242 #IP-Network                    76.13.0.0/16
     243  my $yahoo11 = new NetAddr::IP "76.13.0.0/16";
     244  next if $relayip->within($yahoo11);
     245 #IP-Network                    68.180.128.0/17
     246  my $yahoo12 = new NetAddr::IP "68.180.128.0/17";
     247  next if $relayip->within($yahoo12);
     248 #IP-Network                    209.191.64.0/18
     249  my $yahoo13 = new NetAddr::IP "209.191.64.0/18";
     250  next if $relayip->within($yahoo13);
    248251
    249252# and the same goes for Bell Canada.  *le sigh*
     
    294297}
    295298foreach my $uri (sort keys %urilist) {
    296   if ($opts{u}) {
    297     my @hout = qx { host $uri.multi.uribl.com; host $uri.uribl.company.com };
    298     if ($hout[0] =~ /NXDOMAIN/ && $hout[1] =~ /NXDOMAIN/) {
     299  my @hout = qx { host $uri.multi.uribl.com; host $uri.uribl.company.com };
     300  if ($hout[0] =~ /NXDOMAIN/ && $hout[1] =~ /NXDOMAIN/) {
     301    if ($opts{u}) {
    299302      print "+$uri.uribl.company.com:127.0.0.2:900:::\n";
     303    } else {
     304      # URI plus count
     305      print "$uri\t$urilist{$uri}\n";
    300306    }
    301   } else {
    302     # URI plus count
    303     print "$uri: $urilist{$uri}\n";
    304307  }
    305308}
Note: See TracChangeset for help on using the changeset viewer.