diff options
| author | Martin Mares <mj@ucw.cz> | 1998-12-08 19:31:31 +0100 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 1998-12-08 19:31:31 +0100 |
| commit | 980297d2899a5aec6609d1f7b44626e52e6e4417 (patch) | |
| tree | 50a7900edf310bb3b6e8cbfa8da2a30924b81abe /proto/static | |
| parent | 618533af91051b7b26ac19816e89cd81352b0f13 (diff) | |
| download | bird-980297d2899a5aec6609d1f7b44626e52e6e4417.tar bird-980297d2899a5aec6609d1f7b44626e52e6e4417.zip | |
Fixed a couple of bugs in static protocol. All static routes except device
ones seem to work well.
Diffstat (limited to 'proto/static')
| -rw-r--r-- | proto/static/static.c | 44 | ||||
| -rw-r--r-- | proto/static/static.h | 1 |
2 files changed, 29 insertions, 16 deletions
diff --git a/proto/static/static.c b/proto/static/static.c index bc060cd..d1fe217 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -65,30 +65,42 @@ static_start(struct proto *P) DBG("Static: take off!\n"); WALK_LIST(r, p->other_routes) - if (r->dest == RTD_ROUTER) + switch (r->dest) { - struct neighbor *n = neigh_find(P, &r->via, NEF_STICKY); - if (n) - { - n->data = r; - r->neigh = n; - static_install(p, r, n->iface); - } - else - log(L_ERR "Static route destination %I is invalid. Ignoring.\n", r->via); + case RTD_ROUTER: + { + struct neighbor *n = neigh_find(P, &r->via, NEF_STICKY); + if (n) + { + r->chain = n->data; + n->data = r; + r->neigh = n; + static_install(p, r, n->iface); + } + else + log(L_ERR "Static route destination %I is invalid. Ignoring.\n", r->via); + break; + } + case RTD_DEVICE: + die("Static device routes are not supported"); + /* FIXME: Static device routes */ + default: + static_install(p, r, NULL); } - else - static_install(p, r, NULL); } static void static_neigh_notify(struct neighbor *n) { + struct static_proto *p = (struct static_proto *) n->proto; + struct static_route *r; + DBG("Static: neighbor notify for %I: iface %p\n", n->addr, n->iface); - if (n->iface) - static_install((struct static_proto *) n->proto, n->data, n->iface); - else - static_remove((struct static_proto *) n->proto, n->data); + for(r=n->data; r; r=r->chain) + if (n->iface) + static_install(p, r, n->iface); + else + static_remove(p, r); } static void diff --git a/proto/static/static.h b/proto/static/static.h index b6d6945..ba66c80 100644 --- a/proto/static/static.h +++ b/proto/static/static.h @@ -19,6 +19,7 @@ void static_init_instance(struct static_proto *); struct static_route { node n; + struct static_route *chain; /* Next for the same neighbor */ ip_addr net; /* Network we route */ int masklen; /* Mask length */ int dest; /* Destination type (RTD_*) */ |