X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmap%2Fmap_api.c;h=a6b461db107bb536b721760b1ec8960e2b79610b;hb=4d376f67a;hp=1b8ffc72a6aa6496bb590793f1a220f34112c221;hpb=fc7344f9beffe506085730e8e03f7c8771deb3a6;p=vpp.git

diff --git a/src/plugins/map/map_api.c b/src/plugins/map/map_api.c
index 1b8ffc72a6a..a6b461db107 100644
--- a/src/plugins/map/map_api.c
+++ b/src/plugins/map/map_api.c
@@ -61,7 +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);
+		       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,
@@ -103,7 +104,9 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
   vl_api_map_domain_details_t *rmp;
   map_main_t *mm = &map_main;
   map_domain_t *d;
+  map_domain_extra_t *de;
   vl_api_registration_t *reg;
+  u32 map_domain_index;
 
   if (pool_elts (mm->domains) == 0)
     return;
@@ -115,11 +118,19 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
   /* *INDENT-OFF* */
   pool_foreach(d, mm->domains,
   ({
+    u32 len;
+
+    map_domain_index = d - mm->domains;
+    de = vec_elt_at_index(mm->domain_extras, map_domain_index);
+
+    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));
+    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;
-    rmp->domain_index = htonl(d - mm->domains);
+    rmp->domain_index = htonl(map_domain_index);
     clib_memcpy(&rmp->ip6_prefix.prefix, &d->ip6_prefix, sizeof(rmp->ip6_prefix.prefix));
     clib_memcpy(&rmp->ip4_prefix.prefix, &d->ip4_prefix, sizeof(rmp->ip4_prefix.prefix));
     clib_memcpy(&rmp->ip6_src.prefix, &d->ip6_src, sizeof(rmp->ip6_src.prefix));
@@ -132,6 +143,8 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
     rmp->flags = d->flags;
     rmp->mtu = htons(d->mtu);
 
+	vl_api_to_api_string (len, de->tag, &rmp->tag );
+
     vl_api_send_msg (reg, (u8 *) rmp);
   }));
   /* *INDENT-ON* */
@@ -600,12 +613,36 @@ vl_api_map_param_get_t_handler (vl_api_map_param_get_t * mp)
 int
 map_if_enable_disable (bool is_enable, u32 sw_if_index, bool is_translation)
 {
+  map_main_t *mm = &map_main;
+
+  if (pool_is_free_index (mm->vnet_main->interface_main.sw_interfaces,
+			  sw_if_index))
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  is_enable = ! !is_enable;
+
+  if (is_translation)
+    {
+      if (clib_bitmap_get (mm->bm_trans_enabled_by_sw_if, sw_if_index)
+	  == is_enable)
+	return 0;
+    }
+  else
+    {
+      if (clib_bitmap_get (mm->bm_encap_enabled_by_sw_if, sw_if_index)
+	  == is_enable)
+	return 0;
+    }
+
   if (is_translation == false)
     {
       vnet_feature_enable_disable ("ip4-unicast", "ip4-map", sw_if_index,
 				   is_enable ? 1 : 0, 0, 0);
       vnet_feature_enable_disable ("ip6-unicast", "ip6-map", sw_if_index,
 				   is_enable ? 1 : 0, 0, 0);
+      mm->bm_encap_enabled_by_sw_if =
+	clib_bitmap_set (mm->bm_encap_enabled_by_sw_if, sw_if_index,
+			 is_enable);
     }
   else
     {
@@ -613,7 +650,11 @@ map_if_enable_disable (bool is_enable, u32 sw_if_index, bool is_translation)
 				   is_enable ? 1 : 0, 0, 0);
       vnet_feature_enable_disable ("ip6-unicast", "ip6-map-t", sw_if_index,
 				   is_enable ? 1 : 0, 0, 0);
+      mm->bm_trans_enabled_by_sw_if =
+	clib_bitmap_set (mm->bm_trans_enabled_by_sw_if, sw_if_index,
+			 is_enable);
     }
+
   return 0;
 }