Merge branch 'master' of ssh://git.nic.cz/bird

1 files changed, 30 insertions, 5 deletions

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6a28fd43..06121ea3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -273,6 +273,23 @@ do_rte_announce(struct announce_hook *ah, int type UNUSED, net *net, rte *new, r
   if (!new && !old)
     return;
 
+  struct proto_limit *l = ah->out_limit;
+  if (l && new && (!old || refeed))
+    {
+      if (stats->exp_routes >= l->limit)
+	proto_notify_limit(ah, l, stats->exp_routes);
+
+      if (l->state == PLS_BLOCKED)
+	{
+	  /* Exported route counter ignores whether the route was
+	     blocked by limit, to be consistent when limits change */
+	  stats->exp_routes++;
+	  stats->exp_updates_rejected++;
+	  rte_trace_out(D_FILTERS, p, new, "rejected [limit]");
+	  goto done;
+	}
+    }
+
   if (new)
     stats->exp_updates_accepted++;
   else
@@ -307,6 +324,8 @@ do_rte_announce(struct announce_hook *ah, int type UNUSED, net *net, rte *new, r
     }
   else
     p->rt_notify(p, ah->table, net, new, old, new->attrs->eattrs);
+
+ done:
   if (new && new != new0)	/* Discard temporary rte's */
     rte_free(new);
   if (old && old != old0)
@@ -485,12 +504,18 @@ rte_recalculate(struct announce_hook *ah, net *net, rte *new, ea_list *tmpa, str
     }
 
   struct proto_limit *l = ah->in_limit;
-  if (l && !old && new && (stats->imp_routes >= l->limit) && proto_notify_limit(ah, l))
+  if (l && !old && new)
     {
-      stats->imp_updates_ignored++;
-      rte_trace_in(D_FILTERS, p, new, "ignored [limit]");
-      rte_free_quick(new);
-      return;
+      if (stats->imp_routes >= l->limit)
+	proto_notify_limit(ah, l, stats->imp_routes);
+
+      if (l->state == PLS_BLOCKED)
+	{
+	  stats->imp_updates_ignored++;
+	  rte_trace_in(D_FILTERS, p, new, "ignored [limit]");
+	  rte_free_quick(new);
+	  return;
+	}
     }
 
   if (new)