diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2019-01-18 23:30:46 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2019-01-18 23:30:46 +0000 |
| commit | 1ce00a00cddb0a2749a17dc0c864d5b9cc4ad03b (patch) | |
| tree | 787f5b76f60352443df8c0ed8e3b25f1bc89ed63 /usr.sbin/bgpd/bgpd.c | |
| parent | 5e29643b839e09f4ac439bff070fcff5df33ca7f (diff) | |
Don't store the mpe information in struct ktable but instead pass the
ifindex from the RDE over. This will allow to import prefixes to multiple
mpe interfaces in one rdomain.
OK dlg@
Diffstat (limited to 'usr.sbin/bgpd/bgpd.c')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 711551e5cdc..25da28c071c 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.205 2018/12/27 20:23:24 remi Exp $ */ +/* $OpenBSD: bgpd.c,v 1.206 2019/01/18 23:30:45 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -487,8 +487,8 @@ reconfigure(char *conffile, struct bgpd_config *conf, struct peer **peer_l) /* RIBs for the RDE */ while ((rr = SIMPLEQ_FIRST(&ribnames))) { SIMPLEQ_REMOVE_HEAD(&ribnames, entry); - if (ktable_update(rr->rtableid, rr->name, NULL, - rr->flags, conf->fib_priority) == -1) { + if (ktable_update(rr->rtableid, rr->name, rr->flags, + conf->fib_priority) == -1) { log_warnx("failed to load rdomain %d", rr->rtableid); return (-1); @@ -624,8 +624,8 @@ reconfigure(char *conffile, struct bgpd_config *conf, struct peer **peer_l) while ((rd = SIMPLEQ_FIRST(&conf->rdomains)) != NULL) { SIMPLEQ_REMOVE_HEAD(&conf->rdomains, entry); - if (ktable_update(rd->rtableid, rd->descr, rd->ifmpe, - rd->flags, conf->fib_priority) == -1) { + if (ktable_update(rd->rtableid, rd->descr, rd->flags, + conf->fib_priority) == -1) { log_warnx("failed to load rdomain %d", rd->rtableid); return (-1); |