aboutsummaryrefslogtreecommitdiff
path: root/tnet/files
diff options
context:
space:
mode:
Diffstat (limited to 'tnet/files')
-rw-r--r--tnet/files/akili/bird-tnet-pre.conf16
-rw-r--r--tnet/files/akili/bird-tnet.conf22
-rw-r--r--tnet/files/astyanax/bird-tnet-pre.conf16
-rw-r--r--tnet/files/astyanax/bird-tnet.conf22
-rw-r--r--tnet/files/hash/bird-tnet-pre.conf16
-rw-r--r--tnet/files/hash/bird-tnet.conf22
-rw-r--r--tnet/files/knot/bird-tnet-pre.conf2
-rw-r--r--tnet/files/knot/bird-tnet.conf42
-rw-r--r--tnet/files/lhn2pi/bird-tnet-pre.conf16
-rw-r--r--tnet/files/lhn2pi/bird-tnet.conf22
-rw-r--r--tnet/files/node1/bird-tnet-pre.conf16
-rw-r--r--tnet/files/node1/bird-tnet.conf22
-rw-r--r--tnet/files/node2/bird-tnet-pre.conf16
-rw-r--r--tnet/files/node2/bird-tnet.conf22
14 files changed, 216 insertions, 56 deletions
diff --git a/tnet/files/akili/bird-tnet-pre.conf b/tnet/files/akili/bird-tnet-pre.conf
index 7994dfe..383c050 100644
--- a/tnet/files/akili/bird-tnet-pre.conf
+++ b/tnet/files/akili/bird-tnet-pre.conf
@@ -3,5 +3,19 @@ define tnet_router = fdb1:4242:3538:ffff::/64;
function is_tnet() # -> bool
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet && (net !~ tnet_router);
+}
+
+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/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..383c050 100644
--- a/tnet/files/astyanax/bird-tnet-pre.conf
+++ b/tnet/files/astyanax/bird-tnet-pre.conf
@@ -3,5 +3,19 @@ define tnet_router = fdb1:4242:3538:ffff::/64;
function is_tnet() # -> bool
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet && (net !~ tnet_router);
+}
+
+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/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/hash/bird-tnet-pre.conf b/tnet/files/hash/bird-tnet-pre.conf
index 7994dfe..383c050 100644
--- a/tnet/files/hash/bird-tnet-pre.conf
+++ b/tnet/files/hash/bird-tnet-pre.conf
@@ -3,5 +3,19 @@ define tnet_router = fdb1:4242:3538:ffff::/64;
function is_tnet() # -> bool
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet && (net !~ tnet_router);
+}
+
+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/hash/bird-tnet.conf b/tnet/files/hash/bird-tnet.conf
index 16ce2cc..b105201 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,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/knot/bird-tnet-pre.conf b/tnet/files/knot/bird-tnet-pre.conf
index ec31fa2..383c050 100644
--- a/tnet/files/knot/bird-tnet-pre.conf
+++ b/tnet/files/knot/bird-tnet-pre.conf
@@ -3,7 +3,7 @@ define tnet_router = fdb1:4242:3538:ffff::/64;
function is_tnet() # -> bool
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet && (net !~ tnet_router);
}
roa6 table dn42_roa;
diff --git a/tnet/files/knot/bird-tnet.conf b/tnet/files/knot/bird-tnet.conf
index 66189e1..60c00ed 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,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;
};
};
}
@@ -34,6 +44,13 @@ protocol bgp tnet_hash from tnet_tpl {
rr client;
}
+protocol bgp tnet_lhn2pi from tnet_tpl {
+ neighbor fdb1:4242:3538:ffff:374e:2c7d:319e:e527;
+ 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 +73,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..383c050 100644
--- a/tnet/files/lhn2pi/bird-tnet-pre.conf
+++ b/tnet/files/lhn2pi/bird-tnet-pre.conf
@@ -3,5 +3,19 @@ define tnet_router = fdb1:4242:3538:ffff::/64;
function is_tnet() # -> bool
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet && (net !~ tnet_router);
+}
+
+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/lhn2pi/bird-tnet.conf b/tnet/files/lhn2pi/bird-tnet.conf
index 864ad0b..895409c 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;
};
};
}
diff --git a/tnet/files/node1/bird-tnet-pre.conf b/tnet/files/node1/bird-tnet-pre.conf
index 7994dfe..383c050 100644
--- a/tnet/files/node1/bird-tnet-pre.conf
+++ b/tnet/files/node1/bird-tnet-pre.conf
@@ -3,5 +3,19 @@ define tnet_router = fdb1:4242:3538:ffff::/64;
function is_tnet() # -> bool
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet && (net !~ tnet_router);
+}
+
+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/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..383c050 100644
--- a/tnet/files/node2/bird-tnet-pre.conf
+++ b/tnet/files/node2/bird-tnet-pre.conf
@@ -3,5 +3,19 @@ define tnet_router = fdb1:4242:3538:ffff::/64;
function is_tnet() # -> bool
{
- return net ~ tnet && ! (net ~ tnet_router);
+ return net ~ tnet && (net !~ tnet_router);
+}
+
+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/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-20 11:55:16 +0000