diff options
| author | paul <paul> | 2005-10-18 04:20:33 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-10-18 04:20:33 +0000 |
| commit | eb3da6dfa92be8083bbe1b4436818754be158b93 (patch) | |
| tree | 72067c3eb6ec2f5fd1678d555062424f163c6599 /lib | |
| parent | 3623814abc4df8435d2fc50697c6d7fc66f21088 (diff) | |
2005-10-18 Paul Jakma <paul.jakma@sun.com>
* (general) SPF memory management cleanup and fix for rare
double-free bug.
* ospf_spf.h: (struct vertex_parent) New struct to hold parent
specific data, eg the backlink and the parent vertex pointer,
and point to the appropriate general struct vertex_nexthop.
(struct vertex_nexthop) remove parent vertex pointer, so
this struct can be shared across vertices.
(struct vertex) rename list child to list children. Remove
list of nexthops, replace with list of vertex_parents.
* ospf_spf.c: (update_stat) trivial, remove cast from void *.
(vertex_nexthop_new) remove init of parent - field is gone
from struct vertex_nexthop.
(ospf_canonical_nexthops_free) Remove the canonical
vertex_nexthop memory objects. These are the vertex_nexthops
attached to the first level of router vertices from the root.
(vertex_parent_new) new function, create a vertex_parent.
(vertex_parent_free) ditto, but free it.
(ospf_vertex_new) Update to match changes to struct vertex.
(ospf_vertex_free) Recursively free a struct vertex and its
children. The parent list is used as a reference count.
vertex_nexthops must be free seperately, if required.
(ospf_vertex_dump) update to match struct vertex changes.
Print out backlink of parents too.
(ospf_vertex_add_parent) ditto.
(ospf_lsa_has_link) update comment.
(ospf_nexthop_add_unique) removed, not needed anymore.
(ospf_nexthop_merge) ditto.
(ospf_spf_consider_nexthop) renamed to ospf_spf_add_parent.
Simplified to just create vertex_parent and add it.
(ospf_spf_flush_parents) new function, flush out the parent
list.
(ospf_nexthop_calculation) Take the relevant route_lsa_link
as an argument, which simplifies things and removes the need
for the hack in ospf_nexthop_add_unique - ospf_spf_next
already knew exactly which link the cost calculated was for.
Update to match struct vertex changes too.
(ospf_spf_next) Don't create a vertex for W unnecessarily, if
it's there's a vertex already created for W, use it, and
hence there's no need to free it either.
Update some manipulation/comparisons of distance to match.
Flush the parent list if a lower cost path is found.
(ospf_spf_route_free) unused, removed.
(ospf_spf_dump) match the struct vertex changes, and dump the
ifname if possible.
(ospf_spf_calculate) At end of SPF, free the canonical nexthops
and call ospf_vertex_free on the root vertex to free the
entire tree.
* ospf_interface.c: (ospf_vl_set_params) match struct vertex
changes.
* ospf_route.c: (ospf_intra_route_add) ditto
(ospf_route_copy_nexthops_from_vertex) ditto
* memtypes.c: (memory_list_ospf) Add MTYPE_OSPF_VERTEX_PARENT.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ChangeLog | 4 | ||||
| -rw-r--r-- | lib/memtypes.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 956b10eb..aea7e87d 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2005-10-18 Paul Jakma <paul.jakma@sun.com> + + * memtypes.c: (memory_list_ospf) Add MTYPE_OSPF_VERTEX_PARENT. + 2005-10-01 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * zebra.h: Declare new functions zebra_route_string() and diff --git a/lib/memtypes.c b/lib/memtypes.c index 45c07dad..f7c07fbb 100644 --- a/lib/memtypes.c +++ b/lib/memtypes.c @@ -6,7 +6,7 @@ * The script is sensitive to the format (though not whitespace), see * the top of memtypes.awk for more details. * - * $Id: memtypes.c,v 1.7 2005/09/21 14:06:35 paul Exp $ + * $Id: memtypes.c,v 1.8 2005/10/18 04:20:33 paul Exp $ */ #include "zebra.h" @@ -182,6 +182,7 @@ struct memory_list memory_list_ospf[] = { MTYPE_OSPF_PACKET, "OSPF packet" }, { MTYPE_OSPF_FIFO, "OSPF FIFO queue" }, { MTYPE_OSPF_VERTEX, "OSPF vertex" }, + { MTYPE_OSPF_VERTEX_PARENT, "OSPF vertex parent", }, { MTYPE_OSPF_NEXTHOP, "OSPF nexthop" }, { MTYPE_OSPF_PATH, "OSPF path" }, { MTYPE_OSPF_VL_DATA, "OSPF VL data" }, |