jan2 updates

index.html

@@ -166,46 +166,45 @@
 	</section>
 
 	<section><h2>Enter dynamic routes</h2>
+	  <p>As a Router:</p>
+	  <p>Advertise your networks</p>
 	  <p>Discovering routes to other networks</p>
-	  <p>Add them to the kernel routing table</p>
-	  <p>OSPF: RFC5430, RFC2328</p>
+	  <p>Optional: Do some logic</p>
+	  <p>Add them to the routing table</p>
+	  <p class="fragment">Userspace daemons</p>
+	  <p class="fragment">talking to the kernel networking stack</p>
 	</section>				   
-	
-	<section><h2>What I'm assuming we're familiar with</h2>
-	  <p>Diagram showing standard leaf node of a network with a bit cloud containg "The rest of the org"</p>
-	</section>
-
-	<section><h2>What we're familiar with</h2>
-	  <p>Diagram showing added storage and server network<p>
-	</section>
-
-	<section><h2>How things evolve</h2>
-	  <p>Uh Oh, we've got a new Datacentre</p>
-	</section>
-
-	<section><h2>How things evolve</h2>
-	  <p>which has its own lot of storage and servers</p>
-	</section>
-
-	<section><h2>How things evolve</h2>
-	  <p>And now people want to work in Tasmania!</p>
-	</section>
 
 	<section><h2>Dynamic Routing</h2>
 	  <p>Open Shortest Path First (OSPF)</p>
 	  <p>The algorithm is pretty interesting</p>
 	  <p class="fragment">RFC2328</p>
 	  <p class="fragment">RFC5340</p>
+	  <p class="fragment">For: Dynamic routes inside your networks</p>
 	</section>
 	
 	<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>
+	</section>
+
+	<section><h2>The Userspace Daemons</h2>
+	  <p>BIRD: Berkeley Internet Routing Daemon</p>
+	  <p>Quagga: Fork of Zebra</p>
+	  <p class="fragment">Significant overlap, but they are different</p>
+	  <p class="fragment">I've not used Quagga</p>
 	</section>
 	
-	<section>more detail on what VLANs, OSPF and BGP are for</section>
-	<section>how to do these things in linux</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>
+		
+
+	
 	<section>more detail on bird</section>
 	<section>building out a virtual network with LXC</section>
 	<section>ergh, NAT</section>
@@ -227,6 +226,30 @@
 	  <p>BenEater's <a href="https://www.youtube.com/watch?v=-wMU8vmfaYo">"Why was facebook down for five hours" </a></p>
 	  <p>802.1Q: <a href="https://www.ieee802.org/1/pages/802.1Q-2014.html" /></p>
 	</section>
+
+
+	<section><h2>Unused Bits</h2></section>
+	<section><h2>What I'm assuming we're familiar with</h2>
+	  <p>Diagram showing standard leaf node of a network with a bit cloud containg "The rest of the org"</p>
+	</section>
+
+	<section><h2>What we're familiar with</h2>
+	  <p>Diagram showing added storage and server network<p>
+	</section>
+
+	<section><h2>How things evolve</h2>
+	  <p>Uh Oh, we've got a new Datacentre</p>
+	</section>
+
+	<section><h2>How things evolve</h2>
+	  <p>which has its own lot of storage and servers</p>
+	</section>
+
+	<section><h2>How things evolve</h2>
+	  <p>And now people want to work in Tasmania!</p>
+	</section>
+
+
       </div>
     </div>