diff --git a/README.md b/README.md index 90361f7..5a92eca 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ | chenx97 | chenx97@gmail.com | | | frank | | | | funnysyc | yc.s@outlook.com | funnysyc | +| HuajiTech | noc@huajitech.net | huajitech | | iEdon | | | | Icecat | icecat@catio.network | fakeicecat | | leedagee | leedageea@gmail.com | leedagee | @@ -46,6 +47,7 @@ | lilydjwg | lilydjwg@gmail.com | @lilydjwg | | MagicNeko | noc@koishi.moe | Mirs322 | | mark22k | neo@mk16.de | https://t.me/mark22k | +| Ricky8955555 | 397050061@qq.com | ricky8955555 | | septs | bgp@septs.email | septs | | undefined-moe | i@undefined.moe | webpack_exports_undefined | @@ -93,7 +95,7 @@ | NeoNetwork | AS4201270080 | Hanako | HANAKO-NETWORK | | NeoNetwork | AS4201270099 | TsingYao | AS-NEO-TSINGYAO | | NeoNetwork | AS4201270186 | 186526 | 186526 Network | -| NeoNetwork | AS4201270456 | funnysyc | HJTMESH-AS | +| NeoNetwork | AS4201270456 | huajitech | HJTMESH-AS | | NeoNetwork | AS4201271111 | KusakabeSi | Kusakabe-Neo | | NeoNetwork | AS4201271488 | SyllaBear | Polar Bear | | NeoNetwork | AS4201271877 | Lily | Lily_Network | @@ -103,6 +105,7 @@ | DN42 | AS4242420247 | Ren Baoshuo | BAOSHUO-AS-DN42 | | DN42 | AS4242420288 | Yux | IWARP-DN42 | | DN42 | AS4242420308 | VILLISEK | VILLISEK | +| DN42 | AS4242420458 | huajitech | HUAJINET | | DN42 | AS4242420916 | alanyhq | alanyhq | | DN42 | AS4242421025 | icecat | NextMoe Neo-Network Intermediate Access Project | | DN42 | AS4242421037 | LibreHouse | LibreHouse | @@ -112,6 +115,7 @@ | DN42 | AS4242421876 | David Liu | POTATO-42 | | DN42 | AS4242422189 | iEdon | IEDON-NET-AS | | DN42 | AS4242422439 | DannyAAM | SARU-AS-DN42 | +| DN42 | AS4242422458 | huajitech | PIGEONHOLE-AS | | DN42 | AS4242422464 | Yura | Yura Network | | DN42 | AS4242422923 | mark22k | AS-BANDURA-DN42 | | DN42 | AS4242423088 | SUNNET | SUNNET | @@ -323,6 +327,8 @@ | AS4201270186 | 186526-block-v6 | subnet | fd10:127:186::/48 | | | AS4201270456 | HJTMESH-NET | subnet | 10.127.45.0/24 | | | AS4201270456 | HJTMESH-NET | subnet | fd10:127:45::/48 | | +| AS4201270456 | HUAJITECH-ANYCAST | subnet | 10.127.27.24/29 | | +| AS4201270456 | HUAJITECH-ANYCAST | subnet | fd10:127:27:20::/60 | | | AS4201271111 | Kusakabe-Neo-IP4 | subnet | 10.127.111.0/24 | | | AS4201271111 | Kusakabe-Neo-IP6 | subnet | fd10:127:e00f::/48 | | | AS4201271488 | Bear | subnet | fd10:127:1488::/48 | | @@ -339,6 +345,8 @@ | AS4242420288 | IWARP-NEO-IP6-NETWORK | subnet | fd10:127:30::/48 | | | AS4242420308 | VILLISEK-NEO | subnet | 10.127.38.32/27 | | | AS4242420308 | VILLISEK-NEO-V6 | subnet | fd10:127:308::/48 | | +| AS4242420458 | HUAJITECH-ANYCAST | subnet | 10.127.27.24/29 | | +| AS4242420458 | HUAJITECH-ANYCAST | subnet | fd10:127:27:20::/60 | | | 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 | | @@ -351,6 +359,8 @@ | 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 | | +| AS4242422458 | HUAJITECH-ANYCAST | subnet | 10.127.27.24/29 | | +| AS4242422458 | HUAJITECH-ANYCAST | subnet | fd10:127:27:20::/60 | | | AS4242422464 | Yura Moe NET | subnet | 10.127.127.0/24 | | | AS4242422464 | Yura Neo2 | subnet | fd10:127:127::/48 | | | AS4242422464 | Yura Neo Anycast | loopback | 10.127.127.127/32 | 10.127.127.0/24 | @@ -393,6 +403,7 @@ 10.127.22.0/28 10.127.25.0/24 10.127.26.0/24 +10.127.27.24/29 10.127.30.0/24 10.127.38.32/27 10.127.39.0/24 @@ -432,6 +443,7 @@ fd10:127:10::/48 fd10:127:13::/48 fd10:127:17::/48 fd10:127:23::/48 +fd10:127:27:20::/60 fd10:127:30::/48 fd10:127:39::/48 fd10:127:41::/48 @@ -485,7 +497,11 @@ fd10:127:ffff:53::/64 10.127.22.128/25 10.127.23.0/24 10.127.24.0/24 -10.127.27.0/24 +10.127.27.0/28 +10.127.27.16/29 +10.127.27.32/27 +10.127.27.64/26 +10.127.27.128/25 10.127.28.0/23 10.127.31.0/24 10.127.32.0/22 @@ -603,7 +619,20 @@ fd10:127:16::/48 fd10:127:18::/45 fd10:127:20::/47 fd10:127:22::/48 -fd10:127:24::/46 +fd10:127:24::/47 +fd10:127:26::/48 +fd10:127:27::/59 +fd10:127:27:30::/60 +fd10:127:27:40::/58 +fd10:127:27:80::/57 +fd10:127:27:100::/56 +fd10:127:27:200::/55 +fd10:127:27:400::/54 +fd10:127:27:800::/53 +fd10:127:27:1000::/52 +fd10:127:27:2000::/51 +fd10:127:27:4000::/50 +fd10:127:27:8000::/49 fd10:127:28::/45 fd10:127:31::/48 fd10:127:32::/47 @@ -883,5 +912,5 @@ fd10:127:ffff:8000::/49 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 11181 | 54355 | 17.06% | 82.94% | -| IPv6 | 7.9228e+28 | 4.5731e+25 | 7.9182e+28 | 0.06% | 99.94% | +| IPv4 | 65536 | 11189 | 54347 | 17.07% | 82.93% | +| IPv6 | 7.9228e+28 | 4.5732e+25 | 7.9182e+28 | 0.06% | 99.94% | diff --git a/dns/db.10.127 b/dns/db.10.127 index 99f5a88..4b8daf1 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -1,7 +1,7 @@ ; NeoNetwork DNS Record $TTL 3600 @ IN SOA root-dns.neo. root.neo. ( - 68862316 ; Serial + 70658496 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -107,7 +107,7 @@ $TTL 3600 111 IN NS ns.kskb.neo. -45 IN NS ns0.hjt.neo. +45 IN NS ns0.hmn.neo. 186 IN NS ns1.186526.dn42. 186 IN NS ns2.186526.dn42. @@ -339,6 +339,16 @@ $TTL 3600 134.8 IN CNAME 134.128/29.8 135.8 IN CNAME 135.128/29.8 +24/29.27 IN NS ns0.hmn.neo. +24.27 IN CNAME 24.24/29.27 +25.27 IN CNAME 25.24/29.27 +26.27 IN CNAME 26.24/29.27 +27.27 IN CNAME 27.24/29.27 +28.27 IN CNAME 28.24/29.27 +29.27 IN CNAME 29.24/29.27 +30.27 IN CNAME 30.24/29.27 +31.27 IN CNAME 31.24/29.27 + ; dnskey @ IN DNSKEY 257 3 13 QVgt1c+OlL9X9jrnD39njabYFCi2eEYjLI5AvpXT6HWAF1BbAOfNm/56 4OeU03oDcCgQ6zNQMV0FNPvrk53K0w== diff --git a/dns/db.fd10.127 b/dns/db.fd10.127 index 959dc53..b04864d 100644 --- a/dns/db.fd10.127 +++ b/dns/db.fd10.127 @@ -1,7 +1,7 @@ ; NeoNetwork DNS Record $TTL 3600 @ IN SOA root-dns.neo. root.neo. ( - 68515461 ; Serial + 70658496 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -65,7 +65,8 @@ c.c.0.0 IN NS ns1.an.dn42. f.0.0.e IN NS ns.kskb.neo. -5.4.0.0 IN NS ns0.hjt.neo. +5.4.0.0 IN NS ns0.hmn.neo. +2.0.0.7.2.0.0 IN NS ns0.hmn.neo. 6.8.1.0 IN NS ns1.186526.dn42. 6.8.1.0 IN NS ns2.186526.dn42. diff --git a/dns/neonetwork b/dns/neonetwork index e3d6ed1..418e2f2 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -1,7 +1,7 @@ ; NeoNetwork DNS Record $TTL 3600 @ IN SOA root-dns.neo. root.neo. ( - 68515461 ; Serial + 70658496 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -165,9 +165,11 @@ kskb IN NS ns.kskb ns.kskb IN A 10.127.111.233 ns.kskb IN AAAA fd10:127:e00f:aca::233 -hjt IN NS ns0.hjt -ns0.hjt IN A 10.127.45.233 -ns0.hjt IN AAAA fd10:127:45:233::1 +hmn IN NS ns0.hmn +ns0.hmn IN A 10.127.45.233 +ns0.hmn IN AAAA fd10:127:45:233::1 + +hjt IN NS ns0.hmn hanako IN NS ns.hanako ns.hanako IN A 10.127.80.80 diff --git a/dns/rfc2317.toml b/dns/rfc2317.toml index c0bde43..336b18d 100644 --- a/dns/rfc2317.toml +++ b/dns/rfc2317.toml @@ -16,3 +16,6 @@ NS = ["ns1.staph.neo."] ["10.127.8.128/29"] NS = ["ns.leedagee.neo."] + +["10.127.27.24/29"] +NS = ["ns0.hmn.neo."] diff --git a/neonetwork.json b/neonetwork.json index 15597b6..259ef4a 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1657520790, - "valid": 1658730390 + "generated": 1657534539, + "valid": 1658744139 }, "people": { "186526": { @@ -1724,10 +1724,26 @@ }, "nic_hdl": "FUNNYSYC" }, + "asns": [] + }, + "huajitech": { + "info": { + "name": "HuajiTech", + "babel": [ + "zh-N", + "en-2" + ], + "contact": { + "email": "noc@huajitech.net", + "telegram": "huajitech", + "github": "huajitech" + }, + "nic_hdl": "HUAJITECH" + }, "asns": [ { "asn": 4201270456, - "owner": "funnysyc", + "owner": "huajitech", "name": "HJTMESH-AS", "source": "NeoNetwork", "description": "HUAJITECH Mesh Network", @@ -1737,6 +1753,11 @@ "prefix": "10.127.45.0/24", "maxLength": 29, "netname": "HJTMESH-NET" + }, + { + "prefix": "10.127.27.24/29", + "maxLength": 29, + "netname": "HUAJITECH-ANYCAST" } ], "ipv6": [ @@ -1744,6 +1765,57 @@ "prefix": "fd10:127:45::/48", "maxLength": 64, "netname": "HJTMESH-NET" + }, + { + "prefix": "fd10:127:27:20::/60", + "maxLength": 64, + "netname": "HUAJITECH-ANYCAST" + } + ] + } + }, + { + "asn": 4242420458, + "owner": "huajitech", + "name": "HUAJINET", + "source": "DN42", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.27.24/29", + "maxLength": 29, + "netname": "HUAJITECH-ANYCAST" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:27:20::/60", + "maxLength": 64, + "netname": "HUAJITECH-ANYCAST" + } + ] + } + }, + { + "asn": 4242422458, + "owner": "huajitech", + "name": "PIGEONHOLE-AS", + "source": "DN42", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.27.24/29", + "maxLength": 29, + "netname": "HUAJITECH-ANYCAST" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:27:20::/60", + "maxLength": 64, + "netname": "HUAJITECH-ANYCAST" } ] } @@ -2152,6 +2224,22 @@ } ] }, + "ricky8955555": { + "info": { + "name": "Ricky8955555", + "babel": [ + "zh-N", + "en-2" + ], + "contact": { + "email": "397050061@qq.com", + "telegram": "ricky8955555", + "github": "ricky8955555" + }, + "nic_hdl": "RICKY8955555" + }, + "asns": [] + }, "septs": { "info": { "name": "septs", diff --git a/rfc8416.json b/rfc8416.json index 0593f92..cf70977 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -313,6 +313,12 @@ "maxPrefixLength": 29, "comment": "HJTMESH-NET" }, + { + "asn": 4201270456, + "prefix": "10.127.27.24/29", + "maxPrefixLength": 29, + "comment": "HUAJITECH-ANYCAST" + }, { "asn": 4201271111, "prefix": "10.127.111.0/24", @@ -361,6 +367,12 @@ "maxPrefixLength": 29, "comment": "VILLISEK-NEO" }, + { + "asn": 4242420458, + "prefix": "10.127.27.24/29", + "maxPrefixLength": 29, + "comment": "HUAJITECH-ANYCAST" + }, { "asn": 4242421037, "prefix": "10.127.8.0/26", @@ -409,6 +421,12 @@ "maxPrefixLength": 32, "comment": "Saru-Neo-AnyNS-IP4" }, + { + "asn": 4242422458, + "prefix": "10.127.27.24/29", + "maxPrefixLength": 29, + "comment": "HUAJITECH-ANYCAST" + }, { "asn": 4242422464, "prefix": "10.127.127.0/24", @@ -739,6 +757,12 @@ "maxPrefixLength": 64, "comment": "HJTMESH-NET" }, + { + "asn": 4201270456, + "prefix": "fd10:127:27:20::/60", + "maxPrefixLength": 64, + "comment": "HUAJITECH-ANYCAST" + }, { "asn": 4201271111, "prefix": "fd10:127:e00f::/48", @@ -787,6 +811,12 @@ "maxPrefixLength": 64, "comment": "VILLISEK-NEO-V6" }, + { + "asn": 4242420458, + "prefix": "fd10:127:27:20::/60", + "maxPrefixLength": 64, + "comment": "HUAJITECH-ANYCAST" + }, { "asn": 4242421025, "prefix": "fd10:127:233:1000::/64", @@ -811,6 +841,12 @@ "maxPrefixLength": 64, "comment": "Saru-Neo-IP6" }, + { + "asn": 4242422458, + "prefix": "fd10:127:27:20::/60", + "maxPrefixLength": 64, + "comment": "HUAJITECH-ANYCAST" + }, { "asn": 4242422464, "prefix": "fd10:127:127::/48", diff --git a/roa46.json b/roa46.json index 9578331..1ec134d 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 142, - "generated": 1657520789, - "valid": 1658730389 + "counts": 148, + "generated": 1657534538, + "valid": 1658744138 }, "roas": [ { @@ -260,6 +260,11 @@ "prefix": "10.127.45.0/24", "maxLength": 29 }, + { + "asn": "AS4201270456", + "prefix": "10.127.27.24/29", + "maxLength": 29 + }, { "asn": "AS4201271111", "prefix": "10.127.111.0/24", @@ -300,6 +305,11 @@ "prefix": "10.127.38.32/27", "maxLength": 29 }, + { + "asn": "AS4242420458", + "prefix": "10.127.27.24/29", + "maxLength": 29 + }, { "asn": "AS4242421037", "prefix": "10.127.8.0/26", @@ -340,6 +350,11 @@ "prefix": "10.127.255.39/32", "maxLength": 32 }, + { + "asn": "AS4242422458", + "prefix": "10.127.27.24/29", + "maxLength": 29 + }, { "asn": "AS4242422464", "prefix": "10.127.127.0/24", @@ -615,6 +630,11 @@ "prefix": "fd10:127:45::/48", "maxLength": 64 }, + { + "asn": "AS4201270456", + "prefix": "fd10:127:27:20::/60", + "maxLength": 64 + }, { "asn": "AS4201271111", "prefix": "fd10:127:e00f::/48", @@ -655,6 +675,11 @@ "prefix": "fd10:127:308::/48", "maxLength": 64 }, + { + "asn": "AS4242420458", + "prefix": "fd10:127:27:20::/60", + "maxLength": 64 + }, { "asn": "AS4242421025", "prefix": "fd10:127:233:1000::/64", @@ -675,6 +700,11 @@ "prefix": "fd10:127:39::/48", "maxLength": 64 }, + { + "asn": "AS4242422458", + "prefix": "fd10:127:27:20::/60", + "maxLength": 64 + }, { "asn": "AS4242422464", "prefix": "fd10:127:127::/48", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index b209ecb..bd22592 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -51,6 +51,7 @@ route 10.127.80.0/24 max 29 as 4201270080; route 10.127.99.0/24 max 29 as 4201270099; route 10.127.186.0/24 max 29 as 4201270186; route 10.127.45.0/24 max 29 as 4201270456; +route 10.127.27.24/29 max 29 as 4201270456; route 10.127.111.0/24 max 29 as 4201271111; route 10.127.180.0/24 max 29 as 4201271877; route 10.127.149.224/27 max 29 as 4201272923; @@ -59,6 +60,7 @@ route 10.127.12.0/24 max 29 as 4242420140; route 10.127.17.0/24 max 29 as 4242420247; route 10.127.30.0/24 max 29 as 4242420288; route 10.127.38.32/27 max 29 as 4242420308; +route 10.127.27.24/29 max 29 as 4242420458; 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; @@ -67,6 +69,7 @@ route 10.127.21.0/24 max 29 as 4242422189; route 10.127.25.0/24 max 29 as 4242422189; 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; route 10.127.127.0/24 max 29 as 4242422464; route 10.127.127.127/32 max 32 as 4242422464; route 10.127.127.125/32 max 32 as 4242422464; @@ -122,6 +125,7 @@ route fd10:127:80::/48 max 64 as 4201270080; route fd10:127:99::/48 max 64 as 4201270099; route fd10:127:186::/48 max 64 as 4201270186; route fd10:127:45::/48 max 64 as 4201270456; +route fd10:127:27:20::/60 max 64 as 4201270456; route fd10:127:e00f::/48 max 64 as 4201271111; route fd10:127:1488::/48 max 64 as 4201271488; route fd10:127:1877::/48 max 64 as 4201271877; @@ -130,10 +134,12 @@ route fd10:127:88::/48 max 64 as 4201279999; route fd10:127:17::/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: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: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; route fd10:127:127:53::/64 max 64 as 4242422464; route fd10:127:53:53::/64 max 64 as 4242422464; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 58842d8..0b4279c 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -51,6 +51,7 @@ route 10.127.80.0/24 max 29 as 4201270080; route 10.127.99.0/24 max 29 as 4201270099; route 10.127.186.0/24 max 29 as 4201270186; route 10.127.45.0/24 max 29 as 4201270456; +route 10.127.27.24/29 max 29 as 4201270456; route 10.127.111.0/24 max 29 as 4201271111; route 10.127.180.0/24 max 29 as 4201271877; route 10.127.149.224/27 max 29 as 4201272923; @@ -59,6 +60,7 @@ route 10.127.12.0/24 max 29 as 4242420140; route 10.127.17.0/24 max 29 as 4242420247; route 10.127.30.0/24 max 29 as 4242420288; route 10.127.38.32/27 max 29 as 4242420308; +route 10.127.27.24/29 max 29 as 4242420458; 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; @@ -67,6 +69,7 @@ route 10.127.21.0/24 max 29 as 4242422189; route 10.127.25.0/24 max 29 as 4242422189; 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; route 10.127.127.0/24 max 29 as 4242422464; route 10.127.127.127/32 max 32 as 4242422464; route 10.127.127.125/32 max 32 as 4242422464; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index 479e1ff..87abdd6 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -46,6 +46,7 @@ route fd10:127:80::/48 max 64 as 4201270080; route fd10:127:99::/48 max 64 as 4201270099; route fd10:127:186::/48 max 64 as 4201270186; route fd10:127:45::/48 max 64 as 4201270456; +route fd10:127:27:20::/60 max 64 as 4201270456; route fd10:127:e00f::/48 max 64 as 4201271111; route fd10:127:1488::/48 max 64 as 4201271488; route fd10:127:1877::/48 max 64 as 4201271877; @@ -54,10 +55,12 @@ route fd10:127:88::/48 max 64 as 4201279999; route fd10:127:17::/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: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: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; route fd10:127:127:53::/64 max 64 as 4242422464; route fd10:127:53:53::/64 max 64 as 4242422464;