proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-24 07:56:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: maintain the mcast-grp per-l2vni

Browse Source 
This info is propagated to bgpd for appropriate IMET route generation.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
This commit is contained in:
Anuradha Karuppiah 2019-03-19 09:10:47 -07:00
parent d7fe235c1b
commit 39c46ff136
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zebra/zebra_vxlan.c
View File

@ -1858,12 +1858,16 @@ static void zvni_print(zebra_vni_t *zvni, void **ctxt)
vty_out(vty, " VxLAN ifIndex: %u\n", zvni->vxlan_if->ifindex); vty_out(vty, " VxLAN ifIndex: %u\n", zvni->vxlan_if->ifindex);
vty_out(vty, " Local VTEP IP: %s\n", vty_out(vty, " Local VTEP IP: %s\n",
inet_ntoa(zvni->local_vtep_ip)); inet_ntoa(zvni->local_vtep_ip));
vty_out(vty, " Mcast group: %s\n",
inet_ntoa(zvni->mcast_grp));
} else { } else {
json_object_string_add(json, "vxlanInterface", json_object_string_add(json, "vxlanInterface",
zvni->vxlan_if->name); zvni->vxlan_if->name);
json_object_int_add(json, "ifindex", zvni->vxlan_if->ifindex); json_object_int_add(json, "ifindex", zvni->vxlan_if->ifindex);
json_object_string_add(json, "vtepIp", json_object_string_add(json, "vtepIp",
inet_ntoa(zvni->local_vtep_ip)); inet_ntoa(zvni->local_vtep_ip));
json_object_string_add(json, "mcastGroup",
inet_ntoa(zvni->mcast_grp));
json_object_string_add(json, "advertiseGatewayMacip", json_object_string_add(json, "advertiseGatewayMacip",
zvni->advertise_gw_macip ? "Yes" : "No"); zvni->advertise_gw_macip ? "Yes" : "No");
json_object_int_add(json, "numMacs", num_macs); json_object_int_add(json, "numMacs", num_macs);
@ -3916,6 +3920,7 @@ static int zvni_send_add_to_client(zebra_vni_t *zvni)
stream_putl(s, zvni->vni); stream_putl(s, zvni->vni);
stream_put_in_addr(s, &zvni->local_vtep_ip); stream_put_in_addr(s, &zvni->local_vtep_ip);
stream_put(s, &zvni->vrf_id, sizeof(vrf_id_t)); /* tenant vrf */ stream_put(s, &zvni->vrf_id, sizeof(vrf_id_t)); /* tenant vrf */
stream_put_in_addr(s, &zvni->mcast_grp);
/* Write packet size. */ /* Write packet size. */
stream_putw_at(s, 0, stream_get_endp(s)); stream_putw_at(s, 0, stream_get_endp(s));
@ -4039,6 +4044,7 @@ static void zvni_build_hash_table(void)
} }
zvni->local_vtep_ip = vxl->vtep_ip; zvni->local_vtep_ip = vxl->vtep_ip;
zvni->mcast_grp = vxl->mcast_grp;
zvni->vxlan_if = ifp; zvni->vxlan_if = ifp;
vlan_if = zvni_map_to_svi(vxl->access_vlan, vlan_if = zvni_map_to_svi(vxl->access_vlan,
zif->brslave_info.br_if); zif->brslave_info.br_if);
@ -8477,6 +8483,7 @@ int zebra_vxlan_if_update(struct interface *ifp, uint16_t chgflags)
} }
zvni->local_vtep_ip = vxl->vtep_ip; zvni->local_vtep_ip = vxl->vtep_ip;
zvni->mcast_grp = vxl->mcast_grp;
zvni->vxlan_if = ifp; zvni->vxlan_if = ifp;
/* Take further actions needed. /* Take further actions needed.
@ -8488,7 +8495,9 @@ int zebra_vxlan_if_update(struct interface *ifp, uint16_t chgflags)
/* Inform BGP, if there is a change of interest. */ /* Inform BGP, if there is a change of interest. */
if (chgflags if (chgflags
& (ZEBRA_VXLIF_MASTER_CHANGE | ZEBRA_VXLIF_LOCAL_IP_CHANGE)) & (ZEBRA_VXLIF_MASTER_CHANGE |
ZEBRA_VXLIF_LOCAL_IP_CHANGE |
ZEBRA_VXLIF_MCAST_GRP_CHANGE))
zvni_send_add_to_client(zvni); zvni_send_add_to_client(zvni);
/* If there is a valid new master or a VLAN mapping change, /* If there is a valid new master or a VLAN mapping change,
@ -8579,6 +8588,7 @@ int zebra_vxlan_if_add(struct interface *ifp)
} }
zvni->local_vtep_ip = vxl->vtep_ip; zvni->local_vtep_ip = vxl->vtep_ip;
zvni->mcast_grp = vxl->mcast_grp;
zvni->vxlan_if = ifp; zvni->vxlan_if = ifp;
vlan_if = zvni_map_to_svi(vxl->access_vlan, vlan_if = zvni_map_to_svi(vxl->access_vlan,
zif->brslave_info.br_if); zif->brslave_info.br_if);
@ -8589,15 +8599,24 @@ int zebra_vxlan_if_add(struct interface *ifp)
listnode_add_sort(zl3vni->l2vnis, zvni); listnode_add_sort(zl3vni->l2vnis, zvni);
} }
if (IS_ZEBRA_DEBUG_VXLAN) if (IS_ZEBRA_DEBUG_VXLAN) {
char addr_buf1[INET_ADDRSTRLEN];
char addr_buf2[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &vxl->vtep_ip,
addr_buf1, INET_ADDRSTRLEN);
inet_ntop(AF_INET, &vxl->mcast_grp,
addr_buf2, INET_ADDRSTRLEN);
zlog_debug( zlog_debug(
"Add L2-VNI %u VRF %s intf %s(%u) VLAN %u local IP %s master %u", "Add L2-VNI %u VRF %s intf %s(%u) VLAN %u local IP %s mcast %s master %u",
vni, vni,
vlan_if ? vrf_id_to_name(vlan_if->vrf_id) vlan_if ? vrf_id_to_name(vlan_if->vrf_id)
: VRF_DEFAULT_NAME, : VRF_DEFAULT_NAME,
ifp->name, ifp->ifindex, vxl->access_vlan, ifp->name, ifp->ifindex, vxl->access_vlan,
inet_ntoa(vxl->vtep_ip), addr_buf1, addr_buf2,
zif->brslave_info.bridge_ifindex); zif->brslave_info.bridge_ifindex);
}
/* If down or not mapped to a bridge, we're done. */ /* If down or not mapped to a bridge, we're done. */
if (!if_is_operative(ifp) || !zif->brslave_info.br_if) if (!if_is_operative(ifp) || !zif->brslave_info.br_if)