Fix VPP-1487 DHCP client does not support option 6-domain server

[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 5aed4c0..d71ffe9 100644 (file)
--- a/src/vnet/dhcp/dhcp_api.c
+++ b/src/vnet/dhcp/dhcp_api.c
@@ -25,6 +25,8 @@
 #include <vnet/dhcp/dhcp_proxy.h>
 #include <vnet/dhcp/client.h>
 #include <vnet/dhcp/dhcp6_pd_client_dp.h>
+#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/vnet_msg_enum.h>
@@ -53,7 +55,10 @@ _(DHCP_CLIENT_CONFIG, dhcp_client_config)         \
 _(DHCP_CLIENT_DUMP, dhcp_client_dump)             \
 _(WANT_DHCP6_PD_REPLY_EVENTS, want_dhcp6_pd_reply_events)               \
 _(DHCP6_PD_SEND_CLIENT_MESSAGE, dhcp6_pd_send_client_message)           \
-_(DHCP6_CLIENTS_ENABLE_DISABLE, dhcp6_clients_enable_disable)
+_(WANT_DHCP6_REPLY_EVENTS, want_dhcp6_reply_events)               \
+_(DHCP6_SEND_CLIENT_MESSAGE, dhcp6_send_client_message)           \
+_(DHCP6_CLIENTS_ENABLE_DISABLE, dhcp6_clients_enable_disable)     \
+_(DHCP6_DUID_LL_SET, dhcp6_duid_ll_set)
 
 
 static void
@@ -143,7 +148,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;
@@ -213,6 +218,7 @@ 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);
@@ -222,8 +228,16 @@ dhcp_client_lease_encode (vl_api_dhcp_lease_t * lease,
   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);
+  clib_memcpy (&lease->host_address[0], (u8 *) & client->leased_address,
+              sizeof (ip4_address_t));
+  clib_memcpy (&lease->router_address[0], (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));
 
   if (NULL != client->l2_rewrite)
     clib_memcpy (&lease->host_mac[0], client->l2_rewrite + 6, 6);
@@ -319,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;
@@ -351,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()
  */
@@ -389,6 +403,8 @@ dhcp_api_hookup (vlib_main_t * vm)
 
   dhcp6_pd_set_publisher_node (dhcp6_pd_reply_process_node.index,
                               DHCP6_PD_DP_REPLY_REPORT);
+  dhcp6_set_publisher_node (dhcp6_reply_process_node.index,
+                           DHCP6_DP_REPLY_REPORT);
 
   return 0;
 }