diff --git a/README.md b/README.md index ae667cf..fe8f950 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ see routes.txt for allocated domain. There's a bind9 server on NeoPDP-11 (10.127.1.1), all domain names are under "neonetwork.unix". ## Connection Graph -![NeoNetwork Nodes](https://raw.githubusercontent.com/NeoChen1024/NeoNetwork/master/nodes.png) +![NeoNetwork Nodes](https://raw.githubusercontent.com/NeoChen1024/NeoNetwork/master/nodes.svg) ## Files and Directories: ospf-area.txt OSPF Area Number diff --git a/docs/index.html b/docs/index.html index 7387f79..cedfc37 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ see routes.txt for allocated domain.

Connection Graph

-

NeoNetwork Nodes

+

NeoNetwork Nodes

Files and Directories:

diff --git a/document/route-dir.zh_TW.txt b/document/route-dir.zh_TW.txt new file mode 100644 index 0000000..3d8a14e --- /dev/null +++ b/document/route-dir.zh_TW.txt @@ -0,0 +1,41 @@ +路由目錄格式定義文檔 +==================== + +按照本 VPN 網路之常見使用方式，可將 IP 分配歸類為下列 +幾種規則，並將其格式規範化，做為路由分配定義檔之檔案名稱： + +1. 點對點 /30 隧道： `10.127.0.x/30` （其中 x 可被 4 整除） +2. 連續子網路： `10.127.x.y/z` （其中， z 必定大於 16） +3. 點對點 Peer： `PP,10.127.x.x~10.127.x.x` （兩邊 IP 各為 /32） +4. Loopback 位址： `10.127.255.x/32` + +定義格式 +======== + +檔案內容可分為以下幾個欄位，由於要方便處裡，將會以類似 +Shell Script 定義變數的方式作為定義檔語法，此外，定義變數之 +順序必須與此處相同： + + TYPE= + PROTO= （僅限於點對點 /30 隧道，以及點對點 Peer） + SUBNET= 或是 PEER=<上游 IP>~<下游 IP> + UPSTREAM= + DOWNSTREAM= + +各變數詳細資訊 +============== + +1. TYPE: IP 使用類型 + 可用選項有： TUN30, SUBNET, PP, LO （分別對應第一節之 IP 位址分配類型） + +2. PROTO: 使用的 VPN 協定 + 可用選項有： Tinc, WireGuard, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN + +3. SUBNET: 使用的網域範圍 + 格式： 依照 CIDR + +4. PEER: 點對點 Peer 位址 + 格式： ~ + +5. UPSTREAM: 上游主機名稱 +6. DOWNSTREAM: 下游主機名稱 diff --git a/makegraph.sh b/makegraph.sh index 943cda8..68ca5fd 100755 --- a/makegraph.sh +++ b/makegraph.sh @@ -1,17 +1,8 @@ #!/bin/sh - set -xe if which dot 2>&1 > /dev/null ; then - dot -T png nodes.dot -o nodes.png + dot -T svg nodes.dot -o nodes.svg else echo 'You need to install graphviz first' fi - -if [ "$1" != 'noopt' ]; then - if which optipng 2>&1 > /dev/null ; then - optipng -o7 -zm9 -v nodes.png - else - echo 'optipng is not present, not optimizing compression' - fi -fi diff --git a/nodes.dot b/nodes.dot index 2973d6d..f053f4b 100644 --- a/nodes.dot +++ b/nodes.dot @@ -11,7 +11,7 @@ digraph "NeoNetwork Nodes" ncuiqh [label="ncuiqh.nerdpol.ovh\n(LEGACY)"] megumiLHS [label="megumi.yukipedia.cf"] pan [label="r2.neocloud.tw\n(10.127.3.1)"] - icecat_Explosion [label="hk-01.nextmoe.cloud.imiku.cn"] + icecat_Explosion [label="hk-01.nextmoe.cloud.imiku.cn\n(10.127.0.58,\n10.127.4.10)"] icecat_Notebook [label="Notebook\n(10.127.0.64/30,\n10.127.4.100)"] magicneko_HK01 [label="M-HK1\n(10.127.4.1)"] magicneko_HK02 [label="M-HK2\n(10.127.4.10)"] @@ -30,7 +30,7 @@ digraph "NeoNetwork Nodes" septs [label="bgp.septs.me\n(AS4200055555)"] lantian [label="lantian\n(AS4200002547)"] dfceaef [label="dfceaef\n(AS4242420140)"] - + SUNNET [label="SUNNET\n(10.127.11.0/24)\n(AS4242423088)"] subgraph cluster_AS4201048576 { label = "NeoNetwork (AS4201048576)"; @@ -92,4 +92,5 @@ digraph "NeoNetwork Nodes" magicneko_JP03 -> chenx97 [dir=both] magicneko_RU01 -> staph [dir=both] megumiLHS -> septs [dir=both] + icecat_Explosion -> SUNNET [dir=both] } diff --git a/nodes.png b/nodes.png deleted file mode 100644 index 34e0778..0000000 Binary files a/nodes.png and /dev/null differ diff --git a/nodes.svg b/nodes.svg new file mode 100644 index 0000000..c0827e1 --- /dev/null +++ b/nodes.svg @@ -0,0 +1,509 @@ + + + + + + +NeoNetwork Nodes + +NeoNetwork Nodes + +cluster_AS4201048576 + +NeoNetwork (AS4201048576) + + +cluster_AS4200012450 + +MagicNeko Network (AS4200012450) + + +cluster_AS4200066666 + +Jerry Network (AS4200066666) + + + +c + +caasih.neocloud.tw +(10.127.0.1) + + + +staph + +s.aureus.ga +(AS4200078274) + + + +c->staph + + + + + +ucbvax + +router.neocloud.tw +(10.127.255.2) + + + +ucbvax->c + + + + + + +chenx97 + +chenx97.neocloud.tw +(AS4200114514) + + + +ucbvax->chenx97 + + + + + + +septs + +bgp.septs.me +(AS4200055555) + + + +ucbvax->septs + + + + + + +np11 + +NeoPDP-11 +(10.127.255.1, +10.127.1.1) + + + +np11->c + + + + + +np11->ucbvax + + + + + +pan + +r2.neocloud.tw +(10.127.3.1) + + + +np11->pan + + + + + +ns + +NeoSystem +(10.127.255.80) + + + +ns->ucbvax + + + + + +ns->pan + + + + + +ncuiqh + +ncuiqh.nerdpol.ovh +(LEGACY) + + + +ncuiqh->c + + + + + + +fionaLHS + +fiona.yukipedia.cf +(LEGACY) + + + +fionaLHS->ucbvax + + + + + + +pan->ucbvax + + + + + + +icecat_Explosion + +hk-01.nextmoe.cloud.imiku.cn + + + +icecat_Explosion->ucbvax + + + + + + +icecat_Notebook + +Notebook +(10.127.0.64/30, +10.127.4.100) + + + +icecat_Notebook->icecat_Explosion + + + + + +magicneko_HK01 + +M-HK1 +(10.127.4.1) + + + +magicneko_HK01->icecat_Explosion + + + + + +magicneko_HK02 + +M-HK2 +(10.127.4.10) + + + +magicneko_HK02->icecat_Explosion + + + + + +magicneko_JP01 + +M-JP1 +(10.127.4.11) + + + +magicneko_JP01->icecat_Explosion + + + + + +magicneko_HK03 + +M-HK3 +(10.127.4.12) + + + +magicneko_HK03->icecat_Explosion + + + + + +magicneko_JP02 + +M-JP2 +(10.127.4.13) + + + +magicneko_JP02->icecat_Explosion + + + + + +magicneko_RU01 + +M-RU1 +(10.127.4.14) + + + +magicneko_RU01->icecat_Explosion + + + + + +magicneko_RU01->staph + + + + + + +magicneko_JP03 + +M-JP3 +(10.127.4.15) + + + +magicneko_JP03->icecat_Explosion + + + + + +magicneko_JP03->chenx97 + + + + + + +JerryXiao + +jpn.neo.jerryxiao.cc +(10.127.8.193) + + + +magicneko_JP03->JerryXiao + + + + + + +magicneko_JP03->septs + + + + + + +staph_CN + +cnhome.aureus.ga +(10.127.8.187) +(AS4200078274) + + + +staph->staph_CN + + + + + +staph->septs + + + + + + +JerryXiao->ucbvax + + + + + + +JerryXiao->pan + + + + + + +JerryXiao_SH01 + +jerryxiao-sh01 +(10.127.8.195) + + + +JerryXiao->JerryXiao_SH01 + + + + + + +JerryXiao_HK01 + +jerryxiao-hk01 +(10.127.8.194) + + + +JerryXiao->JerryXiao_HK01 + + + + + + +JerryXiao->septs + + + + + + +JerryXiao_SH01->JerryXiao_HK01 + + + + + + +dfceaef + +dfceaef +(AS4242420140) + + + +JerryXiao_SH01->dfceaef + + + + + + +JerryXiao_HK02 + +jerryxiao-hk02 +(10.127.8.196) + + + +JerryXiao_HK01->JerryXiao_HK02 + + + + + + +lantian + +lantian +(AS4200002547) + + + +lantian->JerryXiao + + + + + + +lantian->septs + + + + + + +NNPCC + +NNPCC + + + +NNPCC->np11 + + + + + + +NeoBOX + +NeoBOX + + + +NeoBOX->np11 + + + + + + +cklvax + +cklvax + + + +cklvax->np11 + + + + + + +NeoStorage + +NeoStorage + + + +NeoStorage->np11 + + + + + + diff --git a/routes.txt b/routes.txt index 7115737..b991987 100644 --- a/routes.txt +++ b/routes.txt @@ -45,7 +45,7 @@ PP:10.127.8.195/32 : 10.127.8.194/32 WireGuard JerryXiao-SH1 <--> JerryXiao-H PP:10.127.8.194/32 : 10.127.8.196/32 WireGuard JerryXiao-HK1 <--> JerryXiao-HK2 PP:10.127.8.193/32 : 10.127.10.1/32 WireGuard JerryXiao <--> Lan Tian PP:172.20.51.99/32 : 172.22.127.2/32 WireGuard JerryXiao <--> dfceaef - +PP:10.127.4.254/32 : 10.127.11.199/32 WireGuard Icecat-Explosion <--> SUNNET @1 --> Non-24H