Typos. A bunch of typos I've been collecting.

[vpp.git] / src / vnet / fib / fib_entry_src.c

diff --git a/src/vnet/fib/fib_entry_src.c b/src/vnet/fib/fib_entry_src.c
index 6868da6..c6c2a04 100644 (file)
--- a/src/vnet/fib/fib_entry_src.c
+++ b/src/vnet/fib/fib_entry_src.c
@@ -173,6 +173,8 @@ fib_entry_src_action_deinit (fib_entry_t *fib_entry,
 
     fib_path_ext_list_flush(&esrc->fes_path_exts);
     vec_del1(fib_entry->fe_srcs, index);
+    vec_sort_with_function(fib_entry->fe_srcs,
+                          fib_entry_src_cmp_for_sort);
 }
 
 fib_entry_src_cover_res_t
@@ -445,7 +447,7 @@ fib_entry_src_collect_forwarding (fib_node_index_t pl_index,
             /*
              * else
              *  the path does not refine the cover, meaning that
-             *  the adjacency doesdoes not match the sub-net on the link.
+             *  the adjacency does/does not match the sub-net on the link.
              *  So this path does not contribute forwarding.
              */
             break;
@@ -518,7 +520,7 @@ fib_entry_src_mk_lb (fib_entry_t *fib_entry,
 
     /*
      * As an optimisation we allocate the vector of next-hops to be sized
-     * equal to the maximum nuber of paths we will need, which is also the
+     * equal to the maximum number of paths we will need, which is also the
      * most likely number we will need, since in most cases the paths are 'up'.
      */
     vec_validate(ctx.next_hops, fib_path_list_get_n_paths(esrc->fes_pl));
@@ -807,7 +809,7 @@ fib_entry_src_covered_inherit_add_i (fib_entry_t *fib_entry,
             /*
              * the covered source is itself a COVERED_INHERIT, i.e.
              * it also pushes this source down the sub-tree.
-             * We consider this more specfic covered to be the owner
+             * We consider this more specific covered to be the owner
              * of the sub-tree from this point down.
              */
             return (FIB_TABLE_WALK_SUB_TREE_STOP);
@@ -825,7 +827,7 @@ fib_entry_src_covered_inherit_add_i (fib_entry_t *fib_entry,
         {
             /*
              * The covered's source was not inherited and it is also
-             * not inherting. Nevertheless, it still owns the sub-tree from 
+             * not inheriting. Nevertheless, it still owns the sub-tree from
              * this point down.
              */
             return (FIB_TABLE_WALK_SUB_TREE_STOP);
@@ -882,7 +884,7 @@ fib_entry_src_covered_inherit_walk_remove (fib_node_index_t fei,
             /*
              * the covered source is itself a COVERED_INHERIT, i.e.
              * it also pushes this source down the sub-tree.
-             * We consider this more specfic covered to be the owner
+             * We consider this more specific covered to be the owner
              * of the sub-tree from this point down.
              */
             return (FIB_TABLE_WALK_SUB_TREE_STOP);
@@ -903,7 +905,7 @@ fib_entry_src_covered_inherit_walk_remove (fib_node_index_t fei,
         {
             /*
              * The covered's source was not inherited and it is also
-             * not inherting. Nevertheless, it still owns the sub-tree from 
+             * not inheriting. Nevertheless, it still owns the sub-tree from
              * this point down.
              */
             return (FIB_TABLE_WALK_SUB_TREE_STOP);
@@ -1545,12 +1547,19 @@ fib_entry_src_action_path_add (fib_entry_t *fib_entry,
     esrc = fib_entry_src_find(fib_entry, source);
     if (NULL == esrc)
     {
+       const dpo_id_t *dpo;
+
+       if (flags == FIB_ENTRY_FLAG_EXCLUSIVE) {
+           dpo = &rpath->dpo;
+       } else {
+           dpo = drop_dpo_get(fib_entry_get_dpo_proto(fib_entry));
+       }
+
        fib_entry =
             fib_entry_src_action_add(fib_entry,
                                      source,
                                      flags,
-                                     drop_dpo_get(
-                                         fib_entry_get_dpo_proto(fib_entry)));
+                                     dpo);
        esrc = fib_entry_src_find(fib_entry, source);
     }
 
@@ -1606,11 +1615,18 @@ fib_entry_src_action_path_swap (fib_entry_t *fib_entry,
 
     if (NULL == esrc)
     {
+       const dpo_id_t *dpo;
+
+       if (flags == FIB_ENTRY_FLAG_EXCLUSIVE) {
+           dpo = &rpaths->dpo;
+       } else {
+           dpo = drop_dpo_get(fib_entry_get_dpo_proto(fib_entry));
+       }
+
         fib_entry = fib_entry_src_action_add(fib_entry,
                                             source,
                                             flags,
-                                             drop_dpo_get(
-                                                 fib_entry_get_dpo_proto(fib_entry)));
+                                             dpo);
        esrc = fib_entry_src_find(fib_entry, source);
     }
     else