diff --git a/data/as-set/AS-FIXMIX42 b/data/as-set/AS-POTATO similarity index 59% rename from data/as-set/AS-FIXMIX42 rename to data/as-set/AS-POTATO index 8110ca631..911c2247b 100644 --- a/data/as-set/AS-FIXMIX42 +++ b/data/as-set/AS-POTATO @@ -1,8 +1,10 @@ -as-set: AS-FIXMIX42 -descr: fixmix Technologies DN42 as-set +as-set: AS-POTATO +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" mbrs-by-ref: DL-MNT members: AS4242421876 members: AS4201270021 +members: AS17830 members: AS211876 admin-c: DL-DN42 tech-c: DL-DN42 diff --git a/data/as-set/AS-FIXMIX42:AS-DOWNSTREAM b/data/as-set/AS-POTATO:AS-DOWNSTREAM similarity index 65% rename from data/as-set/AS-FIXMIX42:AS-DOWNSTREAM rename to data/as-set/AS-POTATO:AS-DOWNSTREAM index f14eda300..4d64b7836 100644 --- a/data/as-set/AS-FIXMIX42:AS-DOWNSTREAM +++ b/data/as-set/AS-POTATO:AS-DOWNSTREAM @@ -1,5 +1,7 @@ -as-set: AS-FIXMIX42:AS-DOWNSTREAM -descr: fixmix Technologies DN42 Downstream as-set +as-set: AS-POTATO:AS-DOWNSTREAM +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" +remarks: Leaf (unidirectional transit) Peers remarks: ══════════════════════════════ members: AS4242421876:AS-DOWNSTREAM remarks: ══════════════════════════════ diff --git a/data/as-set/AS-FIXMIX42:AS-TRANSIT b/data/as-set/AS-POTATO:AS-TRANSIT similarity index 65% rename from data/as-set/AS-FIXMIX42:AS-TRANSIT rename to data/as-set/AS-POTATO:AS-TRANSIT index 070ba183a..91d173aa5 100644 --- a/data/as-set/AS-FIXMIX42:AS-TRANSIT +++ b/data/as-set/AS-POTATO:AS-TRANSIT @@ -1,5 +1,7 @@ -as-set: AS-FIXMIX42:AS-TRANSIT -descr: fixmix Technologies DN42 Transit as-set +as-set: AS-POTATO:AS-TRANSIT +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" +remarks: Regular (bidirectional transit) Peers remarks: ══════════════════════════════ members: AS4242421876:AS-TRANSIT remarks: ══════════════════════════════ diff --git a/data/aut-num/AS17830 b/data/aut-num/AS17830 new file mode 100644 index 000000000..1521a92f6 --- /dev/null +++ b/data/aut-num/AS17830 @@ -0,0 +1,13 @@ +aut-num: AS17830 +as-name: POTATO-AS-AP +descr: David Liu aka PotatoNet +member-of: AS-POTATO +remarks: ╔═════════════════════════════════════╗ +remarks: ║ PotatoNet @ DN42 ║ +remarks: ║═════════════════════════════════════║ +remarks: ║ see AS4242421876 for more details ║ +remarks: ╚═════════════════════════════════════╝ +admin-c: DL-DN42 +tech-c: DL-DN42 +mnt-by: DL-MNT +source: APNIC diff --git a/data/aut-num/AS211876 b/data/aut-num/AS211876 index f14f33767..4c1d78b3c 100644 --- a/data/aut-num/AS211876 +++ b/data/aut-num/AS211876 @@ -1,14 +1,10 @@ aut-num: AS211876 as-name: FIXMIX-GEN -descr: fixmix Global Experimental Network +descr: fixmix Technologies org: ORG-FIXMIX -member-of: AS-FIXMIX42 -mp-import: afi any.unicast from AS-FIXMIX42:AS-TRANSIT accept ANY -mp-export: afi any.unicast to AS-FIXMIX42:AS-TRANSIT announce ANY -mp-import: afi any.unicast from AS-FIXMIX42:AS-DOWNSTREAM accept PeerAS -mp-export: afi any.unicast to AS-FIXMIX42:AS-DOWNSTREAM announce ANY +member-of: AS-POTATO remarks: ╔═════════════════════════════════════╗ -remarks: ║ fixmix DN42 Network ║ +remarks: ║ PotatoNet @ DN42 ║ remarks: ║═════════════════════════════════════║ remarks: ║ see AS4242421876 for more details ║ remarks: ╚═════════════════════════════════════╝ diff --git a/data/aut-num/AS4242421876 b/data/aut-num/AS4242421876 index 47fc5d40b..38c354128 100644 --- a/data/aut-num/AS4242421876 +++ b/data/aut-num/AS4242421876 @@ -1,44 +1,68 @@ aut-num: AS4242421876 -as-name: FIXMIX-42 -descr: fixmix DN42 Network -org: ORG-FIXMIX -member-of: AS-FIXMIX42 -mp-import: afi any.unicast from AS-FIXMIX42:AS-TRANSIT accept ANY -mp-export: afi any.unicast to AS-FIXMIX42:AS-TRANSIT announce ANY -mp-import: afi any.unicast from AS-FIXMIX42:AS-DOWNSTREAM accept PeerAS -mp-export: afi any.unicast to AS-FIXMIX42:AS-DOWNSTREAM announce ANY +as-name: POTATO-42 +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" +member-of: AS-POTATO +mp-import: afi any.unicast from AS-POTATO:AS-TRANSIT accept ANY +mp-export: afi any.unicast to AS-POTATO:AS-TRANSIT announce ANY +mp-import: afi any.unicast from AS-POTATO:AS-DOWNSTREAM accept PeerAS +mp-export: afi any.unicast to AS-POTATO:AS-DOWNSTREAM announce ANY remarks: ╔══════════════════════════════════════════════╗ -remarks: ║ fixmix DN42 Network · AS4242421876 ║ +remarks: ║ PotatoNet @ DN42 AS4242421876 ║ remarks: ║══════════════════════════════════════════════║ remarks: ║ * Tier 1 Network certified by info.nia.dn42 ║ -remarks: ║ * Direct connections to 90+ networks ║ +remarks: ║ * Direct connections to 90+ networks, ║ remarks: ║ including Freifunk ICVPN & ChaosVPN ║ -remarks: ║ * Open Peering Policy ║ +remarks: ║ * Open peering policy ║ remarks: ║══════════════════════════════════════════════║ -remarks: ║ * 18 Nodes Available for Peering: ║ -remarks: ║ - Nuremberg, Germany ║ -remarks: ║ - Frankfurt, Germany ║ -remarks: ║ - Amsterdam, Netherlands (*2) ║ -remarks: ║ - Moscow, Russia ║ -remarks: ║ - Los Angeles, United States ║ -remarks: ║ - New York City, United States ║ -remarks: ║ - Chicago, United States ║ -remarks: ║ - Las Vegas, United States ║ -remarks: ║ - Vancouver, Canada ║ -remarks: ║ - Hong Kong, China (*2) ║ -remarks: ║ - Tokyo, Japan ║ -remarks: ║ - Singapore ║ -remarks: ║ - Shanghai, China ║ -remarks: ║ - Shenyang, China (*2) ║ -remarks: ║ - Auckland, New Zealand ║ +remarks: ║ * 35 nodes available for peering: ║ +remarks: ║ > Europe ║ +remarks: ║ - 101 Nuremberg, DE ║ +remarks: ║ - 102 Frankfurt, DE ║ +remarks: ║ - 103 Amsterdam, NL ║ +remarks: ║ - 104 Bissen, LU ║ +remarks: ║ - 105 Vitry-sur-Seine, FR ║ +remarks: ║ - 106 Rome, IT ║ +remarks: ║ - 107 Falkenstein, DE ║ +remarks: ║ - 108 Falkenstein, DE ║ +remarks: ║ - 109 Haarlem, NL ║ +remarks: ║ - 110 Haarlem, NL ║ +remarks: ║ - 111 Dronten, NL ║ +remarks: ║ - 112 Dusseldorf, DE ║ +remarks: ║ > North America ║ +remarks: ║ - 201 Los Angeles, US ║ +remarks: ║ - 202 New York City, US ║ +remarks: ║ - 203 Chicago, US ║ +remarks: ║ - 204 Las Vegas, US ║ +remarks: ║ - 205 Vancouver, CA ║ +remarks: ║ - 206 Central Illinois, US ║ +remarks: ║ - 207 Fremont, US ║ +remarks: ║ - 208 Kansas City, US ║ +remarks: ║ - 209 Miami, US ║ +remarks: ║ > Asia ║ +remarks: ║ - 301 Hong Kong, CN ║ +remarks: ║ - 302 Hong Kong, CN ║ +remarks: ║ - 303 Tokyo, JP ║ +remarks: ║ - 304 Singapore, SG ║ +remarks: ║ - 305 Shanghai, CN ║ +remarks: ║ - 306 Shenyang, CN ║ +remarks: ║ - 307 Shenyang, CN ║ +remarks: ║ - 308 Guangzhou, CN ║ +remarks: ║ - 309 Seoul, KR ║ +remarks: ║ - 310 Khabarovsk, RU ║ +remarks: ║ - 311 Shenyang, CN ║ +remarks: ║ - 312 Hangzhou, CN ║ +remarks: ║ - 313 Wuhan, CN ║ +remarks: ║ > Oceania ║ +remarks: ║ - 401 Auckland, NZ ║ remarks: ║══════════════════════════════════════════════║ -remarks: ║ * Info Page: fixmix.dn42 (DN42) ║ +remarks: ║ * Info Page: potato.dn42 (DN42) ║ remarks: ║ bit.ly/1876-info (external) ║ -remarks: ║ * Looking Glass: lg.fixmix.dn42 (DN42) ║ +remarks: ║ * Looking Glass: lg.potato.dn42 (DN42) ║ remarks: ║ bit.ly/1876-lg (external) ║ remarks: ║══════════════════════════════════════════════║ remarks: ║ * Contact: ║ -remarks: ║ - Email: ops@fixmix.network ║ +remarks: ║ - Email: operations@potatonet.dliu.me ║ remarks: ║ - IRC: p0tat05 @ hackint ║ remarks: ║ - Telegram: @p0tat05 ║ remarks: ╚══════════════════════════════════════════════╝ diff --git a/data/dns/david.dn42 b/data/dns/david.dn42 index 52cf89f86..5a0bd4ac8 100644 --- a/data/dns/david.dn42 +++ b/data/dns/david.dn42 @@ -1,8 +1,8 @@ domain: david.dn42 descr: David Zhixu Liu -nserver: ns1.fixmix.dn42 -nserver: ns2.fixmix.dn42 -nserver: ns3.fixmix.dn42 +nserver: ns1.potato.dn42 +nserver: ns2.potato.dn42 +nserver: ns3.potato.dn42 ds-rdata: 1246 7 2 AA981AF0F0A4F25A515AD4C10231D04044E144DC59E91F9C66E90894B7EEE252 admin-c: DL-DN42 tech-c: DL-DN42 diff --git a/data/dns/fixmix.dn42 b/data/dns/fixmix.dn42 index edbdd8f93..834abb959 100644 --- a/data/dns/fixmix.dn42 +++ b/data/dns/fixmix.dn42 @@ -1,12 +1,9 @@ domain: fixmix.dn42 -descr: fixmix Technologies Ltd +descr: fixmix Technologies org: ORG-FIXMIX -nserver: ns1.fixmix.dn42 172.22.66.59 -nserver: ns1.fixmix.dn42 fda1:ae59:6dd0:11:: -nserver: ns2.fixmix.dn42 172.22.66.54 -nserver: ns2.fixmix.dn42 fda1:ae59:6dd0:21:: -nserver: ns3.fixmix.dn42 172.22.66.52 -nserver: ns3.fixmix.dn42 fda1:ae59:6dd0:31:: +nserver: ns1.potato.dn42 +nserver: ns2.potato.dn42 +nserver: ns3.potato.dn42 ds-rdata: 6918 7 2 DBC977B574BFAA2AC76D58EF1D756F925123A2569F479C98EAC7819D5C3CE72A admin-c: DL-DN42 tech-c: DL-DN42 diff --git a/data/dns/potato.dn42 b/data/dns/potato.dn42 new file mode 100644 index 000000000..d36ce65cb --- /dev/null +++ b/data/dns/potato.dn42 @@ -0,0 +1,14 @@ +domain: potato.dn42 +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" +nserver: ns1.potato.dn42 172.22.66.59 +nserver: ns1.potato.dn42 fda1:ae59:6dd0:1010::1 +nserver: ns2.potato.dn42 172.22.66.54 +nserver: ns2.potato.dn42 fda1:ae59:6dd0:2010::1 +nserver: ns3.potato.dn42 172.22.66.52 +nserver: ns3.potato.dn42 fda1:ae59:6dd0:3010::1 +ds-rdata: 4401 7 2 EFFFA8616609919BB738AF944D07B2330BC355078A99A526B88AA62614DA8970 +admin-c: DL-DN42 +tech-c: DL-DN42 +mnt-by: DL-MNT +source: DN42 diff --git a/data/inet6num/fda1:ae59:6dd0::_48 b/data/inet6num/fda1:ae59:6dd0::_48 index 6cdf2ca50..24af1932a 100644 --- a/data/inet6num/fda1:ae59:6dd0::_48 +++ b/data/inet6num/fda1:ae59:6dd0::_48 @@ -1,11 +1,12 @@ inet6num: fda1:ae59:6dd0:0000:0000:0000:0000:0000 - fda1:ae59:6dd0:ffff:ffff:ffff:ffff:ffff cidr: fda1:ae59:6dd0::/48 -netname: FIXMIX-NET6-42A -descr: fixmix Technologies DN42 IPv6 Block -org: ORG-FIXMIX -nserver: ns1.fixmix.dn42 -nserver: ns2.fixmix.dn42 -nserver: ns3.fixmix.dn42 +netname: POTATO-42-NET6-A +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" +country: CN +nserver: ns1.potato.dn42 +nserver: ns2.potato.dn42 +nserver: ns3.potato.dn42 ds-rdata: 62409 7 2 7F387E646C5472025CA83D74025267824D6D9D6F0F5FCEBAF11330A690BE6328 admin-c: DL-DN42 tech-c: DL-DN42 diff --git a/data/inetnum/172.22.66.32_27 b/data/inetnum/172.22.66.32_27 index 03aa1d4c9..6a5555959 100644 --- a/data/inetnum/172.22.66.32_27 +++ b/data/inetnum/172.22.66.32_27 @@ -1,11 +1,12 @@ inetnum: 172.22.66.32 - 172.22.66.63 cidr: 172.22.66.32/27 -netname: FIXMIX-NET4-42A -descr: fixmix Technologies DN42 IPv4 Block -org: ORG-FIXMIX -nserver: ns1.fixmix.dn42 -nserver: ns2.fixmix.dn42 -nserver: ns3.fixmix.dn42 +netname: POTATO-42-NET4-A +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" +country: CN +nserver: ns1.potato.dn42 +nserver: ns2.potato.dn42 +nserver: ns3.potato.dn42 ds-rdata: 43174 7 2 DCD156A84D2D02E984FD73B683322B2350C9B82516953EE04B6B3C98F5294686 admin-c: DL-DN42 tech-c: DL-DN42 diff --git a/data/inetnum/172.23.66.0_26 b/data/inetnum/172.23.66.0_26 index 5f8470fbf..22289a129 100644 --- a/data/inetnum/172.23.66.0_26 +++ b/data/inetnum/172.23.66.0_26 @@ -1,11 +1,13 @@ inetnum: 172.23.66.0 - 172.23.66.63 cidr: 172.23.66.0/26 -netname: FIXMIX-NET4-42B -descr: fixmix Technologies DN42 IPv4 Block -org: ORG-FIXMIX -nserver: ns1.fixmix.dn42 -nserver: ns2.fixmix.dn42 -nserver: ns3.fixmix.dn42 +netname: POTATO-42-NET4-B +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" +country: CN +nserver: ns1.potato.dn42 +nserver: ns2.potato.dn42 +nserver: ns3.potato.dn42 +ds-rdata: 8106 7 2 836313D484582EC7940AEB89CD09258A2FEBAB25287AA35951EA16B28D2FDC9C admin-c: DL-DN42 tech-c: DL-DN42 mnt-by: DL-MNT diff --git a/data/organisation/ORG-FIXMIX b/data/organisation/ORG-FIXMIX index 3199aa4e9..559e0f259 100644 --- a/data/organisation/ORG-FIXMIX +++ b/data/organisation/ORG-FIXMIX @@ -1,18 +1,11 @@ organisation: ORG-FIXMIX org-name: fixmix Technologies Ltd -address: 286211 / Via House -address: 26c Hazel Road -address: Southampton SO19 7GA +address: Office 1, 83 Ducie Street +address: Manchester M1 2JQ address: United Kingdom e-mail: mgmt@fixmix.tech phone: +44 333 339 1678 www: https://fixmix.tech -remarks: ═════════════════════════ -remarks: Network Operations Team -e-mail: ops@fixmix.network -abuse-mailbox: abuse@fixmix.network -www: https://fixmix.network -remarks: ═════════════════════════ admin-c: DL-DN42 tech-c: DL-DN42 mnt-by: DL-MNT diff --git a/data/person/DL-DN42 b/data/person/DL-DN42 index 6e02c93a2..8a5842987 100644 --- a/data/person/DL-DN42 +++ b/data/person/DL-DN42 @@ -1,11 +1,11 @@ person: David Zhixu Liu +nick: p0tat05 address: 2 Gaogong Road, Hunnan District address: Shenyang, Liaoning 110179 address: China e-mail: david@fixmix.tech phone: +852 5619 6781 -www: https://davidliu.pro -nick: p0tat05 +www: https://dliu.me nic-hdl: DL-DN42 mnt-by: DL-MNT source: DN42 diff --git a/data/route/172.22.66.32_27 b/data/route/172.22.66.32_27 index 7d5490cfd..731f75daa 100644 --- a/data/route/172.22.66.32_27 +++ b/data/route/172.22.66.32_27 @@ -1,6 +1,9 @@ route: 172.22.66.32/27 +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" origin: AS4242421876 origin: AS4201270021 +origin: AS17830 origin: AS211876 mnt-by: DL-MNT source: DN42 diff --git a/data/route/172.23.66.0_26 b/data/route/172.23.66.0_26 index adaf20416..c298be1e0 100644 --- a/data/route/172.23.66.0_26 +++ b/data/route/172.23.66.0_26 @@ -1,6 +1,9 @@ route: 172.23.66.0/26 +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" origin: AS4242421876 origin: AS4201270021 +origin: AS17830 origin: AS211876 mnt-by: DL-MNT source: DN42 diff --git a/data/route6/fda1:ae59:6dd0::_48 b/data/route6/fda1:ae59:6dd0::_48 index 034d9dd9d..410fb681e 100644 --- a/data/route6/fda1:ae59:6dd0::_48 +++ b/data/route6/fda1:ae59:6dd0::_48 @@ -1,6 +1,9 @@ route6: fda1:ae59:6dd0::/48 +descr: PotatoNet @ DN42 +remarks: previously known as "fixmix DN42 Network" origin: AS4242421876 origin: AS4201270021 +origin: AS17830 origin: AS211876 max-length: 48 mnt-by: DL-MNT