mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

BGP: Allow multiple EBGP neighbors with the same peer.

Browse Source 
We can distinguish BGP sessions if at least one side uses a different IP
address. Extend olock mechanism to handle local IP as a part of key, with
optional wildcard, so BGP sessions could local IP in the olock and not
block themselves.
This commit is contained in:
Alexander Zubkov 2024-02-07 19:11:10 +01:00 committed by Ondrej Zajicek
parent 0b52f7c01f
commit 574d7eb241
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ip.h
View File

@ -176,6 +176,10 @@ static inline ip6_addr ip6_not(ip6_addr a)
#define ipa_xor(x,y) ip6_xor(x,y) #define ipa_xor(x,y) ip6_xor(x,y)
#define ipa_not(x) ip6_not(x) #define ipa_not(x) ip6_not(x)
/* Compare addresses when zero address works like a wildcard */
static inline int ipa_equal_wildcard(ip_addr x, ip_addr y)
{ return ipa_zero(x) || ipa_zero(y) || ipa_equal(x, y); }
/* /*
* A zero address is either a token for invalid/unused, or the prefix of default * A zero address is either a token for invalid/unused, or the prefix of default

5
nest/locks.c
View File

@ -48,7 +48,8 @@ olock_same(struct object_lock *x, struct object_lock *y)
x->vrf == y->vrf && x->vrf == y->vrf &&
x->port == y->port && x->port == y->port &&
x->inst == y->inst && x->inst == y->inst &&
ipa_equal(x->addr, y->addr); ipa_equal(x->addr, y->addr) &&
ipa_equal_wildcard(x->addr_local, y->addr_local);
} }
static void static void
@ -91,7 +92,7 @@ olock_dump(resource *r)
struct object_lock *l = (struct object_lock *) r; struct object_lock *l = (struct object_lock *) r;
static char *olock_states[] = { "free", "locked", "waiting", "event" }; static char *olock_states[] = { "free", "locked", "waiting", "event" };
debug("(%d:%s:%I:%d:%d) [%s]\n", l->type, (l->iface ? l->iface->name : "?"), l->addr, l->port, l->inst, olock_states[l->state]); debug("(%d:%s:%I:%I:%d:%d) [%s]\n", l->type, (l->iface ? l->iface->name : "?"), l->addr, l->addr_local, l->port, l->inst, olock_states[l->state]);
if (!EMPTY_LIST(l->waiters)) if (!EMPTY_LIST(l->waiters))
debug(" [wanted]\n"); debug(" [wanted]\n");
} }

3
nest/locks.h
View File

@ -25,7 +25,8 @@
struct object_lock { struct object_lock {
resource r; resource r;
ip_addr addr; /* Identification of a object: IP address */ ip_addr addr; /* Identification of a object: IP address (strict compare) */
ip_addr addr_local; /* ... another IP address (allow zero IP wildcard) */
uint type; /* ... object type (OBJLOCK_xxx) */ uint type; /* ... object type (OBJLOCK_xxx) */
uint port; /* ... port number */ uint port; /* ... port number */
uint inst; /* ... instance ID */ uint inst; /* ... instance ID */

1
proto/bgp/bgp.c
View File

@ -1616,6 +1616,7 @@ bgp_start(struct proto *P)
struct object_lock *lock; struct object_lock *lock;
lock = p->lock = olock_new(P->pool); lock = p->lock = olock_new(P->pool);
lock->addr = p->remote_ip; lock->addr = p->remote_ip;
lock->addr_local = p->cf->local_ip;
lock->port = p->cf->remote_port; lock->port = p->cf->remote_port;
lock->iface = p->cf->iface; lock->iface = p->cf->iface;
lock->vrf = p->cf->iface ? NULL : p->p.vrf; lock->vrf = p->cf->iface ? NULL : p->p.vrf;