aboutsummaryrefslogtreecommitdiff
path: root/tnet/files
diff options
context:
space:
mode:
Diffstat (limited to 'tnet/files')
-rw-r--r--tnet/files/akili/bird-tnet-pre.conf9
-rw-r--r--tnet/files/astyanax/bird-tnet-pre.conf9
-rw-r--r--tnet/files/conflatorio/bird-tnet-pre.conf9
-rw-r--r--tnet/files/hash/bird-tnet-pre.conf9
-rw-r--r--tnet/files/hash/bird-tnet.conf6
-rw-r--r--tnet/files/knot/bird-tnet-pre.conf9
-rw-r--r--tnet/files/knot/bird-tnet.conf7
-rw-r--r--tnet/files/lhn2pi/bird-tnet-pre.conf9
-rw-r--r--tnet/files/node1/bird-tnet-pre.conf9
-rw-r--r--tnet/files/node2/bird-tnet-pre.conf9
10 files changed, 42 insertions, 43 deletions
diff --git a/tnet/files/akili/bird-tnet-pre.conf b/tnet/files/akili/bird-tnet-pre.conf
index 383c050..61669a1 100644
--- a/tnet/files/akili/bird-tnet-pre.conf
+++ b/tnet/files/akili/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:a000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- 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()
{
return net ~ [
fd00::/8{44,64} # ULA address space as per RFC 4193
diff --git a/tnet/files/astyanax/bird-tnet-pre.conf b/tnet/files/astyanax/bird-tnet-pre.conf
index 383c050..61669a1 100644
--- a/tnet/files/astyanax/bird-tnet-pre.conf
+++ b/tnet/files/astyanax/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:a000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- 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()
{
return net ~ [
fd00::/8{44,64} # ULA address space as per RFC 4193
diff --git a/tnet/files/conflatorio/bird-tnet-pre.conf b/tnet/files/conflatorio/bird-tnet-pre.conf
index 383c050..895ac54 100644
--- a/tnet/files/conflatorio/bird-tnet-pre.conf
+++ b/tnet/files/conflatorio/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:a000::/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/hash/bird-tnet-pre.conf b/tnet/files/hash/bird-tnet-pre.conf
index 383c050..61669a1 100644
--- a/tnet/files/hash/bird-tnet-pre.conf
+++ b/tnet/files/hash/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:a000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- 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()
{
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 b105201..5ac9690 100644
--- a/tnet/files/hash/bird-tnet.conf
+++ b/tnet/files/hash/bird-tnet.conf
@@ -37,9 +37,9 @@ template bgp tnet_tpl {
};
}
-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;
}
diff --git a/tnet/files/knot/bird-tnet-pre.conf b/tnet/files/knot/bird-tnet-pre.conf
index 383c050..61669a1 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:a000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- 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()
{
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 60c00ed..fd5332a 100644
--- a/tnet/files/knot/bird-tnet.conf
+++ b/tnet/files/knot/bird-tnet.conf
@@ -37,6 +37,13 @@ template bgp tnet_tpl {
};
}
+protocol bgp tnet_conflatorio from tnet_tpl {
+ neighbor fe80:47fc:660:b91f:1063:a6ae:46bb:7588;
+ interface "tnet-confltrio";
+
+ rr client;
+}
+
protocol bgp tnet_hash from tnet_tpl {
neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7d;
interface "tnet-hash";
diff --git a/tnet/files/lhn2pi/bird-tnet-pre.conf b/tnet/files/lhn2pi/bird-tnet-pre.conf
index 383c050..61669a1 100644
--- a/tnet/files/lhn2pi/bird-tnet-pre.conf
+++ b/tnet/files/lhn2pi/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:a000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- 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()
{
return net ~ [
fd00::/8{44,64} # ULA address space as per RFC 4193
diff --git a/tnet/files/node1/bird-tnet-pre.conf b/tnet/files/node1/bird-tnet-pre.conf
index 383c050..61669a1 100644
--- a/tnet/files/node1/bird-tnet-pre.conf
+++ b/tnet/files/node1/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:a000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- 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()
{
return net ~ [
fd00::/8{44,64} # ULA address space as per RFC 4193
diff --git a/tnet/files/node2/bird-tnet-pre.conf b/tnet/files/node2/bird-tnet-pre.conf
index 383c050..61669a1 100644
--- a/tnet/files/node2/bird-tnet-pre.conf
+++ b/tnet/files/node2/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:a000::/52;
-function is_tnet() # -> bool
+function is_tnet()
{
- 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()
{
return net ~ [
fd00::/8{44,64} # ULA address space as per RFC 4193
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-10 14:03:59 +0000