Cleaning up

This commit is contained in:
Jesper Hess 2018-09-15 21:09:28 +02:00
parent de7c73a907
commit f12c0fa68d
Signed by: graffen
GPG key ID: 351A89E40D763F0F
8 changed files with 23 additions and 94 deletions

View file

@ -34,7 +34,6 @@ template pipe iBGP_Pipe {
export all;
}
protocol pipe {
table master;
peer table T_BGP4;
@ -46,7 +45,6 @@ protocol pipe {
}
reject;
};
# import limit 1000 action block;
export filter {
# here we export the whole net

View file

@ -34,7 +34,6 @@ template pipe iBGP_Pipe {
export all;
}
protocol pipe {
table master;
peer table T_BGP6;

View file

@ -1,6 +1,6 @@
log syslog { debug, trace, info, remote, warning, error, auth, fatal, bug };
table T_BGP4;
table T_OSPF;
table T_OSPF4;
protocol device {
scan time 10;
@ -13,17 +13,13 @@ protocol static {
}
include "/etc/bird/local4.conf";
# filter helpers
#################
#include "/etc/bird/filter4.conf";
include "/etc/bird/community_filters.conf";
protocol kernel {
scan time 20;
metric 64; # Use explicit kernel route metric to avoid collisions
# with non-BIRD routes in the kernel routing table
# with non-BIRD routes in the kernel routing table
import keep filtered;
import none;
export filter {
@ -33,6 +29,6 @@ protocol kernel {
};
}
include "/etc/bird/ospf.conf";
include "/etc/bird/bgp.conf";
include "/etc/bird/ospf4.conf";
include "/etc/bird/bgp4.conf";
include "/etc/bird/peers4/*";

View file

@ -1,91 +1,34 @@
log syslog { debug, trace, info, remote, warning, error, auth, fatal, bug };
table T_BGP6;
table T_OSPF6;
protocol device {
scan time 10;
scan time 10;
}
# local configuration
######################
include "/etc/bird/local6.conf";
# filter helpers
#################
#include "/etc/bird/filter6.conf";
include "/etc/bird/community_filters.conf";
protocol kernel {
metric 64; # Use explicit kernel route metric to avoid collisions
# with non-BIRD routes in the kernel routing table
scan time 20;
import none;
# export all; # Actually insert routes into the kernel routing table
export filter {
if source = RTS_STATIC then reject;
krt_prefsrc = OWNIP;
accept;
};
}
# static routes
################
protocol static {
route fd62:77fb:94bf::/48 reject;
import all;
export none;
}
template bgp dnpeers {
table T_BGP6;
local as 4242423934;
path metric 1;
import all;
export all;
}
template bgp iBGP_Peer {
local as OWNAS;
igp table T_OSPF6;
path metric on;
import keep filtered;
# import where iBGP_import_peer_policy();
# export where iBGP_export_peer_policy();
import all;
export all;
source address OWNIP;
next hop self;
}
template pipe iBGP_Pipe {
# table name will come from peer definition
peer table master;
import all;
export all;
}
protocol pipe {
peer table T_BGP6;
import filter {
# accept every subnet, except our own advertised subnet
# filtering is important, because some guys try to advertise routes like 0.0.0$
if is_valid_network() && !is_self_net() then {
accept;
}
reject;
};
include "/etc/bird/local6.conf";
#include "/etc/bird/filter6.conf";
include "/etc/bird/community_filters.conf";
protocol kernel {
metric 64; # Use explicit kernel route metric to avoid collisions
# with non-BIRD routes in the kernel routing table
scan time 20;
import none;
# export all; # Actually insert routes into the kernel routing table
export filter {
# here we export the whole net
if is_valid_network() then {
accept;
}
reject;
if source = RTS_STATIC then reject;
krt_prefsrc = OWNIP;
accept;
};
};
}
include "/etc/bird/ospf6.conf";
include "/etc/bird/bgp6.conf";
include "/etc/bird/peers6/*";

View file

@ -1,5 +1,5 @@
protocol ospf {
table T_OSPF;
table T_OSPF4;
import all;
export all;
@ -7,9 +7,6 @@ protocol ospf {
interface "wg-ospf-*" {
};
interface "wg-uk-lon1" {
};
interface "lo" {
stub;
};
@ -17,7 +14,7 @@ protocol ospf {
}
protocol direct {
table T_OSPF;
table T_OSPF4;
import where is_self_net();
export none;
@ -31,8 +28,7 @@ filter filter_OSPF {
};
protocol pipe {
peer table T_OSPF;
peer table T_OSPF4;
import filter filter_OSPF;
export none;
# export filter filter_OSPF;
}

View file

@ -6,9 +6,6 @@ protocol ospf {
area 0 {
interface "wg-ospf-*" {
};
interface "wg-uk-lon1" {
};
interface "lo" {
stub;