diff --git a/README.md b/README.md index 4083753..249b458 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ | Source | ASN | Owner | Name | |------------|--------------|---------------|-----------------------------------------------------------------| +| Internet | AS17830 | David Liu | POTATO-AS-AP | | Internet | AS38173 | SUNNET | SUNNET | | Internet | AS134098 | licson | Licson Internal Network | | Internet | AS140913 | magicneko | Koishi Network(aka Hentai Network) | @@ -79,7 +80,7 @@ | NeoNetwork | AS4201270018 | caxap | caxap Network | | NeoNetwork | AS4201270019 | Cupkappu | Cupkappu | | NeoNetwork | AS4201270020 | Edward_P | Edward_P | -| NeoNetwork | AS4201270021 | David Liu | FIXMIX-NEO | +| NeoNetwork | AS4201270021 | David Liu | POTATO-NEO | | NeoNetwork | AS4201270022 | lilydjwg | lilydjwg | | NeoNetwork | AS4201270030 | Yux | IWARP-NEO | | NeoNetwork | AS4201270099 | TsingYao | AS-NEO-TSINGYAO | @@ -97,7 +98,7 @@ | DN42 | AS4242421214 | SteveYi | Yi-Network | | DN42 | AS4242421331 | Yukari | Niantic Network | | DN42 | AS4242421332 | Yukari | Niantic Network CN | -| DN42 | AS4242421876 | David Liu | FIXMIX-42 | +| DN42 | AS4242421876 | David Liu | POTATO-42 | | DN42 | AS4242422189 | iEdon | IEDON-NET-AS | | DN42 | AS4242422464 | Yura | Yura Network | | DN42 | AS4242422526 | Anillc | ANILLC-AS | @@ -143,7 +144,7 @@ | AS4201270019 | Cupkappu-JP | | AS4201270019 | Cupkappu-HK2 | | AS4201270020 | Edward_P | -| AS4201270021 | fixmix | +| AS4201270021 | PotatoNet | | AS4201270030 | IWarp | | AS4201270099 | TsingYao | | AS4201271111 | KSKB-HK1 | @@ -186,6 +187,8 @@ | ASN | Name | Type | Prefix | Supernet | |--------------|--------------------------------------------------------------------|----------|-------------------------|-------------------| +| AS17830 | POTATO-NEO-NET4-A | subnet | 10.127.66.0/24 | | +| AS17830 | POTATO-NEO-NET6-A | subnet | fd10:127:aa66::/48 | | | AS38173 | SUNNET | subnet | 10.127.11.0/24 | | | AS38173 | SUNNET | subnet | fd10:127:ee11::/48 | | | AS134098 | LICSON-NET-SUBALLOC-1 | subnet | 10.127.14.0/23 | | @@ -201,8 +204,8 @@ | AS141776 | BAOSHUO-NEO-V6-1 | subnet | fd10:127:17::/48 | | | AS207268 | IX42-LAS-4 | subnet | 10.127.131.0/24 | | | AS207268 | IX42-LAS-6 | subnet | fd10:127:1300::/48 | | -| AS211876 | FIXMIX-NET4-NEOA | subnet | 10.127.66.0/24 | | -| AS211876 | FIXMIX-NET6-NEOA | subnet | fd10:127:aa66::/48 | | +| AS211876 | POTATO-NEO-NET4-A | subnet | 10.127.66.0/24 | | +| AS211876 | POTATO-NEO-NET6-A | subnet | fd10:127:aa66::/48 | | | AS213262 | Moe | subnet | fd10:127:3262::/64 | | | AS4201270000 | RESERVED | subnet | 10.127.0.0/24 | | | AS4201270000 | MAIN | subnet | 10.127.1.0/24 | | @@ -256,8 +259,8 @@ | AS4201270019 | cupkappu | subnet | 10.127.19.0/24 | | | AS4201270020 | Edward_P-Ezpro | subnet | 10.127.8.128/29 | | | AS4201270020 | Edward_P-Ezpro-V6 | subnet | fd10:127:2f2f::/48 | | -| AS4201270021 | FIXMIX-NET4-NEOA | subnet | 10.127.66.0/24 | | -| AS4201270021 | FIXMIX-NET6-NEOA | subnet | fd10:127:aa66::/48 | | +| AS4201270021 | POTATO-NEO-NET4-A | subnet | 10.127.66.0/24 | | +| AS4201270021 | POTATO-NEO-NET6-A | subnet | fd10:127:aa66::/48 | | | AS4201270022 | lilydjwg | subnet | 10.127.8.136/29 | | | AS4201270022 | lilydjwg | subnet | fd10:127:ba7e::/48 | | | AS4201270030 | IWARP-NEO-IP4-NETWORK | subnet | 10.127.30.0/24 | | @@ -283,8 +286,8 @@ | AS4242421214 | Yi Global VPN | subnet | 10.127.124.0/29 | | | AS4242421332 | NetUnion-IPv4 | subnet | 10.127.132.0/24 | | | AS4242421332 | NetUnion-IPv6 | subnet | fd10:127:1332::/48 | | -| AS4242421876 | FIXMIX-NET4-NEOA | subnet | 10.127.66.0/24 | | -| AS4242421876 | FIXMIX-NET6-NEOA | subnet | fd10:127:aa66::/48 | | +| AS4242421876 | POTATO-NEO-NET4-A | subnet | 10.127.66.0/24 | | +| AS4242421876 | POTATO-NEO-NET6-A | subnet | fd10:127:aa66::/48 | | | AS4242422189 | IEDON-NET | subnet | 10.127.21.0/24 | | | AS4242422189 | IEDON-NET | subnet | 10.127.25.0/24 | | | AS4242422464 | Yura Moe NET | subnet | 10.127.127.0/24 | | diff --git a/dns/db.10.127 b/dns/db.10.127 index 0236595..1a79189 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. ( - 40790003 ; Serial + 42720039 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -92,9 +92,10 @@ $TTL 3600 127 IN NS ns1.yura.dn42. 127 IN NS ns2.yura.dn42. -66 IN NS ns1.fixmix.neo. -66 IN NS ns2.fixmix.neo. -66 IN NS ns3.fixmix.neo. +66 IN NS ns1.potato.neo. +66 IN NS ns2.potato.neo. +66 IN NS ns3.potato.neo. +66 IN DS 2356 7 2 46A410B6D465D60D2AEBE80135E7F7374CDA51F70AFEEA43445203509B118E66 99 IN NS ns1.tsingyao.neo. 99 IN NS ns2.tsingyao.neo. diff --git a/dns/db.fd10.127 b/dns/db.fd10.127 index 7c6a091..90eb11b 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. ( - 40781537 ; Serial + 42720039 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -44,9 +44,10 @@ $TTL 3600 1.1.e.e IN NS ns1.sun.dn42. -6.6.a.a IN NS ns1.fixmix.neo. -6.6.a.a IN NS ns2.fixmix.neo. -6.6.a.a IN NS ns3.fixmix.neo. +6.6.a.a IN NS ns1.potato.neo. +6.6.a.a IN NS ns2.potato.neo. +6.6.a.a IN NS ns3.potato.neo. +6.6.a.a IN DS 31105 7 2 CA2C41EA47978F1728FE49778CDC2882AD2725E23081AE72F7D2ECE5FF95E20D 8.8.4.1 IN NS ns1.bear.neo. diff --git a/dns/neonetwork b/dns/neonetwork index 9fda7fb..cd27bb0 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -1,7 +1,7 @@ ; NeoNetwork DNS Record $TTL 3600 @ IN SOA root-dns.neo. root.neo. ( - 42525772 ; Serial + 42720039 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -111,18 +111,24 @@ ns.yura IN AAAA fd10:127:127:53:: ns1.yura IN AAAA fd10:127:127:53a::1 ns2.yura IN AAAA fd10:127:127:53b::1 -fixmix IN NS ns1.fixmix -fixmix IN NS ns2.fixmix -fixmix IN NS ns3.fixmix -david IN NS ns1.fixmix -david IN NS ns2.fixmix -david IN NS ns3.fixmix -ns1.fixmix IN A 10.127.66.59 -ns2.fixmix IN A 10.127.66.54 -ns3.fixmix IN A 10.127.66.52 -ns1.fixmix IN AAAA fd10:127:aa66:11:: -ns2.fixmix IN AAAA fd10:127:aa66:21:: -ns3.fixmix IN AAAA fd10:127:aa66:31:: +potato IN NS ns1.potato +potato IN NS ns2.potato +potato IN NS ns3.potato +potato IN DS 6841 7 2 B02CE6960F3FFC54AAAEA4FA26F050D911A7049158B0B35350E74CC78F04E183 +fixmix IN NS ns1.potato +fixmix IN NS ns2.potato +fixmix IN NS ns3.potato +fixmix IN DS 5223 7 2 BF26524942A4FAFA08C0DDF71C2E56EDC3BC82EDBA8F86B0DF6070B378919840 +david IN NS ns1.potato +david IN NS ns2.potato +david IN NS ns3.potato +david IN DS 14533 7 2 914D786DACF1C5D2C953515A425FB4BA4D644D7DECA7B6B60BBC487323479039 +ns1.potato IN A 10.127.66.59 +ns2.potato IN A 10.127.66.54 +ns3.potato IN A 10.127.66.52 +ns1.potato IN AAAA fd10:127:aa66:1010::1 +ns2.potato IN AAAA fd10:127:aa66:2010::1 +ns3.potato IN AAAA fd10:127:aa66:3010::1 bear IN NS ns1.bear koala IN NS ns1.bear diff --git a/neonetwork.json b/neonetwork.json index 6d025d6..1b8fdea 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1629566789, - "valid": 1630776389 + "generated": 1629596082, + "valid": 1630805682 }, "people": { "Anillc": { @@ -114,30 +114,53 @@ "github": "p0tat05" }, "persona": { - "pgp": "11BA9B106D0DF5E6A1C4BC180641F2177A5530C0" + "pgp": "F69228A3DADECB2BFCEE6EB38EC04651740E765D" }, "nic_hdl": "DAVID-LIU" }, "asns": [ { - "asn": 211876, + "asn": 17830, "owner": "David Liu", - "name": "FIXMIX-GEN", + "name": "POTATO-AS-AP", "source": "Internet", - "description": "fixmix Global Experimental Network", + "description": "David Liu aka PotatoNet", "routes": { "ipv4": [ { "prefix": "10.127.66.0/24", "maxLength": 29, - "netname": "FIXMIX-NET4-NEOA" + "netname": "POTATO-NEO-NET4-A" } ], "ipv6": [ { "prefix": "fd10:127:aa66::/48", "maxLength": 64, - "netname": "FIXMIX-NET6-NEOA" + "netname": "POTATO-NEO-NET6-A" + } + ] + } + }, + { + "asn": 211876, + "owner": "David Liu", + "name": "FIXMIX-GEN", + "source": "Internet", + "description": "fixmix Technologies", + "routes": { + "ipv4": [ + { + "prefix": "10.127.66.0/24", + "maxLength": 29, + "netname": "POTATO-NEO-NET4-A" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:aa66::/48", + "maxLength": 64, + "netname": "POTATO-NEO-NET6-A" } ] } @@ -145,22 +168,22 @@ { "asn": 4201270021, "owner": "David Liu", - "name": "FIXMIX-NEO", + "name": "POTATO-NEO", "source": "NeoNetwork", - "description": "fixmix NeoNetwork Network", + "description": "PotatoNet @ NeoNetwork", "routes": { "ipv4": [ { "prefix": "10.127.66.0/24", "maxLength": 29, - "netname": "FIXMIX-NET4-NEOA" + "netname": "POTATO-NEO-NET4-A" } ], "ipv6": [ { "prefix": "fd10:127:aa66::/48", "maxLength": 64, - "netname": "FIXMIX-NET6-NEOA" + "netname": "POTATO-NEO-NET6-A" } ] } @@ -168,22 +191,22 @@ { "asn": 4242421876, "owner": "David Liu", - "name": "FIXMIX-42", + "name": "POTATO-42", "source": "DN42", - "description": "fixmix DN42 Network", + "description": "PotatoNet @ DN42", "routes": { "ipv4": [ { "prefix": "10.127.66.0/24", "maxLength": 29, - "netname": "FIXMIX-NET4-NEOA" + "netname": "POTATO-NEO-NET4-A" } ], "ipv6": [ { "prefix": "fd10:127:aa66::/48", "maxLength": 64, - "netname": "FIXMIX-NET6-NEOA" + "netname": "POTATO-NEO-NET6-A" } ] } diff --git a/rfc8416.json b/rfc8416.json index be122b3..9acb031 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -7,6 +7,12 @@ "locallyAddedAssertions": { "bgpsecAssertions": [], "prefixAssertions": [ + { + "asn": 17830, + "prefix": "10.127.66.0/24", + "maxPrefixLength": 29, + "comment": "POTATO-NEO-NET4-A" + }, { "asn": 38173, "prefix": "10.127.11.0/24", @@ -59,7 +65,7 @@ "asn": 211876, "prefix": "10.127.66.0/24", "maxPrefixLength": 29, - "comment": "FIXMIX-NET4-NEOA" + "comment": "POTATO-NEO-NET4-A" }, { "asn": 4201270000, @@ -245,7 +251,7 @@ "asn": 4201270021, "prefix": "10.127.66.0/24", "maxPrefixLength": 29, - "comment": "FIXMIX-NET4-NEOA" + "comment": "POTATO-NEO-NET4-A" }, { "asn": 4201270022, @@ -329,7 +335,7 @@ "asn": 4242421876, "prefix": "10.127.66.0/24", "maxPrefixLength": 29, - "comment": "FIXMIX-NET4-NEOA" + "comment": "POTATO-NEO-NET4-A" }, { "asn": 4242422189, @@ -397,6 +403,12 @@ "maxPrefixLength": 29, "comment": "TSINTYAO-NEO-NET4" }, + { + "asn": 17830, + "prefix": "fd10:127:aa66::/48", + "maxPrefixLength": 64, + "comment": "POTATO-NEO-NET6-A" + }, { "asn": 38173, "prefix": "fd10:127:ee11::/48", @@ -443,7 +455,7 @@ "asn": 211876, "prefix": "fd10:127:aa66::/48", "maxPrefixLength": 64, - "comment": "FIXMIX-NET6-NEOA" + "comment": "POTATO-NEO-NET6-A" }, { "asn": 213262, @@ -587,7 +599,7 @@ "asn": 4201270021, "prefix": "fd10:127:aa66::/48", "maxPrefixLength": 64, - "comment": "FIXMIX-NET6-NEOA" + "comment": "POTATO-NEO-NET6-A" }, { "asn": 4201270022, @@ -665,7 +677,7 @@ "asn": 4242421876, "prefix": "fd10:127:aa66::/48", "maxPrefixLength": 64, - "comment": "FIXMIX-NET6-NEOA" + "comment": "POTATO-NEO-NET6-A" }, { "asn": 4242422464, diff --git a/roa46.json b/roa46.json index ab49477..590ec9e 100644 --- a/roa46.json +++ b/roa46.json @@ -1,10 +1,15 @@ { "metadata": { - "counts": 118, - "generated": 1629566789, - "valid": 1630776389 + "counts": 120, + "generated": 1629596082, + "valid": 1630805682 }, "roas": [ + { + "asn": "AS17830", + "prefix": "10.127.66.0/24", + "maxLength": 29 + }, { "asn": "AS38173", "prefix": "10.127.11.0/24", @@ -330,6 +335,11 @@ "prefix": "10.127.99.0/24", "maxLength": 29 }, + { + "asn": "AS17830", + "prefix": "fd10:127:aa66::/48", + "maxLength": 64 + }, { "asn": "AS38173", "prefix": "fd10:127:ee11::/48", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 4e9d2e9..210e3af 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -1,5 +1,6 @@ # NeoNetwork ROA tool +route 10.127.66.0/24 max 29 as 17830; route 10.127.11.0/24 max 29 as 38173; route 10.127.14.0/23 max 29 as 134098; route 10.127.4.0/24 max 29 as 140913; @@ -65,6 +66,7 @@ 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:aa66::/48 max 64 as 17830; 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; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 21cf80c..0fe4779 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -1,5 +1,6 @@ # NeoNetwork ROA tool +route 10.127.66.0/24 max 29 as 17830; route 10.127.11.0/24 max 29 as 38173; route 10.127.14.0/23 max 29 as 134098; route 10.127.4.0/24 max 29 as 140913; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index 68554bc..ebaf15d 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -1,5 +1,6 @@ # NeoNetwork ROA tool +route fd10:127:aa66::/48 max 64 as 17830; 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;