Update zebra_mpls.c

update

Signed-off-by: zhou-run <zhou.run@h3c.com>

zebra/zebra_mpls.c

@@ -672,9 +672,11 @@ static int nhlfe_nexthop_active_ipv4(struct zebra_nhlfe *nhlfe,
 		for (match_nh = match->nhe->nhg.nexthop; match_nh;
 		     match_nh = match_nh->next) {
 			if ((match->type == ZEBRA_ROUTE_CONNECT ||
-			     match->type == ZEBRA_ROUTE_LOCAL) &&
-			     nexthop->ifindex == match_nh->ifindex)
+			     match->type == ZEBRA_ROUTE_LOCAL) ||
+			    nexthop->ifindex == match_nh->ifindex) {
+				nexthop->ifindex = match_nh->ifindex;
 				return 1;
+			}
 		}
 	}
 
@@ -713,16 +715,18 @@ static int nhlfe_nexthop_active_ipv6(struct zebra_nhlfe *nhlfe,
 
 	/* Locate a valid connected route. */
 	RNODE_FOREACH_RE (rn, match) {
-		if ((match->type == ZEBRA_ROUTE_CONNECT ||
-		      match->type == ZEBRA_ROUTE_LOCAL) &&
+		if (((match->type == ZEBRA_ROUTE_CONNECT ||
+		      match->type == ZEBRA_ROUTE_LOCAL)) &&
 		    !CHECK_FLAG(match->status, ROUTE_ENTRY_REMOVED) &&
-		    CHECK_FLAG(match->flags, ZEBRA_FLAG_SELECTED) &&
-		    match && match->nhe->nhg.nexthop &&
-		    nexthop->ifindex == match->nhe->nhg.nexthop->ifindex)
-			return 1;
+		    CHECK_FLAG(match->flags, ZEBRA_FLAG_SELECTED))
+			break;
 	}
 
-	return 0;
+	if (!match || !match->nhe->nhg.nexthop)
+		return 0;
+
+	nexthop->ifindex = match->nhe->nhg.nexthop->ifindex;
+	return 1;
 }