diff --git a/README.md b/README.md index 2ad6158..d3a7dc6 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ | Staph | staph@aosc.io | Staph | | SteveYi | info@steveyi.net | steveyiyo | | SyllaBear | bear@koala.gq | | -| TsingYao | yujintong@126.com | @yujintong | +| TsingYao | yujintong@126.com | yujintong | | Clement VILLISEK | clement@villisek.fr | | | Yangfl Network | | | | Yukari | i@0x7f.cc | CharlesYang | @@ -81,7 +81,7 @@ | NeoNetwork | AS4201270021 | David Liu | FIXMIX-NEO | | NeoNetwork | AS4201270022 | lilydjwg | lilydjwg | | NeoNetwork | AS4201270030 | Yux | IWARP-NEO | -| NeoNetwork | AS4201270099 | TsingYao | TsingYao | +| NeoNetwork | AS4201270099 | TsingYao | AS-NEO-TSINGYAO | | NeoNetwork | AS4201271111 | kskb | kskb | | NeoNetwork | AS4201271488 | SyllaBear | Polar Bear | | DN42 | AS4242420140 | Yangfl | Yangfl Network | @@ -100,6 +100,7 @@ | DN42 | AS4242422526 | Anillc | ANILLC-AS | | DN42 | AS4242423088 | SUNNET | SUNNET | | DN42 | AS4242423618 | JerryXiao | Jerry AS | +| DN42 | AS4242423699 | TsingYao | AS-NEO-TSINGYAO | ## Node table @@ -261,8 +262,8 @@ | AS4201270022 | lilydjwg | subnet | fd10:127:ba7e::/48 | | | AS4201270030 | IWARP-NEO-IP4-NETWORK | subnet | 10.127.30.0/24 | | | AS4201270030 | IWARP-NEO-IP6-NETWORK | subnet | fd10:127:30::/48 | | -| AS4201270099 | TSINTYAO-NET4-NEOA | subnet | 10.127.99.0/24 | | -| AS4201270099 | TSINGYAO-NET6-NEOA | subnet | fd10:127:99::/48 | | +| AS4201270099 | TSINTYAO-NEO-NET4 | subnet | 10.127.99.0/24 | | +| AS4201270099 | TSINGYAO-NEO-NET6 | subnet | fd10:127:99::/48 | | | AS4201271111 | kskb | subnet | 10.127.111.0/24 | | | AS4201271111 | kskb | subnet | fd10:127:e00f::/48 | | | AS4201271488 | Bear | subnet | fd10:127:1488::/48 | | @@ -297,6 +298,8 @@ | AS4242423618 | anycast-recur-4 | loopback | 10.127.255.54/32 | | | AS4242423618 | anycast-auth-6 | loopback | fd10:127:ffff:53::/64 | | | AS4242423618 | anycast-recur-6 | loopback | fd10:127:53:53::/64 | fd10:127:53::/48 | +| AS4242423699 | TSINTYAO-NEO-NET4 | subnet | 10.127.99.0/24 | | +| AS4242423699 | TSINGYAO-NEO-NET6 | subnet | fd10:127:99::/48 | | ## Used CIDR Range diff --git a/dns/neonetwork b/dns/neonetwork index 8d17fa0..ec969af 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -1,7 +1,7 @@ ; NeoNetwork DNS Record $TTL 3600 @ IN SOA root-dns.neo. root.neo. ( - 40781537 ; Serial + 41617225 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -136,12 +136,18 @@ ns1.iwarp IN AAAA fd10:127:30:53::1 an IN NS ns1.an.dn42. -tsingyao IN NS ns1.tsingyao -tsingyao IN NS ns2.tsingyao -ns1.tsingyao IN A 10.127.99.1 -ns1.tsingyao IN AAAA fd10:127:99:1::1 -ns2.tsingyao IN A 10.127.99.2 -ns2.tsingyao IN AAAA fd10:127:99:2::1 +dnswol IN NS ns1.dnswol +dnswol IN NS ns2.dnswol +dnswol IN DS 53285 14 1 88971c954d18aa1224a1b01e54c81dc6cd71a86e +dnswol IN DS 53285 14 2 d782d7d9afec4e20082913fe2f23fd9e2c0e0ad7206fa389cadc4050d11b7e80 +dnswol IN DS 53285 14 4 1c0fcf050b4000de0648a8e25a8e809e35b7501c846ad785f07e2c4296610c305d217cb5113c34f937f62780e82b5e98 +ns1.dnswol IN A 10.127.99.50 +ns1.dnswol IN AAAA fd10:127:99::32:1 +ns2.dnswol IN A 10.127.99.51 +ns2.dnswol IN AAAA fd10:127:99::33:1 + +tsingyao IN NS ns1.dnswol +tsingyao IN NS ns2.dnswol ; AUTOGENERATED diff --git a/neonetwork.json b/neonetwork.json index e045094..913b084 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1628490101, - "valid": 1629699701 + "generated": 1628493274, + "valid": 1629702874 }, "people": { "Anillc": { @@ -957,10 +957,13 @@ "TsingYao": { "info": { "name": "TsingYao", + "babel": [ + "zh-N", + "en" + ], "contact": { "email": "yujintong@126.com", - "telegram": "@yujintong", - "irc": "yujintong", + "telegram": "yujintong", "github": "yujintong" }, "persona": { @@ -972,22 +975,45 @@ { "asn": 4201270099, "owner": "TsingYao", - "name": "TsingYao", + "name": "AS-NEO-TSINGYAO", "source": "NeoNetwork", - "description": "TsingYao NeoNetwork Network", + "description": "TsingYao Neo Network", "routes": { "ipv4": [ { "prefix": "10.127.99.0/24", "maxLength": 29, - "netname": "TSINTYAO-NET4-NEOA" + "netname": "TSINTYAO-NEO-NET4" } ], "ipv6": [ { "prefix": "fd10:127:99::/48", "maxLength": 64, - "netname": "TSINGYAO-NET6-NEOA" + "netname": "TSINGYAO-NEO-NET6" + } + ] + } + }, + { + "asn": 4242423699, + "owner": "TsingYao", + "name": "AS-NEO-TSINGYAO", + "source": "DN42", + "description": "TsingYao Neo Network", + "routes": { + "ipv4": [ + { + "prefix": "10.127.99.0/24", + "maxLength": 29, + "netname": "TSINTYAO-NEO-NET4" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:99::/48", + "maxLength": 64, + "netname": "TSINGYAO-NEO-NET6" } ] } diff --git a/rfc8416.json b/rfc8416.json index ead3413..acf0dc3 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -281,7 +281,7 @@ "asn": 4201270099, "prefix": "10.127.99.0/24", "maxPrefixLength": 29, - "comment": "TSINTYAO-NET4-NEOA" + "comment": "TSINTYAO-NEO-NET4" }, { "asn": 4201271111, @@ -397,6 +397,12 @@ "maxPrefixLength": 32, "comment": "anycast-recur-4" }, + { + "asn": 4242423699, + "prefix": "10.127.99.0/24", + "maxPrefixLength": 29, + "comment": "TSINTYAO-NEO-NET4" + }, { "asn": 38173, "prefix": "fd10:127:ee11::/48", @@ -605,7 +611,7 @@ "asn": 4201270099, "prefix": "fd10:127:99::/48", "maxPrefixLength": 64, - "comment": "TSINGYAO-NET6-NEOA" + "comment": "TSINGYAO-NEO-NET6" }, { "asn": 4201271111, @@ -696,6 +702,12 @@ "prefix": "fd10:127:53:53::/64", "maxPrefixLength": 64, "comment": "anycast-recur-6" + }, + { + "asn": 4242423699, + "prefix": "fd10:127:99::/48", + "maxPrefixLength": 64, + "comment": "TSINGYAO-NEO-NET6" } ] } diff --git a/roa46.json b/roa46.json index 1324644..2b26ceb 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 115, - "generated": 1628490101, - "valid": 1629699701 + "counts": 117, + "generated": 1628493273, + "valid": 1629702873 }, "roas": [ { @@ -330,6 +330,11 @@ "prefix": "10.127.255.54/32", "maxLength": 32 }, + { + "asn": "AS4242423699", + "prefix": "10.127.99.0/24", + "maxLength": 29 + }, { "asn": "AS38173", "prefix": "fd10:127:ee11::/48", @@ -579,6 +584,11 @@ "asn": "AS4242423618", "prefix": "fd10:127:53:53::/64", "maxLength": 64 + }, + { + "asn": "AS4242423699", + "prefix": "fd10:127:99::/48", + "maxLength": 64 } ] } \ No newline at end of file diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 86f7c35..b09f919 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -65,6 +65,7 @@ route 10.127.20.0/24 max 29 as 4242422526; route 10.127.11.0/24 max 29 as 4242423088; route 10.127.255.53/32 max 32 as 4242423618; route 10.127.255.54/32 max 32 as 4242423618; +route 10.127.99.0/24 max 29 as 4242423699; route fd10:127:ee11::/48 max 64 as 38173; route fd10:127:233::/48 max 64 as 140913; route fd10:127:ee11::/48 max 64 as 140936; @@ -114,4 +115,5 @@ route fd10:127:53:53::/64 max 64 as 4242422464; route fd10:127:cc::/48 max 64 as 4242422526; route fd10:127:ee11::/48 max 64 as 4242423088; route fd10:127:ffff:53::/64 max 64 as 4242423618; -route fd10:127:53:53::/64 max 64 as 4242423618; \ No newline at end of file +route fd10:127:53:53::/64 max 64 as 4242423618; +route fd10:127:99::/48 max 64 as 4242423699; \ No newline at end of file diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 9eda052..5e1caf0 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -64,4 +64,5 @@ route 10.127.255.54/32 max 32 as 4242422464; route 10.127.20.0/24 max 29 as 4242422526; route 10.127.11.0/24 max 29 as 4242423088; route 10.127.255.53/32 max 32 as 4242423618; -route 10.127.255.54/32 max 32 as 4242423618; \ No newline at end of file +route 10.127.255.54/32 max 32 as 4242423618; +route 10.127.99.0/24 max 29 as 4242423699; \ No newline at end of file diff --git a/roa6_bird2.conf b/roa6_bird2.conf index b2d5843..bddb0ca 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -49,4 +49,5 @@ route fd10:127:53:53::/64 max 64 as 4242422464; route fd10:127:cc::/48 max 64 as 4242422526; route fd10:127:ee11::/48 max 64 as 4242423088; route fd10:127:ffff:53::/64 max 64 as 4242423618; -route fd10:127:53:53::/64 max 64 as 4242423618; \ No newline at end of file +route fd10:127:53:53::/64 max 64 as 4242423618; +route fd10:127:99::/48 max 64 as 4242423699; \ No newline at end of file