X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp%2Fvpp-api%2Fapi.c;h=663096062efcccc4cd1c4d460305ea8cba967db3;hb=f07fb71b6276429bd81b5ae3669c8f33d38df1fa;hp=c1da5aa93cfc15e7cc855e8a7f3963dd3eedfd12;hpb=c5bb0d6667ca36affe9fb30e58c852e4f1b47f93;p=vpp.git

diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
index c1da5aa93cf..663096062ef 100644
--- a/vpp/vpp-api/api.c
+++ b/vpp/vpp-api/api.c
@@ -4989,6 +4989,7 @@ static void vl_api_gre_add_del_tunnel_t_handler
   memset (a, 0, sizeof (*a));
 
   a->is_add = mp->is_add;
+  a->teb = mp->teb;
 
   /* ip addresses sent in network byte order */
   clib_memcpy (&(a->src), mp->src_address, 4);
@@ -5018,6 +5019,7 @@ static void send_gre_tunnel_details
   clib_memcpy (rmp->src_address, &(t->tunnel_src), 4);
   clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4);
   rmp->outer_fib_id = htonl (im->fibs[t->outer_fib_index].table_id);
+  rmp->teb = t->teb;
   rmp->sw_if_index = htonl (t->sw_if_index);
   rmp->context = context;
 
@@ -5714,6 +5716,8 @@ vl_api_lisp_locator_dump_t_handler (vl_api_lisp_locator_dump_t * mp)
     ls_index = htonl (mp->ls_index);
   else
     {
+      /* make sure we get a proper C-string */
+      mp->ls_name[sizeof (mp->ls_name) - 1] = 0;
       ls_name = format (0, "%s", mp->ls_name);
       p = hash_get_mem (lcm->locator_set_index_by_name, ls_name);
       if (!p)