diff options
Diffstat (limited to 'proto/bgp')
| -rw-r--r-- | proto/bgp/bgp.c | 4 | ||||
| -rw-r--r-- | proto/bgp/packets.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 932ad9f3..ced83c5c 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -1277,7 +1277,7 @@ bgp_start_locked(struct object_lock *lock) return; } - neighbor *n = neigh_find2(&p->p, &cf->remote_ip, cf->iface, NEF_STICKY); + neighbor *n = neigh_find(&p->p, cf->remote_ip, cf->iface, NEF_STICKY); if (!n) { log(L_ERR "%s: Invalid remote address %I%J", p->p.name, cf->remote_ip, cf->iface); @@ -1521,7 +1521,7 @@ bgp_channel_start(struct channel *C) if (ipa_zero(c->next_hop_addr)) { /* We know the iface for single-hop, we make lookup for multihop */ - struct neighbor *nbr = p->neigh ?: neigh_find2(&p->p, &src, NULL, 0); + struct neighbor *nbr = p->neigh ?: neigh_find(&p->p, src, NULL, 0); struct iface *iface = nbr ? nbr->iface : NULL; if (bgp_channel_is_ipv4(c) && iface && iface->addr4) diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c index aa08732d..190fd6fe 100644 --- a/proto/bgp/packets.c +++ b/proto/bgp/packets.c @@ -744,9 +744,9 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll) /* GW_DIRECT -> single_hop -> p->neigh != NULL */ if (ipa_nonzero(gw)) - nbr = neigh_find2(&p->p, &gw, NULL, 0); + nbr = neigh_find(&p->p, gw, NULL, 0); else if (ipa_nonzero(ll)) - nbr = neigh_find2(&p->p, &ll, p->neigh->iface, 0); + nbr = neigh_find(&p->p, ll, p->neigh->iface, 0); if (!nbr || (nbr->scope == SCOPE_HOST)) WITHDRAW(BAD_NEXT_HOP); |