Cleaning up stuff, renaming things a little
This commit is contained in:
parent
dddb9217ac
commit
f9215518f7
|
@ -1,9 +1,9 @@
|
||||||
template bgp dnpeers {
|
template bgp dn42peer {
|
||||||
local as OWNAS;
|
local as OWNAS;
|
||||||
table T_BGP;
|
table T_BGP;
|
||||||
path metric 1;
|
path metric 1;
|
||||||
import keep filtered;
|
import keep filtered;
|
||||||
import where dnpeers_import_policy();
|
import where dn42peer_import_policy();
|
||||||
export filter {
|
export filter {
|
||||||
if is_valid_network() then {
|
if is_valid_network() then {
|
||||||
accept;
|
accept;
|
||||||
|
@ -12,14 +12,12 @@ template bgp dnpeers {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
template bgp iBGP_Peer {
|
template bgp ibgppeer {
|
||||||
local as OWNAS;
|
local as OWNAS;
|
||||||
hold time 15;
|
hold time 15;
|
||||||
igp table T_OSPF;
|
igp table T_OSPF;
|
||||||
path metric on;
|
path metric on;
|
||||||
import keep filtered;
|
import keep filtered;
|
||||||
# import where iBGP_import_peer_policy();
|
|
||||||
# export where iBGP_export_peer_policy();
|
|
||||||
import all;
|
import all;
|
||||||
export all;
|
export all;
|
||||||
source address OWNIP_IBGP;
|
source address OWNIP_IBGP;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
template bgp dnpeers {
|
template bgp dn42peer {
|
||||||
local as OWNAS;
|
local as OWNAS;
|
||||||
table T_BGP;
|
table T_BGP;
|
||||||
path metric 1;
|
path metric 1;
|
||||||
import keep filtered on;
|
import keep filtered on;
|
||||||
import where dnpeers_import_policy();
|
import where dn42peer_import_policy();
|
||||||
export filter {
|
export filter {
|
||||||
if is_valid_network() then {
|
if is_valid_network() then {
|
||||||
accept;
|
accept;
|
||||||
|
@ -12,7 +12,7 @@ template bgp dnpeers {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
template bgp iBGP_Peer {
|
template bgp ibgppeer {
|
||||||
local as OWNAS;
|
local as OWNAS;
|
||||||
hold time 15;
|
hold time 15;
|
||||||
igp table T_OSPF;
|
igp table T_OSPF;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
log "/var/log/bird.log" { debug, trace, info, remote, warning, error, auth, fatal, bug };
|
log "/var/log/bird.log" { debug, trace, info, remote, warning, error, auth, fatal, bug };
|
||||||
|
|
||||||
table T_BGP;
|
table T_BGP;
|
||||||
table T_OSPF;
|
table T_OSPF;
|
||||||
|
|
||||||
|
@ -12,10 +13,6 @@ protocol static {
|
||||||
export none;
|
export none;
|
||||||
}
|
}
|
||||||
|
|
||||||
include "/etc/bird/local4.conf";
|
|
||||||
include "/etc/bird/filter4.conf";
|
|
||||||
include "/etc/bird/community_filters.conf";
|
|
||||||
|
|
||||||
protocol kernel {
|
protocol kernel {
|
||||||
scan time 20;
|
scan time 20;
|
||||||
metric 64; # Use explicit kernel route metric to avoid collisions
|
metric 64; # Use explicit kernel route metric to avoid collisions
|
||||||
|
@ -29,6 +26,9 @@ protocol kernel {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include "/etc/bird/local4.conf";
|
||||||
|
include "/etc/bird/filter4.conf";
|
||||||
|
include "/etc/bird/community_filters.conf";
|
||||||
include "/etc/bird/ospf4.conf";
|
include "/etc/bird/ospf4.conf";
|
||||||
include "/etc/bird/bgp4.conf";
|
include "/etc/bird/bgp4.conf";
|
||||||
include "/etc/bird/peers4/*";
|
include "/etc/bird/peers4/*";
|
||||||
|
|
|
@ -34,7 +34,7 @@ function import_filter_networks() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function dnpeers_import_policy() {
|
function dn42peer_import_policy() {
|
||||||
if(!check_roa()) then return false;
|
if(!check_roa()) then return false;
|
||||||
if(!import_filter_networks()) then return false;
|
if(!import_filter_networks()) then return false;
|
||||||
}
|
}
|
|
@ -27,7 +27,7 @@ function import_filter_networks() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function dnpeers_import_policy() {
|
function dn42peer_import_policy() {
|
||||||
if(!check_roa()) then return false;
|
if(!check_roa()) then return false;
|
||||||
if(!import_filter_networks()) then return false;
|
if(!import_filter_networks()) then return false;
|
||||||
}
|
}
|
Loading…
Reference in a new issue