BD ARP entry use common API types

[vpp.git] / src / vat / api_format.c

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index 0e53f56..8b56f76 100644 (file)
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -18,6 +18,7 @@
  */
 
 #include <vat/vat.h>
+#include <vpp/api/types.h>
 #include <vppinfra/socket.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -53,6 +54,8 @@
 #include <vnet/bonding/node.h>
 #include <vnet/qos/qos_types.h>
 #include "vat/json_format.h"
+#include <vnet/ip/ip_types_api.h>
+#include <vnet/ethernet/ethernet_types_api.h>
 
 #include <inttypes.h>
 #include <sys/stat.h>
@@ -79,6 +82,14 @@
 #if VPP_API_TEST_BUILTIN == 0
 #include <netdb.h>
 
+/* *INDENT-OFF* */
+const mac_address_t ZERO_MAC_ADDRESS = {
+  .bytes = {
+    0, 0, 0, 0, 0, 0,
+  },
+};
+/* *INDENT-ON* */
+
 u32
 vl (void *p)
 {
@@ -6360,7 +6371,7 @@ api_create_loopback (vat_main_t * vam)
   u32 user_instance = 0;
   int ret;
 
-  memset (mac_address, 0, sizeof (mac_address));
+  clib_memset (mac_address, 0, sizeof (mac_address));
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -7815,16 +7826,17 @@ api_bridge_flags (vat_main_t * vam)
 static int
 api_bd_ip_mac_add_del (vat_main_t * vam)
 {
+  vl_api_address_t ip = VL_API_ZERO_ADDRESS;
+  vl_api_mac_address_t mac = VL_API_ZERO_MAC_ADDRESS;
   unformat_input_t *i = vam->input;
   vl_api_bd_ip_mac_add_del_t *mp;
+  ip46_type_t type;
   u32 bd_id;
   u8 is_ipv6 = 0;
   u8 is_add = 1;
   u8 bd_id_set = 0;
   u8 ip_set = 0;
   u8 mac_set = 0;
-  ip4_address_t v4addr;
-  ip6_address_t v6addr;
   u8 macaddr[6];
   int ret;
 
@@ -7836,16 +7848,11 @@ api_bd_ip_mac_add_del (vat_main_t * vam)
        {
          bd_id_set++;
        }
-      else if (unformat (i, "%U", unformat_ip4_address, &v4addr))
-       {
-         ip_set++;
-       }
-      else if (unformat (i, "%U", unformat_ip6_address, &v6addr))
+      else if (unformat (i, "%U", unformat_vl_api_address, &ip))
        {
          ip_set++;
-         is_ipv6++;
        }
-      else if (unformat (i, "%U", unformat_ethernet_address, macaddr))
+      else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac))
        {
          mac_set++;
        }
@@ -7874,13 +7881,11 @@ api_bd_ip_mac_add_del (vat_main_t * vam)
   M (BD_IP_MAC_ADD_DEL, mp);
 
   mp->bd_id = ntohl (bd_id);
-  mp->is_ipv6 = is_ipv6;
   mp->is_add = is_add;
-  if (is_ipv6)
-    clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
-  else
-    clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
-  clib_memcpy (mp->mac_address, macaddr, 6);
+
+  clib_memcpy (&mp->ip, &ip, sizeof (ip));
+  clib_memcpy (&mp->mac, &mac, sizeof (mac));
+
   S (mp);
   W (ret);
   return ret;
@@ -7998,7 +8003,7 @@ api_tap_connect (vat_main_t * vam)
   int ip6_address_set = 0;
   int ret;
 
-  memset (mac_address, 0, sizeof (mac_address));
+  clib_memset (mac_address, 0, sizeof (mac_address));
 
   /* Parse args required to build the message */
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
@@ -8087,7 +8092,7 @@ api_tap_modify (vat_main_t * vam)
   u8 sw_if_index_set = 0;
   int ret;
 
