MAP: Use explicit address/prefix types in API

[vpp.git] / src / plugins / map / map_api.c

diff --git a/src/plugins/map/map_api.c b/src/plugins/map/map_api.c
index 4b21c37..28cfd9d 100644 (file)
--- a/src/plugins/map/map_api.c
+++ b/src/plugins/map/map_api.c
@@ -61,12 +61,13 @@ vl_api_map_add_domain_t_handler (vl_api_map_add_domain_t * mp)
     flags |= MAP_DOMAIN_RFC6052;
 
   rv =
-    map_create_domain ((ip4_address_t *) & mp->ip4_prefix, mp->ip4_prefix_len,
-                      (ip6_address_t *) & mp->ip6_prefix, mp->ip6_prefix_len,
-                      (ip6_address_t *) & mp->ip6_src,
-                      mp->ip6_src_prefix_len, mp->ea_bits_len,
-                      mp->psid_offset, mp->psid_length, &index,
-                      ntohs (mp->mtu), flags);
+    map_create_domain ((ip4_address_t *) & mp->ip4_prefix.prefix,
+                      mp->ip4_prefix.len,
+                      (ip6_address_t *) & mp->ip6_prefix.prefix,
+                      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);
 
   /* *INDENT-OFF* */
   REPLY_MACRO2(VL_API_MAP_ADD_DOMAIN_REPLY,
@@ -97,7 +98,7 @@ vl_api_map_add_del_rule_t_handler (vl_api_map_add_del_rule_t * mp)
 
   rv =
     map_add_del_psid (ntohl (mp->index), ntohs (mp->psid),
-                     (ip6_address_t *) mp->ip6_dst, mp->is_add);
+                     (ip6_address_t *) & mp->ip6_dst, mp->is_add);
 
   REPLY_MACRO (VL_API_MAP_ADD_DEL_RULE_REPLY);
 }
@@ -125,12 +126,12 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
     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);
-    clib_memcpy(rmp->ip6_prefix, &d->ip6_prefix, sizeof(rmp->ip6_prefix));
-    clib_memcpy(rmp->ip4_prefix, &d->ip4_prefix, sizeof(rmp->ip4_prefix));
-    clib_memcpy(rmp->ip6_src, &d->ip6_src, sizeof(rmp->ip6_src));
-    rmp->ip6_prefix_len = d->ip6_prefix_len;
-    rmp->ip4_prefix_len = d->ip4_prefix_len;
-    rmp->ip6_src_len = d->ip6_src_len;
+    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));
+    rmp->ip6_prefix.len = d->ip6_prefix_len;
+    rmp->ip4_prefix.len = d->ip4_prefix_len;
+    rmp->ip6_src.len = d->ip6_src_len;
     rmp->ea_bits_len = d->ea_bits_len;
     rmp->psid_offset = d->psid_offset;
     rmp->psid_length = d->psid_length;
@@ -178,7 +179,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.address, &dst, sizeof (rmp->ip6_dst.address));
       rmp->context = mp->context;
       vl_api_send_msg (reg, (u8 *) rmp);
     }