From 14e7f50f791d43cc01dd9c0946988367e4754b21 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Thu, 23 Apr 2020 11:00:57 +0800 Subject: [PATCH 01/15] Add peer (septs-magicneko-ru01) by nextmoe_fengling --- nodes.dot | 1 + nodes.svg | 516 +++++++++++++++++++++++++++-------------------------- routes.txt | 3 +- 3 files changed, 269 insertions(+), 251 deletions(-) diff --git a/nodes.dot b/nodes.dot index e948975..d0e3516 100644 --- a/nodes.dot +++ b/nodes.dot @@ -91,4 +91,5 @@ digraph "NeoNetwork Nodes" megumiLHS -> septs [dir=both] icecat_Explosion -> SUNNET [dir=both] staph -> santost12 [dir=both] + magicneko_RU01 -> septs [dir=both] } diff --git a/nodes.svg b/nodes.svg index 03908a3..fe85ee0 100644 --- a/nodes.svg +++ b/nodes.svg @@ -1,512 +1,528 @@ - - - + + NeoNetwork Nodes - -NeoNetwork Nodes + +NeoNetwork Nodes cluster_AS4201048576 - -NeoNetwork (AS4201048576) + +NeoNetwork (AS4201048576) cluster_AS4200012450 - -MagicNeko Network (AS4200012450) + +MagicNeko Network (AS4200012450) cluster_AS4200066666 - -Jerry Network (AS4200066666) + +Jerry Network (AS4200066666) c - -caasih.neocloud.tw -(10.127.0.1) - - - -staph - -s.aureus.ga -(AS4200078274) - - - -c->staph - - + +caasih.neocloud.tw +(10.127.0.1) ucbvax - -router.neocloud.tw -(10.127.255.2) + +router.neocloud.tw +(10.127.255.2) ucbvax->c - - - + + + chenx97 - -chenx97.neocloud.tw -(AS4200114514) + +chenx97.neocloud.tw +(AS4200114514) - + ucbvax->chenx97 - - - + + + septs - -bgp.septs.me -(AS4200055555) + +bgp.septs.me +(AS4200055555) - + ucbvax->septs - - - + + + np11 - -NeoPDP-11 -(10.127.255.1, -10.127.1.1) + +NeoPDP-11 +(10.127.255.1, +10.127.1.1) np11->c - - + + np11->ucbvax - - + + pan - -r2.neocloud.tw -(10.127.3.1) + +r2.neocloud.tw +(10.127.3.1) np11->pan - - + + ns - -NeoSystem -(10.127.255.80) + +NeoSystem +(10.127.255.80) ns->ucbvax - - + + ns->pan - - + + megumiLHS - -megumi.yukipedia.cf -(AS4203223939) + +megumi.yukipedia.cf +(AS4203223939) megumiLHS->ucbvax - - - + + + - + megumiLHS->septs - - - + + + pan->ucbvax - - - + + + icecat_Explosion - -hk-01.nextmoe.cloud.imiku.cn -(10.127.0.58, -10.127.4.10) + +hk-01.nextmoe.cloud.imiku.cn +(10.127.0.58, +10.127.4.10) icecat_Explosion->ucbvax - - - + + + SUNNET - -SUNNET -(10.127.11.0/24) -(AS4242423088) + +SUNNET +(10.127.11.0/24) +(AS4242423088) - + icecat_Explosion->SUNNET - - - + + + icecat_Notebook - -Notebook -(10.127.0.64/30, -10.127.4.100) + +Notebook +(10.127.0.64/30, +10.127.4.100) - + icecat_Notebook->icecat_Explosion - - + + magicneko_HK01 - -M-HK1 -(10.127.4.1) + +M-HK1 +(10.127.4.1) - + magicneko_HK01->icecat_Explosion - - + + magicneko_HK02 - -M-HK2 -(10.127.4.10) + +M-HK2 +(10.127.4.10) - + magicneko_HK02->icecat_Explosion - - + + magicneko_JP01 - -M-JP1 -(10.127.4.11) + +M-JP1 +(10.127.4.11) - + magicneko_JP01->icecat_Explosion - - + + magicneko_HK03 - -M-HK3 -(10.127.4.12) + +M-HK3 +(10.127.4.12) - + magicneko_HK03->icecat_Explosion - - + + magicneko_JP02 - -M-JP2 -(10.127.4.13) + +M-JP2 +(10.127.4.13) - + magicneko_JP02->icecat_Explosion - - + + magicneko_RU01 - -M-RU1 -(10.127.4.14) + +M-RU1 +(10.127.4.14) - + magicneko_RU01->icecat_Explosion - - + + + + + +staph + +s.aureus.ga +(AS4200078274) - + magicneko_RU01->staph - - - + + + + + + +magicneko_RU01->septs + + + magicneko_JP03 - -M-JP3 -(10.127.4.15) + +M-JP3 +(10.127.4.15) - + magicneko_JP03->icecat_Explosion - - + + - + magicneko_JP03->chenx97 - - - + + + JerryXiao - -jpn.neo.jerryxiao.cc -(10.127.8.193) + +jpn.neo.jerryxiao.cc +(10.127.8.193) - + magicneko_JP03->JerryXiao - - - + + + - + magicneko_JP03->septs - - - + + + staph_CN - -cnhome.aureus.ga -(10.127.8.187) -(AS4200078274) + +cnhome.aureus.ga +(10.127.8.187) +(AS4200078274) - + staph->staph_CN - - + + - + staph->septs - - - + + + + + + +santost12 + +Santost12 +(10.127.69.1) +(AS4200006969) + + + +staph->santost12 + + + - + JerryXiao->ucbvax - - - + + + JerryXiao_SH01 - -jerryxiao-sh01 -(10.127.8.195) + +jerryxiao-sh01 +(10.127.8.195) - + JerryXiao->JerryXiao_SH01 - - - + + + JerryXiao_HK01 - -jerryxiao-hk01 -(10.127.8.194) + +jerryxiao-hk01 +(10.127.8.194) - + JerryXiao->JerryXiao_HK01 - - - + + + - + JerryXiao->septs - - - + + + - + JerryXiao_SH01->JerryXiao_HK01 - - - + + + dfceaef - -dfceaef -(AS4242420140) + +dfceaef +(AS4242420140) - + JerryXiao_SH01->dfceaef - - - + + + JerryXiao_HK02 - -jerryxiao-hk02 -(10.127.8.196) + +jerryxiao-hk02 +(10.127.8.196) - + JerryXiao_HK01->JerryXiao_HK02 - - - + + + lantian - -lantian -(AS4200002547) + +lantian +(AS4200002547) - + lantian->JerryXiao - - - + + + - + lantian->septs - - - + + + - + NNPCC - -NNPCC + +NNPCC NNPCC->np11 - - - + + + - + NeoBOX - -NeoBOX + +NeoBOX NeoBOX->np11 - - - + + + - + cklvax - -cklvax + +cklvax cklvax->np11 - - - + + + - + NeoStorage - -NeoStorage + +NeoStorage NeoStorage->np11 - - - + + + diff --git a/routes.txt b/routes.txt index d6b19e6..3c0f1fe 100644 --- a/routes.txt +++ b/routes.txt @@ -37,7 +37,8 @@ Network ID Protocol Upstream Downstream Comment 10.127.0.112/30 Gre septs <--> ucbvax 10.127.0.116/30 WireGuard ucbvax <--> santost12 10.127.0.120/30 WireGuard MagicNeko-JP03 <--> chenx97 -10.127.0.124~252/30 +10.127.0.124/30 Gre septs <--> MagicNeko-RU01 +10.127.0.128~252/30 ======= PP:10.127.8.193/32 : 10.127.8.195/32 WireGuard JerryXiao <--> JerryXiao-SH1 PP:10.127.8.193/32 : 10.127.8.194/32 WireGuard JerryXiao <--> JerryXiao-HK1 From d60e8e5bf3f0523ae7a9c9649f32219d129455a5 Mon Sep 17 00:00:00 2001 From: Outvi V <19144373+outloudvi@users.noreply.github.com> Date: Thu, 23 Apr 2020 11:49:16 +0800 Subject: [PATCH 02/15] AS4203223939: Request 10.127.8.0/26 --- routes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.txt b/routes.txt index 3c0f1fe..d6d8fc6 100644 --- a/routes.txt +++ b/routes.txt @@ -63,6 +63,7 @@ Subnet Name Comment 10.127.4.0/24 Icecat-Explosion For LANFor Magicneko Explosion Network Interworking address 10.127.5.0/24 172.24.5.0/24 Icecat-Mobile-devices For LANfor Mobile device internal network segment for testing connectivity quality, No SLA +10.127.8.0/26 LibreHouse For infrastratures in our network 10.127.8.184/29 StaphNet For Staph equipments around the world 10.127.8.192/26 JerryXiao-Infrastructure For cloud instances 10.127.9.0/24 JerryXiao-Home For home From 77eb444b4542662fde197a067d5e5d818db2ea4b Mon Sep 17 00:00:00 2001 From: Jerry Date: Thu, 23 Apr 2020 12:07:28 +0800 Subject: [PATCH 03/15] add missing info --- README.md | 1 + nodes.dot | 2 +- nodes.svg | 437 +++++++++++++++++++++++++++--------------------------- 3 files changed, 221 insertions(+), 219 deletions(-) diff --git a/README.md b/README.md index 50d1c02..1c238d9 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Telegram Group invitation link available at TXT record of `join-telegram.neoclou bgp.septs.me ( ASN 4200055555) jp-03.nextmoe.cloud.imiku.cn (10.127.4.15, ASN 4200012450) ru-01.nextmoe.cloud.imiku.cn (10.127.4.14, ASN 4200012450) + jpn.neo.jerryxiao.cc (10.127.8.193, ASN 4200066666) ## Routing Protocols Any protocol supported by Quagga or FRRouting, recommended to use BGP. diff --git a/nodes.dot b/nodes.dot index d0e3516..318b1c9 100644 --- a/nodes.dot +++ b/nodes.dot @@ -28,7 +28,7 @@ digraph "NeoNetwork Nodes" JerryXiao_HK02 [label="jerryxiao-hk02\n(10.127.8.196)"] septs [label="bgp.septs.me\n(AS4200055555)"] lantian [label="lantian\n(AS4200002547)"] - dfceaef [label="dfceaef\n(AS4242420140)"] + dfceaef [label="dfceaef\n(10.127.9.192/26)\n(AS4242420140)"] SUNNET [label="SUNNET\n(10.127.11.0/24)\n(AS4242423088)"] santost12 [label="Santost12\n(10.127.69.1)\n(AS4200006969)"] subgraph cluster_AS4201048576 diff --git a/nodes.svg b/nodes.svg index fe85ee0..ca72e91 100644 --- a/nodes.svg +++ b/nodes.svg @@ -1,528 +1,529 @@ - - + NeoNetwork Nodes - -NeoNetwork Nodes + +NeoNetwork Nodes cluster_AS4201048576 - -NeoNetwork (AS4201048576) + +NeoNetwork (AS4201048576) cluster_AS4200012450 - -MagicNeko Network (AS4200012450) + +MagicNeko Network (AS4200012450) cluster_AS4200066666 - -Jerry Network (AS4200066666) + +Jerry Network (AS4200066666) c - -caasih.neocloud.tw -(10.127.0.1) + +caasih.neocloud.tw +(10.127.0.1) ucbvax - -router.neocloud.tw -(10.127.255.2) + +router.neocloud.tw +(10.127.255.2) ucbvax->c - - - + + + chenx97 - -chenx97.neocloud.tw -(AS4200114514) + +chenx97.neocloud.tw +(AS4200114514) ucbvax->chenx97 - - - + + + septs - -bgp.septs.me -(AS4200055555) + +bgp.septs.me +(AS4200055555) ucbvax->septs - - - + + + np11 - -NeoPDP-11 -(10.127.255.1, -10.127.1.1) + +NeoPDP-11 +(10.127.255.1, +10.127.1.1) np11->c - - + + np11->ucbvax - - + + pan - -r2.neocloud.tw -(10.127.3.1) + +r2.neocloud.tw +(10.127.3.1) np11->pan - - + + ns - -NeoSystem -(10.127.255.80) + +NeoSystem +(10.127.255.80) ns->ucbvax - - + + ns->pan - - + + megumiLHS - -megumi.yukipedia.cf -(AS4203223939) + +megumi.yukipedia.cf +(AS4203223939) megumiLHS->ucbvax - - - + + + megumiLHS->septs - - - + + + pan->ucbvax - - - + + + icecat_Explosion - -hk-01.nextmoe.cloud.imiku.cn -(10.127.0.58, -10.127.4.10) + +hk-01.nextmoe.cloud.imiku.cn +(10.127.0.58, +10.127.4.10) icecat_Explosion->ucbvax - - - + + + SUNNET - -SUNNET -(10.127.11.0/24) -(AS4242423088) + +SUNNET +(10.127.11.0/24) +(AS4242423088) icecat_Explosion->SUNNET - - - + + + icecat_Notebook - -Notebook -(10.127.0.64/30, -10.127.4.100) + +Notebook +(10.127.0.64/30, +10.127.4.100) icecat_Notebook->icecat_Explosion - - + + magicneko_HK01 - -M-HK1 -(10.127.4.1) + +M-HK1 +(10.127.4.1) magicneko_HK01->icecat_Explosion - - + + magicneko_HK02 - -M-HK2 -(10.127.4.10) + +M-HK2 +(10.127.4.10) magicneko_HK02->icecat_Explosion - - + + magicneko_JP01 - -M-JP1 -(10.127.4.11) + +M-JP1 +(10.127.4.11) magicneko_JP01->icecat_Explosion - - + + magicneko_HK03 - -M-HK3 -(10.127.4.12) + +M-HK3 +(10.127.4.12) magicneko_HK03->icecat_Explosion - - + + magicneko_JP02 - -M-JP2 -(10.127.4.13) + +M-JP2 +(10.127.4.13) magicneko_JP02->icecat_Explosion - - + + magicneko_RU01 - -M-RU1 -(10.127.4.14) + +M-RU1 +(10.127.4.14) magicneko_RU01->icecat_Explosion - - + + staph - -s.aureus.ga -(AS4200078274) + +s.aureus.ga +(AS4200078274) magicneko_RU01->staph - - - + + + magicneko_RU01->septs - - - + + + magicneko_JP03 - -M-JP3 -(10.127.4.15) + +M-JP3 +(10.127.4.15) magicneko_JP03->icecat_Explosion - - + + magicneko_JP03->chenx97 - - - + + + JerryXiao - -jpn.neo.jerryxiao.cc -(10.127.8.193) + +jpn.neo.jerryxiao.cc +(10.127.8.193) magicneko_JP03->JerryXiao - - - + + + magicneko_JP03->septs - - - + + + staph_CN - -cnhome.aureus.ga -(10.127.8.187) -(AS4200078274) + +cnhome.aureus.ga +(10.127.8.187) +(AS4200078274) staph->staph_CN - - + + staph->septs - - - + + + santost12 - -Santost12 -(10.127.69.1) -(AS4200006969) + +Santost12 +(10.127.69.1) +(AS4200006969) staph->santost12 - - - + + + JerryXiao->ucbvax - - - + + + JerryXiao_SH01 - -jerryxiao-sh01 -(10.127.8.195) + +jerryxiao-sh01 +(10.127.8.195) JerryXiao->JerryXiao_SH01 - - - + + + JerryXiao_HK01 - -jerryxiao-hk01 -(10.127.8.194) + +jerryxiao-hk01 +(10.127.8.194) JerryXiao->JerryXiao_HK01 - - - + + + JerryXiao->septs - - - + + + JerryXiao_SH01->JerryXiao_HK01 - - - + + + dfceaef - -dfceaef -(AS4242420140) + +dfceaef +(10.127.9.192/26) +(AS4242420140) JerryXiao_SH01->dfceaef - - - + + + JerryXiao_HK02 - -jerryxiao-hk02 -(10.127.8.196) + +jerryxiao-hk02 +(10.127.8.196) JerryXiao_HK01->JerryXiao_HK02 - - - + + + lantian - -lantian -(AS4200002547) + +lantian +(AS4200002547) lantian->JerryXiao - - - + + + lantian->septs - - - + + + NNPCC - -NNPCC + +NNPCC NNPCC->np11 - - - + + + NeoBOX - -NeoBOX + +NeoBOX NeoBOX->np11 - - - + + + cklvax - -cklvax + +cklvax cklvax->np11 - - - + + + NeoStorage - -NeoStorage + +NeoStorage NeoStorage->np11 - - - + + + From 3b9cdc341115cf69c18bb68b0f021f4b6e150440 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 23 Apr 2020 12:00:36 +0800 Subject: [PATCH 04/15] Join as AS4200005566 --- bgp-asn.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bgp-asn.txt b/bgp-asn.txt index 4400a23..4439904 100644 --- a/bgp-asn.txt +++ b/bgp-asn.txt @@ -12,4 +12,5 @@ AS Number Name 4242423088 SUNNET 4203223939 LibreHouse (outvi) 4200006969 santost12 -4242420140 dfceaef \ No newline at end of file +4242420140 dfceaef +4200005566 frank From 789569be24b50033f4e71d8e34650fca7e1d3cb6 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 23 Apr 2020 12:50:36 +0800 Subject: [PATCH 05/15] Requested subnets and loopback address Requested subnet: - 10.127.56.0/24 Registered loopback address: - 10.127.255.56 --- routes.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routes.txt b/routes.txt index d6d8fc6..edb25ec 100644 --- a/routes.txt +++ b/routes.txt @@ -70,6 +70,7 @@ Subnet Name Comment 10.127.10.0/24 Lan Tian LAN For LAN 10.127.11.0/24 SUNNET For SUN 10.127.69.0/24 santost12 For home +10.127.56.0/24 frank-hsinchu For home +======================+ || Loopback Addresses || @@ -82,3 +83,4 @@ Loopback Address Name System Comment 10.127.255.2 ucbvax Arch Linux/frr 10.127.255.4 pan Arch Linux/frr 10.127.255.80 NeoSystem Arch Linux/frr +10.127.255.56 frank-hsinchu Ubuntu/bird From 8de403ba9303e3f70e5bdba751a828f37c8fe795 Mon Sep 17 00:00:00 2001 From: Outvi V <19144373+outloudvi@users.noreply.github.com> Date: Thu, 23 Apr 2020 13:25:42 +0800 Subject: [PATCH 06/15] routes: New peer at 10.127.0.128/30 --- routes.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routes.txt b/routes.txt index edb25ec..ba2e1d7 100644 --- a/routes.txt +++ b/routes.txt @@ -38,7 +38,8 @@ Network ID Protocol Upstream Downstream Comment 10.127.0.116/30 WireGuard ucbvax <--> santost12 10.127.0.120/30 WireGuard MagicNeko-JP03 <--> chenx97 10.127.0.124/30 Gre septs <--> MagicNeko-RU01 -10.127.0.128~252/30 +10.127.0.128/30 Gre MagicNeko-JP03 <--> megumiLHS +10.127.0.132~252/30 ======= PP:10.127.8.193/32 : 10.127.8.195/32 WireGuard JerryXiao <--> JerryXiao-SH1 PP:10.127.8.193/32 : 10.127.8.194/32 WireGuard JerryXiao <--> JerryXiao-HK1 From ab1ab503e34889a2eea1d46dbf23ae1c58546121 Mon Sep 17 00:00:00 2001 From: Outvi V Date: Thu, 23 Apr 2020 13:32:54 +0800 Subject: [PATCH 07/15] new peer: magicneko_JP03 <-> megumiLHS --- nodes.dot | 1 + nodes.svg | 445 +++++++++++++++++++++++++++--------------------------- 2 files changed, 227 insertions(+), 219 deletions(-) diff --git a/nodes.dot b/nodes.dot index 318b1c9..80e5a53 100644 --- a/nodes.dot +++ b/nodes.dot @@ -92,4 +92,5 @@ digraph "NeoNetwork Nodes" icecat_Explosion -> SUNNET [dir=both] staph -> santost12 [dir=both] magicneko_RU01 -> septs [dir=both] + magicneko_JP03 -> megumiLHS [dir=both] } diff --git a/nodes.svg b/nodes.svg index ca72e91..86d380e 100644 --- a/nodes.svg +++ b/nodes.svg @@ -4,526 +4,533 @@ - - + + NeoNetwork Nodes - -NeoNetwork Nodes + +NeoNetwork Nodes cluster_AS4201048576 - -NeoNetwork (AS4201048576) + +NeoNetwork (AS4201048576) cluster_AS4200012450 - -MagicNeko Network (AS4200012450) + +MagicNeko Network (AS4200012450) cluster_AS4200066666 - -Jerry Network (AS4200066666) + +Jerry Network (AS4200066666) c - -caasih.neocloud.tw -(10.127.0.1) + +caasih.neocloud.tw +(10.127.0.1) ucbvax - -router.neocloud.tw -(10.127.255.2) + +router.neocloud.tw +(10.127.255.2) ucbvax->c - - - + + + chenx97 - -chenx97.neocloud.tw -(AS4200114514) + +chenx97.neocloud.tw +(AS4200114514) ucbvax->chenx97 - - - + + + septs - -bgp.septs.me -(AS4200055555) + +bgp.septs.me +(AS4200055555) ucbvax->septs - - - + + + np11 - -NeoPDP-11 -(10.127.255.1, -10.127.1.1) + +NeoPDP-11 +(10.127.255.1, +10.127.1.1) np11->c - - + + np11->ucbvax - - + + pan - -r2.neocloud.tw -(10.127.3.1) + +r2.neocloud.tw +(10.127.3.1) np11->pan - - + + ns - -NeoSystem -(10.127.255.80) + +NeoSystem +(10.127.255.80) ns->ucbvax - - + + ns->pan - - + + megumiLHS - -megumi.yukipedia.cf -(AS4203223939) + +megumi.yukipedia.cf +(AS4203223939) megumiLHS->ucbvax - - - + + + megumiLHS->septs - - - + + + pan->ucbvax - - - + + + icecat_Explosion - -hk-01.nextmoe.cloud.imiku.cn -(10.127.0.58, -10.127.4.10) + +hk-01.nextmoe.cloud.imiku.cn +(10.127.0.58, +10.127.4.10) icecat_Explosion->ucbvax - - - + + + SUNNET - -SUNNET -(10.127.11.0/24) -(AS4242423088) + +SUNNET +(10.127.11.0/24) +(AS4242423088) icecat_Explosion->SUNNET - - - + + + icecat_Notebook - -Notebook -(10.127.0.64/30, -10.127.4.100) + +Notebook +(10.127.0.64/30, +10.127.4.100) icecat_Notebook->icecat_Explosion - - + + magicneko_HK01 - -M-HK1 -(10.127.4.1) + +M-HK1 +(10.127.4.1) magicneko_HK01->icecat_Explosion - - + + magicneko_HK02 - -M-HK2 -(10.127.4.10) + +M-HK2 +(10.127.4.10) magicneko_HK02->icecat_Explosion - - + + magicneko_JP01 - -M-JP1 -(10.127.4.11) + +M-JP1 +(10.127.4.11) magicneko_JP01->icecat_Explosion - - + + magicneko_HK03 - -M-HK3 -(10.127.4.12) + +M-HK3 +(10.127.4.12) magicneko_HK03->icecat_Explosion - - + + magicneko_JP02 - -M-JP2 -(10.127.4.13) + +M-JP2 +(10.127.4.13) magicneko_JP02->icecat_Explosion - - + + magicneko_RU01 - -M-RU1 -(10.127.4.14) + +M-RU1 +(10.127.4.14) magicneko_RU01->icecat_Explosion - - + + staph - -s.aureus.ga -(AS4200078274) + +s.aureus.ga +(AS4200078274) magicneko_RU01->staph - - - + + + magicneko_RU01->septs - - - + + + magicneko_JP03 - -M-JP3 -(10.127.4.15) + +M-JP3 +(10.127.4.15) + + + +magicneko_JP03->megumiLHS + + + magicneko_JP03->icecat_Explosion - - + + magicneko_JP03->chenx97 - - - + + + JerryXiao - -jpn.neo.jerryxiao.cc -(10.127.8.193) + +jpn.neo.jerryxiao.cc +(10.127.8.193) magicneko_JP03->JerryXiao - - - + + + magicneko_JP03->septs - - - + + + staph_CN - -cnhome.aureus.ga -(10.127.8.187) -(AS4200078274) + +cnhome.aureus.ga +(10.127.8.187) +(AS4200078274) staph->staph_CN - - + + staph->septs - - - + + + santost12 - -Santost12 -(10.127.69.1) -(AS4200006969) + +Santost12 +(10.127.69.1) +(AS4200006969) staph->santost12 - - - + + + JerryXiao->ucbvax - - - + + + JerryXiao_SH01 - -jerryxiao-sh01 -(10.127.8.195) + +jerryxiao-sh01 +(10.127.8.195) JerryXiao->JerryXiao_SH01 - - - + + + JerryXiao_HK01 - -jerryxiao-hk01 -(10.127.8.194) + +jerryxiao-hk01 +(10.127.8.194) JerryXiao->JerryXiao_HK01 - - - + + + JerryXiao->septs - - - + + + JerryXiao_SH01->JerryXiao_HK01 - - - + + + dfceaef - -dfceaef -(10.127.9.192/26) -(AS4242420140) + +dfceaef +(10.127.9.192/26) +(AS4242420140) JerryXiao_SH01->dfceaef - - - + + + JerryXiao_HK02 - -jerryxiao-hk02 -(10.127.8.196) + +jerryxiao-hk02 +(10.127.8.196) JerryXiao_HK01->JerryXiao_HK02 - - - + + + lantian - -lantian -(AS4200002547) + +lantian +(AS4200002547) lantian->JerryXiao - - - + + + lantian->septs - - - + + + NNPCC - -NNPCC + +NNPCC NNPCC->np11 - - - + + + NeoBOX - -NeoBOX + +NeoBOX NeoBOX->np11 - - - + + + cklvax - -cklvax + +cklvax cklvax->np11 - - - + + + NeoStorage - -NeoStorage + +NeoStorage NeoStorage->np11 - - - + + + From 505dc91e960dabc85fd83d544d5ff2b78425f21b Mon Sep 17 00:00:00 2001 From: Outvi V Date: Thu, 23 Apr 2020 13:34:12 +0800 Subject: [PATCH 08/15] Update IP and ASN of megumi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c238d9..607326c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Telegram Group invitation link available at TXT record of `join-telegram.neoclou caasih.neocloud.tw (10.127.0.1, ASN 4201048576) router.neocloud.tw (10.127.255.2, ASN 4201048576) r2.neocloud.tw (10.127.3.1, ASN 4201048576) - megumi.yukipedia.cf (10.127.0.30) + megumi.yukipedia.cf (10.127.30.1 ASN 4203223939) hk-01.nextmoe.cloud.imiku.cn (10.127.0.58, ASN 4200012450) bgp.septs.me ( ASN 4200055555) jp-03.nextmoe.cloud.imiku.cn (10.127.4.15, ASN 4200012450) From a93c8cef67d45b11aaeddc74b1f5886722758144 Mon Sep 17 00:00:00 2001 From: Outvi V <19144373+outloudvi@users.noreply.github.com> Date: Thu, 23 Apr 2020 13:35:13 +0800 Subject: [PATCH 09/15] README: fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 607326c..a691b75 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Telegram Group invitation link available at TXT record of `join-telegram.neoclou caasih.neocloud.tw (10.127.0.1, ASN 4201048576) router.neocloud.tw (10.127.255.2, ASN 4201048576) r2.neocloud.tw (10.127.3.1, ASN 4201048576) - megumi.yukipedia.cf (10.127.30.1 ASN 4203223939) + megumi.yukipedia.cf (10.127.30.1, ASN 4203223939) hk-01.nextmoe.cloud.imiku.cn (10.127.0.58, ASN 4200012450) bgp.septs.me ( ASN 4200055555) jp-03.nextmoe.cloud.imiku.cn (10.127.4.15, ASN 4200012450) From f7c15470d278f20f7934812443a23d333e18f62c Mon Sep 17 00:00:00 2001 From: Myer921 Date: Thu, 23 Apr 2020 14:42:27 +0800 Subject: [PATCH 10/15] Add Subnet Address by nextmoe_icecat --- routes.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/routes.txt b/routes.txt index ba2e1d7..64ee536 100644 --- a/routes.txt +++ b/routes.txt @@ -59,11 +59,11 @@ PP:10.127.8.185/32 : 10.127.69.1/32 WireGuard staph <--> santost12 Subnet Name Comment =======================|===============================|=========================================================================== 10.127.1.0/24 CROOM For LAN in school -10.127.2.0/24 NeoSystem VMs For LANVirtual Machine on NeoSystem -10.127.3.0/24 pan hub For LANFor non-multihome connection in Taiwan -10.127.4.0/24 Icecat-Explosion For LANFor Magicneko Explosion Network Interworking address +10.127.2.0/24 NeoSystem VMs For Virtual Machine on NeoSystem +10.127.3.0/24 pan hub For non-multihome connection in Taiwan +10.127.4.0/24 Icecat-Explosion For Magicneko Explosion Network Interworking address, No SLA 10.127.5.0/24 -172.24.5.0/24 Icecat-Mobile-devices For LANfor Mobile device internal network segment for testing connectivity quality, No SLA +172.24.5.0/24 Icecat-Mobile-devices For Mobile device internal network segment for testing connectivity quality, No SLA 10.127.8.0/26 LibreHouse For infrastratures in our network 10.127.8.184/29 StaphNet For Staph equipments around the world 10.127.8.192/26 JerryXiao-Infrastructure For cloud instances @@ -72,7 +72,7 @@ Subnet Name Comment 10.127.11.0/24 SUNNET For SUN 10.127.69.0/24 santost12 For home 10.127.56.0/24 frank-hsinchu For home - +10.127.254.0/24 Icecat-Mobile-devices For Mobile device internal network segment for testing connectivity quality, No SLA(=172.24.5.0/24) +======================+ || Loopback Addresses || +======================+ From 1946c9d4d2f3ce90ecbbe9abc8ff117d41ddf72e Mon Sep 17 00:00:00 2001 From: Myer921 Date: Thu, 23 Apr 2020 14:58:26 +0800 Subject: [PATCH 11/15] fixed address by nextmoe_icecat --- routes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.txt b/routes.txt index 64ee536..9f9aba5 100644 --- a/routes.txt +++ b/routes.txt @@ -72,7 +72,7 @@ Subnet Name Comment 10.127.11.0/24 SUNNET For SUN 10.127.69.0/24 santost12 For home 10.127.56.0/24 frank-hsinchu For home -10.127.254.0/24 Icecat-Mobile-devices For Mobile device internal network segment for testing connectivity quality, No SLA(=172.24.5.0/24) +10.127.233.0/24 Icecat-Mobile-devices For Mobile device internal network segment for testing connectivity quality, No SLA(=172.24.5.0/24) +======================+ || Loopback Addresses || +======================+ From a95c170d352b3b90095d659e536870f9477b7f08 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 23 Apr 2020 15:56:02 +0800 Subject: [PATCH 12/15] Update peering tunnel information --- routes.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routes.txt b/routes.txt index 64ee536..75031fc 100644 --- a/routes.txt +++ b/routes.txt @@ -39,7 +39,8 @@ Network ID Protocol Upstream Downstream Comment 10.127.0.120/30 WireGuard MagicNeko-JP03 <--> chenx97 10.127.0.124/30 Gre septs <--> MagicNeko-RU01 10.127.0.128/30 Gre MagicNeko-JP03 <--> megumiLHS -10.127.0.132~252/30 +10.127.0.132/30 WireGuard icecat-jp3 <--> frank-hsinchu +10.127.0.136~252/30 ======= PP:10.127.8.193/32 : 10.127.8.195/32 WireGuard JerryXiao <--> JerryXiao-SH1 PP:10.127.8.193/32 : 10.127.8.194/32 WireGuard JerryXiao <--> JerryXiao-HK1 From c8b537361c96e14a2bec56a2a97ddcab2ebe9190 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 23 Apr 2020 16:05:04 +0800 Subject: [PATCH 13/15] Update node graph. --- nodes.dot | 2 + nodes.svg | 469 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 244 insertions(+), 227 deletions(-) diff --git a/nodes.dot b/nodes.dot index 80e5a53..0b7d59c 100644 --- a/nodes.dot +++ b/nodes.dot @@ -31,6 +31,7 @@ digraph "NeoNetwork Nodes" dfceaef [label="dfceaef\n(10.127.9.192/26)\n(AS4242420140)"] SUNNET [label="SUNNET\n(10.127.11.0/24)\n(AS4242423088)"] santost12 [label="Santost12\n(10.127.69.1)\n(AS4200006969)"] + frank_hsinchu [label="Frank_Hsinchu\n(10.127.255.56)\n(AS4200005566)"] subgraph cluster_AS4201048576 { label = "NeoNetwork (AS4201048576)"; @@ -93,4 +94,5 @@ digraph "NeoNetwork Nodes" staph -> santost12 [dir=both] magicneko_RU01 -> septs [dir=both] magicneko_JP03 -> megumiLHS [dir=both] + magicneko_JP03 -> frank_hsinchu [dir=both] } diff --git a/nodes.svg b/nodes.svg index 86d380e..22d71f1 100644 --- a/nodes.svg +++ b/nodes.svg @@ -1,536 +1,551 @@ - - - + + NeoNetwork Nodes - -NeoNetwork Nodes + +NeoNetwork Nodes cluster_AS4201048576 - -NeoNetwork (AS4201048576) + +NeoNetwork (AS4201048576) cluster_AS4200012450 - -MagicNeko Network (AS4200012450) + +MagicNeko Network (AS4200012450) cluster_AS4200066666 - -Jerry Network (AS4200066666) + +Jerry Network (AS4200066666) c - -caasih.neocloud.tw -(10.127.0.1) + +caasih.neocloud.tw +(10.127.0.1) ucbvax - -router.neocloud.tw -(10.127.255.2) + +router.neocloud.tw +(10.127.255.2) ucbvax->c - - - + + + chenx97 - -chenx97.neocloud.tw -(AS4200114514) + +chenx97.neocloud.tw +(AS4200114514) ucbvax->chenx97 - - - + + + septs - -bgp.septs.me -(AS4200055555) + +bgp.septs.me +(AS4200055555) ucbvax->septs - - - + + + np11 - -NeoPDP-11 -(10.127.255.1, -10.127.1.1) + +NeoPDP-11 +(10.127.255.1, +10.127.1.1) np11->c - - + + np11->ucbvax - - + + pan - -r2.neocloud.tw -(10.127.3.1) + +r2.neocloud.tw +(10.127.3.1) np11->pan - - + + ns - -NeoSystem -(10.127.255.80) + +NeoSystem +(10.127.255.80) ns->ucbvax - - + + ns->pan - - + + megumiLHS - -megumi.yukipedia.cf -(AS4203223939) + +megumi.yukipedia.cf +(AS4203223939) megumiLHS->ucbvax - - - + + + megumiLHS->septs - - - + + + pan->ucbvax - - - + + + icecat_Explosion - -hk-01.nextmoe.cloud.imiku.cn -(10.127.0.58, -10.127.4.10) + +hk-01.nextmoe.cloud.imiku.cn +(10.127.0.58, +10.127.4.10) icecat_Explosion->ucbvax - - - + + + SUNNET - -SUNNET -(10.127.11.0/24) -(AS4242423088) + +SUNNET +(10.127.11.0/24) +(AS4242423088) icecat_Explosion->SUNNET - - - + + + icecat_Notebook - -Notebook -(10.127.0.64/30, -10.127.4.100) + +Notebook +(10.127.0.64/30, +10.127.4.100) icecat_Notebook->icecat_Explosion - - + + magicneko_HK01 - -M-HK1 -(10.127.4.1) + +M-HK1 +(10.127.4.1) magicneko_HK01->icecat_Explosion - - + + magicneko_HK02 - -M-HK2 -(10.127.4.10) + +M-HK2 +(10.127.4.10) magicneko_HK02->icecat_Explosion - - + + magicneko_JP01 - -M-JP1 -(10.127.4.11) + +M-JP1 +(10.127.4.11) magicneko_JP01->icecat_Explosion - - + + magicneko_HK03 - -M-HK3 -(10.127.4.12) + +M-HK3 +(10.127.4.12) magicneko_HK03->icecat_Explosion - - + + magicneko_JP02 - -M-JP2 -(10.127.4.13) + +M-JP2 +(10.127.4.13) magicneko_JP02->icecat_Explosion - - + + magicneko_RU01 - -M-RU1 -(10.127.4.14) + +M-RU1 +(10.127.4.14) magicneko_RU01->icecat_Explosion - - + + staph - -s.aureus.ga -(AS4200078274) + +s.aureus.ga +(AS4200078274) magicneko_RU01->staph - - - + + + magicneko_RU01->septs - - - + + + magicneko_JP03 - -M-JP3 -(10.127.4.15) + +M-JP3 +(10.127.4.15) magicneko_JP03->megumiLHS - - - + + + magicneko_JP03->icecat_Explosion - - + + magicneko_JP03->chenx97 - - - + + + JerryXiao - -jpn.neo.jerryxiao.cc -(10.127.8.193) + +jpn.neo.jerryxiao.cc +(10.127.8.193) magicneko_JP03->JerryXiao - - - + + + magicneko_JP03->septs - - - + + + + + + +frank_hsinchu + +Frank_Hsinchu +(10.127.255.56) +(AS4200005566) + + + +magicneko_JP03->frank_hsinchu + + + staph_CN - -cnhome.aureus.ga -(10.127.8.187) -(AS4200078274) + +cnhome.aureus.ga +(10.127.8.187) +(AS4200078274) staph->staph_CN - - + + staph->septs - - - + + + santost12 - -Santost12 -(10.127.69.1) -(AS4200006969) + +Santost12 +(10.127.69.1) +(AS4200006969) staph->santost12 - - - + + + JerryXiao->ucbvax - - - + + + JerryXiao_SH01 - -jerryxiao-sh01 -(10.127.8.195) + +jerryxiao-sh01 +(10.127.8.195) JerryXiao->JerryXiao_SH01 - - - + + + JerryXiao_HK01 - -jerryxiao-hk01 -(10.127.8.194) + +jerryxiao-hk01 +(10.127.8.194) JerryXiao->JerryXiao_HK01 - - - + + + JerryXiao->septs - - - + + + JerryXiao_SH01->JerryXiao_HK01 - - - + + + dfceaef - -dfceaef -(10.127.9.192/26) -(AS4242420140) + +dfceaef +(10.127.9.192/26) +(AS4242420140) JerryXiao_SH01->dfceaef - - - + + + JerryXiao_HK02 - -jerryxiao-hk02 -(10.127.8.196) + +jerryxiao-hk02 +(10.127.8.196) JerryXiao_HK01->JerryXiao_HK02 - - - + + + lantian - -lantian -(AS4200002547) + +lantian +(AS4200002547) lantian->JerryXiao - - - + + + lantian->septs - - - + + + - + NNPCC - -NNPCC + +NNPCC NNPCC->np11 - - - + + + - + NeoBOX - -NeoBOX + +NeoBOX NeoBOX->np11 - - - + + + - + cklvax - -cklvax + +cklvax cklvax->np11 - - - + + + - + NeoStorage - -NeoStorage + +NeoStorage NeoStorage->np11 - - - + + + From 6221ceefe636c8f65db704fa025f708e653a6e1e Mon Sep 17 00:00:00 2001 From: Henry Chen Date: Thu, 23 Apr 2020 04:13:43 -0700 Subject: [PATCH 14/15] chenx97: first draft of route-dir translation --- document/route-dir.en_US.txt | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 document/route-dir.en_US.txt diff --git a/document/route-dir.en_US.txt b/document/route-dir.en_US.txt new file mode 100644 index 0000000..5abcb72 --- /dev/null +++ b/document/route-dir.en_US.txt @@ -0,0 +1,44 @@ +IP Registration Directory Format Specification +======================= + +According to the common usage of this VPN network, the IP allocation can be +classified into the following rules, with its format normalized, as the +file name of the routing distribution definition file: + +1. Point-to-Point /30 Tunnel： `10.127.0.x/30` （where x is divisible by 4） +2. Contiguous Subnet： `10.127.x.y/z` (where z must be greater than 16） +3. Peer-to-Peer： `PP,10.127.x.x~10.127.x.x` （IP on both sides is /32） +4. Loopback Address： `10.127.255.x/32` + +Definition Format +======== + +The content of the file can be divided into the following fields. +To simplify processing, Shell Script variable definition syntax +will be used as the syntax of the definition file. In addition, variables must +be defined in the same order as the following: + + TYPE= + PROTO= （only for peer-to-peer /30 tunnels and peer-to-peer /32 peers） + SUBNET= or PEER=~ + UPSTREAM= （only for peer-to-peer /30 tunnels and peer-to-peer /32 peers） + DOWNSTREAM= （only for peer-to-peer /30 tunnels and peer-to-peer /32 peers） + +Detailed Information of Each Variable +============== + +1. TYPE: IP Usage Type + Available options are: TUN30, SUBNET, PP, LO （corresponding to the IP address + allocation type in the first section respectively） + +2. PROTO: VPN Protocol Used + Available options are: Tinc, WireGuard, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN + +3. SUBNET: Subnet Used + Format： Use CIDR Notation + +4. PEER: Peer-to-Peer Address + Format： ~ + +5. UPSTREAM: Upstream Node Name +6. DOWNSTREAM: Downstream Node Name From dbbe38a47154cd5ac0ba7815acfb5fe2d341222f Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Thu, 23 Apr 2020 22:56:26 +0800 Subject: [PATCH 15/15] document: route-dir.en_US: tidy up --- document/route-dir.en_US.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/document/route-dir.en_US.txt b/document/route-dir.en_US.txt index 5abcb72..c03f27f 100644 --- a/document/route-dir.en_US.txt +++ b/document/route-dir.en_US.txt @@ -1,17 +1,17 @@ IP Registration Directory Format Specification -======================= +============================================== According to the common usage of this VPN network, the IP allocation can be classified into the following rules, with its format normalized, as the file name of the routing distribution definition file: -1. Point-to-Point /30 Tunnel： `10.127.0.x/30` （where x is divisible by 4） -2. Contiguous Subnet： `10.127.x.y/z` (where z must be greater than 16） -3. Peer-to-Peer： `PP,10.127.x.x~10.127.x.x` （IP on both sides is /32） -4. Loopback Address： `10.127.255.x/32` +1. Point-to-Point /30 Tunnel: `10.127.0.x/30` （where x is divisible by 4） +2. Contiguous Subnet: `10.127.x.y/z` (where z must be greater than 16） +3. Peer-to-Peer: `PP,10.127.x.x~10.127.x.x` （IP on both sides is /32） +4. Loopback Address: `10.127.255.x/32` Definition Format -======== +================= The content of the file can be divided into the following fields. To simplify processing, Shell Script variable definition syntax @@ -19,26 +19,26 @@ will be used as the syntax of the definition file. In addition, variables must be defined in the same order as the following: TYPE= - PROTO= （only for peer-to-peer /30 tunnels and peer-to-peer /32 peers） + PROTO= (only for peer-to-peer /30 tunnels and peer-to-peer /32 peers) SUBNET= or PEER=~ - UPSTREAM= （only for peer-to-peer /30 tunnels and peer-to-peer /32 peers） - DOWNSTREAM= （only for peer-to-peer /30 tunnels and peer-to-peer /32 peers） + UPSTREAM= (only for peer-to-peer /30 tunnels and peer-to-peer /32 peers) + DOWNSTREAM= (only for peer-to-peer /30 tunnels and peer-to-peer /32 peers) Detailed Information of Each Variable -============== +===================================== 1. TYPE: IP Usage Type - Available options are: TUN30, SUBNET, PP, LO （corresponding to the IP address - allocation type in the first section respectively） + Available options are: TUN30, SUBNET, PP, LO (corresponding to the IP address + allocation type in the first section respectively) 2. PROTO: VPN Protocol Used Available options are: Tinc, WireGuard, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN 3. SUBNET: Subnet Used - Format： Use CIDR Notation + Format: Use CIDR Notation 4. PEER: Peer-to-Peer Address - Format： ~ + Format: ~ 5. UPSTREAM: Upstream Node Name 6. DOWNSTREAM: Downstream Node Name