Merge commit '53958809' into thread-next

1 files changed, 7 insertions, 0 deletions

diff --git a/nest/proto.c b/nest/proto.c
index 48558865..28b4426d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -617,6 +617,12 @@ channel_export_stopped(struct rt_export_request *req)
   {
     c->refeeding = 1;
     c->refeed_pending = 0;
+
+    channel_reset_limit(c, &c->out_limit, PLD_OUT);
+
+    bmap_reset(&c->export_map, 1024);
+    bmap_reset(&c->export_reject_map, 1024);
+
     rt_request_export(c->table, req);
     return;
   }
@@ -643,6 +649,7 @@ channel_feed_end(struct channel *c)
       (l->count <= l->max))
   {
     log(L_INFO "Protocol %s resets route export limit (%u)", c->proto->name, l->max);
+    channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
     c->refeed_pending = 1;
     rt_stop_export(req, channel_export_stopped);