dhcp: send unicast and broadcast packets via the IP adjacency

[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 cd30e1d..7eb2bf4 100644 (file)
--- a/src/vnet/dhcp/dhcp_api.c
+++ b/src/vnet/dhcp/dhcp_api.c
@@ -218,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);
@@ -227,11 +228,18 @@ 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);
-
-  if (NULL != client->l2_rewrite)
-    clib_memcpy (&lease->host_mac[0], client->l2_rewrite + 6, 6);
+  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));
+
+  clib_memcpy (&lease->host_mac[0], client->client_hardware_address, 6);
 }
 
 static void
@@ -356,7 +364,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()
  */