babeld: update to 1.9.2.

This commit is contained in:
lemmi 2020-04-22 11:53:12 +02:00
parent 7074501341
commit 426ac4ca65
2 changed files with 3 additions and 74 deletions

View file

@ -1,71 +0,0 @@
From 36121c1e67fb5a60a35fed0faa37297cd97c9ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
Date: Thu, 19 Sep 2019 01:16:46 +0200
Subject: [PATCH] Remove src_plen assignments which break v4mapped encoding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
These assignments were introduced in f8bce04, probably
to ensure that src_plen doesn't contain any leftovers from
earlier revisions when source specific wasn't done via sub-TLVs.
This however breaks v4mapped encoding as a prefix length of 0
for IPv4 routes is represented as src_plen = 96. This offset is
already added outside of the affected functions and therefore
gets overwritten by this assignment.
Both functions contain an additional check if the message contains
ipv4 addresses, but as this check is only executed if the message has
a source-specific sub-TLV, the offset isn't added for non source-specific
routes.
Because the offset is already added outside of the subtlv parsing
functions, this additional check is also removed, as it would otherwise
break IPv4 source specifics by adding the IPv4 offset two times.
Signed-off-by: Fabian Bläse <fabian@blaese.de>
---
message.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/message.c b/message.c
index 0f6ca19d..78f9aa93 100644
--- a/message.c
+++ b/message.c
@@ -137,8 +137,6 @@ parse_update_subtlv(struct interface *ifp, int metric, int ae,
}
}
- *src_plen = 0;
-
while(i < alen) {
type = a[i];
if(type == SUBTLV_PAD1) {
@@ -170,8 +168,6 @@ parse_update_subtlv(struct interface *ifp, int metric, int ae,
len - 1, src_prefix);
if(rc < 0)
goto fail;
- if(ae == 1)
- (*src_plen) += 96;
} else {
debugf("Received unknown%s Update sub-TLV %d.\n",
(type & 0x80) != 0 ? " mandatory" : "", type);
@@ -305,8 +301,6 @@ parse_request_subtlv(int ae, const unsigned char *a, int alen,
{
int type, len, i = 0;
- *src_plen = 0;
-
while(i < alen) {
type = a[0];
if(type == SUBTLV_PAD1) {
@@ -336,8 +330,6 @@ parse_request_subtlv(int ae, const unsigned char *a, int alen,
len - 1, src_prefix);
if(rc < 0)
goto fail;
- if(ae == 1)
- (*src_plen) += 96;
} else {
debugf("Received unknown%s Route Request sub-TLV %d.\n",
((type & 0x80) != 0) ? " mandatory" : "", type);

View file

@ -1,7 +1,7 @@
# Template file for 'babeld' # Template file for 'babeld'
pkgname=babeld pkgname=babeld
version=1.9.1 version=1.9.2
revision=3 revision=1
wrksrc=babeld-babeld-${version} wrksrc=babeld-babeld-${version}
build_style=gnu-makefile build_style=gnu-makefile
short_desc="Babel loop-avoiding distance-vector routing daemon" short_desc="Babel loop-avoiding distance-vector routing daemon"
@ -9,7 +9,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="MIT" license="MIT"
homepage="https://www.irif.fr/~jch/software/babel/" homepage="https://www.irif.fr/~jch/software/babel/"
distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz" distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz"
checksum=16e18dbd9f8442feaa68487f5919a8ff8f7d95c62a9c7a3c42b7adf31bd4a9b3 checksum=c8c8c3698afb00caa5a5c9bbbb0a22b56d79ad3f9775382915ba979ac88c4e8f
patch_args="-Np1" patch_args="-Np1"
pre_build() { pre_build() {