Calm down headings, more fragments

index.html

@@ -48,13 +48,13 @@
 	  <p class="fragment">Maybe don't go and try building an ISP based off this talk :)</p>
 	</section>
 
-	<section><h2>What even is a network</h2>
+	<section><h2>What even is a network?</h2>
 	  <p class="fragment fade-in-then-out">Ethernet?</p>
 	  <p class="fragment fade-in-then-out">Token Ring?</p>
 	  <p class="fragment fade-in-then-out">IPX?</p>
 	  <p class="fragment fade-in-then-out">AX.25?</p>
 	</section>
-	<section><h2>What even is a network</h2>
+	<section><h2>What even is a network?</h2>
 	  <p class="fragment fade-in-then-out">ipv4?</p>
 	  <p class="fragment fade-in-then-out">ipv6?</p>
 	  <p class="fragment fade-in-then-out">tcp?</p>
@@ -63,7 +63,7 @@
 	    <p>We are going to mostly focus on Ethernet and IPv6</p>
 	</section>
 	
-	<section><h2>Managed network?</h2>
+	<section><h2>Managed networks</h2>
 	  <p class="fragment"><b>Controls</b> connections between computers</p>
 	  <p class="fragment"><b>Scales</b> connections between computers</p>
 	  <p class="fragment"><img src="3tier.png" /><p>
@@ -83,9 +83,10 @@
 	    <p>or a parfait</p>
 	    <p>which you can mostly ignore, as what we generally use doesn't conform to it. But it does provide a good framework for assisting understanding</p>
 	    <p>Like firewalls, web-proxies/SSL MITM, But also access rights etc</p>
+	  </aside>
 	</section>
-
-	<section><h2>Layers!</h2>
+	
+	<section><h2>Layers</h2>
 	  <p>This means the Physical layers do not have to match the Logical connections</p>
 	  <p class="fragment">Networks are also a bit fractal in nature</p>
 	  <p class="fragment">For the purposes of this talk, we can ignore a lot of complexity</p>
@@ -100,7 +101,9 @@
 	  <p class="fragment">IEEE 802.1Q</p>
 	  <aside class="notes">
 	    <p>beware of strange implementations, windows seems to take Router Advertisements from all vlans, regardless of tag</p>
+	  </aside>
 	</section>
+	
 	<section><h2>VLANs in linux</h2>
 	  <p>Are pretty easy!</p>
 	  <pre class="fragment"><code data-trim data-noescape>
@@ -114,7 +117,7 @@
 	<section><h2>VLANs in linux</h2>
 	  <p>Various different methods of making it go in different distributions</p>
 	  <p class="fragment">Debian: in /etc/network/interfaces</p>
-	  <pre>
+	  <pre class="fragment">
 	    <code>auto enp1s0.2502
 iface enp1s0.2502 inet dhcp
 iface enp1s0.2502 inet6 auto</code>
@@ -135,6 +138,7 @@ iface enp1s0.2502 inet6 auto</code>
 	</section>
 	
 	<section><h2>Linux Routing</h2>
+	  <p>Add to sysctl config:</p>
 	  <pre class="fragment"><code data-trim data-noescape>
 	      net.ipv4.ip_forward = 1
 	      net.ipv6.conf.all.forwarding = 1
@@ -145,7 +149,7 @@ iface enp1s0.2502 inet6 auto</code>
 	  <p class="fragment">Yeah, not really :)</p>
 	</section>
 	
-	<section><h2>Static Routes!</h2>
+	<section><h2>Static Routes</h2>
 	  <p>Manually added, or scripted routes that don't change</p>
 	  <pre><code data-trim data-noescape>
 	      ip route add 172.17.0.0/24 via 172.16.0.254 dev wg0
@@ -153,30 +157,32 @@ iface enp1s0.2502 inet6 auto</code>
 	  </pre>
 	</section>
 	
-	<section><h2>Static Routes!</h2>
-	  <p>Harking back to our vlan</p>
-	  <pre width="110%"><code>ip -6 route add 2001:db8:2501::/64 via 2001:db8:2500::1 dev enp0s1
+	<section><h2>Static Routes</h2>
+	  <pre width="110%"><code width="110%">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>
+ip -6 route add 2001:db8:2600:beef:/64 via 2001:db8:face::1 dev wg0</code>
 	  </pre>
 	  <aside class="notes">
 	    <p>As you can imagine this quickly becomes unwieldy with expanding networks</p>
 	  </aside>
 	</section>
 
+	<section><h2>Static Routes</h2>
+	  <img src="Diagrams/MyVLansExt.png"></img>
+	</section>
+
 	<section><h2>Enter dynamic routes</h2>
-	  <p>As a Router:</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">Advertise your LANs</p>
+	  <p class="fragment">Discovering routes to other LANs</p>
+	  <p class="fragment">Optional: Do some logic</p>
+	  <p class="fragment">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>Dynamic Routing</h2>
 	  <p>Open Shortest Path First (OSPF)</p>
-	  <p>The algorithm is pretty interesting</p>
+	  <p>Uses Dijkstra's algorithm</p>
 	  <p class="fragment">RFC2328</p>
 	  <p class="fragment">RFC5340</p>
 	  <p class="fragment">For: Dynamic routes inside your networks</p>
@@ -185,14 +191,19 @@ ip -6 route add 2001:db8:2600::/64 via 2001:db8:2600:beef:face::1 dev enp0s1</co
 	<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 (and inside sometimes)</p>
+	  <p class="fragment">For: Sharing dynamic routes outside your network with other Autonomous Sytstems (AS)</p>
+	  <notes class="aside">
+	    <p>"AS" is used a lot in the ISP world, and your ISP will have an assigned AS Number</p>
+	  </notes>
 	</section>
 
 	<section><h2>The Userspace Daemons</h2>
 	  <p>BIRD: Berkeley Internet Routing Daemon</p>
 	  <p>Quagga: Fork of Zebra</p>
+	  <p>OpenBGPd/OpenOSPFd: from the OpenBSD project</p>
 	  <p class="fragment">Significant overlap, but they are different</p>
-	  <p class="fragment">I've not used Quagga</p>
+	  <p class="fragment">I've not used Quagga, or the OpenBSD ones</p>
+	  <p class="fragment">There are probably others!</p>
 	</section>
 	
 	<section><h2>intro to bird</h2>