diff --git a/README.md b/README.md index 67c463c..6490a11 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ | Edward_P | edward@edward-p.xyz | @Edward_P | | James58899 | | | | JerryXiao | neonet@mail.jerryxiao.cc | JerryXiao | -| Junde Yhi | lmy441900@live.com | lmy441900 | +| Junde Yhi | neonetwork@yhi.moe | lmy441900 | | LINE-NZ | dn42@line.co.nz | | | Lan Tian | | | | LibreHouse | i+noc@outv.im | outvi | @@ -68,7 +68,7 @@ | NeoNetwork | AS4201270009 | santost12 | santost12 | | NeoNetwork | AS4201270010 | Lan Tian | Lan Tian | | NeoNetwork | AS4201270011 | LINE-NZ | LINE-NZ | -| NeoNetwork | AS4201270012 | Junde Yhi | Yhi Interconnect | +| NeoNetwork | AS4201270012 | Junde Yhi | Yhi Interconnection | | NeoNetwork | AS4201270013 | Ndoskrnl | NDOSKRNL | | NeoNetwork | AS4201270014 | leedagee | leedagee | | NeoNetwork | AS4201270015 | James58899 | James58899 | @@ -104,13 +104,13 @@ | AS140913 | magicneko | | AS207268 | IX42-LAS | | AS213262 | Moe | +| AS4201270000 | caasih | +| AS4201270000 | cklvax | | AS4201270000 | NeoPDP-11 | | AS4201270000 | NeoSystem | | AS4201270000 | pan | | AS4201270000 | NeoRouter | | AS4201270000 | NeoVAX | -| AS4201270000 | cklvax | -| AS4201270000 | caasih | | AS4201270001 | septs | | AS4201270003 | chenx97 | | AS4201270004 | frank-hsinchu | @@ -124,6 +124,7 @@ | AS4201270011 | LINE-NZ-NZ01 | | AS4201270011 | LINE-NZ-AU01 | | AS4201270012 | yhi-h | +| AS4201270012 | yhi-s | | AS4201270013 | Ndoskrnl-US01 | | AS4201270013 | Ndoskrnl-CN01 | | AS4201270014 | leedagee | @@ -148,27 +149,27 @@ | Upstream | Downstream | |---------------|---------------| -| pan | NeoPDP-11 | -| pan | NeoSystem | -| pan | NeoVAX | -| JerryXiao | JerryXiao-HK1 | -| JerryXiao | JerryXiao-SH1 | -| JerryXiao | LanTian | -| JerryXiao | dfceaef | -| NeoSystem | NeoVAX | -| NeoPDP-11 | NeoVAX | +| caasih | NeoPDP-11 | +| caasih | staph | | septs | James58899 | | septs | JerryXiao | | septs | LanTian | | septs | frank-hsinchu | | septs | megumiLHS | -| Ndoskrnl-US01 | Ndoskrnl-CN01 | -| JerryXiao-SH1 | JerryXiao-HK1 | | cklvax | NeoSystem | +| 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 | +| NeoSystem | NeoVAX | | JerryXiao-HK1 | JerryXiao-HK2 | | staph | septs | -| caasih | NeoPDP-11 | -| caasih | staph | ## Route table @@ -233,6 +234,7 @@ | AS4201270011 | LINE-NZ | subnet | 10.127.22.0/29 | | | AS4201270011 | LINE-NZ | subnet | 10.127.22.8/29 | | | AS4201270012 | yhi-h | subnet | 10.127.5.0/28 | | +| AS4201270012 | yhi-s | subnet | 10.127.5.16/28 | | | AS4201270013 | Ndoskrnls LAN | subnet | 10.127.13.0/24 | | | AS4201270013 | Ndoskrnls LAN (IPv6) | subnet | fd10:127:13::/48 | | | AS4201270014 | leedagee | subnet | 10.127.23.0/29 | | @@ -291,7 +293,7 @@ 10.127.0.0/23 10.127.2.0/24 10.127.4.0/24 -10.127.5.0/28 +10.127.5.0/27 10.127.7.0/24 10.127.8.0/25 10.127.8.128/28 @@ -369,5 +371,5 @@ fd10:127:ffff:53::/64 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 8071 | 57465 | 12.32% | 87.68% | +| IPv4 | 65536 | 8087 | 57449 | 12.34% | 87.66% | | IPv6 | 7.9228e+28 | 2.7598e+25 | 7.9201e+28 | 0.03% | 99.97% | diff --git a/neonetwork.json b/neonetwork.json index 703aaaf..b6fe761 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1623651709, - "valid": 1624861309 + "generated": 1624254171, + "valid": 1625463771 }, "people": { "Anillc": { @@ -344,7 +344,7 @@ "fi-0" ], "contact": { - "email": "lmy441900@live.com", + "email": "neonetwork@yhi.moe", "telegram": "lmy441900", "mastodon": "@lmy441900@sn.angry.im", "github": "lmy441900" @@ -358,7 +358,7 @@ { "asn": 4201270012, "owner": "Junde Yhi", - "name": "Yhi Interconnect", + "name": "Yhi Interconnection", "source": "NeoNetwork", "description": null, "routes": { @@ -367,6 +367,11 @@ "prefix": "10.127.5.0/28", "maxLength": 29, "netname": "yhi-h" + }, + { + "prefix": "10.127.5.16/28", + "maxLength": 29, + "netname": "yhi-s" } ], "ipv6": [] @@ -1761,15 +1766,6 @@ } ] }, - { - "zone": "neo.", - "records": [ - { - "dnskey": "257 3 13 jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg==", - "ds": "56336 13 2 317f7cc14d2f74abf560cfce6f89f5187872573ba5a7af9a9b14cf47e51489e5" - } - ] - }, { "zone": "7.2.1.0.0.1.d.f.ip6.arpa.", "records": [ @@ -1778,6 +1774,15 @@ "ds": "22562 13 2 5dcf1c8189c8a005a5621a217816eb19390862bccec0917a568415cd58dcec52" } ] + }, + { + "zone": "neo.", + "records": [ + { + "dnskey": "257 3 13 jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg==", + "ds": "56336 13 2 317f7cc14d2f74abf560cfce6f89f5187872573ba5a7af9a9b14cf47e51489e5" + } + ] } ] } \ No newline at end of file diff --git a/rfc8416.json b/rfc8416.json index 35b0ac3..f54456d 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -211,6 +211,12 @@ "maxPrefixLength": 29, "comment": "yhi-h" }, + { + "asn": 4201270012, + "prefix": "10.127.5.16/28", + "maxPrefixLength": 29, + "comment": "yhi-s" + }, { "asn": 4201270013, "prefix": "10.127.13.0/24", diff --git a/roa46.json b/roa46.json index b15f704..6c4e73d 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 110, - "generated": 1623651709, - "valid": 1624861309 + "counts": 111, + "generated": 1624254171, + "valid": 1625463771 }, "roas": [ { @@ -175,6 +175,11 @@ "prefix": "10.127.5.0/28", "maxLength": 29 }, + { + "asn": "AS4201270012", + "prefix": "10.127.5.16/28", + "maxLength": 29 + }, { "asn": "AS4201270013", "prefix": "10.127.13.0/24", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index e56cd19..0a42e38 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -34,6 +34,7 @@ route 10.127.10.0/24 max 29 as 4201270010; route 10.127.22.0/29 max 29 as 4201270011; route 10.127.22.8/29 max 29 as 4201270011; route 10.127.5.0/28 max 29 as 4201270012; +route 10.127.5.16/28 max 29 as 4201270012; route 10.127.13.0/24 max 29 as 4201270013; route 10.127.23.0/29 max 29 as 4201270014; route 10.127.64.0/24 max 29 as 4201270016; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 207b20c..5806055 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -34,6 +34,7 @@ route 10.127.10.0/24 max 29 as 4201270010; route 10.127.22.0/29 max 29 as 4201270011; route 10.127.22.8/29 max 29 as 4201270011; route 10.127.5.0/28 max 29 as 4201270012; +route 10.127.5.16/28 max 29 as 4201270012; route 10.127.13.0/24 max 29 as 4201270013; route 10.127.23.0/29 max 29 as 4201270014; route 10.127.64.0/24 max 29 as 4201270016;