-  memset (mac_address, 0, sizeof (mac_address));
+  clib_memset (mac_address, 0, sizeof (mac_address));
 
   /* Parse args required to build the message */
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
@@ -8204,7 +8209,7 @@ api_tap_create_v2 (vat_main_t * vam)
   int ret;
   u32 rx_ring_sz = 0, tx_ring_sz = 0;
 
-  memset (mac_address, 0, sizeof (mac_address));
+  clib_memset (mac_address, 0, sizeof (mac_address));
 
   /* Parse args required to build the message */
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
@@ -8315,7 +8320,7 @@ api_tap_create_v2 (vat_main_t * vam)
     clib_memcpy (mp->host_bridge, host_bridge, vec_len (host_bridge));
   if (host_ip4_prefix_len)
     clib_memcpy (mp->host_ip4_addr, &host_ip4_addr, 4);
-  if (host_ip4_prefix_len)
+  if (host_ip6_prefix_len)
     clib_memcpy (mp->host_ip6_addr, &host_ip6_addr, 16);
   if (host_ip4_gw_set)
     clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4);
@@ -8385,7 +8390,7 @@ api_bond_create (vat_main_t * vam)
   u8 lb;
   u8 mode_is_set = 0;
 
-  memset (mac_address, 0, sizeof (mac_address));
+  clib_memset (mac_address, 0, sizeof (mac_address));
   lb = BOND_LB_L2;
 
   /* Parse args required to build the message */
@@ -8645,8 +8650,8 @@ api_ip_add_del_route (vat_main_t * vam)
   mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
   mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
 
-  memset (&v4_next_hop_address, 0, sizeof (ip4_address_t));
-  memset (&v6_next_hop_address, 0, sizeof (ip6_address_t));
+  clib_memset (&v4_next_hop_address, 0, sizeof (ip4_address_t));
+  clib_memset (&v6_next_hop_address, 0, sizeof (ip6_address_t));
   /* Parse args required to build the message */
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -8964,14 +8969,14 @@ api_ip_mroute_add_del (vat_main_t * vam)
        }
       else if (unformat (i, "%U", unformat_ip4_address, &v4_grp_address))
        {
-         memset (&v4_src_address, 0, sizeof (v4_src_address));
+         clib_memset (&v4_src_address, 0, sizeof (v4_src_address));
          grp_address_length = 32;
          address_set = 1;
          is_ipv6 = 0;
        }
       else if (unformat (i, "%U", unformat_ip6_address, &v6_grp_address))
        {
-         memset (&v6_src_address, 0, sizeof (v6_src_address));
+         clib_memset (&v6_src_address, 0, sizeof (v6_src_address));
          grp_address_length = 128;
          address_set = 1;
          is_ipv6 = 1;
@@ -9923,7 +9928,7 @@ api_ip_neighbor_add_del (vat_main_t * vam)
   ip6_address_t v6address;
   int ret;
 
-  memset (mac_address, 0, sizeof (mac_address));
+  clib_memset (mac_address, 0, sizeof (mac_address));
 
   /* Parse args required to build the message */
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
@@ -9986,7 +9991,7 @@ api_ip_neighbor_add_del (vat_main_t * vam)
     }
   else
     {
-      /* mp->is_ipv6 = 0; via memset in M macro above */
+      /* mp->is_ipv6 = 0; via clib_memset in M macro above */
       clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
     }
 
@@ -11147,8 +11152,8 @@ api_sr_localsid_add_del (vat_main_t * vam)
   u32 fib_table = ~(u32) 0;
   ip6_address_t nh_addr6;
   ip4_address_t nh_addr4;
-  memset (&nh_addr6, 0, sizeof (ip6_address_t));
-  memset (&nh_addr4, 0, sizeof (ip4_address_t));
+  clib_memset (&nh_addr6, 0, sizeof (ip6_address_t));
+  clib_memset (&nh_addr4, 0, sizeof (ip4_address_t));
 
   bool nexthop_set = 0;
 
