diff options
| author | Jakub Ružička <jakub.ruzicka@nic.cz> | 2022-04-13 17:22:17 +0200 |
|---|---|---|
| committer | Jakub Ružička <jakub.ruzicka@nic.cz> | 2022-04-13 18:07:00 +0200 |
| commit | 9144e160ad285442c275c5139b6d0ff40fdf7ed6 (patch) | |
| tree | 4beb2872a5ac38f965ae256e21dc5794553be4b4 | |
| parent | 0f324fd2dacc78b2b1f17f769566a8c90239684c (diff) | |
| download | bird-9144e160ad285442c275c5139b6d0ff40fdf7ed6.tar.gz | |
d/patches: add upstream patch to fix babel bug
| -rw-r--r-- | debian/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch b/debian/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch new file mode 100644 index 00000000..bc694d57 --- /dev/null +++ b/debian/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch @@ -0,0 +1,29 @@ +From fcb4dd0c831339c4374ace17d8f2ae6ebfeed279 Mon Sep 17 00:00:00 2001 +From: "Ondrej Zajicek (work)" <santiago@crfreenet.org> +Date: Sun, 27 Feb 2022 03:10:38 +0100 +Subject: [PATCH] Babel: Fix bug in iface reconfiguration + +A recent change in Babel causes ifaces to disappear after +reconfiguration. The patch fixes that. + +Thanks to Johannes Kimmel for an insightful bugreport. +--- + 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 e43818f5..174fc9e2 100644 +--- a/proto/babel/babel.c ++++ b/proto/babel/babel.c +@@ -1899,7 +1899,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf) + struct babel_iface *ifa = babel_find_iface(p, iface); + struct babel_iface_config *ic = (void *) iface_patt_find(&cf->iface_list, iface, NULL); + +- if (ic && iface_is_valid(p, iface)) ++ if (ic && !iface_is_valid(p, iface)) + ic = NULL; + + if (ifa && ic) +-- +2.30.2 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..2d8a5da3 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Babel-Fix-bug-in-iface-reconfiguration.patch |