Merge commit 'd5a32563' into haugesund

diff --cc nest/route.h
index 7930058a4598b7b98f928ce9f275c5b47dec4056,227a5f5e1a3b5987bc926aa57aee776e6c751cbd..75890a71af3dd3fb93638cbfc2e422cb91aa1ed7
--- 1/nest/route.h
--- 2/nest/route.h
+++ b/nest/route.h
@@@ -378,21 -353,9 +378,21 @@@ int rte_update_in(struct channel *c, co
  int rt_reload_channel(struct channel *c);
  void rt_reload_channel_abort(struct channel *c);
  void rt_prune_sync(rtable *t, int all);
- int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int refeed);
+ int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old, rte **old_exported, int refeed);
  struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
  
 +static inline int rt_is_ip(rtable *tab)
 +{ return (tab->addr_type == NET_IP4) || (tab->addr_type == NET_IP6); }
 +
 +static inline int rt_is_vpn(rtable *tab)
 +{ return (tab->addr_type == NET_VPN4) || (tab->addr_type == NET_VPN6); }
 +
 +static inline int rt_is_roa(rtable *tab)
 +{ return (tab->addr_type == NET_ROA4) || (tab->addr_type == NET_ROA6); }
 +
 +static inline int rt_is_flow(rtable *tab)
 +{ return (tab->addr_type == NET_FLOW4) || (tab->addr_type == NET_FLOW6); }
 +
  
  /* Default limit for ECMP next hops, defined in sysdep code */
  extern const int rt_default_ecmp;

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

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

diff --cc proto/babel/babel.c
Simple merge

diff --cc proto/bgp/attrs.c
Simple merge

diff --cc proto/bgp/bgp.h
Simple merge

diff --cc proto/pipe/pipe.c
Simple merge