diff --git a/data/aut-num/AS4242420241 b/data/aut-num/AS4242420241 index d98db24aa..56a0d1502 100644 --- a/data/aut-num/AS4242420241 +++ b/data/aut-num/AS4242420241 @@ -2,7 +2,8 @@ aut-num: AS4242420241 as-name: CCCAC-AS descr: AS for the Chaos Computer Club Aachen e.V. remarks: peering requests: dn42@feuerrot.org -admin-c: ORG-CCCAC +admin-c: SPQ-DN42 +admin-c: FEUERROT-DN42 tech-c: FEUERROT-DN42 tech-c: SPQ-DN42 mnt-by: FEUERROT-MNT diff --git a/data/aut-num/AS4242420800 b/data/aut-num/AS4242420800 index d3a4f12a7..265332ca1 100644 --- a/data/aut-num/AS4242420800 +++ b/data/aut-num/AS4242420800 @@ -2,6 +2,6 @@ aut-num: AS4242420800 as-name: SNAPSERV descr: SnapServ Ltd org: ORG-SNAPSERV -admin-c: ORG-SNAPSERV +admin-c: PM-DN42 tech-c: PM-DN42 mnt-by: SNAPSERV-MNT diff --git a/data/aut-num/AS4242423173 b/data/aut-num/AS4242423173 index 5ed288102..5a244c990 100644 --- a/data/aut-num/AS4242423173 +++ b/data/aut-num/AS4242423173 @@ -1,5 +1,5 @@ aut-num: AS4242423173 as-name: AS-COLOCATIOUS -admin-c: ORG-COLOCATIOUS -tech-c: ORG-COLOCATIOUS +admin-c: JWALTER-DN42 +tech-c: JWALTER-DN42 mnt-by: COLOCATIOUS-MNT diff --git a/data/aut-num/AS4242423320 b/data/aut-num/AS4242423320 deleted file mode 100644 index c730ab529..000000000 --- a/data/aut-num/AS4242423320 +++ /dev/null @@ -1,6 +0,0 @@ -aut-num: AS4242423320 -as-name: COOPERNET-AS -descr: Coopernet -admin-c: COOPERNET-DN42 -tech-c: COOPERNET-DN42 -mnt-by: PIKKAACHU-MNT diff --git a/data/aut-num/AS4242423321 b/data/aut-num/AS4242423321 deleted file mode 100644 index 82e840a4c..000000000 --- a/data/aut-num/AS4242423321 +++ /dev/null @@ -1,6 +0,0 @@ -aut-num: AS4242423321 -as-name: PIKKAACHU-AS -descr: Pikkaachu AS -admin-c: PIKKAACHU-DN42 -tech-c: PIKKAACHU-DN42 -mnt-by: PIKKAACHU-MNT diff --git a/data/aut-num/AS4242423322 b/data/aut-num/AS4242423322 deleted file mode 100644 index 410233724..000000000 --- a/data/aut-num/AS4242423322 +++ /dev/null @@ -1,6 +0,0 @@ -aut-num: AS4242423322 -as-name: ZENO-IX -descr: Zeno IX -admin-c: ZENO-DN42 -tech-c: PIKKAACHU-DN42 -mnt-by: PIKKAACHU-MNT diff --git a/data/aut-num/AS4242423323 b/data/aut-num/AS4242423323 deleted file mode 100644 index a852e3a6b..000000000 --- a/data/aut-num/AS4242423323 +++ /dev/null @@ -1,6 +0,0 @@ -aut-num: AS4242423323 -as-name: COOPERNET-AS -descr: Coopernet -admin-c: COOPERNET-DN42 -tech-c: COOPERNET-DN42 -mnt-by: PIKKAACHU-MNT diff --git a/data/aut-num/AS4242423329 b/data/aut-num/AS4242423329 deleted file mode 100644 index 1de03cc32..000000000 --- a/data/aut-num/AS4242423329 +++ /dev/null @@ -1,9 +0,0 @@ -aut-num: AS4242423329 -as-name: HSBNE-IX -descr: HSBNE-IX -org: ORG-HSBNE -admin-c: HSBNE-DN42 -tech-c: PIKKAACHU-DN42 -tech-c: 4GON-DN42 -mnt-by: PIKKAACHU-MNT -mnt-by: 4GON-MNT diff --git a/data/aut-num/AS4242423993 b/data/aut-num/AS4242423993 index bbaa26f2b..460dc4ef3 100644 --- a/data/aut-num/AS4242423993 +++ b/data/aut-num/AS4242423993 @@ -1,6 +1,7 @@ aut-num: AS4242423993 as-name: 2F30-AS descr: 2F30 AS -admin-c: ORG-2F30 +org: ORG-2F30 +admin-c: SIN-DN42 tech-c: SIN-DN42 mnt-by: 2F30-MNT diff --git a/data/aut-num/AS4242429966 b/data/aut-num/AS4242429966 index 828866ad2..f4c52bb7c 100644 --- a/data/aut-num/AS4242429966 +++ b/data/aut-num/AS4242429966 @@ -1,6 +1,7 @@ aut-num: AS4242429966 as-name: CL-AS descr: CL-AS -admin-c: ORG-CL -tech-c: ORG-CL +org: ORG-CL +admin-c: CL-DN42 +tech-c: CL-DN42 mnt-by: CL-MNT diff --git a/data/aut-num/AS64826 b/data/aut-num/AS64826 index 356853ad0..fe951e895 100644 --- a/data/aut-num/AS64826 +++ b/data/aut-num/AS64826 @@ -1,7 +1,7 @@ aut-num: AS64826 as-name: NETRAT-AS descr: netrat's AS -remarks: route information goes here +remarks: route information goes here admin-c: NETRAT-DN42 tech-c: NETRAT-DN42 -mnt-by: DUMMY-MNT +mnt-by: DUMMY-MNT diff --git a/data/aut-num/AS65046 b/data/aut-num/AS65046 index 39f87515c..8f3bc2b26 100644 --- a/data/aut-num/AS65046 +++ b/data/aut-num/AS65046 @@ -1,6 +1,5 @@ aut-num: AS65043 as-name: FFHALLE-AS -org: Freifunk Halle descr: Freifunk Halle admin-c: FREIFUNKHALLE-DN42 tech-c: FREIFUNKHALLE-DN42 diff --git a/data/dns/1.22.172.in-addr.arpa b/data/dns/1.22.172.in-addr.arpa deleted file mode 100644 index 69029eb4e..000000000 --- a/data/dns/1.22.172.in-addr.arpa +++ /dev/null @@ -1,6 +0,0 @@ -domain: 1.22.172.in-addr.arpa -nserver: ns2.as206226.net -admin-c: FRITZ-DN42 -tech-c: FRITZ-DN42 -zone-c: FRITZ-DN42 -mnt-by: DUMMY-MNT diff --git a/data/dns/198.23.172.in-addr.arpa b/data/dns/198.23.172.in-addr.arpa deleted file mode 100644 index 0b6654155..000000000 --- a/data/dns/198.23.172.in-addr.arpa +++ /dev/null @@ -1,11 +0,0 @@ -domain: 198.23.172.in-addr.arpa -nserver: ns2.ccchb.de -ds-rrdata: 43785 7 1 15CBE9F4DF07962555B4CA33E96EDD2DE3AEAEEC -ds-rrdata: 43785 7 2 A769CBB0BA3C56901D3941B0757BF25E1A9591304C7A912D88DBB29F 6DA5DB55 -admin-c: FRITZ-DN42 -admin-c: PYROPETER-DN42 -tech-c: FRITZ-DN42 -tech-c: PYROPETER-DN42 -zone-c: FRITZ-DN42 -zone-c: PYROPETER-DN42 -mnt-by: FLHB-NETGROUP-MNT diff --git a/data/dns/36.20.172.in-addr.arpa b/data/dns/36.20.172.in-addr.arpa deleted file mode 100644 index 373fc77a1..000000000 --- a/data/dns/36.20.172.in-addr.arpa +++ /dev/null @@ -1,11 +0,0 @@ -domain: 36.20.172.in-addr.arpa -nserver: ns2.ccchb.de -ds-rrdata: 3144 7 1 CCE65E22EDE791CDEAD7A3B586E52664A48872A1 -ds-rrdata: 3144 7 2 ED4A852646DAA8667113384C74521E70375F9C2D0D52519D4F5616C0 0DA43279 -admin-c: FRITZ-DN42 -admin-c: PYROPETER-DN42 -tech-c: FRITZ-DN42 -tech-c: PYROPETER-DN42 -zone-c: FRITZ-DN42 -zone-c: PYROPETER-DN42 -mnt-by: FLHB-NETGROUP-MNT diff --git a/data/dns/37.20.172.in-addr.arpa b/data/dns/37.20.172.in-addr.arpa deleted file mode 100644 index a041beb96..000000000 --- a/data/dns/37.20.172.in-addr.arpa +++ /dev/null @@ -1,11 +0,0 @@ -domain: 37.20.172.in-addr.arpa -nserver: ns2.ccchb.de -ds-rrdata: 50763 7 1 303757513FC4C488134E65C37674808930DA3170 -ds-rrdata: 50763 7 2 216714A4362719042D4E86095E5939FA1DAAEF9BAE24425F528BA4D1 17D5578F -admin-c: FRITZ-DN42 -admin-c: PYROPETER-DN42 -tech-c: FRITZ-DN42 -tech-c: PYROPETER-DN42 -zone-c: FRITZ-DN42 -zone-c: PYROPETER-DN42 -mnt-by: FLHB-NETGROUP-MNT diff --git a/data/dns/70.22.172.in-addr.arpa b/data/dns/70.22.172.in-addr.arpa deleted file mode 100644 index d75c2fe35..000000000 --- a/data/dns/70.22.172.in-addr.arpa +++ /dev/null @@ -1,12 +0,0 @@ -domain: 70.22.172.in-addr.arpa -nserver: ns2.ccchb.de -ds-rrdata: 14838 7 1 EBA321444D4613856C70BE1D996EACDC903461AA -ds-rrdata: 14838 7 2 D289466C0A92A6216D72653661ED8348B29D83F29A5AA13AFE32C996 D576DFF8 -admin-c: FRITZ-DN42 -admin-c: PYROPETER-DN42 -tech-c: FRITZ-DN42 -tech-c: PYROPETER-DN42 -zone-c: FRITZ-DN42 -zone-c: PYROPETER-DN42 -mnt-by: FLHB-NETGROUP-MNT - diff --git a/data/dns/f.6.f.5.6.f.f.a.6.d.d.f.ip6.arpa b/data/dns/f.6.f.5.6.f.f.a.6.d.d.f.ip6.arpa deleted file mode 100644 index 0d022a9c5..000000000 --- a/data/dns/f.6.f.5.6.f.f.a.6.d.d.f.ip6.arpa +++ /dev/null @@ -1,11 +0,0 @@ -domain: f.6.f.5.6.f.f.a.6.d.d.f.ip6.arpa -nserver: ns.p5.flhb.de -ds-rrdata: 24396 7 1 CE4CA1EEE1AF124B7EA84D9995E3BAD711856339 -ds-rrdata: 24396 7 2 6F6C0CF7F7582CB1866861749BBC8226F25377C3C22AE43DFA0A3C52 A76E4F7F -admin-c: FRITZ-DN42 -admin-c: PYROPETER-DN42 -tech-c: FRITZ-DN42 -tech-c: PYROPETER-DN42 -zone-c: FRITZ-DN42 -zone-c: PYROPETER-DN42 -mnt-by: FLHB-NETGROUP-MNT diff --git a/data/inet6num/fd00:bad:b00b::_64 b/data/inet6num/fd00:bad:b00b::_64 index 1666b1ee5..37e5b08bc 100644 --- a/data/inet6num/fd00:bad:b00b::_64 +++ b/data/inet6num/fd00:bad:b00b::_64 @@ -5,3 +5,4 @@ admin-c: REISENB-DN42 tech-c: REISENB-DN42 mnt-by: REISENB-MNT status: ASSIGNED +cidr: fd00:bad:b00b::/64 diff --git a/data/inet6num/fd25:ce36:b7db::_48 b/data/inet6num/fd25:ce36:b7db::_48 index d8c7797c9..87de4cbb8 100644 --- a/data/inet6num/fd25:ce36:b7db::_48 +++ b/data/inet6num/fd25:ce36:b7db::_48 @@ -3,7 +3,7 @@ netname: SNAPSERV-20160507 descr: SnapServ Ltd country: CH org: ORG-SNAPSERV -admin-c: ORG-SNAPSERV +admin-c: PM-DN42 tech-c: PM-DN42 mnt-by: SNAPSERV-MNT status: ASSIGNED diff --git a/data/inet6num/fd42:dead:d00d::_48 b/data/inet6num/fd42:dead:d00d::_48 index 4e2ba96a5..1c54602a2 100644 --- a/data/inet6num/fd42:dead:d00d::_48 +++ b/data/inet6num/fd42:dead:d00d::_48 @@ -5,3 +5,4 @@ admin-c: WALLE256-DN42 tech-c: WALLE256-DN42 mnt-by: WALLE256-MNT status: ASSIGNED +cidr: fd42:dead:d00d::/48 diff --git a/data/inet6num/fd52:d62e:8011:4200::_56 b/data/inet6num/fd52:d62e:8011:4200::_56 index 306b33f79..078e20b83 100644 --- a/data/inet6num/fd52:d62e:8011:4200::_56 +++ b/data/inet6num/fd52:d62e:8011:4200::_56 @@ -8,3 +8,4 @@ mnt-by: TRAE32566-MNT nserver: ns01.trae32566.org nserver: ns02.trae32566.org status: ASSIGNED +cidr: fd52:d62e:8011:4200::/56 diff --git a/data/inet6num/fd74:40ee:b38a::_48 b/data/inet6num/fd74:40ee:b38a::_48 index 8c20499de..d8dee6226 100644 --- a/data/inet6num/fd74:40ee:b38a::_48 +++ b/data/inet6num/fd74:40ee:b38a::_48 @@ -2,8 +2,9 @@ inet6num: fd74:40ee:b38a:0:0:0:0:0 - fd74:40ee:b38a:ffff:ffff:ffff:ffff netname: HSB-ORG-NET6 descr: Hackerspace Bielefeld IPv6 ULA country: DE -admin-c: ORG-HSB -tech-c: ORG-HSB +org: ORG-HSB +admin-c: BODEMS-DN42 +tech-c: BODEMS-DN42 mnt-by: BODEMS-MNT status: ASSIGNED -cidr: fd74:40ee:b38a::/48 +cidr: fd74:40ee:b38a::/48 diff --git a/data/inet6num/fdd6:aff6:5f6f::_48 b/data/inet6num/fdd6:aff6:5f6f::_48 index 94c034ea9..43aa8b722 100644 --- a/data/inet6num/fdd6:aff6:5f6f::_48 +++ b/data/inet6num/fdd6:aff6:5f6f::_48 @@ -7,8 +7,10 @@ admin-c: FRITZ-DN42 admin-c: PYROPETER-DN42 tech-c: FRITZ-DN42 tech-c: PYROPETER-DN42 +zone-c: FRITZ-DN42 +zone-c: PYROPETER-DN42 status: ASSIGNED PA nserver: ns.p5.flhb.de -ds-rrdata: 24396 7 1 CE4CA1EEE1AF124B7EA84D9995E3BAD711856339 -ds-rrdata: 24396 7 2 6F6C0CF7F7582CB1866861749BBC8226F25377C3C22AE43DFA0A3C52 A76E4F7F +ds-rdata: 24396 7 1 CE4CA1EEE1AF124B7EA84D9995E3BAD711856339 +ds-rdata: 24396 7 2 6F6C0CF7F7582CB1866861749BBC8226F25377C3C22AE43DFA0A3C52 A76E4F7F diff --git a/data/inetnum/172.20.12.64_28 b/data/inetnum/172.20.12.64_28 index ecc4e1571..5098931ee 100644 --- a/data/inetnum/172.20.12.64_28 +++ b/data/inetnum/172.20.12.64_28 @@ -6,3 +6,4 @@ admin-c: DARK-DN42 tech-c: DARK-DN42 mnt-by: DARK-MNT status: ASSIGNED +cidr: 172.20.12.64/28 diff --git a/data/inetnum/172.20.13.128_27 b/data/inetnum/172.20.13.128_27 index b3d90ae67..d1fb4280a 100644 --- a/data/inetnum/172.20.13.128_27 +++ b/data/inetnum/172.20.13.128_27 @@ -5,3 +5,4 @@ tech-c: ASTR0BOY-DN42 mnt-by: ASTR0BOY-MNT nserver: ns1.evenet.dn42 status: ASSIGNED +cidr: 172.20.13.128/27 diff --git a/data/inetnum/172.20.14.128_27 b/data/inetnum/172.20.14.128_27 index 8fc7e8076..02399d9a1 100644 --- a/data/inetnum/172.20.14.128_27 +++ b/data/inetnum/172.20.14.128_27 @@ -5,3 +5,5 @@ mnt-by: MFORCE-MNT nserver: ns1.evenet.dn42 nserver: ns2.evenet.dn42 status: ASSIGNED +cidr: 172.20.14.128/27 +netname: evennet network diff --git a/data/inetnum/172.20.148.32_27 b/data/inetnum/172.20.148.32_27 index ab74982b0..ac4e95815 100644 --- a/data/inetnum/172.20.148.32_27 +++ b/data/inetnum/172.20.148.32_27 @@ -5,3 +5,4 @@ admin-c: INSTIPOD-DN42 tech-c: INSTIPOD-DN42 mnt-by: INSTIPOD-MNT status: ASSIGNED +cidr: 172.20.148.32/27 diff --git a/data/inetnum/172.20.149.136_29 b/data/inetnum/172.20.149.136_29 index 4c7ec2c11..7853b9e72 100644 --- a/data/inetnum/172.20.149.136_29 +++ b/data/inetnum/172.20.149.136_29 @@ -8,3 +8,4 @@ mnt-by: RSDOHERTY-MNT nserver: ns1.evenet.dn42 nserver: ns2.evenet.dn42 status: ASSIGNED +cidr: 172.20.149.136/29 diff --git a/data/inetnum/172.20.149.64_26 b/data/inetnum/172.20.149.64_26 index 83256abff..8ae45fbe8 100644 --- a/data/inetnum/172.20.149.64_26 +++ b/data/inetnum/172.20.149.64_26 @@ -4,3 +4,4 @@ admin-c: PETRI13-DN42 tech-c: PETRI13-DN42 mnt-by: PETRI13-MNT status: ASSIGNED +cidr: 172.20.149.64/26 diff --git a/data/inetnum/172.20.15.0_28 b/data/inetnum/172.20.15.0_28 index a7725a543..ef570ad08 100644 --- a/data/inetnum/172.20.15.0_28 +++ b/data/inetnum/172.20.15.0_28 @@ -5,3 +5,4 @@ admin-c: DCS-DN42 tech-c: DCS-DN42 mnt-by: DCS-MNT status: ALLOCATED PA +cidr: 172.20.15.0/28 diff --git a/data/inetnum/172.20.170.64_27 b/data/inetnum/172.20.170.64_27 index f1d617115..a1834daea 100644 --- a/data/inetnum/172.20.170.64_27 +++ b/data/inetnum/172.20.170.64_27 @@ -6,3 +6,4 @@ admin-c: IP64-DN42 tech-c: IP64-DN42 mnt-by: IP64-MNT status: ASSIGNED +cidr: 172.20.170.64/27 diff --git a/data/inetnum/172.20.172.128_28 b/data/inetnum/172.20.172.128_28 index 9e22b7df1..0b96cbc4c 100644 --- a/data/inetnum/172.20.172.128_28 +++ b/data/inetnum/172.20.172.128_28 @@ -4,3 +4,4 @@ admin-c: ZHSJ-DN42 tech-c: ZHSJ-DN42 mnt-by: ZHSJ-MNT status: ASSIGNED +cidr: 172.20.172.128/28 diff --git a/data/inetnum/172.20.175.0_27 b/data/inetnum/172.20.175.0_27 index 1b264fbfa..f94b7f9fe 100644 --- a/data/inetnum/172.20.175.0_27 +++ b/data/inetnum/172.20.175.0_27 @@ -6,3 +6,4 @@ admin-c: SICKHEKKER-DN42 tech-c: SICKHEKKER-DN42 mnt-by: HEKKER-MNT status: ASSIGNED +cidr: 172.20.175.0/27 diff --git a/data/inetnum/172.20.180.128_25 b/data/inetnum/172.20.180.128_25 index 05a503c42..92a28a017 100644 --- a/data/inetnum/172.20.180.128_25 +++ b/data/inetnum/172.20.180.128_25 @@ -6,3 +6,4 @@ admin-c: MDP-DN42 tech-c: MDP-DN42 mnt-by: MDP-MNT status: ASSIGNED +cidr: 172.20.180.128/25 diff --git a/data/inetnum/172.20.183.32_29 b/data/inetnum/172.20.183.32_29 index b2d842e60..7e33bf368 100644 --- a/data/inetnum/172.20.183.32_29 +++ b/data/inetnum/172.20.183.32_29 @@ -8,3 +8,4 @@ mnt-by: RSDOHERTY-MNT nserver: ns1.evenet.dn42 nserver: ns2.evenet.dn42 status: ASSIGNED +cidr: 172.20.183.32/29 diff --git a/data/inetnum/172.20.232.0_27 b/data/inetnum/172.20.232.0_27 index 978051de3..eb9b05c46 100644 --- a/data/inetnum/172.20.232.0_27 +++ b/data/inetnum/172.20.232.0_27 @@ -7,3 +7,4 @@ tech-c: SAINTWOLF-DN42 mnt-by: SAINTWOLF-MNT nserver: ns1.saintwolf.dn42 status: ASSIGNED +cidr: 172.20.232.0/27 diff --git a/data/inetnum/172.20.3.0_24 b/data/inetnum/172.20.3.0_24 index 9e9501b14..ecf7d1a1b 100644 --- a/data/inetnum/172.20.3.0_24 +++ b/data/inetnum/172.20.3.0_24 @@ -5,3 +5,5 @@ tech-c: REISENB-DN42 mnt-by: REISENB-MNT nserver: ns1.reisenb.dn42 status: ASSIGNED +cidr: 172.20.3.0/24 +netname: reisenb network diff --git a/data/inetnum/172.20.36.0_23 b/data/inetnum/172.20.36.0_23 index 9aa77d4d7..09b0a1a65 100644 --- a/data/inetnum/172.20.36.0_23 +++ b/data/inetnum/172.20.36.0_23 @@ -7,12 +7,14 @@ admin-c: FRITZ-DN42 admin-c: PYROPETER-DN42 tech-c: FRITZ-DN42 tech-c: PYROPETER-DN42 +zone-c: FRITZ-DN42 +zone-c: PYROPETER-DN42 mnt-by: FLHB-NETGROUP-MNT nserver: ns2.ccchb.de -ds-rrdata: 3144 7 1 CCE65E22EDE791CDEAD7A3B586E52664A48872A1 -ds-rrdata: 3144 7 2 ED4A852646DAA8667113384C74521E70375F9C2D0D52519D4F5616C0 0DA43279 -ds-rrdata: 50763 7 1 303757513FC4C488134E65C37674808930DA3170 -ds-rrdata: 50763 7 2 216714A4362719042D4E86095E5939FA1DAAEF9BAE24425F528BA4D1 17D5578F +ds-rdata: 3144 7 1 CCE65E22EDE791CDEAD7A3B586E52664A48872A1 +ds-rdata: 3144 7 2 ED4A852646DAA8667113384C74521E70375F9C2D0D52519D4F5616C0 0DA43279 +ds-rdata: 50763 7 1 303757513FC4C488134E65C37674808930DA3170 +ds-rdata: 50763 7 2 216714A4362719042D4E86095E5939FA1DAAEF9BAE24425F528BA4D1 17D5578F status: ASSIGNED bgp-status: active cidr: 172.20.36.0/23 diff --git a/data/inetnum/172.20.4.192_27 b/data/inetnum/172.20.4.192_27 index 26aee38df..60bae154d 100644 --- a/data/inetnum/172.20.4.192_27 +++ b/data/inetnum/172.20.4.192_27 @@ -7,3 +7,4 @@ mnt-by: RZA-MNT nserver: ns1.wutang.dn42 nserver: ns2.wutang.dn42 status: ASSIGNED +cidr: 172.20.4.192/27 diff --git a/data/inetnum/172.20.6.80_28 b/data/inetnum/172.20.6.80_28 index a0a4d30c6..05f919a45 100644 --- a/data/inetnum/172.20.6.80_28 +++ b/data/inetnum/172.20.6.80_28 @@ -6,3 +6,4 @@ admin-c: MRCHLMS-DN42 tech-c: MRCHLMS-DN42 mnt-by: MRCHLMS-MNT status: ASSIGNED +cidr: 172.20.6.80/28 diff --git a/data/inetnum/172.21.125.160_27 b/data/inetnum/172.21.125.160_27 index f09c35315..9d2768536 100644 --- a/data/inetnum/172.21.125.160_27 +++ b/data/inetnum/172.21.125.160_27 @@ -2,7 +2,7 @@ inetnum: 172.21.125.160 - 172.21.125.191 netname: VITALE-NETWORKS descr: Hosting Services country: NL -admin-c: ORG-VITALE +admin-c: SCARLET-DN42 tech-c: SCARLET-DN42 mnt-by: VITALE-MNT status: ALLOCATED diff --git a/data/inetnum/172.22.1.0_24 b/data/inetnum/172.22.1.0_24 index b05bbff57..ecd533898 100644 --- a/data/inetnum/172.22.1.0_24 +++ b/data/inetnum/172.22.1.0_24 @@ -3,6 +3,7 @@ netname: CCCHH org: ORG-CCCHH admin-c: FRITZ-DN42 tech-c: FRITZ-DN42 +zone-c: FRITZ-DN42 mnt-by: FRITZ-MNT bgp-status: active -cidr: 172.22.1.0/24 +cidr: 172.22.1.0/24 diff --git a/data/inetnum/172.22.181.128_28 b/data/inetnum/172.22.181.128_28 index bdfc66233..8d5643757 100644 --- a/data/inetnum/172.22.181.128_28 +++ b/data/inetnum/172.22.181.128_28 @@ -7,3 +7,4 @@ tech-c: ASACHDE-DN42 mnt-by: SACHDE-MNT nserver: dummy.dn42 status: ASSIGNED +cidr: 172.22.181.128/28 diff --git a/data/inetnum/172.22.255.192_27 b/data/inetnum/172.22.255.192_27 index f09186c75..20680e5a0 100644 --- a/data/inetnum/172.22.255.192_27 +++ b/data/inetnum/172.22.255.192_27 @@ -1,10 +1,10 @@ inetnum: 172.22.255.192 - 172.22.255.223 netname: TINC-IX-3-NET descr: Tinc-IX-3 network -tinc-hosts: SET-3-DN42-TINC +remarks: tinc-hosts: SET-3-DN42-TINC admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 mnt-by: DUMMY-MNT status: ASSIGNED bgp-status: ignore -cidr: 172.22.255.192/27 +cidr: 172.22.255.192/27 diff --git a/data/inetnum/172.22.70.0_24 b/data/inetnum/172.22.70.0_24 index fe348221d..b8251a779 100644 --- a/data/inetnum/172.22.70.0_24 +++ b/data/inetnum/172.22.70.0_24 @@ -7,10 +7,12 @@ admin-c: FRITZ-DN42 admin-c: PYROPETER-DN42 tech-c: FRITZ-DN42 tech-c: PYROPETER-DN42 +zone-c: FRITZ-DN42 +zone-c: PYROPETER-DN42 mnt-by: FLHB-NETGROUP-MNT status: ASSIGNED nserver: ns2.ccchb.de -ds-rrdata: 14838 7 1 EBA321444D4613856C70BE1D996EACDC903461AA -ds-rrdata: 14838 7 2 D289466C0A92A6216D72653661ED8348B29D83F29A5AA13AFE32C996 D576DFF8 -bgp-status: active +ds-rdata: 14838 7 1 EBA321444D4613856C70BE1D996EACDC903461AA +ds-rdata: 14838 7 2 D289466C0A92A6216D72653661ED8348B29D83F29A5AA13AFE32C996 D576DFF8 +bgp-status: active cidr: 172.22.70.0/24 diff --git a/data/inetnum/172.23.0.20_32 b/data/inetnum/172.23.0.20_32 index 859139bf9..bea4c895e 100644 --- a/data/inetnum/172.23.0.20_32 +++ b/data/inetnum/172.23.0.20_32 @@ -5,3 +5,4 @@ tech-c: LUTOMA-DN42 mnt-by: LUTOMA-MNT nserver: ns1.lutoma.dn42 status: ALLOCATED +cidr: 172.23.0.20/32 diff --git a/data/inetnum/172.23.119.0_27 b/data/inetnum/172.23.119.0_27 index ef08dcc84..5a2e762d8 100644 --- a/data/inetnum/172.23.119.0_27 +++ b/data/inetnum/172.23.119.0_27 @@ -5,3 +5,4 @@ admin-c: WALLE256-DN42 tech-c: WALLE256-DN42 mnt-by: WALLE256-MNT status: ASSIGNED +cidr: 172.23.119.0/27 diff --git a/data/inetnum/172.23.188.0_24 b/data/inetnum/172.23.188.0_24 index 5615a211c..f4743a99e 100644 --- a/data/inetnum/172.23.188.0_24 +++ b/data/inetnum/172.23.188.0_24 @@ -6,3 +6,4 @@ tech-c: REISENB-DN42 mnt-by: REISENB-MNT nserver: ns1.rbz.ee status: ASSIGNED +cidr: 172.23.188.0/24 diff --git a/data/inetnum/172.23.198.0_24 b/data/inetnum/172.23.198.0_24 index 15c6c715c..1311d5acd 100644 --- a/data/inetnum/172.23.198.0_24 +++ b/data/inetnum/172.23.198.0_24 @@ -7,10 +7,12 @@ admin-c: FRITZ-DN42 admin-c: PYROPETER-DN42 tech-c: FRITZ-DN42 tech-c: PYROPETER-DN42 +zone-c: FRITZ-DN42 +zone-c: PYROPETER-DN42 mnt-by: FLHB-NETGROUP-MNT status: ASSIGNED nserver: ns2.ccchb.de -ds-rrdata: 43785 7 1 15CBE9F4DF07962555B4CA33E96EDD2DE3AEAEEC -ds-rrdata: 43785 7 2 A769CBB0BA3C56901D3941B0757BF25E1A9591304C7A912D88DBB29F 6DA5DB55 -bgp-status: active +ds-rdata: 43785 7 1 15CBE9F4DF07962555B4CA33E96EDD2DE3AEAEEC +ds-rdata: 43785 7 2 A769CBB0BA3C56901D3941B0757BF25E1A9591304C7A912D88DBB29F 6DA5DB55 +bgp-status: active cidr: 172.23.198.0/24 diff --git a/data/mntner/PIKKAACHU-MNT b/data/mntner/PIKKAACHU-MNT deleted file mode 100644 index b27b61ce6..000000000 --- a/data/mntner/PIKKAACHU-MNT +++ /dev/null @@ -1,5 +0,0 @@ -mntner: PIKKAACHU-MNT -sha512-pw: Nzg4NTAxNTQ3YTY0N2YxMDNlYzY1NTNhYThhODUwZWMxZmIxODc4NDU4NDQxMTc1Y2ZmNWQ3NmVjYTAxZmFmZjBlZThiNzI2Mjc0MzRiNTllMmI4ZjE0ODdhOWU1NmEyZmRhZTVhZTRjNzA4NjYwNDMxYjVjYTdjZDkzMWRmNTg0YzcxMGUxOTY2ZGYyN2UyYjQxYmUwMWFjYmM5ZGFjYWRjNGE2NDBiNjFlMjk3MmIxMGZkZjUzOTJkYzUxMDhiOTZjMTliMDJjNDcxNDhjMjdjMjVhMjcyOGNjMjgyNDFiZDIxNmNlMGE1ZTMxNTVhZTZhZmNhNTBhZWEzYjU5OGRkMTc3OTBhYzY1YWEzNzZjMjhmNjFmNDU3MDcxOGM3MDA1NGU4M2M3ZTNiYjgzOTgyYmQxZWNkOThlN2I4MjA3ZmI0YjNhZjkxODYxNzNlZDk4YTgwMzQ3NWE1NTU1YmY0NTIzYWEwYTdlYzM1MWEyOWY0ZDExYWU2ZWI3YWViMmE4OTc2YWQyNmYzNmQwZmFlY2JhYzg2NzRjOTQ3YWI4ODg5N2RiZWRjMzMwODFhNWJhMmM4OGIyM2VjY2YzN2Q5Nzc0OTc5YzIxZGZjNjIyMjI2MTMwZmFkYzY2N2UwNzFlMjliYjAzOGVkMmQ0YzM0NTQ0NDhjZWU0N2M2ZTU= -admin-c: PIKKAACHU-DN42 -tech-c: PIKKAACHU-DN42 -mnt-by: PIKKAACHU-MNT diff --git a/data/organisation/ORG-HSBNE b/data/organisation/ORG-HSBNE deleted file mode 100644 index a4d1a68ac..000000000 --- a/data/organisation/ORG-HSBNE +++ /dev/null @@ -1,10 +0,0 @@ -organisation: ORG-HSBNE -org-name: HSBNE INC -www: http://hsbne.org -e-mail: executive@hsbne.org -descr: Hackerspace Brisbane -admin-c: HSBNE-DN42 -tech-c: PIKKAACHU-DN42 -tech-c: 4GON-DN42 -mnt-by: PIKKAACHU-MNT -mnt-by: 4GON-MNT diff --git a/data/organisation/ORG-ZENO b/data/organisation/ORG-ZENO deleted file mode 100644 index 6f878af51..000000000 --- a/data/organisation/ORG-ZENO +++ /dev/null @@ -1,6 +0,0 @@ -organisation: ORG-ZENO -org-name: ZENO -descr: Zeno -admin-c: ZENO-DN42 -tech-c: ZENO-DN42 -mnt-by: PIKKAACHU-MNT diff --git a/data/person/COOPERNET-DN42 b/data/person/COOPERNET-DN42 deleted file mode 100644 index aeb1f4cc7..000000000 --- a/data/person/COOPERNET-DN42 +++ /dev/null @@ -1,4 +0,0 @@ -person: COOPERNET -contact: noc@coopernet.com.au -nic-hdl: COOPERNET-DN42 -mnt-by: PIKKAACHU-MNT diff --git a/data/person/HSBNE-DN42 b/data/person/HSBNE-DN42 deleted file mode 100644 index 504bd57c1..000000000 --- a/data/person/HSBNE-DN42 +++ /dev/null @@ -1,7 +0,0 @@ -person: HSBNE INC -contact: #hsbne@irc.freenode.net -e-mail: executive@hsbne.org.au -nic-hdl: HSBNE-DN42 -org: ORG-HSBNE -mnt-by: PIKKAACHU-MNT -mnt-by: 4GON-MNT diff --git a/data/person/ZENO-DN42 b/data/person/ZENO-DN42 deleted file mode 100644 index a817de294..000000000 --- a/data/person/ZENO-DN42 +++ /dev/null @@ -1,5 +0,0 @@ -person: ZENO -contact: PIKKAACHU-DN42 -e-mail: noc@zeno.io -nic-hdl: ZENO-DN42 -mnt-by: PIKKAACHU-MNT diff --git a/data/route/172.22.35.0_24 b/data/route/172.22.35.0_24 deleted file mode 100644 index be86f74d7..000000000 --- a/data/route/172.22.35.0_24 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.22.35.0/24 -descr: AAnet -origin: AS64635 -bgp-status: inactive 1474660804 -mnt-by: DUMMY-MNT diff --git a/data/schema/INET6NUM-SCHEMA b/data/schema/INET6NUM-SCHEMA index 69bbe558c..ca726be94 100644 --- a/data/schema/INET6NUM-SCHEMA +++ b/data/schema/INET6NUM-SCHEMA @@ -11,6 +11,8 @@ key: bgp-status optional single > {active|absent|ignore} [timestamp key: policy optional single > {open|closed|ask} min=int max=int all-min=int all-max=int key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role +key: zone-c optional multiple lookup=dn42.person,dn42.role +key: ds-rdata optional multiple key: mnt-by optional multiple lookup=dn42.mntner key: mnt-lower optional multiple lookup=dn42.mntner key: mnt-routes optional multiple lookup=dn42.mntner diff --git a/data/schema/INETNUM-SCHEMA b/data/schema/INETNUM-SCHEMA index a9a88a76d..7d066ffc8 100644 --- a/data/schema/INETNUM-SCHEMA +++ b/data/schema/INETNUM-SCHEMA @@ -11,6 +11,8 @@ key: bgp-status optional single > {active|absent|ignore} [timestamp] key: policy optional single > {open|closed|ask} min=int max=int all-min=int all-max=int key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role +key: zone-c optional multiple lookup=dn42.person,dn42.role +key: ds-rdata optional multiple key: mnt-by optional multiple lookup=dn42.mntner key: mnt-lower optional multiple lookup=dn42.mntner key: mnt-routes optional multiple lookup=dn42.mntner