mactime: add a "top" command to watch device stats

[vpp.git] / src / vnet / dhcp / dhcp_api.c

diff --git a/src/vnet/dhcp/dhcp_api.c b/src/vnet/dhcp/dhcp_api.c
index 59ab6dc..252f2df 100644 (file)
--- a/src/vnet/dhcp/dhcp_api.c
+++ b/src/vnet/dhcp/dhcp_api.c
@@ -28,6 +28,7 @@
 #include <vnet/dhcp/dhcp6_ia_na_client_dp.h>
 #include <vnet/dhcp/dhcp6_client_common_dp.h>
 #include <vnet/fib/fib_table.h>
+#include <vnet/ip/ip_types_api.h>
 
 #include <vnet/vnet_msg_enum.h>
 
@@ -72,8 +73,8 @@ vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t * mp)
   vpn_ascii_id = format (0, "%s", mp->vpn_ascii_id);
   rv =
     dhcp_proxy_set_vss ((mp->is_ipv6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4),
-                       ntohl (mp->tbl_id), mp->vss_type, vpn_ascii_id,
-                       ntohl (mp->oui), ntohl (mp->vpn_index),
+                       ntohl (mp->tbl_id), ntohl (mp->vss_type),
+                       vpn_ascii_id, ntohl (mp->oui), ntohl (mp->vpn_index),
                        mp->is_add == 0);
 
   REPLY_MACRO (VL_API_DHCP_PROXY_SET_VSS_REPLY);
@@ -87,12 +88,18 @@ static void vl_api_dhcp_proxy_config_t_handler
   ip46_address_t src, server;
   int rv = -1;
 
-  if (mp->is_ipv6)
+  if (mp->dhcp_src_address.af != mp->dhcp_server.af)
     {
-      clib_memcpy (&src.ip6, mp->dhcp_src_address, sizeof (src.ip6));
-      clib_memcpy (&server.ip6, mp->dhcp_server, sizeof (server.ip6));
+      rv = VNET_API_ERROR_INVALID_ARGUMENT;
+      goto reply;
+    }
 
