Merge remote-tracking branch 'upstream/master'

makegraph.sh

@@ -7,3 +7,11 @@ if which dot 2>&1 > /dev/null ; then
 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

nodes.dot

@@ -8,8 +8,7 @@ digraph "NeoNetwork Nodes"
 	ucbvax [label="ucbvax.nerdpol.ovh"]
 	np11 [label="NeoPDP-11"]
 	croom [label="CROOM (10.127.1.0/24)"]
-	np [label="NeoPortable"]
-	nv [label="NeoVAX"]
+	ns [label="NeoSystem"]
 	ncuiqh [label="ncuiqh.nerdpol.ovh"]
 	fionaLHS [label="fiona.yukipedia.cf"]
 	pan [label="r2.tw.pan93412.dedyn.io"]
@@ -22,15 +21,16 @@ digraph "NeoNetwork Nodes"
 		cklvax -> croom [dir=both]
 	}
 
-	np11 -> c
+	croom -> np11 [dir=both]
 	np11 -> ucbvax
 	np11 -> pan
+	np11 -> c
 	ucbvax -> c [dir=both]
-	croom -> np11 [dir=both]
-	np -> ucbvax
-	nv -> np [dir=both]
+	ns -> ucbvax
 	ncuiqh -> c [dir=both]
 	fionaLHS -> ucbvax [dir=both]
-	np -> pan
+	ns -> pan
 	icecat_Explosion -> ucbvax [dir=both]
+	pan -> ucbvax [dir=both]
+	pan -> c [dir=both]
 }

routes.txt

@@ -1,29 +1,55 @@
-# Point to Point Tunnels
+##########################
+# Point to Point Tunnels #
+##########################
 # Upstream's IP is Network ID + 1, Downstream's is Network ID + 2
 # Bidirection arrow means they could establish bidirectional connection
 
-# Network ID		Protocol	Upstream	     Downstream		Comment
+Network ID		Protocol	Upstream	     Downstream		Comment
+=======================|===============|====================|==================|===========================
 10.127.0.0/30		Tinc		caasih		<--> ucbvax
 10.127.0.4/30		Tinc		caasih		 --> NeoPortable	Normally not being used
-10.127.0.8/30		Tinc		ucbvax		 --> NeoPortable	@
+10.127.0.8/30		WireGuard	ucbvax		 --> NeoPortable	@1
 10.127.0.12/30		Tinc		ucbvax		 --> NeoPDP-11
 10.127.0.16/30		Tinc		caasih		 --> NeoPDP-11
-10.127.0.20/30		Tinc		NeoPortable	<--> NeoVAX		@
+10.127.0.20/30		Tinc		NeoPortable	<--> NeoVAX		@1
 10.127.0.24/30		Tinc		NeoPDP-11	 --> NeoPortable	Normally not being used
 10.127.0.28/30		Tinc		ucbvax		<--> fionaLHS
 10.127.0.32/30		Tinc		caasih		<--> ncuiqh
-10.127.0.36/30		Tinc		ucbvax		 --> NeoVAX		@
+10.127.0.36/30		Tinc		ucbvax		 --> NeoVAX		@1
 10.127.0.40/30		Tinc		pan		 --> NeoPDP11
-10.127.0.44/30		Tinc		pan		 --> NeoPortable	@
+10.127.0.44/30		Tinc		pan		 --> NeoPortable	@1
 10.127.0.48/30		WireGuard	cklvax		<--> NeoSystem
 10.127.0.52/30		WireGuard	pan		 --> NeoSystem		
 10.127.0.56/30		Tinc		ucbvax		 --> Icecat-Explosion	No online time guarantee
+10.127.0.60/30		WireGuard	ucbvax		<--> pan
 
-@ --> Non-24H
+@1 --> Non-24H
 
-# Continuous Subnet
+
+/* ================= *\
+|| Continuous Subnet ||
+\* ================= */
+
+Subnet			Name			Comment
 10.127.1.0/24		CROOM
 10.127.2.0/24		NeoSystems VMs
+<<<<<<< HEAD
 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)
 172.24.5.0/24		Icecat-Mobile-devices (For Mobile device internal network segment for testing connectivity quality, No SLA)
+=======
+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
+
+
++======================+
+|| Loopback Addresses ||
++======================+
+
+Loopback Address	Name		System		Comment
+=======================|===============|===============|===================================================
+10.127.255.1		NeoPDP-11	FreeBSD/frr
+10.127.255.2		ucbvax		Arch Linux/frr
+10.127.255.4		pan		Arch Linux/frr
+10.127.255.80		NeoSystem	Arch Linux/frr
+>>>>>>> upstream/master