X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fplugins%2Fmap%2Fmap_api.c;h=1b8ffc72a6aa6496bb590793f1a220f34112c221;hp=8ce6428fbc6f944e97f5fb44c5546f4510896ef2;hb=fc7344f;hpb=5a2e278a09726be627b8310e03f0522d60aafedf

diff --git a/src/plugins/map/map_api.c b/src/plugins/map/map_api.c
index 8ce6428fbc6..1b8ffc72a6a 100644
--- a/src/plugins/map/map_api.c
+++ b/src/plugins/map/map_api.c
@@ -54,12 +54,6 @@ vl_api_map_add_domain_t_handler (vl_api_map_add_domain_t * mp)
   u32 index;
   u8 flags = 0;
 
-  if (mp->is_translation)
-    flags |= MAP_DOMAIN_TRANSLATION;
-
-  if (mp->is_rfc6052)
-    flags |= MAP_DOMAIN_RFC6052;
-
   rv =
     map_create_domain ((ip4_address_t *) & mp->ip4_prefix.prefix,
 		       mp->ip4_prefix.len,
@@ -137,7 +131,6 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
     rmp->psid_length = d->psid_length;
     rmp->flags = d->flags;
     rmp->mtu = htons(d->mtu);
-    rmp->is_translation = (d->flags & MAP_DOMAIN_TRANSLATION); // Redundant
 
     vl_api_send_msg (reg, (u8 *) rmp);
   }));
@@ -179,7 +172,7 @@ vl_api_map_rule_dump_t_handler (vl_api_map_rule_dump_t * mp)
       clib_memset (rmp, 0, sizeof (*rmp));
       rmp->_vl_msg_id = ntohs (VL_API_MAP_RULE_DETAILS + mm->msg_id_base);
       rmp->psid = htons (i);
-      clib_memcpy (rmp->ip6_dst, &dst, sizeof (rmp->ip6_dst));
+      clib_memcpy (&rmp->ip6_dst, &dst, sizeof (rmp->ip6_dst));
       rmp->context = mp->context;
       vl_api_send_msg (reg, (u8 *) rmp);
     }
@@ -337,7 +330,7 @@ static void
   int rv = 0;
 
   map_pre_resolve ((ip4_address_t *) & mp->ip4_nh_address,
-		   (ip6_address_t *) & mp->ip6_nh_address, mp->is_add);
+		   (ip6_address_t *) & mp->ip6_nh_address, !mp->is_add);
 
   REPLY_MACRO (VL_API_MAP_PARAM_ADD_DEL_PRE_RESOLVE_REPLY);
 }
@@ -526,6 +519,29 @@ static void
 }
 
 
+int
+map_param_set_tcp (u16 tcp_mss)
+{
+  map_main_t *mm = &map_main;
+
+  mm->tcp_mss = tcp_mss;
+
+  return 0;
+}
+
+
+static void
+vl_api_map_param_set_tcp_t_handler (vl_api_map_param_set_tcp_t * mp)
+{
+  map_main_t *mm = &map_main;
+  vl_api_map_param_set_tcp_reply_t *rmp;
+  int rv = 0;
+
+  map_param_set_tcp (ntohs (mp->tcp_mss));
+  REPLY_MACRO (VL_API_MAP_PARAM_SET_TCP_REPLY);
+}
+
+
 static void
 vl_api_map_param_get_t_handler (vl_api_map_param_get_t * mp)
 {
@@ -562,14 +578,14 @@ vl_api_map_param_get_t_handler (vl_api_map_param_get_t * mp)
   rmp->ip4_pool_size = clib_net_to_host_u16 (mm->ip4_reass_conf_pool_size);
   rmp->ip4_buffers = clib_net_to_host_u32 (mm->ip4_reass_conf_buffers);
   rmp->ip4_ht_ratio =
-    clib_net_to_host_u32 ((u32) mm->ip4_reass_conf_ht_ratio);
+    clib_net_to_host_u64 ((u64) mm->ip4_reass_conf_ht_ratio);
 
   rmp->ip6_lifetime_ms =
     clib_net_to_host_u16 (mm->ip6_reass_conf_lifetime_ms);
   rmp->ip6_pool_size = clib_net_to_host_u16 (mm->ip6_reass_conf_pool_size);
   rmp->ip6_buffers = clib_net_to_host_u32 (mm->ip6_reass_conf_buffers);
   rmp->ip6_ht_ratio =
-    clib_net_to_host_u32 ((u32) mm->ip6_reass_conf_ht_ratio);
+    clib_net_to_host_u64 ((u64) mm->ip6_reass_conf_ht_ratio);
 
   rmp->sec_check_enable = mm->sec_check;
   rmp->sec_check_fragments = mm->sec_check_frag;
@@ -581,12 +597,52 @@ 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)
+{
+  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);
+    }
+  else
+    {
+      vnet_feature_enable_disable ("ip4-unicast", "ip4-map-t", sw_if_index,
+				   is_enable ? 1 : 0, 0, 0);
+      vnet_feature_enable_disable ("ip6-unicast", "ip6-map-t", sw_if_index,
+				   is_enable ? 1 : 0, 0, 0);
+    }
+  return 0;
+}
+
+
+static void
+vl_api_map_if_enable_disable_t_handler (vl_api_map_if_enable_disable_t * mp)
+{
+  map_main_t *mm = &map_main;
+  vl_api_map_if_enable_disable_reply_t *rmp;
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv =
+    map_if_enable_disable (mp->is_enable, htonl (mp->sw_if_index),
+			   mp->is_translation);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_MAP_IF_ENABLE_DISABLE_REPLY);
+}
+
+
 #define foreach_map_plugin_api_msg		\
 _(MAP_ADD_DOMAIN, map_add_domain)		\
 _(MAP_DEL_DOMAIN, map_del_domain)		\
 _(MAP_ADD_DEL_RULE, map_add_del_rule)		\
 _(MAP_DOMAIN_DUMP, map_domain_dump)		\
 _(MAP_RULE_DUMP, map_rule_dump)			\
+_(MAP_IF_ENABLE_DISABLE, map_if_enable_disable)	\
 _(MAP_SUMMARY_STATS, map_summary_stats)		\
 _(MAP_PARAM_SET_FRAGMENTATION, map_param_set_fragmentation)	\
 _(MAP_PARAM_SET_ICMP, map_param_set_icmp)	\
@@ -595,6 +651,7 @@ _(MAP_PARAM_ADD_DEL_PRE_RESOLVE, map_param_add_del_pre_resolve)	\
 _(MAP_PARAM_SET_REASSEMBLY, map_param_set_reassembly)		\
 _(MAP_PARAM_SET_SECURITY_CHECK, map_param_set_security_check)	\
 _(MAP_PARAM_SET_TRAFFIC_CLASS, map_param_set_traffic_class)	\
+_(MAP_PARAM_SET_TCP, map_param_set_tcp)	\
 _(MAP_PARAM_GET, map_param_get)
 
 #define vl_msg_name_crc_list