Merge branch 'thread-next' into HEAD

diff --cc conf/confbase.Y
Simple merge

diff --cc doc/bird.sgml
Simple merge

diff --cc nest/config.Y
Simple merge

diff --cc nest/proto.c
index e569ab76960c1a521a083b6b8d38fa9f28327ad4,8b949c9cdb17c9bcb3c683816c5a24e5697298f3..bbf41ab1402004aa3b9ae25b171fad6698453a4c
--- 1/nest/proto.c
--- 2/nest/proto.c
+++ b/nest/proto.c
@@@ -687,15 -564,15 +686,17 @@@ channel_start_export(struct channel *c
  
    ASSERT(c->channel_state == CS_UP);
  
+   pool *p = rp_newf(c->proto->pool, c->proto->pool->domain, "Channel %s.%s export", c->proto->name, c->name);
+ 
    c->out_req = (struct rt_export_request) {
-     .name = mb_sprintf(c->proto->pool, "%s.%s", c->proto->name, c->name),
+     .name = mb_sprintf(p, "%s.%s", c->proto->name, c->name),
      .list = proto_work_list(c->proto),
-     .pool = c->proto->pool,
+     .pool = p,
      .feed_block_size = c->feed_block_size,
 -    .addr = c->out_subprefix,
 -    .addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
 +    .prefilter = {
 +      .mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
 +      .addr = c->out_subprefix,
 +    },
      .trace_routes = c->debug | c->proto->debug,
      .dump_req = channel_dump_export_req,
      .log_state_change = channel_export_log_state_change,

diff --cc nest/protocol.h
Simple merge

diff --cc nest/route.h
index 65da04a1a856945c822f4d6c53bda7320564b32e,6b9a0dc1cb397cf037a98ca32a765e0b9d393deb..fe100a366e24a902017007871981e639c283bf88
--- 1/nest/rt.h
--- 2/nest/route.h
+++ b/nest/route.h
@@@ -319,10 -300,11 +319,10 @@@ struct rt_pending_export 
  
  struct rt_export_request {
    struct rt_export_hook *hook;                /* Table part of the export */
-   char *name;         /* Network prefilter address */
 -  const char *name;
 -  const net_addr *addr;                       /* Network prefilter address */
++  char *name;
    u8 trace_routes;
 -  u8 addr_mode;                               /* Network prefilter mode (TE_ADDR_*) */
    uint feed_block_size;                       /* How many routes to feed at once */
 +  struct rt_prefilter prefilter;
  
    event_list *list;                   /* Where to schedule export events */
    pool *pool;                         /* Pool to use for allocations */

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

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

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

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

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

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

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

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

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

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

diff --cc sysdep/unix/krt.c
Simple merge