proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 02:46:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4470 from donaldsharp/bgp_mac_rescan

Browse Source 
Bgp mac rescan
This commit is contained in:
Sri Mohana Singamsetty 2019-06-20 13:33:09 -07:00 committed by GitHub
commit bdacdc9271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_evpn_vty.c
View File

@ -1060,6 +1060,9 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
json_object_int_add(json_prefix_info,
"prefixLen", rm->p.prefixlen);
if (rd_header)
json_nroute = json_object_new_object();
}
for (pi = bgp_node_get_bgp_path_info(rm); pi;
@ -1132,8 +1135,6 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
else if (type == RD_TYPE_IP)
decode_rd_ip(pnt + 2, &rd_ip);
if (use_json) {
json_nroute =
json_object_new_object();
if (type == RD_TYPE_AS
|| type == RD_TYPE_AS4)
sprintf(rd_str, "%u:%d",
@ -1184,6 +1185,7 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
SAFI_EVPN, json_array);
output_count++;
}
rd_header = 0;
if (use_json) {
json_object_object_add(json_prefix_info,
"paths", json_array);

46
bgpd/bgp_mac.c
View File

@ -134,11 +134,11 @@ static struct bgp_self_mac *bgp_mac_find_interface_name(const char *ifname)
}
static void bgp_process_mac_rescan_table(struct bgp *bgp, struct peer *peer,
struct bgp_table *table)
struct bgp_table *table,
struct ethaddr *macaddr)
{
struct bgp_node *prn, *rn;
struct bgp_path_info *pi;
uint32_t count = 0;
for (prn = bgp_table_top(table); prn; prn = bgp_route_next(prn)) {
struct bgp_table *sub = prn->info;
@ -147,12 +147,21 @@ static void bgp_process_mac_rescan_table(struct bgp *bgp, struct peer *peer,
continue;
for (rn = bgp_table_top(sub); rn; rn = bgp_route_next(rn)) {
bool rn_affected;
struct prefix_evpn *pevpn = (struct prefix_evpn *)&rn->p;
struct prefix_rd prd;
uint32_t num_labels = 0;
mpls_label_t *label_pnt = NULL;
struct bgp_route_evpn evpn;
count++;
if (pevpn->family == AF_EVPN &&
pevpn->prefix.route_type == BGP_EVPN_MAC_IP_ROUTE &&
memcmp(&rn->p.u.prefix_evpn.macip_addr.mac,
macaddr, ETH_ALEN) == 0)
rn_affected = true;
else
rn_affected = false;
for (pi = rn->info; pi; pi = pi->next) {
if (pi->peer == peer)
break;
@ -161,6 +170,14 @@ static void bgp_process_mac_rescan_table(struct bgp *bgp, struct peer *peer,
if (!pi)
continue;
/*
* If the mac address is not the same then
* we don't care and since we are looking
*/
if ((memcmp(&pi->attr->rmac, macaddr, ETH_ALEN) != 0) &&
!rn_affected)
continue;
if (pi->extra)
num_labels = pi->extra->num_labels;
if (num_labels)
@ -202,7 +219,7 @@ static void bgp_process_mac_rescan_table(struct bgp *bgp, struct peer *peer,
}
}
static void bgp_mac_rescan_evpn_table(struct bgp *bgp)
static void bgp_mac_rescan_evpn_table(struct bgp *bgp, struct ethaddr *macaddr)
{
struct listnode *node;
struct peer *peer;
@ -232,12 +249,12 @@ static void bgp_mac_rescan_evpn_table(struct bgp *bgp)
if (bgp_debug_update(peer, NULL, NULL, 1))
zlog_debug("Processing EVPN MAC interface change on peer %s",
peer->host);
bgp_process_mac_rescan_table(bgp, peer, table);
bgp_process_mac_rescan_table(bgp, peer, table, macaddr);
}
}
}
static void bgp_mac_rescan_all_evpn_tables(void)
static void bgp_mac_rescan_all_evpn_tables(struct ethaddr *macaddr)
{
struct listnode *node;
struct bgp *bgp;
@ -246,11 +263,12 @@ static void bgp_mac_rescan_all_evpn_tables(void)
struct bgp_table *table = bgp->rib[AFI_L2VPN][SAFI_EVPN];
if (table)
bgp_mac_rescan_evpn_table(bgp);
bgp_mac_rescan_evpn_table(bgp, macaddr);
}
}
static void bgp_mac_remove_ifp_internal(struct bgp_self_mac *bsm, char *ifname)
static void bgp_mac_remove_ifp_internal(struct bgp_self_mac *bsm, char *ifname,
struct ethaddr *macaddr)
{
struct listnode *node = NULL;
char *name;
@ -270,7 +288,7 @@ static void bgp_mac_remove_ifp_internal(struct bgp_self_mac *bsm, char *ifname)
list_delete(&bsm->ifp_list);
XFREE(MTYPE_BSM, bsm);
bgp_mac_rescan_all_evpn_tables();
bgp_mac_rescan_all_evpn_tables(macaddr);
}
}
@ -294,7 +312,8 @@ void bgp_mac_add_mac_entry(struct interface *ifp)
listnode_add(bsm->ifp_list, ifname);
if (old_bsm)
bgp_mac_remove_ifp_internal(old_bsm, ifname);
bgp_mac_remove_ifp_internal(old_bsm, ifname,
&old_bsm->macaddr);
} else {
/*
* If old mac address is the same as the new,
@ -306,12 +325,13 @@ void bgp_mac_add_mac_entry(struct interface *ifp)
}
if (old_bsm)
bgp_mac_remove_ifp_internal(old_bsm, ifp->name);
bgp_mac_remove_ifp_internal(old_bsm, ifp->name,
&old_bsm->macaddr);
listnode_add(bsm->ifp_list, ifname);
}
bgp_mac_rescan_all_evpn_tables();
bgp_mac_rescan_all_evpn_tables(&bsm->macaddr);
}
void bgp_mac_del_mac_entry(struct interface *ifp)
@ -328,7 +348,7 @@ void bgp_mac_del_mac_entry(struct interface *ifp)
* Write code to allow old mac address to no-longer
* win if we happen to have received it from a peer.
*/
bgp_mac_remove_ifp_internal(bsm, ifp->name);
bgp_mac_remove_ifp_internal(bsm, ifp->name, &bsm->macaddr);
}
/* This API checks MAC address against any of local