summaryrefslogtreecommitdiffstats
path: root/proto
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-05-17 22:16:53 +0200
committerMartin Mares <mj@ucw.cz>1999-05-17 22:16:53 +0200
commit4f1a6d27b9a44f61329bc7b6779a0c645362e181 (patch)
tree4c77601930c97a225f42aaf9ce5dcc378459d1ec /proto
parent0e02abfd5770062768eeb4c75061b7d2f656489d (diff)
downloadbird-4f1a6d27b9a44f61329bc7b6779a0c645362e181.tar
bird-4f1a6d27b9a44f61329bc7b6779a0c645362e181.zip
Kill remaining master_table relics in KRT code.
Make all protocols pass routing table to rte_update and rte_discard.
Diffstat (limited to 'proto')
-rw-r--r--proto/rip/rip.c4
-rw-r--r--proto/static/static.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 4a3e10a..16c63ae 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -223,7 +223,7 @@ advertise_entry( struct proto *p, struct rip_block *b, ip_addr whotoldme )
r->u.rip.tag = ntohl(b->tag);
r->net = n;
r->pflags = 0; /* Here go my flags */
- rte_update( n, p, r );
+ rte_update( p->table, n, p, r );
DBG( "done\n" );
}
@@ -356,7 +356,7 @@ rip_timer(timer *t)
if (now - rte->lastmod > P_CF->garbage_time) {
debug( "RIP: entry is too old: " ); rte_dump( rte );
- rte_discard(rte);
+ rte_discard(p->table, rte);
}
}
diff --git a/proto/static/static.c b/proto/static/static.c
index b136b31..d245be2 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -40,7 +40,7 @@ static_install(struct proto *p, struct static_route *r, struct iface *ifa)
e = rte_get_temp(aa);
e->net = n;
e->pflags = 0;
- rte_update(n, p, e);
+ rte_update(p->table, n, p, e);
}
static void
@@ -51,7 +51,7 @@ static_remove(struct proto *p, struct static_route *r)
DBG("Removing static route %I/%d\n", r->net, r->masklen);
n = net_find(p->table, r->net, r->masklen);
if (n)
- rte_update(n, p, NULL);
+ rte_update(p->table, n, p, NULL);
}
static int