Merge commit '0767a0c2' into haugesund

Conflicts:
	nest/rt-table.c

diff --cc nest/route.h
index 98d030a90c4587988a4969c5ac62b1ef6cc0b058,e4507d4adb6af90d2fb7ce4b3a5f64198cff9091..2543aaf6ca6f54b101ca5e150f05f2ac08ce7294
--- 1/nest/route.h
--- 2/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);

diff --cc nest/rt-show.c
Simple merge

diff --cc nest/rt-table.c
Simple merge