Skip to content

Commit

Permalink
bird: update to 2.16.
Browse files Browse the repository at this point in the history
  • Loading branch information
lemmi committed Dec 22, 2024
1 parent 675417f commit 4e10a28
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From cfac0076fb7365fe91360fa351f311f141a7a303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <[email protected]>
Date: Tue, 10 Dec 2024 02:14:06 +0100
Subject: [PATCH] Babel: fix seqno wrapping on seqno request

The Babel seqno wraps around when reaching its maximum value (UINT16_MAX).
When comparing seqnos, this has to be taken into account. Therefore,
plain number comparisons do not work.
---
proto/babel/babel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index fe5c0599a..b5cbb63f8 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1015,7 +1015,7 @@ babel_send_update_(struct babel_iface *ifa, btime changed, struct fib *rtable)

/* Our own seqno might have changed, in which case we update the routes we
originate. */
- if ((e->router_id == p->router_id) && (e->seqno < p->update_seqno))
+ if ((e->router_id == p->router_id) && gt_mod64k(p->update_seqno, e->seqno))
{
e->seqno = p->update_seqno;
e->updated = current_time();
--
GitLab

4 changes: 2 additions & 2 deletions srcpkgs/bird/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'bird'
pkgname=bird
version=2.15.1
version=2.16
revision=1
build_style=gnu-configure
hostmakedepends="flex"
Expand All @@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://bird.network.cz"
changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
checksum=48e85c622de164756c132ea77ad1a8a95cc9fd0137ffd0d882746589ce75c75d
checksum=6629110293af6f1727967121d64f9c8dc94ed6181c4ef8b1dc51c7fdd669871c

conf_files="/etc/bird.conf"
system_accounts="_bird"
Expand Down

0 comments on commit 4e10a28

Please sign in to comment.