From 1ab2140d6b678600cf43928bf8288c3532c93592 Mon Sep 17 00:00:00 2001
From: Paul Warren <pwarren@pwarren.id.au>
Date: Thu, 13 Jan 2022 23:10:15 +1100
Subject: [PATCH] More content

---
 index.html | 66 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index f6a5690..0250240 100644
--- a/index.html
+++ b/index.html
@@ -127,7 +127,17 @@ iface enp1s0.2502 inet6 auto</code>
 	  <aside class="notes">
 	    <p>OpenWRT: can also use the hardware present on most hardware routers to assign vlans to specific ports</p>
 	</section>
-	
+
+	<section><h2>VLANs in linux</h2>
+	  <p>Here's what I've done</p>
+	  <img src="Diagrams/MyVLans.png"></img>
+	  <aside class="notes">
+	    <p>Guest Wifi</p>
+	    <p>Access VLAN</p>
+	    <p>Netflix, Youtube, my webhost, desktops/work computers</p>
+	  </aside>
+	</section>
+
 	<section><h2>What even is a router?</h2>
 	  <p class="fragment">Two or more interfaces</p>
 	  <p class="fragment">Some logic to determine where a packet goes</p>
@@ -212,29 +222,64 @@ ip -6 route add 2001:db8:2600:beef:/64 via 2001:db8:face::1 dev wg0</code>
 	  <p class="fragment">Use version control</p>
 	  <aside class="notes">
 	    <p>Not quite turing complete</p>
-	    <p> git on /etc/bird or wherever your distor stores it.</p>
+	    <p> git on /etc/bird or wherever your distro stores it.</p>
 	  </aside>  
 	</section>
+
+	<section><h2>Intro to bird configuration</h2>
+	  <p>/etc/bird.conf</p>
+	  <pre><code data-trim data-noescape>router id 10.9.99.6;
+
+log "/var/log/bird/bird.log" all;
+debug protocols { states, routes, filters, interfaces }
+
+protocol kernel {
+        import none;
+        export all;
+}
+
+protocol device {
+        # defaults...
+}
+	    </code>
+	  </pre>
+	</section>
 	
 	<section><h2>Intro to bird configuration</h2>
 	  <p>/etc/bird.conf</p>
 	  <p>Each router needs a unique ID</p>
-	  <p>
-
+	  <p class="fragment">Protocol blocks, There are lots of types</p>
+	  <p class="fragment">They are how bird knows what to talk to and how</p>
 	  <aside class="notes">
-	    <p>Set BIRD's router ID. It's a world-wide unique identification of your router, usually one of router's IPv4 addresses. Default: the lowest IPv4 address of a non-loopback interface. <p>
+	    <p>router ID. usually one of router's IPv4 addresses. Default: the lowest IPv4 address of a non-loopback interface. World (your network) unique<p>
 	      
 	</section>
 
 	<section><h2>Intro to bird configuration</h2>
-	  <p>KNorries diagram here</p>
+	    <pre><code data-trim data-noescape>protocol ospf {
+        area 0 {
+                interface "lo" {
+                        stub;
+                };
+                interface "vlan1001" {
+                };
+                interface "vlan1034" {
+                        stub;
+                };
+        };
+		}
+	      </code>
+	    </pre>
+	    <notes class="aside">
+	      <p> There are a lot more options than stub or default</p>
+	      <p>BIRD documentation is really good</p>
+	</section>
+	
+	<section><h2>Intro to bird configuration</h2>
+	  <p><img src="Diagrams/bird-prototable.png"></img></p>
 	</section>
 
 	
-	<section>more detail on bird</section>
-
-	<section>A Simple Network</section>
-	
 	<section>Multi Host IPs (Authoritative DNS example like in the facebook thing)</section>
 
 	<section>Why use a 'real' router</section>
@@ -251,6 +296,7 @@ ip -6 route add 2001:db8:2600:beef:/64 via 2001:db8:face::1 dev wg0</code>
 	  <p>Why did I use /64s?</p>
 	  <p>I highly recommend going through KNorrie's network examples: <a href="https://github.com/knorrie/network-examples">https://github.com/knorrie/network-examples</a></p>
 	  <p>OSPF Areas</p>
+	  <p>Auth* for OSPF</p>
 	  <p>Automatic transfers of internal aggregates to BGP (Something I've not investigated much)</p>
 	</section>