map: Use vl_api_string macros.

* Add optional tag to api call in tests
* Add test for map_domain_dump() for api code coverage.

Type: fix

Change-Id: I2f7784aecdca4bf9e94de3319f959786e3d2c607
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

1 files changed, 5 insertions, 23 deletions

diff --git a/src/plugins/map/map_api.c b/src/plugins/map/map_api.c
index b9b4416d57a..a6b461db107 100644
--- a/src/plugins/map/map_api.c
+++ b/src/plugins/map/map_api.c
@@ -53,16 +53,6 @@ vl_api_map_add_domain_t_handler (vl_api_map_add_domain_t * mp)
   int rv = 0;
   u32 index;
   u8 flags = 0;
-  char *tag = 0;
-  u32 len;
-
-  len = ntohl (mp->tag.length);
-  if (len > 0)
-    {
-      tag = clib_mem_alloc (len + 1);
-      clib_memset (tag, 0, len + 1);
-      clib_memcpy (tag, (char *) mp->tag.buf, len);
-    }
 
   rv =
     map_create_domain ((ip4_address_t *) & mp->ip4_prefix.prefix,
@@ -71,10 +61,8 @@ vl_api_map_add_domain_t_handler (vl_api_map_add_domain_t * mp)
 		       mp->ip6_prefix.len,
 		       (ip6_address_t *) & mp->ip6_src.prefix,
 		       mp->ip6_src.len, mp->ea_bits_len, mp->psid_offset,
-		       mp->psid_length, &index, ntohs (mp->mtu), flags, tag);
-
-  if (tag)
-    clib_mem_free (tag);
+		       mp->psid_length, &index, ntohs (mp->mtu), flags,
+		       vl_api_from_api_string_c (&mp->tag));
 
   /* *INDENT-OFF* */
   REPLY_MACRO2(VL_API_MAP_ADD_DOMAIN_REPLY,
@@ -135,12 +123,10 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
     map_domain_index = d - mm->domains;
     de = vec_elt_at_index(mm->domain_extras, map_domain_index);
 
-    len = 0;
-    if (de->tag)
-      len = strlen(de->tag);
+    len = strnlen_s(de->tag, 64);
 
     /* Make sure every field is initiated (or don't skip the clib_memset()) */
-    rmp = vl_msg_api_alloc (sizeof (*rmp) + sizeof(rmp->tag.length) + len);
+    rmp = vl_msg_api_alloc (sizeof (*rmp) + len);
 
     rmp->_vl_msg_id = htons(VL_API_MAP_DOMAIN_DETAILS + mm->msg_id_base);
     rmp->context = mp->context;
@@ -157,11 +143,7 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
     rmp->flags = d->flags;
     rmp->mtu = htons(d->mtu);
 
-    if (de->tag)
-      {
-	rmp->tag.length = htonl (len);
-	clib_memcpy ((char *)rmp->tag.buf, de->tag, len);
-      }
+	vl_api_to_api_string (len, de->tag, &rmp->tag );
 
     vl_api_send_msg (reg, (u8 *) rmp);
   }));