From 10a22c5b56f05fc9ea89ae1c3000e607ef1f09c5 Mon Sep 17 00:00:00 2001
From: Paul Warren <pwarren@pwarren.id.au>
Date: Sat, 8 Jan 2022 21:24:04 +1100
Subject: [PATCH] More content

---
 index.html | 52 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index 2639365..e16c752 100644
--- a/index.html
+++ b/index.html
@@ -158,6 +158,8 @@
 	  <p>Harking back to our vlan</p>
 	  <pre><code data-trim data-noescape>
 	      ip -6 route add 2001:db8:2501::/64 via 2001:db8:2500::1 dev enp0s1
+	      ip -6 route add 2001:db8:2502::/64 via 2001:db8:2500::1 dev enp0s1
+	      ip -6 route add 2001:db8:2600::/64 via 2001:db8:2600:beef:face::1 dev enp0s1
 	    </code>
 	  </pre>
 	  <aside class="notes">
@@ -167,8 +169,8 @@
 
 	<section><h2>Enter dynamic routes</h2>
 	  <p>As a Router:</p>
-	  <p>Advertise your networks</p>
-	  <p>Discovering routes to other networks</p>
+	  <p>Advertise your LANs</p>
+	  <p>Discovering routes to other LANs</p>
 	  <p>Optional: Do some logic</p>
 	  <p>Add them to the routing table</p>
 	  <p class="fragment">Userspace daemons</p>
@@ -186,7 +188,7 @@
 	<section><h2>Dynamic Routing</h2>
 	  <p>Border Gateway Protocol (BGP)</p>
 	  <p class="fragment">RF4271</p>
-	  <p class="fragment">For: Dynamic routes outside your network</p>
+	  <p class="fragment">For: Dynamic routes outside your network (and inside sometimes)</p>
 	</section>
 
 	<section><h2>The Userspace Daemons</h2>
@@ -196,26 +198,50 @@
 	  <p class="fragment">I've not used Quagga</p>
 	</section>
 	
-	<section>intro to bird</section>
-
-	<section><h2>Two types of interfaces for OSPF</h2>
-	  <p>Has other routers on it: Interface </p>
-	  <p>Only this router on it: Stub interface</p>
+	<section><h2>intro to bird</h2>
+	  <p>Powerful</p>
+	  <p class="fragment">Complex to configure</p>
+	  <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>
+	  </aside>  
 	</section>
-		
+	
+	<section><h2>Intro to bird configuration</h2>
+	  <p>/etc/bird.conf</p>
+	  <p>Each router needs a unique ID</p>
+	  <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>
+	      
+	</section>
+
+	<section><h2>
 
 	
 	<section>more detail on bird</section>
-	<section>building out a virtual network with LXC</section>
-	<section>ergh, NAT</section>
-	<section>Why use a 'real' router</section>
-	<section>OpenWRT</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>
+
+	<section><h2>¿Por qué no los dos?</h2>
+	  <p>OpenWRT is a linux based distribution for real networking hardware</p>
+	  <aside class="note">
+	    <p>Consumer grade mostly, but some enterprise level routers are supported</p>
+	</section>
+	
+
 	<section><h2>Bonus homework</h2>
 	  <p>Why did I use 2001::db8::/32?</p>
 	  <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>Automatic transfers of internal aggregates to BGP (Something I've not investigated much)</p>
 	</section>
 	
 	<section><h2>Resources</h2>