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

2003-06-7 kamatchi soundaram <kamatchi@tdd.sj.nec.com>

Browse Source 
* (ospf_spf.c): Fix consideration of costs for PtP nexthops in
	  ospf_nexthop_calculation().
This commit is contained in:
paul 2003-06-06 23:23:36 +00:00
parent 79cb216984
commit bf9392c6e9
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ospfd/ospf_spf.c
View File

@ -340,6 +340,37 @@ ospf_get_next_link (struct vertex *v, struct vertex *w,
return NULL; return NULL;
} }
/* Consider supplied next-hop for inclusion to the supplied list
* of next-hops, adjust list as neccessary
*/
void
ospf_spf_consider_nexthop (struct list *nexthops, struct vertex_nexthop *newhop)
{
struct listnode *nnode;
struct vertex_nexthop *hop;
LIST_LOOP (nexthops, hop, nnode)
{
assert (hop->oi);
/* weed out hops with higher cost than the newhop */
if (hop->oi->output_cost > newhop->oi->output_cost)
{
/* delete the existing nexthop */
listnode_delete (nexthops, hop);
vertex_nexthop_free (hop);
}
else if ( hop->oi->output_cost < newhop->oi->output_cost)
{
return;
}
}
/* new hop is <= existing hops, add it */
listnode_add (nexthops, newhop);
return;
}
/* Calculate nexthop from root to vertex W. */ /* Calculate nexthop from root to vertex W. */
void void
ospf_nexthop_calculation (struct ospf_area *area, ospf_nexthop_calculation (struct ospf_area *area,
@ -407,7 +438,7 @@ ospf_nexthop_calculation (struct ospf_area *area,
nh = vertex_nexthop_new (v); nh = vertex_nexthop_new (v);
nh->oi = oi; nh->oi = oi;
nh->router = l2->link_data; nh->router = l2->link_data;
listnode_add (w->nexthop, nh); ospf_spf_consider_nexthop (w->nexthop, nh);
} }
} }
} }