diff --git a/README.md b/README.md index 0724144..9934756 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ | Internet | AS141706 | magicneko | Koishi Network(=4201270005) | | Internet | AS207268 | Yukari | Strategic Explorations (IX) | | Internet | AS209557 | SteveYi | Yi-Network | -| Internet | AS211876 | David Liu | FIXMIX-AS | +| Internet | AS211876 | David Liu | FIXMIX-GEN | | Internet | AS213262 | Moe | Moe | | NeoNetwork | AS4201270000 | Neo_Chen | NeoNetwork Origin | | NeoNetwork | AS4201270001 | septs | NiceLabs Exchange | @@ -70,7 +70,7 @@ | NeoNetwork | AS4201270018 | caxap | caxap Network | | NeoNetwork | AS4201270019 | Cupkappu | Cupkappu | | NeoNetwork | AS4201270020 | Edward_P | Edward_P | -| NeoNetwork | AS4201270021 | David Liu | FIXMIX-AS-NEONETWORK | +| NeoNetwork | AS4201270021 | David Liu | FIXMIX-NEO | | NeoNetwork | AS4201270022 | lilydjwg | lilydjwg | | DN42 | AS4242420140 | Yangfl | Yangfl Network | | DN42 | AS4242420308 | VILLISEK | VILLISEK | @@ -78,7 +78,7 @@ | DN42 | AS4242421025 | icecat | NextMoe Neo-Network Intermediate Access Project | | DN42 | AS4242421037 | LibreHouse | LibreHouse | | DN42 | AS4242421214 | SteveYi | Yi-Network | -| DN42 | AS4242421876 | David Liu | FIXMIX-AS-DN42 | +| DN42 | AS4242421876 | David Liu | FIXMIX-42 | | DN42 | AS4242422189 | iEdon | IEDON-NET-AS | | DN42 | AS4242422464 | Yura | Yura Network | | DN42 | AS4242423088 | SUNNET | SUNNET | @@ -172,8 +172,8 @@ | AS141706 | MagicNeko-CN office VPN+IX Node(name:liqingge) | subnet | fd10:127:233:1c3a::/64 | fd10:127:233::/48 | | AS207268 | IX42-LAS-4 | subnet | 10.127.131.0/24 | | | AS207268 | IX42-LAS-6 | subnet | fd10:127:1300::/48 | | -| AS211876 | FIXMIX-NET-NEOV4A | subnet | 10.127.66.0/24 | | -| AS211876 | FIXMIX-NET-NEOV6A | subnet | fd10:127:aa66::/48 | | +| AS211876 | FIXMIX-NET4-NEOA | subnet | 10.127.66.0/24 | | +| AS211876 | FIXMIX-NET6-NEOA | subnet | fd10:127:aa66::/48 | | | AS213262 | Moe | subnet | fd10:127:3262::/64 | | | AS4201270000 | RESERVED | subnet | 10.127.0.0/24 | | | AS4201270000 | CROOM | subnet | 10.127.1.0/24 | | @@ -226,8 +226,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-NET-NEOV4A | subnet | 10.127.66.0/24 | | -| AS4201270021 | FIXMIX-NET-NEOV6A | subnet | fd10:127:aa66::/48 | | +| AS4201270021 | FIXMIX-NET4-NEOA | subnet | 10.127.66.0/24 | | +| AS4201270021 | FIXMIX-NET6-NEOA | subnet | fd10:127:aa66::/48 | | | AS4201270022 | lilydjwg | subnet | 10.127.8.136/29 | | | AS4201270022 | lilydjwg | subnet | fd10:127:ba7e::/48 | | | AS4242420140 | dfceaef NET | subnet | 10.127.12.0/24 | | @@ -236,8 +236,8 @@ | 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 | | -| AS4242421876 | FIXMIX-NET-NEOV4A | subnet | 10.127.66.0/24 | | -| AS4242421876 | FIXMIX-NET-NEOV6A | subnet | fd10:127:aa66::/48 | | +| AS4242421876 | FIXMIX-NET4-NEOA | subnet | 10.127.66.0/24 | | +| AS4242421876 | FIXMIX-NET6-NEOA | 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 ee2abc3..a5049e5 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. ( - 31818820 ; Serial + 33366682 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -81,6 +81,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. + ; AUTOGENERATED ; rfc2317 diff --git a/dns/db.fd10.127 b/dns/db.fd10.127 index 8905816..1e7b44f 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. ( - 31818820 ; Serial + 33366682 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -39,3 +39,7 @@ $TTL 3600 7.2.1.0 IN NS ns2.yura.dn42. 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. diff --git a/dns/neonetwork b/dns/neonetwork index 079414f..10ac7c6 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -1,7 +1,7 @@ ; NeoNetwork DNS Record $TTL 3600 @ IN SOA root-dns.neo. root.neo. ( - 32391630 ; Serial + 33366682 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -103,3 +103,16 @@ ns.yura IN A 10.127.127.125 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:: diff --git a/neonetwork.json b/neonetwork.json index 06edab4..0b1034e 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1620023136, - "valid": 1621232736 + "generated": 1620242734, + "valid": 1621452334 }, "people": { "Cupkappu": { @@ -348,7 +348,7 @@ { "asn": 211876, "owner": "David Liu", - "name": "FIXMIX-AS", + "name": "FIXMIX-GEN", "source": "Internet", "description": "fixmix Global Experimental Network", "routes": { @@ -356,14 +356,14 @@ { "prefix": "10.127.66.0/24", "maxLength": 29, - "netname": "FIXMIX-NET-NEOV4A" + "netname": "FIXMIX-NET4-NEOA" } ], "ipv6": [ { "prefix": "fd10:127:aa66::/48", "maxLength": 64, - "netname": "FIXMIX-NET-NEOV6A" + "netname": "FIXMIX-NET6-NEOA" } ] } @@ -371,7 +371,7 @@ { "asn": 4201270021, "owner": "David Liu", - "name": "FIXMIX-AS-NEONETWORK", + "name": "FIXMIX-NEO", "source": "NeoNetwork", "description": "fixmix NeoNetwork Network", "routes": { @@ -379,14 +379,14 @@ { "prefix": "10.127.66.0/24", "maxLength": 29, - "netname": "FIXMIX-NET-NEOV4A" + "netname": "FIXMIX-NET4-NEOA" } ], "ipv6": [ { "prefix": "fd10:127:aa66::/48", "maxLength": 64, - "netname": "FIXMIX-NET-NEOV6A" + "netname": "FIXMIX-NET6-NEOA" } ] } @@ -394,7 +394,7 @@ { "asn": 4242421876, "owner": "David Liu", - "name": "FIXMIX-AS-DN42", + "name": "FIXMIX-42", "source": "DN42", "description": "fixmix DN42 Network", "routes": { @@ -402,14 +402,14 @@ { "prefix": "10.127.66.0/24", "maxLength": 29, - "netname": "FIXMIX-NET-NEOV4A" + "netname": "FIXMIX-NET4-NEOA" } ], "ipv6": [ { "prefix": "fd10:127:aa66::/48", "maxLength": 64, - "netname": "FIXMIX-NET-NEOV6A" + "netname": "FIXMIX-NET6-NEOA" } ] } diff --git a/rfc8416.json b/rfc8416.json index 93f9ed2..051bc20 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -53,7 +53,7 @@ "asn": 211876, "prefix": "10.127.66.0/24", "maxPrefixLength": 29, - "comment": "FIXMIX-NET-NEOV4A" + "comment": "FIXMIX-NET4-NEOA" }, { "asn": 4201270000, @@ -239,7 +239,7 @@ "asn": 4201270021, "prefix": "10.127.66.0/24", "maxPrefixLength": 29, - "comment": "FIXMIX-NET-NEOV4A" + "comment": "FIXMIX-NET4-NEOA" }, { "asn": 4201270022, @@ -275,7 +275,7 @@ "asn": 4242421876, "prefix": "10.127.66.0/24", "maxPrefixLength": 29, - "comment": "FIXMIX-NET-NEOV4A" + "comment": "FIXMIX-NET4-NEOA" }, { "asn": 4242422189, @@ -371,7 +371,7 @@ "asn": 211876, "prefix": "fd10:127:aa66::/48", "maxPrefixLength": 64, - "comment": "FIXMIX-NET-NEOV6A" + "comment": "FIXMIX-NET6-NEOA" }, { "asn": 213262, @@ -509,7 +509,7 @@ "asn": 4201270021, "prefix": "fd10:127:aa66::/48", "maxPrefixLength": 64, - "comment": "FIXMIX-NET-NEOV6A" + "comment": "FIXMIX-NET6-NEOA" }, { "asn": 4201270022, @@ -533,7 +533,7 @@ "asn": 4242421876, "prefix": "fd10:127:aa66::/48", "maxPrefixLength": 64, - "comment": "FIXMIX-NET-NEOV6A" + "comment": "FIXMIX-NET6-NEOA" }, { "asn": 4242422464, diff --git a/roa46.json b/roa46.json index b6d5b2b..c050e50 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { "counts": 94, - "generated": 1620023136, - "valid": 1621232736 + "generated": 1620242734, + "valid": 1621452334 }, "roas": [ {