From 9497f5d07932a6b4eb0371733bf284a1e845450d Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 26 Feb 2019 06:07:45 +0100 Subject: [PATCH] babeld: actually add the patch --- ..._plen-to-v4mapped-encoding-on-import.patch | 36 +++++++++++++++++++ srcpkgs/babeld/template | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/babeld/patches/Convert-src_plen-to-v4mapped-encoding-on-import.patch diff --git a/srcpkgs/babeld/patches/Convert-src_plen-to-v4mapped-encoding-on-import.patch b/srcpkgs/babeld/patches/Convert-src_plen-to-v4mapped-encoding-on-import.patch new file mode 100644 index 00000000000..204f43df8b9 --- /dev/null +++ b/srcpkgs/babeld/patches/Convert-src_plen-to-v4mapped-encoding-on-import.patch @@ -0,0 +1,36 @@ +From cd8a9ba8014688092060eebe4a67e92d9083099b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= +Date: Wed, 26 Dec 2018 00:44:29 +0100 +Subject: [PATCH] kernel_netlink: Convert src_plen to v4mapped encoding on + import +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +src_plen for IPv4 routes imported from kernel has not been adjusted +to v4mapped encoding. Therefore IPv4 xroutes used an inconsistent encoding +which lead to failed comparisons when sending updates. + +Routes received from neighbors with the same prefix as xroutes therefore +have been announced to neighbours instead. + +This issue is fixed by converting src_plen on import. + +Signed-off-by: Fabian Bläse +--- + kernel_netlink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git kernel_netlink.c kernel_netlink.c +index 618d74bc..c424f0ed 100644 +--- kernel_netlink.c ++++ kernel_netlink.c +@@ -1119,6 +1119,7 @@ parse_kernel_route_rta(struct rtmsg *rtm, int len, struct kernel_route *route) + v4tov6(route->prefix, zeroes); + v4tov6(route->src_prefix, zeroes); + route->plen = 96; ++ route->src_plen = 96; + } + route->proto = rtm->rtm_protocol; + + diff --git a/srcpkgs/babeld/template b/srcpkgs/babeld/template index 29d88aafea8..05d26248794 100644 --- a/srcpkgs/babeld/template +++ b/srcpkgs/babeld/template @@ -1,7 +1,7 @@ # Template file for 'babeld' pkgname=babeld version=1.8.4 -revision=2 +revision=3 wrksrc=babeld-babeld-${version} build_style=gnu-makefile short_desc="Babel loop-avoiding distance-vector routing daemon"