diff options
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/static/config.Y | 8 | ||||
| -rw-r--r-- | proto/static/static.c | 30 | ||||
| -rw-r--r-- | proto/static/static.h | 8 |
3 files changed, 34 insertions, 12 deletions
diff --git a/proto/static/config.Y b/proto/static/config.Y index a7e50164..9f4d7da6 100644 --- a/proto/static/config.Y +++ b/proto/static/config.Y @@ -12,11 +12,12 @@ CF_HDR CF_DEFINES +#define STATIC_CFG ((struct static_config *) this_proto) static struct static_route *this_srt; CF_DECLS -CF_KEYWORDS(STATIC, ROUTE, VIA, DROP, REJECT, PROHIBIT, PREFERENCE) +CF_KEYWORDS(STATIC, ROUTE, VIA, DROP, REJECT, PROHIBIT, PREFERENCE, CHECK, LINK) CF_GRAMMAR @@ -31,12 +32,13 @@ static_proto_start: proto_start STATIC { static_proto: static_proto_start proto_name '{' | static_proto proto_item ';' + | static_proto CHECK LINK ';' { STATIC_CFG->check = STATIC_CHECK_LINK; } | static_proto stat_route ';' ; stat_route0: ROUTE prefix { this_srt = cfg_allocz(sizeof(struct static_route)); - add_tail(&((struct static_config *) this_proto)->other_routes, &this_srt->n); + add_tail(&STATIC_CFG->other_routes, &this_srt->n); this_srt->net = $2.addr; this_srt->masklen = $2.len; } @@ -51,7 +53,7 @@ stat_route: this_srt->dest = RTD_DEVICE; this_srt->if_name = $3; rem_node(&this_srt->n); - add_tail(&((struct static_config *) this_proto)->iface_routes, &this_srt->n); + add_tail(&STATIC_CFG->iface_routes, &this_srt->n); } | stat_route0 DROP { this_srt->dest = RTD_BLACKHOLE; } | stat_route0 REJECT { this_srt->dest = RTD_UNREACHABLE; } diff --git a/proto/static/static.c b/proto/static/static.c index 6b42a379..4f879bd3 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -64,6 +64,20 @@ static_install(struct proto *p, struct static_route *r, struct iface *ifa) r->installed = 1; } +static int +static_decide(struct static_config *cf, struct static_route *r) +{ + struct iface *ifa = r->neigh->iface; + + if (!ifa) + return 0; + + if ((cf->check == STATIC_CHECK_LINK) && !(ifa->flags & IF_LINK_UP)) + return 0; + + return 1; +} + static void static_remove(struct proto *p, struct static_route *r) { @@ -80,7 +94,7 @@ static_remove(struct proto *p, struct static_route *r) } static void -static_add(struct proto *p, struct static_route *r) +static_add(struct proto *p, struct static_config *cf, struct static_route *r) { DBG("static_add(%I/%d,%d)\n", r->net, r->masklen, r->dest); switch (r->dest) @@ -93,8 +107,10 @@ static_add(struct proto *p, struct static_route *r) r->chain = n->data; n->data = r; r->neigh = n; - if (n->iface) + if (static_decide(cf, r)) static_install(p, r, n->iface); + else + static_remove(p, r); } else log(L_ERR "Static route destination %I is invalid. Ignoring.", r->via); @@ -115,7 +131,7 @@ static_start(struct proto *p) DBG("Static: take off!\n"); WALK_LIST(r, c->other_routes) - static_add(p, r); + static_add(p, c, r); return PS_UP; } @@ -142,7 +158,7 @@ static_neigh_notify(struct neighbor *n) DBG("Static: neighbor notify for %I: iface %p\n", n->addr, n->iface); for(r=n->data; r; r=r->chain) - if (n->iface) + if (static_decide((struct static_config *) p->cf, r)) static_install(p, r, n->iface); else static_remove(p, r); @@ -249,13 +265,13 @@ static_match(struct proto *p, struct static_route *r, struct static_config *n) WALK_LIST(t, n->iface_routes) if (static_same_net(r, t)) { - t->installed = static_same_dest(r, t); + t->installed = r->installed && static_same_dest(r, t); return; } WALK_LIST(t, n->other_routes) if (static_same_net(r, t)) { - t->installed = static_same_dest(r, t); + t->installed = r->installed && static_same_dest(r, t); return; } static_remove(p, r); @@ -282,7 +298,7 @@ static_reconfigure(struct proto *p, struct proto_config *new) static_install(p, r, ifa); } WALK_LIST(r, n->other_routes) - static_add(p, r); + static_add(p, n, r); return 1; } diff --git a/proto/static/static.h b/proto/static/static.h index 5d2bd218..40da74c9 100644 --- a/proto/static/static.h +++ b/proto/static/static.h @@ -11,10 +11,14 @@ struct static_config { struct proto_config c; - list iface_routes; /* Routes to search on interface events */ - list other_routes; /* Routes hooked to neighbor cache and reject routes */ + list iface_routes; /* Routes to search on interface events */ + list other_routes; /* Routes hooked to neighbor cache and reject routes */ + int check; /* Condition for route install */ }; +#define STATIC_CHECK_NONE 0 +#define STATIC_CHECK_LINK 1 + void static_init_config(struct static_config *); struct static_route { |