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

2005-09-19 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

Browse Source 
* ospf_lsa.h: (ospf_external_lsa_flush) Comment out the 5th argument
	  (nexthop) since it is not used in the function (except inside
	  some commented-out code).
	* ospf_lsa.c: (ospf_external_lsa_flush,ospf_external_lsa_refresh)
	  Comment out the 5th argument to ospf_external_lsa_flush.
	* ospf_asbr.c: (ospf_redistribute_withdraw) Comment out 5th arg
	  to ospf_external_lsa_flush.
	* ospf_vty.c: (no_ospf_default_information_originate) Eliminate 5th
	  uninitialized nexthop arg to ospf_external_lsa_flush.
	* ospf_zebra.c: (ospf_zebra_read_ipv4) Comment out 5th arg
	  to ospf_external_lsa_flush.
	* ospfd.c: (ospf_network_set) Comment out 5th arg
	  to ospf_external_lsa_flush.
This commit is contained in:
ajs 2005-09-19 13:28:05 +00:00
parent f06834b805
commit 5339cfdb7c
7 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ospfd/ChangeLog
View File

@ -1,3 +1,19 @@
2005-09-19 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_lsa.h: (ospf_external_lsa_flush) Comment out the 5th argument
(nexthop) since it is not used in the function (except inside
some commented-out code).
* ospf_lsa.c: (ospf_external_lsa_flush,ospf_external_lsa_refresh)
Comment out the 5th argument to ospf_external_lsa_flush.
* ospf_asbr.c: (ospf_redistribute_withdraw) Comment out 5th arg
to ospf_external_lsa_flush.
* ospf_vty.c: (no_ospf_default_information_originate) Eliminate 5th
uninitialized nexthop arg to ospf_external_lsa_flush.
* ospf_zebra.c: (ospf_zebra_read_ipv4) Comment out 5th arg
to ospf_external_lsa_flush.
* ospfd.c: (ospf_network_set) Comment out 5th arg
to ospf_external_lsa_flush.
2005-09-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu> 2005-09-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_opaque.c: * ospf_opaque.c:

3
ospfd/ospf_asbr.c
View File

@ -287,7 +287,8 @@ ospf_redistribute_withdraw (u_char type)
if (is_prefix_default (&ei->p) && if (is_prefix_default (&ei->p) &&
ospf->default_originate != DEFAULT_ORIGINATE_NONE) ospf->default_originate != DEFAULT_ORIGINATE_NONE)
continue; continue;
ospf_external_lsa_flush (ospf, type, &ei->p, ei->ifindex, ei->nexthop); ospf_external_lsa_flush (ospf, type, &ei->p,
ei->ifindex /*, ei->nexthop */);
ospf_external_info_delete (type, ei->p); ospf_external_info_delete (type, ei->p);
} }
} }

4
ospfd/ospf_lsa.c
View File

@ -2137,7 +2137,7 @@ ospf_nssa_lsa_flush (struct ospf *ospf, struct prefix_ipv4 *p)
void void
ospf_external_lsa_flush (struct ospf *ospf, ospf_external_lsa_flush (struct ospf *ospf,
u_char type, struct prefix_ipv4 *p, u_char type, struct prefix_ipv4 *p,
unsigned int ifindex, struct in_addr nexthop) unsigned int ifindex /*, struct in_addr nexthop */)
{ {
struct ospf_lsa *lsa; struct ospf_lsa *lsa;
@ -2261,7 +2261,7 @@ ospf_external_lsa_refresh (struct ospf *ospf, struct ospf_lsa *lsa,
"redist check fail", "redist check fail",
lsa->data->type, inet_ntoa (lsa->data->id)); lsa->data->type, inet_ntoa (lsa->data->id));
ospf_external_lsa_flush (ospf, ei->type, &ei->p, ospf_external_lsa_flush (ospf, ei->type, &ei->p,
ei->ifindex, ei->nexthop); ei->ifindex /*, ei->nexthop */);
return; return;
} }

2
ospfd/ospf_lsa.h
View File

@ -272,7 +272,7 @@ extern struct ospf_lsa *ospf_lsa_install (struct ospf *,
extern void ospf_nssa_lsa_flush (struct ospf *ospf, struct prefix_ipv4 *p); extern void ospf_nssa_lsa_flush (struct ospf *ospf, struct prefix_ipv4 *p);
extern void ospf_external_lsa_flush (struct ospf *, u_char, struct prefix_ipv4 *, extern void ospf_external_lsa_flush (struct ospf *, u_char, struct prefix_ipv4 *,
unsigned int, struct in_addr); unsigned int /* , struct in_addr nexthop */);
extern struct in_addr ospf_get_ip_from_ifp (struct ospf_interface *); extern struct in_addr ospf_get_ip_from_ifp (struct ospf_interface *);

3
ospfd/ospf_vty.c
View File

@ -6054,13 +6054,12 @@ DEFUN (no_ospf_default_information_originate,
{ {
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
struct prefix_ipv4 p; struct prefix_ipv4 p;
struct in_addr nexthop;
p.family = AF_INET; p.family = AF_INET;
p.prefix.s_addr = 0; p.prefix.s_addr = 0;
p.prefixlen = 0; p.prefixlen = 0;
ospf_external_lsa_flush (ospf, DEFAULT_ROUTE, &p, 0, nexthop); ospf_external_lsa_flush (ospf, DEFAULT_ROUTE, &p, 0);
if (EXTERNAL_INFO (DEFAULT_ROUTE)) { if (EXTERNAL_INFO (DEFAULT_ROUTE)) {
ospf_external_info_delete (DEFAULT_ROUTE, p); ospf_external_info_delete (DEFAULT_ROUTE, p);

2
ospfd/ospf_zebra.c
View File

@ -869,7 +869,7 @@ ospf_zebra_read_ipv4 (int command, struct zclient *zclient,
if (is_prefix_default (&p)) if (is_prefix_default (&p))
ospf_external_lsa_refresh_default (ospf); ospf_external_lsa_refresh_default (ospf);
else else
ospf_external_lsa_flush (ospf, api.type, &p, ifindex, nexthop); ospf_external_lsa_flush (ospf, api.type, &p, ifindex /*, nexthop */);
} }
return 0; return 0;

2
ospfd/ospfd.c
View File

@ -620,7 +620,7 @@ ospf_network_set (struct ospf *ospf, struct prefix_ipv4 *p,
if (ospf_external_info_find_lsa (ospf, &ei->p)) if (ospf_external_info_find_lsa (ospf, &ei->p))
if (!ospf_distribute_check_connected (ospf, ei)) if (!ospf_distribute_check_connected (ospf, ei))
ospf_external_lsa_flush (ospf, ei->type, &ei->p, ospf_external_lsa_flush (ospf, ei->type, &ei->p,
ei->ifindex, ei->nexthop); ei->ifindex /*, ei->nexthop */);
ospf_area_check_free (ospf, area_id); ospf_area_check_free (ospf, area_id);