diff options
| author | Marco d'Itri <md@linux.it> | 2014-05-02 02:38:05 +0200 |
|---|---|---|
| committer | Marco d'Itri <md@linux.it> | 2014-05-02 04:26:50 +0200 |
| commit | f12e652595cde01a3cfd5b50e7302b4a06054bb9 (patch) | |
| tree | 29085e5aac3a0888ff8f192831f28edd10a2f08d | |
| parent | 4a77be3e036db9a54a26060979eb9d3a6c20680c (diff) | |
| download | whois-f12e652595cde01a3cfd5b50e7302b4a06054bb9.tar.gz | |
Fix some invalid ASN and networks entries
Some of them would never be matched.
Reported by Henry Stern.
| -rw-r--r-- | as_del_list | 19 | ||||
| -rw-r--r-- | ip_del_list | 7 | ||||
| -rwxr-xr-x | make_as_del.pl | 9 |
3 files changed, 19 insertions, 16 deletions
diff --git a/as_del_list b/as_del_list index 4ec8538..6fff895 100644 --- a/as_del_list +++ b/as_del_list @@ -29,26 +29,24 @@ 9840 9871 whois.nic.or.kr 9943 9982 whois.nic.or.kr 9990 10021 whois.nic.ad.jp -9216 10067 apnic 10034 10073 whois.nic.or.kr 10154 10198 whois.nic.or.kr -10074 10239 apnic +9216 10239 apnic 12288 13311 ripe 15360 16383 ripe 17503 17534 whois.nic.ad.jp 17567 17616 whois.nic.or.kr 17673 17704 whois.nic.ad.jp -17832 17880 whois.nic.or.kr -17408 18431 apnic +17832 17881 whois.nic.or.kr 17930 17961 whois.nic.ad.jp 18067 18098 whois.nic.ad.jp 18121 18152 whois.nic.ad.jp 18259 18290 whois.nic.ad.jp -18259 18290 whois.nic.ad.jp +17408 18431 apnic 20480 21503 ripe -23552 24575 apnic 23552 23601 whois.nic.or.kr 23612 23643 whois.nic.ad.jp +23552 24575 apnic 24576 25599 ripe 26592 26623 lacnic 27648 28671 lacnic @@ -70,11 +68,10 @@ 59392 61439 ripe 61440 61951 lacnic 61952 62463 ripe -63488 63999 apnic - -# private ASN block -64512 65534 ripe - # catch all: everything else comes from ARIN 1 63487 arin +63488 63999 apnic + +# documentation and private ASN block +64496 65534 ripe diff --git a/ip_del_list b/ip_del_list index 646c134..db7361e 100644 --- a/ip_del_list +++ b/ip_del_list @@ -187,7 +187,7 @@ 210.61.0.0/16 twnic 210.62.252.0/22 twnic 210.65.0.0/16 twnic -210.71.128.0/16 twnic +210.71.128.0/17 twnic 210.90.0.0/15 whois.nic.or.kr 210.92.0.0/14 whois.nic.or.kr 210.96.0.0/11 whois.nic.or.kr # => 210.127.255.255 @@ -202,7 +202,7 @@ 210.224.0.0/12 whois.nic.ad.jp # => 210.239.255.255 # some more TWNIC blocks are scattered here 210.240.0.0/16 twnic -210.241.0.0/15 twnic +210.241.0.0/18 twnic 210.241.224.0/19 twnic 210.242.0.0/15 twnic 210.248.0.0/13 whois.nic.ad.jp @@ -244,7 +244,8 @@ 220.103.0.0/16 whois.nic.or.kr 220.104.0.0/13 whois.nic.ad.jp 220.149.0.0/16 whois.nic.or.kr -221.138.0.0/13 whois.nic.or.kr +221.138.0.0/15 whois.nic.or.kr +221.140.0.0/14 whois.nic.or.kr 221.144.0.0/12 whois.nic.or.kr 221.160.0.0/13 whois.nic.or.kr 222.96.0.0/12 whois.nic.or.kr diff --git a/make_as_del.pl b/make_as_del.pl index 281cb07..10ab071 100755 --- a/make_as_del.pl +++ b/make_as_del.pl @@ -3,6 +3,8 @@ use warnings; use strict; +my $last_l = 0; + while (<>) { chomp; s/#.*$//; @@ -12,12 +14,15 @@ while (<>) { die "format error: $_" if not (/^([\d\.]+)\s+([\d\.]+)\s+([\w\.]+)$/); my $f = $1; my $l = $2; my $s = $3; - print qq|{ ${f}, ${l}, "|; + die "constraint violated: $l < $last_l" if $l < $last_l; + $last_l = $l; + + print "{ ${f}, ${l}, \""; if ($s =~ /\./) { print "$s"; } else { print "whois.$s.net"; } - print qq|" },\n|; + print qq(" },\n); } |