mirror of
https://gitlab.labs.nic.cz/labs/bird.git
synced 2024-05-11 16:54:54 +00:00
Kill remaining master_table relics in KRT code.
Make all protocols pass routing table to rte_update and rte_discard.
This commit is contained in:
@@ -86,7 +86,7 @@ krt_parse_entry(byte *ent, struct krt_proto *p)
|
||||
return;
|
||||
}
|
||||
|
||||
net = net_get(&master_table, dest, masklen);
|
||||
net = net_get(p->p.table, dest, masklen);
|
||||
|
||||
a.proto = &p->p;
|
||||
a.source = RTS_INHERIT;
|
||||
|
@@ -594,7 +594,7 @@ nl_parse_route(struct krt_proto *p, struct nlmsghdr *h, int scan)
|
||||
src = KRT_SRC_ALIEN;
|
||||
}
|
||||
|
||||
net = net_get(&master_table, dst, i->rtm_dst_len);
|
||||
net = net_get(p->p.table, dst, i->rtm_dst_len);
|
||||
ra.proto = &p->p;
|
||||
ra.source = RTS_INHERIT;
|
||||
ra.scope = SCOPE_UNIVERSE;
|
||||
|
@@ -132,7 +132,7 @@ krt_learn_announce_update(struct krt_proto *p, rte *e)
|
||||
ee->net = nn;
|
||||
ee->pflags = 0;
|
||||
ee->u.krt = e->u.krt;
|
||||
rte_update(nn, &p->p, ee);
|
||||
rte_update(p->p.table, nn, &p->p, ee);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -140,7 +140,7 @@ krt_learn_announce_delete(struct krt_proto *p, net *n)
|
||||
{
|
||||
n = net_find(p->p.table, n->n.prefix, n->n.pxlen);
|
||||
if (n)
|
||||
rte_update(n, &p->p, NULL);
|
||||
rte_update(p->p.table, n, &p->p, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -356,7 +356,7 @@ krt_dump_attrs(rte *e)
|
||||
static void
|
||||
krt_flush_routes(struct krt_proto *p)
|
||||
{
|
||||
struct rtable *t = &master_table;
|
||||
struct rtable *t = p->p.table;
|
||||
|
||||
DBG("Flushing kernel routes...\n");
|
||||
FIB_WALK(&t->fib, f)
|
||||
@@ -466,7 +466,7 @@ static void
|
||||
krt_prune(struct krt_proto *p)
|
||||
{
|
||||
struct proto *pp = &p->p;
|
||||
struct rtable *t = &master_table;
|
||||
struct rtable *t = p->p.table;
|
||||
struct fib_node *f;
|
||||
|
||||
DBG("Pruning routes...\n");
|
||||
@@ -547,7 +547,7 @@ krt_got_route_async(struct krt_proto *p, rte *e, int new)
|
||||
/* Fall-thru */
|
||||
default:
|
||||
DBG("Discarding\n");
|
||||
rte_update(net, &p->p, NULL);
|
||||
rte_update(p->p.table, net, &p->p, NULL);
|
||||
}
|
||||
rte_free(e);
|
||||
}
|
||||
|
Reference in New Issue
Block a user