diff --git a/README.md b/README.md index 6490a11..503f0c1 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ | SyllaBear | bear@koala.gq | | | Clement VILLISEK | clement@villisek.fr | | | Yangfl Network | | | -| Yukari | charles@0x7f.cc | CharlesYang | +| Yukari | i@0x7f.cc | CharlesYang | | Yura | yurachan@etlgr.com | @noc2464 | | Yux Zhu | me@yux.im | im_yux | | alanyhq | | alanyhq | @@ -90,6 +90,8 @@ | DN42 | AS4242421025 | icecat | NextMoe Neo-Network Intermediate Access Project | | DN42 | AS4242421037 | LibreHouse | LibreHouse | | DN42 | AS4242421214 | SteveYi | Yi-Network | +| DN42 | AS4242421331 | Yukari | Niantic Network | +| DN42 | AS4242421332 | Yukari | Niantic Network CN | | DN42 | AS4242421876 | David Liu | FIXMIX-42 | | DN42 | AS4242422189 | iEdon | IEDON-NET-AS | | DN42 | AS4242422464 | Yura | Yura Network | @@ -105,12 +107,12 @@ | AS207268 | IX42-LAS | | AS213262 | Moe | | AS4201270000 | caasih | -| AS4201270000 | cklvax | | AS4201270000 | NeoPDP-11 | | AS4201270000 | NeoSystem | | AS4201270000 | pan | | AS4201270000 | NeoRouter | | AS4201270000 | NeoVAX | +| AS4201270000 | cklvax | | AS4201270001 | septs | | AS4201270003 | chenx97 | | AS4201270004 | frank-hsinchu | @@ -141,6 +143,8 @@ | AS4242420140 | dfceaef | | AS4242420308 | VILLISEK | | AS4242421037 | megumiLHS | +| AS4242421331 | NIA-NET | +| AS4242421332 | NIACN-NET | | AS4242422189 | iEdon | | AS4242422464 | Yura | | AS4242423088 | SUNNET | @@ -151,25 +155,25 @@ |---------------|---------------| | caasih | NeoPDP-11 | | caasih | staph | +| staph | septs | +| pan | NeoPDP-11 | +| pan | NeoSystem | +| pan | NeoVAX | | septs | James58899 | | septs | JerryXiao | | septs | LanTian | | septs | frank-hsinchu | | septs | megumiLHS | -| cklvax | NeoSystem | +| Ndoskrnl-US01 | Ndoskrnl-CN01 | | JerryXiao | JerryXiao-HK1 | | JerryXiao | JerryXiao-SH1 | | JerryXiao | LanTian | | JerryXiao | dfceaef | -| Ndoskrnl-US01 | Ndoskrnl-CN01 | -| pan | NeoPDP-11 | -| pan | NeoSystem | -| pan | NeoVAX | | NeoPDP-11 | NeoVAX | | JerryXiao-SH1 | JerryXiao-HK1 | +| cklvax | NeoSystem | | NeoSystem | NeoVAX | | JerryXiao-HK1 | JerryXiao-HK2 | -| staph | septs | ## Route table @@ -267,6 +271,8 @@ | AS4242421025 | icecat | subnet | fd10:127:233:1000::/64 | fd10:127:233::/48 | | AS4242421037 | LibreHouse | subnet | 10.127.8.0/26 | | | AS4242421214 | Yi Global VPN | subnet | 10.127.124.0/29 | | +| AS4242421332 | NetUnion-IPv4 | subnet | 10.127.132.0/24 | | +| AS4242421332 | NetUnion-IPv6 | subnet | fd10:127:1332::/48 | | | AS4242421876 | FIXMIX-NET4-NEOA | subnet | 10.127.66.0/24 | | | AS4242421876 | FIXMIX-NET6-NEOA | subnet | fd10:127:aa66::/48 | | | AS4242422189 | IEDON-NET | subnet | 10.127.21.0/24 | | @@ -323,6 +329,7 @@ 10.127.124.0/29 10.127.127.0/24 10.127.131.0/24 +10.127.132.0/24 10.127.233.0/24 10.127.234.0/24 10.127.255.1/32 @@ -352,6 +359,7 @@ fd10:127:127::/48 fd10:127:233::/48 fd10:127:308::/48 fd10:127:1300::/48 +fd10:127:1332::/48 fd10:127:1488::/48 fd10:127:1919::/48 fd10:127:2f2f::/48 @@ -371,5 +379,5 @@ fd10:127:ffff:53::/64 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 8087 | 57449 | 12.34% | 87.66% | -| IPv6 | 7.9228e+28 | 2.7598e+25 | 7.9201e+28 | 0.03% | 99.97% | +| IPv4 | 65536 | 8343 | 57193 | 12.73% | 87.27% | +| IPv6 | 7.9228e+28 | 2.8807e+25 | 7.9199e+28 | 0.04% | 99.96% | diff --git a/neonetwork.json b/neonetwork.json index 669eb7d..a532e15 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1624860728, - "valid": 1626070328 + "generated": 1625034196, + "valid": 1626243796 }, "people": { "Anillc": { @@ -1028,8 +1028,11 @@ "name": "Yukari", "contact": { "telegram": "CharlesYang", - "github": "SteveCharlesYang", - "email": "charles@0x7f.cc" + "github": "YukariChiba", + "email": "i@0x7f.cc" + }, + "persona": { + "pgp": "9DC663829861B7FDFB5DA8B39277CB21961D6DD5" }, "nic_hdl": "YUKARI" }, @@ -1056,6 +1059,40 @@ } ] } + }, + { + "asn": 4242421331, + "owner": "Yukari", + "name": "Niantic Network", + "source": "DN42", + "description": "Niantic Network Backbone", + "routes": { + "ipv4": [], + "ipv6": [] + } + }, + { + "asn": 4242421332, + "owner": "Yukari", + "name": "Niantic Network CN", + "source": "DN42", + "description": "Niantic Network China", + "routes": { + "ipv4": [ + { + "prefix": "10.127.132.0/24", + "maxLength": 29, + "netname": "NetUnion-IPv4" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:1332::/48", + "maxLength": 64, + "netname": "NetUnion-IPv6" + } + ] + } } ] }, @@ -1758,11 +1795,11 @@ }, "dnssec": [ { - "zone": "127.10.in-addr.arpa.", + "zone": "neo.", "records": [ { - "dnskey": "257 3 13 QVgt1c+OlL9X9jrnD39njabYFCi2eEYjLI5AvpXT6HWAF1BbAOfNm/56 4OeU03oDcCgQ6zNQMV0FNPvrk53K0w==", - "ds": "22312 13 2 16859deddc7966541b4507d4612b00ea6fb95b2773e51d4bcc201e16f6178b0f" + "dnskey": "257 3 13 jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg==", + "ds": "56336 13 2 317f7cc14d2f74abf560cfce6f89f5187872573ba5a7af9a9b14cf47e51489e5" } ] }, @@ -1776,11 +1813,11 @@ ] }, { - "zone": "neo.", + "zone": "127.10.in-addr.arpa.", "records": [ { - "dnskey": "257 3 13 jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg==", - "ds": "56336 13 2 317f7cc14d2f74abf560cfce6f89f5187872573ba5a7af9a9b14cf47e51489e5" + "dnskey": "257 3 13 QVgt1c+OlL9X9jrnD39njabYFCi2eEYjLI5AvpXT6HWAF1BbAOfNm/56 4OeU03oDcCgQ6zNQMV0FNPvrk53K0w==", + "ds": "22312 13 2 16859deddc7966541b4507d4612b00ea6fb95b2773e51d4bcc201e16f6178b0f" } ] } diff --git a/rfc8416.json b/rfc8416.json index f54456d..e187b5b 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -319,6 +319,12 @@ "maxPrefixLength": 29, "comment": "Yi Global VPN" }, + { + "asn": 4242421332, + "prefix": "10.127.132.0/24", + "maxPrefixLength": 29, + "comment": "NetUnion-IPv4" + }, { "asn": 4242421876, "prefix": "10.127.66.0/24", @@ -625,6 +631,12 @@ "maxPrefixLength": 64, "comment": "icecat" }, + { + "asn": 4242421332, + "prefix": "fd10:127:1332::/48", + "maxPrefixLength": 64, + "comment": "NetUnion-IPv6" + }, { "asn": 4242421876, "prefix": "fd10:127:aa66::/48", diff --git a/roa46.json b/roa46.json index e3c7398..f252db7 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 111, - "generated": 1624860727, - "valid": 1626070327 + "counts": 113, + "generated": 1625034195, + "valid": 1626243795 }, "roas": [ { @@ -265,6 +265,11 @@ "prefix": "10.127.124.0/29", "maxLength": 29 }, + { + "asn": "AS4242421332", + "prefix": "10.127.132.0/24", + "maxLength": 29 + }, { "asn": "AS4242421876", "prefix": "10.127.66.0/24", @@ -520,6 +525,11 @@ "prefix": "fd10:127:233:1000::/64", "maxLength": 64 }, + { + "asn": "AS4242421332", + "prefix": "fd10:127:1332::/48", + "maxLength": 64 + }, { "asn": "AS4242421876", "prefix": "fd10:127:aa66::/48", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 0a42e38..2817289 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -52,6 +52,7 @@ route 10.127.30.0/24 max 29 as 4242420288; route 10.127.38.32/27 max 29 as 4242420308; route 10.127.8.0/26 max 29 as 4242421037; route 10.127.124.0/29 max 29 as 4242421214; +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; @@ -103,6 +104,7 @@ route fd10:127:9898::/48 max 64 as 4242420247; route fd10:127:30::/48 max 64 as 4242420288; route fd10:127:308::/48 max 64 as 4242420308; 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:127::/48 max 64 as 4242422464; route fd10:127:127:53::/64 max 64 as 4242422464; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 5806055..b9e99d1 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -52,6 +52,7 @@ route 10.127.30.0/24 max 29 as 4242420288; route 10.127.38.32/27 max 29 as 4242420308; route 10.127.8.0/26 max 29 as 4242421037; route 10.127.124.0/29 max 29 as 4242421214; +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; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index 9f5ebfb..7ea60c2 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -40,6 +40,7 @@ route fd10:127:9898::/48 max 64 as 4242420247; route fd10:127:30::/48 max 64 as 4242420288; route fd10:127:308::/48 max 64 as 4242420308; 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:127::/48 max 64 as 4242422464; route fd10:127:127:53::/64 max 64 as 4242422464;