1
0
Fork 0
mirror of https://github.com/NeoCloud/NeoNetwork synced 2024-11-22 16:40:41 +08:00

Merge branch 'master' into master

This commit is contained in:
Neo_Chen 2020-04-22 18:11:25 +08:00 committed by GitHub
commit 03553bba2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 79 additions and 49 deletions

View file

@ -11,6 +11,7 @@ Telegram Group invitation link available at TXT record of `join-telegram.neoclou
cuiqh.nerdpool.ovh (10.127.0.34, Area 1) cuiqh.nerdpool.ovh (10.127.0.34, Area 1)
fiona.yukipedia.cf (10.127.0.30, Area 2) fiona.yukipedia.cf (10.127.0.30, Area 2)
hk-01.nextmoe.cloud.imiku.cn (10.127.0.58, Area 3, ASN 4200012450) hk-01.nextmoe.cloud.imiku.cn (10.127.0.58, Area 3, ASN 4200012450)
bgp.septs.me ( , ASN 4200055555)
## Routing Protocols ## Routing Protocols
Any protocol supported by Quagga or FRRouting, recommended to use BGP. Any protocol supported by Quagga or FRRouting, recommended to use BGP.

View file

@ -1,6 +1,7 @@
# BGP AS Number: (Private AS) # BGP AS Number: (Private AS)
AS Number Name AS Number Name
===============|================================================================
4201048576 Neo_Chen 4201048576 Neo_Chen
4200078274 Staph 4200078274 Staph
4200012450 icecat 4200012450 icecat
@ -9,3 +10,6 @@ AS Number Name
4200055555 Septs 4200055555 Septs
4200002547 Lan Tian 4200002547 Lan Tian
4242423088 SUNNET 4242423088 SUNNET
4203223939 LibreHouse (outvi)
4200006969 santost12
4242420140 dfceaef

View file

@ -1,52 +1,51 @@
; NeoNetwork DNS Record ; NeoNetwork DNS Record
$TTL 604800 $TTL 604800
@ IN SOA NeoPDP-11.NeoNetwork.unix. root.NeoNetwork.unix. ( @ IN SOA NeoPDP-11.neo. root.neo. (
4096 ; Serial 4096 ; Serial
604800 ; Refresh 604800 ; Refresh
86400 ; Retry 86400 ; Retry
2419200 ; Expire 2419200 ; Expire
604800 ) ; Negative Cache TTL 604800 ) ; Negative Cache TTL
; ;
@ IN NS NeoPDP-11.NeoNetwork.unix. @ IN NS NeoPDP-11.neo.
1.1 IN PTR NeoPDP-11.NeoNetwork.unix. 1.1 IN PTR NeoPDP-11.neo.
14.0 IN PTR NeoPDP-11.NeoNetwork.unix. 14.0 IN PTR NeoPDP-11.neo.
18.0 IN PTR NeoPDP-11.NeoNetwork.unix. 18.0 IN PTR NeoPDP-11.neo.
42.0 IN PTR NeoPDP-11.NeoNetwork.unix. 42.0 IN PTR NeoPDP-11.neo.
1.255 IN PTR NeoPDP-11.NeoNetwork.unix. 1.255 IN PTR NeoPDP-11.neo.
; CROOM 40.1 IN PTR cklvax.neo.
40.1 IN PTR cklvax.NeoNetwork.unix. 63.1 IN PTR NNPCC.neo.
63.1 IN PTR NNPCC.NeoNetwork.unix. 20.1 IN PTR NeoBOX.neo.
20.1 IN PTR NeoBOX.NeoNetwork.unix. 10.1 IN PTR neostorage.neonetwork.
10.1 IN PTR neostorage.neonetwork.unix.
10.0 IN PTR NeoSystem.NeoNetwork.unix. 10.0 IN PTR NeoSystem.neo.
46.0 IN PTR NeoSystem.NeoNetwork.unix. 46.0 IN PTR NeoSystem.neo.
80.1 IN PTR NeoSystem.NeoNetwork.unix. 80.1 IN PTR NeoSystem.neo.
80.255 IN PTR NeoSystem.NeoNetwork.unix. 80.255 IN PTR NeoSystem.neo.
2.0 IN PTR ucbvax.NeoNetwork.unix. 2.0 IN PTR ucbvax.neo.
9.0 IN PTR ucbvax.NeoNetwork.unix. 9.0 IN PTR ucbvax.neo.
13.0 IN PTR ucbvax.NeoNetwork.unix. 13.0 IN PTR ucbvax.neo.
29.0 IN PTR ucbvax.NeoNetwork.unix. 29.0 IN PTR ucbvax.neo.
37.0 IN PTR ucbvax.NeoNetwork.unix. 37.0 IN PTR ucbvax.neo.
57.0 IN PTR ucbvax.NeoNetwork.unix. 57.0 IN PTR ucbvax.neo.
61.0 IN PTR ucbvax.NeoNetwork.unix. 61.0 IN PTR ucbvax.neo.
2.255 IN PTR ucbvax.NeoNetwork.unix. 2.255 IN PTR ucbvax.neo.
1.0 IN PTR caasih.NeoNetwork.unix. 1.0 IN PTR caasih.neo.
17.0 IN PTR caasih.NeoNetwork.unix. 17.0 IN PTR caasih.neo.
33.0 IN PTR caasih.NeoNetwork.unix. 33.0 IN PTR caasih.neo.
69.0 IN PTR caasih.NeoNetwork.unix. 69.0 IN PTR caasih.neo.
1.3 IN PTR pan.NeoNetwork.unix. 1.3 IN PTR pan.neo.
41.0 IN PTR pan.NeoNetwork.unix. 41.0 IN PTR pan.neo.
45.0 IN PTR pan.NeoNetwork.unix. 45.0 IN PTR pan.neo.
62.0 IN PTR pan.NeoNetwork.unix. 62.0 IN PTR pan.neo.
70.0 IN PTR staph.NeoNetwork.unix. 70.0 IN PTR staph.neo.
97.0 IN PTR staph.NeoNetwork.unix. 97.0 IN PTR staph.neo.
185.8 IN PTR staph.NeoNetwork.unix. 185.8 IN PTR staph.neo.
187.8 IN PTR staph-cn.NeoNetwork.unix. 187.8 IN PTR staph-cn.neo.

View file

@ -10,7 +10,7 @@ options {
// Add this for no IPv4: // Add this for no IPv4:
listen-on { any; }; listen-on { any; };
allow-recursion { 127.0.0.1; 10.127.0.0/16; }; allow-recursion { any; };
allow-transfer { none; }; allow-transfer { none; };
allow-query { any; }; allow-query { any; };
allow-update { none; }; allow-update { none; };
@ -45,7 +45,7 @@ zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"
file "localhost.ip6.zone"; file "localhost.ip6.zone";
}; };
zone "NeoNetwork.unix" IN { zone "neo." IN {
type forward; type forward;
forward only; forward only;
forwarders { 10.127.1.1; }; forwarders { 10.127.1.1; };

View file

@ -1,16 +1,16 @@
; NeoNetwork DNS Record ; NeoNetwork DNS Record
$TTL 604800 $TTL 604800
@ IN SOA NeoPDP-11.NeoNetwork.unix. root.NeoNetwork.unix. ( @ IN SOA NeoPDP-11.neo. root.neo. (
4096 ; Serial 4096 ; Serial
604800 ; Refresh 604800 ; Refresh
86400 ; Retry 86400 ; Retry
2419200 ; Expire 2419200 ; Expire
604800 ) ; Negative Cache TTL 604800 ) ; Negative Cache TTL
; ;
@ IN NS NeoPDP-11.NeoNetwork.unix. @ IN NS NeoPDP-11.neo.
@ IN A 10.127.1.1 @ IN A 10.127.1.1
root IN CNAME neo.
NeoPDP-11 IN A 10.127.255.1 NeoPDP-11 IN A 10.127.255.1
ucbvax IN A 10.127.255.2 ucbvax IN A 10.127.255.2
caasih IN A 10.127.0.1 caasih IN A 10.127.0.1
@ -22,4 +22,3 @@ NNPCC IN A 10.127.1.63
NeoVAX IN A 10.127.0.38 NeoVAX IN A 10.127.0.38
pan IN A 10.127.3.1 pan IN A 10.127.3.1
telegram IN TXT "https://t.me/NeoNetworkVPN" telegram IN TXT "https://t.me/NeoNetworkVPN"
info IN TXT "NeoNetwork, operated by Neo_Chen"

View file

@ -23,9 +23,13 @@ digraph "NeoNetwork Nodes"
staph [label="s.aureus.ga\n(AS4200078274)"] staph [label="s.aureus.ga\n(AS4200078274)"]
staph_CN [label="cnhome.aureus.ga\n(10.127.8.187)\n(AS4200078274)"] staph_CN [label="cnhome.aureus.ga\n(10.127.8.187)\n(AS4200078274)"]
chenx97 [label="chenx97.neocloud.tw\n(AS4200114514)"] chenx97 [label="chenx97.neocloud.tw\n(AS4200114514)"]
JerryXiao [label="jpn.neo.jerryxiao.cc\n(AS4200066666)"] JerryXiao [label="jpn.neo.jerryxiao.cc\n(10.127.8.193)"]
JerryXiao_SH01 [label="jerryxiao-sh01\n(10.127.8.195)"]
JerryXiao_HK01 [label="jerryxiao-hk01\n(10.127.8.194)"]
JerryXiao_HK02 [label="jerryxiao-hk02\n(10.127.8.196)"]
septs [label="bgp.septs.me\n(AS4200055555)"] septs [label="bgp.septs.me\n(AS4200055555)"]
lantian [label="lantian\n(AS4200002547)"] lantian [label="lantian\n(AS4200002547)"]
dfceaef [label="dfceaef\n(AS4242420140)"]
subgraph cluster_AS4201048576 subgraph cluster_AS4201048576
{ {
@ -53,7 +57,7 @@ digraph "NeoNetwork Nodes"
subgraph cluster_AS4200012450 subgraph cluster_AS4200012450
{ {
label="MagicNeko Network (4200012450)"; label="MagicNeko Network (AS4200012450)";
magicneko_HK01-> icecat_Explosion magicneko_HK01-> icecat_Explosion
magicneko_HK02-> icecat_Explosion magicneko_HK02-> icecat_Explosion
@ -65,12 +69,23 @@ digraph "NeoNetwork Nodes"
icecat_Notebook -> icecat_Explosion icecat_Notebook -> icecat_Explosion
} }
subgraph cluster_AS4200066666
{
label="Jerry Network (AS4200066666)";
JerryXiao -> JerryXiao_SH01 [dir=both]
JerryXiao -> JerryXiao_HK01 [dir=both]
JerryXiao_SH01 -> JerryXiao_HK01 [dir=both]
JerryXiao_HK01 -> JerryXiao_HK02 [dir=both]
}
JerryXiao -> pan [dir=both] JerryXiao -> pan [dir=both]
JerryXiao -> ucbvax [dir=both] JerryXiao -> ucbvax [dir=both]
JerryXiao -> septs [dir=both]
JerryXiao_SH01 -> dfceaef [dir=both]
magicneko_JP03 -> JerryXiao [dir=both] magicneko_JP03 -> JerryXiao [dir=both]
lantian -> septs [dir=both] lantian -> septs [dir=both]
lantian -> JerryXiao [dir=both] lantian -> JerryXiao [dir=both]
JerryXiao -> septs [dir=both]
magicneko_JP03 -> septs [dir=both] magicneko_JP03 -> septs [dir=both]
staph -> septs [dir=both] staph -> septs [dir=both]
ucbvax -> septs [dir=both] ucbvax -> septs [dir=both]

View file

@ -1,8 +1,8 @@
# OSPF Area Number: # OSPF Area Number:
OSPF Area Name OSPF Area Name
===============|================================================================
0 Neo_Chen 0 Neo_Chen
1 Edward_P 1 Edward_P
2 LibreHouse 2 LibreHouse
3 Icecat 3 Icecat

View file

@ -12,7 +12,7 @@ Network ID Protocol Upstream Downstream Comment
10.127.0.12/30 Tinc ucbvax --> NeoPDP-11 10.127.0.12/30 Tinc ucbvax --> NeoPDP-11
10.127.0.16/30 Tinc caasih --> NeoPDP-11 10.127.0.16/30 Tinc caasih --> NeoPDP-11
10.127.0.20/30 Tinc NeoSystem <--> NeoVAX @1 10.127.0.20/30 Tinc NeoSystem <--> NeoVAX @1
10.127.0.24/30 <Available> 10.127.0.24/30 Gre staph <--> ??? Pending
10.127.0.28/30 Tinc ucbvax <--> fionaLHS 10.127.0.28/30 Tinc ucbvax <--> fionaLHS
10.127.0.32/30 Tinc caasih <--> ncuiqh 10.127.0.32/30 Tinc caasih <--> ncuiqh
10.127.0.36/30 Tinc ucbvax --> NeoVAX @1 10.127.0.36/30 Tinc ucbvax --> NeoVAX @1
@ -28,11 +28,23 @@ Network ID Protocol Upstream Downstream Comment
10.127.0.76/30 WireGuard JerryXiao <--> pan 10.127.0.76/30 WireGuard JerryXiao <--> pan
10.127.0.80/30 WireGuard JerryXiao <--> ucbvax 10.127.0.80/30 WireGuard JerryXiao <--> ucbvax
10.127.0.84/30 WireGuard MagicNeko-JP03 <--> JerryXiao 10.127.0.84/30 WireGuard MagicNeko-JP03 <--> JerryXiao
10.127.0.88/30 Gre septs <--> icecat-jp3
10.127.0.92/30 <Available> 10.127.0.92/30 <Available>
10.127.0.96/30 Gre staph <--> septs 10.127.0.96/30 Gre staph <--> septs
10.127.0.100/30 Gre septs <--> JerryXiao
10.127.0.104/30 Gre septs <--> fionaLHS
10.127.0.108/30 Gre septs <--> Lan Tian 10.127.0.108/30 Gre septs <--> Lan Tian
10.127.0.112/30 Gre septs <--> ucbvax 10.127.0.112/30 Gre septs <--> ucbvax
10.127.0.116/30 WireGuard ucbvax <--> santost12
10.127.0.116~252/30 <Available> 10.127.0.116~252/30 <Available>
=======
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
PP:10.127.8.195/32 : 10.127.8.194/32 WireGuard JerryXiao-SH1 <--> JerryXiao-HK1
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
@1 --> Non-24H @1 --> Non-24H
@ -54,7 +66,7 @@ Subnet Name Comment
10.127.9.0/24 JerryXiao-Home For home 10.127.9.0/24 JerryXiao-Home For home
10.127.10.0/24 Lan Tian LAN For LAN 10.127.10.0/24 Lan Tian LAN For LAN
10.127.11.0/24 SUNNET For SUN 10.127.11.0/24 SUNNET For SUN
10.127.69.0/24 santost12 For home
+======================+ +======================+
|| Loopback Addresses || || Loopback Addresses ||