Cleaning up a bit

This commit is contained in:
Jesper Hess 2018-10-10 18:10:26 +02:00
parent c8b8192713
commit c605e4723a
Signed by: graffen
GPG key ID: 351A89E40D763F0F
5 changed files with 15 additions and 20 deletions

View file

@ -1,22 +1,18 @@
template bgp dnpeers { template bgp dnpeers {
local as OWNAS; local as OWNAS;
table T_BGP4; table T_BGP;
# metric is the number of hops between us and the peer # metric is the number of hops between us and the peer
path metric 1; 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; import all;
export all; export all;
#source address 172.20.170.192;
}; };
template bgp iBGP_Peer { template bgp iBGP_Peer {
local as OWNAS; local as OWNAS;
igp table T_OSPF4; hold time 15;
igp table T_OSPF;
path metric on; path metric on;
import keep filtered; import keep filtered;
# import where iBGP_import_peer_policy(); # import where iBGP_import_peer_policy();
@ -40,7 +36,7 @@ roa table dn42_roa {
protocol pipe { protocol pipe {
table master; table master;
peer table T_BGP4; peer table T_BGP;
import filter { import filter {
if (roa_check(dn42_roa, net, bgp_path.last) = ROA_INVALID) then { if (roa_check(dn42_roa, net, bgp_path.last) = ROA_INVALID) then {
print "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last; print "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last;

View file

@ -1,6 +1,6 @@
template bgp dnpeers { template bgp dnpeers {
local as OWNAS; local as OWNAS;
table T_BGP6; table T_BGP;
# metric is the number of hops between us and the peer # metric is the number of hops between us and the peer
path metric 1; path metric 1;
@ -11,12 +11,12 @@ template bgp dnpeers {
import all; import all;
export all; export all;
#source address 172.20.170.192;
}; };
template bgp iBGP_Peer { template bgp iBGP_Peer {
local as OWNAS; local as OWNAS;
igp table T_OSPF6; hold time 15;
igp table T_OSPF;
path metric on; path metric on;
import keep filtered; import keep filtered;
# import where iBGP_import_peer_policy(); # import where iBGP_import_peer_policy();
@ -40,7 +40,7 @@ roa table dn42_roa6 {
protocol pipe { protocol pipe {
table master; table master;
peer table T_BGP6; peer table T_BGP;
import filter { import filter {
if (roa_check(dn42_roa6, net, bgp_path.last) = ROA_INVALID) then { if (roa_check(dn42_roa6, net, bgp_path.last) = ROA_INVALID) then {

View file

@ -1,6 +1,6 @@
log syslog { debug, trace, info, remote, warning, error, auth, fatal, bug }; log syslog { debug, trace, info, remote, warning, error, auth, fatal, bug };
table T_BGP4; table T_BGP;
table T_OSPF4; table T_OSPF;
protocol device { protocol device {
scan time 10; scan time 10;

View file

@ -1,5 +1,5 @@
protocol ospf { protocol ospf {
table T_OSPF4; table T_OSPF;
import all; import all;
export all; export all;
@ -20,7 +20,7 @@ filter filter_OSPF {
}; };
protocol pipe { protocol pipe {
peer table T_OSPF4; peer table T_OSPF;
table master; table master;
import filter filter_OSPF; import filter filter_OSPF;
export none; export none;

View file

@ -1,5 +1,5 @@
protocol ospf O_OSPF { protocol ospf O_OSPF {
table T_OSPF6; table T_OSPF;
import all; import all;
export all; export all;
@ -13,15 +13,14 @@ protocol ospf O_OSPF {
}; };
} }
filter filter_OSPF {
filter filter_OSPF6 {
ospf_metric1 = 1000; ospf_metric1 = 1000;
if is_self_net() then accept; if is_self_net() then accept;
else reject; else reject;
}; };
protocol pipe { protocol pipe {
peer table T_OSPF6; peer table T_OSPF;
table master; table master;
import filter filter_OSPF6; import filter filter_OSPF6;
export none; export none;