Protocol/Pipe naming mostly

bgp4.conf

@@ -19,8 +19,13 @@ template bgp ibgppeer {
 	path metric on;
 	import keep filtered;
 	import all;
-	export all;
-	source address OWNIP_IBGP;
+	export filter {
+		if is_self_net() then {
+			reject;
+		 }
+		accept;
+	};
+	source address OWNIP;
 	next hop self;
 }
 
@@ -30,9 +35,15 @@ template pipe iBGP_Pipe {
 	export all;
 }
 
-protocol pipe {
+template pipe dn42peer_pipe {
+	peer table master;
+	import all;
+	export all;
+}
+
+protocol pipe P_BGP_to_Master {
 	table master;
         peer table T_BGP;
-        import all;
+	import all;
         export all;
 }

bgp6.conf

@@ -33,7 +33,7 @@ template pipe iBGP_Pipe {
 }
 
 
-protocol pipe {
+protocol pipe P_BGP_to_Master {
 	table master;
         peer table T_BGP;
         import all;

ospf4.conf

@@ -1,4 +1,4 @@
-protocol ospf {
+protocol ospf O_OSPF {
 	table T_OSPF;
         import all;
 	export all;
@@ -6,6 +6,9 @@ protocol ospf {
         area 0 {
 		interface "wg-ospf-*" {
 		};
+
+		interface "wg-roam-*" {
+		};
 		
                 interface "lo" {
                         stub;
@@ -14,12 +17,12 @@ protocol ospf {
 }
 
 filter filter_OSPF {
-#        ospf_metric1 = 1000;
+        ospf_metric1 = 1000;
 	if is_self_net() then accept;
         else reject;
 };
 
-protocol pipe {
+protocol pipe P_OSPF_to_Master {
 	peer table T_OSPF;
 	table master;
 	import filter filter_OSPF;

ospf6.conf

@@ -19,7 +19,7 @@ filter filter_OSPF {
         else reject;
 };
 
-protocol pipe {
+protocol pipe P_OSPF_to_Master {
 	peer table T_OSPF;
 	table master;
 	import filter filter_OSPF;