proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 17:13:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BGP: Link BGP instance to corresponding VRF

Browse Source 
Link BGP instance (Default or VRF) to the corresponding VRF structure and
modify lookup to use this. The logic is very similar to what is implemented
in zebra - the 'struct zebra_vrf' there is essentially 'struct bgp' in BGP.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-9122
Reviewed By: CCR-4102
Testing Done: Manual
This commit is contained in:
vivek 2016-02-19 18:43:30 -08:00
parent f360eac003
commit d1be1f083d
3 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_zebra.c
View File

@ -252,8 +252,8 @@ bgp_vrf_add (int command, struct zclient *zclient, zebra_size_t length,
bgp = bgp_lookup_by_name(vrf->name); bgp = bgp_lookup_by_name(vrf->name);
if (bgp) if (bgp)
{ {
/* We have instance configured, make it "up". */ /* We have instance configured, link to VRF and make it "up". */
bgp->vrf_id = vrf_id; bgp_vrf_link (bgp, vrf);
bgp_instance_up (bgp); bgp_instance_up (bgp);
} }
@ -281,8 +281,8 @@ bgp_vrf_delete (int command, struct zclient *zclient, zebra_size_t length,
bgp = bgp_lookup_by_name(vrf->name); bgp = bgp_lookup_by_name(vrf->name);
if (bgp) if (bgp)
{ {
/* We have instance configured, make it "down". */ /* We have instance configured, unlink from VRF and make it "down". */
bgp->vrf_id = VRF_DEFAULT; bgp_vrf_unlink (bgp, vrf);
bgp_instance_down (bgp); bgp_instance_down (bgp);
} }

56
bgpd/bgpd.c
View File

@ -2823,41 +2823,18 @@ bgp_lookup_by_name (const char *name)
return NULL; return NULL;
} }
/* Lookup BGP instance based on VRF id */ /* Lookup BGP instance based on VRF id. */
/* Note: Only to be used for incoming messages from Zebra. */
struct bgp * struct bgp *
bgp_lookup_by_vrf_id (vrf_id_t vrf_id) bgp_lookup_by_vrf_id (vrf_id_t vrf_id)
{
struct bgp *bgp;
struct listnode *node, *nnode;
for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp))
if (bgp->vrf_id == vrf_id)
return bgp;
return NULL;
}
/* Link BGP instance to VRF, if present. */
static void
bgp_vrf_link (struct bgp *bgp)
{ {
struct vrf *vrf; struct vrf *vrf;
vrf = vrf_lookup_by_name(bgp->name); /* Lookup VRF (in tree) and follow link. */
vrf = vrf_lookup (vrf_id);
if (!vrf) if (!vrf)
return; return NULL;
bgp->vrf_id = vrf->vrf_id; return (vrf->info) ? (struct bgp *)vrf->info : NULL;
}
/* Unlink BGP instance from VRF, if present. */
static void
bgp_vrf_unlink (struct bgp *bgp)
{
struct vrf *vrf;
vrf = vrf_lookup (bgp->vrf_id);
if (!vrf)
return;
bgp->vrf_id = VRF_DEFAULT;
} }
/* Called from VTY commands. */ /* Called from VTY commands. */
@ -2930,9 +2907,16 @@ bgp_get (struct bgp **bgp_val, as_t *as, const char *name,
listnode_add (bm->bgp, bgp); listnode_add (bm->bgp, bgp);
/* If VRF, link to the VRF structure, if present. */ /* If Default instance or VRF, link to the VRF structure, if present. */
if (bgp->inst_type == BGP_INSTANCE_TYPE_VRF) if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT ||
bgp_vrf_link (bgp); bgp->inst_type == BGP_INSTANCE_TYPE_VRF)
{
struct vrf *vrf;
vrf = bgp_vrf_lookup_by_instance_type (bgp);
if (vrf)
bgp_vrf_link (bgp, vrf);
}
/* Register with Zebra, if needed */ /* Register with Zebra, if needed */
if (IS_BGP_INST_KNOWN_TO_ZEBRA(bgp)) if (IS_BGP_INST_KNOWN_TO_ZEBRA(bgp))
@ -3006,6 +2990,7 @@ bgp_delete (struct bgp *bgp)
struct peer *peer; struct peer *peer;
struct peer_group *group; struct peer_group *group;
struct listnode *node, *next; struct listnode *node, *next;
struct vrf *vrf;
afi_t afi; afi_t afi;
int i; int i;
@ -3073,9 +3058,10 @@ bgp_delete (struct bgp *bgp)
if (IS_BGP_INST_KNOWN_TO_ZEBRA(bgp)) if (IS_BGP_INST_KNOWN_TO_ZEBRA(bgp))
bgp_zebra_instance_deregister (bgp); bgp_zebra_instance_deregister (bgp);
/* If VRF, unlink from the VRF structure. */ /* If Default instance or VRF, unlink from the VRF structure. */
if (bgp->inst_type == BGP_INSTANCE_TYPE_VRF) vrf = bgp_vrf_lookup_by_instance_type (bgp);
bgp_vrf_unlink (bgp); if (vrf)
bgp_vrf_unlink (bgp, vrf);
thread_master_free_unused(bm->master); thread_master_free_unused(bm->master);
bgp_unlock(bgp); /* initial reference */ bgp_unlock(bgp); /* initial reference */

35
bgpd/bgpd.h
View File

@ -1438,4 +1438,39 @@ peer_cap_enhe (struct peer *peer)
return (CHECK_FLAG(peer->af_cap[AFI_IP][SAFI_UNICAST], PEER_CAP_ENHE_AF_NEGO)); return (CHECK_FLAG(peer->af_cap[AFI_IP][SAFI_UNICAST], PEER_CAP_ENHE_AF_NEGO));
} }
/* Lookup VRF for BGP instance based on its type. */
static inline struct vrf *
bgp_vrf_lookup_by_instance_type (struct bgp *bgp)
{
struct vrf *vrf;
if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT)
vrf = vrf_lookup (VRF_DEFAULT);
else if (bgp->inst_type == BGP_INSTANCE_TYPE_VRF)
vrf = vrf_lookup_by_name (bgp->name);
else
vrf = NULL;
return vrf;
}
/* Link BGP instance to VRF. */
static inline void
bgp_vrf_link (struct bgp *bgp, struct vrf *vrf)
{
bgp->vrf_id = vrf->vrf_id;
bgp_lock (bgp);
vrf->info = (void *)bgp;
}
/* Unlink BGP instance from VRF. */
static inline void
bgp_vrf_unlink (struct bgp *bgp, struct vrf *vrf)
{
vrf->info = NULL;
bgp_unlock (bgp);
bgp->vrf_id = VRF_DEFAULT;
}
#endif /* _QUAGGA_BGPD_H */ #endif /* _QUAGGA_BGPD_H */