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

1. ospf_opaque_type10_lsa_term (area) - was being called after

Browse Source 
ospf_lsdb_free had been called. (efence caught this one).

This bug is present in zebra.org CVS

2. It fixes my previous ospf_network_match_iface patch ([zebra 17352])
- i lost a couple of checks in ospf_network_run() by mistake. this
patch isnt in zebra.org CVS, but it would be nice to have it once it
works.

This hopefully fixes the 'assert rn->info' problems people had with
zebra-pj yesterday.
This commit is contained in:
paul 2003-02-18 23:26:37 +00:00
parent 8c80cb7ee9
commit cb3f37d276
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ospfd/ospfd.c
View File

@ -472,14 +472,12 @@ ospf_area_free (struct ospf_area *area)
ospf_lsa_discard_callback);
foreach_lsa (OPAQUE_LINK_LSDB (area), area->lsdb, 0,
ospf_lsa_discard_callback);
ospf_opaque_type10_lsa_term (area);
#endif /* HAVE_OPAQUE_LSA */
ospf_lsdb_delete_all (area->lsdb);
ospf_lsdb_free (area->lsdb);
#ifdef HAVE_OPAQUE_LSA
ospf_opaque_type10_lsa_term (area);
#endif /* HAVE_OPAQUE_LSA */
ospf_lsa_unlock (area->router_lsa_self);
route_table_finish (area->ranges);
@ -722,8 +720,11 @@ ospf_network_run (struct ospf *ospf, struct prefix *p, struct ospf_area *area)
else
addr = co->address;
if (ospf_network_match_iface(co,p))
if (p->family == co->address->family
&& ! ospf_if_is_configured (&(addr->u.prefix4))
&& ospf_network_match_iface(co,p))
{
assert(co);
struct ospf_interface *oi;
oi = ospf_if_new (ifp, co->address);