diff --git a/README.md b/README.md index 50d1c02..a691b75 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,12 @@ 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) 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/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 diff --git a/document/route-dir.en_US.txt b/document/route-dir.en_US.txt new file mode 100644 index 0000000..c03f27f --- /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 diff --git a/nodes.dot b/nodes.dot index e948975..0b7d59c 100644 --- a/nodes.dot +++ b/nodes.dot @@ -28,9 +28,10 @@ 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)"] + frank_hsinchu [label="Frank_Hsinchu\n(10.127.255.56)\n(AS4200005566)"] subgraph cluster_AS4201048576 { label = "NeoNetwork (AS4201048576)"; @@ -91,4 +92,7 @@ digraph "NeoNetwork Nodes" megumiLHS -> septs [dir=both] icecat_Explosion -> SUNNET [dir=both] 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 03908a3..22d71f1 100644 --- a/nodes.svg +++ b/nodes.svg @@ -1,512 +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) - - - -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->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) + + + +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 - - - + + + diff --git a/routes.txt b/routes.txt index d6b19e6..73cb169 100644 --- a/routes.txt +++ b/routes.txt @@ -37,7 +37,10 @@ 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/30 Gre MagicNeko-JP03 <--> megumiLHS +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 @@ -57,18 +60,20 @@ 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 10.127.9.0/24 JerryXiao-Home For home 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 +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 || +======================+ @@ -80,3 +85,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