From fc8e918ec752ee47546b3ddbb75aa0f8092c2491 Mon Sep 17 00:00:00 2001 From: sump pump Date: Fri, 22 May 2020 00:07:35 +0000 Subject: [PATCH] Update bird/bird.conf.tmpl, README.md files --- README.md | 1 + bird/bird.conf.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d1d6c0c..ffc667c 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ eth0 Link encap:Ethernet HWaddr xx:xx:xx:xx:xx:xx * `global_prefix`: global network prefix: defaults to `16`. * `router_prefix`: router network prefix: defaults to `24`. If you change this you _SHOULD_ change `netmask` too. * `netmask`: router netmask: defaults to `255.255.255.0` (`/24`); _SHOULD_ be the bitmask that corresponds to the `router_prefix` + * `internal_interface`: the interface to route your _OWN_ networks to. This should be the interface where your personal Lixonet subnets are reachable at, or in other words the interface at which the Lixonet EE router can send packets destined to networks you own. Defaults to `eth0`. #### Tinc options * `network_name` - The name of the interface that Tinc should create when it's started. Defaults to `lixonet`. Set this for multiple networks. diff --git a/bird/bird.conf.tmpl b/bird/bird.conf.tmpl index 42ecdad..8940195 100644 --- a/bird/bird.conf.tmpl +++ b/bird/bird.conf.tmpl @@ -117,7 +117,7 @@ filter bgp_export_filter_v4 filter kernel_export_filter_v4 { - if is_own_route_v4() then reject; # Reject poisons + #if is_own_route_v4() then reject; # Reject poisons if is_lixonet_global_v4() then accept; # Accept anything else reject; # Reject anything else (non-Lixonet) } @@ -139,7 +139,7 @@ protocol static { range ${network_address}/${global_prefix:-16}+ unreachable; # Announced networks - {{ if len "${bgp_routes:-}" }}{{ range "$bgp_routes" | split "," }}route {{.}} reject; + {{ if len "${bgp_routes:-}" }}{{ range "$bgp_routes" | split "," }}route {{.}} via ${internal_interface:-eth0}; {{ end }}{{ end }} };