Cleaning up stuff

This commit is contained in:
graffen 2018-09-22 10:51:14 +00:00
parent bb9e070b7c
commit 77914b7cb4
9 changed files with 48 additions and 38 deletions

View File

@ -13,7 +13,7 @@ protocol static {
}
include "/etc/bird/local4.conf";
#include "/etc/bird/filter4.conf";
include "/etc/bird/filter4.conf";
include "/etc/bird/community_filters.conf";
protocol kernel {

View File

@ -13,7 +13,7 @@ protocol static {
}
include "/etc/bird/local6.conf";
#include "/etc/bird/filter6.conf";
include "/etc/bird/filter6.conf";
include "/etc/bird/community_filters.conf";
protocol kernel {

17
filter4.conf Normal file
View File

@ -0,0 +1,17 @@
function is_self_net() {
return net ~ [172.20.170.192/27+];
}
function is_valid_network() {
return net ~ [
172.20.0.0/14{21,29}, # dn42
172.20.0.0/24{28,32}, # dn42 Anycast
172.21.0.0/24{28,32}, # dn42 Anycast
172.22.0.0/24{28,32}, # dn42 Anycast
172.23.0.0/24{28,32}, # dn42 Anycast
172.31.0.0/16+, # ChaosVPN
10.100.0.0/14+, # ChaosVPN
10.0.0.0/8{15,24} # Freifunk.net
];
}

10
filter6.conf Normal file
View File

@ -0,0 +1,10 @@
function is_self_net() {
return net ~ [fd62:77fb:94bf::/48+];
}
function is_valid_network() {
return net ~ [
fd00::/8{44,64} # ULA address space as per RFC 4193
];
}

View File

@ -1,22 +1,5 @@
router id 172.20.170.192;
router id <router id>;
define OWNAS = 4242423934;
define OWNIP = 172.20.170.192;
define OWNIP = <router ip>;
define DN42_REGION = 41;
function is_self_net() {
return net ~ [172.20.170.192/27];
}
function is_valid_network() {
return net ~ [
172.20.0.0/14{21,29}, # dn42
172.20.0.0/24{28,32}, # dn42 Anycast
172.21.0.0/24{28,32}, # dn42 Anycast
172.22.0.0/24{28,32}, # dn42 Anycast
172.23.0.0/24{28,32}, # dn42 Anycast
172.31.0.0/16+, # ChaosVPN
10.100.0.0/14+, # ChaosVPN
10.0.0.0/8{15,24} # Freifunk.net
];
}

5
local4.conf Normal file
View File

@ -0,0 +1,5 @@
router id 172.20.170.192;
define OWNAS = 4242423934;
define OWNIP = 172.20.170.192;
define DN42_REGION = 41;

View File

@ -1,15 +1,5 @@
router id 172.20.170.192;
router id <router id>;
define OWNAS = 4242423934;
define OWNIP = fd62:77fb:94bf::2300;
define OWNIP = <router ip>;
define DN42_REGION = 41;
function is_self_net() {
return net ~ [fd62:77fb:94bf::/48+];
}
function is_valid_network() {
return net ~ [
fd00::/8{44,64} # ULA address space as per RFC 4193
];
}

5
local6.conf Normal file
View File

@ -0,0 +1,5 @@
router id 172.20.170.192;
define OWNAS = 4242423934;
define OWNIP = fd62:77fb:94bf::2300;
define DN42_REGION = 41;

View File

@ -14,14 +14,14 @@ protocol ospf {
}
filter filter_OSPF {
ospf_metric1 = 1000;
# ospf_metric1 = 1000;
if is_self_net() then accept;
else reject;
};
protocol pipe {
table T_OSPF4;
peer table master;
import none;
export filter filter_OSPF;
peer table T_OSPF4;
table master;
import filter filter_OSPF;
export none;
}