Commit 6e5bb697 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Don't satisfy requests with retractions.

parent bc7ca323
...@@ -710,6 +710,9 @@ really_send_update(struct network *net, ...@@ -710,6 +710,9 @@ really_send_update(struct network *net,
if(!net->up) if(!net->up)
return; return;
if(metric < INFINITY)
satisfy_request(prefix, plen, seqno, hash_id(id), net);
add_metric = output_filter(id, prefix, plen, net->ifindex); add_metric = output_filter(id, prefix, plen, net->ifindex);
if(add_metric < INFINITY) { if(add_metric < INFINITY) {
...@@ -740,7 +743,6 @@ really_send_update(struct network *net, ...@@ -740,7 +743,6 @@ really_send_update(struct network *net,
} }
} }
} }
satisfy_request(prefix, plen, seqno, hash_id(id), net);
} }
static int static int
...@@ -887,9 +889,8 @@ send_update(struct network *net, int urgent, ...@@ -887,9 +889,8 @@ send_update(struct network *net, int urgent,
case where network is not null. */ case where network is not null. */
request = find_request(prefix, plen, NULL); request = find_request(prefix, plen, NULL);
if(request) { if(request) {
struct route *route; struct route *route = find_installed_route(prefix, plen);
route = find_installed_route(prefix, plen); if(route && route->metric < INFINITY) {
if(route) {
urgent = 1; urgent = 1;
satisfy_request(prefix, plen, route->seqno, satisfy_request(prefix, plen, route->seqno,
hash_id(route->src->id), net); hash_id(route->src->id), net);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment