proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-01 12:50:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* ospf_zebra.c: Don't assert/stop before type == ZEBRA_ROUTE_MAX if

Browse Source 
dealing with routemaps. There is ospf->route_map[ZEBRA_ROUTE_MAX]
	  for default-information.

	Fixes bugzilla #208.
	[backport candidate]
This commit is contained in:
hasso 2005-08-05 07:40:15 +00:00
parent e279c7a6f3
commit 01018ce479
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ospfd/ChangeLog
View File

@ -1,3 +1,9 @@
2005-08-05 Hasso Tepper <hasso at quagga.net>
* ospf_zebra.c: Don't assert/stop before type == ZEBRA_ROUTE_MAX if
dealing with routemaps. There is ospf->route_map[ZEBRA_ROUTE_MAX]
for default-information.
2005-07-26 Paul Jakma <paul.jakma@sun.com> 2005-07-26 Paul Jakma <paul.jakma@sun.com>
* ospf_abr.c: (ospf_abr_announce_network_to_area) SET_FLAG * ospf_abr.c: (ospf_abr_announce_network_to_area) SET_FLAG

10
ospfd/ospf_zebra.c
View File

@ -927,7 +927,7 @@ ospf_distribute_list_update_timer (struct thread *thread)
struct ospf *ospf; struct ospf *ospf;
type = (intptr_t)THREAD_ARG (thread); type = (intptr_t)THREAD_ARG (thread);
assert (type < ZEBRA_ROUTE_MAX); assert (type <= ZEBRA_ROUTE_MAX);
rt = EXTERNAL_INFO (type); rt = EXTERNAL_INFO (type);
@ -992,7 +992,7 @@ ospf_filter_update (struct access_list *access)
return; return;
/* Update distribute-list, and apply filter. */ /* Update distribute-list, and apply filter. */
for (type = 0; type < ZEBRA_ROUTE_MAX; type++) for (type = 0; type <= ZEBRA_ROUTE_MAX; type++)
{ {
if (ROUTEMAP (ospf, type) != NULL) if (ROUTEMAP (ospf, type) != NULL)
{ {
@ -1001,6 +1001,10 @@ ospf_filter_update (struct access_list *access)
continue; continue;
} }
/* There is place for route-map for default-information (ZEBRA_ROUTE_MAX),
* but no distribute list. */
if (type == ZEBRA_ROUTE_MAX)
break;
if (DISTRIBUTE_NAME (ospf, type)) if (DISTRIBUTE_NAME (ospf, type))
{ {
@ -1061,7 +1065,7 @@ ospf_prefix_list_update (struct prefix_list *plist)
/* Update all route-maps which are used as redistribution filters. /* Update all route-maps which are used as redistribution filters.
* They might use prefix-list. * They might use prefix-list.
*/ */
for (type = 0; type < ZEBRA_ROUTE_MAX; type++) for (type = 0; type <= ZEBRA_ROUTE_MAX; type++)
{ {
if (ROUTEMAP (ospf, type) != NULL) if (ROUTEMAP (ospf, type) != NULL)
{ {