From bac9df09971dbcde231aea0aeb315864bd030646 Mon Sep 17 00:00:00 2001 From: "Tristan B. Kildaire" Date: Mon, 31 May 2021 22:34:16 +0200 Subject: [PATCH] Fixed bird configurations --- docs/bird1.6.md | 26 +++++--------------------- docs/bird2.md | 20 ++------------------ 2 files changed, 7 insertions(+), 39 deletions(-) diff --git a/docs/bird1.6.md b/docs/bird1.6.md index 208ec44..3a41d79 100644 --- a/docs/bird1.6.md +++ b/docs/bird1.6.md @@ -58,7 +58,7 @@ ip inPrefixMasked; # CRXN Route filter based filter crxn6 { - # CRXN v6 range + # CRXN v6 range if (rangeCheck(net, fd00::/8) = true) then accept; @@ -68,8 +68,6 @@ filter crxn6 then accept; - - # No matches, reject reject; } @@ -86,12 +84,6 @@ It is meant to have the same routes as the `crxn` table. ``` # CRXN table table crxn; - -# master table - -# This is the default table, I only use this as the looking glass defaults to looking at it - -table master; ``` #### `router.conf` @@ -111,13 +103,9 @@ doesn't even need those, it gets them from the interface. # directly attached networks - i.e. nexthop = 0.0.0.0) protocol direct crxnDirect { - # Import from direct -> bird into bird's `crxn` table + # Import from direct -> bird into bird's `crxn` table import filter crxn6; table crxn; - - # Only doing this so it shows by default in looking glass - import filter crxn6; - table master; } ``` @@ -134,13 +122,9 @@ TODO: Check, defualt `learn` should larn non `kernel` and non-`bird` routes # Of course we also then export all routes from our Bird tables into the kernel so you can actually forward packets protocol kernel crxnKernel { - # Export from bird -> kernel from bird's `crxn` table - export filter crxn6; - table crxn; - - # Only doing this so it shows by default in looking glass - import filter crxn6; - table master; + # Export from bird -> kernel from bird's `crxn` table + export filter crxn6; + table crxn; } ``` diff --git a/docs/bird2.md b/docs/bird2.md index 64a3ffa..1a52359 100644 --- a/docs/bird2.md +++ b/docs/bird2.md @@ -68,8 +68,6 @@ filter crxn6 then accept; - - # No matches, reject reject; } @@ -86,12 +84,6 @@ It is meant to have the same routes as the `crxn` table. ``` # CRXN table ipv6 table crxn; - -# master table - -# This is the default table, I only use this as the looking glass defaults to looking at it - -ipv6 table master; ``` #### `router.conf` @@ -115,11 +107,7 @@ protocol direct crxnDirect { # Import from direct -> bird into bird's `crxn` table import filter crxn6; table crxn; - - # Only doing this so it shows by default in looking glass - import filter crxn6; - table master; - } + }; } ``` @@ -139,11 +127,7 @@ protocol kernel crxnKernel { # Export from bird -> kernel from bird's `crxn` table export filter crxn6; table crxn; - - # Only doing this so it shows by default in looking glass - import filter crxn6; - table master; - } + }; } ```