diff --git a/README.md b/README.md index 2b7498e..b05f60c 100644 --- a/README.md +++ b/README.md @@ -4,33 +4,33 @@ | Name | Email | Telegram | |----------------|------------------------------|-------------| +| liangjw | liangjw@etlgr.com | liangjw | +| Yukari | charles@0x7f.cc | CharlesYang | +| iEdon | | | +| Yura | yurachan@etlgr.com | | +| licson | admin@licson.net | licson | +| alanyhq | | alanyhq | +| Tyler | | santost12 | +| leedagee | leedageea@gmail.com | leedagee | | septs | bgp@septs.email | septs | -| Icecat | icecat@catio.network | fakeicecat | +| Staph | staph@aosc.io | Staph | +| SUNNET | | | +| CainSakura | cain@iloli.cc | CainSakura | | LibreHouse | i+noc@outv.im | outvi | | Lan Tian | | | -| leedagee | leedageea@gmail.com | leedagee | -| Tyler | | santost12 | +| Ndoskrnl | lollipop.studio.cn@gmail.com | | +| JerryXiao | neonet@mail.jerryxiao.cc | JerryXiao | | Junde Yhi | lmy441900@live.com | lmy441900 | -| Neo_Chen | chenkolei@gmail.com | Neo_Chen | -| CainSakura | cain@iloli.cc | CainSakura | -| Yura | yurachan@etlgr.com | | -| Yangfl Network | | | | caxap | yrdw@protonmail.com | | | SteveYi | info@steveyi.net | steveyiyo | -| James58899 | | | -| licson | admin@licson.net | licson | -| Staph | staph@aosc.io | Staph | | chenx97 | chenx97@gmail.com | | -| liangjw | liangjw@etlgr.com | liangjw | -| iEdon | | | -| frank | | | -| Yukari | charles@0x7f.cc | CharlesYang | +| Icecat | icecat@catio.network | fakeicecat | | Moe | noc@moeternet.com | @moeternet | -| JerryXiao | neonet@mail.jerryxiao.cc | JerryXiao | -| Ndoskrnl | lollipop.studio.cn@gmail.com | | -| alanyhq | | alanyhq | +| Yangfl Network | | | +| frank | | | | LINE-NZ | dn42@line.co.nz | | -| SUNNET | | | +| Neo_Chen | chenkolei@gmail.com | Neo_Chen | +| James58899 | | | ## AS table @@ -75,13 +75,13 @@ |--------------|---------------------------| | AS207268 | IX42-LAS | | AS213262 | Moe | +| AS4201270000 | cklvax | +| AS4201270000 | caasih | | AS4201270000 | NeoPDP-11 | | AS4201270000 | NeoSystem | | AS4201270000 | pan | | AS4201270000 | ucbvax | | AS4201270000 | NeoVAX | -| AS4201270000 | cklvax | -| AS4201270000 | caasih | | AS4201270001 | septs | | AS4201270003 | chenx97 | | AS4201270004 | frank-hsinchu | @@ -118,6 +118,13 @@ | Upstream | Downstream | |-------------------|---------------------------| +| NeoPDP-11 | NeoVAX | +| staph | MagicNeko-UK01 | +| staph | septs | +| cklvax | NeoSystem | +| santost12-Network | MagicNeko-JP03 | +| JerryXiao-SH1 | JerryXiao-HK1 | +| JerryXiao-HK1 | JerryXiao-HK2 | | septs | James58899 | | septs | JerryXiao | | septs | LanTian | @@ -125,29 +132,15 @@ | septs | frank-hsinchu | | septs | megumiLHS | | septs | ucbvax | -| NeoPDP-11 | NeoVAX | +| MagicNeko-HK01 | Icecat-GroupAccessNetwork | +| MagicNeko-HK01 | SUNNET | +| NeoSystem | NeoVAX | | ucbvax | MagicNeko-HK01 | | ucbvax | NeoPDP-11 | | ucbvax | NeoSystem | | ucbvax | chenx97 | | ucbvax | megumiLHS | | ucbvax | pan | -| JerryXiao-HK1 | JerryXiao-HK2 | -| NeoSystem | NeoVAX | -| MagicNeko-HK01 | Icecat-GroupAccessNetwork | -| MagicNeko-HK01 | SUNNET | -| MagicNeko-JP03 | JerryXiao | -| MagicNeko-JP03 | Ndoskrnl-US01 | -| MagicNeko-JP03 | chenx97 | -| MagicNeko-JP03 | frank-hsinchu | -| MagicNeko-JP03 | megumiLHS | -| MagicNeko-JP03 | santost12-Network | -| cklvax | NeoSystem | -| santost12-Network | MagicNeko-JP03 | -| Ndoskrnl-US01 | Ndoskrnl-CN01 | -| staph | MagicNeko-UK01 | -| staph | septs | -| JerryXiao-SH1 | JerryXiao-HK1 | | JerryXiao | JerryXiao-HK1 | | JerryXiao | JerryXiao-SH1 | | JerryXiao | LanTian | @@ -157,6 +150,13 @@ | pan | NeoPDP-11 | | pan | NeoSystem | | pan | NeoVAX | +| Ndoskrnl-US01 | Ndoskrnl-CN01 | +| MagicNeko-JP03 | JerryXiao | +| MagicNeko-JP03 | Ndoskrnl-US01 | +| MagicNeko-JP03 | chenx97 | +| MagicNeko-JP03 | frank-hsinchu | +| MagicNeko-JP03 | megumiLHS | +| MagicNeko-JP03 | santost12-Network | | caasih | NeoPDP-11 | | caasih | staph | | caasih | ucbvax | @@ -192,6 +192,7 @@ | AS4201270005 | MagicNeko VPN | subnet | fd10:127:233:1c3a::/64 | fd10:127:233::/48 | | AS4201270006 | JerryXiao-Infrastructure | subnet | 10.127.8.192/26 | | | AS4201270006 | JerryXiao-Home | subnet | 10.127.9.0/24 | | +| AS4201270006 | JerryXiao-School | subnet | 10.127.8.64/26 | | | AS4201270006 | JerryXiao-Anycast | loopback | 10.127.255.53/32 | | | AS4201270006 | JerryXiao6 | subnet | fd10:127:53::/48 | | | AS4201270007 | StaphNet | subnet | 10.127.8.160/27 | | @@ -241,7 +242,7 @@ 10.127.4.0/24 10.127.5.0/28 10.127.7.0/24 -10.127.8.0/26 +10.127.8.0/25 10.127.8.160/27 10.127.8.192/26 10.127.9.0/24 diff --git a/neonetwork.json b/neonetwork.json index 95e7fb1..6b63ad8 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,9 +1,291 @@ { "metadata": { - "generated": 1600064174, - "valid": 1601273774 + "generated": 1600075988, + "valid": 1601285588 }, "people": { + "liangjw": { + "info": { + "name": "liangjw", + "babel": [ + "zh-N", + "zh-hans-N", + "zh-hant-2", + "zh-yue-2", + "en-2", + "ja-1" + ], + "contact": { + "email": "liangjw@etlgr.com", + "telegram": "liangjw" + }, + "persona": { + "pgp": "A04C56688622E1D51DB4ED5D263BDBB7ECAB32E4" + }, + "nic_hdl": "LIANGJW" + }, + "asns": [ + { + "asn": 4201270016, + "owner": "liangjw", + "name": "Moecast Network", + "source": "NeoNetwork", + "description": "Moecast Network NeoNetwork Service", + "routes": { + "ipv4": [ + { + "prefix": "10.127.64.0/27", + "maxLength": 29, + "netname": "Moecast Network" + } + ], + "ipv6": [] + } + } + ] + }, + "Yukari": { + "info": { + "name": "Yukari", + "contact": { + "telegram": "CharlesYang", + "github": "SteveCharlesYang", + "email": "charles@0x7f.cc" + }, + "nic_hdl": "YUKARI" + }, + "asns": [ + { + "asn": 207268, + "owner": "Yukari", + "name": "Strategic Explorations (IX)", + "source": "Internet", + "description": "Internet eXchange in DN42 / NeoNetwork / clearnet", + "routes": { + "ipv4": [ + { + "prefix": "10.127.131.0/24", + "maxLength": 29, + "netname": "IX42-LAS-4" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:1300::/48", + "maxLength": 64, + "netname": "IX42-LAS-6" + } + ] + } + } + ] + }, + "iEdon": { + "info": { + "name": "iEdon", + "contact": { + "irc": "iedon" + }, + "nic_hdl": "IEDON" + }, + "asns": [ + { + "asn": 4242422189, + "owner": "iEdon", + "name": "IEDON-NET-AS", + "source": "DN42", + "description": "iEdon Networks", + "routes": { + "ipv4": [ + { + "prefix": "10.127.21.0/24", + "maxLength": 29, + "netname": "IEDON-NET" + } + ], + "ipv6": [] + } + } + ] + }, + "Yura": { + "info": { + "name": "Yura", + "babel": [ + "zh-N", + "zh-hans-N", + "zh-hant-2", + "zh-yue-2", + "en-3", + "ru-0", + "fi-0", + "ar-0", + "jp-0" + ], + "contact": { + "email": "yurachan@etlgr.com" + }, + "persona": { + "pgp": "9E525A59D24A4041CA3C32BBF75C0CDC951918BE" + }, + "nic_hdl": "YURA" + }, + "asns": [ + { + "asn": 4242422464, + "owner": "Yura", + "name": "Yura Network", + "source": "DN42", + "description": "Yura NeoNetwork Backbone", + "routes": { + "ipv4": [ + { + "prefix": "10.127.127.0/24", + "maxLength": 29, + "netname": "Yura Moe NET" + } + ], + "ipv6": [] + } + } + ] + }, + "licson": { + "info": { + "name": "licson", + "contact": { + "email": "admin@licson.net", + "telegram": "licson", + "github": "licson0729" + }, + "nic_hdl": "LICSON" + }, + "asns": [ + { + "asn": 134098, + "owner": "licson", + "name": "Licson Internal Network", + "source": "Internet", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.14.0/23", + "maxLength": 29, + "netname": "LICSON-NET-SUBALLOC-1" + } + ], + "ipv6": [] + } + } + ] + }, + "alanyhq": { + "info": { + "name": "alanyhq", + "babel": [ + "zh-N", + "en-2" + ], + "contact": { + "telegram": "alanyhq", + "irc": "alanyhq" + }, + "nic_hdl": "ALANYHQ" + }, + "asns": [ + { + "asn": 4242420916, + "owner": "alanyhq", + "name": "alanyhq", + "source": "DN42", + "description": "alanyhq main", + "routes": { + "ipv4": [], + "ipv6": [] + } + } + ] + }, + "santost12": { + "info": { + "name": "Tyler", + "contact": { + "telegram": "santost12", + "github": "santost12" + }, + "nic_hdl": "TYLER" + }, + "asns": [ + { + "asn": 4201270009, + "owner": "santost12", + "name": "santost12", + "source": "NeoNetwork", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.69.0/27", + "maxLength": 29, + "netname": "santost12" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:ec39::/48", + "maxLength": 64, + "netname": "santost12" + } + ] + } + } + ] + }, + "leedagee": { + "info": { + "name": "leedagee", + "babel": [ + "zh-N", + "zh-hans-N", + "zh-hant-3", + "en-2", + "ja-0" + ], + "contact": { + "email": "leedageea@gmail.com", + "telegram": "leedagee", + "irc": "lizr", + "github": "leedagee" + }, + "nic_hdl": "LEEDAGEE" + }, + "asns": [ + { + "asn": 4201270014, + "owner": "leedagee", + "name": "leedagee", + "source": "NeoNetwork", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.23.0/29", + "maxLength": 29, + "netname": "leedagee" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:23::/48", + "maxLength": 64, + "netname": "leedagee" + } + ] + } + } + ] + }, "septs": { "info": { "name": "septs", @@ -51,91 +333,167 @@ } ] }, - "icecat": { + "Staph": { "info": { - "name": "Icecat", + "name": "Staph", + "description": "A programming prokaryotic organism", + "babel": [ + "zh-N", + "en-4", + "ja-2", + "es-1", + "fr-1" + ], "contact": { - "telegram": "fakeicecat", - "github": "Myer921", - "email": "icecat@catio.network" + "email": "staph@aosc.io", + "telegram": "Staph", + "irc": "Staph_aureus", + "github": "StephDC" }, - "nic_hdl": "ICECAT" + "nic_hdl": "STAPH" }, "asns": [ { - "asn": 4201270008, - "owner": "icecat", - "name": "MagicNeko Experimental Network", + "asn": 4201270007, + "owner": "Staph", + "name": "Staph", "source": "NeoNetwork", - "description": "MagicNeko Network", + "description": null, "routes": { "ipv4": [ { - "prefix": "10.127.4.0/24", + "prefix": "10.127.8.160/27", "maxLength": 29, - "netname": "Icecat-Explosion" + "netname": "StaphNet" }, { - "prefix": "10.127.237.0/24", + "prefix": "10.127.7.0/24", "maxLength": 29, - "netname": "MagicNeko IX (Will not broadcast)" - }, - { - "prefix": "10.127.255.117/32", - "maxLength": 32, - "netname": "magicneko-tw" + "netname": "AOSCNet" } ], "ipv6": [ { - "prefix": "fd10:127:233::/48", + "prefix": "fd10:127:7::/51", "maxLength": 64, - "netname": "icecat" - } - ] - } - }, - { - "asn": 4201270005, - "owner": "icecat", - "name": "Icecat", - "source": "NeoNetwork", - "description": "NextMoe Group Access Network", - "routes": { - "ipv4": [ - { - "prefix": "10.127.233.0/24", - "maxLength": 29, - "netname": "Icecat Residential network occupation address" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:233:1c3c::/64", - "maxLength": 64, - "netname": "icecat" + "netname": "Staph_v6" }, { - "prefix": "fd10:127:233:1c3a::/64", + "prefix": "fd10:127:7:2000::/54", "maxLength": 64, - "netname": "MagicNeko VPN" + "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" } ] } - }, + } + ] + }, + "SUNNET": { + "info": { + "name": "SUNNET", + "nic_hdl": "SUNNET" + }, + "asns": [ { - "asn": 4242421025, - "owner": "icecat", - "name": "NextMoe Neo-Network Intermediate Access Project", - "source": "DN42", - "description": "NextMoe Neo-Network Intermediate Access Project", + "asn": 140936, + "owner": "SUNNET", + "name": "SUNNET", + "source": "Internet", + "description": "SUNNET", "routes": { "ipv4": [], + "ipv6": [] + } + }, + { + "asn": 4242423088, + "owner": "SUNNET", + "name": "SUNNET", + "source": "DN42", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.11.0/24", + "maxLength": 29, + "netname": "SUNNET" + } + ], + "ipv6": [] + } + } + ] + }, + "CainSakura": { + "info": { + "name": "CainSakura", + "contact": { + "telegram": "CainSakura", + "github": "CainSakura", + "email": "cain@iloli.cc" + }, + "nic_hdl": "CAINSAKURA" + }, + "asns": [ + { + "asn": 4201270017, + "owner": "CainSakura", + "name": "Cain's Home Network", + "source": "NeoNetwork", + "description": "NextMoe GUser", + "routes": { + "ipv4": [ + { + "prefix": "10.127.234.0/24", + "maxLength": 29, + "netname": "CainSakura-home-devices" + }, + { + "prefix": "10.127.235.0/24", + "maxLength": 29, + "netname": "Icecat Global Tunnel Address (OpenVPN)" + }, + { + "prefix": "10.127.236.0/24", + "maxLength": 29, + "netname": "MagicNeko VPN" + } + ], "ipv6": [ { - "prefix": "fd10:127:233:1000::/64", + "prefix": "fd10:127:234::/48", "maxLength": 64, - "netname": "icecat" + "netname": "CainSakura-home-devices" } ] } @@ -211,79 +569,95 @@ } ] }, - "leedagee": { + "Ndoskrnl": { "info": { - "name": "leedagee", + "name": "Ndoskrnl", + "description": "We can start chat happily with Google Translate :)", "babel": [ - "zh-N", - "zh-hans-N", - "zh-hant-3", - "en-2", - "ja-0" + "en-1", + "zh-1" ], "contact": { - "email": "leedageea@gmail.com", - "telegram": "leedagee", - "irc": "lizr", - "github": "leedagee" + "email": "lollipop.studio.cn@gmail.com", + "github": "magic0whi" }, - "nic_hdl": "LEEDAGEE" + "nic_hdl": "NDOSKRNL" }, "asns": [ { - "asn": 4201270014, - "owner": "leedagee", - "name": "leedagee", + "asn": 4201270013, + "owner": "Ndoskrnl", + "name": "NDOSKRNL", "source": "NeoNetwork", - "description": null, + "description": "Ndoskrnl's Network", "routes": { "ipv4": [ { - "prefix": "10.127.23.0/29", + "prefix": "10.127.13.0/24", "maxLength": 29, - "netname": "leedagee" + "netname": "Ndoskrnls LAN" } ], "ipv6": [ { - "prefix": "fd10:127:23::/48", + "prefix": "fd10:127:13::/48", "maxLength": 64, - "netname": "leedagee" + "netname": "Ndoskrnls LAN (IPv6)" } ] } } ] }, - "santost12": { + "JerryXiao": { "info": { - "name": "Tyler", + "name": "JerryXiao", "contact": { - "telegram": "santost12", - "github": "santost12" + "email": "neonet@mail.jerryxiao.cc", + "telegram": "JerryXiao", + "irc": "JerryXiao@hackint", + "github": "isjerryxiao" }, - "nic_hdl": "TYLER" + "persona": { + "pgp": "186242204A2EC70438E9CE3B9D9CE43650FF2BAA" + }, + "nic_hdl": "JERRYXIAO" }, "asns": [ { - "asn": 4201270009, - "owner": "santost12", - "name": "santost12", + "asn": 4201270006, + "owner": "JerryXiao", + "name": "Jerry Network", "source": "NeoNetwork", "description": null, "routes": { "ipv4": [ { - "prefix": "10.127.69.0/27", + "prefix": "10.127.8.192/26", "maxLength": 29, - "netname": "santost12" + "netname": "JerryXiao-Infrastructure" + }, + { + "prefix": "10.127.9.0/24", + "maxLength": 29, + "netname": "JerryXiao-Home" + }, + { + "prefix": "10.127.8.64/26", + "maxLength": 29, + "netname": "JerryXiao-School" + }, + { + "prefix": "10.127.255.53/32", + "maxLength": 32, + "netname": "JerryXiao-Anycast" } ], "ipv6": [ { - "prefix": "fd10:127:ec39::/48", + "prefix": "fd10:127:53::/48", "maxLength": 64, - "netname": "santost12" + "netname": "JerryXiao6" } ] } @@ -334,6 +708,335 @@ } ] }, + "caxap": { + "info": { + "name": "caxap", + "contact": { + "email": "yrdw@protonmail.com" + }, + "nic_hdl": "CAXAP" + }, + "asns": [ + { + "asn": 4201270018, + "owner": "caxap", + "name": "caxap Network", + "source": "NeoNetwork", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.100.0/24", + "maxLength": 29, + "netname": "caxap-minecraft-net" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:6324::/48", + "maxLength": 64, + "netname": "caxap6" + } + ] + } + } + ] + }, + "SteveYi": { + "info": { + "name": "SteveYi", + "contact": { + "telegram": "steveyiyo", + "github": "steveyiyo", + "email": "info@steveyi.net" + }, + "nic_hdl": "STEVEYI" + }, + "asns": [ + { + "asn": 4242421214, + "owner": "SteveYi", + "name": "Yi-Network", + "source": "DN42", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.124.0/29", + "maxLength": 29, + "netname": "Yi Global VPN" + } + ], + "ipv6": [] + } + }, + { + "asn": 209557, + "owner": "SteveYi", + "name": "Yi-Network", + "source": "Internet", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.124.0/29", + "maxLength": 29, + "netname": "Yi Global VPN" + } + ], + "ipv6": [] + } + } + ] + }, + "chenx97": { + "info": { + "name": "chenx97", + "contact": { + "email": "chenx97@gmail.com", + "github": "chenx97" + }, + "nic_hdl": "CHENX97" + }, + "asns": [ + { + "asn": 4201270003, + "owner": "chenx97", + "name": "chenx97", + "source": "NeoNetwork", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.89.0/24", + "maxLength": 29, + "netname": "chenx97 v4" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:1919::/48", + "maxLength": 64, + "netname": "chenx97" + } + ] + } + } + ] + }, + "icecat": { + "info": { + "name": "Icecat", + "contact": { + "telegram": "fakeicecat", + "github": "Myer921", + "email": "icecat@catio.network" + }, + "nic_hdl": "ICECAT" + }, + "asns": [ + { + "asn": 4201270005, + "owner": "icecat", + "name": "Icecat", + "source": "NeoNetwork", + "description": "NextMoe Group Access Network", + "routes": { + "ipv4": [ + { + "prefix": "10.127.233.0/24", + "maxLength": 29, + "netname": "Icecat Residential network occupation address" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:233:1c3c::/64", + "maxLength": 64, + "netname": "icecat" + }, + { + "prefix": "fd10:127:233:1c3a::/64", + "maxLength": 64, + "netname": "MagicNeko VPN" + } + ] + } + }, + { + "asn": 4201270008, + "owner": "icecat", + "name": "MagicNeko Experimental Network", + "source": "NeoNetwork", + "description": "MagicNeko Network", + "routes": { + "ipv4": [ + { + "prefix": "10.127.4.0/24", + "maxLength": 29, + "netname": "Icecat-Explosion" + }, + { + "prefix": "10.127.237.0/24", + "maxLength": 29, + "netname": "MagicNeko IX (Will not broadcast)" + }, + { + "prefix": "10.127.255.117/32", + "maxLength": 32, + "netname": "magicneko-tw" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:233::/48", + "maxLength": 64, + "netname": "icecat" + } + ] + } + }, + { + "asn": 4242421025, + "owner": "icecat", + "name": "NextMoe Neo-Network Intermediate Access Project", + "source": "DN42", + "description": "NextMoe Neo-Network Intermediate Access Project", + "routes": { + "ipv4": [], + "ipv6": [ + { + "prefix": "fd10:127:233:1000::/64", + "maxLength": 64, + "netname": "icecat" + } + ] + } + } + ] + }, + "Moe": { + "info": { + "name": "Moe", + "description": "Moe Overflow Electric NOC", + "contact": { + "email": "noc@moeternet.com", + "telegram": "@moeternet" + }, + "nic_hdl": "MOE" + }, + "asns": [ + { + "asn": 213262, + "owner": "Moe", + "name": "Moe", + "source": "Internet", + "description": "Moe Overflow Electric", + "routes": { + "ipv4": [], + "ipv6": [ + { + "prefix": "fd10:127:3262::/64", + "maxLength": 64, + "netname": "Moe" + } + ] + } + } + ] + }, + "Yangfl": { + "info": { + "name": "Yangfl Network", + "nic_hdl": "YANGFL-NETWORK" + }, + "asns": [ + { + "asn": 4242420140, + "owner": "Yangfl", + "name": "Yangfl Network", + "source": "DN42", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.12.0/24", + "maxLength": 29, + "netname": "dfceaef NET" + } + ], + "ipv6": [] + } + } + ] + }, + "frank": { + "info": { + "name": "frank", + "nic_hdl": "FRANK" + }, + "asns": [ + { + "asn": 4201270004, + "owner": "frank", + "name": "frank", + "source": "NeoNetwork", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.56.0/24", + "maxLength": 29, + "netname": "frank-hsinchu" + }, + { + "prefix": "10.127.255.56/32", + "maxLength": 32, + "netname": "frank-hsinchu-1" + } + ], + "ipv6": [] + } + } + ] + }, + "LINE-NZ": { + "info": { + "name": "LINE-NZ", + "babel": [ + "en" + ], + "contact": { + "email": "dn42@line.co.nz", + "github": "line-nz" + }, + "nic_hdl": "LINE-NZ" + }, + "asns": [ + { + "asn": 4201270011, + "owner": "LINE-NZ", + "name": "LINE-NZ", + "source": "NeoNetwork", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.22.0/29", + "maxLength": 29, + "netname": "LINE-NZ" + }, + { + "prefix": "10.127.22.8/29", + "maxLength": 29, + "netname": "LINE-NZ" + } + ], + "ipv6": [] + } + } + ] + }, "Neo_Chen": { "info": { "name": "Neo_Chen", @@ -424,200 +1127,6 @@ } ] }, - "CainSakura": { - "info": { - "name": "CainSakura", - "contact": { - "telegram": "CainSakura", - "github": "CainSakura", - "email": "cain@iloli.cc" - }, - "nic_hdl": "CAINSAKURA" - }, - "asns": [ - { - "asn": 4201270017, - "owner": "CainSakura", - "name": "Cain's Home Network", - "source": "NeoNetwork", - "description": "NextMoe GUser", - "routes": { - "ipv4": [ - { - "prefix": "10.127.234.0/24", - "maxLength": 29, - "netname": "CainSakura-home-devices" - }, - { - "prefix": "10.127.235.0/24", - "maxLength": 29, - "netname": "Icecat Global Tunnel Address (OpenVPN)" - }, - { - "prefix": "10.127.236.0/24", - "maxLength": 29, - "netname": "MagicNeko VPN" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:234::/48", - "maxLength": 64, - "netname": "CainSakura-home-devices" - } - ] - } - } - ] - }, - "Yura": { - "info": { - "name": "Yura", - "babel": [ - "zh-N", - "zh-hans-N", - "zh-hant-2", - "zh-yue-2", - "en-3", - "ru-0", - "fi-0", - "ar-0", - "jp-0" - ], - "contact": { - "email": "yurachan@etlgr.com" - }, - "persona": { - "pgp": "9E525A59D24A4041CA3C32BBF75C0CDC951918BE" - }, - "nic_hdl": "YURA" - }, - "asns": [ - { - "asn": 4242422464, - "owner": "Yura", - "name": "Yura Network", - "source": "DN42", - "description": "Yura NeoNetwork Backbone", - "routes": { - "ipv4": [ - { - "prefix": "10.127.127.0/24", - "maxLength": 29, - "netname": "Yura Moe NET" - } - ], - "ipv6": [] - } - } - ] - }, - "Yangfl": { - "info": { - "name": "Yangfl Network", - "nic_hdl": "YANGFL-NETWORK" - }, - "asns": [ - { - "asn": 4242420140, - "owner": "Yangfl", - "name": "Yangfl Network", - "source": "DN42", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.12.0/24", - "maxLength": 29, - "netname": "dfceaef NET" - } - ], - "ipv6": [] - } - } - ] - }, - "caxap": { - "info": { - "name": "caxap", - "contact": { - "email": "yrdw@protonmail.com" - }, - "nic_hdl": "CAXAP" - }, - "asns": [ - { - "asn": 4201270018, - "owner": "caxap", - "name": "caxap Network", - "source": "NeoNetwork", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.100.0/24", - "maxLength": 29, - "netname": "caxap-minecraft-net" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:6324::/48", - "maxLength": 64, - "netname": "caxap6" - } - ] - } - } - ] - }, - "SteveYi": { - "info": { - "name": "SteveYi", - "contact": { - "telegram": "steveyiyo", - "github": "steveyiyo", - "email": "info@steveyi.net" - }, - "nic_hdl": "STEVEYI" - }, - "asns": [ - { - "asn": 4242421214, - "owner": "SteveYi", - "name": "Yi-Network", - "source": "DN42", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.124.0/29", - "maxLength": 29, - "netname": "Yi Global VPN" - } - ], - "ipv6": [] - } - }, - { - "asn": 209557, - "owner": "SteveYi", - "name": "Yi-Network", - "source": "Internet", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.124.0/29", - "maxLength": 29, - "netname": "Yi Global VPN" - } - ], - "ipv6": [] - } - } - ] - }, "James58899": { "info": { "name": "James58899", @@ -636,510 +1145,6 @@ } } ] - }, - "licson": { - "info": { - "name": "licson", - "contact": { - "email": "admin@licson.net", - "telegram": "licson", - "github": "licson0729" - }, - "nic_hdl": "LICSON" - }, - "asns": [ - { - "asn": 134098, - "owner": "licson", - "name": "Licson Internal Network", - "source": "Internet", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.14.0/23", - "maxLength": 29, - "netname": "LICSON-NET-SUBALLOC-1" - } - ], - "ipv6": [] - } - } - ] - }, - "Staph": { - "info": { - "name": "Staph", - "description": "A programming prokaryotic organism", - "babel": [ - "zh-N", - "en-4", - "ja-2", - "es-1", - "fr-1" - ], - "contact": { - "email": "staph@aosc.io", - "telegram": "Staph", - "irc": "Staph_aureus", - "github": "StephDC" - }, - "nic_hdl": "STAPH" - }, - "asns": [ - { - "asn": 4201270007, - "owner": "Staph", - "name": "Staph", - "source": "NeoNetwork", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.8.160/27", - "maxLength": 29, - "netname": "StaphNet" - }, - { - "prefix": "10.127.7.0/24", - "maxLength": 29, - "netname": "AOSCNet" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:7::/51", - "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" - } - ] - } - } - ] - }, - "chenx97": { - "info": { - "name": "chenx97", - "contact": { - "email": "chenx97@gmail.com", - "github": "chenx97" - }, - "nic_hdl": "CHENX97" - }, - "asns": [ - { - "asn": 4201270003, - "owner": "chenx97", - "name": "chenx97", - "source": "NeoNetwork", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.89.0/24", - "maxLength": 29, - "netname": "chenx97 v4" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:1919::/48", - "maxLength": 64, - "netname": "chenx97" - } - ] - } - } - ] - }, - "liangjw": { - "info": { - "name": "liangjw", - "babel": [ - "zh-N", - "zh-hans-N", - "zh-hant-2", - "zh-yue-2", - "en-2", - "ja-1" - ], - "contact": { - "email": "liangjw@etlgr.com", - "telegram": "liangjw" - }, - "persona": { - "pgp": "A04C56688622E1D51DB4ED5D263BDBB7ECAB32E4" - }, - "nic_hdl": "LIANGJW" - }, - "asns": [ - { - "asn": 4201270016, - "owner": "liangjw", - "name": "Moecast Network", - "source": "NeoNetwork", - "description": "Moecast Network NeoNetwork Service", - "routes": { - "ipv4": [ - { - "prefix": "10.127.64.0/27", - "maxLength": 29, - "netname": "Moecast Network" - } - ], - "ipv6": [] - } - } - ] - }, - "iEdon": { - "info": { - "name": "iEdon", - "contact": { - "irc": "iedon" - }, - "nic_hdl": "IEDON" - }, - "asns": [ - { - "asn": 4242422189, - "owner": "iEdon", - "name": "IEDON-NET-AS", - "source": "DN42", - "description": "iEdon Networks", - "routes": { - "ipv4": [ - { - "prefix": "10.127.21.0/24", - "maxLength": 29, - "netname": "IEDON-NET" - } - ], - "ipv6": [] - } - } - ] - }, - "frank": { - "info": { - "name": "frank", - "nic_hdl": "FRANK" - }, - "asns": [ - { - "asn": 4201270004, - "owner": "frank", - "name": "frank", - "source": "NeoNetwork", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.56.0/24", - "maxLength": 29, - "netname": "frank-hsinchu" - }, - { - "prefix": "10.127.255.56/32", - "maxLength": 32, - "netname": "frank-hsinchu-1" - } - ], - "ipv6": [] - } - } - ] - }, - "Yukari": { - "info": { - "name": "Yukari", - "contact": { - "telegram": "CharlesYang", - "github": "SteveCharlesYang", - "email": "charles@0x7f.cc" - }, - "nic_hdl": "YUKARI" - }, - "asns": [ - { - "asn": 207268, - "owner": "Yukari", - "name": "Strategic Explorations (IX)", - "source": "Internet", - "description": "Internet eXchange in DN42 / NeoNetwork / clearnet", - "routes": { - "ipv4": [ - { - "prefix": "10.127.131.0/24", - "maxLength": 29, - "netname": "IX42-LAS-4" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:1300::/48", - "maxLength": 64, - "netname": "IX42-LAS-6" - } - ] - } - } - ] - }, - "Moe": { - "info": { - "name": "Moe", - "description": "Moe Overflow Electric NOC", - "contact": { - "email": "noc@moeternet.com", - "telegram": "@moeternet" - }, - "nic_hdl": "MOE" - }, - "asns": [ - { - "asn": 213262, - "owner": "Moe", - "name": "Moe", - "source": "Internet", - "description": "Moe Overflow Electric", - "routes": { - "ipv4": [], - "ipv6": [ - { - "prefix": "fd10:127:3262::/64", - "maxLength": 64, - "netname": "Moe" - } - ] - } - } - ] - }, - "JerryXiao": { - "info": { - "name": "JerryXiao", - "contact": { - "email": "neonet@mail.jerryxiao.cc", - "telegram": "JerryXiao", - "irc": "JerryXiao@hackint", - "github": "isjerryxiao" - }, - "persona": { - "pgp": "186242204A2EC70438E9CE3B9D9CE43650FF2BAA" - }, - "nic_hdl": "JERRYXIAO" - }, - "asns": [ - { - "asn": 4201270006, - "owner": "JerryXiao", - "name": "Jerry Network", - "source": "NeoNetwork", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.8.192/26", - "maxLength": 29, - "netname": "JerryXiao-Infrastructure" - }, - { - "prefix": "10.127.9.0/24", - "maxLength": 29, - "netname": "JerryXiao-Home" - }, - { - "prefix": "10.127.255.53/32", - "maxLength": 32, - "netname": "JerryXiao-Anycast" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:53::/48", - "maxLength": 64, - "netname": "JerryXiao6" - } - ] - } - } - ] - }, - "Ndoskrnl": { - "info": { - "name": "Ndoskrnl", - "description": "We can start chat happily with Google Translate :)", - "babel": [ - "en-1", - "zh-1" - ], - "contact": { - "email": "lollipop.studio.cn@gmail.com", - "github": "magic0whi" - }, - "nic_hdl": "NDOSKRNL" - }, - "asns": [ - { - "asn": 4201270013, - "owner": "Ndoskrnl", - "name": "NDOSKRNL", - "source": "NeoNetwork", - "description": "Ndoskrnl's Network", - "routes": { - "ipv4": [ - { - "prefix": "10.127.13.0/24", - "maxLength": 29, - "netname": "Ndoskrnls LAN" - } - ], - "ipv6": [ - { - "prefix": "fd10:127:13::/48", - "maxLength": 64, - "netname": "Ndoskrnls LAN (IPv6)" - } - ] - } - } - ] - }, - "alanyhq": { - "info": { - "name": "alanyhq", - "babel": [ - "zh-N", - "en-2" - ], - "contact": { - "telegram": "alanyhq", - "irc": "alanyhq" - }, - "nic_hdl": "ALANYHQ" - }, - "asns": [ - { - "asn": 4242420916, - "owner": "alanyhq", - "name": "alanyhq", - "source": "DN42", - "description": "alanyhq main", - "routes": { - "ipv4": [], - "ipv6": [] - } - } - ] - }, - "LINE-NZ": { - "info": { - "name": "LINE-NZ", - "babel": [ - "en" - ], - "contact": { - "email": "dn42@line.co.nz", - "github": "line-nz" - }, - "nic_hdl": "LINE-NZ" - }, - "asns": [ - { - "asn": 4201270011, - "owner": "LINE-NZ", - "name": "LINE-NZ", - "source": "NeoNetwork", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.22.0/29", - "maxLength": 29, - "netname": "LINE-NZ" - }, - { - "prefix": "10.127.22.8/29", - "maxLength": 29, - "netname": "LINE-NZ" - } - ], - "ipv6": [] - } - } - ] - }, - "SUNNET": { - "info": { - "name": "SUNNET", - "nic_hdl": "SUNNET" - }, - "asns": [ - { - "asn": 140936, - "owner": "SUNNET", - "name": "SUNNET", - "source": "Internet", - "description": "SUNNET", - "routes": { - "ipv4": [], - "ipv6": [] - } - }, - { - "asn": 4242423088, - "owner": "SUNNET", - "name": "SUNNET", - "source": "DN42", - "description": null, - "routes": { - "ipv4": [ - { - "prefix": "10.127.11.0/24", - "maxLength": 29, - "netname": "SUNNET" - } - ], - "ipv6": [] - } - } - ] } } } \ No newline at end of file diff --git a/rfc8416.json b/rfc8416.json index 5aaa125..096263a 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -121,6 +121,12 @@ "maxPrefixLength": 29, "comment": "JerryXiao-Home" }, + { + "asn": 4201270006, + "prefix": "10.127.8.64/26", + "maxPrefixLength": 29, + "comment": "JerryXiao-School" + }, { "asn": 4201270006, "prefix": "10.127.255.53/32", diff --git a/roa46.json b/roa46.json index f2b4546..1217f0f 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 68, - "generated": 1600064174, - "valid": 1601273774 + "counts": 69, + "generated": 1600075988, + "valid": 1601285588 }, "roas": [ { @@ -100,6 +100,11 @@ "prefix": "10.127.9.0/24", "maxLength": 29 }, + { + "asn": "AS4201270006", + "prefix": "10.127.8.64/26", + "maxLength": 29 + }, { "asn": "AS4201270006", "prefix": "10.127.255.53/32", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index a46e024..a4d1e22 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -19,6 +19,7 @@ route 4201270004 max 10.127.255.56/32 as 32; route 4201270005 max 10.127.233.0/24 as 29; route 4201270006 max 10.127.8.192/26 as 29; route 4201270006 max 10.127.9.0/24 as 29; +route 4201270006 max 10.127.8.64/26 as 29; route 4201270006 max 10.127.255.53/32 as 32; route 4201270007 max 10.127.8.160/27 as 29; route 4201270007 max 10.127.7.0/24 as 29; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 4fe7120..1218ffa 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -19,6 +19,7 @@ route 4201270004 max 10.127.255.56/32 as 32; route 4201270005 max 10.127.233.0/24 as 29; route 4201270006 max 10.127.8.192/26 as 29; route 4201270006 max 10.127.9.0/24 as 29; +route 4201270006 max 10.127.8.64/26 as 29; route 4201270006 max 10.127.255.53/32 as 32; route 4201270007 max 10.127.8.160/27 as 29; route 4201270007 max 10.127.7.0/24 as 29;