diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-06-27 16:51:53 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-06-27 16:57:07 +0200 |
| commit | 586c1800c447ff099d34889b23647c4733876d9b (patch) | |
| tree | d2f3feec9aaabeffe2457d994f4c453e1d9e7782 /proto/bgp/bgp.c | |
| parent | 45f28d85818f79790968725a945063228989bae7 (diff) | |
Nest: Neighbor cache cleanups
Simplify neighbor cache code, fix several minor bugs, and improve
handling of ONLINK flag.
Diffstat (limited to 'proto/bgp/bgp.c')
| -rw-r--r-- | proto/bgp/bgp.c | 4 |
1 files changed, 2 insertions, 2 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) |