X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_entry_src.c;h=173df74f0a4a98b7ef09fddb252b173386fe1c4a;hb=7999e83a41ebad8a3f02cfcb2809cdb3aae919ba;hp=8c5082846a84556b2f1b7d617354553f527cf7ab;hpb=8142499cd1cb3b8d0168d0e6cf5309c5b4813cc4;p=vpp.git

diff --git a/src/vnet/fib/fib_entry_src.c b/src/vnet/fib/fib_entry_src.c
index 8c5082846a8..173df74f0a4 100644
--- a/src/vnet/fib/fib_entry_src.c
+++ b/src/vnet/fib/fib_entry_src.c
@@ -29,12 +29,6 @@
  */
 static fib_entry_src_vft_t fib_entry_src_vft[FIB_SOURCE_MAX];
 
-static fib_protocol_t
-fib_entry_get_proto (const fib_entry_t * fib_entry)
-{
-    return (fib_entry->fe_prefix.fp_proto);
-}
-
 void
 fib_entry_src_register (fib_source_t source,
 			const fib_entry_src_vft_t *vft)
@@ -193,6 +187,7 @@ typedef struct fib_entry_src_collect_forwarding_ctx_t_
     const fib_entry_src_t *esrc;
     fib_forward_chain_type_t fct;
     int n_recursive_constrained;
+    u16 preference;
 } fib_entry_src_collect_forwarding_ctx_t;
 
 /**
@@ -351,6 +346,22 @@ fib_entry_src_collect_forwarding (fib_node_index_t pl_index,
     {
         ctx->n_recursive_constrained += 1;
     }
+    if (0xffff == ctx->preference)
+    {
+        /*
+         * not set a preference yet, so the first path we encounter
+         * sets the preference we are collecting.
+         */
+        ctx->preference = fib_path_get_preference(path_index);
+    }
+    else if (ctx->preference != fib_path_get_preference(path_index))
+    {
+        /*
+         * this path does not belong to the same preference as the
+         * previous paths encountered. we are done now.
+         */
+        return (FIB_PATH_LIST_WALK_STOP);
+    }
 
     /*
      * get the matching path-extension for the path being visited.
@@ -422,6 +433,7 @@ fib_entry_src_mk_lb (fib_entry_t *fib_entry,
         .next_hops = NULL,
         .n_recursive_constrained = 0,
         .fct = fct,
+        .preference = 0xffff,
     };
 
     /*
@@ -843,7 +855,7 @@ fib_entry_src_action_add (fib_entry_t *fib_entry,
 	fib_entry_src_vft[source].fesv_add(esrc,
 					   fib_entry,
 					   flags,
-					   fib_entry_get_proto(fib_entry),
+                                           fib_entry_get_dpo_proto(fib_entry),
 					   dpo);
     }
 
@@ -896,7 +908,7 @@ fib_entry_src_action_update (fib_entry_t *fib_entry,
 	fib_entry_src_vft[source].fesv_add(esrc,
 					   fib_entry,
 					   flags,
-					   fib_entry_get_proto(fib_entry),
+					   fib_entry_get_dpo_proto(fib_entry),
 					   dpo);
     }
 
@@ -1088,8 +1100,7 @@ fib_entry_src_action_path_add (fib_entry_t *fib_entry,
                                      source,
                                      flags,
                                      drop_dpo_get(
-                                         fib_proto_to_dpo(
-                                             fib_entry_get_proto(fib_entry))));
+                                         fib_entry_get_dpo_proto(fib_entry)));
 	esrc = fib_entry_src_find(fib_entry, source, NULL);
     }
 
@@ -1148,8 +1159,7 @@ fib_entry_src_action_path_swap (fib_entry_t *fib_entry,
 					     source,
 					     flags,
                                              drop_dpo_get(
-                                                 fib_proto_to_dpo(
-                                                     fib_entry_get_proto(fib_entry))));
+                                                 fib_entry_get_dpo_proto(fib_entry)));
 	esrc = fib_entry_src_find(fib_entry, source, NULL);
     }