Data update
This commit is contained in:
Ingy döt Net
parent
5150844a7d
commit
4bb20c9b71
7735 changed files with 38060 additions and 199180 deletions
|
|
@ -1,105 +0,0 @@
|
|||
with Ada.Strings;
|
||||
with Ada.Strings.Fixed;
|
||||
with Ada.Strings.Maps;
|
||||
with Ada.Text_IO;
|
||||
|
||||
use Ada.Strings;
|
||||
use Ada.Strings.Fixed;
|
||||
use Ada.Strings.Maps;
|
||||
use Ada.Text_IO;
|
||||
|
||||
procedure Canonicalize_CIDR is
|
||||
type IP_Octet_Type is mod 256;
|
||||
|
||||
type IP_Record_Type is record
|
||||
A, B, C, D : IP_Octet_Type;
|
||||
end record
|
||||
with Size => 32;
|
||||
|
||||
for IP_Record_Type use record
|
||||
-- Use little-endian ordering to match bit array
|
||||
D at 0 range 0 .. 7;
|
||||
C at 1 range 0 .. 7;
|
||||
B at 2 range 0 .. 7;
|
||||
A at 3 range 0 .. 7;
|
||||
end record;
|
||||
|
||||
type IP_Bitarray_Type is array (0 .. 31) of Boolean
|
||||
with Component_Size => 1;
|
||||
|
||||
subtype IP_Mask_Type is Natural range 0 .. 32;
|
||||
|
||||
type IP_CIDR_Type is record
|
||||
IP : IP_Record_Type;
|
||||
Mask : IP_Mask_Type;
|
||||
end record;
|
||||
|
||||
function Parse_IP_CIDR (S : String) return IP_CIDR_Type is
|
||||
IP_Record : IP_CIDR_Type;
|
||||
Digit_Range : Character_Range := ('0', '9');
|
||||
Digit_Set : Character_Set := To_Set (Digit_Range);
|
||||
Octets : array (1 .. 4) of IP_Octet_Type;
|
||||
First : Positive;
|
||||
Last : Natural := 0;
|
||||
begin
|
||||
for I in Octets'Range loop
|
||||
Find_Token (S, Digit_Set, Last + 1, Inside, First, Last);
|
||||
Octets (I) := IP_Octet_Type'Value (S (First .. Last));
|
||||
end loop;
|
||||
IP_Record.IP.A := Octets (1);
|
||||
IP_Record.IP.B := Octets (2);
|
||||
IP_Record.IP.C := Octets (3);
|
||||
IP_Record.IP.D := Octets (4);
|
||||
|
||||
Find_Token (S, Digit_Set, Last + 1, Inside, First, Last);
|
||||
IP_Record.Mask := IP_Mask_Type'Value (S (First .. Last));
|
||||
|
||||
return IP_Record;
|
||||
end Parse_IP_CIDR;
|
||||
|
||||
procedure Canonicalize_IP_CIDR (Addr : in out IP_CIDR_Type) is
|
||||
-- Fun part. I can overlay different types over the same bits.
|
||||
Bit_Overlay : IP_Bitarray_Type with Address => Addr.IP'Address;
|
||||
begin
|
||||
for I in Bit_Overlay'First .. Bit_Overlay'Last - Addr.Mask loop
|
||||
Bit_Overlay (I) := False;
|
||||
end loop;
|
||||
end Canonicalize_IP_CIDR;
|
||||
|
||||
procedure Put_IP_CIDR (Addr : IP_CIDR_TYPE) is
|
||||
package Octet_IO is new Ada.Text_IO.Modular_IO (IP_Octet_Type);
|
||||
package Mask_IO is new Ada.Text_IO.Integer_IO (IP_Mask_Type);
|
||||
begin
|
||||
Octet_IO.Put (Addr.IP.A, 0);
|
||||
Put (".");
|
||||
Octet_IO.Put (Addr.IP.B, 0);
|
||||
Put (".");
|
||||
Octet_IO.Put (Addr.IP.C, 0);
|
||||
Put (".");
|
||||
Octet_IO.Put (Addr.IP.D, 0);
|
||||
Put ("/");
|
||||
Mask_IO.Put (Addr.Mask, 0);
|
||||
end Put_IP_CIDR;
|
||||
|
||||
procedure Show_IP_Canonicalize (S : String) is
|
||||
Canon : IP_CIDR_Type := Parse_IP_CIDR (S);
|
||||
begin
|
||||
Canonicalize_IP_Cidr (Canon);
|
||||
Put (S & " -> ");
|
||||
Put_IP_CIDR (Canon);
|
||||
New_Line;
|
||||
end Show_IP_Canonicalize;
|
||||
|
||||
Test_IPs : array (1 .. 5) of String (1 .. 18) :=
|
||||
(
|
||||
"36.18.154.103/12 ",
|
||||
"62.62.197.11/29 ",
|
||||
"67.137.119.181/4 ",
|
||||
"161.214.74.21/24 ",
|
||||
"184.232.176.184/18"
|
||||
);
|
||||
begin
|
||||
for I of Test_IPs loop
|
||||
Show_IP_Canonicalize (I);
|
||||
end loop;
|
||||
end Canonicalize_CIDR;
|
||||
|
|
@ -1,35 +1,31 @@
|
|||
(phixonline)-->
|
||||
<span style="color: #008080;">with</span> <span style="color: #008080;">javascript_semantics</span> <span style="color: #000080;font-style:italic;">-- (not likely useful)</span>
|
||||
<span style="color: #008080;">function</span> <span style="color: #000000;">canonicalize_cidr</span><span style="color: #0000FF;">(</span><span style="color: #004080;">string</span> <span style="color: #000000;">cidr</span><span style="color: #0000FF;">)</span>
|
||||
<span style="color: #000000;">cidr</span> <span style="color: #0000FF;">=</span> <span style="color: #7060A8;">substitute</span><span style="color: #0000FF;">(</span><span style="color: #000000;">cidr</span><span style="color: #0000FF;">,</span><span style="color: #008000;">"."</span><span style="color: #0000FF;">,</span><span style="color: #008000;">" "</span><span style="color: #0000FF;">)</span> <span style="color: #000080;font-style:italic;">-- (else %d eats 0.0 etc)</span>
|
||||
<span style="color: #008080;">if</span> <span style="color: #008080;">not</span> <span style="color: #7060A8;">find</span><span style="color: #0000FF;">(</span><span style="color: #008000;">'/'</span><span style="color: #0000FF;">,</span><span style="color: #000000;">cidr</span><span style="color: #0000FF;">)</span> <span style="color: #008080;">then</span> <span style="color: #000000;">cidr</span> <span style="color: #0000FF;">&=</span> <span style="color: #008000;">"/32"</span> <span style="color: #008080;">end</span> <span style="color: #008080;">if</span>
|
||||
<span style="color: #004080;">sequence</span> <span style="color: #000000;">res</span> <span style="color: #0000FF;">=</span> <span style="color: #7060A8;">scanf</span><span style="color: #0000FF;">(</span><span style="color: #000000;">cidr</span><span style="color: #0000FF;">,</span><span style="color: #008000;">"%d %d %d %d/%d"</span><span style="color: #0000FF;">)</span>
|
||||
<span style="color: #008080;">if</span> <span style="color: #7060A8;">length</span><span style="color: #0000FF;">(</span><span style="color: #000000;">res</span><span style="color: #0000FF;">)=</span><span style="color: #000000;">1</span> <span style="color: #008080;">then</span>
|
||||
<span style="color: #004080;">integer</span> <span style="color: #0000FF;">{</span><span style="color: #000000;">a</span><span style="color: #0000FF;">,</span><span style="color: #000000;">b</span><span style="color: #0000FF;">,</span><span style="color: #000000;">c</span><span style="color: #0000FF;">,</span><span style="color: #000000;">d</span><span style="color: #0000FF;">,</span><span style="color: #000000;">m</span><span style="color: #0000FF;">}</span> <span style="color: #0000FF;">=</span> <span style="color: #000000;">res</span><span style="color: #0000FF;">[</span><span style="color: #000000;">1</span><span style="color: #0000FF;">]</span>
|
||||
<span style="color: #008080;">if</span> <span style="color: #000000;">a</span><span style="color: #0000FF;">>=</span><span style="color: #000000;">0</span> <span style="color: #008080;">and</span> <span style="color: #000000;">a</span><span style="color: #0000FF;"><=</span><span style="color: #000000;">255</span>
|
||||
<span style="color: #008080;">and</span> <span style="color: #000000;">b</span><span style="color: #0000FF;">>=</span><span style="color: #000000;">0</span> <span style="color: #008080;">and</span> <span style="color: #000000;">b</span><span style="color: #0000FF;"><=</span><span style="color: #000000;">255</span>
|
||||
<span style="color: #008080;">and</span> <span style="color: #000000;">c</span><span style="color: #0000FF;">>=</span><span style="color: #000000;">0</span> <span style="color: #008080;">and</span> <span style="color: #000000;">c</span><span style="color: #0000FF;"><=</span><span style="color: #000000;">255</span>
|
||||
<span style="color: #008080;">and</span> <span style="color: #000000;">d</span><span style="color: #0000FF;">>=</span><span style="color: #000000;">0</span> <span style="color: #008080;">and</span> <span style="color: #000000;">d</span><span style="color: #0000FF;"><=</span><span style="color: #000000;">255</span>
|
||||
<span style="color: #008080;">and</span> <span style="color: #000000;">m</span><span style="color: #0000FF;">>=</span><span style="color: #000000;">1</span> <span style="color: #008080;">and</span> <span style="color: #000000;">m</span><span style="color: #0000FF;"><=</span><span style="color: #000000;">32</span> <span style="color: #008080;">then</span>
|
||||
<span style="color: #004080;">atom</span> <span style="color: #000000;">mask</span> <span style="color: #0000FF;">=</span> <span style="color: #7060A8;">power</span><span style="color: #0000FF;">(</span><span style="color: #000000;">2</span><span style="color: #0000FF;">,</span><span style="color: #000000;">32</span><span style="color: #0000FF;">-</span><span style="color: #000000;">m</span><span style="color: #0000FF;">)-</span><span style="color: #000000;">1</span><span style="color: #0000FF;">,</span>
|
||||
<span style="color: #000000;">addr</span> <span style="color: #0000FF;">=</span> <span style="color: #7060A8;">bytes_to_int</span><span style="color: #0000FF;">({</span><span style="color: #000000;">d</span><span style="color: #0000FF;">,</span><span style="color: #000000;">c</span><span style="color: #0000FF;">,</span><span style="color: #000000;">b</span><span style="color: #0000FF;">,</span><span style="color: #000000;">a</span><span style="color: #0000FF;">})</span>
|
||||
<span style="color: #000000;">addr</span> <span style="color: #0000FF;">-=</span> <span style="color: #7060A8;">and_bits</span><span style="color: #0000FF;">(</span><span style="color: #000000;">addr</span><span style="color: #0000FF;">,</span><span style="color: #000000;">mask</span><span style="color: #0000FF;">)</span>
|
||||
<span style="color: #0000FF;">{</span><span style="color: #000000;">d</span><span style="color: #0000FF;">,</span><span style="color: #000000;">c</span><span style="color: #0000FF;">,</span><span style="color: #000000;">b</span><span style="color: #0000FF;">,</span><span style="color: #000000;">a</span><span style="color: #0000FF;">}</span> <span style="color: #0000FF;">=</span> <span style="color: #7060A8;">int_to_bytes</span><span style="color: #0000FF;">(</span><span style="color: #000000;">addr</span><span style="color: #0000FF;">)</span>
|
||||
<span style="color: #008080;">return</span> <span style="color: #7060A8;">sprintf</span><span style="color: #0000FF;">(</span><span style="color: #008000;">"%d.%d.%d.%d/%d"</span><span style="color: #0000FF;">,{</span><span style="color: #000000;">a</span><span style="color: #0000FF;">,</span><span style="color: #000000;">b</span><span style="color: #0000FF;">,</span><span style="color: #000000;">c</span><span style="color: #0000FF;">,</span><span style="color: #000000;">d</span><span style="color: #0000FF;">,</span><span style="color: #000000;">m</span><span style="color: #0000FF;">})</span>
|
||||
<span style="color: #008080;">end</span> <span style="color: #008080;">if</span>
|
||||
<span style="color: #008080;">end</span> <span style="color: #008080;">if</span>
|
||||
<span style="color: #008080;">return</span> <span style="color: #008000;">"???"</span>
|
||||
<span style="color: #008080;">end</span> <span style="color: #008080;">function</span>
|
||||
with javascript_semantics
|
||||
function canonicalize_cidr(string cidr)
|
||||
cidr = substitute(cidr,"."," ") -- (else %d eats 0.0 etc)
|
||||
if not find('/',cidr) then cidr &= "/32" end if
|
||||
sequence res = scanf(cidr,"%d %d %d %d/%d")
|
||||
if length(res)=1 then
|
||||
integer {a,b,c,d,m} = res[1]
|
||||
if a>=0 and a<=255
|
||||
and b>=0 and b<=255
|
||||
and c>=0 and c<=255
|
||||
and d>=0 and d<=255
|
||||
and m>=1 and m<=32 then
|
||||
atom mask = power(2,32-m)-1,
|
||||
addr = bytes_to_int({d,c,b,a})
|
||||
addr -= and_bits(addr,mask)
|
||||
{d,c,b,a} = int_to_bytes(addr)
|
||||
return sprintf("%d.%d.%d.%d/%d",{a,b,c,d,m})
|
||||
end if
|
||||
end if
|
||||
return "???"
|
||||
end function
|
||||
|
||||
<span style="color: #008080;">constant</span> <span style="color: #000000;">tests</span> <span style="color: #0000FF;">=</span> <span style="color: #0000FF;">{</span><span style="color: #008000;">"87.70.141.1/22"</span><span style="color: #0000FF;">,</span>
|
||||
<span style="color: #008000;">"36.18.154.103/12"</span><span style="color: #0000FF;">,</span>
|
||||
<span style="color: #008000;">"62.62.197.11/29"</span><span style="color: #0000FF;">,</span>
|
||||
<span style="color: #008000;">"67.137.119.181/4"</span><span style="color: #0000FF;">,</span>
|
||||
<span style="color: #008000;">"161.214.74.21/24"</span><span style="color: #0000FF;">,</span>
|
||||
<span style="color: #008000;">"184.232.176.184/18"</span><span style="color: #0000FF;">}</span>
|
||||
|
||||
<span style="color: #008080;">for</span> <span style="color: #000000;">i</span><span style="color: #0000FF;">=</span><span style="color: #000000;">1</span> <span style="color: #008080;">to</span> <span style="color: #7060A8;">length</span><span style="color: #0000FF;">(</span><span style="color: #000000;">tests</span><span style="color: #0000FF;">)</span> <span style="color: #008080;">do</span>
|
||||
<span style="color: #004080;">string</span> <span style="color: #000000;">ti</span> <span style="color: #0000FF;">=</span> <span style="color: #000000;">tests</span><span style="color: #0000FF;">[</span><span style="color: #000000;">i</span><span style="color: #0000FF;">]</span>
|
||||
<span style="color: #7060A8;">printf</span><span style="color: #0000FF;">(</span><span style="color: #000000;">1</span><span style="color: #0000FF;">,</span><span style="color: #008000;">"%-18s -> %s\n"</span><span style="color: #0000FF;">,{</span><span style="color: #000000;">ti</span><span style="color: #0000FF;">,</span><span style="color: #000000;">canonicalize_cidr</span><span style="color: #0000FF;">(</span><span style="color: #000000;">ti</span><span style="color: #0000FF;">)})</span>
|
||||
<span style="color: #008080;">end</span> <span style="color: #008080;">for</span>
|
||||
<!--
|
||||
constant tests = {"87.70.141.1/22",
|
||||
"36.18.154.103/12",
|
||||
"62.62.197.11/29",
|
||||
"67.137.119.181/4",
|
||||
"161.214.74.21/24",
|
||||
"184.232.176.184/18"}
|
||||
for t in tests do
|
||||
printf(1,"%-18s -> %s\n",{t,canonicalize_cidr(t)})
|
||||
end for
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue