From: Maria Matejka <mq@ucw.cz>
Date: Wed, 9 Mar 2022 13:39:55 +0000 (+0100)
Subject: Merge commit '0767a0c2' into haugesund
X-Git-Tag: v3.0-alpha1~171^2~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dc1d7782ef792787b49b929d1b331429d23c68e;p=thirdparty%2Fbird.git

Merge commit '0767a0c2' into haugesund

Conflicts:
	nest/rt-table.c
---

9dc1d7782ef792787b49b929d1b331429d23c68e
diff --cc nest/route.h
index 98d030a90,e4507d4ad..2543aaf6c
--- a/nest/route.h
+++ b/nest/route.h
@@@ -358,11 -332,10 +358,11 @@@ static inline net *net_find(rtable *tab
  static inline net *net_find_valid(rtable *tab, const net_addr *addr)
  { net *n = net_find(tab, addr); return (n && n->routes && rte_is_valid(&n->routes->rte)) ? n : NULL; }
  static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
 -void *net_route(rtable *tab, const net_addr *n);
 +net *net_get(rtable *tab, const net_addr *addr);
 +net *net_route(rtable *tab, const net_addr *n);
  int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
  int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
- rte *rt_export_merged(struct channel *c, net *net, linpool *pool, int silent);
+ rte *rt_export_merged_show(struct channel *c, net *n, linpool *pool);
  void rt_refresh_begin(rtable *t, struct channel *c);
  void rt_refresh_end(rtable *t, struct channel *c);
  void rt_modify_stale(rtable *t, struct channel *c);