From 0f69b4387438567276311f064803752fa006dc0e Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Wed, 13 May 2020 21:18:53 +0800 Subject: [PATCH 01/29] pretty-output: node-dir support --- scripts/pretty-output.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/scripts/pretty-output.sh b/scripts/pretty-output.sh index 0469dda..238eb25 100755 --- a/scripts/pretty-output.sh +++ b/scripts/pretty-output.sh @@ -123,7 +123,6 @@ route) subnet="${subnet/,/\/}" source "$i" case "$TYPE" in - TUN30) print_tun30 "$subnet" "$PROTO" "$UPSTREAM" "$DOWNSTREAM";; SUBNET) print_subnet "$subnet" "$NAME" "$DESC";; LO) print_lo "$subnet" "$NAME" "$DESC";; *) errmsg "Invalid \$TYPE in $i\n";; @@ -131,7 +130,21 @@ route) done ;; people);; -node);; +node) + for i in node/*; do + node="${i#node/}" + source "$i" + + echo -e \ + "${BRIGHT}${BBLUE}${FYELLOW}========================================${RESET}" + + printf "${BRIGHT}${FYELLOW}%12s${RESET} | ${BRIGHT}${FGREEN}%20s${RESET} | ${FCYAN}%s${RESET}\n" "AS${ASN}" "$node" "$DESC" + + for ip in "${IP[@]}"; do + printf "\t%s\n" "$ip" + done + done + ;; *) errmsg "Invalid type\n";; esac From 09d9edcbb2b4af29cf511b32895cfcb0a656ea98 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Wed, 13 May 2020 19:14:47 +0800 Subject: [PATCH 02/29] new file: route6/fd10:127:0233:1c3c::,64 --- route6/fd10:127:0233:1c3c::,64 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 route6/fd10:127:0233:1c3c::,64 diff --git a/route6/fd10:127:0233:1c3c::,64 b/route6/fd10:127:0233:1c3c::,64 new file mode 100644 index 0000000..a55331d --- /dev/null +++ b/route6/fd10:127:0233:1c3c::,64 @@ -0,0 +1,5 @@ +TYPE="SUBNET" +NAME="icecat" +DESC="NextMoe Radvd IPv6 Address" +ASN="4201270005" +SUPERNET="fd10:127:0233::/48" From b820deb165ffd8ca945066c6ce180cd2e1351ca9 Mon Sep 17 00:00:00 2001 From: Jerry Date: Wed, 13 May 2020 21:09:30 +0800 Subject: [PATCH 03/29] roa.py: needs py37 --- scripts/roa.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/roa.py b/scripts/roa.py index 0eb5b55..42d8bdb 100755 --- a/scripts/roa.py +++ b/scripts/roa.py @@ -9,9 +9,7 @@ import re NEONET_ADDR_POOL = ('10.127.0.0/16', 'fd10:127::/32') NEONET_ADDR_POOL = [ip_network(neo) for neo in NEONET_ADDR_POOL] IS_NEONET = lambda net: bool([True for neo in NEONET_ADDR_POOL if net.version == neo.version and net.subnet_of(neo)]) -if not hasattr(IPv4Network, 'subnet_of'): - IS_NEONET = lambda x: True - print('# [!] IPv4Network has no attr subnet_of, please consider upgrading your python installation') +assert hasattr(IPv4Network, 'subnet_of') # needs at least python 3.7 class BashParser: def __init__(self): @@ -171,16 +169,22 @@ def neonet_route2roa(dirname, is_ipv6=False): print("[!] Error while processing file", f) raise roa_entries.sort(key=lambda l: l['asn']) + l_prefix = [_roa['prefix'] for _roa in roa_entries] for _net1, _net2 in combinations(roa_entries, 2): net1, net2 = sorted([_net1, _net2], key=lambda net: net['prefix'].prefixlen) if net1['prefix'].overlaps(net2['prefix']): - if net1['prefix'] != net2['prefix'] and net1['prefix'].supernet_of(net2['prefix']) \ - and net2['supernet'] == net1['prefix']: - # This is allowed - pass - else: - print("[!] Error: found", net2, "overlaps", net1) - raise AssertionError # if this is intended, please include SUPERNET= in your route + try: + assert net1['prefix'] != net2['prefix'] + assert net1['prefix'].supernet_of(net2['prefix']) + s1net, s2net= (net1['supernet'], net2['supernet']) + assert s2net # please include SUPERNET= in your route + # if net1(the bigger net) has a supernet s1net, then s1net and net1 + # will be checked or must have been checked, same for net2 + assert not s1net or s1net in l_prefix # net1.supernet is garbage + assert s2net == net1['prefix'] or s2net in l_prefix # net2.supernet is garbage + except AssertionError: + print("[!] Error: found", net1, "overlaps", net2) + raise return roa_entries if __name__ == "__main__": From 3ab85f1f7166ce1a15d23ce84d3529b4fbc0e7fe Mon Sep 17 00:00:00 2001 From: Jerry Date: Wed, 13 May 2020 21:32:58 +0800 Subject: [PATCH 04/29] [pyenv][revert-pending] use pyenv for py38 --- .github/workflows/roa.yml | 22 ++++++++++++++++------ .github/workflows/test-your-pr.yml | 22 ++++++++++++++++------ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.github/workflows/roa.yml b/.github/workflows/roa.yml index 45b416e..93a7e6a 100644 --- a/.github/workflows/roa.yml +++ b/.github/workflows/roa.yml @@ -22,19 +22,29 @@ jobs: run: | sudo apt update -qq sudo apt install -y python3 git openssh-client + sudo apt install -y curl + curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash + export PATH="$HOME/.pyenv/bin:$PATH" + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" + pyenv install 3.8.2 + pyenv shell 3.8.2 - name: Run roa script shell: bash run: | + export PATH="$HOME/.pyenv/bin:$PATH" + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" maxlen4=29 maxlen6=64 mkdir -p roa_dir - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -o roa_dir/roa46_bird2.conf - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -o roa_dir/roa46_bird2.conf + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json - name: Upload files env: diff --git a/.github/workflows/test-your-pr.yml b/.github/workflows/test-your-pr.yml index a893b6a..f252262 100644 --- a/.github/workflows/test-your-pr.yml +++ b/.github/workflows/test-your-pr.yml @@ -22,16 +22,26 @@ jobs: run: | sudo apt update -qq sudo apt install -y python3 git openssh-client + sudo apt install -y curl + curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash + export PATH="$HOME/.pyenv/bin:$PATH" + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" + pyenv install 3.8.2 + pyenv shell 3.8.2 - name: Run roa script shell: bash run: | + export PATH="$HOME/.pyenv/bin:$PATH" + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" maxlen4=29 maxlen6=64 mkdir -p roa_dir - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -o roa_dir/roa46_bird2.conf - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json - python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -o roa_dir/roa46_bird2.conf + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json + pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json From 0f9ce21bc01b8de3ea3528e5473dc6e2de457619 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Wed, 13 May 2020 21:35:46 +0800 Subject: [PATCH 05/29] pretty-output: rename people-dir to entity-dir --- scripts/pretty-output.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pretty-output.sh b/scripts/pretty-output.sh index 238eb25..20d0ae6 100755 --- a/scripts/pretty-output.sh +++ b/scripts/pretty-output.sh @@ -99,7 +99,7 @@ if [ $# -lt 1 ]; then "Usage: table-output.sh \n" \ "\n" \ " table types:\n" \ - " asn, route, people, node\n" + " asn, route, entity, node\n" fi arg="$2" # Optional argument @@ -129,7 +129,7 @@ route) esac done ;; -people);; +entity);; node) for i in node/*; do node="${i#node/}" From 02d97394312331d9f1bb3f0cf8ebd6de705fb69a Mon Sep 17 00:00:00 2001 From: Jerry Date: Wed, 13 May 2020 21:40:37 +0800 Subject: [PATCH 06/29] [pyenv] attempt to fix pyenv --- .github/workflows/roa.yml | 1 + .github/workflows/test-your-pr.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/roa.yml b/.github/workflows/roa.yml index 93a7e6a..731cc4a 100644 --- a/.github/workflows/roa.yml +++ b/.github/workflows/roa.yml @@ -36,6 +36,7 @@ jobs: export PATH="$HOME/.pyenv/bin:$PATH" eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" + pyenv shell 3.8.2 maxlen4=29 maxlen6=64 mkdir -p roa_dir diff --git a/.github/workflows/test-your-pr.yml b/.github/workflows/test-your-pr.yml index f252262..0f1ff26 100644 --- a/.github/workflows/test-your-pr.yml +++ b/.github/workflows/test-your-pr.yml @@ -36,6 +36,7 @@ jobs: export PATH="$HOME/.pyenv/bin:$PATH" eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" + pyenv shell 3.8.2 maxlen4=29 maxlen6=64 mkdir -p roa_dir From 5b1bf47a125eadd6fd672c2df5a2143a0e1bc4d6 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Wed, 13 May 2020 21:57:47 +0800 Subject: [PATCH 07/29] README: up --- README.md | 8 ++++---- docs/index.html | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5b30d28..a4cf8cf 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ # NeoNetwork A useless VPN network ready for peering! -**WARNING:** This network is not interconnected to DN42 yet Git Repo. [here](https://git.neocloud.tw) Pull requests are welcomed! Working language: `zh_* / en_*` -Telegram Group invitation link available at TXT record of `join-telegram.neocloud.tw` ## IXs @@ -27,11 +25,12 @@ Any protocol supported by Bird, Quagga or FRRouting, BGP recommended. All IPv4 addresses are under the range 10.127.0.0/16 All IPv6 addresses are under the range fd10:127::/32 -see routes.txt for allocated domain. +see [route](https://github.com/NeoCloud/NeoNetwork/tree/master/route) +and [route6](https://github.com/NeoCloud/NeoNetwork/tree/master/route6) for allocated subnet. ## DNS -There's a bind9 server on dns.neocloud.tw (10.127.225.2), all domain names are under ".neo". +There's a bind9 server on dns.neocloud.tw (`10.127.225.2` and `fd10:127:5f37:59df::255:2`), all domain names are under ".neo". ## Connection Graph @@ -44,5 +43,6 @@ There's a bind9 server on dns.neocloud.tw (10.127.225.2), all domain names are u entity/ Entitys route/ Network subnet allocation node/ Nodes + peer/ Peering status vpn/ VPN configuration examples (Tinc & WireGuard) dns/ Bind9 DNS zone files and example configuration diff --git a/docs/index.html b/docs/index.html index 71b7580..3f4748e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -11,11 +11,9 @@

NeoNetwork

A useless VPN network ready for peering!
-WARNING: This network is not interconnected to DN42 yet
Git Repo. here
Pull requests are welcomed!
-Working language: zh_* / en_*
-Telegram Group invitation link available at TXT record of join-telegram.neocloud.tw

+Working language: zh_* / en_*

IXs

@@ -33,17 +31,18 @@ megumi.yukipedia.cf (10.127.30.1, ASN 4242421037)

Routing Protocols

-

Any protocol supported by Quagga or FRRouting, recommended to use BGP.

+

Any protocol supported by Bird, Quagga or FRRouting, BGP recommended.

IP Addresses

All IPv4 addresses are under the range 10.127.0.0/16
All IPv6 addresses are under the range fd10:127::/32
-see routes.txt for allocated domain.

+see route +and route6 for allocated subnet.

DNS

-

There’s a bind9 server on dns.neocloud.tw (10.127.225.2), all domain names are under “.neo”.

+

There’s a bind9 server on dns.neocloud.tw (10.127.225.2 and fd10:127:5f37:59df::255:2), all domain names are under “.neo”.

Connection Graph

@@ -56,6 +55,7 @@ asn/ BGP AS Number allocation entity/ Entitys route/ Network subnet allocation node/ Nodes +peer/ Peering status vpn/ VPN configuration examples (Tinc & WireGuard) dns/ Bind9 DNS zone files and example configuration From 96df569bef83eda13424b9195253dbe364ff06e4 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Wed, 13 May 2020 22:00:54 +0800 Subject: [PATCH 08/29] README: up [skip ci] --- README.md | 1 + docs/index.html | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index a4cf8cf..1889a7d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # NeoNetwork A useless VPN network ready for peering! +This network is connected with [DN42](https://dn42.net) Git Repo. [here](https://git.neocloud.tw) Pull requests are welcomed! Working language: `zh_* / en_*` diff --git a/docs/index.html b/docs/index.html index 3f4748e..981b97d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -11,6 +11,7 @@

NeoNetwork

A useless VPN network ready for peering!
+This network is connected with DN42
Git Repo. here
Pull requests are welcomed!
Working language: zh_* / en_*

From fb31a9ce0caac3e0357295a0033f679df0c55a87 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Thu, 14 May 2020 17:33:05 +0800 Subject: [PATCH 09/29] DNS: up [skip ci] --- dns/db.10.127 | 1 + dns/neonetwork | 3 +-- scripts/dns-reverse-generator.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dns/db.10.127 b/dns/db.10.127 index 518adc7..8b2c0ea 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -17,6 +17,7 @@ $TTL 604800 10.1 IN PTR neostorage.neonetwork. 80.1 IN PTR NeoSystem.neo. 1.3 IN PTR pan.neo. +16.2 IN PTR caasih.neo. 185.8 IN PTR staph.neo. 187.8 IN PTR staph-cn.neo. diff --git a/dns/neonetwork b/dns/neonetwork index fb1fe9c..07ebb0f 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -15,13 +15,12 @@ $TTL 604800 root IN CNAME neo. NeoPDP-11 IN A 10.127.255.1 ucbvax IN A 10.127.255.2 -caasih IN A 10.127.0.1 +caasih IN A 10.127.2.16 NeoSystem IN A 10.127.255.80 neostorage IN A 10.127.1.10 NeoBOX IN A 10.127.1.20 cklvax IN A 10.127.1.40 NNPCC IN A 10.127.1.63 -NeoVAX IN A 10.127.0.38 pan IN A 10.127.3.1 staph IN A 10.127.8.185 staph-cn IN A 10.127.8.187 diff --git a/scripts/dns-reverse-generator.sh b/scripts/dns-reverse-generator.sh index caf565e..9338540 100755 --- a/scripts/dns-reverse-generator.sh +++ b/scripts/dns-reverse-generator.sh @@ -38,7 +38,7 @@ for i in *; do if [ "$TYPE" = "LO" ]; then ip="${i/,32/}" - print_record "$(ipcalc "$ip" 0)" "$NAME.neo" >> "$LO_TEMP" + print_record "$(ipcalc "$ip" 0)" "$NAME.neo." >> "$LO_TEMP" fi done ) From 19fd4432328f1605e41c26b4b0546e1778ca5a0f Mon Sep 17 00:00:00 2001 From: "Staph. aureus" Date: Thu, 14 May 2020 10:27:21 -0400 Subject: [PATCH 10/29] Add new allocation --- entity/Staph | 6 +++++- node/staph | 3 ++- route6/fd10:127:7::,48 | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 route6/fd10:127:7::,48 diff --git a/entity/Staph b/entity/Staph index 44a98f9..60c3fbc 100644 --- a/entity/Staph +++ b/entity/Staph @@ -8,5 +8,9 @@ CONTACT=( "GITHUB: StephDC" ) BABEL=( - "" + "zh-N" + "en-4" + "ja-2" + "es-1" + "fr-1" ) diff --git a/node/staph b/node/staph index 9a0e697..e5afb33 100644 --- a/node/staph +++ b/node/staph @@ -1,4 +1,5 @@ ASN="4201270007" -DESC="" +DESC="Home of S. aureus in Amsterdam" IP=( + "10.127.8.185/29" ) diff --git a/route6/fd10:127:7::,48 b/route6/fd10:127:7::,48 new file mode 100644 index 0000000..a80b01c --- /dev/null +++ b/route6/fd10:127:7::,48 @@ -0,0 +1,4 @@ +TYPE="SUBNET" +NAME="Staph_v6" +DESC="Staph-infected IPv6 subnet - please do not disinfect" +ASN="4201270007" From 52b3c55b8d5cab13d744c0b6d5776b28da480829 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Fri, 15 May 2020 16:53:26 +0800 Subject: [PATCH 11/29] route6: fd10:127:5f37:59df::/64 updated info --- route6/fd10:127:5f37:59df::,64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/route6/fd10:127:5f37:59df::,64 b/route6/fd10:127:5f37:59df::,64 index 075f152..8f23768 100644 --- a/route6/fd10:127:5f37:59df::,64 +++ b/route6/fd10:127:5f37:59df::,64 @@ -1,4 +1,4 @@ TYPE=SUBNET -NAME="CROOM" -DESC="For CROOM connectivity" +NAME="NeoNetwork Origin" +DESC="Neo_Chen's Network" ASN="4201270000" From a7fe2ac87ed51d5f28b711cafb66ccad2ed6866f Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sat, 16 May 2020 00:49:14 +0800 Subject: [PATCH 12/29] entity: alanyhq --- asn/AS4201270021 | 3 +++ asn/AS4201270022 | 3 +++ asn/AS4201270023 | 3 +++ asn/AS4201270024 | 3 +++ asn/AS4201270025 | 3 +++ asn/AS4201270026 | 3 +++ asn/AS4201270027 | 3 +++ asn/AS4201270028 | 3 +++ asn/AS4201270029 | 3 +++ asn/AS4201270030 | 3 +++ asn/AS4201270031 | 3 +++ asn/AS4201270032 | 3 +++ asn/AS4201270033 | 3 +++ asn/AS4201270034 | 3 +++ asn/AS4201270035 | 3 +++ asn/AS4201270036 | 3 +++ asn/AS4201270037 | 3 +++ asn/AS4201270038 | 3 +++ asn/AS4201270039 | 3 +++ entity/alanyhq | 13 +++++++++++++ 20 files changed, 70 insertions(+) create mode 100644 asn/AS4201270021 create mode 100644 asn/AS4201270022 create mode 100644 asn/AS4201270023 create mode 100644 asn/AS4201270024 create mode 100644 asn/AS4201270025 create mode 100644 asn/AS4201270026 create mode 100644 asn/AS4201270027 create mode 100644 asn/AS4201270028 create mode 100644 asn/AS4201270029 create mode 100644 asn/AS4201270030 create mode 100644 asn/AS4201270031 create mode 100644 asn/AS4201270032 create mode 100644 asn/AS4201270033 create mode 100644 asn/AS4201270034 create mode 100644 asn/AS4201270035 create mode 100644 asn/AS4201270036 create mode 100644 asn/AS4201270037 create mode 100644 asn/AS4201270038 create mode 100644 asn/AS4201270039 create mode 100644 entity/alanyhq diff --git a/asn/AS4201270021 b/asn/AS4201270021 new file mode 100644 index 0000000..b1a1279 --- /dev/null +++ b/asn/AS4201270021 @@ -0,0 +1,3 @@ +NAME="alanyhq in Shanghai, CN" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270022 b/asn/AS4201270022 new file mode 100644 index 0000000..caedc66 --- /dev/null +++ b/asn/AS4201270022 @@ -0,0 +1,3 @@ +NAME="alanyhq in Beijing, CN" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270023 b/asn/AS4201270023 new file mode 100644 index 0000000..2a4968b --- /dev/null +++ b/asn/AS4201270023 @@ -0,0 +1,3 @@ +NAME="alanyhq in Guangzhou, CN" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270024 b/asn/AS4201270024 new file mode 100644 index 0000000..255c7cd --- /dev/null +++ b/asn/AS4201270024 @@ -0,0 +1,3 @@ +NAME="alanyhq in Hongkong, CN" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270025 b/asn/AS4201270025 new file mode 100644 index 0000000..420e478 --- /dev/null +++ b/asn/AS4201270025 @@ -0,0 +1,3 @@ +NAME="alanyhq in Taiwan, CN" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270026 b/asn/AS4201270026 new file mode 100644 index 0000000..8f3969b --- /dev/null +++ b/asn/AS4201270026 @@ -0,0 +1,3 @@ +NAME="alanyhq in Sydney, AU" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270027 b/asn/AS4201270027 new file mode 100644 index 0000000..f319386 --- /dev/null +++ b/asn/AS4201270027 @@ -0,0 +1,3 @@ +NAME="alanyhq in Singapore" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270028 b/asn/AS4201270028 new file mode 100644 index 0000000..8134033 --- /dev/null +++ b/asn/AS4201270028 @@ -0,0 +1,3 @@ +NAME="alanyhq in Tokyo, JP" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270029 b/asn/AS4201270029 new file mode 100644 index 0000000..c9ada0e --- /dev/null +++ b/asn/AS4201270029 @@ -0,0 +1,3 @@ +NAME="alanyhq in Seoul, KR" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270030 b/asn/AS4201270030 new file mode 100644 index 0000000..e193470 --- /dev/null +++ b/asn/AS4201270030 @@ -0,0 +1,3 @@ +NAME="alanyhq in Johannesburg, ZA" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270031 b/asn/AS4201270031 new file mode 100644 index 0000000..357beec --- /dev/null +++ b/asn/AS4201270031 @@ -0,0 +1,3 @@ +NAME="alanyhq in London, UK" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270032 b/asn/AS4201270032 new file mode 100644 index 0000000..94e4f16 --- /dev/null +++ b/asn/AS4201270032 @@ -0,0 +1,3 @@ +NAME="alanyhq in Frankfurt, DE" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270033 b/asn/AS4201270033 new file mode 100644 index 0000000..350ec14 --- /dev/null +++ b/asn/AS4201270033 @@ -0,0 +1,3 @@ +NAME="alanyhq in Paris, FR" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270034 b/asn/AS4201270034 new file mode 100644 index 0000000..cdf6ac0 --- /dev/null +++ b/asn/AS4201270034 @@ -0,0 +1,3 @@ +NAME="alanyhq in Amsterdam, NL" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270035 b/asn/AS4201270035 new file mode 100644 index 0000000..6884805 --- /dev/null +++ b/asn/AS4201270035 @@ -0,0 +1,3 @@ +NAME="alanyhq in Copenhagen, DK" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270036 b/asn/AS4201270036 new file mode 100644 index 0000000..1066098 --- /dev/null +++ b/asn/AS4201270036 @@ -0,0 +1,3 @@ +NAME="alanyhq in Warsaw, PL" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270037 b/asn/AS4201270037 new file mode 100644 index 0000000..629bc72 --- /dev/null +++ b/asn/AS4201270037 @@ -0,0 +1,3 @@ +NAME="alanyhq in Madrid, ES" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270038 b/asn/AS4201270038 new file mode 100644 index 0000000..36fc15d --- /dev/null +++ b/asn/AS4201270038 @@ -0,0 +1,3 @@ +NAME="alanyhq in Oslo, NO" +OWNER="alayhq" +DESC="" diff --git a/asn/AS4201270039 b/asn/AS4201270039 new file mode 100644 index 0000000..b7e62d0 --- /dev/null +++ b/asn/AS4201270039 @@ -0,0 +1,3 @@ +NAME="alanyhq in São Paulo, BR" +OWNER="alayhq" +DESC="" diff --git a/entity/alanyhq b/entity/alanyhq new file mode 100644 index 0000000..0291086 --- /dev/null +++ b/entity/alanyhq @@ -0,0 +1,13 @@ +NAME="alanyhq" +DESC="" +CONTACT=( + "EMAIL:" + "TELEGRAM:@alanyhq" + "IRC:alanyhq" + "MASTODON:" + "GITHUB:" +) +BABEL=( + "zh-N" + "en-2" +) From cf8fb1a22d0c670badd3af9f76cba25f4eac855a Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sat, 16 May 2020 00:49:14 +0800 Subject: [PATCH 13/29] fix: entity: alanyhq --- asn/AS4201270021 | 4 ++-- asn/AS4201270022 | 4 ++-- asn/AS4201270023 | 4 ++-- asn/AS4201270024 | 4 ++-- asn/AS4201270025 | 4 ++-- asn/AS4201270026 | 4 ++-- asn/AS4201270027 | 4 ++-- asn/AS4201270028 | 4 ++-- asn/AS4201270029 | 4 ++-- asn/AS4201270030 | 4 ++-- asn/AS4201270031 | 4 ++-- asn/AS4201270032 | 4 ++-- asn/AS4201270033 | 4 ++-- asn/AS4201270034 | 4 ++-- asn/AS4201270035 | 4 ++-- asn/AS4201270036 | 4 ++-- asn/AS4201270037 | 4 ++-- asn/AS4201270038 | 4 ++-- asn/AS4201270039 | 4 ++-- asn/AS4201270040 | 3 +++ asn/AS4201270041 | 3 +++ 21 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 asn/AS4201270040 create mode 100644 asn/AS4201270041 diff --git a/asn/AS4201270021 b/asn/AS4201270021 index b1a1279..1fcd5da 100644 --- a/asn/AS4201270021 +++ b/asn/AS4201270021 @@ -1,3 +1,3 @@ NAME="alanyhq in Shanghai, CN" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Shanghai, CN" diff --git a/asn/AS4201270022 b/asn/AS4201270022 index caedc66..4c6fb6e 100644 --- a/asn/AS4201270022 +++ b/asn/AS4201270022 @@ -1,3 +1,3 @@ NAME="alanyhq in Beijing, CN" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Beijing, CN" diff --git a/asn/AS4201270023 b/asn/AS4201270023 index 2a4968b..d4b7076 100644 --- a/asn/AS4201270023 +++ b/asn/AS4201270023 @@ -1,3 +1,3 @@ NAME="alanyhq in Guangzhou, CN" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Guangzhou, CN" diff --git a/asn/AS4201270024 b/asn/AS4201270024 index 255c7cd..f648737 100644 --- a/asn/AS4201270024 +++ b/asn/AS4201270024 @@ -1,3 +1,3 @@ NAME="alanyhq in Hongkong, CN" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Hongkong, CN" diff --git a/asn/AS4201270025 b/asn/AS4201270025 index 420e478..38e9e93 100644 --- a/asn/AS4201270025 +++ b/asn/AS4201270025 @@ -1,3 +1,3 @@ NAME="alanyhq in Taiwan, CN" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Taiwan, CN" diff --git a/asn/AS4201270026 b/asn/AS4201270026 index 8f3969b..de3e209 100644 --- a/asn/AS4201270026 +++ b/asn/AS4201270026 @@ -1,3 +1,3 @@ NAME="alanyhq in Sydney, AU" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Sydney, AU" diff --git a/asn/AS4201270027 b/asn/AS4201270027 index f319386..5f90aa8 100644 --- a/asn/AS4201270027 +++ b/asn/AS4201270027 @@ -1,3 +1,3 @@ NAME="alanyhq in Singapore" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Singapore" diff --git a/asn/AS4201270028 b/asn/AS4201270028 index 8134033..8cd46f2 100644 --- a/asn/AS4201270028 +++ b/asn/AS4201270028 @@ -1,3 +1,3 @@ NAME="alanyhq in Tokyo, JP" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Tokyo, JP" diff --git a/asn/AS4201270029 b/asn/AS4201270029 index c9ada0e..d8f8f07 100644 --- a/asn/AS4201270029 +++ b/asn/AS4201270029 @@ -1,3 +1,3 @@ NAME="alanyhq in Seoul, KR" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Seoul, KR" diff --git a/asn/AS4201270030 b/asn/AS4201270030 index e193470..1c66edc 100644 --- a/asn/AS4201270030 +++ b/asn/AS4201270030 @@ -1,3 +1,3 @@ NAME="alanyhq in Johannesburg, ZA" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Johannesburg, ZA" diff --git a/asn/AS4201270031 b/asn/AS4201270031 index 357beec..174d730 100644 --- a/asn/AS4201270031 +++ b/asn/AS4201270031 @@ -1,3 +1,3 @@ NAME="alanyhq in London, UK" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in London, UK" diff --git a/asn/AS4201270032 b/asn/AS4201270032 index 94e4f16..4269aae 100644 --- a/asn/AS4201270032 +++ b/asn/AS4201270032 @@ -1,3 +1,3 @@ NAME="alanyhq in Frankfurt, DE" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Frankfurt, DE" diff --git a/asn/AS4201270033 b/asn/AS4201270033 index 350ec14..70c8946 100644 --- a/asn/AS4201270033 +++ b/asn/AS4201270033 @@ -1,3 +1,3 @@ NAME="alanyhq in Paris, FR" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Paris, FR" diff --git a/asn/AS4201270034 b/asn/AS4201270034 index cdf6ac0..df7875d 100644 --- a/asn/AS4201270034 +++ b/asn/AS4201270034 @@ -1,3 +1,3 @@ NAME="alanyhq in Amsterdam, NL" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Amsterdam, NL" diff --git a/asn/AS4201270035 b/asn/AS4201270035 index 6884805..017af28 100644 --- a/asn/AS4201270035 +++ b/asn/AS4201270035 @@ -1,3 +1,3 @@ NAME="alanyhq in Copenhagen, DK" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Copenhagen, DK" diff --git a/asn/AS4201270036 b/asn/AS4201270036 index 1066098..b232582 100644 --- a/asn/AS4201270036 +++ b/asn/AS4201270036 @@ -1,3 +1,3 @@ NAME="alanyhq in Warsaw, PL" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Warsaw, PL" diff --git a/asn/AS4201270037 b/asn/AS4201270037 index 629bc72..33ae92c 100644 --- a/asn/AS4201270037 +++ b/asn/AS4201270037 @@ -1,3 +1,3 @@ NAME="alanyhq in Madrid, ES" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Madrid, ES" diff --git a/asn/AS4201270038 b/asn/AS4201270038 index 36fc15d..d6e426f 100644 --- a/asn/AS4201270038 +++ b/asn/AS4201270038 @@ -1,3 +1,3 @@ NAME="alanyhq in Oslo, NO" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in Oslo, NO" diff --git a/asn/AS4201270039 b/asn/AS4201270039 index b7e62d0..fa45dee 100644 --- a/asn/AS4201270039 +++ b/asn/AS4201270039 @@ -1,3 +1,3 @@ NAME="alanyhq in São Paulo, BR" -OWNER="alayhq" -DESC="" +OWNER="alanyhq" +DESC="alanyhq in São Paulo, BR" diff --git a/asn/AS4201270040 b/asn/AS4201270040 new file mode 100644 index 0000000..4d6c801 --- /dev/null +++ b/asn/AS4201270040 @@ -0,0 +1,3 @@ +NAME="Oxygen233" +OWNER="JerryXiao" +DESC="Oxygen233-AS" diff --git a/asn/AS4201270041 b/asn/AS4201270041 new file mode 100644 index 0000000..c95ec97 --- /dev/null +++ b/asn/AS4201270041 @@ -0,0 +1,3 @@ +NAME="Oxygen233" +OWNER="JerryXiao" +DESC="Oxygen233-CN" From c0a962abefb7bf7d818286aab87aee099c659ccb Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sat, 16 May 2020 12:44:35 +0800 Subject: [PATCH 14/29] route6: alanyhq --- route6/fd10:127:a1a1:21::,64 | 4 ++++ route6/fd10:127:a1a1:22::,64 | 4 ++++ route6/fd10:127:a1a1:23::,64 | 4 ++++ route6/fd10:127:a1a1:24::,64 | 4 ++++ route6/fd10:127:a1a1:25::,64 | 4 ++++ route6/fd10:127:a1a1:26::,64 | 4 ++++ route6/fd10:127:a1a1:27::,64 | 4 ++++ route6/fd10:127:a1a1:28::,64 | 4 ++++ route6/fd10:127:a1a1:29::,64 | 4 ++++ route6/fd10:127:a1a1:30::,64 | 4 ++++ route6/fd10:127:a1a1:31::,64 | 4 ++++ route6/fd10:127:a1a1:32::,64 | 4 ++++ route6/fd10:127:a1a1:33::,64 | 4 ++++ route6/fd10:127:a1a1:34::,64 | 4 ++++ route6/fd10:127:a1a1:35::,64 | 4 ++++ route6/fd10:127:a1a1:36::,64 | 4 ++++ route6/fd10:127:a1a1:37::,64 | 4 ++++ route6/fd10:127:a1a1:38::,64 | 4 ++++ route6/fd10:127:a1a1:39::,64 | 4 ++++ 19 files changed, 76 insertions(+) create mode 100644 route6/fd10:127:a1a1:21::,64 create mode 100644 route6/fd10:127:a1a1:22::,64 create mode 100644 route6/fd10:127:a1a1:23::,64 create mode 100644 route6/fd10:127:a1a1:24::,64 create mode 100644 route6/fd10:127:a1a1:25::,64 create mode 100644 route6/fd10:127:a1a1:26::,64 create mode 100644 route6/fd10:127:a1a1:27::,64 create mode 100644 route6/fd10:127:a1a1:28::,64 create mode 100644 route6/fd10:127:a1a1:29::,64 create mode 100644 route6/fd10:127:a1a1:30::,64 create mode 100644 route6/fd10:127:a1a1:31::,64 create mode 100644 route6/fd10:127:a1a1:32::,64 create mode 100644 route6/fd10:127:a1a1:33::,64 create mode 100644 route6/fd10:127:a1a1:34::,64 create mode 100644 route6/fd10:127:a1a1:35::,64 create mode 100644 route6/fd10:127:a1a1:36::,64 create mode 100644 route6/fd10:127:a1a1:37::,64 create mode 100644 route6/fd10:127:a1a1:38::,64 create mode 100644 route6/fd10:127:a1a1:39::,64 diff --git a/route6/fd10:127:a1a1:21::,64 b/route6/fd10:127:a1a1:21::,64 new file mode 100644 index 0000000..2a8fa6a --- /dev/null +++ b/route6/fd10:127:a1a1:21::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Shanghai, CN" +DESC="" +ASN="4201270021" diff --git a/route6/fd10:127:a1a1:22::,64 b/route6/fd10:127:a1a1:22::,64 new file mode 100644 index 0000000..cd99c69 --- /dev/null +++ b/route6/fd10:127:a1a1:22::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Beijing, CN" +DESC="" +ASN="4201270022" diff --git a/route6/fd10:127:a1a1:23::,64 b/route6/fd10:127:a1a1:23::,64 new file mode 100644 index 0000000..3597993 --- /dev/null +++ b/route6/fd10:127:a1a1:23::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Guangzhou, CN" +DESC="" +ASN="4201270023" diff --git a/route6/fd10:127:a1a1:24::,64 b/route6/fd10:127:a1a1:24::,64 new file mode 100644 index 0000000..b450f29 --- /dev/null +++ b/route6/fd10:127:a1a1:24::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Hongkong, CN" +DESC="" +ASN="4201270024" diff --git a/route6/fd10:127:a1a1:25::,64 b/route6/fd10:127:a1a1:25::,64 new file mode 100644 index 0000000..30cea1d --- /dev/null +++ b/route6/fd10:127:a1a1:25::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Taiwan, CN" +DESC="" +ASN="4201270025" diff --git a/route6/fd10:127:a1a1:26::,64 b/route6/fd10:127:a1a1:26::,64 new file mode 100644 index 0000000..01d8628 --- /dev/null +++ b/route6/fd10:127:a1a1:26::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Sydney, AU" +DESC="" +ASN="4201270026" diff --git a/route6/fd10:127:a1a1:27::,64 b/route6/fd10:127:a1a1:27::,64 new file mode 100644 index 0000000..367fb27 --- /dev/null +++ b/route6/fd10:127:a1a1:27::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Singapore" +DESC="" +ASN="4201270027" diff --git a/route6/fd10:127:a1a1:28::,64 b/route6/fd10:127:a1a1:28::,64 new file mode 100644 index 0000000..ad2cf62 --- /dev/null +++ b/route6/fd10:127:a1a1:28::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Tokyo, JP" +DESC="" +ASN="4201270028" diff --git a/route6/fd10:127:a1a1:29::,64 b/route6/fd10:127:a1a1:29::,64 new file mode 100644 index 0000000..228c9be --- /dev/null +++ b/route6/fd10:127:a1a1:29::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Seoul, KR" +DESC="" +ASN="4201270029" diff --git a/route6/fd10:127:a1a1:30::,64 b/route6/fd10:127:a1a1:30::,64 new file mode 100644 index 0000000..f56e6c3 --- /dev/null +++ b/route6/fd10:127:a1a1:30::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Johannesburg, ZA" +DESC="" +ASN="4201270030" diff --git a/route6/fd10:127:a1a1:31::,64 b/route6/fd10:127:a1a1:31::,64 new file mode 100644 index 0000000..bf74f56 --- /dev/null +++ b/route6/fd10:127:a1a1:31::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in London, UK" +DESC="" +ASN="4201270031" diff --git a/route6/fd10:127:a1a1:32::,64 b/route6/fd10:127:a1a1:32::,64 new file mode 100644 index 0000000..128c99b --- /dev/null +++ b/route6/fd10:127:a1a1:32::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Frankfurt, DE" +DESC="" +ASN="4201270032" diff --git a/route6/fd10:127:a1a1:33::,64 b/route6/fd10:127:a1a1:33::,64 new file mode 100644 index 0000000..11dd15f --- /dev/null +++ b/route6/fd10:127:a1a1:33::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Paris, FR" +DESC="" +ASN="4201270033" diff --git a/route6/fd10:127:a1a1:34::,64 b/route6/fd10:127:a1a1:34::,64 new file mode 100644 index 0000000..25962fd --- /dev/null +++ b/route6/fd10:127:a1a1:34::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Amsterdam, NL" +DESC="" +ASN="4201270034" diff --git a/route6/fd10:127:a1a1:35::,64 b/route6/fd10:127:a1a1:35::,64 new file mode 100644 index 0000000..63700d8 --- /dev/null +++ b/route6/fd10:127:a1a1:35::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Copenhagen, DK" +DESC="" +ASN="4201270035" diff --git a/route6/fd10:127:a1a1:36::,64 b/route6/fd10:127:a1a1:36::,64 new file mode 100644 index 0000000..f351e27 --- /dev/null +++ b/route6/fd10:127:a1a1:36::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Warsaw, PL" +DESC="" +ASN="4201270036" diff --git a/route6/fd10:127:a1a1:37::,64 b/route6/fd10:127:a1a1:37::,64 new file mode 100644 index 0000000..a465d73 --- /dev/null +++ b/route6/fd10:127:a1a1:37::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Madrid, ES" +DESC="" +ASN="4201270037" diff --git a/route6/fd10:127:a1a1:38::,64 b/route6/fd10:127:a1a1:38::,64 new file mode 100644 index 0000000..4461f98 --- /dev/null +++ b/route6/fd10:127:a1a1:38::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in Oslo, NO" +DESC="" +ASN="4201270038" diff --git a/route6/fd10:127:a1a1:39::,64 b/route6/fd10:127:a1a1:39::,64 new file mode 100644 index 0000000..05c7e98 --- /dev/null +++ b/route6/fd10:127:a1a1:39::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq in São Paulo, BR" +DESC="" +ASN="4201270039" From 7a35aeb906020eaae5a39cc5b66dea3d38daccd1 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sat, 16 May 2020 14:47:19 +0800 Subject: [PATCH 15/29] asn & route6: alanyhq main --- asn/AS4242420916 | 3 +++ route6/fd10:127:a1a1:20::,64 | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 asn/AS4242420916 create mode 100644 route6/fd10:127:a1a1:20::,64 diff --git a/asn/AS4242420916 b/asn/AS4242420916 new file mode 100644 index 0000000..87bb8e9 --- /dev/null +++ b/asn/AS4242420916 @@ -0,0 +1,3 @@ +NAME="alanyhq" +OWNER="alanyhq" +DESC="alanyhq main" diff --git a/route6/fd10:127:a1a1:20::,64 b/route6/fd10:127:a1a1:20::,64 new file mode 100644 index 0000000..1ca4459 --- /dev/null +++ b/route6/fd10:127:a1a1:20::,64 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="alanyhq main" +DESC="" +ASN="4242420916" From 5882132d4fca0ed084173ac433e17f026c5cfd34 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sat, 16 May 2020 19:09:24 +0800 Subject: [PATCH 16/29] asn: AS4201270020: alanyhq backbone --- asn/AS4201270020 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 asn/AS4201270020 diff --git a/asn/AS4201270020 b/asn/AS4201270020 new file mode 100644 index 0000000..69cbe23 --- /dev/null +++ b/asn/AS4201270020 @@ -0,0 +1,3 @@ +NAME="alanyhq backbone" +OWNER="alanyhq" +DESC="alanyhq backbone" From 4c5e0631710d02402e56f523f7ba17941abd7621 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sat, 16 May 2020 19:22:33 +0800 Subject: [PATCH 17/29] route6: fd10:127:a1a1:20::/64 should belong to AS4201270020 --- route6/fd10:127:a1a1:20::,64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/route6/fd10:127:a1a1:20::,64 b/route6/fd10:127:a1a1:20::,64 index 1ca4459..4279453 100644 --- a/route6/fd10:127:a1a1:20::,64 +++ b/route6/fd10:127:a1a1:20::,64 @@ -1,4 +1,4 @@ TYPE=SUBNET -NAME="alanyhq main" +NAME="alanyhq backbone" DESC="" -ASN="4242420916" +ASN="4201270020" From 92da5549f6e43fb0bae6d3fe2b0f595b86f0e3ed Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sun, 17 May 2020 17:54:55 +0800 Subject: [PATCH 18/29] removed alanyhq ASes --- asn/AS4201270020 | 3 --- asn/AS4201270021 | 3 --- asn/AS4201270022 | 3 --- asn/AS4201270023 | 3 --- asn/AS4201270024 | 3 --- asn/AS4201270025 | 3 --- asn/AS4201270026 | 3 --- asn/AS4201270027 | 3 --- asn/AS4201270028 | 3 --- asn/AS4201270029 | 3 --- asn/AS4201270030 | 3 --- asn/AS4201270031 | 3 --- asn/AS4201270032 | 3 --- asn/AS4201270033 | 3 --- asn/AS4201270034 | 3 --- asn/AS4201270035 | 3 --- asn/AS4201270036 | 3 --- asn/AS4201270037 | 3 --- asn/AS4201270038 | 3 --- asn/AS4201270039 | 3 --- 20 files changed, 60 deletions(-) delete mode 100644 asn/AS4201270020 delete mode 100644 asn/AS4201270021 delete mode 100644 asn/AS4201270022 delete mode 100644 asn/AS4201270023 delete mode 100644 asn/AS4201270024 delete mode 100644 asn/AS4201270025 delete mode 100644 asn/AS4201270026 delete mode 100644 asn/AS4201270027 delete mode 100644 asn/AS4201270028 delete mode 100644 asn/AS4201270029 delete mode 100644 asn/AS4201270030 delete mode 100644 asn/AS4201270031 delete mode 100644 asn/AS4201270032 delete mode 100644 asn/AS4201270033 delete mode 100644 asn/AS4201270034 delete mode 100644 asn/AS4201270035 delete mode 100644 asn/AS4201270036 delete mode 100644 asn/AS4201270037 delete mode 100644 asn/AS4201270038 delete mode 100644 asn/AS4201270039 diff --git a/asn/AS4201270020 b/asn/AS4201270020 deleted file mode 100644 index 69cbe23..0000000 --- a/asn/AS4201270020 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq backbone" -OWNER="alanyhq" -DESC="alanyhq backbone" diff --git a/asn/AS4201270021 b/asn/AS4201270021 deleted file mode 100644 index 1fcd5da..0000000 --- a/asn/AS4201270021 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Shanghai, CN" -OWNER="alanyhq" -DESC="alanyhq in Shanghai, CN" diff --git a/asn/AS4201270022 b/asn/AS4201270022 deleted file mode 100644 index 4c6fb6e..0000000 --- a/asn/AS4201270022 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Beijing, CN" -OWNER="alanyhq" -DESC="alanyhq in Beijing, CN" diff --git a/asn/AS4201270023 b/asn/AS4201270023 deleted file mode 100644 index d4b7076..0000000 --- a/asn/AS4201270023 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Guangzhou, CN" -OWNER="alanyhq" -DESC="alanyhq in Guangzhou, CN" diff --git a/asn/AS4201270024 b/asn/AS4201270024 deleted file mode 100644 index f648737..0000000 --- a/asn/AS4201270024 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Hongkong, CN" -OWNER="alanyhq" -DESC="alanyhq in Hongkong, CN" diff --git a/asn/AS4201270025 b/asn/AS4201270025 deleted file mode 100644 index 38e9e93..0000000 --- a/asn/AS4201270025 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Taiwan, CN" -OWNER="alanyhq" -DESC="alanyhq in Taiwan, CN" diff --git a/asn/AS4201270026 b/asn/AS4201270026 deleted file mode 100644 index de3e209..0000000 --- a/asn/AS4201270026 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Sydney, AU" -OWNER="alanyhq" -DESC="alanyhq in Sydney, AU" diff --git a/asn/AS4201270027 b/asn/AS4201270027 deleted file mode 100644 index 5f90aa8..0000000 --- a/asn/AS4201270027 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Singapore" -OWNER="alanyhq" -DESC="alanyhq in Singapore" diff --git a/asn/AS4201270028 b/asn/AS4201270028 deleted file mode 100644 index 8cd46f2..0000000 --- a/asn/AS4201270028 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Tokyo, JP" -OWNER="alanyhq" -DESC="alanyhq in Tokyo, JP" diff --git a/asn/AS4201270029 b/asn/AS4201270029 deleted file mode 100644 index d8f8f07..0000000 --- a/asn/AS4201270029 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Seoul, KR" -OWNER="alanyhq" -DESC="alanyhq in Seoul, KR" diff --git a/asn/AS4201270030 b/asn/AS4201270030 deleted file mode 100644 index 1c66edc..0000000 --- a/asn/AS4201270030 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Johannesburg, ZA" -OWNER="alanyhq" -DESC="alanyhq in Johannesburg, ZA" diff --git a/asn/AS4201270031 b/asn/AS4201270031 deleted file mode 100644 index 174d730..0000000 --- a/asn/AS4201270031 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in London, UK" -OWNER="alanyhq" -DESC="alanyhq in London, UK" diff --git a/asn/AS4201270032 b/asn/AS4201270032 deleted file mode 100644 index 4269aae..0000000 --- a/asn/AS4201270032 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Frankfurt, DE" -OWNER="alanyhq" -DESC="alanyhq in Frankfurt, DE" diff --git a/asn/AS4201270033 b/asn/AS4201270033 deleted file mode 100644 index 70c8946..0000000 --- a/asn/AS4201270033 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Paris, FR" -OWNER="alanyhq" -DESC="alanyhq in Paris, FR" diff --git a/asn/AS4201270034 b/asn/AS4201270034 deleted file mode 100644 index df7875d..0000000 --- a/asn/AS4201270034 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Amsterdam, NL" -OWNER="alanyhq" -DESC="alanyhq in Amsterdam, NL" diff --git a/asn/AS4201270035 b/asn/AS4201270035 deleted file mode 100644 index 017af28..0000000 --- a/asn/AS4201270035 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Copenhagen, DK" -OWNER="alanyhq" -DESC="alanyhq in Copenhagen, DK" diff --git a/asn/AS4201270036 b/asn/AS4201270036 deleted file mode 100644 index b232582..0000000 --- a/asn/AS4201270036 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Warsaw, PL" -OWNER="alanyhq" -DESC="alanyhq in Warsaw, PL" diff --git a/asn/AS4201270037 b/asn/AS4201270037 deleted file mode 100644 index 33ae92c..0000000 --- a/asn/AS4201270037 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Madrid, ES" -OWNER="alanyhq" -DESC="alanyhq in Madrid, ES" diff --git a/asn/AS4201270038 b/asn/AS4201270038 deleted file mode 100644 index d6e426f..0000000 --- a/asn/AS4201270038 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in Oslo, NO" -OWNER="alanyhq" -DESC="alanyhq in Oslo, NO" diff --git a/asn/AS4201270039 b/asn/AS4201270039 deleted file mode 100644 index fa45dee..0000000 --- a/asn/AS4201270039 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="alanyhq in São Paulo, BR" -OWNER="alanyhq" -DESC="alanyhq in São Paulo, BR" From 438f5e54723606422c4abd085b2ef792b03a93b4 Mon Sep 17 00:00:00 2001 From: "Staph. aureus" Date: Mon, 18 May 2020 03:44:38 +0000 Subject: [PATCH 19/29] Minor fixes --- nodes.dot | 4 ++-- route/10.127.8.184,29 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nodes.dot b/nodes.dot index 6cd2ebd..b8e070b 100644 --- a/nodes.dot +++ b/nodes.dot @@ -20,8 +20,8 @@ digraph "NeoNetwork Nodes" magicneko_RU01 [label="M-RU1\n(10.127.4.14,\nfd10:127:0233:7170:2021::10.127.4.14)"] magicneko_JP03 [label="M-JP3\n(10.127.4.15,\nfd10:127:0233:7170:2021::10.127.4.15)"] magicneko_CN01 [label="M-CN1\n(10.127.4.101,\nfd10:127:0233:7170:2021::10.127.4.101)"] - staph [label="s.aureus.ga\n(10.127.8.185)\n(AS4201270007)"] - staph_CN [label="cnhome.aureus.ga\n(10.127.8.187)\n(AS4201270007)"] + staph [label="s.aureus.ga\n(10.127.8.185\nfd10:127:7::1)\n(AS4201270007)"] + staph_CN [label="cnhome.aureus.ga\n(10.127.8.187\nfd10:127:7::3)\n(AS4201270007)"] chenx97 [label="chenx97.neocloud.tw\n(AS4201270003)"] JerryXiao [label="jpn.neo.jerryxiao.cc\n(10.127.8.193)"] JerryXiao_SH01 [label="jerryxiao-sh01\n(10.127.8.195)"] diff --git a/route/10.127.8.184,29 b/route/10.127.8.184,29 index ad82cf8..0ec7caa 100644 --- a/route/10.127.8.184,29 +++ b/route/10.127.8.184,29 @@ -1,4 +1,4 @@ TYPE="SUBNET" NAME="StaphNet" -DESC="For Staph equipments around the world" +DESC="For Staph-infected equipments around the world" ASN="4201270007" From 70496c90ba8c16ec89cf20c6e14b92b8cc192f2b Mon Sep 17 00:00:00 2001 From: Licson Date: Mon, 18 May 2020 23:03:41 +0800 Subject: [PATCH 20/29] Minor fixes (#75) Co-authored-by: Staph. aureus --- asn/AS134098 | 3 +++ entity/licson | 12 ++++++++++++ route/10.127.14.0,23 | 4 ++++ 3 files changed, 19 insertions(+) create mode 100644 asn/AS134098 create mode 100644 entity/licson create mode 100644 route/10.127.14.0,23 diff --git a/asn/AS134098 b/asn/AS134098 new file mode 100644 index 0000000..b4cf550 --- /dev/null +++ b/asn/AS134098 @@ -0,0 +1,3 @@ +NAME="Licson Internal Network" +OWNER="licson" +DESC="" diff --git a/entity/licson b/entity/licson new file mode 100644 index 0000000..f2bf9ca --- /dev/null +++ b/entity/licson @@ -0,0 +1,12 @@ +NAME="licson" +DESC="" +CONTACT=( + "EMAIL:admin@licson.net" + "TELEGRAM:licson" + "IRC:licson" + "MASTODON:" + "GITHUB:licson0729" +) +BABEL=( + "" +) diff --git a/route/10.127.14.0,23 b/route/10.127.14.0,23 new file mode 100644 index 0000000..61095a7 --- /dev/null +++ b/route/10.127.14.0,23 @@ -0,0 +1,4 @@ +TYPE="SUBNET" +NAME="LICSON-NET-SUBALLOC-1" +DESC="" +ASN="134098" From c81aa1ef0ded0c9bc92eac48bb080583adcf47d9 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Mon, 18 May 2020 23:09:36 +0800 Subject: [PATCH 21/29] removed route6 of alanyhq --- route6/fd10:127:a1a1:20::,64 | 4 ---- route6/fd10:127:a1a1:21::,64 | 4 ---- route6/fd10:127:a1a1:22::,64 | 4 ---- route6/fd10:127:a1a1:23::,64 | 4 ---- route6/fd10:127:a1a1:24::,64 | 4 ---- route6/fd10:127:a1a1:25::,64 | 4 ---- route6/fd10:127:a1a1:26::,64 | 4 ---- route6/fd10:127:a1a1:27::,64 | 4 ---- route6/fd10:127:a1a1:28::,64 | 4 ---- route6/fd10:127:a1a1:29::,64 | 4 ---- route6/fd10:127:a1a1:30::,64 | 4 ---- route6/fd10:127:a1a1:31::,64 | 4 ---- route6/fd10:127:a1a1:32::,64 | 4 ---- route6/fd10:127:a1a1:33::,64 | 4 ---- route6/fd10:127:a1a1:34::,64 | 4 ---- route6/fd10:127:a1a1:35::,64 | 4 ---- route6/fd10:127:a1a1:36::,64 | 4 ---- route6/fd10:127:a1a1:37::,64 | 4 ---- route6/fd10:127:a1a1:38::,64 | 4 ---- route6/fd10:127:a1a1:39::,64 | 4 ---- 20 files changed, 80 deletions(-) delete mode 100644 route6/fd10:127:a1a1:20::,64 delete mode 100644 route6/fd10:127:a1a1:21::,64 delete mode 100644 route6/fd10:127:a1a1:22::,64 delete mode 100644 route6/fd10:127:a1a1:23::,64 delete mode 100644 route6/fd10:127:a1a1:24::,64 delete mode 100644 route6/fd10:127:a1a1:25::,64 delete mode 100644 route6/fd10:127:a1a1:26::,64 delete mode 100644 route6/fd10:127:a1a1:27::,64 delete mode 100644 route6/fd10:127:a1a1:28::,64 delete mode 100644 route6/fd10:127:a1a1:29::,64 delete mode 100644 route6/fd10:127:a1a1:30::,64 delete mode 100644 route6/fd10:127:a1a1:31::,64 delete mode 100644 route6/fd10:127:a1a1:32::,64 delete mode 100644 route6/fd10:127:a1a1:33::,64 delete mode 100644 route6/fd10:127:a1a1:34::,64 delete mode 100644 route6/fd10:127:a1a1:35::,64 delete mode 100644 route6/fd10:127:a1a1:36::,64 delete mode 100644 route6/fd10:127:a1a1:37::,64 delete mode 100644 route6/fd10:127:a1a1:38::,64 delete mode 100644 route6/fd10:127:a1a1:39::,64 diff --git a/route6/fd10:127:a1a1:20::,64 b/route6/fd10:127:a1a1:20::,64 deleted file mode 100644 index 4279453..0000000 --- a/route6/fd10:127:a1a1:20::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq backbone" -DESC="" -ASN="4201270020" diff --git a/route6/fd10:127:a1a1:21::,64 b/route6/fd10:127:a1a1:21::,64 deleted file mode 100644 index 2a8fa6a..0000000 --- a/route6/fd10:127:a1a1:21::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Shanghai, CN" -DESC="" -ASN="4201270021" diff --git a/route6/fd10:127:a1a1:22::,64 b/route6/fd10:127:a1a1:22::,64 deleted file mode 100644 index cd99c69..0000000 --- a/route6/fd10:127:a1a1:22::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Beijing, CN" -DESC="" -ASN="4201270022" diff --git a/route6/fd10:127:a1a1:23::,64 b/route6/fd10:127:a1a1:23::,64 deleted file mode 100644 index 3597993..0000000 --- a/route6/fd10:127:a1a1:23::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Guangzhou, CN" -DESC="" -ASN="4201270023" diff --git a/route6/fd10:127:a1a1:24::,64 b/route6/fd10:127:a1a1:24::,64 deleted file mode 100644 index b450f29..0000000 --- a/route6/fd10:127:a1a1:24::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Hongkong, CN" -DESC="" -ASN="4201270024" diff --git a/route6/fd10:127:a1a1:25::,64 b/route6/fd10:127:a1a1:25::,64 deleted file mode 100644 index 30cea1d..0000000 --- a/route6/fd10:127:a1a1:25::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Taiwan, CN" -DESC="" -ASN="4201270025" diff --git a/route6/fd10:127:a1a1:26::,64 b/route6/fd10:127:a1a1:26::,64 deleted file mode 100644 index 01d8628..0000000 --- a/route6/fd10:127:a1a1:26::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Sydney, AU" -DESC="" -ASN="4201270026" diff --git a/route6/fd10:127:a1a1:27::,64 b/route6/fd10:127:a1a1:27::,64 deleted file mode 100644 index 367fb27..0000000 --- a/route6/fd10:127:a1a1:27::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Singapore" -DESC="" -ASN="4201270027" diff --git a/route6/fd10:127:a1a1:28::,64 b/route6/fd10:127:a1a1:28::,64 deleted file mode 100644 index ad2cf62..0000000 --- a/route6/fd10:127:a1a1:28::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Tokyo, JP" -DESC="" -ASN="4201270028" diff --git a/route6/fd10:127:a1a1:29::,64 b/route6/fd10:127:a1a1:29::,64 deleted file mode 100644 index 228c9be..0000000 --- a/route6/fd10:127:a1a1:29::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Seoul, KR" -DESC="" -ASN="4201270029" diff --git a/route6/fd10:127:a1a1:30::,64 b/route6/fd10:127:a1a1:30::,64 deleted file mode 100644 index f56e6c3..0000000 --- a/route6/fd10:127:a1a1:30::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Johannesburg, ZA" -DESC="" -ASN="4201270030" diff --git a/route6/fd10:127:a1a1:31::,64 b/route6/fd10:127:a1a1:31::,64 deleted file mode 100644 index bf74f56..0000000 --- a/route6/fd10:127:a1a1:31::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in London, UK" -DESC="" -ASN="4201270031" diff --git a/route6/fd10:127:a1a1:32::,64 b/route6/fd10:127:a1a1:32::,64 deleted file mode 100644 index 128c99b..0000000 --- a/route6/fd10:127:a1a1:32::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Frankfurt, DE" -DESC="" -ASN="4201270032" diff --git a/route6/fd10:127:a1a1:33::,64 b/route6/fd10:127:a1a1:33::,64 deleted file mode 100644 index 11dd15f..0000000 --- a/route6/fd10:127:a1a1:33::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Paris, FR" -DESC="" -ASN="4201270033" diff --git a/route6/fd10:127:a1a1:34::,64 b/route6/fd10:127:a1a1:34::,64 deleted file mode 100644 index 25962fd..0000000 --- a/route6/fd10:127:a1a1:34::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Amsterdam, NL" -DESC="" -ASN="4201270034" diff --git a/route6/fd10:127:a1a1:35::,64 b/route6/fd10:127:a1a1:35::,64 deleted file mode 100644 index 63700d8..0000000 --- a/route6/fd10:127:a1a1:35::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Copenhagen, DK" -DESC="" -ASN="4201270035" diff --git a/route6/fd10:127:a1a1:36::,64 b/route6/fd10:127:a1a1:36::,64 deleted file mode 100644 index f351e27..0000000 --- a/route6/fd10:127:a1a1:36::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Warsaw, PL" -DESC="" -ASN="4201270036" diff --git a/route6/fd10:127:a1a1:37::,64 b/route6/fd10:127:a1a1:37::,64 deleted file mode 100644 index a465d73..0000000 --- a/route6/fd10:127:a1a1:37::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Madrid, ES" -DESC="" -ASN="4201270037" diff --git a/route6/fd10:127:a1a1:38::,64 b/route6/fd10:127:a1a1:38::,64 deleted file mode 100644 index 4461f98..0000000 --- a/route6/fd10:127:a1a1:38::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in Oslo, NO" -DESC="" -ASN="4201270038" diff --git a/route6/fd10:127:a1a1:39::,64 b/route6/fd10:127:a1a1:39::,64 deleted file mode 100644 index 05c7e98..0000000 --- a/route6/fd10:127:a1a1:39::,64 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE=SUBNET -NAME="alanyhq in São Paulo, BR" -DESC="" -ASN="4201270039" From 3ece98193041247067b24f36599662b75444eeb3 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Tue, 19 May 2020 10:21:13 +0800 Subject: [PATCH 22/29] validated @licson 's ASN --- asn/AS134098 | 1 + document/asn-dir.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/asn/AS134098 b/asn/AS134098 index b4cf550..815baf4 100644 --- a/asn/AS134098 +++ b/asn/AS134098 @@ -1,3 +1,4 @@ NAME="Licson Internal Network" OWNER="licson" DESC="" +VALID="YES" diff --git a/document/asn-dir.txt b/document/asn-dir.txt index 23f873e..2da5a95 100644 --- a/document/asn-dir.txt +++ b/document/asn-dir.txt @@ -8,3 +8,7 @@ NAME="" OWNER="" # Description DESC="" +# if it's a ASN registered from *NIC, this variable records +# whether members of NeoNetwork have validated its ownership yet +# possible value: "YES" "NO" +VALID="" From b6282cdf6d6f527b2c79c4d6c5a9c74668ba7dcb Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Tue, 19 May 2020 10:31:41 +0800 Subject: [PATCH 23/29] entity-dir: added AUTH variable (OpenPGP key fingerprint) --- document/entity-dir.txt | 2 ++ entity/Icecat | 1 + entity/James58899 | 1 + entity/JerryXiao | 1 + entity/LINE-NZ | 1 + entity/Lan Tian | 1 + entity/LibreHouse | 1 + entity/Ndoskrnl | 1 + entity/Neo_Chen | 1 + entity/SUNNET | 1 + entity/Septs | 1 + entity/Staph | 1 + entity/Yangfl | 1 + entity/alanyhq | 1 + entity/chenx97 | 1 + entity/frank | 1 + entity/licson | 1 + entity/santost12 | 1 + 18 files changed, 19 insertions(+) diff --git a/document/entity-dir.txt b/document/entity-dir.txt index e03dc03..951a206 100644 --- a/document/entity-dir.txt +++ b/document/entity-dir.txt @@ -16,3 +16,5 @@ CONTACT=( BABEL=( "" ) +# OpenPGP key fingerprint +AUTH="PGP:" diff --git a/entity/Icecat b/entity/Icecat index 705a33f..e7ec9ed 100644 --- a/entity/Icecat +++ b/entity/Icecat @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/James58899 b/entity/James58899 index ba3d526..7026cfc 100644 --- a/entity/James58899 +++ b/entity/James58899 @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/JerryXiao b/entity/JerryXiao index 748f16c..9521a2b 100644 --- a/entity/JerryXiao +++ b/entity/JerryXiao @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/LINE-NZ b/entity/LINE-NZ index c9fef83..0cbb66c 100644 --- a/entity/LINE-NZ +++ b/entity/LINE-NZ @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "en" ) +AUTH="PGP:" diff --git a/entity/Lan Tian b/entity/Lan Tian index 56f794b..d32a110 100644 --- a/entity/Lan Tian +++ b/entity/Lan Tian @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/LibreHouse b/entity/LibreHouse index 24b8479..76cb93e 100644 --- a/entity/LibreHouse +++ b/entity/LibreHouse @@ -14,3 +14,4 @@ BABEL=( "en-2" "ja-0" ) +AUTH="PGP:" diff --git a/entity/Ndoskrnl b/entity/Ndoskrnl index 77bb01d..288fa69 100644 --- a/entity/Ndoskrnl +++ b/entity/Ndoskrnl @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "zh|en-1" ) +AUTH="PGP:" diff --git a/entity/Neo_Chen b/entity/Neo_Chen index c9c9f87..518e662 100644 --- a/entity/Neo_Chen +++ b/entity/Neo_Chen @@ -11,3 +11,4 @@ BABEL=( "zh-N" "en-2" ) +AUTH="PGP:D306BB628837043150CD1E42CA0957540FD996CD" diff --git a/entity/SUNNET b/entity/SUNNET index cf6e1ad..845ae22 100644 --- a/entity/SUNNET +++ b/entity/SUNNET @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/Septs b/entity/Septs index a0e9cf0..1fb3bfa 100644 --- a/entity/Septs +++ b/entity/Septs @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/Staph b/entity/Staph index 60c3fbc..ec8fed9 100644 --- a/entity/Staph +++ b/entity/Staph @@ -14,3 +14,4 @@ BABEL=( "es-1" "fr-1" ) +AUTH="PGP:" diff --git a/entity/Yangfl b/entity/Yangfl index 67f9134..0ef69b8 100644 --- a/entity/Yangfl +++ b/entity/Yangfl @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/alanyhq b/entity/alanyhq index 0291086..f7acc82 100644 --- a/entity/alanyhq +++ b/entity/alanyhq @@ -11,3 +11,4 @@ BABEL=( "zh-N" "en-2" ) +AUTH="PGP:" diff --git a/entity/chenx97 b/entity/chenx97 index de2ae20..ed1fce1 100644 --- a/entity/chenx97 +++ b/entity/chenx97 @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/frank b/entity/frank index 0d0a89c..4758fc3 100644 --- a/entity/frank +++ b/entity/frank @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/licson b/entity/licson index f2bf9ca..255acb8 100644 --- a/entity/licson +++ b/entity/licson @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" diff --git a/entity/santost12 b/entity/santost12 index fb1f6e0..2e3126c 100644 --- a/entity/santost12 +++ b/entity/santost12 @@ -10,3 +10,4 @@ CONTACT=( BABEL=( "" ) +AUTH="PGP:" From 5a7de190814e4ee8f5ad5cddfde3f41977dc5e1f Mon Sep 17 00:00:00 2001 From: Jerry Date: Tue, 19 May 2020 10:16:56 +0800 Subject: [PATCH 24/29] remove dead asn --- asn/AS4201270040 | 3 --- asn/AS4201270041 | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 asn/AS4201270040 delete mode 100644 asn/AS4201270041 diff --git a/asn/AS4201270040 b/asn/AS4201270040 deleted file mode 100644 index 4d6c801..0000000 --- a/asn/AS4201270040 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="Oxygen233" -OWNER="JerryXiao" -DESC="Oxygen233-AS" diff --git a/asn/AS4201270041 b/asn/AS4201270041 deleted file mode 100644 index c95ec97..0000000 --- a/asn/AS4201270041 +++ /dev/null @@ -1,3 +0,0 @@ -NAME="Oxygen233" -OWNER="JerryXiao" -DESC="Oxygen233-CN" From 96a138e8b9e603b4cc8c36c58c4a69694c0542cd Mon Sep 17 00:00:00 2001 From: Jerry Date: Tue, 19 May 2020 10:51:44 +0800 Subject: [PATCH 25/29] add auth for jerryxiao --- entity/Icecat | 2 +- entity/James58899 | 2 +- entity/JerryXiao | 2 +- entity/LINE-NZ | 2 +- entity/Lan Tian | 2 +- entity/LibreHouse | 2 +- entity/Ndoskrnl | 2 +- entity/Neo_Chen | 2 +- entity/SUNNET | 2 +- entity/Septs | 2 +- entity/Staph | 2 +- entity/Yangfl | 2 +- entity/alanyhq | 2 +- entity/chenx97 | 2 +- entity/frank | 2 +- entity/licson | 2 +- entity/santost12 | 2 +- scripts/roa.py | 11 ++++++++++- 18 files changed, 27 insertions(+), 18 deletions(-) diff --git a/entity/Icecat b/entity/Icecat index e7ec9ed..f794757 100644 --- a/entity/Icecat +++ b/entity/Icecat @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/James58899 b/entity/James58899 index 7026cfc..7c6219c 100644 --- a/entity/James58899 +++ b/entity/James58899 @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/JerryXiao b/entity/JerryXiao index 9521a2b..45cb524 100644 --- a/entity/JerryXiao +++ b/entity/JerryXiao @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="PGP:186242204A2EC70438E9CE3B9D9CE43650FF2BAA" diff --git a/entity/LINE-NZ b/entity/LINE-NZ index 0cbb66c..26eae7b 100644 --- a/entity/LINE-NZ +++ b/entity/LINE-NZ @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "en" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/Lan Tian b/entity/Lan Tian index d32a110..690f116 100644 --- a/entity/Lan Tian +++ b/entity/Lan Tian @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/LibreHouse b/entity/LibreHouse index 76cb93e..ccbb13b 100644 --- a/entity/LibreHouse +++ b/entity/LibreHouse @@ -14,4 +14,4 @@ BABEL=( "en-2" "ja-0" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/Ndoskrnl b/entity/Ndoskrnl index 288fa69..d178abe 100644 --- a/entity/Ndoskrnl +++ b/entity/Ndoskrnl @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "zh|en-1" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/Neo_Chen b/entity/Neo_Chen index 518e662..ece7b4b 100644 --- a/entity/Neo_Chen +++ b/entity/Neo_Chen @@ -11,4 +11,4 @@ BABEL=( "zh-N" "en-2" ) -AUTH="PGP:D306BB628837043150CD1E42CA0957540FD996CD" +AUTH="" diff --git a/entity/SUNNET b/entity/SUNNET index 845ae22..df0d2d7 100644 --- a/entity/SUNNET +++ b/entity/SUNNET @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/Septs b/entity/Septs index 1fb3bfa..fa76f99 100644 --- a/entity/Septs +++ b/entity/Septs @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/Staph b/entity/Staph index ec8fed9..5ef685a 100644 --- a/entity/Staph +++ b/entity/Staph @@ -14,4 +14,4 @@ BABEL=( "es-1" "fr-1" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/Yangfl b/entity/Yangfl index 0ef69b8..7d29678 100644 --- a/entity/Yangfl +++ b/entity/Yangfl @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/alanyhq b/entity/alanyhq index f7acc82..ca1bf27 100644 --- a/entity/alanyhq +++ b/entity/alanyhq @@ -11,4 +11,4 @@ BABEL=( "zh-N" "en-2" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/chenx97 b/entity/chenx97 index ed1fce1..e05de6d 100644 --- a/entity/chenx97 +++ b/entity/chenx97 @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/frank b/entity/frank index 4758fc3..64d8408 100644 --- a/entity/frank +++ b/entity/frank @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/licson b/entity/licson index 255acb8..4d0806d 100644 --- a/entity/licson +++ b/entity/licson @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/entity/santost12 b/entity/santost12 index 2e3126c..e0a429a 100644 --- a/entity/santost12 +++ b/entity/santost12 @@ -10,4 +10,4 @@ CONTACT=( BABEL=( "" ) -AUTH="PGP:" +AUTH="" diff --git a/scripts/roa.py b/scripts/roa.py index 42d8bdb..31e681f 100755 --- a/scripts/roa.py +++ b/scripts/roa.py @@ -77,7 +77,7 @@ def neoneo_get_people(): if not f.is_file(): continue fc = shell2dict(f.read_text()) - present_keys = ('name', 'desc', 'contact', 'babel') + present_keys = ('name', 'desc', 'contact', 'babel', 'auth') assert f.name people[f.name] = {k: fc.get(k) for k in present_keys} nic_hdl = name2nichdl(f.name) @@ -86,6 +86,15 @@ def neoneo_get_people(): people[f.name]['nic_hdl'] = nic_hdl for v in people[f.name].values(): assert v is not None + auth = people[f.name]['auth'] + if auth: + method, data = auth.split(':') + assert method in ('PGP', 'SSH') + if method == 'PGP': + assert len(data) == 40 # invaild pgp fingerprint + elif method == 'SSH': + assert data.startswith('ssh-') # invalid ssh pubkey + people[f.name]['auth'] = f"{'pgp-fingerprint ' if method == 'PGP' else ''}{data.strip()}" except Exception: print("[!] Error while processing file", f) raise From 76d852b9dbf54f2e942765dd666ae5ecdb45e13a Mon Sep 17 00:00:00 2001 From: Jerry Date: Tue, 19 May 2020 10:54:40 +0800 Subject: [PATCH 26/29] oops --- entity/Neo_Chen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entity/Neo_Chen b/entity/Neo_Chen index ece7b4b..518e662 100644 --- a/entity/Neo_Chen +++ b/entity/Neo_Chen @@ -11,4 +11,4 @@ BABEL=( "zh-N" "en-2" ) -AUTH="" +AUTH="PGP:D306BB628837043150CD1E42CA0957540FD996CD" From 020de28872abd75255e67b6c436a64aae678070f Mon Sep 17 00:00:00 2001 From: Junde Yhi Date: Tue, 19 May 2020 16:49:33 +0800 Subject: [PATCH 27/29] Register "Yhi Interconnect" to NeoNetwork (#76) * entity: add yhi * asn/AS4201270012: register * node/yhi-h: add * route: register10.127.5.0/28 for yhi-h * entity/Junde Yhi: convert spaces to tabs for indentation * entity/Junde Yhi: add missing DESC --- asn/AS4201270012 | 3 +++ entity/Junde Yhi | 19 +++++++++++++++++++ node/yhi-h | 4 ++++ route/10.127.5.0,28 | 4 ++++ 4 files changed, 30 insertions(+) create mode 100644 asn/AS4201270012 create mode 100644 entity/Junde Yhi create mode 100644 node/yhi-h create mode 100644 route/10.127.5.0,28 diff --git a/asn/AS4201270012 b/asn/AS4201270012 new file mode 100644 index 0000000..b675043 --- /dev/null +++ b/asn/AS4201270012 @@ -0,0 +1,3 @@ +NAME="Yhi Interconnect" +OWNER="Junde Yhi" +DESC="" diff --git a/entity/Junde Yhi b/entity/Junde Yhi new file mode 100644 index 0000000..5b94a98 --- /dev/null +++ b/entity/Junde Yhi @@ -0,0 +1,19 @@ +NAME="Junde Yhi" +DESC="" +CONTACT=( + "EMAIL:lmy441900@live.com" + "TELEGRAM:@lmy441900" + "MASTODON:@lmy441900@sn.angry.im" + "GITHUB:lmy441900" +) +BABEL=( + "zh-N" + "zh-hans-N" + "zh-hant-2" + "en-3" + "de-0" + "ru-0" + "jp-0" + "fi-0" +) +AUTH="PGP:E6C74782A1FBEE741D09885FD274286F672C800A" diff --git a/node/yhi-h b/node/yhi-h new file mode 100644 index 0000000..f13f128 --- /dev/null +++ b/node/yhi-h @@ -0,0 +1,4 @@ +ASN="AS4201270012" +DESC="" +IP=( +) diff --git a/route/10.127.5.0,28 b/route/10.127.5.0,28 new file mode 100644 index 0000000..d4c1f14 --- /dev/null +++ b/route/10.127.5.0,28 @@ -0,0 +1,4 @@ +TYPE=SUBNET +NAME="yhi-h" +DESC="Yhi Interconnect H" +ASN="AS4201270012" From b8d91fef399460932ee1901606e012dbe00ab6fb Mon Sep 17 00:00:00 2001 From: leedagee <61650578+leedagee@users.noreply.github.com> Date: Wed, 20 May 2020 18:52:54 +0800 Subject: [PATCH 28/29] Register leedagee (#78) * Register leedagee * leedagee: AS4201270014 --- asn/AS4201270014 | 3 +++ entity/leedagee | 13 +++++++++++++ node/leedagee | 4 ++++ route/10.127.23.0,29 | 4 ++++ 4 files changed, 24 insertions(+) create mode 100644 asn/AS4201270014 create mode 100644 entity/leedagee create mode 100644 node/leedagee create mode 100644 route/10.127.23.0,29 diff --git a/asn/AS4201270014 b/asn/AS4201270014 new file mode 100644 index 0000000..54ad6c3 --- /dev/null +++ b/asn/AS4201270014 @@ -0,0 +1,3 @@ +NAME="leedagee" +OWNER="leedagee" +DESC="" diff --git a/entity/leedagee b/entity/leedagee new file mode 100644 index 0000000..9f3b587 --- /dev/null +++ b/entity/leedagee @@ -0,0 +1,13 @@ +NAME="leedagee" +DESC="" +CONTACT=( + "EMAIL:leedageea@gmail.com" + "TELEGRAM:@leedagee" + "IRC:lizr" + "GITHUB:leedagee" +) +BABEL=( + "zh-N" + "en-2" +) +AUTH="PGP:47627D2288B20CC033C7B7D72D83E4E89C15DA36" diff --git a/node/leedagee b/node/leedagee new file mode 100644 index 0000000..d478866 --- /dev/null +++ b/node/leedagee @@ -0,0 +1,4 @@ +ASN="4201270014" +DESC="" +IP=( +) diff --git a/route/10.127.23.0,29 b/route/10.127.23.0,29 new file mode 100644 index 0000000..d6dec21 --- /dev/null +++ b/route/10.127.23.0,29 @@ -0,0 +1,4 @@ +TYPE="SUBNET" +NAME="leedagee" +DESC="leedagee" +ASN="4201270014" From a5f71ba1779aa613fb21817cffe0885d844814ae Mon Sep 17 00:00:00 2001 From: leedagee <61650578+leedagee@users.noreply.github.com> Date: Wed, 20 May 2020 21:01:57 +0800 Subject: [PATCH 29/29] leedagee: add ipv6 net (#79) * Register leedagee * leedagee: AS4201270014 * leedagee: add ipv6 net --- route6/fd10:127:0023::,48 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 route6/fd10:127:0023::,48 diff --git a/route6/fd10:127:0023::,48 b/route6/fd10:127:0023::,48 new file mode 100644 index 0000000..d6dec21 --- /dev/null +++ b/route6/fd10:127:0023::,48 @@ -0,0 +1,4 @@ +TYPE="SUBNET" +NAME="leedagee" +DESC="leedagee" +ASN="4201270014"