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

Merge pull request #2255 from donaldsharp/rt_netlink_dirty_bits

Browse Source 
Some Valgrind issues found
This commit is contained in:
Russ White 2018-05-18 02:37:54 -04:00 committed by GitHub
commit c66932f7e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bgpd/bgp_evpn.c
View File

@ -327,6 +327,12 @@ static int evpn_route_target_cmp(struct ecommunity *ecom1,
return strcmp(ecom1->str, ecom2->str); return strcmp(ecom1->str, ecom2->str);
} }
static void evpn_xxport_delete_ecomm(void *val)
{
struct ecommunity *ecomm = val;
ecommunity_free(&ecomm);
}
/* /*
* Mask off global-admin field of specified extended community (RT), * Mask off global-admin field of specified extended community (RT),
* just retain the local-admin field. * just retain the local-admin field.
@ -3240,8 +3246,6 @@ static void bgp_evpn_handle_export_rt_change_for_vrf(struct bgp *bgp_vrf)
static void update_autort_vni(struct hash_backet *backet, struct bgp *bgp) static void update_autort_vni(struct hash_backet *backet, struct bgp *bgp)
{ {
struct bgpevpn *vpn = backet->data; struct bgpevpn *vpn = backet->data;
struct listnode *node, *nnode;
struct ecommunity *ecom;
if (!vpn) { if (!vpn) {
zlog_warn("%s: VNI hash entry for VNI not found", __PRETTY_FUNCTION__); zlog_warn("%s: VNI hash entry for VNI not found", __PRETTY_FUNCTION__);
@ -3252,16 +3256,12 @@ static void update_autort_vni(struct hash_backet *backet, struct bgp *bgp)
if (is_vni_live(vpn)) if (is_vni_live(vpn))
bgp_evpn_uninstall_routes(bgp, vpn); bgp_evpn_uninstall_routes(bgp, vpn);
bgp_evpn_unmap_vni_from_its_rts(bgp, vpn); bgp_evpn_unmap_vni_from_its_rts(bgp, vpn);
for (ALL_LIST_ELEMENTS(vpn->import_rtl, node, nnode, ecom))
ecommunity_free(&ecom);
list_delete_all_node(vpn->import_rtl); list_delete_all_node(vpn->import_rtl);
bgp_evpn_derive_auto_rt_import(bgp, vpn); bgp_evpn_derive_auto_rt_import(bgp, vpn);
if (is_vni_live(vpn)) if (is_vni_live(vpn))
bgp_evpn_install_routes(bgp, vpn); bgp_evpn_install_routes(bgp, vpn);
} }
if (!is_export_rt_configured(vpn)) { if (!is_export_rt_configured(vpn)) {
for (ALL_LIST_ELEMENTS(vpn->export_rtl, node, nnode, ecom))
ecommunity_free(&ecom);
list_delete_all_node(vpn->export_rtl); list_delete_all_node(vpn->export_rtl);
bgp_evpn_derive_auto_rt_export(bgp, vpn); bgp_evpn_derive_auto_rt_export(bgp, vpn);
if (is_vni_live(vpn)) if (is_vni_live(vpn))
@ -4100,8 +4100,10 @@ struct bgpevpn *bgp_evpn_new(struct bgp *bgp, vni_t vni,
/* Initialize route-target import and export lists */ /* Initialize route-target import and export lists */
vpn->import_rtl = list_new(); vpn->import_rtl = list_new();
vpn->import_rtl->cmp = (int (*)(void *, void *))evpn_route_target_cmp; vpn->import_rtl->cmp = (int (*)(void *, void *))evpn_route_target_cmp;
vpn->import_rtl->del = evpn_xxport_delete_ecomm;
vpn->export_rtl = list_new(); vpn->export_rtl = list_new();
vpn->export_rtl->cmp = (int (*)(void *, void *))evpn_route_target_cmp; vpn->export_rtl->cmp = (int (*)(void *, void *))evpn_route_target_cmp;
vpn->export_rtl->del = evpn_xxport_delete_ecomm;
bf_assign_index(bm->rd_idspace, vpn->rd_id); bf_assign_index(bm->rd_idspace, vpn->rd_id);
derive_rd_rt_for_vni(bgp, vpn); derive_rd_rt_for_vni(bgp, vpn);
@ -4651,10 +4653,11 @@ void bgp_evpn_init(struct bgp *bgp)
bgp->vrf_import_rtl = list_new(); bgp->vrf_import_rtl = list_new();
bgp->vrf_import_rtl->cmp = bgp->vrf_import_rtl->cmp =
(int (*)(void *, void *))evpn_route_target_cmp; (int (*)(void *, void *))evpn_route_target_cmp;
bgp->vrf_import_rtl->del = evpn_xxport_delete_ecomm;
bgp->vrf_export_rtl = list_new(); bgp->vrf_export_rtl = list_new();
bgp->vrf_export_rtl->cmp = bgp->vrf_export_rtl->cmp =
(int (*)(void *, void *))evpn_route_target_cmp; (int (*)(void *, void *))evpn_route_target_cmp;
bgp->vrf_export_rtl->del = evpn_xxport_delete_ecomm;
bgp->l2vnis = list_new(); bgp->l2vnis = list_new();
bgp->l2vnis->cmp = (int (*)(void *, void *))vni_hash_cmp; bgp->l2vnis->cmp = (int (*)(void *, void *))vni_hash_cmp;
} }

