summaryrefslogtreecommitdiff
path: root/ospfd/ospf_ase.c
diff options
context:
space:
mode:
authorpaul <paul>2003-08-10 02:51:22 +0000
committerpaul <paul>2003-08-10 02:51:22 +0000
commit96735eeafe4713b60700915dd2fb6dcbd0f09c8f (patch)
tree49b7f583956e3d7ad91dcfa006d18e20f57efe15 /ospfd/ospf_ase.c
parent286e1e71538440ed0bef4576aded1745191490d3 (diff)
2003-08-10 amir <amir@datacore.ch>
* Add missing 'i' to getopts, short form of --pid_file. see http://bugzilla.quagga.net/show_bug.cgi?id=25
Diffstat (limited to 'ospfd/ospf_ase.c')
-rw-r--r--ospfd/ospf_ase.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c
index 5605933b..db43e102 100644
--- a/ospfd/ospf_ase.c
+++ b/ospfd/ospf_ase.c
@@ -141,7 +141,7 @@ ospf_ase_complete_direct_routes (struct ospf_route *ro, struct in_addr nexthop)
listnode node;
struct ospf_path *op;
- for (node = listhead (ro->path); node; nextnode (node))
+ for (node = listhead (ro->paths); node; nextnode (node))
if ((op = getdata (node)) != NULL)
if (op->nexthop.s_addr == 0)
op->nexthop.s_addr = nexthop.s_addr;
@@ -268,7 +268,6 @@ ospf_ase_calculate_new_route (struct ospf_lsa *lsa,
}
new->type = OSPF_DESTINATION_NETWORK;
- new->path = list_new ();
new->u.ext.origin = lsa;
new->u.ext.tag = ntohl (al->e[0].route_tag);
new->u.ext.asbr = asbr_route;
@@ -511,7 +510,7 @@ ospf_ase_calculate_route (struct ospf *ospf, struct ospf_lsa * lsa)
else
{
zlog_info ("Route[External]: Routes are equal");
- ospf_route_copy_nexthops (or, asbr_route->path);
+ ospf_route_copy_nexthops (or, asbr_route->paths);
if (al->e[0].fwd_addr.s_addr)
ospf_ase_complete_direct_routes (or, al->e[0].fwd_addr);
}
@@ -565,11 +564,11 @@ ospf_ase_route_match_same (struct route_table *rt, struct prefix *prefix,
return 0;
}
- if (or->path->count != newor->path->count)
+ if (or->paths->count != newor->paths->count)
return 0;
/* Check each path. */
- for (n1 = listhead (or->path), n2 = listhead (newor->path);
+ for (n1 = listhead (or->paths), n2 = listhead (newor->paths);
n1 && n2; nextnode (n1), nextnode (n2))
{
op = getdata (n1);