zebra: Make the import_check look like nexthop_check

Make the functions take the same parameters.

Future commits will use this.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-02-05 21:27:02 -05:00
parent 3cdba47a82
commit 735219e91d

View File

@ -361,9 +361,10 @@ zebra_rnh_resolve_import_entry(struct zebra_vrf *zvrf, afi_t afi,
* See if a tracked route entry for import (by BGP) has undergone any * See if a tracked route entry for import (by BGP) has undergone any
* change, and if so, notify the client. * change, and if so, notify the client.
*/ */
static void zebra_rnh_eval_import_check_entry(vrf_id_t vrfid, afi_t afi, static void zebra_rnh_eval_import_check_entry(struct zebra_vrf *zvrf, afi_t afi,
int force, struct route_node *nrn, int force, struct route_node *nrn,
struct rnh *rnh, struct rnh *rnh,
struct route_node *prn,
struct route_entry *re) struct route_entry *re)
{ {
int state_changed = 0; int state_changed = 0;
@ -383,13 +384,15 @@ static void zebra_rnh_eval_import_check_entry(vrf_id_t vrfid, afi_t afi,
if (state_changed || force) { if (state_changed || force) {
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN); prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN);
zlog_debug("%u:%s: Route import check %s %s", vrfid, zlog_debug("%u:%s: Route import check %s %s",
zvrf->vrf->vrf_id,
bufn, rnh->state ? "passed" : "failed", bufn, rnh->state ? "passed" : "failed",
state_changed ? "(state changed)" : ""); state_changed ? "(state changed)" : "");
} }
/* state changed, notify clients */ /* state changed, notify clients */
for (ALL_LIST_ELEMENTS_RO(rnh->client_list, node, client)) { for (ALL_LIST_ELEMENTS_RO(rnh->client_list, node, client)) {
send_client(rnh, client, RNH_IMPORT_CHECK_TYPE, vrfid); send_client(rnh, client,
RNH_IMPORT_CHECK_TYPE, zvrf->vrf->vrf_id);
} }
} }
} }
@ -689,8 +692,8 @@ static void zebra_rnh_evaluate_entry(struct zebra_vrf *zvrf, afi_t afi,
/* Process based on type of entry. */ /* Process based on type of entry. */
if (type == RNH_IMPORT_CHECK_TYPE) if (type == RNH_IMPORT_CHECK_TYPE)
zebra_rnh_eval_import_check_entry(zvrf->vrf->vrf_id, afi, force, zebra_rnh_eval_import_check_entry(zvrf, afi, force, nrn, rnh,
nrn, rnh, re); prn, re);
else else
zebra_rnh_eval_nexthop_entry(zvrf, afi, force, nrn, rnh, prn, zebra_rnh_eval_nexthop_entry(zvrf, afi, force, nrn, rnh, prn,
re); re);