15
zebra/rt_netlink.c
View File

@ -1308,8 +1308,7 @@ static int netlink_neigh_update(int cmd, int ifindex, uint32_t addr, char *lla,
struct zebra_ns *zns = zebra_ns_lookup(ns_id); struct zebra_ns *zns = zebra_ns_lookup(ns_id);
memset(&req.n, 0, sizeof(req.n)); memset(&req, 0, sizeof(req));
memset(&req.ndm, 0, sizeof(req.ndm));
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
req.n.nlmsg_flags = NLM_F_CREATE | NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_CREATE | NLM_F_REQUEST;
@ -1666,8 +1665,7 @@ int kernel_get_ipmr_sg_stats(struct zebra_vrf *zvrf, void *in)
struct zebra_ns *zns; struct zebra_ns *zns;
zns = zvrf->zns; zns = zvrf->zns;
memset(&req.n, 0, sizeof(req.n)); memset(&req, 0, sizeof(req));
memset(&req.ndm, 0, sizeof(req.ndm));
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
req.n.nlmsg_flags = NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_REQUEST;
@ -1759,8 +1757,7 @@ static int netlink_vxlan_flood_list_update(struct interface *ifp,
struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(ifp->vrf_id); struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(ifp->vrf_id);
zns = zvrf->zns; zns = zvrf->zns;
memset(&req.n, 0, sizeof(req.n)); memset(&req, 0, sizeof(req));
memset(&req.ndm, 0, sizeof(req.ndm));
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
req.n.nlmsg_flags = NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_REQUEST;
@ -2075,8 +2072,7 @@ static int netlink_macfdb_update(struct interface *ifp, vlanid_t vid,
return -1; return -1;
} }
memset(&req.n, 0, sizeof(req.n)); memset(&req, 0, sizeof(req));
memset(&req.ndm, 0, sizeof(req.ndm));
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
req.n.nlmsg_flags = NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_REQUEST;
@ -2392,8 +2388,7 @@ static int netlink_neigh_update2(struct interface *ifp, struct ipaddr *ip,
struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(ifp->vrf_id); struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(ifp->vrf_id);
zns = zvrf->zns; zns = zvrf->zns;
memset(&req.n, 0, sizeof(req.n)); memset(&req, 0, sizeof(req));
memset(&req.ndm, 0, sizeof(req.ndm));
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
req.n.nlmsg_flags = NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_REQUEST;