aboutsummaryrefslogtreecommitdiff
path: root/tnet/files
diff options
context:
space:
mode:
Diffstat (limited to 'tnet/files')
-rw-r--r--tnet/files/akili/bird-tnet-pre.conf21
-rw-r--r--tnet/files/akili/bird-tnet.conf22
-rw-r--r--tnet/files/astyanax/bird-tnet-pre.conf21
-rw-r--r--tnet/files/astyanax/bird-tnet.conf22
-rw-r--r--tnet/files/conflatorio/bird-tnet-pre.conf20
-rw-r--r--tnet/files/conflatorio/bird-tnet.conf48
-rw-r--r--tnet/files/coregonus/bird-tnet-pre.conf20
-rw-r--r--tnet/files/coregonus/bird-tnet.conf43
-rw-r--r--tnet/files/hash/bird-tnet-pre.conf21
-rw-r--r--tnet/files/hash/bird-tnet.conf35
-rw-r--r--tnet/files/knot/bird-tnet-pre.conf9
-rw-r--r--tnet/files/knot/bird-tnet.conf63
-rw-r--r--tnet/files/lhn2pi/bird-tnet-pre.conf21
-rw-r--r--tnet/files/lhn2pi/bird-tnet.conf24
-rw-r--r--tnet/files/node1/bird-tnet-pre.conf21
-rw-r--r--tnet/files/node1/bird-tnet.conf22
-rw-r--r--tnet/files/node2/bird-tnet-pre.conf21
-rw-r--r--tnet/files/node2/bird-tnet.conf22
18 files changed, 394 insertions, 82 deletions
diff --git a/tnet/files/akili/bird-tnet-pre.conf b/tnet/files/akili/bird-tnet-pre.conf
index 7994dfe..74c981d 100644
--- a/tnet/files/akili/bird-tnet-pre.conf
+++ b/tnet/files/akili/bird-tnet-pre.conf
@@ -1,7 +1,20 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
+define tnet = fdb1:4242:3538:2000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+ roa6 { table dn42_roa; };
+ include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network()
+{
+ return net ~ [
+ fd00::/8{44,64} # ULA address space as per RFC 4193
+ ];
}
diff --git a/tnet/files/akili/bird-tnet.conf b/tnet/files/akili/bird-tnet.conf
index f9b9d08..24c9b8e 100644
--- a/tnet/files/akili/bird-tnet.conf
+++ b/tnet/files/akili/bird-tnet.conf
@@ -1,3 +1,9 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
template bgp tnet_tpl {
local as 4242423538;
neighbor internal;
@@ -10,19 +16,23 @@ template bgp tnet_tpl {
next hop self;
import filter {
if is_tnet() then {
- print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
}
- print proto, ": import reject, reason=not tnet"; reject;
};
# newer bird's only
# import keep filtered;
export filter {
if is_tnet() then {
- print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
}
- print proto, ": export reject, reason=not tnet"; reject;
};
};
}
diff --git a/tnet/files/astyanax/bird-tnet-pre.conf b/tnet/files/astyanax/bird-tnet-pre.conf
index 7994dfe..74c981d 100644
--- a/tnet/files/astyanax/bird-tnet-pre.conf
+++ b/tnet/files/astyanax/bird-tnet-pre.conf
@@ -1,7 +1,20 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
+define tnet = fdb1:4242:3538:2000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+ roa6 { table dn42_roa; };
+ include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network()
+{
+ return net ~ [
+ fd00::/8{44,64} # ULA address space as per RFC 4193
+ ];
}
diff --git a/tnet/files/astyanax/bird-tnet.conf b/tnet/files/astyanax/bird-tnet.conf
index d697e54..3dbf4c9 100644
--- a/tnet/files/astyanax/bird-tnet.conf
+++ b/tnet/files/astyanax/bird-tnet.conf
@@ -1,3 +1,9 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
template bgp tnet_tpl {
local as 4242423538;
neighbor internal;
@@ -10,19 +16,23 @@ template bgp tnet_tpl {
next hop self;
import filter {
if is_tnet() then {
- print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
}
- print proto, ": import reject, reason=not tnet"; reject;
};
# newer bird's only
# import keep filtered;
export filter {
if is_tnet() then {
- print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
}
- print proto, ": export reject, reason=not tnet"; reject;
};
};
}
diff --git a/tnet/files/conflatorio/bird-tnet-pre.conf b/tnet/files/conflatorio/bird-tnet-pre.conf
new file mode 100644
index 0000000..d60e8df
--- /dev/null
+++ b/tnet/files/conflatorio/bird-tnet-pre.conf
@@ -0,0 +1,20 @@
+define tnet = fdb1:4242:3538:2000::/52;
+
+function is_tnet() -> bool
+{
+ return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+ roa6 { table dn42_roa; };
+ include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network() -> bool
+{
+ return net ~ [
+ fd00::/8{44,64} # ULA address space as per RFC 4193
+ ];
+}
diff --git a/tnet/files/conflatorio/bird-tnet.conf b/tnet/files/conflatorio/bird-tnet.conf
new file mode 100644
index 0000000..02780a6
--- /dev/null
+++ b/tnet/files/conflatorio/bird-tnet.conf
@@ -0,0 +1,48 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
+template bgp tnet_tpl {
+ local as 4242423538;
+ neighbor internal;
+
+ direct;
+
+ password "trygvis";
+
+ ipv6 {
+ next hop self;
+ import filter {
+ if is_tnet() then {
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
+ }
+ };
+ # newer bird's only
+ # import keep filtered;
+ export filter {
+ if is_tnet() then {
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
+ }
+ };
+ };
+}
+
+protocol bgp tnet_hash from tnet_tpl {
+ neighbor fe80:4540:476c:d432:2f32:818b:811b:bb61;
+ interface "tnet-hash";
+}
+
+protocol bgp tnet_knot from tnet_tpl {
+ neighbor fe80:47fc:0660:b91f:1063:a6ae:46bb:7589;
+ interface "tnet-knot";
+}
diff --git a/tnet/files/coregonus/bird-tnet-pre.conf b/tnet/files/coregonus/bird-tnet-pre.conf
new file mode 100644
index 0000000..d60e8df
--- /dev/null
+++ b/tnet/files/coregonus/bird-tnet-pre.conf
@@ -0,0 +1,20 @@
+define tnet = fdb1:4242:3538:2000::/52;
+
+function is_tnet() -> bool
+{
+ return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+ roa6 { table dn42_roa; };
+ include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network() -> bool
+{
+ return net ~ [
+ fd00::/8{44,64} # ULA address space as per RFC 4193
+ ];
+}
diff --git a/tnet/files/coregonus/bird-tnet.conf b/tnet/files/coregonus/bird-tnet.conf
new file mode 100644
index 0000000..95ede41
--- /dev/null
+++ b/tnet/files/coregonus/bird-tnet.conf
@@ -0,0 +1,43 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
+template bgp tnet_tpl {
+ local as 4242423538;
+ neighbor internal;
+
+ direct;
+
+ password "trygvis";
+
+ ipv6 {
+ next hop self;
+ import filter {
+ if is_tnet() then {
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
+ }
+ };
+ # newer bird's only
+ # import keep filtered;
+ export filter {
+ if is_tnet() then {
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
+ }
+ };
+ };
+}
+
+protocol bgp tnet_knot from tnet_tpl {
+ neighbor fe80:ba82:77f0:f96d:7a85:a7fa:ef6f:37d2;
+ interface "tnet-knot";
+}
diff --git a/tnet/files/hash/bird-tnet-pre.conf b/tnet/files/hash/bird-tnet-pre.conf
index 7994dfe..74c981d 100644
--- a/tnet/files/hash/bird-tnet-pre.conf
+++ b/tnet/files/hash/bird-tnet-pre.conf
@@ -1,7 +1,20 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
+define tnet = fdb1:4242:3538:2000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+ roa6 { table dn42_roa; };
+ include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network()
+{
+ return net ~ [
+ fd00::/8{44,64} # ULA address space as per RFC 4193
+ ];
}
diff --git a/tnet/files/hash/bird-tnet.conf b/tnet/files/hash/bird-tnet.conf
index 16ce2cc..a570291 100644
--- a/tnet/files/hash/bird-tnet.conf
+++ b/tnet/files/hash/bird-tnet.conf
@@ -1,3 +1,9 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
template bgp tnet_tpl {
local as 4242423538;
neighbor internal;
@@ -10,26 +16,30 @@ template bgp tnet_tpl {
next hop self;
import filter {
if is_tnet() then {
- print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
}
- print proto, ": import reject, reason=not tnet"; reject;
};
# newer bird's only
# import keep filtered;
export filter {
if is_tnet() then {
- print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
}
- print proto, ": export reject, reason=not tnet"; reject;
};
};
}
-protocol bgp tnet_astyanax from tnet_tpl {
- neighbor fe80:a0fd:89e4:42c6:f617:7398:abf4:b517;
- interface "tnet-astyanax";
+protocol bgp tnet_conflatorio from tnet_tpl {
+ neighbor fe80:4540:476c:d432:2f32:818b:811b:bb60;
+ interface "tnet-confltrio";
rr client;
}
@@ -41,6 +51,13 @@ protocol bgp tnet_knot from tnet_tpl {
rr client;
}
+protocol bgp tnet_lhn2pi from tnet_tpl {
+ neighbor fe80:6195:1d43:9655:35f7:9dba:798c:26b9;
+ interface "tnet-lhn2pi";
+
+ rr client;
+}
+
protocol bgp tnet_node1 from tnet_tpl {
neighbor fe80:a026:6ec2:b356:21c5:b51:22b9:a1df;
interface "tnet-node1";
diff --git a/tnet/files/knot/bird-tnet-pre.conf b/tnet/files/knot/bird-tnet-pre.conf
index ec31fa2..d60e8df 100644
--- a/tnet/files/knot/bird-tnet-pre.conf
+++ b/tnet/files/knot/bird-tnet-pre.conf
@@ -1,9 +1,8 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
+define tnet = fdb1:4242:3538:2000::/52;
-function is_tnet() # -> bool
+function is_tnet() -> bool
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet;
}
roa6 table dn42_roa;
@@ -13,7 +12,7 @@ protocol static {
include "/etc/bird/dn42_roa_bird2_6.conf";
};
-function dn42_is_valid_network() # -> bool
+function dn42_is_valid_network() -> bool
{
return net ~ [
fd00::/8{44,64} # ULA address space as per RFC 4193
diff --git a/tnet/files/knot/bird-tnet.conf b/tnet/files/knot/bird-tnet.conf
index 66189e1..f21be09 100644
--- a/tnet/files/knot/bird-tnet.conf
+++ b/tnet/files/knot/bird-tnet.conf
@@ -1,3 +1,9 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
template bgp tnet_tpl {
local as 4242423538;
neighbor internal;
@@ -10,23 +16,41 @@ template bgp tnet_tpl {
next hop self;
import filter {
if is_tnet() then {
- print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
}
- print proto, ": import reject, reason=not tnet"; reject;
};
# newer bird's only
# import keep filtered;
export filter {
if is_tnet() then {
- print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
}
- print proto, ": export reject, reason=not tnet"; reject;
};
};
}
+protocol bgp tnet_conflatorio from tnet_tpl {
+ neighbor fe80:47fc:660:b91f:1063:a6ae:46bb:7588;
+ interface "tnet-confltrio";
+
+ rr client;
+}
+
+protocol bgp tnet_coregonus from tnet_tpl {
+ neighbor fe80:ba82:77f0:f96d:7a85:a7fa:ef6f:37d3;
+ interface "tnet-coregonus";
+
+ rr client;
+}
+
protocol bgp tnet_hash from tnet_tpl {
neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7d;
interface "tnet-hash";
@@ -34,6 +58,20 @@ protocol bgp tnet_hash from tnet_tpl {
rr client;
}
+protocol bgp tnet_kv24ix from tnet_tpl {
+ neighbor fe80:fef1:078a:5b64:efd3:ae7b:d286:d7cf;
+ interface "tnet-kv24ix";
+
+ rr client;
+}
+
+protocol bgp tnet_lhn2pi from tnet_tpl {
+ neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e9;
+ interface "tnet-lhn2pi";
+
+ rr client;
+}
+
protocol bgp tnet_node1 from tnet_tpl {
neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f3;
interface "tnet-node1";
@@ -56,23 +94,22 @@ protocol bgp routedbits_lon1 {
ipv6 {
import filter {
- if dn42_is_valid_network() && !is_tnet() then {
+ if dn42_is_valid_network() && (net !~ tnet) then {
# Check when unknown or invalid according to ROA
if (roa_check(dn42_roa, net, bgp_path.last) = ROA_VALID) then {
accept;
} else {
- print "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last;
- reject;
+ reject proto, "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last;
}
} else {
- reject;
+ reject proto, "[dn42] invalid dn42 network ", net, " ASN ", bgp_path.last;
}
};
export filter {
- if dn42_is_valid_network() && source ~ [RTS_STATIC, RTS_BGP] then {
- accept;
+ if net ~ tnet then {
+ accept proto, "[dn42] accepting export tnet: ", net;
} else {
- reject;
+ reject proto, "[dn42] rejecting export: ", net;
}
};
};
diff --git a/tnet/files/lhn2pi/bird-tnet-pre.conf b/tnet/files/lhn2pi/bird-tnet-pre.conf
index 7994dfe..74c981d 100644
--- a/tnet/files/lhn2pi/bird-tnet-pre.conf
+++ b/tnet/files/lhn2pi/bird-tnet-pre.conf
@@ -1,7 +1,20 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
+define tnet = fdb1:4242:3538:2000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+ roa6 { table dn42_roa; };
+ include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network()
+{
+ return net ~ [
+ fd00::/8{44,64} # ULA address space as per RFC 4193
+ ];
}
diff --git a/tnet/files/lhn2pi/bird-tnet.conf b/tnet/files/lhn2pi/bird-tnet.conf
index 864ad0b..9f0ef8c 100644
--- a/tnet/files/lhn2pi/bird-tnet.conf
+++ b/tnet/files/lhn2pi/bird-tnet.conf
@@ -1,3 +1,9 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
template bgp tnet_tpl {
local as 4242423538;
neighbor internal;
@@ -10,19 +16,23 @@ template bgp tnet_tpl {
next hop self;
import filter {
if is_tnet() then {
- print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
}
- print proto, ": import reject, reason=not tnet"; reject;
};
# newer bird's only
# import keep filtered;
export filter {
if is_tnet() then {
- print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
}
- print proto, ": export reject, reason=not tnet"; reject;
};
};
}
@@ -33,6 +43,6 @@ protocol bgp tnet_hash from tnet_tpl {
}
protocol bgp tnet_knot from tnet_tpl {
- neighbor fdb1:4242:3538:ffff:374e:2c7d:319e:e526;
+ neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8;
interface "tnet-knot";
}
diff --git a/tnet/files/node1/bird-tnet-pre.conf b/tnet/files/node1/bird-tnet-pre.conf
index 7994dfe..74c981d 100644
--- a/tnet/files/node1/bird-tnet-pre.conf
+++ b/tnet/files/node1/bird-tnet-pre.conf
@@ -1,7 +1,20 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
+define tnet = fdb1:4242:3538:2000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+ roa6 { table dn42_roa; };
+ include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network()
+{
+ return net ~ [
+ fd00::/8{44,64} # ULA address space as per RFC 4193
+ ];
}
diff --git a/tnet/files/node1/bird-tnet.conf b/tnet/files/node1/bird-tnet.conf
index 88bd6f8..6449582 100644
--- a/tnet/files/node1/bird-tnet.conf
+++ b/tnet/files/node1/bird-tnet.conf
@@ -1,3 +1,9 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
template bgp tnet_tpl {
local as 4242423538;
neighbor internal;
@@ -10,19 +16,23 @@ template bgp tnet_tpl {
next hop self;
import filter {
if is_tnet() then {
- print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
}
- print proto, ": import reject, reason=not tnet"; reject;
};
# newer bird's only
# import keep filtered;
export filter {
if is_tnet() then {
- print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
}
- print proto, ": export reject, reason=not tnet"; reject;
};
};
}
diff --git a/tnet/files/node2/bird-tnet-pre.conf b/tnet/files/node2/bird-tnet-pre.conf
index 7994dfe..74c981d 100644
--- a/tnet/files/node2/bird-tnet-pre.conf
+++ b/tnet/files/node2/bird-tnet-pre.conf
@@ -1,7 +1,20 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
+define tnet = fdb1:4242:3538:2000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+ roa6 { table dn42_roa; };
+ include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network()
+{
+ return net ~ [
+ fd00::/8{44,64} # ULA address space as per RFC 4193
+ ];
}
diff --git a/tnet/files/node2/bird-tnet.conf b/tnet/files/node2/bird-tnet.conf
index 99dfc5e..b9a2294 100644
--- a/tnet/files/node2/bird-tnet.conf
+++ b/tnet/files/node2/bird-tnet.conf
@@ -1,3 +1,9 @@
+# Set to true if this peer is directly connected to a dn42 peer
+define is_dn42_peer = true;
+# If we are connected directly to dn42, we don't want the dn42 routes from others
+define import_dn42 = !is_dn42_peer;
+define export_dn42 = is_dn42_peer;
+
template bgp tnet_tpl {
local as 4242423538;
neighbor internal;
@@ -10,19 +16,23 @@ template bgp tnet_tpl {
next hop self;
import filter {
if is_tnet() then {
- print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if import_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": import reject, reason=not tnet";
}
- print proto, ": import reject, reason=not tnet"; reject;
};
# newer bird's only
# import keep filtered;
export filter {
if is_tnet() then {
- print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
- accept;
+ accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
+ } else if export_dn42 && dn42_is_valid_network() then {
+ accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
+ } else {
+ reject proto, ": export reject, reason=not tnet";
}
- print proto, ": export reject, reason=not tnet"; reject;
};
};
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 16:30:08 +0000