diff --git a/README.md b/README.md index d3a7dc6..6a282b8 100644 --- a/README.md +++ b/README.md @@ -202,12 +202,10 @@ | AS211876 | FIXMIX-NET6-NEOA | subnet | fd10:127:aa66::/48 | | | AS213262 | Moe | subnet | fd10:127:3262::/64 | | | AS4201270000 | RESERVED | subnet | 10.127.0.0/24 | | -| AS4201270000 | CROOM | subnet | 10.127.1.0/24 | | -| AS4201270000 | NeoSystem | subnet | 10.127.2.0/24 | | +| AS4201270000 | MAIN | subnet | 10.127.1.0/24 | | +| AS4201270000 | Messed-up Network | subnet | 10.127.2.0/24 | | | AS4201270000 | Neo_Chen ZeroTier-One Hub | subnet | 10.127.16.0/24 | | -| AS4201270000 | NeoPDP-11 | loopback | 10.127.255.1/32 | | | AS4201270000 | fsnvax | loopback | 10.127.255.4/32 | | -| AS4201270000 | NeoSystem | loopback | 10.127.255.80/32 | | | AS4201270000 | NeoNetwork Origin | subnet | fd10:127:5f37:59df::/64 | | | AS4201270001 | NiceLabs IX IPv4 Pool | subnet | 10.127.41.0/24 | | | AS4201270001 | NiceLabs IX IPv6 Pool | subnet | fd10:127:41::/48 | | @@ -340,12 +338,10 @@ 10.127.132.0/24 10.127.233.0/24 10.127.234.0/24 -10.127.255.1/32 10.127.255.4/32 10.127.255.53/32 10.127.255.54/32 10.127.255.56/32 -10.127.255.80/32 10.127.255.117/32 fd10:127:7::/51 fd10:127:7:2000::/54 @@ -388,5 +384,5 @@ fd10:127:ffff:53::/64 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 8599 | 56937 | 13.12% | 86.88% | +| IPv4 | 65536 | 8597 | 56939 | 13.12% | 86.88% | | IPv6 | 7.9228e+28 | 3.0015e+25 | 7.9198e+28 | 0.04% | 99.96% | diff --git a/neonetwork.json b/neonetwork.json index d810133..154987e 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1629094886, - "valid": 1630304486 + "generated": 1629294469, + "valid": 1630504069 }, "people": { "Anillc": { @@ -591,32 +591,22 @@ { "prefix": "10.127.1.0/24", "maxLength": 29, - "netname": "CROOM" + "netname": "MAIN" }, { "prefix": "10.127.2.0/24", "maxLength": 29, - "netname": "NeoSystem" + "netname": "Messed-up Network" }, { "prefix": "10.127.16.0/24", "maxLength": 29, "netname": "Neo_Chen ZeroTier-One Hub" }, - { - "prefix": "10.127.255.1/32", - "maxLength": 32, - "netname": "NeoPDP-11" - }, { "prefix": "10.127.255.4/32", "maxLength": 32, "netname": "fsnvax" - }, - { - "prefix": "10.127.255.80/32", - "maxLength": 32, - "netname": "NeoSystem" } ], "ipv6": [ diff --git a/rfc8416.json b/rfc8416.json index acf0dc3..099e466 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -71,13 +71,13 @@ "asn": 4201270000, "prefix": "10.127.1.0/24", "maxPrefixLength": 29, - "comment": "CROOM" + "comment": "MAIN" }, { "asn": 4201270000, "prefix": "10.127.2.0/24", "maxPrefixLength": 29, - "comment": "NeoSystem" + "comment": "Messed-up Network" }, { "asn": 4201270000, @@ -85,24 +85,12 @@ "maxPrefixLength": 29, "comment": "Neo_Chen ZeroTier-One Hub" }, - { - "asn": 4201270000, - "prefix": "10.127.255.1/32", - "maxPrefixLength": 32, - "comment": "NeoPDP-11" - }, { "asn": 4201270000, "prefix": "10.127.255.4/32", "maxPrefixLength": 32, "comment": "fsnvax" }, - { - "asn": 4201270000, - "prefix": "10.127.255.80/32", - "maxPrefixLength": 32, - "comment": "NeoSystem" - }, { "asn": 4201270001, "prefix": "10.127.41.0/24", diff --git a/roa46.json b/roa46.json index e535ab0..7abc291 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 117, - "generated": 1629094886, - "valid": 1630304486 + "counts": 115, + "generated": 1629294469, + "valid": 1630504069 }, "roas": [ { @@ -70,21 +70,11 @@ "prefix": "10.127.16.0/24", "maxLength": 29 }, - { - "asn": "AS4201270000", - "prefix": "10.127.255.1/32", - "maxLength": 32 - }, { "asn": "AS4201270000", "prefix": "10.127.255.4/32", "maxLength": 32 }, - { - "asn": "AS4201270000", - "prefix": "10.127.255.80/32", - "maxLength": 32 - }, { "asn": "AS4201270001", "prefix": "10.127.41.0/24", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index b09f919..ef3e2dd 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -13,9 +13,7 @@ route 10.127.0.0/24 max 29 as 4201270000; route 10.127.1.0/24 max 29 as 4201270000; route 10.127.2.0/24 max 29 as 4201270000; route 10.127.16.0/24 max 29 as 4201270000; -route 10.127.255.1/32 max 32 as 4201270000; route 10.127.255.4/32 max 32 as 4201270000; -route 10.127.255.80/32 max 32 as 4201270000; route 10.127.41.0/24 max 29 as 4201270001; route 10.127.89.0/24 max 29 as 4201270003; route 10.127.56.0/24 max 29 as 4201270004; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 5e1caf0..8f492bd 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -13,9 +13,7 @@ route 10.127.0.0/24 max 29 as 4201270000; route 10.127.1.0/24 max 29 as 4201270000; route 10.127.2.0/24 max 29 as 4201270000; route 10.127.16.0/24 max 29 as 4201270000; -route 10.127.255.1/32 max 32 as 4201270000; route 10.127.255.4/32 max 32 as 4201270000; -route 10.127.255.80/32 max 32 as 4201270000; route 10.127.41.0/24 max 29 as 4201270001; route 10.127.89.0/24 max 29 as 4201270003; route 10.127.56.0/24 max 29 as 4201270004;