From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Mon, 14 Jun 2021 18:02:50 +0000 (+0200)
Subject: Nest: Fix export of tmpattrs through pipes
X-Git-Tag: v2.0.9~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b9bf4e192a252db861acadc7f800d7046435a3f;p=thirdparty%2Fbird.git

Nest: Fix export of tmpattrs through pipes

Pipes copy the original rte with old values, so they require rte to be
exported with stored tmpattrs. Other protocols access stored attributes
using eattr list, so they require rte to be exported with expanded
tmpattrs. This is temporary hack, we plan to remove whoe tmpattr mechanism.

Thanks to Paul Donohue for the bugreport.
---

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 13209dd7c..390b3277c 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -618,6 +618,12 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
       goto reject;
     }
 
+#ifdef CONFIG_PIPE
+  /* Pipes need rte with stored tmpattrs, remaining protocols need expanded tmpattrs */
+  if (p->proto == &proto_pipe)
+    rte_store_tmp_attrs(rt, pool, NULL);
+#endif
+
  accept:
   if (rt != rt0)
     *rt_free = rt;