Fixing Exclusive dpo path issues added when via rpath 42/15542/6
authorVijayabhaskar Katamreddy <vkatamre@cisco.com>
Thu, 25 Oct 2018 20:28:12 +0000 (13:28 -0700)
committerNeale Ranns <nranns@cisco.com>
Mon, 29 Oct 2018 08:31:19 +0000 (08:31 +0000)
Change-Id: I7531a64d7072d85514ca579827b6ea0e9cef6f08
Signed-off-by: Vijayabhaskar Katamreddy <vkatamre@cisco.com>
src/vnet/fib/fib_entry_src.c

index b3b40bf..bc1ff2e 100644 (file)
@@ -1547,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);
     }
 
@@ -1608,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