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

Merge pull request #466 from dslicenc/aggregate

Browse Source 
bgpd: resolve crash in workqueue processing due to invalid safi
This commit is contained in:
Lou Berger 2017-05-05 15:54:11 -04:00 committed by GitHub
commit 8655cadeb5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bgpd/bgp_route.c
View File

@ -5757,11 +5757,11 @@ bgp_aggregate_unset (struct vty *vty, const char *prefix_str,
} }
aggregate = rn->info; aggregate = rn->info;
if (aggregate->safi & SAFI_UNICAST) if (aggregate->safi == SAFI_UNICAST)
bgp_aggregate_delete (bgp, &p, afi, SAFI_UNICAST, aggregate); bgp_aggregate_delete (bgp, &p, afi, SAFI_UNICAST, aggregate);
if (aggregate->safi & SAFI_LABELED_UNICAST) if (aggregate->safi == SAFI_LABELED_UNICAST)
bgp_aggregate_delete (bgp, &p, afi, SAFI_LABELED_UNICAST, aggregate); bgp_aggregate_delete (bgp, &p, afi, SAFI_LABELED_UNICAST, aggregate);
if (aggregate->safi & SAFI_MULTICAST) if (aggregate->safi == SAFI_MULTICAST)
bgp_aggregate_delete (bgp, &p, afi, SAFI_MULTICAST, aggregate); bgp_aggregate_delete (bgp, &p, afi, SAFI_MULTICAST, aggregate);
/* Unlock aggregate address configuration. */ /* Unlock aggregate address configuration. */
@ -5817,11 +5817,11 @@ bgp_aggregate_set (struct vty *vty, const char *prefix_str,
rn->info = aggregate; rn->info = aggregate;
/* Aggregate address insert into BGP routing table. */ /* Aggregate address insert into BGP routing table. */
if (safi & SAFI_UNICAST) if (safi == SAFI_UNICAST)
bgp_aggregate_add (bgp, &p, afi, SAFI_UNICAST, aggregate); bgp_aggregate_add (bgp, &p, afi, SAFI_UNICAST, aggregate);
if (safi & SAFI_LABELED_UNICAST) if (safi == SAFI_LABELED_UNICAST)
bgp_aggregate_add (bgp, &p, afi, SAFI_LABELED_UNICAST, aggregate); bgp_aggregate_add (bgp, &p, afi, SAFI_LABELED_UNICAST, aggregate);
if (safi & SAFI_MULTICAST) if (safi == SAFI_MULTICAST)
bgp_aggregate_add (bgp, &p, afi, SAFI_MULTICAST, aggregate); bgp_aggregate_add (bgp, &p, afi, SAFI_MULTICAST, aggregate);
return CMD_SUCCESS; return CMD_SUCCESS;
@ -5910,7 +5910,7 @@ DEFUN (no_aggregate_address_mask,
int idx = 0; int idx = 0;
argv_find (argv, argc, "A.B.C.D", &idx); argv_find (argv, argc, "A.B.C.D", &idx);
char *prefix = argv[idx]->arg; char *prefix = argv[idx]->arg;
char *mask = argv[idx++]->arg; char *mask = argv[idx+1]->arg;
char prefix_str[BUFSIZ]; char prefix_str[BUFSIZ];
int ret = netmask_str2prefix_str (prefix, mask, prefix_str); int ret = netmask_str2prefix_str (prefix, mask, prefix_str);