diff --git a/README.md b/README.md index e049953..07284b7 100644 --- a/README.md +++ b/README.md @@ -182,14 +182,7 @@ | AS4201270006 | anycast-recur-6 | loopback | fd10:127:53:53::/64 | fd10:127:53::/48 | | AS4201270007 | StaphNet | subnet | 10.127.8.160/27 | | | AS4201270007 | AOSCNet | subnet | 10.127.7.0/24 | | -| AS4201270007 | Staph_v6 | subnet | fd10:127:7::/51 | | -| AS4201270007 | StaphReserve_0 | subnet | fd10:127:7:2000::/54 | | -| AS4201270007 | AOSCNet_v6 | subnet | fd10:127:7:2672::/64 | | -| AS4201270007 | StaphReserve_1 | subnet | fd10:127:7:3000::/52 | | -| AS4201270007 | StaphReserve_2 | subnet | fd10:127:7:4000::/50 | | -| AS4201270007 | StaphReserve_3 | subnet | fd10:127:7:8000::/50 | | -| AS4201270007 | StaphReserve_4 | subnet | fd10:127:7:c000::/51 | | -| AS4201270007 | StaphPeer | subnet | fd10:127:7:ffff::/64 | | +| AS4201270007 | Staph_v6 | subnet | fd10:127:7::/48 | | | AS4201270010 | Lan Tian LAN | subnet | 10.127.10.0/24 | | | AS4201270010 | Lan Tian LAN6 | subnet | fd10:127:10::/48 | | | AS4201270011 | LINE-NZ | subnet | 10.127.22.0/29 | | @@ -359,14 +352,7 @@ 10.127.255.54/32 10.127.255.56/32 fd10:127::/48 -fd10:127:7::/51 -fd10:127:7:2000::/54 -fd10:127:7:2672::/64 -fd10:127:7:3000::/52 -fd10:127:7:4000::/50 -fd10:127:7:8000::/50 -fd10:127:7:c000::/51 -fd10:127:7:ffff::/64 +fd10:127:7::/48 fd10:127:10::/48 fd10:127:13::/48 fd10:127:17::/48 @@ -529,30 +515,6 @@ fd10:127:1::/48 fd10:127:2::/47 fd10:127:4::/47 fd10:127:6::/48 -fd10:127:7:2400::/55 -fd10:127:7:2600::/58 -fd10:127:7:2640::/59 -fd10:127:7:2660::/60 -fd10:127:7:2670::/63 -fd10:127:7:2673::/64 -fd10:127:7:2674::/62 -fd10:127:7:2678::/61 -fd10:127:7:2680::/57 -fd10:127:7:2700::/56 -fd10:127:7:2800::/53 -fd10:127:7:e000::/52 -fd10:127:7:f000::/53 -fd10:127:7:f800::/54 -fd10:127:7:fc00::/55 -fd10:127:7:fe00::/56 -fd10:127:7:ff00::/57 -fd10:127:7:ff80::/58 -fd10:127:7:ffc0::/59 -fd10:127:7:ffe0::/60 -fd10:127:7:fff0::/61 -fd10:127:7:fff8::/62 -fd10:127:7:fffc::/63 -fd10:127:7:fffe::/64 fd10:127:8::/45 fd10:127:11::/48 fd10:127:12::/48 @@ -860,4 +822,4 @@ fd10:127:ffff:8000::/49 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| | IPv4 | 65536 | 12477 | 53059 | 19.04% | 80.96% | -| IPv6 | 7.9228e+28 | 5.2985e+25 | 7.9175e+28 | 0.07% | 99.93% | +| IPv6 | 7.9228e+28 | 5.3193e+25 | 7.9175e+28 | 0.07% | 99.93% | diff --git a/dns/named_trust_anchors.conf b/dns/named_trust_anchors.conf index 692e939..6cc4e5d 100644 --- a/dns/named_trust_anchors.conf +++ b/dns/named_trust_anchors.conf @@ -1,8 +1,8 @@ trust-anchors { - 7.2.1.0.0.1.d.f.ip6.arpa. static-key 257 3 13 "sI90N0KcwXtpqNDmsagKH/761EzsjSlGyYxx338qRrDlzRwXQPG6bO1m HoTdnKrWBcd1JqYM0/tgDXKep7dJgA=="; - 7.2.1.0.0.1.d.f.ip6.arpa. static-key 257 3 15 "aneEeuuJL47gPJJzT6ZbOgB9HlKpQmkkPNJNvK2z1pI="; - neo. static-key 257 3 13 "jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg=="; - neo. static-key 257 3 15 "eE/0MWGb7wYP4U/kf5mXCbE8tGIwo1U++dp22Fumo+g="; 127.10.in-addr.arpa. static-key 257 3 13 "QVgt1c+OlL9X9jrnD39njabYFCi2eEYjLI5AvpXT6HWAF1BbAOfNm/56 4OeU03oDcCgQ6zNQMV0FNPvrk53K0w=="; 127.10.in-addr.arpa. static-key 257 3 15 "PWTkwcNA5jJqNYSsyeHt0xnxh1wZQ5//UmMuMPi5DlU="; + neo. static-key 257 3 13 "jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg=="; + neo. static-key 257 3 15 "eE/0MWGb7wYP4U/kf5mXCbE8tGIwo1U++dp22Fumo+g="; + 7.2.1.0.0.1.d.f.ip6.arpa. static-key 257 3 13 "sI90N0KcwXtpqNDmsagKH/761EzsjSlGyYxx338qRrDlzRwXQPG6bO1m HoTdnKrWBcd1JqYM0/tgDXKep7dJgA=="; + 7.2.1.0.0.1.d.f.ip6.arpa. static-key 257 3 15 "aneEeuuJL47gPJJzT6ZbOgB9HlKpQmkkPNJNvK2z1pI="; } diff --git a/neonetwork.json b/neonetwork.json index 427b6a5..12cab1b 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1707718727, - "valid": 1708928327 + "generated": 1707877579, + "valid": 1709087179 }, "people": { "186526": { @@ -1112,7 +1112,7 @@ "babel": [ "zh-N", "en-4", - "ja-2", + "ja-3", "es-1", "fr-1" ], @@ -1146,44 +1146,9 @@ ], "ipv6": [ { - "prefix": "fd10:127:7::/51", + "prefix": "fd10:127:7::/48", "maxLength": 64, "netname": "Staph_v6" - }, - { - "prefix": "fd10:127:7:2000::/54", - "maxLength": 64, - "netname": "StaphReserve_0" - }, - { - "prefix": "fd10:127:7:2672::/64", - "maxLength": 64, - "netname": "AOSCNet_v6" - }, - { - "prefix": "fd10:127:7:3000::/52", - "maxLength": 64, - "netname": "StaphReserve_1" - }, - { - "prefix": "fd10:127:7:4000::/50", - "maxLength": 64, - "netname": "StaphReserve_2" - }, - { - "prefix": "fd10:127:7:8000::/50", - "maxLength": 64, - "netname": "StaphReserve_3" - }, - { - "prefix": "fd10:127:7:c000::/51", - "maxLength": 64, - "netname": "StaphReserve_4" - }, - { - "prefix": "fd10:127:7:ffff::/64", - "maxLength": 64, - "netname": "StaphPeer" } ] } @@ -2577,15 +2542,15 @@ }, "dnssec": [ { - "zone": "7.2.1.0.0.1.d.f.ip6.arpa.", + "zone": "127.10.in-addr.arpa.", "records": [ { - "dnskey": "257 3 13 sI90N0KcwXtpqNDmsagKH/761EzsjSlGyYxx338qRrDlzRwXQPG6bO1m HoTdnKrWBcd1JqYM0/tgDXKep7dJgA==", - "ds": "22562 13 2 5dcf1c8189c8a005a5621a217816eb19390862bccec0917a568415cd58dcec52" + "dnskey": "257 3 13 QVgt1c+OlL9X9jrnD39njabYFCi2eEYjLI5AvpXT6HWAF1BbAOfNm/56 4OeU03oDcCgQ6zNQMV0FNPvrk53K0w==", + "ds": "22312 13 2 16859deddc7966541b4507d4612b00ea6fb95b2773e51d4bcc201e16f6178b0f" }, { - "dnskey": "257 3 15 aneEeuuJL47gPJJzT6ZbOgB9HlKpQmkkPNJNvK2z1pI=", - "ds": "27574 15 2 09baad36e187d53ecadcebef76babfd6c9fb0af5f4844596f3ca0c906ed8637e" + "dnskey": "257 3 15 PWTkwcNA5jJqNYSsyeHt0xnxh1wZQ5//UmMuMPi5DlU=", + "ds": "22644 15 2 ba8389bd2f3ea36b7280a9a166fa3cc05d6af53a3ff987e62d37cf401d2c380b" } ] }, @@ -2603,15 +2568,15 @@ ] }, { - "zone": "127.10.in-addr.arpa.", + "zone": "7.2.1.0.0.1.d.f.ip6.arpa.", "records": [ { - "dnskey": "257 3 13 QVgt1c+OlL9X9jrnD39njabYFCi2eEYjLI5AvpXT6HWAF1BbAOfNm/56 4OeU03oDcCgQ6zNQMV0FNPvrk53K0w==", - "ds": "22312 13 2 16859deddc7966541b4507d4612b00ea6fb95b2773e51d4bcc201e16f6178b0f" + "dnskey": "257 3 13 sI90N0KcwXtpqNDmsagKH/761EzsjSlGyYxx338qRrDlzRwXQPG6bO1m HoTdnKrWBcd1JqYM0/tgDXKep7dJgA==", + "ds": "22562 13 2 5dcf1c8189c8a005a5621a217816eb19390862bccec0917a568415cd58dcec52" }, { - "dnskey": "257 3 15 PWTkwcNA5jJqNYSsyeHt0xnxh1wZQ5//UmMuMPi5DlU=", - "ds": "22644 15 2 ba8389bd2f3ea36b7280a9a166fa3cc05d6af53a3ff987e62d37cf401d2c380b" + "dnskey": "257 3 15 aneEeuuJL47gPJJzT6ZbOgB9HlKpQmkkPNJNvK2z1pI=", + "ds": "27574 15 2 09baad36e187d53ecadcebef76babfd6c9fb0af5f4844596f3ca0c906ed8637e" } ] } diff --git a/rfc8416.json b/rfc8416.json index ca3e1f3..ae03ef4 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -651,52 +651,10 @@ }, { "asn": 4201270007, - "prefix": "fd10:127:7::/51", + "prefix": "fd10:127:7::/48", "maxPrefixLength": 64, "comment": "Staph_v6" }, - { - "asn": 4201270007, - "prefix": "fd10:127:7:2000::/54", - "maxPrefixLength": 64, - "comment": "StaphReserve_0" - }, - { - "asn": 4201270007, - "prefix": "fd10:127:7:2672::/64", - "maxPrefixLength": 64, - "comment": "AOSCNet_v6" - }, - { - "asn": 4201270007, - "prefix": "fd10:127:7:3000::/52", - "maxPrefixLength": 64, - "comment": "StaphReserve_1" - }, - { - "asn": 4201270007, - "prefix": "fd10:127:7:4000::/50", - "maxPrefixLength": 64, - "comment": "StaphReserve_2" - }, - { - "asn": 4201270007, - "prefix": "fd10:127:7:8000::/50", - "maxPrefixLength": 64, - "comment": "StaphReserve_3" - }, - { - "asn": 4201270007, - "prefix": "fd10:127:7:c000::/51", - "maxPrefixLength": 64, - "comment": "StaphReserve_4" - }, - { - "asn": 4201270007, - "prefix": "fd10:127:7:ffff::/64", - "maxPrefixLength": 64, - "comment": "StaphPeer" - }, { "asn": 4201270010, "prefix": "fd10:127:10::/48", diff --git a/roa46.json b/roa46.json index c643339..3d34bd5 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 163, - "generated": 1707718727, - "valid": 1708928327 + "counts": 156, + "generated": 1707877579, + "valid": 1709087179 }, "roas": [ { @@ -542,42 +542,7 @@ }, { "asn": "AS4201270007", - "prefix": "fd10:127:7::/51", - "maxLength": 64 - }, - { - "asn": "AS4201270007", - "prefix": "fd10:127:7:2000::/54", - "maxLength": 64 - }, - { - "asn": "AS4201270007", - "prefix": "fd10:127:7:2672::/64", - "maxLength": 64 - }, - { - "asn": "AS4201270007", - "prefix": "fd10:127:7:3000::/52", - "maxLength": 64 - }, - { - "asn": "AS4201270007", - "prefix": "fd10:127:7:4000::/50", - "maxLength": 64 - }, - { - "asn": "AS4201270007", - "prefix": "fd10:127:7:8000::/50", - "maxLength": 64 - }, - { - "asn": "AS4201270007", - "prefix": "fd10:127:7:c000::/51", - "maxLength": 64 - }, - { - "asn": "AS4201270007", - "prefix": "fd10:127:7:ffff::/64", + "prefix": "fd10:127:7::/48", "maxLength": 64 }, { diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 5ef9b20..e2bdc74 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -107,14 +107,7 @@ route fd10:127:41::/48 max 64 as 4201270001; route fd10:127:53::/48 max 64 as 4201270006; route fd10:127:ffff:53::/64 max 64 as 4201270006; route fd10:127:53:53::/64 max 64 as 4201270006; -route fd10:127:7::/51 max 64 as 4201270007; -route fd10:127:7:2000::/54 max 64 as 4201270007; -route fd10:127:7:2672::/64 max 64 as 4201270007; -route fd10:127:7:3000::/52 max 64 as 4201270007; -route fd10:127:7:4000::/50 max 64 as 4201270007; -route fd10:127:7:8000::/50 max 64 as 4201270007; -route fd10:127:7:c000::/51 max 64 as 4201270007; -route fd10:127:7:ffff::/64 max 64 as 4201270007; +route fd10:127:7::/48 max 64 as 4201270007; route fd10:127:10::/48 max 64 as 4201270010; route fd10:127:13::/48 max 64 as 4201270013; route fd10:127:23::/48 max 64 as 4201270014; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index 8e409bd..609d294 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -20,14 +20,7 @@ route fd10:127:41::/48 max 64 as 4201270001; route fd10:127:53::/48 max 64 as 4201270006; route fd10:127:ffff:53::/64 max 64 as 4201270006; route fd10:127:53:53::/64 max 64 as 4201270006; -route fd10:127:7::/51 max 64 as 4201270007; -route fd10:127:7:2000::/54 max 64 as 4201270007; -route fd10:127:7:2672::/64 max 64 as 4201270007; -route fd10:127:7:3000::/52 max 64 as 4201270007; -route fd10:127:7:4000::/50 max 64 as 4201270007; -route fd10:127:7:8000::/50 max 64 as 4201270007; -route fd10:127:7:c000::/51 max 64 as 4201270007; -route fd10:127:7:ffff::/64 max 64 as 4201270007; +route fd10:127:7::/48 max 64 as 4201270007; route fd10:127:10::/48 max 64 as 4201270010; route fd10:127:13::/48 max 64 as 4201270013; route fd10:127:23::/48 max 64 as 4201270014;