Merge commit '93509af4' into HEAD

diff --cc nest/proto.c
index 5b00cc9d9dca012f60f30b194ac046920c8fecd0,a7419c9611021e3c54a6a314cd1c8fc9e9a23e2c..5ddfb31e1031562c59f9b1395c5ade0c3585bbca
--- 1/nest/proto.c
--- 2/nest/proto.c
+++ b/nest/proto.c
@@@ -343,7 -289,7 +343,8 @@@ struct roa_subscription 
    struct settle settle;
    struct channel *c;
    struct rt_export_request req;
+   struct f_trie* trie;
 +  struct channel_feeding_request cfr[2];
  };
  
  static void
@@@ -364,23 -310,10 +365,25 @@@ channel_roa_out_changed(struct settle *
  
    CD(c, "Feeding triggered by RPKI change");
  
 -  c->refeed_pending = 1;
 -  channel_stop_export(c);
+   /* TODO feed by trie */
+ 
 +  /* Refeed already pending */
 +  if ((s->cfr[0].state == CFRS_PENDING) || (s->cfr[1].state == CFRS_PENDING))
 +    return;
 +
 +  /* First refeed inactive */
 +  if (s->cfr[0].state == CFRS_INACTIVE)
 +  {
 +    s->cfr[0].type = CFRT_AUXILIARY;
 +    channel_request_feeding(c, &s->cfr[0]);
 +  }
 +  else
 +  {
 +    /* Second refeed MUST be inactive */
 +    ASSERT_DIE(s->cfr[1].state == CFRS_INACTIVE);
 +    s->cfr[1].type = CFRT_AUXILIARY;
 +    channel_request_feeding(c, &s->cfr[1]);
 +  }
  }
  
  static void

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

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

diff --cc nest/rt.h
Simple merge

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