Support BIRD 1.x

We don't have `net.type` there.
pierky · Mar 26, 2024 · ba1789f · ba1789f
1 parent 09e123d
commit ba1789f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/templates/bird/clients.j2 b/templates/bird/clients.j2
@@ -376,10 +376,10 @@ filter receive_from_{{ client.id }} {
 		{% for current_afi in afis %}
 		{%	 set min_pref_len = client.cfg.filtering["ipv" ~ current_afi ~ "_pref_len"].min %}
 		{%   set max_pref_len = client.cfg.filtering["ipv" ~ current_afi ~ "_pref_len"].max %}
-		if net.type = NET_IP{{ current_afi }} then {
-			if !prefix_len_is_valid({{ min_pref_len }}, {{ max_pref_len }}) then
+		if
+			{% if "2.0"|target_version_ge %}net.type = NET_IP{{ current_afi }} && {% endif %}
+			!prefix_len_is_valid({{ min_pref_len }}, {{ max_pref_len }}) then
 				{{ reject(client, 13, '"prefix len [", net.len, "] not in ' ~ min_pref_len ~ '-' ~ max_pref_len ~ ' - REJECTING ", net') }}
-		}
 		{% endfor %}
 
 		{% if cfg.graceful_shutdown.enabled %}

diff --git a/templates/fingerprints.yml b/templates/fingerprints.yml
@@ -1,5 +1,5 @@
 bird:
-  clients.j2: 4a59b6da873981b449bc0ef09e3d3c5aa70f865e05ca98284afaf37edc387e30ce036d50703fff8d13e9344ab5a9b59e0b8c562995d3b5153e187b3d760203a3
+  clients.j2: 14ee5c43ec0bf1a0e6ad061e12d936db3448982c69e893e20f6cc704622ef17d28b087592bed5735856f85bd6ba0b2c8f6f4e9b69ea5b525987f066a34b54577
   common.j2: 1888f590f24415b2df86b3f86f4a36ca8c348ae6e5ddfac664e1663928fd5093863b605d5165b4075da38df5bb041f1cbeebee9991efc1be02eb4a696d95e420
   header.j2: 25f219ef4d0a4ee64c18b338bc557c246c4759b438f31865a7483ebef8a9a3795e09c85ba301da24d7036b474f7936f7a9ed758f93d66bca36e0624c23729170
   irrdb.j2: 4ff9a0dba41a02737c17a2497613f2dcc179a80b79714f18d61162e9503907cfd53765ab426036119e8bcb716d9d24a5380d724235373ae4ab7340d6c6eb074a