From 6ac261d93465476f6544d629fbce0783237dc824 Mon Sep 17 00:00:00 2001
From: "Tristan B. Kildaire" <deavmi@redxen.eu>
Date: Thu, 24 Jun 2021 17:24:56 +0200
Subject: [PATCH] Fixed radv documentation

---
 docs/radv/bird1.6_radv.md                     |  7 ++--
 docs/radv/bird2_radv.md                       |  6 ++--
 docs/routing/bird/bird_babel.md               | 33 ++-----------------
 .../bird/protocols/babel/bird1.6_babel.md     | 24 ++++++++++++++
 .../bird/protocols/babel/bird2_babel.md       | 27 +++++++++++++++
 docs/routing/bird/protocols/babel/index.md    |  7 ++++
 docs/routing/bird/protocols/index.md          |  5 +++
 7 files changed, 70 insertions(+), 39 deletions(-)
 create mode 100644 docs/routing/bird/protocols/babel/bird1.6_babel.md
 create mode 100644 docs/routing/bird/protocols/babel/bird2_babel.md
 create mode 100644 docs/routing/bird/protocols/babel/index.md
 create mode 100644 docs/routing/bird/protocols/index.md

diff --git a/docs/radv/bird1.6_radv.md b/docs/radv/bird1.6_radv.md
index 218cad2..b20758e 100644
--- a/docs/radv/bird1.6_radv.md
+++ b/docs/radv/bird1.6_radv.md
@@ -28,7 +28,6 @@ protocol radv
 
     # Interfaces to run radv on
     interface "eth0";
-
 }
 ```
 
@@ -63,10 +62,8 @@ protocol radv
 	        # Defaults are fine
 	    };
 
-	    # Normally it will distribute a default route, disable that (TODO: Check)
-	    prefix ::/0 {
-	      	skip yes;
-	    };
+		# Prevent advertising of default route
+		default lifetime 0;
 	};
 }
 ```
\ No newline at end of file
diff --git a/docs/radv/bird2_radv.md b/docs/radv/bird2_radv.md
index 4525572..c9a8b04 100644
--- a/docs/radv/bird2_radv.md
+++ b/docs/radv/bird2_radv.md
@@ -65,10 +65,8 @@ protocol radv
 	        # Defaults are fine
 	    };
 
-	    # Normally it will distribute a default route, disable that (TODO: Check)
-	    prefix ::/0 {
-	      	skip yes;
-	    };
+		# Prevent advertising of default route
+		default lifetime 0;
 	};
 }
 ```
\ No newline at end of file
diff --git a/docs/routing/bird/bird_babel.md b/docs/routing/bird/bird_babel.md
index f1fcc2e..60efc18 100644
--- a/docs/routing/bird/bird_babel.md
+++ b/docs/routing/bird/bird_babel.md
@@ -1,34 +1,7 @@
 Bird Babel configuration
 ========================
 
-In `/etc/bird/crxn/babel.conf` place the following template:
-
-```
-# CRXN Babel protocol
-protocol babel crxnBabel
-{
-
-    # Interfaces to run babel on
-    interface "interface1", "interface2";
-
-    ipv6
-    {
-        import filter crxnFilter;
-        export filter crxnFilter;
-        table crxn;
-    };
-}
-```
-
-1. Set the `interface` list to a list of interfaces you wish the babel
-protocol to run on
-    * It also supports regex in a string so you can do `"interface*"` for example
-
-**Note:** For Bird 1.6 you will want to remove the `ipv6 {};`.
-
-And that is all!
-
-### Additional changes
-
-TODO: Finish this, `wired vs `wireless`
+Two configurations:
 
+1. [Bird 1.6](protocols/babel/bird1.6_babel.md)
+1. [Bird 2](protocols/babel/bird2_babel.md)
\ No newline at end of file
diff --git a/docs/routing/bird/protocols/babel/bird1.6_babel.md b/docs/routing/bird/protocols/babel/bird1.6_babel.md
new file mode 100644
index 0000000..b5cc601
--- /dev/null
+++ b/docs/routing/bird/protocols/babel/bird1.6_babel.md
@@ -0,0 +1,24 @@
+Bird 1.6 Babel configuration
+============================
+
+In `/etc/bird/crxn/babel.conf` place the following template:
+
+```
+# CRXN Babel protocol
+protocol babel crxnBabel
+{
+
+    # Interfaces to run babel on
+    interface "interface1", "interface2";
+
+    import filter crxnFilter;
+    export filter crxnFilter;
+    table crxn;
+}
+```
+
+1. Set the `interface` list to a list of interfaces you wish the babel
+protocol to run on
+    * It also supports regex in a string so you can do `"interface*"` for example
+
+And that is all!
\ No newline at end of file
diff --git a/docs/routing/bird/protocols/babel/bird2_babel.md b/docs/routing/bird/protocols/babel/bird2_babel.md
new file mode 100644
index 0000000..1c62646
--- /dev/null
+++ b/docs/routing/bird/protocols/babel/bird2_babel.md
@@ -0,0 +1,27 @@
+Bird 2 Babel configuration
+==========================
+
+In `/etc/bird/crxn/babel.conf` place the following template:
+
+```
+# CRXN Babel protocol
+protocol babel crxnBabel
+{
+
+    # Interfaces to run babel on
+    interface "interface1", "interface2";
+
+    ipv6
+    {
+        import filter crxnFilter;
+        export filter crxnFilter;
+        table crxn;
+    };
+}
+```
+
+1. Set the `interface` list to a list of interfaces you wish the babel
+protocol to run on
+    * It also supports regex in a string so you can do `"interface*"` for example
+
+And that is all!
\ No newline at end of file
diff --git a/docs/routing/bird/protocols/babel/index.md b/docs/routing/bird/protocols/babel/index.md
new file mode 100644
index 0000000..60efc18
--- /dev/null
+++ b/docs/routing/bird/protocols/babel/index.md
@@ -0,0 +1,7 @@
+Bird Babel configuration
+========================
+
+Two configurations:
+
+1. [Bird 1.6](protocols/babel/bird1.6_babel.md)
+1. [Bird 2](protocols/babel/bird2_babel.md)
\ No newline at end of file
diff --git a/docs/routing/bird/protocols/index.md b/docs/routing/bird/protocols/index.md
new file mode 100644
index 0000000..09c2bb3
--- /dev/null
+++ b/docs/routing/bird/protocols/index.md
@@ -0,0 +1,5 @@
+Protocols
+=========
+
+1. [Babel](babel/)
+2. [OSPF](ospf/)
\ No newline at end of file