|
@@ -652,15 +652,33 @@ static struct rt6_info *find_rr_leaf(struct fib6_node *fn,
|
|
|
u32 metric, int oif, int strict,
|
|
|
bool *do_rr)
|
|
|
{
|
|
|
- struct rt6_info *rt, *match;
|
|
|
+ struct rt6_info *rt, *match, *cont;
|
|
|
int mpri = -1;
|
|
|
|
|
|
match = NULL;
|
|
|
- for (rt = rr_head; rt && rt->rt6i_metric == metric;
|
|
|
- rt = rt->dst.rt6_next)
|
|
|
+ cont = NULL;
|
|
|
+ for (rt = rr_head; rt; rt = rt->dst.rt6_next) {
|
|
|
+ if (rt->rt6i_metric != metric) {
|
|
|
+ cont = rt;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ match = find_match(rt, oif, strict, &mpri, match, do_rr);
|
|
|
+ }
|
|
|
+
|
|
|
+ for (rt = fn->leaf; rt && rt != rr_head; rt = rt->dst.rt6_next) {
|
|
|
+ if (rt->rt6i_metric != metric) {
|
|
|
+ cont = rt;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
match = find_match(rt, oif, strict, &mpri, match, do_rr);
|
|
|
- for (rt = fn->leaf; rt && rt != rr_head && rt->rt6i_metric == metric;
|
|
|
- rt = rt->dst.rt6_next)
|
|
|
+ }
|
|
|
+
|
|
|
+ if (match || !cont)
|
|
|
+ return match;
|
|
|
+
|
|
|
+ for (rt = cont; rt; rt = rt->dst.rt6_next)
|
|
|
match = find_match(rt, oif, strict, &mpri, match, do_rr);
|
|
|
|
|
|
return match;
|