diff --git a/README.md b/README.md index 77a18fc..b8def2a 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ | Moe | noc@moeternet.com | @moeternet | | Ndoskrnl | lollipop.studio.cn@gmail.com | | | Neo_Chen | chenkolei@gmail.com | Neo_Chen | -| Qin Yuzhen | 1@jin-dan.site | yuzhenqin | | Ren Baoshuo | i@baoshuo.ren | baoshuo | | SUNNET | | | | Staph | staph@aosc.io | Staph | @@ -112,7 +111,6 @@ | DN42 | AS4242421332 | Yukari | Niantic Network CN | | DN42 | AS4242421876 | David Liu | POTATO-42 | | DN42 | AS4242422189 | iEdon | IEDON-NET-AS | -| DN42 | AS4242422399 | Qin Yuzhen | QYZ-AS | | DN42 | AS4242422439 | DannyAAM | SARU-AS-DN42 | | DN42 | AS4242422458 | huajitech | PIGEONHOLE-AS | | DN42 | AS4242422464 | Yura | Yura Network | @@ -347,8 +345,6 @@ | AS4242421876 | POTATO-NEO-NET6-A | subnet | fd10:127:aa66::/48 | | | AS4242422189 | IEDON-NET | subnet | 10.127.21.0/24 | | | AS4242422189 | IEDON-NET | subnet | 10.127.25.0/24 | | -| AS4242422399 | QYZ-NEO-IPV4 | subnet | 10.127.239.0/24 | | -| AS4242422399 | QYZ-NEO-IPV6 | subnet | fd10:127:2399::/48 | | | AS4242422439 | Saru-Neo-IP4 | subnet | 10.127.39.0/24 | | | AS4242422439 | Saru-Neo-AnyNS-IP4 | loopback | 10.127.255.39/32 | | | AS4242422439 | Saru-Neo-IP6 | subnet | fd10:127:39::/48 | | @@ -417,7 +413,6 @@ 10.127.180.0/24 10.127.186.0/24 10.127.232.0/22 -10.127.239.0/24 10.127.255.4/32 10.127.255.39/32 10.127.255.53/32 @@ -456,7 +451,6 @@ fd10:127:1332::/48 fd10:127:1488::/48 fd10:127:1877::/48 fd10:127:1919::/48 -fd10:127:2399::/48 fd10:127:2f2f::/48 fd10:127:3262::/64 fd10:127:5f37:59df::/64 @@ -555,8 +549,7 @@ fd10:127:ffff:53::/64 10.127.188.0/22 10.127.192.0/19 10.127.224.0/21 -10.127.236.0/23 -10.127.238.0/24 +10.127.236.0/22 10.127.240.0/21 10.127.248.0/22 10.127.252.0/23 @@ -733,17 +726,7 @@ fd10:127:1940::/42 fd10:127:1980::/41 fd10:127:1a00::/39 fd10:127:1c00::/38 -fd10:127:2000::/39 -fd10:127:2200::/40 -fd10:127:2300::/41 -fd10:127:2380::/44 -fd10:127:2390::/45 -fd10:127:2398::/48 -fd10:127:239a::/47 -fd10:127:239c::/46 -fd10:127:23a0::/43 -fd10:127:23c0::/42 -fd10:127:2400::/38 +fd10:127:2000::/37 fd10:127:2800::/38 fd10:127:2c00::/39 fd10:127:2e00::/40 @@ -906,5 +889,5 @@ fd10:127:ffff:8000::/49 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 11189 | 54347 | 17.07% | 82.93% | -| IPv6 | 7.9228e+28 | 4.5732e+25 | 7.9182e+28 | 0.06% | 99.94% | +| IPv4 | 65536 | 10933 | 54603 | 16.68% | 83.32% | +| IPv6 | 7.9228e+28 | 4.4523e+25 | 7.9184e+28 | 0.06% | 99.94% | diff --git a/neonetwork.json b/neonetwork.json index 0bbc2cb..335fec5 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1669020388, - "valid": 1670229988 + "generated": 1669223882, + "valid": 1670433482 }, "people": { "186526": { @@ -861,49 +861,6 @@ } ] }, - "Qin Yuzhen": { - "info": { - "name": "Qin Yuzhen", - "babel": [ - "zh-N", - "en-3" - ], - "contact": { - "email": "1@jin-dan.site", - "telegram": "yuzhenqin", - "github": "yuzhenqin" - }, - "persona": { - "pgp": "17A745DEC7298325A69DD1C235D412B098D64338" - }, - "nic_hdl": "QIN-YUZHEN" - }, - "asns": [ - { - "asn": 4242422399, - "owner": "Qin Yuzhen", - "name": "QYZ-AS", - "source": "DN42", - "description": "QYZ DN42 Network", - "routes": { - "ipv4": [ - { - "prefix": "10.127.239.0/24", - "maxLength": 29, - "netname": "QYZ-NEO-IPV4" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:2399::/48", - "maxLength": 64, - "netname": "QYZ-NEO-IPV6" - } - ] - } - } - ] - }, "Ren Baoshuo": { "info": { "name": "Ren Baoshuo", diff --git a/rfc8416.json b/rfc8416.json index a33293e..6051f6d 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -391,12 +391,6 @@ "maxPrefixLength": 29, "comment": "IEDON-NET" }, - { - "asn": 4242422399, - "prefix": "10.127.239.0/24", - "maxPrefixLength": 29, - "comment": "QYZ-NEO-IPV4" - }, { "asn": 4242422439, "prefix": "10.127.39.0/24", @@ -799,12 +793,6 @@ "maxPrefixLength": 64, "comment": "POTATO-NEO-NET6-A" }, - { - "asn": 4242422399, - "prefix": "fd10:127:2399::/48", - "maxPrefixLength": 64, - "comment": "QYZ-NEO-IPV6" - }, { "asn": 4242422439, "prefix": "fd10:127:39::/48", diff --git a/roa46.json b/roa46.json index e470c2a..eeb07a1 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 142, - "generated": 1669020388, - "valid": 1670229988 + "counts": 140, + "generated": 1669223882, + "valid": 1670433482 }, "roas": [ { @@ -325,11 +325,6 @@ "prefix": "10.127.25.0/24", "maxLength": 29 }, - { - "asn": "AS4242422399", - "prefix": "10.127.239.0/24", - "maxLength": 29 - }, { "asn": "AS4242422439", "prefix": "10.127.39.0/24", @@ -665,11 +660,6 @@ "prefix": "fd10:127:aa66::/48", "maxLength": 64 }, - { - "asn": "AS4242422399", - "prefix": "fd10:127:2399::/48", - "maxLength": 64 - }, { "asn": "AS4242422439", "prefix": "fd10:127:39::/48", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 1e0a460..8cd9cd5 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -64,7 +64,6 @@ route 10.127.132.0/24 max 29 as 4242421332; route 10.127.66.0/24 max 29 as 4242421876; route 10.127.21.0/24 max 29 as 4242422189; route 10.127.25.0/24 max 29 as 4242422189; -route 10.127.239.0/24 max 29 as 4242422399; route 10.127.39.0/24 max 29 as 4242422439; route 10.127.255.39/32 max 32 as 4242422439; route 10.127.27.24/29 max 29 as 4242422458; @@ -132,7 +131,6 @@ route fd10:127:27:20::/60 max 64 as 4242420458; route fd10:127:233:1000::/64 max 64 as 4242421025; route fd10:127:1332::/48 max 64 as 4242421332; route fd10:127:aa66::/48 max 64 as 4242421876; -route fd10:127:2399::/48 max 64 as 4242422399; route fd10:127:39::/48 max 64 as 4242422439; route fd10:127:27:20::/60 max 64 as 4242422458; route fd10:127:127::/48 max 64 as 4242422464; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 0fb89d8..0f29307 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -64,7 +64,6 @@ route 10.127.132.0/24 max 29 as 4242421332; route 10.127.66.0/24 max 29 as 4242421876; route 10.127.21.0/24 max 29 as 4242422189; route 10.127.25.0/24 max 29 as 4242422189; -route 10.127.239.0/24 max 29 as 4242422399; route 10.127.39.0/24 max 29 as 4242422439; route 10.127.255.39/32 max 32 as 4242422439; route 10.127.27.24/29 max 29 as 4242422458; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index d1ef7a5..77daf02 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -56,7 +56,6 @@ route fd10:127:27:20::/60 max 64 as 4242420458; route fd10:127:233:1000::/64 max 64 as 4242421025; route fd10:127:1332::/48 max 64 as 4242421332; route fd10:127:aa66::/48 max 64 as 4242421876; -route fd10:127:2399::/48 max 64 as 4242422399; route fd10:127:39::/48 max 64 as 4242422439; route fd10:127:27:20::/60 max 64 as 4242422458; route fd10:127:127::/48 max 64 as 4242422464;