From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 28 Mar 2024 14:00:40 +0000 (+0100)
Subject: Merge commit '574d7eb241a60622b0573ab1460cb23d968ba1cc' into thread-next
X-Git-Tag: v3.0.0~262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62c9f12dfc1b360be1b97dcf8dcb4bea1cf1065d;p=thirdparty%2Fbird.git

Merge commit '574d7eb241a60622b0573ab1460cb23d968ba1cc' into thread-next
---

62c9f12dfc1b360be1b97dcf8dcb4bea1cf1065d
diff --cc proto/bgp/bgp.c
index 1c9844387,e97b45e6f..1c9c38590
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@@ -1819,8 -1614,9 +1819,9 @@@ bgp_start(struct proto *P
     * so that we are the only instance attempting to talk with that neighbor.
     */
    struct object_lock *lock;
 -  lock = p->lock = olock_new(P->pool);
 +  lock = p->lock = olock_new(P->pool_inloop);
    lock->addr = p->remote_ip;
+   lock->addr_local = p->cf->local_ip;
    lock->port = p->cf->remote_port;
    lock->iface = p->cf->iface;
    lock->vrf = p->cf->iface ? NULL : p->p.vrf;