X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_entry.c;h=32e45f24453ec276d566e50b3a20ed86b5cf8b95;hb=775f73c6b;hp=7de521336b8cc85042a5ac2e3c42f213636fb22f;hpb=710071bf0ed7a0926581d1f738a142b72e795d2b;p=vpp.git

diff --git a/src/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c
index 7de521336b8..32e45f24453 100644
--- a/src/vnet/fib/fib_entry.c
+++ b/src/vnet/fib/fib_entry.c
@@ -601,7 +601,7 @@ fib_entry_alloc (u32 fib_index,
     fib_prefix_t *fep;
 
     pool_get(fib_entry_pool, fib_entry);
-    memset(fib_entry, 0, sizeof(*fib_entry));
+    clib_memset(fib_entry, 0, sizeof(*fib_entry));
 
     fib_node_init(&fib_entry->fe_node,
 		  FIB_NODE_TYPE_ENTRY);
@@ -1652,12 +1652,25 @@ void
 fib_entry_encode (fib_node_index_t fib_entry_index,
 		  fib_route_path_encode_t **api_rpaths)
 {
+    fib_path_ext_list_t *ext_list;
     fib_entry_t *fib_entry;
+    fib_entry_src_t *bsrc;
 
+    ext_list = NULL;
     fib_entry = fib_entry_get(fib_entry_index);
+    bsrc = fib_entry_get_best_src_i(fib_entry);
+
+    if (bsrc)
+    {
+	ext_list = &bsrc->fes_path_exts;
+    }
+
     if (FIB_NODE_INDEX_INVALID != fib_entry->fe_parent)
     {
-        fib_path_list_walk(fib_entry->fe_parent, fib_path_encode, api_rpaths);
+        fib_path_list_walk_w_ext(fib_entry->fe_parent,
+                                 ext_list,
+                                 fib_path_encode,
+                                 api_rpaths);
     }
 }