mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Do not remove old static route if it is in new config with different gw.

Browse Source
This commit is contained in:
Ondrej Zajicek 2010-05-16 11:03:59 +02:00
parent 7ff5803bec
commit c1cefd7bea
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
proto/static/static.c
View File

@ -218,15 +218,18 @@ static_init(struct proto_config *c)
return p;
}
static int
static_same_route(struct static_route *x, struct static_route *y)
static inline int
static_same_net(struct static_route *x, struct static_route *y)
{
return ipa_equal(x->net, y->net)
&& x->masklen == y->masklen
&& x->dest == y->dest
return ipa_equal(x->net, y->net) && (x->masklen == y->masklen);
}
static inline int
static_same_dest(struct static_route *x, struct static_route *y)
{
return (x->dest == y->dest)
&& (x->dest != RTD_ROUTER || ipa_equal(x->via, y->via))
&& (x->dest != RTD_DEVICE || !strcmp(x->if_name, y->if_name))
;
&& (x->dest != RTD_DEVICE || !strcmp(x->if_name, y->if_name));
}
static void
@ -234,18 +237,25 @@ static_match(struct proto *p, struct static_route *r, struct static_config *n)
{
struct static_route *t;
/*
* For given old route *r we find whether a route to the same
* network is also in the new route list. In that case, we keep the
* route and possibly update the route later if destination changed.
* Otherwise, we remove the route.
*/
if (r->neigh)
r->neigh->data = NULL;
WALK_LIST(t, n->iface_routes)
if (static_same_route(r, t))
if (static_same_net(r, t))
{
t->installed = 1;
t->installed = static_same_dest(r, t);
return;
}
WALK_LIST(t, n->other_routes)
if (static_same_route(r, t))
if (static_same_net(r, t))
{
t->installed = 1;
t->installed = static_same_dest(r, t);
return;
}
static_remove(p, r);