From 6e8565e4694b55de9a30ce91f991bcc0bb0bd0bf Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 6 Oct 2024 15:23:06 +0200 Subject: tnet: Using templates instead of files --- tnet/bird-deploy.yml | 4 +- tnet/bird-gen.yml | 17 +--- tnet/files/akili/bird-tnet-pre.conf | 20 ----- tnet/files/akili/bird-tnet.conf | 48 ----------- tnet/files/astyanax/bird-tnet-pre.conf | 20 ----- tnet/files/astyanax/bird-tnet.conf | 48 ----------- tnet/files/conflatorio/bird-tnet-pre.conf | 20 ----- tnet/files/conflatorio/bird-tnet.conf | 48 ----------- tnet/files/coregonus/bird-tnet-pre.conf | 20 ----- tnet/files/coregonus/bird-tnet.conf | 43 ---------- tnet/files/hash/bird-tnet-pre.conf | 20 ----- tnet/files/hash/bird-tnet.conf | 73 ---------------- tnet/files/knot/bird-tnet-pre.conf | 20 ----- tnet/files/knot/bird-tnet.conf | 116 -------------------------- tnet/files/lhn2pi/bird-tnet-pre.conf | 20 ----- tnet/files/lhn2pi/bird-tnet.conf | 48 ----------- tnet/files/node1/bird-tnet-pre.conf | 20 ----- tnet/files/node1/bird-tnet.conf | 48 ----------- tnet/files/node2/bird-tnet-pre.conf | 20 ----- tnet/files/node2/bird-tnet.conf | 48 ----------- tnet/templates/akili/bird-tnet-pre.conf | 20 +++++ tnet/templates/akili/bird-tnet.conf | 48 +++++++++++ tnet/templates/astyanax/bird-tnet-pre.conf | 20 +++++ tnet/templates/astyanax/bird-tnet.conf | 48 +++++++++++ tnet/templates/conflatorio/bird-tnet-pre.conf | 20 +++++ tnet/templates/conflatorio/bird-tnet.conf | 48 +++++++++++ tnet/templates/coregonus/bird-tnet-pre.conf | 20 +++++ tnet/templates/coregonus/bird-tnet.conf | 43 ++++++++++ tnet/templates/hash/bird-tnet-pre.conf | 20 +++++ tnet/templates/hash/bird-tnet.conf | 73 ++++++++++++++++ tnet/templates/knot/bird-tnet-pre.conf | 20 +++++ tnet/templates/knot/bird-tnet.conf | 116 ++++++++++++++++++++++++++ tnet/templates/lhn2pi/bird-tnet-pre.conf | 20 +++++ tnet/templates/lhn2pi/bird-tnet.conf | 48 +++++++++++ tnet/templates/node1/bird-tnet-pre.conf | 20 +++++ tnet/templates/node1/bird-tnet.conf | 48 +++++++++++ tnet/templates/node2/bird-tnet-pre.conf | 20 +++++ tnet/templates/node2/bird-tnet.conf | 48 +++++++++++ 38 files changed, 706 insertions(+), 715 deletions(-) delete mode 100644 tnet/files/akili/bird-tnet-pre.conf delete mode 100644 tnet/files/akili/bird-tnet.conf delete mode 100644 tnet/files/astyanax/bird-tnet-pre.conf delete mode 100644 tnet/files/astyanax/bird-tnet.conf delete mode 100644 tnet/files/conflatorio/bird-tnet-pre.conf delete mode 100644 tnet/files/conflatorio/bird-tnet.conf delete mode 100644 tnet/files/coregonus/bird-tnet-pre.conf delete mode 100644 tnet/files/coregonus/bird-tnet.conf delete mode 100644 tnet/files/hash/bird-tnet-pre.conf delete mode 100644 tnet/files/hash/bird-tnet.conf delete mode 100644 tnet/files/knot/bird-tnet-pre.conf delete mode 100644 tnet/files/knot/bird-tnet.conf delete mode 100644 tnet/files/lhn2pi/bird-tnet-pre.conf delete mode 100644 tnet/files/lhn2pi/bird-tnet.conf delete mode 100644 tnet/files/node1/bird-tnet-pre.conf delete mode 100644 tnet/files/node1/bird-tnet.conf delete mode 100644 tnet/files/node2/bird-tnet-pre.conf delete mode 100644 tnet/files/node2/bird-tnet.conf create mode 100644 tnet/templates/akili/bird-tnet-pre.conf create mode 100644 tnet/templates/akili/bird-tnet.conf create mode 100644 tnet/templates/astyanax/bird-tnet-pre.conf create mode 100644 tnet/templates/astyanax/bird-tnet.conf create mode 100644 tnet/templates/conflatorio/bird-tnet-pre.conf create mode 100644 tnet/templates/conflatorio/bird-tnet.conf create mode 100644 tnet/templates/coregonus/bird-tnet-pre.conf create mode 100644 tnet/templates/coregonus/bird-tnet.conf create mode 100644 tnet/templates/hash/bird-tnet-pre.conf create mode 100644 tnet/templates/hash/bird-tnet.conf create mode 100644 tnet/templates/knot/bird-tnet-pre.conf create mode 100644 tnet/templates/knot/bird-tnet.conf create mode 100644 tnet/templates/lhn2pi/bird-tnet-pre.conf create mode 100644 tnet/templates/lhn2pi/bird-tnet.conf create mode 100644 tnet/templates/node1/bird-tnet-pre.conf create mode 100644 tnet/templates/node1/bird-tnet.conf create mode 100644 tnet/templates/node2/bird-tnet-pre.conf create mode 100644 tnet/templates/node2/bird-tnet.conf diff --git a/tnet/bird-deploy.yml b/tnet/bird-deploy.yml index ed7cecf..82f7f39 100644 --- a/tnet/bird-deploy.yml +++ b/tnet/bird-deploy.yml @@ -1,9 +1,9 @@ - hosts: tnet_bird tasks: - become: yes - copy: - dest: "/etc/bird/{{ item }}" + template: src: "{{ inventory_hostname }}/{{ item }}" + dest: "/etc/bird/{{ item }}" owner: bird group: bird mode: 0640 diff --git a/tnet/bird-gen.yml b/tnet/bird-gen.yml index 9fa71b1..74a83b1 100644 --- a/tnet/bird-gen.yml +++ b/tnet/bird-gen.yml @@ -1,25 +1,16 @@ -- name: Remove old configuration - hosts: localhost - connection: local - gather_facts: False - tasks: - - file: - path: files - state: absent - changed_when: False - - name: Generate Bird configuration hosts: tnet_bird connection: local gather_facts: False tasks: - - file: + - name: rmdir files/$hostname + file: path: files/{{ inventory_hostname }} - state: directory + state: absent changed_when: False - template: src: "{{ item }}.j2" - dest: "files/{{ inventory_hostname }}/{{ item }}" + dest: "templates/{{ inventory_hostname }}/{{ item }}" loop: - bird-tnet-pre.conf - bird-tnet.conf diff --git a/tnet/files/akili/bird-tnet-pre.conf b/tnet/files/akili/bird-tnet-pre.conf deleted file mode 100644 index 74c981d..0000000 --- a/tnet/files/akili/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -define tnet = fdb1:4242:3538:2000::/52; - -function is_tnet() -{ - 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 deleted file mode 100644 index 24c9b8e..0000000 --- a/tnet/files/akili/bird-tnet.conf +++ /dev/null @@ -1,48 +0,0 @@ -# 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 fdb1:4242:3538:ffff:ca85:f812:3935:5fba; - interface "tnet-hash"; -} - -protocol bgp tnet_knot from tnet_tpl { - neighbor fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a; - interface "tnet-knot"; -} diff --git a/tnet/files/astyanax/bird-tnet-pre.conf b/tnet/files/astyanax/bird-tnet-pre.conf deleted file mode 100644 index 74c981d..0000000 --- a/tnet/files/astyanax/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -define tnet = fdb1:4242:3538:2000::/52; - -function is_tnet() -{ - 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 deleted file mode 100644 index 3dbf4c9..0000000 --- a/tnet/files/astyanax/bird-tnet.conf +++ /dev/null @@ -1,48 +0,0 @@ -# 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:a0fd:89e4:42c6:f617:7398:abf4:b516; - interface "tnet-hash"; -} - -protocol bgp tnet_knot from tnet_tpl { - neighbor fe80:6728:53fc:fc81:40b3:9beb:8336:ba56; - interface "tnet-knot"; -} diff --git a/tnet/files/conflatorio/bird-tnet-pre.conf b/tnet/files/conflatorio/bird-tnet-pre.conf deleted file mode 100644 index d60e8df..0000000 --- a/tnet/files/conflatorio/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 02780a6..0000000 --- a/tnet/files/conflatorio/bird-tnet.conf +++ /dev/null @@ -1,48 +0,0 @@ -# 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 deleted file mode 100644 index d60e8df..0000000 --- a/tnet/files/coregonus/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 95ede41..0000000 --- a/tnet/files/coregonus/bird-tnet.conf +++ /dev/null @@ -1,43 +0,0 @@ -# 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 deleted file mode 100644 index 74c981d..0000000 --- a/tnet/files/hash/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -define tnet = fdb1:4242:3538:2000::/52; - -function is_tnet() -{ - 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 deleted file mode 100644 index a570291..0000000 --- a/tnet/files/hash/bird-tnet.conf +++ /dev/null @@ -1,73 +0,0 @@ -# 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_conflatorio from tnet_tpl { - neighbor fe80:4540:476c:d432:2f32:818b:811b:bb60; - interface "tnet-confltrio"; - - rr client; -} - -protocol bgp tnet_knot from tnet_tpl { - neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7c; - interface "tnet-knot"; - - 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"; - - rr client; -} - -protocol bgp tnet_node2 from tnet_tpl { - neighbor fe80:a7a6:c1a8:c261:232e:7d67:fc27:7c8d; - interface "tnet-node2"; - - rr client; -} diff --git a/tnet/files/knot/bird-tnet-pre.conf b/tnet/files/knot/bird-tnet-pre.conf deleted file mode 100644 index d60e8df..0000000 --- a/tnet/files/knot/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -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/knot/bird-tnet.conf b/tnet/files/knot/bird-tnet.conf deleted file mode 100644 index f21be09..0000000 --- a/tnet/files/knot/bird-tnet.conf +++ /dev/null @@ -1,116 +0,0 @@ -# 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_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"; - - 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"; - - rr client; -} - -protocol bgp tnet_node2 from tnet_tpl { - neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32db; - interface "tnet-node2"; - - rr client; -} - -protocol bgp routedbits_lon1 { - local as 4242423538; - neighbor fe80::207; - neighbor as 4242420207; - interface "tnet-rtdbts_l1"; - - ipv6 { - import filter { - 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 { - reject proto, "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last; - } - } else { - reject proto, "[dn42] invalid dn42 network ", net, " ASN ", bgp_path.last; - } - }; - export filter { - if net ~ tnet then { - accept proto, "[dn42] accepting export tnet: ", net; - } else { - reject proto, "[dn42] rejecting export: ", net; - } - }; - }; -} diff --git a/tnet/files/lhn2pi/bird-tnet-pre.conf b/tnet/files/lhn2pi/bird-tnet-pre.conf deleted file mode 100644 index 74c981d..0000000 --- a/tnet/files/lhn2pi/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -define tnet = fdb1:4242:3538:2000::/52; - -function is_tnet() -{ - 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 deleted file mode 100644 index 9f0ef8c..0000000 --- a/tnet/files/lhn2pi/bird-tnet.conf +++ /dev/null @@ -1,48 +0,0 @@ -# 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:6195:1d43:9655:35f7:9dba:798c:26b8; - interface "tnet-hash"; -} - -protocol bgp tnet_knot from tnet_tpl { - 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 deleted file mode 100644 index 74c981d..0000000 --- a/tnet/files/node1/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -define tnet = fdb1:4242:3538:2000::/52; - -function is_tnet() -{ - 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 deleted file mode 100644 index 6449582..0000000 --- a/tnet/files/node1/bird-tnet.conf +++ /dev/null @@ -1,48 +0,0 @@ -# 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:a026:6ec2:b356:21c5:b51:22b9:a1de; - interface "tnet-hash"; -} - -protocol bgp tnet_knot from tnet_tpl { - neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f2; - interface "tnet-knot"; -} diff --git a/tnet/files/node2/bird-tnet-pre.conf b/tnet/files/node2/bird-tnet-pre.conf deleted file mode 100644 index 74c981d..0000000 --- a/tnet/files/node2/bird-tnet-pre.conf +++ /dev/null @@ -1,20 +0,0 @@ -define tnet = fdb1:4242:3538:2000::/52; - -function is_tnet() -{ - 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 deleted file mode 100644 index b9a2294..0000000 --- a/tnet/files/node2/bird-tnet.conf +++ /dev/null @@ -1,48 +0,0 @@ -# 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:a7a6:c1a8:c261:232e:7d67:fc27:7c8c; - interface "tnet-hash"; -} - -protocol bgp tnet_knot from tnet_tpl { - neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32da; - interface "tnet-knot"; -} diff --git a/tnet/templates/akili/bird-tnet-pre.conf b/tnet/templates/akili/bird-tnet-pre.conf new file mode 100644 index 0000000..74c981d --- /dev/null +++ b/tnet/templates/akili/bird-tnet-pre.conf @@ -0,0 +1,20 @@ +define tnet = fdb1:4242:3538:2000::/52; + +function is_tnet() +{ + 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/templates/akili/bird-tnet.conf b/tnet/templates/akili/bird-tnet.conf new file mode 100644 index 0000000..24c9b8e --- /dev/null +++ b/tnet/templates/akili/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 fdb1:4242:3538:ffff:ca85:f812:3935:5fba; + interface "tnet-hash"; +} + +protocol bgp tnet_knot from tnet_tpl { + neighbor fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a; + interface "tnet-knot"; +} diff --git a/tnet/templates/astyanax/bird-tnet-pre.conf b/tnet/templates/astyanax/bird-tnet-pre.conf new file mode 100644 index 0000000..74c981d --- /dev/null +++ b/tnet/templates/astyanax/bird-tnet-pre.conf @@ -0,0 +1,20 @@ +define tnet = fdb1:4242:3538:2000::/52; + +function is_tnet() +{ + 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/templates/astyanax/bird-tnet.conf b/tnet/templates/astyanax/bird-tnet.conf new file mode 100644 index 0000000..3dbf4c9 --- /dev/null +++ b/tnet/templates/astyanax/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:a0fd:89e4:42c6:f617:7398:abf4:b516; + interface "tnet-hash"; +} + +protocol bgp tnet_knot from tnet_tpl { + neighbor fe80:6728:53fc:fc81:40b3:9beb:8336:ba56; + interface "tnet-knot"; +} diff --git a/tnet/templates/conflatorio/bird-tnet-pre.conf b/tnet/templates/conflatorio/bird-tnet-pre.conf new file mode 100644 index 0000000..d60e8df --- /dev/null +++ b/tnet/templates/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/templates/conflatorio/bird-tnet.conf b/tnet/templates/conflatorio/bird-tnet.conf new file mode 100644 index 0000000..02780a6 --- /dev/null +++ b/tnet/templates/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/templates/coregonus/bird-tnet-pre.conf b/tnet/templates/coregonus/bird-tnet-pre.conf new file mode 100644 index 0000000..d60e8df --- /dev/null +++ b/tnet/templates/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/templates/coregonus/bird-tnet.conf b/tnet/templates/coregonus/bird-tnet.conf new file mode 100644 index 0000000..95ede41 --- /dev/null +++ b/tnet/templates/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/templates/hash/bird-tnet-pre.conf b/tnet/templates/hash/bird-tnet-pre.conf new file mode 100644 index 0000000..74c981d --- /dev/null +++ b/tnet/templates/hash/bird-tnet-pre.conf @@ -0,0 +1,20 @@ +define tnet = fdb1:4242:3538:2000::/52; + +function is_tnet() +{ + 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/templates/hash/bird-tnet.conf b/tnet/templates/hash/bird-tnet.conf new file mode 100644 index 0000000..a570291 --- /dev/null +++ b/tnet/templates/hash/bird-tnet.conf @@ -0,0 +1,73 @@ +# 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_conflatorio from tnet_tpl { + neighbor fe80:4540:476c:d432:2f32:818b:811b:bb60; + interface "tnet-confltrio"; + + rr client; +} + +protocol bgp tnet_knot from tnet_tpl { + neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7c; + interface "tnet-knot"; + + 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"; + + rr client; +} + +protocol bgp tnet_node2 from tnet_tpl { + neighbor fe80:a7a6:c1a8:c261:232e:7d67:fc27:7c8d; + interface "tnet-node2"; + + rr client; +} diff --git a/tnet/templates/knot/bird-tnet-pre.conf b/tnet/templates/knot/bird-tnet-pre.conf new file mode 100644 index 0000000..d60e8df --- /dev/null +++ b/tnet/templates/knot/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/templates/knot/bird-tnet.conf b/tnet/templates/knot/bird-tnet.conf new file mode 100644 index 0000000..f21be09 --- /dev/null +++ b/tnet/templates/knot/bird-tnet.conf @@ -0,0 +1,116 @@ +# 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_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"; + + 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"; + + rr client; +} + +protocol bgp tnet_node2 from tnet_tpl { + neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32db; + interface "tnet-node2"; + + rr client; +} + +protocol bgp routedbits_lon1 { + local as 4242423538; + neighbor fe80::207; + neighbor as 4242420207; + interface "tnet-rtdbts_l1"; + + ipv6 { + import filter { + 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 { + reject proto, "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last; + } + } else { + reject proto, "[dn42] invalid dn42 network ", net, " ASN ", bgp_path.last; + } + }; + export filter { + if net ~ tnet then { + accept proto, "[dn42] accepting export tnet: ", net; + } else { + reject proto, "[dn42] rejecting export: ", net; + } + }; + }; +} diff --git a/tnet/templates/lhn2pi/bird-tnet-pre.conf b/tnet/templates/lhn2pi/bird-tnet-pre.conf new file mode 100644 index 0000000..74c981d --- /dev/null +++ b/tnet/templates/lhn2pi/bird-tnet-pre.conf @@ -0,0 +1,20 @@ +define tnet = fdb1:4242:3538:2000::/52; + +function is_tnet() +{ + 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/templates/lhn2pi/bird-tnet.conf b/tnet/templates/lhn2pi/bird-tnet.conf new file mode 100644 index 0000000..9f0ef8c --- /dev/null +++ b/tnet/templates/lhn2pi/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:6195:1d43:9655:35f7:9dba:798c:26b8; + interface "tnet-hash"; +} + +protocol bgp tnet_knot from tnet_tpl { + neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8; + interface "tnet-knot"; +} diff --git a/tnet/templates/node1/bird-tnet-pre.conf b/tnet/templates/node1/bird-tnet-pre.conf new file mode 100644 index 0000000..74c981d --- /dev/null +++ b/tnet/templates/node1/bird-tnet-pre.conf @@ -0,0 +1,20 @@ +define tnet = fdb1:4242:3538:2000::/52; + +function is_tnet() +{ + 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/templates/node1/bird-tnet.conf b/tnet/templates/node1/bird-tnet.conf new file mode 100644 index 0000000..6449582 --- /dev/null +++ b/tnet/templates/node1/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:a026:6ec2:b356:21c5:b51:22b9:a1de; + interface "tnet-hash"; +} + +protocol bgp tnet_knot from tnet_tpl { + neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f2; + interface "tnet-knot"; +} diff --git a/tnet/templates/node2/bird-tnet-pre.conf b/tnet/templates/node2/bird-tnet-pre.conf new file mode 100644 index 0000000..74c981d --- /dev/null +++ b/tnet/templates/node2/bird-tnet-pre.conf @@ -0,0 +1,20 @@ +define tnet = fdb1:4242:3538:2000::/52; + +function is_tnet() +{ + 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/templates/node2/bird-tnet.conf b/tnet/templates/node2/bird-tnet.conf new file mode 100644 index 0000000..b9a2294 --- /dev/null +++ b/tnet/templates/node2/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:a7a6:c1a8:c261:232e:7d67:fc27:7c8c; + interface "tnet-hash"; +} + +protocol bgp tnet_knot from tnet_tpl { + neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32da; + interface "tnet-knot"; +} -- cgit v1.2.3