@@ -11297,7 +11302,7 @@ unformat_tcp_mask (unformat_input_t * input, va_list * args)
 
   tcp = (tcp_header_t *) mask;
 
-#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a));
+#define _(a) if (a) clib_memset (&tcp->a, 0xff, sizeof (tcp->a));
   foreach_tcp_proto_field;
 #undef _
 
@@ -11338,7 +11343,7 @@ unformat_udp_mask (unformat_input_t * input, va_list * args)
 
   udp = (udp_header_t *) mask;
 
-#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a));
+#define _(a) if (a) clib_memset (&udp->a, 0xff, sizeof (udp->a));
   foreach_udp_proto_field;
 #undef _
 
@@ -11428,7 +11433,7 @@ unformat_ip4_mask (unformat_input_t * input, va_list * args)
 
   ip = (ip4_header_t *) mask;
 
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a));
   foreach_ip4_proto_field;
 #undef _
 
@@ -11500,7 +11505,7 @@ unformat_ip6_mask (unformat_input_t * input, va_list * args)
 
   ip = (ip6_header_t *) mask;
 
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a));
   foreach_ip6_proto_field;
 #undef _
 
@@ -11596,10 +11601,10 @@ unformat_l2_mask (unformat_input_t * input, va_list * args)
   vec_validate (mask, len - 1);
 
   if (dst)
-    memset (mask, 0xff, 6);
+    clib_memset (mask, 0xff, 6);
 
   if (src)
-    memset (mask + 6, 0xff, 6);
+    clib_memset (mask + 6, 0xff, 6);
 
   if (tag2 || dot1ad)
     {
@@ -13385,8 +13390,8 @@ api_vxlan_add_del_tunnel (vat_main_t * vam)
   int ret;
 
   /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
-  memset (&src, 0, sizeof src);
-  memset (&dst, 0, sizeof dst);
+  clib_memset (&src, 0, sizeof src);
+  clib_memset (&dst, 0, sizeof dst);
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -13668,8 +13673,8 @@ api_geneve_add_del_tunnel (vat_main_t * vam)
   int ret;
 
   /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
-  memset (&src, 0, sizeof src);
-  memset (&dst, 0, sizeof dst);
+  clib_memset (&src, 0, sizeof src);
+  clib_memset (&dst, 0, sizeof dst);
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -13928,10 +13933,10 @@ api_gre_add_del_tunnel (vat_main_t * vam)
   u32 instance = ~0;
   int ret;
 
-  memset (&src4, 0, sizeof src4);
-  memset (&dst4, 0, sizeof dst4);
-  memset (&src6, 0, sizeof src6);
-  memset (&dst6, 0, sizeof dst6);
+  clib_memset (&src4, 0, sizeof src4);
+  clib_memset (&dst4, 0, sizeof dst4);
+  clib_memset (&src6, 0, sizeof src6);
+  clib_memset (&dst6, 0, sizeof dst6);
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -14253,7 +14258,7 @@ api_create_vhost_user_if (vat_main_t * vam)
   int ret;
 
   /* Shut up coverity */
-  memset (hwaddr, 0, sizeof (hwaddr));
+  clib_memset (hwaddr, 0, sizeof (hwaddr));
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -14512,10 +14517,10 @@ api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
   int ret;
 
   /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
-  memset (&local4, 0, sizeof local4);
-  memset (&remote4, 0, sizeof remote4);
-  memset (&local6, 0, sizeof local6);
-  memset (&remote6, 0, sizeof remote6);
+  clib_memset (&local4, 0, sizeof local4);
+  clib_memset (&remote4, 0, sizeof remote4);
+  clib_memset (&local6, 0, sizeof local6);
+  clib_memset (&remote6, 0, sizeof remote6);
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -16920,7 +16925,7 @@ unformat_lisp_eid_vat (unformat_input_t * input, va_list * args)
 {
   lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *);
 
-  memset (a, 0, sizeof (a[0]));
+  clib_memset (a, 0, sizeof (a[0]));
 
   if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len))
     {
@@ -17321,7 +17326,7 @@ api_lisp_gpe_add_del_fwd_entry (vat_main_t * vam)
   vl_api_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0;
   int ret;
 
-  memset (&rloc, 0, sizeof (rloc));
+  clib_memset (&rloc, 0, sizeof (rloc));
 
   /* Parse args required to build the message */
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
@@ -18428,7 +18433,7 @@ api_one_use_petr (vat_main_t * vam)
   ip_address_t ip;
   int ret;
 
-  memset (&ip, 0, sizeof (ip));
+  clib_memset (&ip, 0, sizeof (ip));
 
   /* Parse args required to build the message */
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
@@ -18624,7 +18629,7 @@ api_one_add_del_remote_mapping (vat_main_t * vam)
   vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0;
   int ret;
 
-  memset (&rloc, 0, sizeof (rloc));
+  clib_memset (&rloc, 0, sizeof (rloc));
 
   /* Parse args required to build the message */
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
@@ -19218,7 +19223,7 @@ api_one_add_del_map_request_itr_rlocs (vat_main_t * vam)
     }
   else
     {
-      memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
+      clib_memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
     }
   vec_free (locator_set_name);
 
