From 586c1800c447ff099d34889b23647c4733876d9b Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Wed, 27 Jun 2018 16:51:53 +0200 Subject: Nest: Neighbor cache cleanups Simplify neighbor cache code, fix several minor bugs, and improve handling of ONLINK flag. --- proto/rip/packets.c | 2 +- proto/rip/rip.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'proto/rip') diff --git a/proto/rip/packets.c b/proto/rip/packets.c index 891f454f..1b65362f 100644 --- a/proto/rip/packets.c +++ b/proto/rip/packets.c @@ -627,7 +627,7 @@ rip_receive_response(struct rip_proto *p, struct rip_iface *ifa, struct rip_pack if (ipa_nonzero(rte.next_hop)) { - neighbor *nbr = neigh_find2(&p->p, &rte.next_hop, ifa->iface, 0); + neighbor *nbr = neigh_find(&p->p, rte.next_hop, ifa->iface, 0); if (!nbr || (nbr->scope <= 0)) rte.next_hop = IPA_NONE; } diff --git a/proto/rip/rip.c b/proto/rip/rip.c index 90bf8e5c..2838d425 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -377,7 +377,7 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, s struct rip_neighbor * rip_get_neighbor(struct rip_proto *p, ip_addr *a, struct rip_iface *ifa) { - neighbor *nbr = neigh_find2(&p->p, a, ifa->iface, 0); + neighbor *nbr = neigh_find(&p->p, *a, ifa->iface, 0); if (!nbr || (nbr->scope == SCOPE_HOST) || !rip_iface_link_up(ifa)) return NULL; -- cgit v1.2.3