X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.c;h=ace9ed2f868c626385f3b5db77ccc49512851076;hb=4744ddbfe0012861895dbd33487569e46b81554b;hp=f0722d6af195558d4d68fac15749ede8aa1800dd;hpb=3b4c64e13386e7419f109cd02af4f67e2d6bf55e;p=vpp.git

diff --git a/src/vnet/session/application_interface.c b/src/vnet/session/application_interface.c
index f0722d6af19..ace9ed2f868 100644
--- a/src/vnet/session/application_interface.c
+++ b/src/vnet/session/application_interface.c
@@ -163,7 +163,12 @@ session_endpoint_update_for_app (session_endpoint_cfg_t * sep,
    * that "supports" app's namespace. This will fix our local connection
    * endpoint.
    */
-  fib_index = sep->is_ip4 ? app_ns->ip4_fib_index : app_ns->ip6_fib_index;
+
+  /* If in default namespace and user requested a fib index use it */
+  if (ns_index == 0 && sep->fib_index != ENDPOINT_INVALID_INDEX)
+    fib_index = sep->fib_index;
+  else
+    fib_index = sep->is_ip4 ? app_ns->ip4_fib_index : app_ns->ip6_fib_index;
   sep->peer.fib_index = fib_index;
   sep->fib_index = fib_index;