bgpd: Allow inbound connections to non-default view

* bgpd.c: (peer_lookup) Search through all BGP instances for matches, not just
  the default instance, if no specific instance is given.
  (peer_lookup_with_open) same.
This commit is contained in:
Steve Hill 2009-07-28 17:54:35 +01:00 committed by Paul Jakma
parent 3117b5c47d
commit fc4dc59d08

View File

@ -2144,18 +2144,29 @@ peer_lookup (struct bgp *bgp, union sockunion *su)
struct peer *peer; struct peer *peer;
struct listnode *node, *nnode; struct listnode *node, *nnode;
if (! bgp) if (bgp != NULL)
bgp = bgp_get_default (); {
for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
if (! bgp) {
return NULL; if (sockunion_same (&peer->su, su)
&& ! CHECK_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER))
return peer;
}
}
else if (bm->bgp != NULL)
{
struct listnode *bgpnode, *nbgpnode;
for(ALL_LIST_ELEMENTS(bm->bgp, bgpnode, nbgpnode, bgp))
{
for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer)) for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
{ {
if (sockunion_same (&peer->su, su) if (sockunion_same (&peer->su, su)
&& ! CHECK_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER)) && ! CHECK_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER))
return peer; return peer;
} }
}
}
return NULL; return NULL;
} }
@ -2165,12 +2176,14 @@ peer_lookup_with_open (union sockunion *su, as_t remote_as,
{ {
struct peer *peer; struct peer *peer;
struct listnode *node, *nnode; struct listnode *node, *nnode;
struct listnode *bgpnode, *nbgpnode;
struct bgp *bgp; struct bgp *bgp;
bgp = bgp_get_default (); if (! bm->bgp)
if (! bgp)
return NULL; return NULL;
for(ALL_LIST_ELEMENTS(bm->bgp, bgpnode, nbgpnode, bgp))
{
for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer)) for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
{ {
if (sockunion_same (&peer->su, su) if (sockunion_same (&peer->su, su)
@ -2183,6 +2196,7 @@ peer_lookup_with_open (union sockunion *su, as_t remote_as,
*as = 1; *as = 1;
} }
} }
for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer)) for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
{ {
if (sockunion_same (&peer->su, su) if (sockunion_same (&peer->su, su)
@ -2195,6 +2209,7 @@ peer_lookup_with_open (union sockunion *su, as_t remote_as,
*as = 1; *as = 1;
} }
} }
}
return NULL; return NULL;
} }