From c605e4723a4e096bf8b41227de02227cedc724b8 Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Wed, 10 Oct 2018 18:10:26 +0200
Subject: [PATCH] Cleaning up a bit

---
 bgp4.conf  | 12 ++++--------
 bgp6.conf  |  8 ++++----
 bird.conf  |  4 ++--
 ospf4.conf |  4 ++--
 ospf6.conf |  7 +++----
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/bgp4.conf b/bgp4.conf
index 5a396a5..1d1271e 100644
--- a/bgp4.conf
+++ b/bgp4.conf
@@ -1,22 +1,18 @@
 template bgp dnpeers {
         local as OWNAS;
-        table T_BGP4;
+        table T_BGP;
 
         # metric is the number of hops between us and the peer
         path metric 1;
 
-        # this line allows debugging filter rules
-        # filtered routes can be looked up in birdc using the "show route filtered" command
-	import keep filtered on;
-
         import all;
         export all;
-        #source address 172.20.170.192;
 };
 
 template bgp iBGP_Peer {
 	local as OWNAS;
-	igp table T_OSPF4;
+        hold time 15;
+	igp table T_OSPF;
 	path metric on;
 	import keep filtered;
 #	import where iBGP_import_peer_policy();
@@ -40,7 +36,7 @@ roa table dn42_roa {
 
 protocol pipe {
 	table master;
-        peer table T_BGP4;
+        peer table T_BGP;
         import filter {
 		if (roa_check(dn42_roa, net, bgp_path.last) = ROA_INVALID) then {
 			print "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last;
diff --git a/bgp6.conf b/bgp6.conf
index bededf5..85c7f2a 100644
--- a/bgp6.conf
+++ b/bgp6.conf
@@ -1,6 +1,6 @@
 template bgp dnpeers {
         local as OWNAS;
-        table T_BGP6;
+        table T_BGP;
 
         # metric is the number of hops between us and the peer
         path metric 1;
@@ -11,12 +11,12 @@ template bgp dnpeers {
 
         import all;
         export all;
-        #source address 172.20.170.192;
 };
 
 template bgp iBGP_Peer {
 	local as OWNAS;
-	igp table T_OSPF6;
+        hold time 15;
+	igp table T_OSPF;
 	path metric on;
 	import keep filtered;
 #	import where iBGP_import_peer_policy();
@@ -40,7 +40,7 @@ roa table dn42_roa6 {
 
 protocol pipe {
 	table master;
-        peer table T_BGP6;
+        peer table T_BGP;
         import filter {
                 
 		if (roa_check(dn42_roa6, net, bgp_path.last) = ROA_INVALID) then {
diff --git a/bird.conf b/bird.conf
index 3c587b5..2d599f6 100644
--- a/bird.conf
+++ b/bird.conf
@@ -1,6 +1,6 @@
 log syslog { debug, trace, info, remote, warning, error, auth, fatal, bug };
-table T_BGP4;
-table T_OSPF4;
+table T_BGP;
+table T_OSPF;
 
 protocol device {
 	scan time 10;
diff --git a/ospf4.conf b/ospf4.conf
index 433a956..7106fe7 100644
--- a/ospf4.conf
+++ b/ospf4.conf
@@ -1,5 +1,5 @@
 protocol ospf {
-	table T_OSPF4;
+	table T_OSPF;
         import all;
 	export all;
 
@@ -20,7 +20,7 @@ filter filter_OSPF {
 };
 
 protocol pipe {
-	peer table T_OSPF4;
+	peer table T_OSPF;
 	table master;
 	import filter filter_OSPF;
 	export none;
diff --git a/ospf6.conf b/ospf6.conf
index c9abb81..5018eb7 100644
--- a/ospf6.conf
+++ b/ospf6.conf
@@ -1,5 +1,5 @@
 protocol ospf O_OSPF {
-	table T_OSPF6;
+	table T_OSPF;
         import all;
 	export all;
 
@@ -13,15 +13,14 @@ protocol ospf O_OSPF {
         };
 }
 
-
-filter filter_OSPF6 {
+filter filter_OSPF {
         ospf_metric1 = 1000;
 	if is_self_net() then accept;
         else reject;
 };
 
 protocol pipe {
-	peer table T_OSPF6;
+	peer table T_OSPF;
 	table master;
 	import filter filter_OSPF6;
 	export none;