@@ -19730,8 +19735,8 @@ api_gpe_add_del_native_fwd_rpath (vat_main_t * vam)
   struct in6_addr ip6;
   u32 table_id = 0, nh_sw_if_index = ~0;
 
-  memset (&ip4, 0, sizeof (ip4));
-  memset (&ip6, 0, sizeof (ip6));
+  clib_memset (&ip4, 0, sizeof (ip4));
+  clib_memset (&ip6, 0, sizeof (ip6));
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -19973,7 +19978,7 @@ api_af_packet_create (vat_main_t * vam)
   u8 random_hw_addr = 1;
   int ret;
 
-  memset (hw_addr, 0, sizeof (hw_addr));
+  clib_memset (hw_addr, 0, sizeof (hw_addr));
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -20339,7 +20344,7 @@ api_netmap_create (vat_main_t * vam)
   u8 is_master = 0;
   int ret;
 
-  memset (hw_addr, 0, sizeof (hw_addr));
+  clib_memset (hw_addr, 0, sizeof (hw_addr));
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -21946,8 +21951,8 @@ api_l2_interface_pbb_tag_rewrite (vat_main_t * vam)
   int ret;
 
   /* Shut up coverity */
-  memset (dmac, 0, sizeof (dmac));
-  memset (smac, 0, sizeof (smac));
+  clib_memset (dmac, 0, sizeof (dmac));
+  clib_memset (smac, 0, sizeof (smac));
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -22325,7 +22330,7 @@ api_p2p_ethernet_add (vat_main_t * vam)
   u8 mac_set = 0;
   int ret;
 
-  memset (remote_mac, 0, sizeof (remote_mac));
+  clib_memset (remote_mac, 0, sizeof (remote_mac));
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index))
@@ -22381,7 +22386,7 @@ api_p2p_ethernet_del (vat_main_t * vam)
   u8 mac_set = 0;
   int ret;
 
-  memset (remote_mac, 0, sizeof (remote_mac));
+  clib_memset (remote_mac, 0, sizeof (remote_mac));
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index))
@@ -22469,8 +22474,8 @@ api_sw_interface_set_lldp (vat_main_t * vam)
   ip6_address_t ip6_addr;
   int ret;
 
-  memset (&ip4_addr, 0, sizeof (ip4_addr));
-  memset (&ip6_addr, 0, sizeof (ip6_addr));
+  clib_memset (&ip4_addr, 0, sizeof (ip4_addr));
+  clib_memset (&ip6_addr, 0, sizeof (ip6_addr));
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {