Static: Protocol rework wrt. struct nexthop changes; MPLS label support
This commit is contained in:
Jan Moskyto Matejka
parent
33ad6e0188
commit
f2010f9c65
|
|
@ -64,6 +64,7 @@ CF_DECLS
|
|||
struct proto_spec ps;
|
||||
struct channel_limit cl;
|
||||
struct timeformat *tf;
|
||||
u32 *lbl;
|
||||
}
|
||||
|
||||
%token END CLI_MARKER INVALID_TOKEN ELSECOL DDOT
|
||||
|
|
@ -82,6 +83,7 @@ CF_DECLS
|
|||
%type <a> ipa
|
||||
%type <net> net_ip4_ net_ip6_ net_ip6 net_ip_ net_ip net_or_ipa
|
||||
%type <net_ptr> net_ net_any net_roa4_ net_roa6_ net_roa_
|
||||
%type <lbl> label_stack_start label_stack
|
||||
|
||||
%type <t> text opttext
|
||||
|
||||
|
|
@ -266,6 +268,22 @@ net_or_ipa:
|
|||
}
|
||||
;
|
||||
|
||||
label_stack_start: NUM
|
||||
{
|
||||
$$ = cfg_allocz(sizeof(u32) * (NEXTHOP_MAX_LABEL_STACK+1));
|
||||
$$[0] = 1;
|
||||
$$[1] = $1;
|
||||
};
|
||||
|
||||
label_stack:
|
||||
label_stack_start
|
||||
| label_stack '/' NUM {
|
||||
if ($1[0] >= NEXTHOP_MAX_LABEL_STACK)
|
||||
cf_error("Too many labels in stack.");
|
||||
$1[++$1[0]] = $3;
|
||||
$$ = $1;
|
||||
}
|
||||
;
|
||||
|
||||
datetime:
|
||||
TEXT {
|
||||
|
|
|
|||
|
|
@ -4141,8 +4141,8 @@ specific destination for them and you don't want to send them out through the
|
|||
default route to prevent routing loops).
|
||||
|
||||
<p>There are five types of static routes: `classical' routes telling to forward
|
||||
packets to a neighboring router, multipath routes specifying several (possibly
|
||||
weighted) neighboring routers, device routes specifying forwarding to hosts on a
|
||||
packets to a neighboring router (single path or multipath, possibly weighted),
|
||||
device routes specifying forwarding to hosts on a
|
||||
directly connected network, recursive routes computing their nexthops by doing
|
||||
route table lookups for a given IP, and special routes (sink, blackhole etc.)
|
||||
which specify a special action to be done instead of forwarding the packet.
|
||||
|
|
@ -4174,14 +4174,14 @@ definition of the protocol contains mainly a list of static routes.
|
|||
<p>Route definitions (each may also contain a block of per-route options):
|
||||
|
||||
<descrip>
|
||||
<tag><label id="static-route-via-ip">route <m/prefix/ via <m/ip/</tag>
|
||||
Static route through a neighboring router. For link-local next hops,
|
||||
<tag><label id="static-route-via-ip">route <m/prefix/ via <m/ip/ [mpls <m/num/[/<m/num/[/<m/num/[...]]]]</tag>
|
||||
Static single path route through a neighboring router. For link-local next hops,
|
||||
interface can be specified as a part of the address (e.g.,
|
||||
<cf/via fe80::1234%eth0/).
|
||||
<cf/via fe80::1234%eth0/). MPLS labels should be specified in outer-first order.
|
||||
|
||||
<tag><label id="static-route-via-mpath">route <m/prefix/ multipath via <m/ip/ [weight <m/num/] [bfd <m/switch/] [via <m/.../]</tag>
|
||||
<tag><label id="static-route-via-mpath">route <m/prefix/ via <m/ip/ [mpls <m/num/[/<m/num/[/<m/num/[...]]]] [weight <m/num/] [bfd <m/switch/] [via ...]</tag>
|
||||
Static multipath route. Contains several nexthops (gateways), possibly
|
||||
with their weights.
|
||||
with their weights and MPLS labels.
|
||||
|
||||
<tag><label id="static-route-via-iface">route <m/prefix/ via <m/"interface"/</tag>
|
||||
Static device route through an interface to hosts on a directly
|
||||
|
|
|
|||
|
|
@ -513,6 +513,7 @@ ea_list *ea_append(ea_list *to, ea_list *what);
|
|||
void ea_format_bitfield(struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max);
|
||||
|
||||
#define NEXTHOP_MAX_LABEL_STACK 8
|
||||
#define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*NEXTHOP_MAX_LABEL_STACK)
|
||||
|
||||
static inline size_t nexthop_size(const struct nexthop *nh)
|
||||
{ return sizeof(struct nexthop) + sizeof(u32)*nh->labels; }
|
||||
|
|
@ -527,6 +528,7 @@ int nexthop_is_sorted(struct nexthop *x);
|
|||
|
||||
void rta_init(void);
|
||||
static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a->nh.labels; }
|
||||
#define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*NEXTHOP_MAX_LABEL_STACK)
|
||||
rta *rta_lookup(rta *); /* Get rta equivalent to this one, uc++ */
|
||||
static inline int rta_is_cached(rta *r) { return r->aflags & RTAF_CACHED; }
|
||||
static inline rta *rta_clone(rta *r) { r->uc++; return r; }
|
||||
|
|
|
|||
|
|
@ -330,6 +330,9 @@ nexthop_copy(struct nexthop *o)
|
|||
n->iface = o->iface;
|
||||
n->next = NULL;
|
||||
n->weight = o->weight;
|
||||
n->labels = o->labels;
|
||||
for (int i=0; i<o->labels; i++)
|
||||
n->label[i] = o->label[i];
|
||||
|
||||
*last = n;
|
||||
last = &(n->next);
|
||||
|
|
@ -1176,6 +1179,12 @@ rta_do_cow(rta *o, linpool *lp)
|
|||
{
|
||||
rta *r = lp_alloc(lp, rta_size(o));
|
||||
memcpy(r, o, rta_size(o));
|
||||
for (struct nexthop **nhn = &(r->nh.next), *nho = o->nh.next; nho; nho = nho->next)
|
||||
{
|
||||
*nhn = lp_alloc(lp, nexthop_size(nho));
|
||||
memcpy(*nhn, nho, nexthop_size(nho));
|
||||
nhn = &((*nhn)->next);
|
||||
}
|
||||
r->aflags = 0;
|
||||
r->uc = 0;
|
||||
return r;
|
||||
|
|
|
|||
|
|
@ -2443,14 +2443,7 @@ rt_format_via(rte *e)
|
|||
|
||||
switch (a->dest)
|
||||
{
|
||||
case RTD_UNICAST: if (a->nh.next)
|
||||
bsprintf(via, "multipath");
|
||||
else
|
||||
{
|
||||
if (ipa_nonzero(a->nh.gw)) bsprintf(via, "via %I ", a->nh.gw);
|
||||
bsprintf(via, "dev %s", a->nh.iface->name);
|
||||
}
|
||||
break;
|
||||
case RTD_UNICAST: bsprintf(via, "unicast"); break;
|
||||
case RTD_BLACKHOLE: bsprintf(via, "blackhole"); break;
|
||||
case RTD_UNREACHABLE: bsprintf(via, "unreachable"); break;
|
||||
case RTD_PROHIBIT: bsprintf(via, "prohibited"); break;
|
||||
|
|
@ -2492,11 +2485,24 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, ea_list *tm
|
|||
bsprintf(info, " (%d)", e->pref);
|
||||
cli_printf(c, -1007, "%-18s %s [%s %s%s]%s%s", ia, rt_format_via(e), a->src->proto->name,
|
||||
tm, from, primary ? (sync_error ? " !" : " *") : "", info);
|
||||
if (a->nh.next)
|
||||
for (nh = &(a->nh); nh; nh = nh->next)
|
||||
cli_printf(c, -1007, "\tvia %I on %s weight %d", nh->gw, nh->iface->name, nh->weight + 1);
|
||||
for (nh = &(a->nh); nh; nh = nh->next)
|
||||
{
|
||||
char ls[NEXTHOP_MAX_LABEL_STACK*8 + 5]; char *lsp = ls;
|
||||
if (nh->labels)
|
||||
{
|
||||
lsp += bsprintf(lsp, " mpls %d", nh->label[0]);
|
||||
for (int i=1;i<nh->labels; i++)
|
||||
lsp += bsprintf(lsp, "/%d", nh->label[i]);
|
||||
*lsp++ = '\0';
|
||||
}
|
||||
if (a->nh.next)
|
||||
cli_printf(c, -1007, "\tvia %I%s on %s weight %d", nh->gw, (nh->labels ? ls : ""), nh->iface->name, nh->weight + 1);
|
||||
else
|
||||
cli_printf(c, -1007, "\tvia %I%s on %s", nh->gw, (nh->labels ? ls : ""), nh->iface->name);
|
||||
}
|
||||
if (d->verbose)
|
||||
rta_show(c, a, tmpa);
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -18,19 +18,12 @@ static struct f_inst **this_srt_last_cmd;
|
|||
|
||||
static void
|
||||
static_route_finish(void)
|
||||
{
|
||||
struct static_route *r;
|
||||
|
||||
/* Update undefined use_bfd entries in multipath nexthops */
|
||||
for (r = this_srt->mp_next; r; r = r->mp_next)
|
||||
if (r->use_bfd < 0)
|
||||
r->use_bfd = this_srt->use_bfd;
|
||||
}
|
||||
{ }
|
||||
|
||||
CF_DECLS
|
||||
|
||||
CF_KEYWORDS(STATIC, ROUTE, VIA, DROP, REJECT, PROHIBIT, PREFERENCE, CHECK, LINK)
|
||||
CF_KEYWORDS(MULTIPATH, WEIGHT, RECURSIVE, IGP, TABLE, BLACKHOLE, UNREACHABLE, BFD)
|
||||
CF_KEYWORDS(WEIGHT, RECURSIVE, IGP, TABLE, BLACKHOLE, UNREACHABLE, BFD, MPLS)
|
||||
|
||||
|
||||
CF_GRAMMAR
|
||||
|
|
@ -52,6 +45,50 @@ static_proto:
|
|||
| static_proto stat_route stat_route_opt_list ';' { static_route_finish(); }
|
||||
;
|
||||
|
||||
stat_nexthop_via: VIA
|
||||
{
|
||||
if (last_srt)
|
||||
{
|
||||
last_srt = (last_srt->mp_next = cfg_allocz(sizeof(struct static_route)));
|
||||
last_srt->net = this_srt->net;
|
||||
}
|
||||
else
|
||||
{
|
||||
last_srt = this_srt;
|
||||
rem_node(&this_srt->n);
|
||||
}
|
||||
|
||||
last_srt->mp_head = this_srt;
|
||||
last_srt->dest = RTD_UNICAST;
|
||||
};
|
||||
|
||||
stat_nexthop_ident:
|
||||
stat_nexthop_via ipa ipa_scope {
|
||||
last_srt->via = $2;
|
||||
last_srt->iface = $3;
|
||||
add_tail(&STATIC_CFG->neigh_routes, &last_srt->n);
|
||||
}
|
||||
| stat_nexthop_via TEXT {
|
||||
last_srt->via = IPA_NONE;
|
||||
last_srt->if_name = $2;
|
||||
add_tail(&STATIC_CFG->iface_routes, &last_srt->n);
|
||||
}
|
||||
| stat_nexthop_ident MPLS label_stack {
|
||||
last_srt->label_count = $3[0];
|
||||
last_srt->label_stack = &($3[1]);
|
||||
}
|
||||
| stat_nexthop_ident WEIGHT expr {
|
||||
last_srt->weight = $3 - 1;
|
||||
if (($3<1) || ($3>256)) cf_error("Weight must be in range 1-256");
|
||||
}
|
||||
| stat_nexthop_ident BFD bool { last_srt->use_bfd = $3; cf_check_bfd($3); }
|
||||
;
|
||||
|
||||
stat_nexthop:
|
||||
stat_nexthop_ident
|
||||
| stat_nexthop stat_nexthop_ident
|
||||
;
|
||||
|
||||
stat_route0: ROUTE net_any {
|
||||
this_srt = cfg_allocz(sizeof(struct static_route));
|
||||
add_tail(&STATIC_CFG->other_routes, &this_srt->n);
|
||||
|
|
@ -62,45 +99,8 @@ stat_route0: ROUTE net_any {
|
|||
}
|
||||
;
|
||||
|
||||
stat_multipath1:
|
||||
VIA ipa ipa_scope {
|
||||
last_srt = last_srt ? last_srt->mp_next = cfg_allocz(sizeof(struct static_route)) : this_srt;
|
||||
|
||||
last_srt->dest = RTD_UNICAST;
|
||||
last_srt->via = $2;
|
||||
last_srt->via_if = $3;
|
||||
last_srt->if_name = (void *) this_srt; /* really */
|
||||
last_srt->use_bfd = -1; /* undefined */
|
||||
last_srt->mp_next = NULL;
|
||||
}
|
||||
| stat_multipath1 WEIGHT expr {
|
||||
last_srt->weight = $3 - 1;
|
||||
if (($3<1) || ($3>256)) cf_error("Weight must be in range 1-256");
|
||||
}
|
||||
| stat_multipath1 BFD bool {
|
||||
last_srt->use_bfd = $3; cf_check_bfd($3);
|
||||
}
|
||||
;
|
||||
|
||||
stat_multipath:
|
||||
stat_multipath1
|
||||
| stat_multipath stat_multipath1
|
||||
;
|
||||
|
||||
stat_route:
|
||||
stat_route0 VIA ipa ipa_scope {
|
||||
this_srt->dest = RTD_UNICAST;
|
||||
this_srt->via = $3;
|
||||
this_srt->via_if = $4;
|
||||
}
|
||||
| stat_route0 VIA TEXT {
|
||||
this_srt->dest = RTD_UNICAST;
|
||||
this_srt->via = IPA_NONE;
|
||||
this_srt->if_name = $3;
|
||||
rem_node(&this_srt->n);
|
||||
add_tail(&STATIC_CFG->iface_routes, &this_srt->n);
|
||||
}
|
||||
| stat_route0 MULTIPATH stat_multipath
|
||||
stat_route0 stat_nexthop
|
||||
| stat_route0 RECURSIVE ipa {
|
||||
this_srt->dest = RTDX_RECURSIVE;
|
||||
this_srt->via = $3;
|
||||
|
|
@ -115,7 +115,6 @@ stat_route:
|
|||
|
||||
stat_route_item:
|
||||
cmd { *this_srt_last_cmd = $1; this_srt_last_cmd = &($1->next); }
|
||||
| BFD bool ';' { this_srt->use_bfd = $2; cf_check_bfd($2); }
|
||||
;
|
||||
|
||||
stat_route_opts:
|
||||
|
|
|
|||
|
|
@ -60,37 +60,51 @@ p_igp_table(struct proto *p)
|
|||
static void
|
||||
static_install(struct proto *p, struct static_route *r)
|
||||
{
|
||||
rta a;
|
||||
rta *ap = alloca(RTA_MAX_SIZE);
|
||||
rte *e;
|
||||
|
||||
if (!(r->state & STS_WANT) && r->dest != RTD_UNICAST)
|
||||
return;
|
||||
if (!(r->state & STS_WANT) && (r->state & (STS_INSTALLED | STS_FORCE)) && r->dest != RTD_UNICAST)
|
||||
goto drop;
|
||||
|
||||
DBG("Installing static route %N, rtd=%d\n", r->net, r->dest);
|
||||
bzero(&a, sizeof(a));
|
||||
a.src = p->main_source;
|
||||
a.source = ((r->dest == RTD_UNICAST) && ipa_zero(r->via)) ? RTS_STATIC_DEVICE : RTS_STATIC;
|
||||
a.scope = SCOPE_UNIVERSE;
|
||||
a.dest = r->dest;
|
||||
bzero(ap, RTA_MAX_SIZE);
|
||||
ap->src = p->main_source;
|
||||
ap->source = ((r->dest == RTD_UNICAST) && ipa_zero(r->via)) ? RTS_STATIC_DEVICE : RTS_STATIC;
|
||||
ap->scope = SCOPE_UNIVERSE;
|
||||
ap->dest = r->dest;
|
||||
|
||||
if (r->dest == RTD_UNICAST)
|
||||
{
|
||||
struct static_route *r2;
|
||||
int num = 0;
|
||||
int num = 0, update = 0;
|
||||
|
||||
for (r2 = r; r2; r2 = r2->mp_next)
|
||||
{
|
||||
if ((r2->state & STS_INSTALLED) && !(r2->state & STS_FORCE))
|
||||
continue;
|
||||
|
||||
if ((r2->state & STS_FORCE) ||
|
||||
(!!(r2->state & STS_INSTALLED) != !!(r2->state & STS_WANT)))
|
||||
update++;
|
||||
|
||||
if (r2->state & STS_WANT)
|
||||
{
|
||||
struct nexthop *nh = (a.nh.next) ? alloca(sizeof(struct nexthop)) : &(a.nh);
|
||||
nh->gw = r2->via;
|
||||
nh->iface = r2->neigh->iface;
|
||||
struct nexthop *nh = (ap->nh.next) ? alloca(NEXTHOP_MAX_SIZE) : &(ap->nh);
|
||||
if (ipa_zero(r2->via)) // Device nexthop
|
||||
{
|
||||
nh->gw = IPA_NONE;
|
||||
nh->iface = r2->iface;
|
||||
}
|
||||
else // Router nexthop
|
||||
{
|
||||
nh->gw = r2->via;
|
||||
nh->iface = r2->neigh->iface;
|
||||
}
|
||||
nh->weight = r2->weight;
|
||||
nh->labels = 0;
|
||||
if (a.nh.next)
|
||||
nexthop_insert(&(a.nh), nh);
|
||||
nh->labels = r2->label_count;
|
||||
for (int i=0; i<nh->labels; i++)
|
||||
nh->label[i] = r2->label_stack[i];
|
||||
|
||||
if (ap->nh.next)
|
||||
nexthop_insert(&(ap->nh), nh);
|
||||
r2->state |= STS_INSTALLED;
|
||||
num++;
|
||||
}
|
||||
|
|
@ -98,21 +112,27 @@ static_install(struct proto *p, struct static_route *r)
|
|||
r2->state = 0;
|
||||
}
|
||||
|
||||
if (!update) // Nothing changed
|
||||
return;
|
||||
|
||||
r = r->mp_head;
|
||||
|
||||
if (!num) // No nexthop to install
|
||||
{
|
||||
if (r->state & STS_INSTALLED_ANY)
|
||||
rte_update(p, r->net, NULL);
|
||||
|
||||
drop:
|
||||
rte_update(p, r->net, NULL);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
else
|
||||
r->state |= STS_INSTALLED;
|
||||
|
||||
if (r->dest == RTDX_RECURSIVE)
|
||||
rta_set_recursive_next_hop(p->main_channel->table, &a, p_igp_table(p), r->via, IPA_NONE);
|
||||
rta_set_recursive_next_hop(p->main_channel->table, ap, p_igp_table(p), r->via, IPA_NONE);
|
||||
|
||||
/* We skip rta_lookup() here */
|
||||
|
||||
e = rte_get_temp(&a);
|
||||
e = rte_get_temp(ap);
|
||||
e->pflags = 0;
|
||||
|
||||
if (r->cmds)
|
||||
|
|
@ -124,18 +144,6 @@ static_install(struct proto *p, struct static_route *r)
|
|||
lp_flush(static_lp);
|
||||
}
|
||||
|
||||
static void
|
||||
static_remove(struct proto *p, struct static_route *r)
|
||||
{
|
||||
if (!(r->state & STS_INSTALLED_ANY))
|
||||
return;
|
||||
|
||||
DBG("Removing static route %N via %I\n", r->net, r->via);
|
||||
rte_update(p, r->net, NULL);
|
||||
|
||||
r->state &= ~(STS_INSTALLED | STS_INSTALLED_ANY);
|
||||
}
|
||||
|
||||
static void
|
||||
static_bfd_notify(struct bfd_request *req);
|
||||
|
||||
|
|
@ -165,6 +173,8 @@ static_decide(struct static_config *cf, struct static_route *r)
|
|||
/* r->dest != RTD_MULTIPATH, but may be RTD_NONE (part of multipath route)
|
||||
the route also have to be valid (r->neigh != NULL) */
|
||||
|
||||
r->state &= ~STS_WANT;
|
||||
|
||||
if (r->neigh->scope < 0)
|
||||
return 0;
|
||||
|
||||
|
|
@ -174,6 +184,7 @@ static_decide(struct static_config *cf, struct static_route *r)
|
|||
if (r->bfd_req && r->bfd_req->state != BFD_STATE_UP)
|
||||
return 0;
|
||||
|
||||
r->state |= STS_WANT;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -181,6 +192,9 @@ static_decide(struct static_config *cf, struct static_route *r)
|
|||
static void
|
||||
static_add(struct proto *p, struct static_config *cf, struct static_route *r)
|
||||
{
|
||||
if (r->mp_head && r != r->mp_head)
|
||||
return;
|
||||
|
||||
DBG("static_add(%N,%d)\n", r->net, r->dest);
|
||||
switch (r->dest)
|
||||
{
|
||||
|
|
@ -191,7 +205,10 @@ static_add(struct proto *p, struct static_config *cf, struct static_route *r)
|
|||
|
||||
for (r2 = r; r2; r2 = r2->mp_next)
|
||||
{
|
||||
struct neighbor *n = neigh_find2(p, &r2->via, r2->via_if, NEF_STICKY);
|
||||
if (ipa_zero(r2->via)) // No struct neighbor for device routes
|
||||
continue;
|
||||
|
||||
struct neighbor *n = neigh_find2(p, &r2->via, r2->iface, NEF_STICKY);
|
||||
if (n)
|
||||
{
|
||||
r2->chain = n->data;
|
||||
|
|
@ -199,7 +216,7 @@ static_add(struct proto *p, struct static_config *cf, struct static_route *r)
|
|||
r2->neigh = n;
|
||||
|
||||
static_update_bfd(p, r2);
|
||||
r2->state = static_decide(cf,r2) ? STS_WANT : 0;
|
||||
static_decide(cf,r2);
|
||||
count++;
|
||||
}
|
||||
else
|
||||
|
|
@ -223,6 +240,9 @@ static_add(struct proto *p, struct static_config *cf, struct static_route *r)
|
|||
static void
|
||||
static_rte_cleanup(struct proto *p UNUSED, struct static_route *r)
|
||||
{
|
||||
if (r->mp_head && (r != r->mp_head))
|
||||
return;
|
||||
|
||||
struct static_route *r2;
|
||||
|
||||
for (r2 = r; r2; r2 = r2->mp_next)
|
||||
|
|
@ -250,8 +270,15 @@ static_start(struct proto *p)
|
|||
/* We have to go UP before routes could be installed */
|
||||
proto_notify_state(p, PS_UP);
|
||||
|
||||
WALK_LIST(r, cf->other_routes)
|
||||
WALK_LIST(r, cf->neigh_routes)
|
||||
static_add(p, cf, r);
|
||||
|
||||
WALK_LIST(r, cf->iface_routes)
|
||||
static_add(p, cf, r);
|
||||
|
||||
WALK_LIST(r, cf->other_routes)
|
||||
static_install(p, r);
|
||||
|
||||
return PS_UP;
|
||||
}
|
||||
|
||||
|
|
@ -262,9 +289,14 @@ static_shutdown(struct proto *p)
|
|||
struct static_route *r;
|
||||
|
||||
/* Just reset the flag, the routes will be flushed by the nest */
|
||||
WALK_LIST(r, cf->other_routes)
|
||||
{
|
||||
static_rte_cleanup(p, r);
|
||||
r->state = 0;
|
||||
}
|
||||
WALK_LIST(r, cf->iface_routes)
|
||||
r->state = 0;
|
||||
WALK_LIST(r, cf->other_routes)
|
||||
WALK_LIST(r, cf->neigh_routes)
|
||||
{
|
||||
static_rte_cleanup(p, r);
|
||||
r->state = 0;
|
||||
|
|
@ -275,9 +307,11 @@ static_shutdown(struct proto *p)
|
|||
cf = (void *) p->cf_new;
|
||||
if (cf)
|
||||
{
|
||||
WALK_LIST(r, cf->other_routes)
|
||||
r->state = 0;
|
||||
WALK_LIST(r, cf->iface_routes)
|
||||
r->state = 0;
|
||||
WALK_LIST(r, cf->other_routes)
|
||||
WALK_LIST(r, cf->neigh_routes)
|
||||
r->state = 0;
|
||||
}
|
||||
|
||||
|
|
@ -299,10 +333,8 @@ static_update_rte(struct proto *p, struct static_route *r)
|
|||
if (r->dest != RTD_UNICAST)
|
||||
return;
|
||||
|
||||
if (static_decide((struct static_config *) p->cf, r))
|
||||
static_install(p, r);
|
||||
else
|
||||
static_remove(p, r);
|
||||
static_decide((struct static_config *) p->cf, r);
|
||||
static_install(p, r);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -349,12 +381,15 @@ static_dump(struct proto *p)
|
|||
struct static_config *c = (void *) p->cf;
|
||||
struct static_route *r;
|
||||
|
||||
debug("Independent static routes:\n");
|
||||
WALK_LIST(r, c->other_routes)
|
||||
debug("Independent static nexthops:\n");
|
||||
WALK_LIST(r, c->neigh_routes)
|
||||
static_dump_rt(r);
|
||||
debug("Device static routes:\n");
|
||||
debug("Device static nexthops:\n");
|
||||
WALK_LIST(r, c->iface_routes)
|
||||
static_dump_rt(r);
|
||||
debug("Other static routes:\n");
|
||||
WALK_LIST(r, c->other_routes)
|
||||
static_dump_rt(r);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -367,13 +402,21 @@ static_if_notify(struct proto *p, unsigned flags, struct iface *i)
|
|||
{
|
||||
WALK_LIST(r, c->iface_routes)
|
||||
if (!strcmp(r->if_name, i->name))
|
||||
{
|
||||
r->state |= STS_WANT;
|
||||
r->iface = i;
|
||||
static_install(p, r);
|
||||
}
|
||||
}
|
||||
else if (flags & IF_CHANGE_DOWN)
|
||||
{
|
||||
WALK_LIST(r, c->iface_routes)
|
||||
if (!strcmp(r->if_name, i->name))
|
||||
static_remove(p, r);
|
||||
{
|
||||
r->state &= ~STS_WANT;
|
||||
r->iface = NULL;
|
||||
static_install(p, r);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -386,6 +429,7 @@ static_rte_mergable(rte *pri UNUSED, rte *sec UNUSED)
|
|||
void
|
||||
static_init_config(struct static_config *c)
|
||||
{
|
||||
init_list(&c->neigh_routes);
|
||||
init_list(&c->iface_routes);
|
||||
init_list(&c->other_routes);
|
||||
}
|
||||
|
|
@ -400,8 +444,12 @@ static_postconfig(struct proto_config *CF)
|
|||
cf_error("Channel not specified");
|
||||
|
||||
|
||||
WALK_LIST(r, cf->neigh_routes)
|
||||
if (r->net && (r->net->type != CF->net_type))
|
||||
cf_error("Route %N incompatible with channel type", r->net);
|
||||
|
||||
WALK_LIST(r, cf->iface_routes)
|
||||
if (r->net->type != CF->net_type)
|
||||
if (r->net && (r->net->type != CF->net_type))
|
||||
cf_error("Route %N incompatible with channel type", r->net);
|
||||
|
||||
WALK_LIST(r, cf->other_routes)
|
||||
|
|
@ -442,16 +490,22 @@ static_same_dest(struct static_route *x, struct static_route *y)
|
|||
if (ipa_nonzero(xc->via) && ipa_nonzero(yc->via))
|
||||
{
|
||||
if (!ipa_equal(x->via, y->via) ||
|
||||
(x->via_if != y->via_if) ||
|
||||
(x->iface != y->iface) ||
|
||||
(x->use_bfd != y->use_bfd) ||
|
||||
(x->weight != y->weight))
|
||||
(x->weight != y->weight) ||
|
||||
(x->label_count != y->label_count))
|
||||
return 0;
|
||||
for (int i=0; i<x->label_count; i++)
|
||||
if (x->label_stack[i] != y->label_stack[i])
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
if (strcmp(x->if_name, y->if_name) ||
|
||||
if ((!x->if_name) || (!y->if_name) ||
|
||||
strcmp(x->if_name, y->if_name) ||
|
||||
(x->use_bfd != y->use_bfd) ||
|
||||
(x->weight != y->weight))
|
||||
return 0;
|
||||
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -476,6 +530,9 @@ static_match(struct proto *p, struct static_route *r, struct static_config *n)
|
|||
{
|
||||
struct static_route *t;
|
||||
|
||||
if (r->mp_head && (r->mp_head != r))
|
||||
return;
|
||||
|
||||
/*
|
||||
* 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
|
||||
|
|
@ -486,23 +543,28 @@ static_match(struct proto *p, struct static_route *r, struct static_config *n)
|
|||
if (r->neigh)
|
||||
r->neigh->data = NULL;
|
||||
|
||||
WALK_LIST(t, n->neigh_routes)
|
||||
if ((!t->mp_head || (t->mp_head == t)) && net_equal(r->net, t->net))
|
||||
goto found;
|
||||
|
||||
WALK_LIST(t, n->iface_routes)
|
||||
if (net_equal(r->net, t->net))
|
||||
if ((!t->mp_head || (t->mp_head == t)) && net_equal(r->net, t->net))
|
||||
goto found;
|
||||
|
||||
WALK_LIST(t, n->other_routes)
|
||||
if (net_equal(r->net, t->net))
|
||||
goto found;
|
||||
|
||||
static_remove(p, r);
|
||||
r->state &= ~STS_WANT;
|
||||
static_install(p, r);
|
||||
return;
|
||||
|
||||
found:
|
||||
t->state = r->state;
|
||||
|
||||
/* If destination is different, force reinstall */
|
||||
if (r->state && !static_same_rte(r, t))
|
||||
t->state = r->state | STS_WANT | STS_FORCE;
|
||||
else
|
||||
t->state = r->state;
|
||||
if (!static_same_rte(r, t))
|
||||
t->state |= STS_FORCE;
|
||||
}
|
||||
|
||||
static inline rtable *
|
||||
|
|
@ -525,20 +587,34 @@ static_reconfigure(struct proto *p, struct proto_config *CF)
|
|||
return 0;
|
||||
|
||||
/* Delete all obsolete routes and reset neighbor entries */
|
||||
WALK_LIST(r, o->other_routes)
|
||||
static_match(p, r, n);
|
||||
WALK_LIST(r, o->iface_routes)
|
||||
static_match(p, r, n);
|
||||
WALK_LIST(r, o->other_routes)
|
||||
WALK_LIST(r, o->neigh_routes)
|
||||
static_match(p, r, n);
|
||||
|
||||
/* Now add all new routes, those not changed will be ignored by static_install() */
|
||||
WALK_LIST(r, n->neigh_routes)
|
||||
static_add(p, n, r);
|
||||
WALK_LIST(r, o->neigh_routes)
|
||||
static_rte_cleanup(p, r);
|
||||
|
||||
WALK_LIST(r, n->iface_routes)
|
||||
{
|
||||
struct iface *ifa;
|
||||
if ((ifa = if_find_by_name(r->if_name)) && (ifa->flags & IF_UP))
|
||||
static_install(p, r);
|
||||
{
|
||||
r->iface = ifa;
|
||||
static_install(p, r);
|
||||
}
|
||||
}
|
||||
|
||||
WALK_LIST(r, n->other_routes)
|
||||
static_add(p, n, r);
|
||||
{
|
||||
r->state |= STS_WANT;
|
||||
static_install(p, r);
|
||||
}
|
||||
|
||||
WALK_LIST(r, o->other_routes)
|
||||
static_rte_cleanup(p, r);
|
||||
|
|
@ -555,7 +631,7 @@ static_copy_routes(list *dlst, list *slst)
|
|||
WALK_LIST(sr, *slst)
|
||||
{
|
||||
struct static_route *srr, *drr = NULL;
|
||||
for (srr = sr; srr; srr = srr->mp_next)
|
||||
for (srr = sr->mp_head; srr; srr = srr->mp_next)
|
||||
{
|
||||
/* copy one route */
|
||||
struct static_route *dr = cfg_alloc(sizeof(struct static_route));
|
||||
|
|
@ -577,6 +653,7 @@ static_copy_config(struct proto_config *dest, struct proto_config *src)
|
|||
struct static_config *s = (struct static_config *) src;
|
||||
|
||||
/* Copy route lists */
|
||||
static_copy_routes(&d->neigh_routes, &s->neigh_routes);
|
||||
static_copy_routes(&d->iface_routes, &s->iface_routes);
|
||||
static_copy_routes(&d->other_routes, &s->other_routes);
|
||||
}
|
||||
|
|
@ -606,7 +683,7 @@ static_format_via(struct static_route *r)
|
|||
switch (r->dest)
|
||||
{
|
||||
case RTD_UNICAST: if (ipa_zero(r->via)) bsprintf(via, "dev %s", r->if_name);
|
||||
else bsprintf(via, "via %I%J", r->via, r->via_if);
|
||||
else bsprintf(via, "via %I%J", r->via, r->iface);
|
||||
break;
|
||||
case RTD_BLACKHOLE: bsprintf(via, "blackhole"); break;
|
||||
case RTD_UNREACHABLE: bsprintf(via, "unreachable"); break;
|
||||
|
|
@ -620,13 +697,19 @@ static_format_via(struct static_route *r)
|
|||
static void
|
||||
static_show_rt(struct static_route *r)
|
||||
{
|
||||
if (r->mp_head && (r != r->mp_head))
|
||||
return;
|
||||
if (r->mp_next)
|
||||
{
|
||||
cli_msg(-1009, "%N", r->net);
|
||||
struct static_route *r2;
|
||||
for (r2 = r; r2; r2 = r2->mp_next)
|
||||
{
|
||||
cli_msg(-1009, "\t%s weight %d%s%s", static_format_via(r2), r2->weight + 1,
|
||||
r2->bfd_req ? " (bfd)" : "", (r2->state & STS_INSTALLED) ? "" : " (dormant)");
|
||||
if (r2->mp_next == r)
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
cli_msg(-1009, "%N %s%s%s", r->net, static_format_via(r),
|
||||
|
|
@ -639,9 +722,11 @@ static_show(struct proto *P)
|
|||
struct static_config *c = (void *) P->cf;
|
||||
struct static_route *r;
|
||||
|
||||
WALK_LIST(r, c->other_routes)
|
||||
WALK_LIST(r, c->neigh_routes)
|
||||
static_show_rt(r);
|
||||
WALK_LIST(r, c->iface_routes)
|
||||
static_show_rt(r);
|
||||
WALK_LIST(r, c->other_routes)
|
||||
static_show_rt(r);
|
||||
cli_msg(0, "");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@
|
|||
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 neigh_routes; /* Routes to search on neighbor events */
|
||||
list other_routes; /* Non-nexthop routes */
|
||||
int check_link; /* Whether iface link state is used */
|
||||
struct rtable_config *igp_table; /* Table used for recursive next hop lookups */
|
||||
};
|
||||
|
|
@ -29,21 +30,23 @@ struct static_route {
|
|||
net_addr *net; /* Network we route */
|
||||
int dest; /* Destination type (RTD_*) */
|
||||
ip_addr via; /* Destination router */
|
||||
struct iface *via_if; /* Destination iface, for link-local vias */
|
||||
struct iface *iface; /* Destination iface, for link-local vias or device routes */
|
||||
struct neighbor *neigh;
|
||||
byte *if_name; /* Name for RTD_DEVICE routes */
|
||||
byte *if_name; /* Name for device routes */
|
||||
struct static_route *mp_next; /* Nexthops for multipath routes */
|
||||
struct static_route *mp_head; /* First nexthop of this route */
|
||||
struct f_inst *cmds; /* List of commands for setting attributes */
|
||||
u32 state; /* Current state: STS_* */
|
||||
int use_bfd; /* Configured to use BFD */
|
||||
int weight; /* Multipath next hop weight */
|
||||
byte use_bfd; /* Configured to use BFD */
|
||||
byte label_count; /* Number of labels in stack */
|
||||
struct bfd_request *bfd_req; /* BFD request, if BFD is used */
|
||||
u32 *label_stack; /* Label stack if label_count > 0 */
|
||||
};
|
||||
|
||||
#define STS_INSTALLED 0x1
|
||||
#define STS_INSTALLED_ANY 0x2
|
||||
#define STS_WANT 0x4
|
||||
#define STS_FORCE 0x8
|
||||
#define STS_WANT 0x2
|
||||
#define STS_FORCE 0x4
|
||||
|
||||
/* Dummy nodes (parts of multipath route) abuses masklen field for weight
|
||||
and if_name field for a ptr to the master (RTD_MULTIPATH) node. */
|
||||
|
|
|
|||
Loading…
Reference in a new issue