diff --git a/data/dns/crest.dn42 b/data/dns/crest.dn42 index d5d427e61..66e803239 100644 --- a/data/dns/crest.dn42 +++ b/data/dns/crest.dn42 @@ -1,6 +1,6 @@ domain: crest.dn42 -nserver: dns1.crest.dn42 172.22.228.6 -nserver: dns2.crest.dn42 172.22.228.8 +nserver: dns1.crest.dn42 172.22.228.6 +nserver: dns2.crest.dn42 172.22.228.8 admin-c: CREST-DN42 tech-c: CREST-DN42 mnt-by: CREST-MNT diff --git a/data/dns/dn42 b/data/dns/dn42 index edc4f5bd8..e89b49654 100644 --- a/data/dns/dn42 +++ b/data/dns/dn42 @@ -7,15 +7,6 @@ nserver: rishi.bre.xuu.dn42 172.22.141.191 nserver: rishi.bre.xuu.dn42 fdea:a15a:77b9:4444::191 nserver: grmml.root.dn42 172.23.149.20 nserver: grmml.root.dn42 fd42:23:149:cccc::53 -admin-c: DUMMY-DN42 -tech-c: WELTERDE-DN42 -tech-c: NIXNODES-DN42 -tech-c: SOURIS-DN42 -tech-c: GRMML-DN42 -mnt-by: NIXNODES-MNT -mnt-by: XUU-MNT -mnt-by: GRMML-MNT -mnt-by: PYROPETER-MNT -mnt-by: PRAUSCHER-MNT -mnt-by: HAX404-MNT +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inet6num/fd00::_8 b/data/inet6num/fd00::_8 index 67947a842..203ab8cd8 100644 --- a/data/inet6num/fd00::_8 +++ b/data/inet6num/fd00::_8 @@ -1,13 +1,12 @@ inet6num: fd00:0000:0000:0000:0000:0000:0000:0000 - fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff +cidr: fd00::/8 netname: ROOT-DN42-ULA descr: DN42 ULA Address Space -admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 -mnt-by: DUMMY-MNT +remarks: Only /48 prefixes may be allocated out of this range. nserver: lavana.sjc.xuu.dn42 nserver: grmml.root.dn42 status: ALLOCATED policy: open -remarks: Only /48 prefixes may be allocated out of this range. -cidr: fd00::/8 +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/10.0.0.0_8 b/data/inetnum/10.0.0.0_8 index 7ea150c1e..118006e9f 100644 --- a/data/inetnum/10.0.0.0_8 +++ b/data/inetnum/10.0.0.0_8 @@ -3,11 +3,11 @@ cidr: 10.0.0.0/8 netname: BLK-FREIFUNK descr: Freifunk Intercity-VPN remarks: Registry at https://github.com/freifunk/icvpn-meta -policy: closed -admin-c: HEXA-DN42 -mnt-by: HEXA-MNT nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 status: ALLOCATED +policy: closed +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.20.0.0_16 b/data/inetnum/172.20.0.0_16 index dccf695f8..4b808d548 100644 --- a/data/inetnum/172.20.0.0_16 +++ b/data/inetnum/172.20.0.0_16 @@ -4,14 +4,8 @@ netname: NET-BLK016-DN42 nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 -policy: reserved -admin-c: NIXNODES-DN42 -admin-c: SOURIS-DN42 -admin-c: GRMML-DN42 -admin-c: PRAUSCHER-DN42 -mnt-by: NIXNODES-MNT -mnt-by: XUU-MNT -mnt-by: GRMML-MNT -mnt-by: PRAUSCHER-MNT status: ALLOCATED +policy: reserved +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.20.130.0_25 b/data/inetnum/172.20.130.0_25 index e4c8940b5..9df9e92f4 100644 --- a/data/inetnum/172.20.130.0_25 +++ b/data/inetnum/172.20.130.0_25 @@ -4,7 +4,6 @@ country: US admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT -nserver: NS1.DRATHIR.DN42 status: ALLOCATED cidr: 172.20.130.0/25 source: DN42 diff --git a/data/inetnum/172.20.130.128_25 b/data/inetnum/172.20.130.128_25 index 6644efb96..14f0792a6 100644 --- a/data/inetnum/172.20.130.128_25 +++ b/data/inetnum/172.20.130.128_25 @@ -4,7 +4,6 @@ country: US admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT -nserver: NS1.DRATHIR.DN42 status: ALLOCATED cidr: 172.20.130.128/25 source: DN42 diff --git a/data/inetnum/172.20.130.128_26 b/data/inetnum/172.20.130.128_26 index f10ce50f3..c1208412f 100644 --- a/data/inetnum/172.20.130.128_26 +++ b/data/inetnum/172.20.130.128_26 @@ -5,7 +5,6 @@ country: US admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT -nserver: NS1.DRATHIR.DN42 status: ALLOCATED cidr: 172.20.130.128/26 source: DN42 diff --git a/data/inetnum/172.20.130.128_28 b/data/inetnum/172.20.130.128_28 index 72ceccd9f..ff7069710 100644 --- a/data/inetnum/172.20.130.128_28 +++ b/data/inetnum/172.20.130.128_28 @@ -5,7 +5,6 @@ country: US admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT -nserver: NS1.DRATHIR.DN42 status: ALLOCATED cidr: 172.20.130.128/28 source: DN42 diff --git a/data/inetnum/172.20.160.128_28 b/data/inetnum/172.20.160.128_28 index 1ecf8fcf5..f882ff7f6 100644 --- a/data/inetnum/172.20.160.128_28 +++ b/data/inetnum/172.20.160.128_28 @@ -5,7 +5,6 @@ country: AT admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT -nserver: NS1.DRATHIR.DN42 status: ALLOCATED cidr: 172.20.160.128/28 source: DN42 diff --git a/data/inetnum/172.20.190.128_26 b/data/inetnum/172.20.190.128_26 index 5b1ad32e3..669e1f1cc 100644 --- a/data/inetnum/172.20.190.128_26 +++ b/data/inetnum/172.20.190.128_26 @@ -4,8 +4,6 @@ descr: DRATHIR-DN42-FRA-INET country: FR admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 -nserver: ns1.drathir.dn42 -nserver: ns2.drathir.dn42 mnt-by: DRATHIR-MNT status: ALLOCATED cidr: 172.20.190.128/26 diff --git a/data/inetnum/172.20.190.128_28 b/data/inetnum/172.20.190.128_28 index 037272a59..8ecc9c1dc 100644 --- a/data/inetnum/172.20.190.128_28 +++ b/data/inetnum/172.20.190.128_28 @@ -5,8 +5,6 @@ country: FR admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT -nserver: ns1.drathir.dn42 -nserver: ns2.drathir.dn42 status: ALLOCATED cidr: 172.20.190.128/28 source: DN42 diff --git a/data/inetnum/172.20.190.144_28 b/data/inetnum/172.20.190.144_28 index c6d495741..95a965d11 100644 --- a/data/inetnum/172.20.190.144_28 +++ b/data/inetnum/172.20.190.144_28 @@ -5,7 +5,6 @@ country: FR admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT -nserver: ns4.drathir.dn42 status: ALLOCATED cidr: 172.20.190.144/28 source: DN42 diff --git a/data/inetnum/172.20.190.160_28 b/data/inetnum/172.20.190.160_28 index 6717ecc50..09efae6b1 100644 --- a/data/inetnum/172.20.190.160_28 +++ b/data/inetnum/172.20.190.160_28 @@ -5,7 +5,6 @@ country: UA admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT -nserver: NS1.DRATHIR.DN42 status: ALLOCATED cidr: 172.20.190.160/28 source: DN42 diff --git a/data/inetnum/172.20.190.192_26 b/data/inetnum/172.20.190.192_26 index 47b3ad9c6..5b8316354 100644 --- a/data/inetnum/172.20.190.192_26 +++ b/data/inetnum/172.20.190.192_26 @@ -4,8 +4,6 @@ descr: DRATHIR-DN42-FRA-INET country: FR admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 -nserver: ns1.drathir.dn42 -nserver: ns2.drathir.dn42 mnt-by: DRATHIR-MNT status: ALLOCATED cidr: 172.20.190.192/26 diff --git a/data/inetnum/172.20.254.0_24 b/data/inetnum/172.20.254.0_24 index 1534cdc19..1a1d6d800 100644 --- a/data/inetnum/172.20.254.0_24 +++ b/data/inetnum/172.20.254.0_24 @@ -5,7 +5,6 @@ country: ZA admin-c: ANDRECOETZEE-DN42 tech-c: ANDRECOETZEE-DN42 mnt-by: SILVER-MNT -nserver: dummy-dn42 status: ASSIGNED cidr: 172.20.254.0/24 source: DN42 diff --git a/data/inetnum/172.20.35.0_24 b/data/inetnum/172.20.35.0_24 index a9a4bf1f3..b750ec163 100644 --- a/data/inetnum/172.20.35.0_24 +++ b/data/inetnum/172.20.35.0_24 @@ -5,7 +5,6 @@ country: KR admin-c: BGPTRACE-DN42 tech-c: BGPTRACE-DN42 mnt-by: BGPTRACE-MNT -nserver: KR status: ALLOCATED cidr: 172.20.35.0/24 source: DN42 diff --git a/data/inetnum/172.20.55.32_27 b/data/inetnum/172.20.55.32_27 index 42925a312..d58bd89d9 100644 --- a/data/inetnum/172.20.55.32_27 +++ b/data/inetnum/172.20.55.32_27 @@ -5,7 +5,6 @@ country: KR admin-c: BGPTRACE-DN42 tech-c: BGPTRACE-DN42 mnt-by: BGPTRACE-MNT -nserver: KR status: ALLOCATED cidr: 172.20.55.32/27 source: DN42 diff --git a/data/inetnum/172.21.0.0_16 b/data/inetnum/172.21.0.0_16 index acecc8d32..4c22ba344 100644 --- a/data/inetnum/172.21.0.0_16 +++ b/data/inetnum/172.21.0.0_16 @@ -1,14 +1,13 @@ inetnum: 172.21.0.0 - 172.21.255.255 +cidr: 172.21.0.0/16 netname: NET-BLK116-DN42 +remarks: * Last available IPv4 space +remarks: * Max one /24 per person only allowed due to shortages nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 -policy: reserved -remarks: * Last available IPv4 space -remarks: * Max one /24 per person only allowed due to shortages -admin-c: HEXA-DN42 -mnt-by: HEXA-MNT -mnt-by: NIXNODES-MNT status: ALLOCATED -cidr: 172.21.0.0/16 +policy: reserved +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.22.0.0_16 b/data/inetnum/172.22.0.0_16 index 2143a914b..6b228a0d7 100644 --- a/data/inetnum/172.22.0.0_16 +++ b/data/inetnum/172.22.0.0_16 @@ -2,16 +2,12 @@ inetnum: 172.22.0.0 - 172.22.255.255 cidr: 172.22.0.0/16 netname: NET-BLK216-DN42 descr: The original DN42 IPv4 address block. +remarks: Not free for direct assignments, please use sub-allocated blocks nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 -policy: reserved -remarks: Not free for direct assignments, please use sub-allocated blocks -admin-c: NIXNODES-DN42 -admin-c: SOURIS-DN42 -admin-c: GRMML-DN42 -mnt-by: NIXNODES-MNT -mnt-by: XUU-MNT -mnt-by: GRMML-MNT status: ALLOCATED +policy: reserved +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.23.0.0_16 b/data/inetnum/172.23.0.0_16 index aeb2772bc..4dd3042c5 100644 --- a/data/inetnum/172.23.0.0_16 +++ b/data/inetnum/172.23.0.0_16 @@ -2,14 +2,12 @@ inetnum: 172.23.0.0 - 172.23.255.255 cidr: 172.23.0.0/16 netname: NET-BLK316-DN42 descr: The secondary DN42 IPv4 address block. +remarks: Not free for direct assignments, please use sub-allocated blocks nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 -policy: reserved -remarks: Not free for direct assignments, please use sub-allocated blocks -admin-c: NIXNODES-DN42 -admin-c: SOURIS-DN42 -mnt-by: NIXNODES-MNT -mnt-by: XUU-MNT status: ALLOCATED +policy: reserved +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.23.100.0_28 b/data/inetnum/172.23.100.0_28 index 63032d41d..272723430 100644 --- a/data/inetnum/172.23.100.0_28 +++ b/data/inetnum/172.23.100.0_28 @@ -5,5 +5,4 @@ admin-c: FOOBARS-DN42 tech-c: FOOBARS-DN42 mnt-by: FOOBARS-MNT status: ASSIGNED -nserver: ns1.foobars.dn42 source: DN42 diff --git a/data/inetnum/172.23.100.16_28 b/data/inetnum/172.23.100.16_28 index 68a15b50f..5f4bee1ea 100644 --- a/data/inetnum/172.23.100.16_28 +++ b/data/inetnum/172.23.100.16_28 @@ -5,5 +5,4 @@ admin-c: FOOBARS-DN42 tech-c: FOOBARS-DN42 mnt-by: FOOBARS-MNT status: ASSIGNED -nserver: ns1.foobars.dn42 source: DN42 diff --git a/data/inetnum/172.23.100.32_28 b/data/inetnum/172.23.100.32_28 index 32f8fbb28..79b73532d 100644 --- a/data/inetnum/172.23.100.32_28 +++ b/data/inetnum/172.23.100.32_28 @@ -5,5 +5,4 @@ admin-c: FOOBARS-DN42 tech-c: FOOBARS-DN42 mnt-by: FOOBARS-MNT status: ASSIGNED -nserver: ns1.foobars.dn42 source: DN42 diff --git a/data/inetnum/172.23.100.48_28 b/data/inetnum/172.23.100.48_28 index 33662ab80..fac6c8223 100644 --- a/data/inetnum/172.23.100.48_28 +++ b/data/inetnum/172.23.100.48_28 @@ -5,5 +5,4 @@ admin-c: FOOBARS-DN42 tech-c: FOOBARS-DN42 mnt-by: FOOBARS-MNT status: ASSIGNED -nserver: ns1.foobars.dn42 source: DN42 diff --git a/data/inetnum/172.23.100.64_28 b/data/inetnum/172.23.100.64_28 index 596a29e3f..70a4e77b8 100644 --- a/data/inetnum/172.23.100.64_28 +++ b/data/inetnum/172.23.100.64_28 @@ -5,5 +5,4 @@ admin-c: FOOBARS-DN42 tech-c: FOOBARS-DN42 mnt-by: FOOBARS-MNT status: ASSIGNED -nserver: ns1.foobars.dn42 source: DN42 diff --git a/data/inetnum/172.23.100.80_28 b/data/inetnum/172.23.100.80_28 index c756e8a89..ff2234c93 100644 --- a/data/inetnum/172.23.100.80_28 +++ b/data/inetnum/172.23.100.80_28 @@ -5,5 +5,4 @@ admin-c: FOOBARS-DN42 tech-c: FOOBARS-DN42 mnt-by: FOOBARS-MNT status: ASSIGNED -nserver: ns1.foobars.dn42 source: DN42 diff --git a/data/inetnum/172.23.168.160_27 b/data/inetnum/172.23.168.160_27 index 393ea40bf..3e8bb2783 100644 --- a/data/inetnum/172.23.168.160_27 +++ b/data/inetnum/172.23.168.160_27 @@ -5,7 +5,6 @@ country: AE admin-c: WOLFEN-DN42 tech-c: WOLFEN-DN42 mnt-by: WOLFEN-MNT -nserver: DUMMY-DN42 status: ASSIGNED cidr: 172.23.168.160/27 source: DN42 diff --git a/data/inetnum/172.23.43.104_29 b/data/inetnum/172.23.43.104_29 index 8fca8946d..c98241194 100644 --- a/data/inetnum/172.23.43.104_29 +++ b/data/inetnum/172.23.43.104_29 @@ -5,10 +5,6 @@ country: ZA admin-c: WOLF-DN42 tech-c: WOLF-DN42 mnt-by: WOLF-MNT -nserver: hail.wolf.dn42 -nserver: rain.wolf.dn42 -nserver: snow.wolf.dn42 -nserver: sleet.wolf.dn42 status: ASSIGNED cidr: 172.23.43.104/29 source: DN42 diff --git a/data/inetnum/172.23.43.96_29 b/data/inetnum/172.23.43.96_29 index df9279203..e09c6e9c1 100644 --- a/data/inetnum/172.23.43.96_29 +++ b/data/inetnum/172.23.43.96_29 @@ -6,9 +6,5 @@ admin-c: WOLF-DN42 tech-c: WOLF-DN42 mnt-by: WOLF-MNT status: ASSIGNED -nserver: hail.wolf.dn42 -nserver: rain.wolf.dn42 -nserver: snow.wolf.dn42 -nserver: sleet.wolf.dn42 cidr: 172.23.43.96/29 source: DN42 diff --git a/data/inetnum/172.31.0.0_16 b/data/inetnum/172.31.0.0_16 index 283bbdb11..b80c59730 100644 --- a/data/inetnum/172.31.0.0_16 +++ b/data/inetnum/172.31.0.0_16 @@ -1,11 +1,10 @@ inetnum: 172.31.0.0 - 172.31.255.255 -remarks: ** chaosvpn -admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 -mnt-by: DN42-MNT -status: ALLOCATED +cidr: 172.31.0.0/16 +netname: ** chaosvpn nserver: ns1.chaosvpn.g.nic.dn42 nserver: ns2.chaosvpn.g.nic.dn42 -cidr: 172.31.0.0/16 -netname: Unnamed 172.31.0.0/16 Network +status: ALLOCATED +policy: closed +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42