-      rv = dhcp6_proxy_set_server (&server,
+  ip_address_decode (&mp->dhcp_src_address, &src);
+  ip_address_decode (&mp->dhcp_server, &server);
+
+  if (mp->dhcp_src_address.af == ADDRESS_IP4)
+    {
+      rv = dhcp4_proxy_set_server (&server,
                                   &src,
                                   (u32) ntohl (mp->rx_vrf_id),
                                   (u32) ntohl (mp->server_vrf_id),
@@ -100,20 +107,14 @@ static void vl_api_dhcp_proxy_config_t_handler
     }
   else
     {
-      ip46_address_reset (&src);
-      ip46_address_reset (&server);
-
-      clib_memcpy (&src.ip4, mp->dhcp_src_address, sizeof (src.ip4));
-      clib_memcpy (&server.ip4, mp->dhcp_server, sizeof (server.ip4));
-
-      rv = dhcp4_proxy_set_server (&server,
+      rv = dhcp6_proxy_set_server (&server,
                                   &src,
                                   (u32) ntohl (mp->rx_vrf_id),
                                   (u32) ntohl (mp->server_vrf_id),
                                   (int) (mp->is_add == 0));
     }
 
-
+reply:
   REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
 }
 
@@ -148,7 +149,7 @@ dhcp_send_details (fib_protocol_t proto,
   mp = vl_msg_api_alloc (n);
   if (!mp)
     return;
-  memset (mp, 0, n);
+  clib_memset (mp, 0, n);
   mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_DETAILS);
   mp->context = context;
   mp->count = count;
@@ -161,7 +162,7 @@ dhcp_send_details (fib_protocol_t proto,
 
   if (vss)
     {
-      mp->vss_type = vss->vss_type;
+      mp->vss_type = ntohl (vss->vss_type);
       if (vss->vss_type == VSS_TYPE_ASCII)
        {
          u32 id_len = vec_len (vss->vpn_ascii_id);
@@ -192,23 +193,23 @@ dhcp_send_details (fib_protocol_t proto,
 
     if (mp->is_ipv6)
       {
-       memcpy (v_server->dhcp_server, &server->dhcp_server.ip6, 16);
+       memcpy (&v_server->dhcp_server.un, &server->dhcp_server.ip6, 16);
       }
     else
       {
        /* put the address in the first bytes */
-       memcpy (v_server->dhcp_server, &server->dhcp_server.ip4, 4);
+       memcpy (&v_server->dhcp_server.un, &server->dhcp_server.ip4, 4);
       }
   }
 
   if (mp->is_ipv6)
     {
-      memcpy (mp->dhcp_src_address, &proxy->dhcp_src_address.ip6, 16);
+      memcpy (&mp->dhcp_src_address.un, &proxy->dhcp_src_address.ip6, 16);
     }
   else
     {
       /* put the address in the first bytes */
-      memcpy (mp->dhcp_src_address, &proxy->dhcp_src_address.ip4, 4);
+      memcpy (&mp->dhcp_src_address.un, &proxy->dhcp_src_address.ip4, 4);
     }
   vl_api_send_msg (reg, (u8 *) mp);
 }
@@ -218,20 +219,28 @@ dhcp_client_lease_encode (vl_api_dhcp_lease_t * lease,
                          const dhcp_client_t * client)
 {
   size_t len;
+  u8 i;
 
   lease->is_ipv6 = 0;          // only support IPv6 clients
   lease->sw_if_index = ntohl (client->sw_if_index);
-  lease->state = client->state;
+  lease->state = ntohl (client->state);
   len = clib_min (sizeof (lease->hostname) - 1, vec_len (client->hostname));
   clib_memcpy (&lease->hostname, client->hostname, len);
   lease->hostname[len] = 0;
 
   lease->mask_width = client->subnet_mask_width;
-  clib_memcpy (&lease->host_address[0], (u8 *) & client->leased_address, 4);
-  clib_memcpy (&lease->router_address[0], (u8 *) & client->router_address, 4);
-
-  if (NULL != client->l2_rewrite)
-    clib_memcpy (&lease->host_mac[0], client->l2_rewrite + 6, 6);
+  clib_memcpy (&lease->host_address.un, (u8 *) & client->leased_address,
+              sizeof (ip4_address_t));
+  clib_memcpy (&lease->router_address.un, (u8 *) & client->router_address,
+              sizeof (ip4_address_t));
+
+  lease->count = vec_len (client->domain_server_address);
+  for (i = 0; i < lease->count; i++)
+    clib_memcpy (&lease->domain_server[i].address,
+                (u8 *) & client->domain_server_address[i],
+                sizeof (ip4_address_t));
+
+  clib_memcpy (&lease->host_mac[0], client->client_hardware_address, 6);
 }
 
 static void
@@ -255,6 +264,7 @@ dhcp_client_data_encode (vl_api_dhcp_client_t * vclient,
   else
     vclient->want_dhcp_event = 0;
   vclient->set_broadcast_flag = client->set_broadcast_flag;
+  vclient->dscp = ip_dscp_encode (client->dscp);
   vclient->pid = client->pid;
 }
 
@@ -284,14 +294,13 @@ static void vl_api_dhcp_client_config_t_handler
   vlib_main_t *vm = vlib_get_main ();
   vl_api_dhcp_client_config_reply_t *rmp;
   u32 sw_if_index;
+  ip_dscp_t dscp;
   int rv = 0;
 
+  VALIDATE_SW_IF_INDEX (&(mp->client));
+
   sw_if_index = ntohl (mp->client.sw_if_index);
-  if (!vnet_sw_if_index_is_api_valid (sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-      goto bad_sw_if_index;
-    }
+  dscp = ip_dscp_decode (mp->client.dscp);
 
   rv = dhcp_client_config (mp->is_add,
                           mp->client_index,
@@ -302,10 +311,10 @@ static void vl_api_dhcp_client_config_t_handler
                           (mp->client.want_dhcp_event ?
                            dhcp_compl_event_callback :
                            NULL),
-                          mp->client.set_broadcast_flag, mp->client.pid);
+                          mp->client.set_broadcast_flag,
+                          dscp, mp->client.pid);
 
   BAD_SW_IF_INDEX_LABEL;
-
   REPLY_MACRO (VL_API_DHCP_CLIENT_CONFIG_REPLY);
 }
 
@@ -324,7 +333,7 @@ send_dhcp_client_entry (const dhcp_client_t * client, void *arg)
   ctx = arg;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
 
   mp->_vl_msg_id = ntohs (VL_API_DHCP_CLIENT_DETAILS);
   mp->context = ctx->context;
@@ -356,7 +365,7 @@ vl_api_dhcp_client_dump_t_handler (vl_api_dhcp_client_dump_t * mp)
 /*
  * dhcp_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */