From 318056d9c0c9fc118fcc77eaef00663cef57be95 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Tue, 27 Mar 2018 23:16:36 +0200 Subject: [PATCH 01/13] Fix schema errors and some other cleanups --- data/as-set/AS-CCCHB | 22 ++++++---------------- data/as-set/AS-MORTZU | 17 +---------------- data/as-set/AS-NL-ZUID-IX | 12 ------------ data/as-set/AS-WINTIX | 22 ---------------------- data/aut-num/{4242423160 => AS4242423160} | 0 data/aut-num/AS76198 | 8 ++++---- data/dns/nic.dn42 | 3 --- data/key-cert/MTN-FLHB-NETGROUP | 1 + data/key-cert/MTN-FRITZ | 1 + data/person/WINTIX-DN42 | 5 ----- data/route-set/RS-DN42 | 10 +++++++++- data/route-set/RS-DN42-NATIVE | 5 ++--- data/schema/AS-SET-SCHEMA | 2 +- data/schema/DNS-SCHEMA | 2 +- data/schema/KEY-CERT-SCHEMA | 14 ++++++++++++++ data/schema/MNTNER-SCHEMA | 2 +- data/schema/SCHEMA-SCHEMA | 2 +- data/schema/TINC-KEY-SCHEMA | 2 +- data/schema/TINC-KEYSET-SCHEMA | 2 +- 19 files changed, 44 insertions(+), 88 deletions(-) delete mode 100644 data/as-set/AS-WINTIX rename data/aut-num/{4242423160 => AS4242423160} (100%) delete mode 100644 data/person/WINTIX-DN42 create mode 100644 data/schema/KEY-CERT-SCHEMA diff --git a/data/as-set/AS-CCCHB b/data/as-set/AS-CCCHB index 0fd50f3e7..c19917a00 100644 --- a/data/as-set/AS-CCCHB +++ b/data/as-set/AS-CCCHB @@ -4,20 +4,10 @@ admin-c: CREST-DN42 admin-c: CREST-DN42 mnt-by: CREST-MNT remarks: as-block: 64824 - 64839 -x-members: AS64824 -x-members: AS64825 -x-members: AS64826 -x-members: AS64827 -x-members: AS64828 -x-members: AS64829 -x-members: AS64830 -x-members: AS64831 -x-members: AS64832 -x-members: AS64833 -x-members: AS64834 -x-members: AS64835 -x-members: AS64836 -x-members: AS64837 -x-members: AS64838 -x-members: AS64839 +members: AS64825 +members: AS64827 +members: AS64828 +members: AS64831 +members: AS64833 +members: AS64839 source: DN42 diff --git a/data/as-set/AS-MORTZU b/data/as-set/AS-MORTZU index 4d62d0935..c99351985 100644 --- a/data/as-set/AS-MORTZU +++ b/data/as-set/AS-MORTZU @@ -3,20 +3,5 @@ descr: mortzu ASN block admin-c: MORTZU-DN42 mnt-by: MORTZU-MNT remarks: as-block: 64792 - 64807 -x-members: AS64792 -x-members: AS64793 -x-members: AS64794 -x-members: AS64795 -x-members: AS64796 -x-members: AS64797 -x-members: AS64798 -x-members: AS64799 -x-members: AS64800 -x-members: AS64801 -x-members: AS64802 -x-members: AS64803 -x-members: AS64804 -x-members: AS64805 -x-members: AS64806 -x-members: AS64807 +members: AS64794 source: DN42 diff --git a/data/as-set/AS-NL-ZUID-IX b/data/as-set/AS-NL-ZUID-IX index 60343e3f7..4e408ff64 100644 --- a/data/as-set/AS-NL-ZUID-IX +++ b/data/as-set/AS-NL-ZUID-IX @@ -8,16 +8,4 @@ members: AS4242421340 admin-c: NL-ZUID-DN42 tech-c: NL-ZUID-DN42 mnt-by: MARLINC-MNT -remarks: AS block for NL Zuid exchanges and internal services -x-members: AS4242427000 -x-members: AS4242427001 -x-members: AS4242427002 -x-members: AS4242427003 -x-members: AS4242427004 -x-members: AS4242427005 -x-members: AS4242427006 -x-members: AS4242427007 -x-members: AS4242427008 -x-members: AS4242427009 -x-members: AS4242427010 source: DN42 diff --git a/data/as-set/AS-WINTIX b/data/as-set/AS-WINTIX deleted file mode 100644 index e85743e19..000000000 --- a/data/as-set/AS-WINTIX +++ /dev/null @@ -1,22 +0,0 @@ -as-set: AS-WINTIX -descr: wintix -admin-c: WINTIX-DN42 -mnt-by: DUMMY-MNT -remarks: as-block: 64808 - 64823 -x-members: AS64808 -x-members: AS64809 -x-members: AS64810 -x-members: AS64811 -x-members: AS64812 -x-members: AS64813 -x-members: AS64814 -x-members: AS64815 -x-members: AS64816 -x-members: AS64817 -x-members: AS64818 -x-members: AS64819 -x-members: AS64820 -x-members: AS64821 -x-members: AS64822 -x-members: AS64823 -source: DN42 diff --git a/data/aut-num/4242423160 b/data/aut-num/AS4242423160 similarity index 100% rename from data/aut-num/4242423160 rename to data/aut-num/AS4242423160 diff --git a/data/aut-num/AS76198 b/data/aut-num/AS76198 index c17894711..89276c3d8 100644 --- a/data/aut-num/AS76198 +++ b/data/aut-num/AS76198 @@ -6,14 +6,14 @@ remarks: Welcome to the DN42 autonomous system of Fablab Bremen and remarks: Chaos Computer Club Bremen. We have an open peering policy. remarks: ------------------------ remarks: Transit from AS64712 -x-import: from AS64712 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -x-export: to AS64712 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } +import: from AS64712 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +export: to AS64712 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } mp-import: afi ipv6 from AS64712 accept { fc00::/7^+ } mp-export: afi ipv6 to AS64712 announce { fdd6:aff6:5f6f::/48 } remarks: ------------------------ remarks: Transit from AS76115 -x-import: from AS76115 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -x-export: to AS76115 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } +import: from AS76115 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +export: to AS76115 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } mp-import: afi ipv6 from AS76115 accept { fc00::/7^+ } mp-export: afi ipv6 to AS76115 announce { fdd6:aff6:5f6f::/48 } admin-c: FRITZ-DN42 diff --git a/data/dns/nic.dn42 b/data/dns/nic.dn42 index 0a9d0e188..37c94d884 100644 --- a/data/dns/nic.dn42 +++ b/data/dns/nic.dn42 @@ -6,8 +6,5 @@ mnt-by: NIXNODES-MNT nserver: kapha.mtr.xuu.dn42 nserver: lavnana.sjc.xuu.dn42 nserver: rishi.bre.xuu.dn42 -x-nserver: ns1.nixnodes.dn42 -x-nserver: ns2.nixnodes.dn42 -x-nserver: ns3.nixnodes.dn42 status: EVALPEND 1503917671 source: DN42 diff --git a/data/key-cert/MTN-FLHB-NETGROUP b/data/key-cert/MTN-FLHB-NETGROUP index 8f9525967..c0d06011c 100644 --- a/data/key-cert/MTN-FLHB-NETGROUP +++ b/data/key-cert/MTN-FLHB-NETGROUP @@ -7,3 +7,4 @@ tech-c: FRITZ-DN42 tech-c: PYROPETER-DN42 tech-c: DEELKAR-DN42 mnt-by: FLHB-NETGROUP-MNT +source: DN42 diff --git a/data/key-cert/MTN-FRITZ b/data/key-cert/MTN-FRITZ index 3679116cc..428d01836 100644 --- a/data/key-cert/MTN-FRITZ +++ b/data/key-cert/MTN-FRITZ @@ -4,3 +4,4 @@ owner: fritz@grimpen.net fingerpr: cc3a6dd807903ba70874848ad74f4c627bac3720 certif: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGcchcJ4Id0PyPE6DnA2ShPgfkkhPuaPcQeTvobOpnO472VafcXZ2H1FdkIdYtdK+BMoGX7ndkcMzD91/QcOM5PkD+66BKQdL3WnUc1wRRPNA008qDjoqk1ddDPdG3uYtAsw0epZrRETLepYkNihhRDh/xmhqoPXo8Ax776rWV8QIDAQAB mnt-by: FRITZ-MNT +source: DN42 diff --git a/data/person/WINTIX-DN42 b/data/person/WINTIX-DN42 deleted file mode 100644 index 18159456b..000000000 --- a/data/person/WINTIX-DN42 +++ /dev/null @@ -1,5 +0,0 @@ -person: Wintix -contact: xmpp:wintix@jabber.ccc.de -nic-hdl: WINTIX-DN42 -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/route-set/RS-DN42 b/data/route-set/RS-DN42 index 565f95afd..cc9386304 100644 --- a/data/route-set/RS-DN42 +++ b/data/route-set/RS-DN42 @@ -1,9 +1,17 @@ route-set: RS-DN42 descr: extended dn42 networks -remark: contains the native dn42 network and ICANN assigned PI/PA space +remarks: contains the native dn42 network and ICANN assigned PI/PA space members: RS-DN42-NATIVE +mp-members: RS-DN42-NATIVE members: 195.16.84.40/29 +mp-members: 195.16.84.40/29 members: 37.1.89.160/29 +mp-members: 37.1.89.160/29 members: 46.19.90.48/28 +mp-members: 46.19.90.48/28 members: 46.19.90.96/28 +mp-members: 46.19.90.96/28 members: 46.4.248.192/27 +mp-members: 46.4.248.192/27 +mnt-by: DN42-MNT +source: DN42 diff --git a/data/route-set/RS-DN42-NATIVE b/data/route-set/RS-DN42-NATIVE index 0b3c51c9d..7d2bfecbf 100644 --- a/data/route-set/RS-DN42-NATIVE +++ b/data/route-set/RS-DN42-NATIVE @@ -3,6 +3,5 @@ descr: dn42 native networks mp-members: 172.20.0.0/14+ mp-members: fd00::/8+ members: 172.20.0.0/14+ -tech-c: DUMMY-DN42 -admin-c: DUMMY-DN42 -mnt-by: DUMMY-MNT +mnt-by: DN42-MNT +source: DN42 diff --git a/data/schema/AS-SET-SCHEMA b/data/schema/AS-SET-SCHEMA index 4baa88537..e4dcd9856 100644 --- a/data/schema/AS-SET-SCHEMA +++ b/data/schema/AS-SET-SCHEMA @@ -1,6 +1,6 @@ schema: AS-SET-SCHEMA ref: dn42.as-set -key: as-set required single primary schema +key: as-set required single primary schema key: descr optional single key: mnt-by required multiple lookup=dn42.mntner key: members optional multiple lookup=dn42.aut-num,dn42.as-set diff --git a/data/schema/DNS-SCHEMA b/data/schema/DNS-SCHEMA index bc23155ce..54422959e 100644 --- a/data/schema/DNS-SCHEMA +++ b/data/schema/DNS-SCHEMA @@ -1,6 +1,6 @@ schema: DNS-SCHEMA ref: dn42.domain -key: domain required single primary schema +key: domain required single primary schema key: nserver required multiple > [domain name] [ip addr] key: status required single > {EVALPEND,CONNECT} [timestamp] key: descr optional single diff --git a/data/schema/KEY-CERT-SCHEMA b/data/schema/KEY-CERT-SCHEMA new file mode 100644 index 000000000..efacac959 --- /dev/null +++ b/data/schema/KEY-CERT-SCHEMA @@ -0,0 +1,14 @@ +schema: KEY-CERT-SCHEMA +ref: dn42.key-cert +key: key-cert required single primary schema +key: method required single > {PGP|X509} +key: owner required multiple +key: fingerpr required single +key: certif required multiple +key: org optional multiple lookup=dn42.organisation +key: remarks optional multiple +key: admin-c optional multiple lookup=dn42.person,dn42.role +key: tech-c optional multiple lookup=dn42.person,dn42.role +key: mnt-by required multiple lookup=dn42.mntner +key: source required single +mnt-by: DN42-MNT diff --git a/data/schema/MNTNER-SCHEMA b/data/schema/MNTNER-SCHEMA index 08b629b4f..3590ec089 100644 --- a/data/schema/MNTNER-SCHEMA +++ b/data/schema/MNTNER-SCHEMA @@ -1,6 +1,6 @@ schema: MNTNER-SCHEMA ref: dn42.mntner -key: mntner required single primary schema +key: mntner required single primary schema key: descr optional single key: mnt-by required multiple lookup=dn42.mntner key: admin-c optional multiple lookup=dn42.person,dn42.role diff --git a/data/schema/SCHEMA-SCHEMA b/data/schema/SCHEMA-SCHEMA index 89e46f821..dcad662fc 100644 --- a/data/schema/SCHEMA-SCHEMA +++ b/data/schema/SCHEMA-SCHEMA @@ -1,6 +1,6 @@ schema: SCHEMA-SCHEMA ref: dn42.schema -key: schema required single schema primary > [name] +key: schema required single primary schema > [name] key: ref required single > [schema] key: key required multiple > [key-name] {required|optional|recommend|deprecate} diff --git a/data/schema/TINC-KEY-SCHEMA b/data/schema/TINC-KEY-SCHEMA index 705a8638e..e902fb693 100644 --- a/data/schema/TINC-KEY-SCHEMA +++ b/data/schema/TINC-KEY-SCHEMA @@ -1,6 +1,6 @@ schema: TINC-KEY-SCHEMA ref: dn42.tinc-key -key: tinc-key required single primary schema +key: tinc-key required single primary schema key: tinc-host required single key: tinc-file required single key: descr optional single diff --git a/data/schema/TINC-KEYSET-SCHEMA b/data/schema/TINC-KEYSET-SCHEMA index 566a9db64..9c0991288 100644 --- a/data/schema/TINC-KEYSET-SCHEMA +++ b/data/schema/TINC-KEYSET-SCHEMA @@ -1,6 +1,6 @@ schema: TINC-KEYSET-SCHEMA ref: dn42.tinc-keyset -key: tinc-keyset required single primary schema +key: tinc-keyset required single primary schema key: descr optional single key: remarks optional multiple key: member required multiple lookup=dn42.tinc-key From 18b9a7d2c5ec370ab802c6fb1ce24731f7c29219 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Thu, 29 Mar 2018 18:27:32 +0200 Subject: [PATCH 02/13] Fix bgp-status of inet{6,}num --- data/schema/INET6NUM-SCHEMA | 2 +- data/schema/INETNUM-SCHEMA | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/schema/INET6NUM-SCHEMA b/data/schema/INET6NUM-SCHEMA index 5963eb186..f53860511 100644 --- a/data/schema/INET6NUM-SCHEMA +++ b/data/schema/INET6NUM-SCHEMA @@ -7,7 +7,7 @@ key: nserver optional multiple key: country optional multiple key: descr optional single key: status optional single > {ALLOCATED|ASSIGNED} {PI|} -key: bgp-status optional single > ignore +key: bgp-status optional single > 'ignore' 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 diff --git a/data/schema/INETNUM-SCHEMA b/data/schema/INETNUM-SCHEMA index 8994d4f4a..a3f454672 100644 --- a/data/schema/INETNUM-SCHEMA +++ b/data/schema/INETNUM-SCHEMA @@ -7,7 +7,7 @@ key: nserver optional multiple key: country optional multiple key: descr optional single key: status optional single > {ALLOCATED|ASSIGNED} {PI|} -key: bgp-status optional single > ignore +key: bgp-status optional single > 'ignore' 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 From bf863ecb94507bafc44b8c938e8044fd3892a3c0 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Thu, 29 Mar 2018 18:33:53 +0200 Subject: [PATCH 03/13] Fix status and policy of inet{6,}num --- data/inet6num/fd00::_8 | 2 +- data/schema/INET6NUM-SCHEMA | 4 ++-- data/schema/INETNUM-SCHEMA | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/inet6num/fd00::_8 b/data/inet6num/fd00::_8 index a171b405b..67947a842 100644 --- a/data/inet6num/fd00::_8 +++ b/data/inet6num/fd00::_8 @@ -6,7 +6,7 @@ tech-c: DUMMY-DN42 mnt-by: DUMMY-MNT nserver: lavana.sjc.xuu.dn42 nserver: grmml.root.dn42 -status: ALLOCATED-BY-RIR +status: ALLOCATED policy: open remarks: Only /48 prefixes may be allocated out of this range. cidr: fd00::/8 diff --git a/data/schema/INET6NUM-SCHEMA b/data/schema/INET6NUM-SCHEMA index f53860511..95cfd95d0 100644 --- a/data/schema/INET6NUM-SCHEMA +++ b/data/schema/INET6NUM-SCHEMA @@ -6,9 +6,9 @@ key: netname required single key: nserver optional multiple key: country optional multiple key: descr optional single -key: status optional single > {ALLOCATED|ASSIGNED} {PI|} +key: status optional single > {ALLOCATED|ASSIGNED} {PI|PA|} key: bgp-status optional single > 'ignore' -key: policy optional single > {open|closed|ask} min=int max=int all-min=int all-max=int +key: policy optional single > {open|closed|ask|reserved} 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 diff --git a/data/schema/INETNUM-SCHEMA b/data/schema/INETNUM-SCHEMA index a3f454672..aee68a37e 100644 --- a/data/schema/INETNUM-SCHEMA +++ b/data/schema/INETNUM-SCHEMA @@ -6,9 +6,9 @@ key: netname required single key: nserver optional multiple key: country optional multiple key: descr optional single -key: status optional single > {ALLOCATED|ASSIGNED} {PI|} +key: status optional single > {ALLOCATED|ASSIGNED} {PI|PA|} key: bgp-status optional single > 'ignore' -key: policy optional single > {open|closed|ask} min=int max=int all-min=int all-max=int +key: policy optional single > {open|closed|ask|reserved} 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 From 978ead0773ae3bd694363cce1b451bddd55dce97 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Thu, 29 Mar 2018 18:44:02 +0200 Subject: [PATCH 04/13] Fix dns/domain --- data/dns/bitpipe.dn42 | 7 ------- data/dns/lossy-network.dn42 | 2 +- data/dns/ripnet.dn42 | 2 +- data/dns/ucis.dn42 | 2 +- data/dns/vbox.dn42 | 8 -------- data/schema/DNS-SCHEMA | 2 +- 6 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 data/dns/bitpipe.dn42 delete mode 100644 data/dns/vbox.dn42 diff --git a/data/dns/bitpipe.dn42 b/data/dns/bitpipe.dn42 deleted file mode 100644 index 9090d672a..000000000 --- a/data/dns/bitpipe.dn42 +++ /dev/null @@ -1,7 +0,0 @@ -domain: bitpipe.dn42 -nserver: ns1.bitpipe.dn42 172.20.135.34 -status: OFFLINE -admin-c: IUS-DN42 -tech-c: IUS-DN42 -mnt-by: IUS-MNT -source: DN42 diff --git a/data/dns/lossy-network.dn42 b/data/dns/lossy-network.dn42 index 85970828d..aea005025 100644 --- a/data/dns/lossy-network.dn42 +++ b/data/dns/lossy-network.dn42 @@ -3,7 +3,7 @@ nserver: ns1.lossy-network.dn42 172.23.42.1 nserver: ns1.lossy-network.dn42 fd42:23:42:b100::1 nserver: ns2.lossy-network.dn42 172.23.42.2 nserver: ns2.lossy-network.dn42 fd42:23:42:b200::1 -status: ALIVEANDKICKING +status: CONNECT admin-c: HEXA-DN42 tech-c: HEXA-DN42 mnt-by: HEXA-MNT diff --git a/data/dns/ripnet.dn42 b/data/dns/ripnet.dn42 index 5b9d754c4..999bf4791 100644 --- a/data/dns/ripnet.dn42 +++ b/data/dns/ripnet.dn42 @@ -7,5 +7,5 @@ nserver: nsa.ripnet.dn42 172.20.143.14 nserver: nsa.ripnet.dn42 fd42:6c6d:616f:2e72:6970::14 nserver: nsb.ripnet.dn42 172.20.143.13 nserver: nsb.ripnet.dn42 fd42:6c6d:616f:2e72:6970::13 -status: PENDING +status: EVALPEND source: DN42 diff --git a/data/dns/ucis.dn42 b/data/dns/ucis.dn42 index 34b1d4173..c56203976 100644 --- a/data/dns/ucis.dn42 +++ b/data/dns/ucis.dn42 @@ -2,7 +2,7 @@ domain: ucis.dn42 nserver: ns1.ucis.dn42 172.22.166.2 nserver: ns3.ucis.dn42 172.22.166.6 nserver: ns1.ucis.nl -status: connect +status: CONNECT admin-c: UFO-DN42 tech-c: UFO-DN42 mnt-by: DUMMY-MNT diff --git a/data/dns/vbox.dn42 b/data/dns/vbox.dn42 deleted file mode 100644 index 730304b4a..000000000 --- a/data/dns/vbox.dn42 +++ /dev/null @@ -1,8 +0,0 @@ -domain: vbox.dn42 -admin-c: VBOX-DN42 -tech-c: VBOX-DN42 -mnt-by: VBOX-MNT -nserver: ns1.vbox.dn42 -nserver: ns2.vbox.dn42 -status: OFFLINE -source: DN42 diff --git a/data/schema/DNS-SCHEMA b/data/schema/DNS-SCHEMA index 54422959e..5b61b1292 100644 --- a/data/schema/DNS-SCHEMA +++ b/data/schema/DNS-SCHEMA @@ -2,7 +2,7 @@ schema: DNS-SCHEMA ref: dn42.domain key: domain required single primary schema key: nserver required multiple > [domain name] [ip addr] -key: status required single > {EVALPEND,CONNECT} [timestamp] +key: status required single > {EVALPEND|CONNECT} [timestamp] key: descr optional single key: mnt-by required multiple lookup=dn42.mntner key: admin-c optional multiple lookup=dn42.person,dn42.role From 7933d05d2d7fb51ffa1f46fa07907d37159ad5a8 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Thu, 29 Mar 2018 18:53:26 +0200 Subject: [PATCH 05/13] Fix mntner and key-cert --- data/schema/KEY-CERT-SCHEMA | 2 +- data/schema/MNTNER-SCHEMA | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/schema/KEY-CERT-SCHEMA b/data/schema/KEY-CERT-SCHEMA index efacac959..d3be455a0 100644 --- a/data/schema/KEY-CERT-SCHEMA +++ b/data/schema/KEY-CERT-SCHEMA @@ -1,7 +1,7 @@ schema: KEY-CERT-SCHEMA ref: dn42.key-cert key: key-cert required single primary schema -key: method required single > {PGP|X509} +key: method required single > {PGP|X509|MTN} key: owner required multiple key: fingerpr required single key: certif required multiple diff --git a/data/schema/MNTNER-SCHEMA b/data/schema/MNTNER-SCHEMA index 3590ec089..0b6df9030 100644 --- a/data/schema/MNTNER-SCHEMA +++ b/data/schema/MNTNER-SCHEMA @@ -5,7 +5,7 @@ key: descr optional single key: mnt-by required multiple lookup=dn42.mntner key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role -key: auth optional multiple > [method] [value] +key: auth optional multiple > [method] [value]... key: org optional multiple lookup=dn42.organisation key: abuse-mailbox optional single key: sha512-pw optional single From b8bf913ecefc3c99f042898d323165a3f9391556 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Thu, 29 Mar 2018 19:50:51 +0200 Subject: [PATCH 06/13] Fix SCHEMA-SCHEMA --- data/schema/SCHEMA-SCHEMA | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/schema/SCHEMA-SCHEMA b/data/schema/SCHEMA-SCHEMA index dcad662fc..fd0129c82 100644 --- a/data/schema/SCHEMA-SCHEMA +++ b/data/schema/SCHEMA-SCHEMA @@ -4,7 +4,7 @@ key: schema required single primary schema > [name] key: ref required single > [schema] key: key required multiple > [key-name] {required|optional|recommend|deprecate} - {single|multi} {primary|} {schema|} + {single|multiple} {primary|} {schema|} lookup=str '>' [spec]... key: mnt-by required multiple lookup=dn42.mntner > [mntner] key: remarks optional multiple > [text]... From 8d137e649ce170a1f9bb2ad04246082072fe4635 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Sat, 31 Mar 2018 12:40:10 +0200 Subject: [PATCH 07/13] Fix lookups --- data/aut-num/AS4242423160 | 2 +- data/schema/AS-SET-SCHEMA | 17 +++++++++-------- data/schema/AUT-NUM-SCHEMA | 2 +- data/schema/ROUTE-SET-SCHEMA | 6 +++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/data/aut-num/AS4242423160 b/data/aut-num/AS4242423160 index 39343c3a1..a7fcd4680 100644 --- a/data/aut-num/AS4242423160 +++ b/data/aut-num/AS4242423160 @@ -1,4 +1,4 @@ -aut-num: 4242423160 +aut-num: AS4242423160 as-name: AS for ENS160 admin-c: ENS160-DN42 tech-c: ENS160-DN42 diff --git a/data/schema/AS-SET-SCHEMA b/data/schema/AS-SET-SCHEMA index e4dcd9856..7948f73f8 100644 --- a/data/schema/AS-SET-SCHEMA +++ b/data/schema/AS-SET-SCHEMA @@ -1,11 +1,12 @@ schema: AS-SET-SCHEMA ref: dn42.as-set -key: as-set required single primary schema -key: descr optional single -key: mnt-by required multiple lookup=dn42.mntner -key: members optional multiple lookup=dn42.aut-num,dn42.as-set -key: admin-c optional multiple lookup=dn42.person,dn42.role -key: tech-c optional multiple lookup=dn42.person,dn42.role -key: remarks optional multiple -key: source required single lookup=dn42.registry +key: as-set required single primary schema +key: descr optional single +key: mnt-by required multiple lookup=dn42.mntner +key: members optional multiple lookup=dn42.aut-num,dn42.as-set +key: mbrs-by-ref optional multiple lookup=dn42.mntner +key: admin-c optional multiple lookup=dn42.person,dn42.role +key: tech-c optional multiple lookup=dn42.person,dn42.role +key: remarks optional multiple +key: source required single lookup=dn42.registry mnt-by: DN42-MNT diff --git a/data/schema/AUT-NUM-SCHEMA b/data/schema/AUT-NUM-SCHEMA index 6825a18f4..98dd4976b 100644 --- a/data/schema/AUT-NUM-SCHEMA +++ b/data/schema/AUT-NUM-SCHEMA @@ -4,7 +4,7 @@ key: aut-num required single primary schema key: as-name required single key: descr optional single key: mnt-by required multiple lookup=dn42.mntner -key: member-of optional multiple lookup=dn42.as-set +key: member-of optional multiple lookup=dn42.as-set,dn42.route-set key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: org optional single lookup=dn42.organisation diff --git a/data/schema/ROUTE-SET-SCHEMA b/data/schema/ROUTE-SET-SCHEMA index 4b864edbc..ab14f5b0b 100644 --- a/data/schema/ROUTE-SET-SCHEMA +++ b/data/schema/ROUTE-SET-SCHEMA @@ -3,9 +3,9 @@ ref: dn42.route-set key: route-set required single primary schema key: descr optional single key: mnt-by required multiple lookup=dn42.mntner -key: members deprecate multiple lookup=dn42.route-set -key: mp-members optional multiple lookup=dn42.route -key: mbrs-by-ref optional multiple lookup=dn42.route +key: members deprecate multiple +key: mp-members optional multiple +key: mbrs-by-ref optional multiple lookup=dn42.mntner key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: remarks optional multiple From 994343513aa4271f52627a2d21e5cd270a1cb4c8 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Sat, 31 Mar 2018 14:33:46 +0200 Subject: [PATCH 08/13] Fix names of all as-set objects --- data/as-set/{AS4242423911 => AS-AS4242423911} | 2 +- data/as-set/{AS4242424242 => AS-AS4242424242} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename data/as-set/{AS4242423911 => AS-AS4242423911} (79%) rename data/as-set/{AS4242424242 => AS-AS4242424242} (81%) diff --git a/data/as-set/AS4242423911 b/data/as-set/AS-AS4242423911 similarity index 79% rename from data/as-set/AS4242423911 rename to data/as-set/AS-AS4242423911 index 7992c31da..de987b9d0 100644 --- a/data/as-set/AS4242423911 +++ b/data/as-set/AS-AS4242423911 @@ -1,4 +1,4 @@ -as-set: AS4242423911 +as-set: AS-AS4242423911 descr: Moshii admin-c: MOSH-DN42 tech-c: MOSH-DN42 diff --git a/data/as-set/AS4242424242 b/data/as-set/AS-AS4242424242 similarity index 81% rename from data/as-set/AS4242424242 rename to data/as-set/AS-AS4242424242 index 4de1e3b07..517efea86 100644 --- a/data/as-set/AS4242424242 +++ b/data/as-set/AS-AS4242424242 @@ -1,4 +1,4 @@ -as-set: AS4242424242 +as-set: AS-AS4242424242 descr: Ratatosk Yggdrasil admin-c: CFROG-DN42 tech-c: CFROG-DN42 From aaafcc4807be27825283187f7f49fa926a016642 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Sat, 31 Mar 2018 14:42:47 +0200 Subject: [PATCH 09/13] Fix names of all organisation objects --- data/aut-num/AS4242422121 | 2 +- data/aut-num/AS64839 | 2 +- data/inetnum/172.22.247.0_27 | 2 +- data/inetnum/172.22.247.192_26 | 2 +- .../{HACKSPACE-JENA-DN42 => ORG-HACKSPACE-JENA-DN42} | 2 +- .../{HACKSPACE-LOOP-DN42 => ORG-HACKSPACE-LOOP-DN42} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename data/organisation/{HACKSPACE-JENA-DN42 => ORG-HACKSPACE-JENA-DN42} (85%) rename data/organisation/{HACKSPACE-LOOP-DN42 => ORG-HACKSPACE-LOOP-DN42} (87%) diff --git a/data/aut-num/AS4242422121 b/data/aut-num/AS4242422121 index b491da8a9..bc09d4ce2 100644 --- a/data/aut-num/AS4242422121 +++ b/data/aut-num/AS4242422121 @@ -5,7 +5,7 @@ remarks: Peerings via OpenVPN, Tinc and IPSec remarks: Router located at Paris, behind a DSL line remarks: See https://wiki.leloop.org/index.php/DN42 (French) remarks: for implementations details. -org: HACKSPACE-LOOP-DN42 +org: ORG-HACKSPACE-LOOP-DN42 admin-c: DLGG-DN42 admin-c: KANKAN-DN42 admin-c: NICOO-DN42 diff --git a/data/aut-num/AS64839 b/data/aut-num/AS64839 index a8747059e..e65ddf4b3 100644 --- a/data/aut-num/AS64839 +++ b/data/aut-num/AS64839 @@ -1,6 +1,6 @@ aut-num: AS64839 as-name: KRAUTSPACE-AS -org: HACKSPACE-JENA-DN42 +org: ORG-HACKSPACE-JENA-DN42 descr: krautspace.de mnt-by: MARTIN89-MNT admin-c: MARTIN89-DN42 diff --git a/data/inetnum/172.22.247.0_27 b/data/inetnum/172.22.247.0_27 index a9c93f3df..f5ad71868 100644 --- a/data/inetnum/172.22.247.0_27 +++ b/data/inetnum/172.22.247.0_27 @@ -5,7 +5,7 @@ remarks: IPv4 space reserved for interconnections remarks: Should NOT be announced remarks: See http://wiki.leloop.org/index.php/DN42#Intercos_en_place country: FR -org: HACKSPACE-LOOP-DN42 +org: ORG-HACKSPACE-LOOP-DN42 admin-c: KANKAN-DN42 admin-c: NICOO-DN42 tech-c: KANKAN-DN42 diff --git a/data/inetnum/172.22.247.192_26 b/data/inetnum/172.22.247.192_26 index 1b9be6f60..68fd571ca 100644 --- a/data/inetnum/172.22.247.192_26 +++ b/data/inetnum/172.22.247.192_26 @@ -5,7 +5,7 @@ remarks: IPv4 space reserved for interconnections remarks: Should NOT be announced remarks: See http://wiki.leloop.org/index.php/DN42#Intercos_en_place country: FR -org: HACKSPACE-LOOP-DN42 +org: ORG-HACKSPACE-LOOP-DN42 admin-c: KANKAN-DN42 admin-c: NICOO-DN42 tech-c: KANKAN-DN42 diff --git a/data/organisation/HACKSPACE-JENA-DN42 b/data/organisation/ORG-HACKSPACE-JENA-DN42 similarity index 85% rename from data/organisation/HACKSPACE-JENA-DN42 rename to data/organisation/ORG-HACKSPACE-JENA-DN42 index cd3e8cca5..7cc52f13e 100644 --- a/data/organisation/HACKSPACE-JENA-DN42 +++ b/data/organisation/ORG-HACKSPACE-JENA-DN42 @@ -1,4 +1,4 @@ -organisation: HACKSPACE-JENA-DN42 +organisation: ORG-HACKSPACE-JENA-DN42 org-name: Hackspace Jena e.V. language: DE e-mail: office@hackspace-jena.de diff --git a/data/organisation/HACKSPACE-LOOP-DN42 b/data/organisation/ORG-HACKSPACE-LOOP-DN42 similarity index 87% rename from data/organisation/HACKSPACE-LOOP-DN42 rename to data/organisation/ORG-HACKSPACE-LOOP-DN42 index 7e007b79a..602e8e572 100644 --- a/data/organisation/HACKSPACE-LOOP-DN42 +++ b/data/organisation/ORG-HACKSPACE-LOOP-DN42 @@ -1,4 +1,4 @@ -organisation: HACKSPACE-LOOP-DN42 +organisation: ORG-HACKSPACE-LOOP-DN42 org-name: Le LOOP language: FR e-mail: dn42@lists.leloop.org From 4def8b7341f1526d3c104369cbd489a373746bdc Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Sat, 31 Mar 2018 15:51:11 +0200 Subject: [PATCH 10/13] Remove inet-cidr from the route schema --- data/route/172.22.141.0_24 | 1 - data/route/172.22.141.0_28 | 1 - data/route/172.22.141.160_27 | 1 - data/route6/{fd42:7616:60D2::_48 => fd42:7616:60d2::_48} | 2 +- data/route6/{fd42:D3CA::_48 => fd42:d3ca::_48} | 2 +- data/schema/ROUTE-SCHEMA | 1 - 6 files changed, 2 insertions(+), 6 deletions(-) rename data/route6/{fd42:7616:60D2::_48 => fd42:7616:60d2::_48} (69%) rename data/route6/{fd42:D3CA::_48 => fd42:d3ca::_48} (77%) diff --git a/data/route/172.22.141.0_24 b/data/route/172.22.141.0_24 index 3b8c0dee3..85927be02 100644 --- a/data/route/172.22.141.0_24 +++ b/data/route/172.22.141.0_24 @@ -1,6 +1,5 @@ route: 172.22.141.0/24 descr: Xuu Network -inet-cidr: 172.22.141.0/24 origin: AS64737 mnt-by: XUU-MNT source: DN42 diff --git a/data/route/172.22.141.0_28 b/data/route/172.22.141.0_28 index 557f962ba..13aec921b 100644 --- a/data/route/172.22.141.0_28 +++ b/data/route/172.22.141.0_28 @@ -1,6 +1,5 @@ route: 172.22.141.0/28 descr: Xuu Network 0 -inet-cidr: 172.22.141.0/24 origin: AS64737 mnt-by: XUU-MNT source: DN42 diff --git a/data/route/172.22.141.160_27 b/data/route/172.22.141.160_27 index b32c46009..04fe93f43 100644 --- a/data/route/172.22.141.160_27 +++ b/data/route/172.22.141.160_27 @@ -1,6 +1,5 @@ route: 172.22.141.160/27 descr: Xuu Network 1 -inet-cidr: 172.22.141.0/24 origin: AS64737 mnt-by: XUU-MNT source: DN42 diff --git a/data/route6/fd42:7616:60D2::_48 b/data/route6/fd42:7616:60d2::_48 similarity index 69% rename from data/route6/fd42:7616:60D2::_48 rename to data/route6/fd42:7616:60d2::_48 index 4f27e153c..f6270e421 100644 --- a/data/route6/fd42:7616:60D2::_48 +++ b/data/route6/fd42:7616:60d2::_48 @@ -1,4 +1,4 @@ -route6: fd42:7616:60D2::/48 +route6: fd42:7616:60d2::/48 origin: AS4242423264 mnt-by: HAELWENN-MNT source: DN42 diff --git a/data/route6/fd42:D3CA::_48 b/data/route6/fd42:d3ca::_48 similarity index 77% rename from data/route6/fd42:D3CA::_48 rename to data/route6/fd42:d3ca::_48 index 030e5abca..96cbfdac0 100644 --- a/data/route6/fd42:D3CA::_48 +++ b/data/route6/fd42:d3ca::_48 @@ -1,4 +1,4 @@ -route6: fd42:D3CA::/48 +route6: fd42:d3ca::/48 descr: D3NETWORK-1 origin: AS4242421520 mnt-by: D3NETWORK-MNT diff --git a/data/schema/ROUTE-SCHEMA b/data/schema/ROUTE-SCHEMA index c4847323a..0cdec3c32 100644 --- a/data/schema/ROUTE-SCHEMA +++ b/data/schema/ROUTE-SCHEMA @@ -6,7 +6,6 @@ key: origin required multiple lookup=dn42.aut-num key: member-of optional multiple lookup=dn42.route-set key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role -key: inet-cidr optional single lookup=dn42.inetnum key: descr optional single key: remarks optional multiple key: source required single lookup=dn42.registry From 076654e276fd7e8f81a541b749f2d5940ac2cf33 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Sat, 31 Mar 2018 16:10:19 +0200 Subject: [PATCH 11/13] Fix nserver attribute of all inet{6,}num objects --- data/dns/lynx.dn42 | 1 + data/inet6num/fd01:470:1989::_48 | 1 - data/inet6num/fd22:2697:498f::_48 | 2 +- data/inet6num/fd40:9dc7:b528::_48 | 1 - data/inet6num/fd42:18:28::_48 | 6 +++--- data/inet6num/fd42:2950::_32 | 3 +-- data/inet6num/fd42:64:713::_48 | 2 +- data/inet6num/fd42:ccc:da::_48 | 3 +-- data/inet6num/fd42:d42:2706::_48 | 3 +-- data/inet6num/fd59:54c0:fab::_48 | 2 +- data/inet6num/fd5a:ad49:844c::_64 | 2 +- data/inet6num/fd63:1e39:6f73::_48 | 3 +-- data/inet6num/fd68:fdcc:7a1a::_48 | 3 +-- data/inet6num/fd72:20:185::_64 | 2 +- data/inet6num/fd97:4c4e:9d26::_48 | 2 +- data/inet6num/fda0:23:748b::_48 | 2 +- data/inet6num/fda1:d21:d67f::_48 | 2 +- data/inet6num/fdb3:d376:9939::_48 | 2 -- data/inet6num/fdc8:c633:5319::_48 | 4 ++-- data/inet6num/fdec::_48 | 2 +- data/inet6num/fdef:27db:3be::_48 | 2 -- data/inet6num/fdfc:3e4f:f3c0::_48 | 2 +- data/inetnum/172.20.14.192_26 | 2 +- data/inetnum/172.20.16.128_25 | 4 ++-- data/inetnum/172.20.185.0_24 | 4 ++-- data/inetnum/172.20.186.0_24 | 4 ++-- data/inetnum/172.20.240.0_25 | 4 ++-- data/inetnum/172.20.240.128_26 | 2 +- data/inetnum/172.20.46.0_26 | 2 +- data/inetnum/172.20.57.0_24 | 2 +- data/inetnum/172.22.0.0_15 | 6 +++--- data/inetnum/172.22.113.0_24 | 2 +- data/inetnum/172.22.172.128_25 | 2 +- data/inetnum/172.22.230.0_24 | 2 +- data/inetnum/172.22.230.128_25 | 2 +- data/inetnum/172.22.239.0_24 | 2 +- data/inetnum/172.22.249.0_24 | 1 - data/inetnum/172.22.26.0_23 | 2 +- data/inetnum/172.22.40.0_23 | 2 -- data/inetnum/172.22.58.0_24 | 1 - data/inetnum/172.23.148.0_24 | 2 +- data/inetnum/172.23.192.0_24 | 1 - data/inetnum/172.23.194.0_23 | 1 - data/inetnum/172.23.216.0_24 | 4 ++-- data/inetnum/172.23.225.0_24 | 1 - data/inetnum/172.23.227.0_24 | 1 - data/inetnum/172.23.235.0_24 | 2 +- data/inetnum/172.23.236.0_25 | 2 +- data/inetnum/172.23.245.0_24 | 2 +- data/inetnum/172.23.35.128_26 | 6 +++--- data/inetnum/172.23.56.0_24 | 6 +++--- data/inetnum/172.23.64.0_24 | 2 +- data/inetnum/172.23.76.0_26 | 2 +- 53 files changed, 56 insertions(+), 74 deletions(-) diff --git a/data/dns/lynx.dn42 b/data/dns/lynx.dn42 index 05776f4c9..c9dd261c7 100644 --- a/data/dns/lynx.dn42 +++ b/data/dns/lynx.dn42 @@ -4,5 +4,6 @@ admin-c: LEX-DN42 tech-c: LEX-DN42 mnt-by: LEX-MNT nserver: ns.lynx.dn42 172.22.97.251 +nserver: ns.lynx.dn42 fd97:4c4e:9d26:1ffe::1 status: EVALPEND 1502188311 source: DN42 diff --git a/data/inet6num/fd01:470:1989::_48 b/data/inet6num/fd01:470:1989::_48 index bdbc84b42..504343af4 100644 --- a/data/inet6num/fd01:470:1989::_48 +++ b/data/inet6num/fd01:470:1989::_48 @@ -1,6 +1,5 @@ inet6num: fd01:0470:1989:0000:0000:0000:0000:0000 - fd01:0470:1989:ffff:ffff:ffff:ffff:ffff netname: RAUSCH-NET -nserver: dns.therausch.dn42 fd01:470:1989:ff00::53 cidr: fd01:470:1989::/48 country: US admin-c: KCR-DN42 diff --git a/data/inet6num/fd22:2697:498f::_48 b/data/inet6num/fd22:2697:498f::_48 index c63df700b..8718035de 100644 --- a/data/inet6num/fd22:2697:498f::_48 +++ b/data/inet6num/fd22:2697:498f::_48 @@ -4,7 +4,7 @@ descr: Martin89 dn42 network admin-c: MARTIN89-DN42 tech-c: MARTIN89-DN42 status: ASSIGNED -nserver: dns-anycast-a.martin89.dn42 172.22.113.12 +nserver: dns-anycast-a.martin89.dn42 cidr: fd22:2697:498f::/48 mnt-by: DUMMY-MNT source: DN42 diff --git a/data/inet6num/fd40:9dc7:b528::_48 b/data/inet6num/fd40:9dc7:b528::_48 index 52cbf3923..7429acd20 100644 --- a/data/inet6num/fd40:9dc7:b528::_48 +++ b/data/inet6num/fd40:9dc7:b528::_48 @@ -6,6 +6,5 @@ admin-c: ALARIG-DN42 tech-c: ALARIG-DN42 mnt-by: ALARIG-MNT status: ASSIGNED -nserver: bulbizarre.swordarmor.dn42 172.20.44.5 cidr: fd40:9dc7:b528::/48 source: DN42 diff --git a/data/inet6num/fd42:18:28::_48 b/data/inet6num/fd42:18:28::_48 index 2e9d6f257..4e5e21290 100644 --- a/data/inet6num/fd42:18:28::_48 +++ b/data/inet6num/fd42:18:28::_48 @@ -5,9 +5,9 @@ country: BR admin-c: BR-DN42 tech-c: BR-DN42 mnt-by: BR-MNT -nserver: ns1.br.dn42 172.23.56.1 -nserver: ns2.br.dn42 172.23.56.3 -nserver: ns3.br.dn42 172.23.56.4 +nserver: ns1.br.dn42 +nserver: ns2.br.dn42 +nserver: ns3.br.dn42 status: ALLOCATED cidr: fd42:18:28::/48 source: DN42 diff --git a/data/inet6num/fd42:2950::_32 b/data/inet6num/fd42:2950::_32 index 83686f1aa..586b244c2 100644 --- a/data/inet6num/fd42:2950::_32 +++ b/data/inet6num/fd42:2950::_32 @@ -7,6 +7,5 @@ mnt-by: SIS-MNT org: ORG-SIS status: ASSIGNED cidr: fd42:2950::/32 -nserver: ns.sis.dn42 fd42:2950::53 -nserver: ns.sis.dn42 172.23.234.200 +nserver: ns.sis.dn42 source: DN42 diff --git a/data/inet6num/fd42:64:713::_48 b/data/inet6num/fd42:64:713::_48 index 56631c947..75086a2ec 100644 --- a/data/inet6num/fd42:64:713::_48 +++ b/data/inet6num/fd42:64:713::_48 @@ -4,7 +4,7 @@ descr: Martin89 dn42 network admin-c: MARTIN89-DN42 tech-c: MARTIN89-DN42 status: ASSIGNED -nserver: dns-anycast-a.martin89.dn42 172.22.113.12 +nserver: dns-anycast-a.martin89.dn42 cidr: fd42:64:713::/48 mnt-by: MARTIN89-MNT source: DN42 diff --git a/data/inet6num/fd42:ccc:da::_48 b/data/inet6num/fd42:ccc:da::_48 index 088240772..db770abc9 100644 --- a/data/inet6num/fd42:ccc:da::_48 +++ b/data/inet6num/fd42:ccc:da::_48 @@ -5,8 +5,7 @@ country: DE admin-c: HEXA-DN42 tech-c: HEXA-DN42 mnt-by: HEXA-MNT -nserver: ns1.cccda.dn42 172.23.96.1 -nserver: ns1.cccda.dn42 fd42:ccc:da::1 +nserver: ns1.cccda.dn42 status: ASSIGNED cidr: fd42:ccc:da::/48 source: DN42 diff --git a/data/inet6num/fd42:d42:2706::_48 b/data/inet6num/fd42:d42:2706::_48 index 5736401f2..cef31165a 100644 --- a/data/inet6num/fd42:d42:2706::_48 +++ b/data/inet6num/fd42:d42:2706::_48 @@ -5,8 +5,7 @@ country: DE admin-c: MAJOR-DN42 tech-c: MAJOR-DN42 mnt-by: MAJOR-MNT -nserver: ns1.major.dn42 172.20.46.1 -nserver: ns1.major.dn42 fd42:d42:2706::1 +nserver: ns1.major.dn42 status: ASSIGNED cidr: fd42:d42:2706::/48 source: DN42 diff --git a/data/inet6num/fd59:54c0:fab::_48 b/data/inet6num/fd59:54c0:fab::_48 index 0071d0f35..2befd523b 100644 --- a/data/inet6num/fd59:54c0:fab::_48 +++ b/data/inet6num/fd59:54c0:fab::_48 @@ -1,6 +1,6 @@ inet6num: fd59:54c0:0fab:0000:0000:0000:0000:0000 - fd59:54c0:0fab:ffff:ffff:ffff:ffff:ffff netname: DARKIT-SPACE-IP6 -nserver: ns1.dark-it.dn42 172.23.245.1 +nserver: ns1.dark-it.dn42 descr: DarkIT Space IPv6 country: DE admin-c: DARKIT-DN42 diff --git a/data/inet6num/fd5a:ad49:844c::_64 b/data/inet6num/fd5a:ad49:844c::_64 index db8cf51f6..7fb593d78 100644 --- a/data/inet6num/fd5a:ad49:844c::_64 +++ b/data/inet6num/fd5a:ad49:844c::_64 @@ -24,7 +24,7 @@ country: DE admin-c: HEXA-DN42 tech-c: HEXA-DN42 mnt-by: HEXA-MNT -nserver: ns1.cccda.dn42 172.23.96.1 +nserver: ns1.cccda.dn42 status: ASSIGNED cidr: fd5a:ad49:844c::/64 source: DN42 diff --git a/data/inet6num/fd63:1e39:6f73::_48 b/data/inet6num/fd63:1e39:6f73::_48 index 32fe86e15..4bb0b032e 100644 --- a/data/inet6num/fd63:1e39:6f73::_48 +++ b/data/inet6num/fd63:1e39:6f73::_48 @@ -1,7 +1,6 @@ inet6num: fd63:1e39:6f73:0000:0000:0000:0000:0000 - fd63:1e39:6f73:ffff:ffff:ffff:ffff:ffff netname: ANONET6 -nserver: ns.lynx.dn42 172.22.97.1 -nserver: ns.lynx.dn42 fd63:1e39:6f73:309::1 +nserver: ns.lynx.dn42 descr: Anonet IPv6 country: DE admin-c: LEX-DN42 diff --git a/data/inet6num/fd68:fdcc:7a1a::_48 b/data/inet6num/fd68:fdcc:7a1a::_48 index 3526819cc..82f1aa0eb 100644 --- a/data/inet6num/fd68:fdcc:7a1a::_48 +++ b/data/inet6num/fd68:fdcc:7a1a::_48 @@ -6,7 +6,6 @@ admin-c: HEAVYMETAL-DN42 tech-c: HEAVYMETAL-DN42 mnt-by: ASOTNET-MNT status: ALLOCATED PI -nserver: ns1.aseriesoftubez.dn42 172.22.110.53 -nserver: ns1.aseriesoftubez.dn42 fd68:fdcc:7a1a::53 +nserver: ns1.aseriesoftubez.dn42 cidr: fd68:fdcc:7a1a::/48 source: DN42 diff --git a/data/inet6num/fd72:20:185::_64 b/data/inet6num/fd72:20:185::_64 index 3e558838d..39a1686a0 100644 --- a/data/inet6num/fd72:20:185::_64 +++ b/data/inet6num/fd72:20:185::_64 @@ -5,7 +5,7 @@ country: US admin-c: TOMBII-DN42 tech-c: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT -nserver: ns1.tombii.dn42 172.22.102.1 +nserver: ns1.tombii.dn42 status: ALLOCATED cidr: fd72:20:185::/64 source: DN42 diff --git a/data/inet6num/fd97:4c4e:9d26::_48 b/data/inet6num/fd97:4c4e:9d26::_48 index a68160ed9..99150fd2a 100644 --- a/data/inet6num/fd97:4c4e:9d26::_48 +++ b/data/inet6num/fd97:4c4e:9d26::_48 @@ -1,6 +1,6 @@ inet6num: fd97:4c4e:9d26:0000:0000:0000:0000:0000 - fd97:4c4e:9d26:ffff:ffff:ffff:ffff:ffff netname: LEX-NETWORK -nserver: ns.lynx.dn42 fd97:4c4e:9d26:1ffe::1 +nserver: ns.lynx.dn42 descr: lex's network country: GB admin-c: LEX-DN42 diff --git a/data/inet6num/fda0:23:748b::_48 b/data/inet6num/fda0:23:748b::_48 index 1130a0b27..d525169f6 100644 --- a/data/inet6num/fda0:23:748b::_48 +++ b/data/inet6num/fda0:23:748b::_48 @@ -5,7 +5,7 @@ country: DE admin-c: TBSPACE-DN42 tech-c: TBSPACE-DN42 mnt-by: TBSPACE-MNT -nserver: ns1.loaderror.dn42 172.20.58.64 +nserver: ns1.loaderror.dn42 status: ASSIGNED cidr: fda0:23:748b::/48 source: DN42 diff --git a/data/inet6num/fda1:d21:d67f::_48 b/data/inet6num/fda1:d21:d67f::_48 index 45febbb27..def7de9ce 100644 --- a/data/inet6num/fda1:d21:d67f::_48 +++ b/data/inet6num/fda1:d21:d67f::_48 @@ -4,7 +4,7 @@ country: DE admin-c: JAN-DN42 tech-c: JAN-DN42 mnt-by: JAN-MNT -nserver: ns1.jan.dn42 172.22.125.132 +nserver: ns1.jan.dn42 status: ASSIGNED cidr: fda1:d21:d67f::/48 source: DN42 diff --git a/data/inet6num/fdb3:d376:9939::_48 b/data/inet6num/fdb3:d376:9939::_48 index 43ce067fa..300096d4f 100644 --- a/data/inet6num/fdb3:d376:9939::_48 +++ b/data/inet6num/fdb3:d376:9939::_48 @@ -7,6 +7,4 @@ mnt-by: FRITZ-MNT admin-c: FRITZ-DN42 tech-c: FRITZ-DN42 status: ASSIGNED -nserver: ns.9.3.9.9.6.7.3.d.3.b.d.f.ip6.arpa 195.154.200.230 2001:bc8:3a03:100:: -nserver: ns2.fritz.dn42 source: DN42 diff --git a/data/inet6num/fdc8:c633:5319::_48 b/data/inet6num/fdc8:c633:5319::_48 index 090f0727d..e26eae116 100644 --- a/data/inet6num/fdc8:c633:5319::_48 +++ b/data/inet6num/fdc8:c633:5319::_48 @@ -5,8 +5,8 @@ country: US admin-c: CHRISMOOS-DN42 tech-c: CHRISMOOS-DN42 mnt-by: TECH9-MNT -nserver: ns1.tech9computers.dn42 172.20.16.130 -nserver: ns2.tech9computers.dn42 172.20.16.131 +nserver: ns1.tech9computers.dn42 +nserver: ns2.tech9computers.dn42 status: ASSIGNED cidr: fdc8:c633:5319::/48 source: DN42 diff --git a/data/inet6num/fdec::_48 b/data/inet6num/fdec::_48 index 163b71314..a5ac1d65d 100644 --- a/data/inet6num/fdec::_48 +++ b/data/inet6num/fdec::_48 @@ -2,7 +2,7 @@ inet6num: fdec:0000:0000:0000:0000:0000:0000:0000 - fdec:0000:0000:fff netname: NET-WUNIX-IP6-DN42 descr: Wunix's IPV6 Lab country: DE -nserver: ns1.wunix.dn42 172.23.78.1 +nserver: ns1.wunix.dn42 admin-c: WUNIX-DN42 tech-c: WUNIX-DN42 mnt-by: WUNIX-MNT diff --git a/data/inet6num/fdef:27db:3be::_48 b/data/inet6num/fdef:27db:3be::_48 index 021b1e503..c0272ed31 100644 --- a/data/inet6num/fdef:27db:3be::_48 +++ b/data/inet6num/fdef:27db:3be::_48 @@ -5,8 +5,6 @@ country: BE admin-c: SPLITTER-DN42 tech-c: SPLITTER-DN42 mnt-by: SPLITTER-MNT -nserver: ns1.splitter.dn42 fdef:27db:3be::111 -nserver: ns2.splitter.dn42 fdef:27db:3be::222 status: ALLOCATED cidr: fdef:27db:3be::/48 source: DN42 diff --git a/data/inet6num/fdfc:3e4f:f3c0::_48 b/data/inet6num/fdfc:3e4f:f3c0::_48 index 52b91146d..b7723d61e 100644 --- a/data/inet6num/fdfc:3e4f:f3c0::_48 +++ b/data/inet6num/fdfc:3e4f:f3c0::_48 @@ -6,6 +6,6 @@ country: DE admin-c: UNBEDENKLICH-DN42 tech-c: UNBEDENKLICH-DN42 mnt-by: UNBEDENKLICH-MNT -nserver: ns.unbedenklich.dn42 172.22.230.129 +nserver: ns.unbedenklich.dn42 status: ASSIGNED source: DN42 diff --git a/data/inetnum/172.20.14.192_26 b/data/inetnum/172.20.14.192_26 index 35d7173dc..405e63851 100644 --- a/data/inetnum/172.20.14.192_26 +++ b/data/inetnum/172.20.14.192_26 @@ -5,7 +5,7 @@ country: CA admin-c: KTIMS-DN42 tech-c: KTIMS-DN42 mnt-by: GOTROOT-MNT -nserver: ns1.gotroot.dn42 172.20.14.253 +nserver: ns1.gotroot.dn42 status: ALLOCATED cidr: 172.20.14.192/26 source: DN42 diff --git a/data/inetnum/172.20.16.128_25 b/data/inetnum/172.20.16.128_25 index 49776afe4..0a36f7134 100644 --- a/data/inetnum/172.20.16.128_25 +++ b/data/inetnum/172.20.16.128_25 @@ -4,8 +4,8 @@ country: US admin-c: CHRISMOOS-DN42 tech-c: CHRISMOOS-DN42 mnt-by: TECH9-MNT -nserver: ns1.tech9computers.dn42 172.20.16.130 -nserver: ns2.tech9computers.dn42 172.20.16.131 +nserver: ns1.tech9computers.dn42 +nserver: ns2.tech9computers.dn42 status: ASSIGNED cidr: 172.20.16.128/25 source: DN42 diff --git a/data/inetnum/172.20.185.0_24 b/data/inetnum/172.20.185.0_24 index 7ef7b7606..4e09fa706 100644 --- a/data/inetnum/172.20.185.0_24 +++ b/data/inetnum/172.20.185.0_24 @@ -4,7 +4,7 @@ admin-c: TOMBII-DN42 tech-c: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT status: ALLOCATED -nserver: ns1.dns.dn42 172.22.102.1 -nserver: ns2.dns.dn42 172.22.102.3 +nserver: ns1.dns.dn42 +nserver: ns2.dns.dn42 cidr: 172.20.185.0/24 source: DN42 diff --git a/data/inetnum/172.20.186.0_24 b/data/inetnum/172.20.186.0_24 index a615c7d94..cd416451e 100644 --- a/data/inetnum/172.20.186.0_24 +++ b/data/inetnum/172.20.186.0_24 @@ -4,8 +4,8 @@ country: US admin-c: CHRISMOOS-DN42 tech-c: CHRISMOOS-DN42 mnt-by: TECH9-MNT -nserver: ns1.tech9computers.dn42 172.20.16.130 -nserver: ns2.tech9computers.dn42 172.20.16.131 +nserver: ns1.tech9computers.dn42 +nserver: ns2.tech9computers.dn42 status: ASSIGNED cidr: 172.20.186.0/24 source: DN42 diff --git a/data/inetnum/172.20.240.0_25 b/data/inetnum/172.20.240.0_25 index a5956e38d..b88ca3759 100644 --- a/data/inetnum/172.20.240.0_25 +++ b/data/inetnum/172.20.240.0_25 @@ -7,8 +7,8 @@ remarks: 172.20.240.4/31 - andi admin-c: HEXA-DN42 tech-c: HEXA-DN42 mnt-by: HEXA-MNT -nserver: ns1.lossy-network.dn42. -nserver: ns2.lossy-network.dn42. +nserver: ns1.lossy-network.dn42 +nserver: ns2.lossy-network.dn42 status: ASSIGNED bgp-status: ignore source: DN42 diff --git a/data/inetnum/172.20.240.128_26 b/data/inetnum/172.20.240.128_26 index 5b8061f5c..6f9a4056f 100644 --- a/data/inetnum/172.20.240.128_26 +++ b/data/inetnum/172.20.240.128_26 @@ -3,7 +3,7 @@ netname: MAJOR-TRANSFERNET admin-c: MAJOR-DN42 tech-c: MAJOR-DN42 mnt-by: MAJOR-MNT -nserver: ns1.major.dn42 172.20.46.1 +nserver: ns1.major.dn42 status: ALLOCATED bgp-status: ignore cidr: 172.20.240.128/26 diff --git a/data/inetnum/172.20.46.0_26 b/data/inetnum/172.20.46.0_26 index 7ecd0b664..6aebc2270 100644 --- a/data/inetnum/172.20.46.0_26 +++ b/data/inetnum/172.20.46.0_26 @@ -5,7 +5,7 @@ country: DE admin-c: MAJOR-DN42 tech-c: MAJOR-DN42 mnt-by: MAJOR-MNT -nserver: ns1.major.dn42 172.20.46.1 +nserver: ns1.major.dn42 status: ASSIGNED cidr: 172.20.46.0/26 source: DN42 diff --git a/data/inetnum/172.20.57.0_24 b/data/inetnum/172.20.57.0_24 index bda8ab125..93901384c 100644 --- a/data/inetnum/172.20.57.0_24 +++ b/data/inetnum/172.20.57.0_24 @@ -6,7 +6,7 @@ tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT mnt-by: AFICS-MNT mnt-by: ROTTY-MNT -nserver: ns0.at.dn42 172.23.171.8 +nserver: ns0.at.dn42 status: ASSIGNED cidr: 172.20.57.0/24 source: DN42 diff --git a/data/inetnum/172.22.0.0_15 b/data/inetnum/172.22.0.0_15 index 4ff1b0d69..565cb6380 100644 --- a/data/inetnum/172.22.0.0_15 +++ b/data/inetnum/172.22.0.0_15 @@ -2,9 +2,9 @@ inetnum: 172.22.0.0 - 172.23.255.255 cidr: 172.22.0.0/15 netname: NET-BLK215-DN42 descr: The primary DN42 IPv4 address block. -nserver: xuu.root.dn42 172.22.141.132 -nserver: grmml.root.dn42 172.23.149.20 -nserver: prauscher.root.dn42 172.22.120.1 +nserver: xuu.root.dn42 +nserver: grmml.root.dn42 +nserver: prauscher.root.dn42 policy: reserved remarks: Not free for direct assignments, please use sub-allocated blocks admin-c: NIXNODES-DN42 diff --git a/data/inetnum/172.22.113.0_24 b/data/inetnum/172.22.113.0_24 index c708add95..abb56ccc0 100644 --- a/data/inetnum/172.22.113.0_24 +++ b/data/inetnum/172.22.113.0_24 @@ -4,7 +4,7 @@ descr: Martin89 dn42 network admin-c: MARTIN89-DN42 tech-c: MARTIN89-DN42 status: ASSIGNED -nserver: dns-anycast-a.martin89.dn42 172.22.113.12 +nserver: dns-anycast-a.martin89.dn42 cidr: 172.22.113.0/24 mnt-by: DUMMY-MNT source: DN42 diff --git a/data/inetnum/172.22.172.128_25 b/data/inetnum/172.22.172.128_25 index 2a82583bb..d70bd18c6 100644 --- a/data/inetnum/172.22.172.128_25 +++ b/data/inetnum/172.22.172.128_25 @@ -5,7 +5,7 @@ country: DE admin-c: UNBEDENKLICH-DN42 tech-c: UNBEDENKLICH-DN42 mnt-by: UNBEDENKLICH-MNT -nserver: ns.unbedenklich.dn42 172.22.230.129 +nserver: ns.unbedenklich.dn42 status: ASSIGNED cidr: 172.22.172.128/25 source: DN42 diff --git a/data/inetnum/172.22.230.0_24 b/data/inetnum/172.22.230.0_24 index d34f25404..5996933bb 100644 --- a/data/inetnum/172.22.230.0_24 +++ b/data/inetnum/172.22.230.0_24 @@ -4,7 +4,7 @@ country: DE admin-c: UNBEDENKLICH-DN42 tech-c: UNBEDENKLICH-DN42 mnt-by: UNBEDENKLICH-MNT -nserver: ns.unbedenklich.dn42 172.22.230.129 +nserver: ns.unbedenklich.dn42 status: ASSIGNED cidr: 172.22.230.0/24 source: DN42 diff --git a/data/inetnum/172.22.230.128_25 b/data/inetnum/172.22.230.128_25 index 95a852d17..4470069d1 100644 --- a/data/inetnum/172.22.230.128_25 +++ b/data/inetnum/172.22.230.128_25 @@ -4,7 +4,7 @@ country: DE admin-c: UNBEDENKLICH-DN42 tech-c: UNBEDENKLICH-DN42 mnt-by: UNBEDENKLICH-MNT -nserver: ns.unbedenklich.dn42 172.22.230.129 +nserver: ns.unbedenklich.dn42 status: ASSIGNED cidr: 172.22.230.128/25 source: DN42 diff --git a/data/inetnum/172.22.239.0_24 b/data/inetnum/172.22.239.0_24 index 39cac4ebf..f8421b082 100644 --- a/data/inetnum/172.22.239.0_24 +++ b/data/inetnum/172.22.239.0_24 @@ -5,7 +5,7 @@ country: DE admin-c: MARTIN89-DN42 tech-c: MARTIN89-DN42 status: ASSIGNED -nserver: vm.krautspace.dn42 172.22.239.1 +nserver: vm.krautspace.dn42 cidr: 172.22.239.0/24 mnt-by: DUMMY-MNT source: DN42 diff --git a/data/inetnum/172.22.249.0_24 b/data/inetnum/172.22.249.0_24 index b0ffaf26b..614f3a6b4 100644 --- a/data/inetnum/172.22.249.0_24 +++ b/data/inetnum/172.22.249.0_24 @@ -5,7 +5,6 @@ country: AU admin-c: MWD-DN42 tech-c: MWD-DN42 mnt-by: MWD-MNT -nserver: ns1.mwd.dn42 172.23.219.10 status: ASSIGNED bgp-status: ignore cidr: 172.22.249.0/24 diff --git a/data/inetnum/172.22.26.0_23 b/data/inetnum/172.22.26.0_23 index 0f292e04e..dda3f5d04 100644 --- a/data/inetnum/172.22.26.0_23 +++ b/data/inetnum/172.22.26.0_23 @@ -1,5 +1,5 @@ inetnum: 172.22.26.0 - 172.22.27.255 -nserver: selene.chaosdorf.dn42 172.22.26.9 +nserver: selene.chaosdorf.dn42 netname: CHAOSDORF-NET-DN42 country: DE mnt-by: FEUERROT-MNT diff --git a/data/inetnum/172.22.40.0_23 b/data/inetnum/172.22.40.0_23 index 70e4e673c..ed4472ca6 100644 --- a/data/inetnum/172.22.40.0_23 +++ b/data/inetnum/172.22.40.0_23 @@ -6,7 +6,5 @@ admin-c: FRITZ-DN42 tech-c: FRITZ-DN42 mnt-by: FRITZ-MNT status: ASSIGNED -nserver: ns.40.22.172.in-addr.arpa 195.154.200.230 2001:bc8:3a03:100:: -nserver: ns.41.22.172.in-addr.arpa 195.154.200.230 2001:bc8:3a03:100:: cidr: 172.22.40.0/23 source: DN42 diff --git a/data/inetnum/172.22.58.0_24 b/data/inetnum/172.22.58.0_24 index cfdba6777..e53fbd6f5 100644 --- a/data/inetnum/172.22.58.0_24 +++ b/data/inetnum/172.22.58.0_24 @@ -6,6 +6,5 @@ admin-c: FRITZ-DN42 tech-c: FRITZ-DN42 mnt-by: FRITZ-MNT status: ASSIGNED -nserver: ns.58.22.172.in-addr.arpa 195.154.200.230 2001:bc8:3a03:100:: cidr: 172.22.58.0/24 source: DN42 diff --git a/data/inetnum/172.23.148.0_24 b/data/inetnum/172.23.148.0_24 index de889ef30..f5e9431b3 100644 --- a/data/inetnum/172.23.148.0_24 +++ b/data/inetnum/172.23.148.0_24 @@ -1,7 +1,7 @@ inetnum: 172.23.148.0 - 172.23.148.255 netname: NET-FEUERROT-DN42 country: DE -nserver: irbis.feuerrot.dn42 172.23.148.1 +nserver: irbis.feuerrot.dn42 admin-c: FEUERROT-DN42 tech-c: FEUERROT-DN42 mnt-by: FEUERROT-MNT diff --git a/data/inetnum/172.23.192.0_24 b/data/inetnum/172.23.192.0_24 index bc743343d..f66736235 100644 --- a/data/inetnum/172.23.192.0_24 +++ b/data/inetnum/172.23.192.0_24 @@ -6,6 +6,5 @@ admin-c: FRITZ-DN42 tech-c: FRITZ-DN42 mnt-by: FRITZ-MNT status: ASSIGNED -nserver: ns.192.23.172.in-addr.arpa 195.154.200.230 2001:bc8:3a03:100:: cidr: 172.23.192.0/24 source: DN42 diff --git a/data/inetnum/172.23.194.0_23 b/data/inetnum/172.23.194.0_23 index a3f7b7067..c5d575e19 100644 --- a/data/inetnum/172.23.194.0_23 +++ b/data/inetnum/172.23.194.0_23 @@ -4,7 +4,6 @@ descr: Hackerspace Marburg (HSMR) - various fnord country: DE admin-c: HSMR-DN42 tech-c: OLEANDER-DN42 -nserver: ns1.hsmr.dn42 172.23.194.1 status: ASSIGNED cidr: 172.23.194.0/23 mnt-by: DUMMY-MNT diff --git a/data/inetnum/172.23.216.0_24 b/data/inetnum/172.23.216.0_24 index 2eaeae89d..a27740df2 100644 --- a/data/inetnum/172.23.216.0_24 +++ b/data/inetnum/172.23.216.0_24 @@ -1,7 +1,7 @@ inetnum: 172.23.216.0 - 172.23.216.255 netname: NET-JMT-1 -nserver: ns0.jmt.dn42 172.23.216.243 -nserver: ns1.jmt.dn42 172.23.216.217 +nserver: ns0.jmt.dn42 +nserver: ns1.jmt.dn42 country: DE admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 diff --git a/data/inetnum/172.23.225.0_24 b/data/inetnum/172.23.225.0_24 index e0928b573..436d25367 100644 --- a/data/inetnum/172.23.225.0_24 +++ b/data/inetnum/172.23.225.0_24 @@ -1,6 +1,5 @@ inetnum: 172.23.225.0 - 172.23.225.255 netname: NET-DERF-DN42 -nserver: entropy.derf.dn42 172.23.225.1 country: DE admin-c: DERF-DN42 tech-c: DERF-DN42 diff --git a/data/inetnum/172.23.227.0_24 b/data/inetnum/172.23.227.0_24 index 73346cc01..47cac80ef 100644 --- a/data/inetnum/172.23.227.0_24 +++ b/data/inetnum/172.23.227.0_24 @@ -6,6 +6,5 @@ admin-c: MWD-DN42 tech-c: MWD-DN42 mnt-by: MWD-MNT status: ASSIGNED -nserver: ns1.mwd.dn42 172.23.219.10 cidr: 172.23.227.0/24 source: DN42 diff --git a/data/inetnum/172.23.235.0_24 b/data/inetnum/172.23.235.0_24 index dbd220f2e..35349ed5b 100644 --- a/data/inetnum/172.23.235.0_24 +++ b/data/inetnum/172.23.235.0_24 @@ -1,7 +1,7 @@ inetnum: 172.23.235.0 - 172.23.235.255 netname: TBSPACE-DE1 descr: TBSPACE VPS -nserver: ns1.loaderror.dn42 172.20.58.64 +nserver: ns1.loaderror.dn42 country: DE admin-c: TBSPACE-DN42 tech-c: TBSPACE-DN42 diff --git a/data/inetnum/172.23.236.0_25 b/data/inetnum/172.23.236.0_25 index 14e3b6b71..f2851fb11 100644 --- a/data/inetnum/172.23.236.0_25 +++ b/data/inetnum/172.23.236.0_25 @@ -1,7 +1,7 @@ inetnum: 172.23.236.0 - 172.23.236.127 netname: TBSPACE-TRANSFERNET descr: TBSPACE TRANSFERNET -nserver: ns1.loaderror.dn42 172.20.58.64 +nserver: ns1.loaderror.dn42 country: DE admin-c: TBSPACE-DN42 tech-c: TBSPACE-DN42 diff --git a/data/inetnum/172.23.245.0_24 b/data/inetnum/172.23.245.0_24 index 692d6ab5e..794d6c8ac 100644 --- a/data/inetnum/172.23.245.0_24 +++ b/data/inetnum/172.23.245.0_24 @@ -1,7 +1,7 @@ inetnum: 172.23.245.0 - 172.23.245.255 netname: DARKIT-SPACE descr: DarkIT Space -nserver: ns1.dark-it.dn42 172.23.245.1 +nserver: ns1.dark-it.dn42 country: DE admin-c: DARKIT-DN42 tech-c: DARKIT-DN42 diff --git a/data/inetnum/172.23.35.128_26 b/data/inetnum/172.23.35.128_26 index fe8015b1b..a23c50acd 100644 --- a/data/inetnum/172.23.35.128_26 +++ b/data/inetnum/172.23.35.128_26 @@ -7,7 +7,7 @@ admin-c: BR-DN42 tech-c: BR-DN42 mnt-by: BR-MNT status: ASSIGNED -nserver: ns1.br.dn42 172.23.56.1 -nserver: ns2.br.dn42 172.23.56.3 -nserver: ns3.br.dn42 172.23.56.4 +nserver: ns1.br.dn42 +nserver: ns2.br.dn42 +nserver: ns3.br.dn42 source: DN42 diff --git a/data/inetnum/172.23.56.0_24 b/data/inetnum/172.23.56.0_24 index 7a4088765..50ee4bdb2 100644 --- a/data/inetnum/172.23.56.0_24 +++ b/data/inetnum/172.23.56.0_24 @@ -6,7 +6,7 @@ admin-c: BR-DN42 tech-c: BR-DN42 mnt-by: BR-MNT status: ALLOCATED -nserver: ns1.br.dn42 172.23.56.1 -nserver: ns2.br.dn42 172.23.56.3 -nserver: ns3.br.dn42 172.23.56.4 +nserver: ns1.br.dn42 +nserver: ns2.br.dn42 +nserver: ns3.br.dn42 source: DN42 diff --git a/data/inetnum/172.23.64.0_24 b/data/inetnum/172.23.64.0_24 index 9899a009c..dec713823 100644 --- a/data/inetnum/172.23.64.0_24 +++ b/data/inetnum/172.23.64.0_24 @@ -5,7 +5,7 @@ country: DE admin-c: ERI-DN42 tech-c: ERI-DN42 mnt-by: ERI-MNT -nserver: ns.chelnok.dn42 172.23.64.3 +nserver: ns.chelnok.dn42 status: ASSIGNED cidr: 172.23.64.0/24 source: DN42 diff --git a/data/inetnum/172.23.76.0_26 b/data/inetnum/172.23.76.0_26 index 819cd80ce..59f855bb2 100644 --- a/data/inetnum/172.23.76.0_26 +++ b/data/inetnum/172.23.76.0_26 @@ -6,7 +6,7 @@ tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT mnt-by: AFICS-MNT mnt-by: ROTTY-MNT -nserver: ns0.at.dn42 172.23.171.8 +nserver: ns0.at.dn42 status: ASSIGNED cidr: 172.23.76.0/26 source: DN42 From 8738672a7756885036c866899214ba5c0122b9eb Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Sat, 31 Mar 2018 23:48:41 +0200 Subject: [PATCH 12/13] Fix nested assignments --- data/inet6num/fd42:2247::_32 | 2 +- data/inet6num/fd42:23:149::_48 | 2 +- data/inet6num/fd42:4242:4200::_40 | 2 +- .../fd42:4242:8443:dead:1337:da7a:beef:0_112 | 2 +- data/inet6num/fd42:d42:d42::_48 | 2 +- data/inetnum/172.20.128.48_30 | 8 -------- data/inetnum/172.22.125.128_25 | 2 +- data/inetnum/172.22.141.0_24 | 2 +- data/inetnum/172.22.141.128_25 | 2 +- data/inetnum/172.22.150.0_24 | 2 +- data/inetnum/172.22.192.0_20 | 2 +- data/inetnum/172.22.230.0_24 | 2 +- data/inetnum/172.22.240.0_25 | 12 ------------ data/inetnum/172.22.240.0_27 | 12 ------------ data/inetnum/172.22.254.0_24 | 2 +- data/inetnum/172.22.36.0_23 | 2 +- data/inetnum/172.22.40.0_23 | 2 +- data/inetnum/172.22.53.0_24 | 2 +- data/inetnum/172.22.6.0_23 | 2 +- data/inetnum/172.23.156.0_23 | 2 +- 20 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 data/inetnum/172.20.128.48_30 delete mode 100644 data/inetnum/172.22.240.0_25 delete mode 100644 data/inetnum/172.22.240.0_27 diff --git a/data/inet6num/fd42:2247::_32 b/data/inet6num/fd42:2247::_32 index 6b12083ee..ea92ad203 100644 --- a/data/inet6num/fd42:2247::_32 +++ b/data/inet6num/fd42:2247::_32 @@ -5,6 +5,6 @@ country: CZ admin-c: NGW-DN42 tech-c: NGW-DN42 mnt-by: NGW-MNT -status: ASSIGNED +status: ALLOCATED cidr: fd42:2247::/32 source: DN42 diff --git a/data/inet6num/fd42:23:149::_48 b/data/inet6num/fd42:23:149::_48 index 333aaddf9..aafe8c9a1 100644 --- a/data/inet6num/fd42:23:149::_48 +++ b/data/inet6num/fd42:23:149::_48 @@ -8,6 +8,6 @@ mnt-by: GRMML-MNT nserver: ns1.grmml.dn42 nserver: ns2.grmml.dn42 nserver: ns3.grmml.dn42 -status: ASSIGNED +status: ALLOCATED cidr: fd42:23:149::/48 source: DN42 diff --git a/data/inet6num/fd42:4242:4200::_40 b/data/inet6num/fd42:4242:4200::_40 index 9092078e5..5be0ba97b 100644 --- a/data/inet6num/fd42:4242:4200::_40 +++ b/data/inet6num/fd42:4242:4200::_40 @@ -2,7 +2,7 @@ inet6num: fd42:4242:4200:0000:0000:0000:0000:0000 - fd42:4242:42ff:fff netname: NET-ANDI-VM-SRV cidr: fd42:4242:4200::/40 descr: Andi-'s VM Server2 Address space -status: ASSIGNED PA +status: ALLOCATED PA country: DE admin-c: ANDI-DN42 tech-c: ANDI-DN42 diff --git a/data/inet6num/fd42:4242:8443:dead:1337:da7a:beef:0_112 b/data/inet6num/fd42:4242:8443:dead:1337:da7a:beef:0_112 index 1a401d125..2f3e38879 100644 --- a/data/inet6num/fd42:4242:8443:dead:1337:da7a:beef:0_112 +++ b/data/inet6num/fd42:4242:8443:dead:1337:da7a:beef:0_112 @@ -5,6 +5,6 @@ country: AQ admin-c: FUSL-DN42 tech-c: FUSL-DN42 mnt-by: FUSL-MNT -status: ASSIGNED +status: ALLOCATED cidr: fd42:4242:8443:dead:1337:da7a:beef:0/112 source: DN42 diff --git a/data/inet6num/fd42:d42:d42::_48 b/data/inet6num/fd42:d42:d42::_48 index 0d8e1e40e..572459b63 100644 --- a/data/inet6num/fd42:d42:d42::_48 +++ b/data/inet6num/fd42:d42:d42::_48 @@ -9,5 +9,5 @@ mnt-by: XUU-MNT nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 nserver: rishi.bre.xuu.dn42 -status: ASSIGNED +status: ALLOCATED source: DN42 diff --git a/data/inetnum/172.20.128.48_30 b/data/inetnum/172.20.128.48_30 deleted file mode 100644 index e0c8f5e93..000000000 --- a/data/inetnum/172.20.128.48_30 +++ /dev/null @@ -1,8 +0,0 @@ -inetnum: 172.20.128.48 - 172.20.128.51 -cidr: 172.20.128.48/30 -netname: PEER-JANTECHCS-NETWORK -admin-c: JANSST-DN42 -tech-c: JANSST-DN42 -mnt-by: JANSSEN-MNT -status: ASSIGNED -source: DN42 diff --git a/data/inetnum/172.22.125.128_25 b/data/inetnum/172.22.125.128_25 index 1dd57b946..33e70f542 100644 --- a/data/inetnum/172.22.125.128_25 +++ b/data/inetnum/172.22.125.128_25 @@ -5,6 +5,6 @@ admin-c: JAN-DN42 tech-c: JAN-DN42 mnt-by: JAN-MNT nserver: ns1.jan.dn42 -status: ASSIGNED +status: ALLOCATED cidr: 172.22.125.128/25 source: DN42 diff --git a/data/inetnum/172.22.141.0_24 b/data/inetnum/172.22.141.0_24 index 5a1410680..283ccaa3e 100644 --- a/data/inetnum/172.22.141.0_24 +++ b/data/inetnum/172.22.141.0_24 @@ -9,5 +9,5 @@ country: US admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT -status: ASSIGNED +status: ALLOCATED source: DN42 diff --git a/data/inetnum/172.22.141.128_25 b/data/inetnum/172.22.141.128_25 index 3106ee151..4b3ba9684 100644 --- a/data/inetnum/172.22.141.128_25 +++ b/data/inetnum/172.22.141.128_25 @@ -6,5 +6,5 @@ country: US admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT -status: ASSIGNED +status: ALLOCATED source: DN42 diff --git a/data/inetnum/172.22.150.0_24 b/data/inetnum/172.22.150.0_24 index 91c8b6bd6..799da9932 100644 --- a/data/inetnum/172.22.150.0_24 +++ b/data/inetnum/172.22.150.0_24 @@ -7,6 +7,6 @@ nserver: ns2.sl.dn42 admin-c: CHARLESTHESLOTH-DN42 tech-c: CHARLESTHESLOTH-DN42 mnt-by: SLOTHLOGISTICS-MNT -status: ASSIGNED PI +status: ALLOCATED PI cidr: 172.22.150.0/24 source: DN42 diff --git a/data/inetnum/172.22.192.0_20 b/data/inetnum/172.22.192.0_20 index e1ccc79d2..cb391d256 100644 --- a/data/inetnum/172.22.192.0_20 +++ b/data/inetnum/172.22.192.0_20 @@ -4,7 +4,7 @@ descr: mortzu IPv4 dn42 address space country: DE admin-c: MORTZU-DN42 tech-c: MORTZU-DN42 -status: ASSIGNED +status: ALLOCATED mnt-by: MORTZU-MNT nserver: ns-1.mortzu.dn42 nserver: ns-2.mortzu.dn42 diff --git a/data/inetnum/172.22.230.0_24 b/data/inetnum/172.22.230.0_24 index 5996933bb..3328636c4 100644 --- a/data/inetnum/172.22.230.0_24 +++ b/data/inetnum/172.22.230.0_24 @@ -5,6 +5,6 @@ admin-c: UNBEDENKLICH-DN42 tech-c: UNBEDENKLICH-DN42 mnt-by: UNBEDENKLICH-MNT nserver: ns.unbedenklich.dn42 -status: ASSIGNED +status: ALLOCATED cidr: 172.22.230.0/24 source: DN42 diff --git a/data/inetnum/172.22.240.0_25 b/data/inetnum/172.22.240.0_25 deleted file mode 100644 index 0340607b2..000000000 --- a/data/inetnum/172.22.240.0_25 +++ /dev/null @@ -1,12 +0,0 @@ -inetnum: 172.22.240.0 - 172.22.240.127 -netname: NET-BEARN-IP4-DN42 -descr: Bearn's ipv4 DN42 network -country: US -admin-c: BEARN-DN42 -tech-c: BEARN-DN42 -mnt-by: BEARN-MNT -nserver: ns1.bearn.dn42 -status: ASSIGNED -bgp-status: ignore -cidr: 172.22.240.0/25 -source: DN42 diff --git a/data/inetnum/172.22.240.0_27 b/data/inetnum/172.22.240.0_27 deleted file mode 100644 index e48ca13d7..000000000 --- a/data/inetnum/172.22.240.0_27 +++ /dev/null @@ -1,12 +0,0 @@ -inetnum: 172.22.240.0 - 172.22.240.31 -netname: CRAIG4WHO-DN42 -descr: CRAIG4WHO-DN42 -country: GB -admin-c: CRAIG4WHO-DN42 -tech-c: CRAIG4WHO-DN42 -mnt-by: CRAIG4WHO-MNT -nserver: NS1.DUMMY.NET -status: ALLOCATED -bgp-status: ignore -cidr: 172.22.240.0/27 -source: DN42 diff --git a/data/inetnum/172.22.254.0_24 b/data/inetnum/172.22.254.0_24 index 18cede7fa..89c0b4b61 100644 --- a/data/inetnum/172.22.254.0_24 +++ b/data/inetnum/172.22.254.0_24 @@ -4,7 +4,7 @@ descr: Crest's dn42 transfer networks country: DE admin-c: CREST-DN42 tech-c: CREST-DN42 -status: ASSIGNED +status: ALLOCATED nserver: dns1.crest.dn42 nserver: dns2.crest.dn42 nserver: ns1.mwd.dn42 diff --git a/data/inetnum/172.22.36.0_23 b/data/inetnum/172.22.36.0_23 index 706b27ce5..f77849702 100644 --- a/data/inetnum/172.22.36.0_23 +++ b/data/inetnum/172.22.36.0_23 @@ -3,7 +3,7 @@ netname: RZL-DN42-IP4NET descr: RaumZeitLabor dn42 network country: DE org: ORG-RZL -status: ASSIGNED +status: ALLOCATED nserver: dns.rzl cidr: 172.22.36.0/23 mnt-by: LUTOMA-MNT diff --git a/data/inetnum/172.22.40.0_23 b/data/inetnum/172.22.40.0_23 index ed4472ca6..16047c2cd 100644 --- a/data/inetnum/172.22.40.0_23 +++ b/data/inetnum/172.22.40.0_23 @@ -5,6 +5,6 @@ remarks: This inetnum object has a suballocation: 172.22.41.240/28 admin-c: FRITZ-DN42 tech-c: FRITZ-DN42 mnt-by: FRITZ-MNT -status: ASSIGNED +status: ALLOCATED cidr: 172.22.40.0/23 source: DN42 diff --git a/data/inetnum/172.22.53.0_24 b/data/inetnum/172.22.53.0_24 index 7a15bd17c..6287b216f 100644 --- a/data/inetnum/172.22.53.0_24 +++ b/data/inetnum/172.22.53.0_24 @@ -6,7 +6,7 @@ descr: http://www.srn.dn42/crazydns remarks: To participate, please contact SRN. admin-c: SRN-DN42 tech-c: SRN-DN42 -status: ASSIGNED +status: ALLOCATED cidr: 172.22.53.0/24 mnt-by: DUMMY-MNT source: DN42 diff --git a/data/inetnum/172.22.6.0_23 b/data/inetnum/172.22.6.0_23 index 76b776789..da187bd94 100644 --- a/data/inetnum/172.22.6.0_23 +++ b/data/inetnum/172.22.6.0_23 @@ -6,6 +6,6 @@ country: DE admin-c: RIPPERFOX-DN42 tech-c: RIPPERFOX-DN42 mnt-by: RIPPERFOX-MNT -status: ASSIGNED +status: ALLOCATED cidr: 172.22.6.0/23 source: DN42 diff --git a/data/inetnum/172.23.156.0_23 b/data/inetnum/172.23.156.0_23 index c0e63622a..9e167ba68 100644 --- a/data/inetnum/172.23.156.0_23 +++ b/data/inetnum/172.23.156.0_23 @@ -6,6 +6,6 @@ admin-c: STV0G-DN42 tech-c: STV0G-DN42 mnt-by: NULLL-MNT nserver: ns0.0l.dn42 -status: ASSIGNED +status: ALLOCATED cidr: 172.23.156.0/23 source: DN42 From 6ac04f4c23b458117b224bab5ed53efdfcfaf4a1 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Sat, 31 Mar 2018 23:54:27 +0200 Subject: [PATCH 13/13] Remove two empty as-set --- data/as-set/AS-AS4242423911 | 6 ------ data/as-set/AS-AS4242424242 | 6 ------ 2 files changed, 12 deletions(-) delete mode 100644 data/as-set/AS-AS4242423911 delete mode 100644 data/as-set/AS-AS4242424242 diff --git a/data/as-set/AS-AS4242423911 b/data/as-set/AS-AS4242423911 deleted file mode 100644 index de987b9d0..000000000 --- a/data/as-set/AS-AS4242423911 +++ /dev/null @@ -1,6 +0,0 @@ -as-set: AS-AS4242423911 -descr: Moshii -admin-c: MOSH-DN42 -tech-c: MOSH-DN42 -mnt-by: MOSH-MNT -source: DN42 diff --git a/data/as-set/AS-AS4242424242 b/data/as-set/AS-AS4242424242 deleted file mode 100644 index 517efea86..000000000 --- a/data/as-set/AS-AS4242424242 +++ /dev/null @@ -1,6 +0,0 @@ -as-set: AS-AS4242424242 -descr: Ratatosk Yggdrasil -admin-c: CFROG-DN42 -tech-c: CFROG-DN42 -mnt-by: RATATOSK-MNT -source: DN42