diff --git a/README.md b/README.md index 503f0c1..d1ec31d 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ | Staph | staph@aosc.io | Staph | | SteveYi | info@steveyi.net | steveyiyo | | SyllaBear | bear@koala.gq | | +| TsingYao | yujintong@126.com | @yujintong | | Clement VILLISEK | clement@villisek.fr | | | Yangfl Network | | | | Yukari | i@0x7f.cc | CharlesYang | @@ -80,6 +81,7 @@ | NeoNetwork | AS4201270021 | David Liu | FIXMIX-NEO | | NeoNetwork | AS4201270022 | lilydjwg | lilydjwg | | NeoNetwork | AS4201270030 | Yux | IWARP-NEO | +| NeoNetwork | AS4201270099 | TsingYao | TsingYao | | NeoNetwork | AS4201271111 | kskb | kskb | | NeoNetwork | AS4201271488 | SyllaBear | Polar Bear | | DN42 | AS4242420140 | Yangfl | Yangfl Network | @@ -139,6 +141,7 @@ | AS4201270020 | Edward_P | | AS4201270021 | fixmix | | AS4201270030 | IWarp | +| AS4201270099 | TsingYao | | AS4201271111 | KSKB-HK1 | | AS4242420140 | dfceaef | | AS4242420308 | VILLISEK | @@ -258,6 +261,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 | | | AS4201271111 | kskb | subnet | 10.127.111.0/24 | | | AS4201271111 | kskb | subnet | fd10:127:e00f::/48 | | | AS4201271488 | Bear | subnet | fd10:127:1488::/48 | | @@ -324,6 +329,7 @@ 10.127.64.0/24 10.127.66.0/24 10.127.89.0/24 +10.127.99.0/24 10.127.100.0/24 10.127.111.0/24 10.127.124.0/29 @@ -354,6 +360,7 @@ fd10:127:30::/48 fd10:127:41::/48 fd10:127:53::/48 fd10:127:64::/48 +fd10:127:99::/48 fd10:127:cc::/48 fd10:127:127::/48 fd10:127:233::/48 @@ -379,5 +386,5 @@ fd10:127:ffff:53::/64 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 8343 | 57193 | 12.73% | 87.27% | -| IPv6 | 7.9228e+28 | 2.8807e+25 | 7.9199e+28 | 0.04% | 99.96% | +| IPv4 | 65536 | 8599 | 56937 | 13.12% | 86.88% | +| IPv6 | 7.9228e+28 | 3.0015e+25 | 7.9198e+28 | 0.04% | 99.96% | diff --git a/dns/db.10.127 b/dns/db.10.127 index 851c14e..c01de56 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. ( - 36237769 ; Serial + 40419152 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -94,6 +94,9 @@ $TTL 3600 66 IN NS ns2.fixmix.neo. 66 IN NS ns3.fixmix.neo. +99 IN NS ns1.tsingyao.neo. +99 IN NS ns2.tsingyao.neo. + ; AUTOGENERATED ; rfc2317 diff --git a/dns/db.fd10.127 b/dns/db.fd10.127 index d63018a..1625215 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. ( - 36237769 ; Serial + 40419152 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -50,6 +50,9 @@ $TTL 3600 c.c.0.0 IN NS ns1.an.dn42. +9.9.0.0 IN NS ns1.tsingyao.neo. +9.9.0.0 IN NS ns2.tsingyao.neo. + ; AUTOGENERATED ; dnskey diff --git a/dns/neonetwork b/dns/neonetwork index e9dab7f..03df815 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -1,7 +1,7 @@ ; NeoNetwork DNS Record $TTL 3600 @ IN SOA root-dns.neo. root.neo. ( - 38612694 ; Serial + 40419152 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -133,6 +133,12 @@ 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 ; AUTOGENERATED diff --git a/neonetwork.json b/neonetwork.json index c04e4bd..4124b4d 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1627280515, - "valid": 1628490115 + "generated": 1627295193, + "valid": 1628504793 }, "people": { "Anillc": { @@ -954,6 +954,46 @@ } ] }, + "TsingYao": { + "info": { + "name": "TsingYao", + "contact": { + "email": "yujintong@126.com", + "telegram": "@yujintong", + "irc": "yujintong", + "github": "yujintong" + }, + "persona": { + "pgp": "DD515D58188FBD2F9AF484F8AD04D02E24AC52C9" + }, + "nic_hdl": "TSINGYAO" + }, + "asns": [ + { + "asn": 4201270099, + "owner": "TsingYao", + "name": "TsingYao", + "source": "NeoNetwork", + "description": "TsingYao NeoNetwork Network", + "routes": { + "ipv4": [ + { + "prefix": "10.127.99.0/24", + "maxLength": 29, + "netname": "TSINTYAO-NET4-NEOA" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:99::/48", + "maxLength": 64, + "netname": "TSINGYAO-NET6-NEOA" + } + ] + } + } + ] + }, "VILLISEK": { "info": { "name": "Clement VILLISEK", diff --git a/rfc8416.json b/rfc8416.json index e187b5b..abf6776 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -277,6 +277,12 @@ "maxPrefixLength": 29, "comment": "IWARP-NEO-IP4-NETWORK" }, + { + "asn": 4201270099, + "prefix": "10.127.99.0/24", + "maxPrefixLength": 29, + "comment": "TSINTYAO-NET4-NEOA" + }, { "asn": 4201271111, "prefix": "10.127.111.0/24", @@ -595,6 +601,12 @@ "maxPrefixLength": 64, "comment": "IWARP-NEO-IP6-NETWORK" }, + { + "asn": 4201270099, + "prefix": "fd10:127:99::/48", + "maxPrefixLength": 64, + "comment": "TSINGYAO-NET6-NEOA" + }, { "asn": 4201271111, "prefix": "fd10:127:e00f::/48", diff --git a/roa46.json b/roa46.json index 7560324..5d82f4a 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 113, - "generated": 1627280515, - "valid": 1628490115 + "counts": 115, + "generated": 1627295193, + "valid": 1628504793 }, "roas": [ { @@ -230,6 +230,11 @@ "prefix": "10.127.30.0/24", "maxLength": 29 }, + { + "asn": "AS4201270099", + "prefix": "10.127.99.0/24", + "maxLength": 29 + }, { "asn": "AS4201271111", "prefix": "10.127.111.0/24", @@ -495,6 +500,11 @@ "prefix": "fd10:127:30::/48", "maxLength": 64 }, + { + "asn": "AS4201270099", + "prefix": "fd10:127:99::/48", + "maxLength": 64 + }, { "asn": "AS4201271111", "prefix": "fd10:127:e00f::/48", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 2817289..5b7ca3a 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -45,6 +45,7 @@ route 10.127.8.128/29 max 29 as 4201270020; route 10.127.66.0/24 max 29 as 4201270021; route 10.127.8.136/29 max 29 as 4201270022; route 10.127.30.0/24 max 29 as 4201270030; +route 10.127.99.0/24 max 29 as 4201270099; route 10.127.111.0/24 max 29 as 4201271111; route 10.127.12.0/24 max 29 as 4242420140; route 10.127.60.0/24 max 29 as 4242420247; @@ -98,6 +99,7 @@ route fd10:127:2f2f::/48 max 64 as 4201270020; route fd10:127:aa66::/48 max 64 as 4201270021; route fd10:127:ba7e::/48 max 64 as 4201270022; route fd10:127:30::/48 max 64 as 4201270030; +route fd10:127:99::/48 max 64 as 4201270099; route fd10:127:e00f::/48 max 64 as 4201271111; route fd10:127:1488::/48 max 64 as 4201271488; route fd10:127:9898::/48 max 64 as 4242420247; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index b9e99d1..9fa24fc 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -45,6 +45,7 @@ route 10.127.8.128/29 max 29 as 4201270020; route 10.127.66.0/24 max 29 as 4201270021; route 10.127.8.136/29 max 29 as 4201270022; route 10.127.30.0/24 max 29 as 4201270030; +route 10.127.99.0/24 max 29 as 4201270099; route 10.127.111.0/24 max 29 as 4201271111; route 10.127.12.0/24 max 29 as 4242420140; route 10.127.60.0/24 max 29 as 4242420247; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index 7ea60c2..a1d0001 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -34,6 +34,7 @@ route fd10:127:2f2f::/48 max 64 as 4201270020; route fd10:127:aa66::/48 max 64 as 4201270021; route fd10:127:ba7e::/48 max 64 as 4201270022; route fd10:127:30::/48 max 64 as 4201270030; +route fd10:127:99::/48 max 64 as 4201270099; route fd10:127:e00f::/48 max 64 as 4201271111; route fd10:127:1488::/48 max 64 as 4201271488; route fd10:127:9898::/48 max 64 as 4242420247;