void ospf_route_free(struct ospf_route * or)
{
if (or->paths)
- list_delete_and_null(&or->paths);
+ list_delete(& or->paths);
XFREE(MTYPE_OSPF_ROUTE, or);
}
for (rn = route_top(rt); rn; rn = route_next(rn))
if ((or = rn->info) != NULL) {
if (or->type == OSPF_DESTINATION_NETWORK)
- ospf_zebra_delete(ospf,
- (struct prefix_ipv4 *)&rn->p,
- or);
+ ospf_zebra_delete(
+ ospf, (struct prefix_ipv4 *)&rn->p, or);
else if (or->type == OSPF_DESTINATION_DISCARD)
- ospf_zebra_delete_discard(ospf,
- (struct prefix_ipv4 *)&rn->p);
+ ospf_zebra_delete_discard(
+ ospf, (struct prefix_ipv4 *)&rn->p);
}
}
/* Check each path. */
for (n1 = listhead(or->paths),
n2 = listhead(newor->paths);
- n1 && n2;
- n1 = listnextnode(n1), n2 = listnextnode(n2)) {
+ n1 && n2; n1 = listnextnode_unchecked(n1),
+ n2 = listnextnode_unchecked(n2)) {
op = listgetdata(n1);
newop = listgetdata(n2);
cmprt,
(struct prefix_ipv4 *)&rn
->p))
- ospf_zebra_delete(ospf,
+ ospf_zebra_delete(
+ ospf,
(struct prefix_ipv4
*)&rn->p,
or);
cmprt,
(struct prefix_ipv4 *)&rn
->p))
- ospf_zebra_delete_discard(ospf,
+ ospf_zebra_delete_discard(
+ ospf,
(struct prefix_ipv4
*)&rn->p);
}
if (!ospf_route_match_same(
ospf->old_table,
(struct prefix_ipv4 *)&rn->p, or))
- ospf_zebra_add(ospf,
+ ospf_zebra_add(
+ ospf,
(struct prefix_ipv4 *)&rn->p,
or);
} else if (or->type == OSPF_DESTINATION_DISCARD)
if (!ospf_route_match_same(
ospf->old_table,
(struct prefix_ipv4 *)&rn->p, or))
- ospf_zebra_add_discard(ospf,
+ ospf_zebra_add_discard(
+ ospf,
(struct prefix_ipv4 *)&rn->p);
}
}
struct vertex *v, struct ospf_area *area,
int parent_is_root, int lsa_pos)
{
- u_int32_t cost;
+ uint32_t cost;
struct route_node *rn;
struct ospf_route * or ;
struct prefix_ipv4 p;
static int ospf_asbr_route_cmp(struct ospf *ospf, struct ospf_route *r1,
struct ospf_route *r2)
{
- u_char r1_type, r2_type;
+ uint8_t r1_type, r2_type;
r1_type = r1->path_type;
r2_type = r2->path_type;
zlog_debug("Pruning router node %s",
inet_ntoa(rn->p.u.prefix4));
- list_delete_and_null(&paths);
+ list_delete(&paths);
rn->info = NULL;
route_unlock_node(rn);
}
}
int ospf_add_discard_route(struct ospf *ospf, struct route_table *rt,
- struct ospf_area *area,
- struct prefix_ipv4 *p)
+ struct ospf_area *area, struct prefix_ipv4 *p)
{
struct route_node *rn;
struct ospf_route * or, *new_or;