diff options
| author | Paul Jakma <paul.jakma@hpe.com> | 2016-01-18 10:12:10 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@hpe.com> | 2016-02-26 14:11:46 +0000 |
| commit | 9099f9b2a66e86f8a90d7fe18f61bd2bb1bc6744 (patch) | |
| tree | 1ce5d2e4ecff6b57eb00d40b1a91b3f363ff35fe /ospf6d/ospf6_spf.c | |
| parent | 954c7d6bcd04c2cf037965adda0f9d11afdcd165 (diff) | |
| download | quagga-9099f9b2a66e86f8a90d7fe18f61bd2bb1bc6744.tar.bz2 quagga-9099f9b2a66e86f8a90d7fe18f61bd2bb1bc6744.tar.xz | |
*: use an ifindex_t type, defined in lib/if.h, for ifindex values
Diffstat (limited to 'ospf6d/ospf6_spf.c')
| -rw-r--r-- | ospf6d/ospf6_spf.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 88e12853..858398eb 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -225,7 +225,8 @@ static void ospf6_nexthop_calc (struct ospf6_vertex *w, struct ospf6_vertex *v, caddr_t lsdesc) { - int i, ifindex; + int i; + ifindex_t ifindex; struct ospf6_interface *oi; u_int16_t type; u_int32_t adv_router; @@ -235,7 +236,10 @@ ospf6_nexthop_calc (struct ospf6_vertex *w, struct ospf6_vertex *v, assert (VERTEX_IS_TYPE (ROUTER, w)); ifindex = (VERTEX_IS_TYPE (NETWORK, v) ? v->nexthop[0].ifindex : - ROUTER_LSDESC_GET_IFID (lsdesc)); + /* v is the local router & the interface_id is a local ifindex */ + (ifindex_t) ROUTER_LSDESC_GET_IFID (lsdesc)); + assert (ifindex >= 0); + oi = ospf6_interface_lookup_by_ifindex (ifindex); if (oi == NULL) { |