From 4a40030a65f8029740d5c9ccb226114073f52eb8 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 18 Aug 2024 09:43:30 +0200 Subject: Better if support --- tnet/templates/bird-tnet-pre.conf.j2 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tnet/templates/bird-tnet-pre.conf.j2') diff --git a/tnet/templates/bird-tnet-pre.conf.j2 b/tnet/templates/bird-tnet-pre.conf.j2 index 383c050..e762cd5 100644 --- a/tnet/templates/bird-tnet-pre.conf.j2 +++ b/tnet/templates/bird-tnet-pre.conf.j2 @@ -1,9 +1,8 @@ -define tnet = fdb1:4242:3538::/48; -define tnet_router = fdb1:4242:3538:ffff::/64; +define tnet = {{ ipam6.networks.tnet_dn42.range }}; -function is_tnet() # -> bool +function is_tnet(){{ " -> bool" if birdv >= 2015 }} { - 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" if birdv >= 2015 }} { return net ~ [ fd00::/8{44,64} # ULA address space as per RFC 4193 -- cgit v1.2.3