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

[ospfd] CID #28, remove another ospf_lookup call - ospf_redistribute_withdraw

Browse Source 
2006-05-12 Paul Jakma <paul.jakma@sun.com>

	* ospf_asbr.c: (ospf_redistribute_withdraw) remove ospf_lookup
	  call by taking the struct ospf * as argument, which the
	  caller has, fixing CID #28.
	* ospf_asbr.h: (ospf_redistribute_withdraw) update declaration
	* ospf_zebra.c: (ospf_redistribute_unset) update call to
	  ospf_redistribute_withdraw to match.
This commit is contained in:
Paul Jakma 2006-05-12 23:02:46 +00:00
parent e43be0edb7
commit 6db3a6f75c
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ospfd/ChangeLog
View File

@ -7,6 +7,12 @@
(struct lsa_action) remove unused member.
* ospf_interface.c: (ospf_if_exists) Fix missing NULL return
check on ospf_lookup, CID #27.
* ospf_asbr.c: (ospf_redistribute_withdraw) remove ospf_lookup
call by taking the struct ospf * as argument, which the
caller has, fixing CID #28.
* ospf_asbr.h: (ospf_redistribute_withdraw) update declaration
* ospf_zebra.c: (ospf_redistribute_unset) update call to
ospf_redistribute_withdraw to match.
2006-05-11 Paul Jakma <paul.jakma@sun.com>

5
ospfd/ospf_asbr.c
View File

@ -270,14 +270,11 @@ ospf_asbr_status_update (struct ospf *ospf, u_char status)
}
void
ospf_redistribute_withdraw (u_char type)
ospf_redistribute_withdraw (struct ospf *ospf, u_char type)
{
struct ospf *ospf;
struct route_node *rn;
struct external_info *ei;
ospf = ospf_lookup ();
/* Delete external info for specified type. */
if (EXTERNAL_INFO (type))
for (rn = route_top (EXTERNAL_INFO (type)); rn; rn = route_next (rn))

2
ospfd/ospf_asbr.h
View File

@ -70,7 +70,7 @@ extern struct ospf_route *ospf_external_route_lookup (struct ospf *,
struct prefix_ipv4 *);
extern void ospf_asbr_status_update (struct ospf *, u_char);
extern void ospf_redistribute_withdraw (u_char);
extern void ospf_redistribute_withdraw (struct ospf *, u_char);
extern void ospf_asbr_check (void);
extern void ospf_schedule_asbr_check (void);
extern void ospf_asbr_route_install_lsa (struct ospf_lsa *);

2
ospfd/ospf_zebra.c
View File

@ -565,7 +565,7 @@ ospf_redistribute_unset (struct ospf *ospf, int type)
ospf->dmetric[type].value = -1;
/* Remove the routes from OSPF table. */
ospf_redistribute_withdraw (type);
ospf_redistribute_withdraw (ospf, type);
ospf_asbr_status_update (ospf, --ospf->redistribute);