#include <vnet/api_errno.h>
#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/ip/ip_types_api.h>
#include <vnet/vnet_msg_enum.h>
_(DHCP_PROXY_CONFIG,dhcp_proxy_config) \
_(DHCP_PROXY_DUMP,dhcp_proxy_dump) \
_(DHCP_PROXY_SET_VSS,dhcp_proxy_set_vss) \
-_(DHCP_CLIENT_CONFIG, dhcp_client_config)
+_(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) \
+_(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
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);
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),
}
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);
}
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;
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);
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);
}
-void
-dhcp_compl_event_callback (u32 client_index, u32 pid, u8 * hostname,
- u8 mask_width, u8 is_ipv6, u8 * host_address,
- u8 * router_address, u8 * host_mac)
+static void
+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 = 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.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
+dhcp_client_data_encode (vl_api_dhcp_client_t * vclient,
+ const dhcp_client_t * client)
+{
+ size_t len;
+
+ vclient->sw_if_index = ntohl (client->sw_if_index);
+ len = clib_min (sizeof (vclient->hostname) - 1, vec_len (client->hostname));
+ clib_memcpy (&vclient->hostname, client->hostname, len);
+ vclient->hostname[len] = 0;
+
+ len = clib_min (sizeof (vclient->id) - 1,
+ vec_len (client->client_identifier));
+ clib_memcpy (&vclient->id, client->client_identifier, len);
+ vclient->id[len] = 0;
+
+ if (NULL != client->event_callback)
+ vclient->want_dhcp_event = 1;
+ 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;
+}
+
+static void
+dhcp_compl_event_callback (u32 client_index, const dhcp_client_t * client)
{
vl_api_registration_t *reg;
vl_api_dhcp_compl_event_t *mp;
- u32 len;
reg = vl_api_client_index_to_registration (client_index);
if (!reg)
mp = vl_msg_api_alloc (sizeof (*mp));
mp->client_index = client_index;
- mp->pid = pid;
- mp->is_ipv6 = is_ipv6;
- len = (vec_len (hostname) < 63) ? vec_len (hostname) : 63;
- clib_memcpy (&mp->hostname, hostname, len);
- mp->hostname[len] = 0;
- mp->mask_width = mask_width;
- clib_memcpy (&mp->host_address[0], host_address, 16);
- clib_memcpy (&mp->router_address[0], router_address, 16);
-
- if (NULL != host_mac)
- clib_memcpy (&mp->host_mac[0], host_mac, 6);
+ mp->pid = client->pid;
+ dhcp_client_lease_encode (&mp->lease, client);
mp->_vl_msg_id = ntohs (VL_API_DHCP_COMPL_EVENT);
{
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);
+ VALIDATE_SW_IF_INDEX (&(mp->client));
- rv = dhcp_client_config (vm, ntohl (mp->sw_if_index),
- mp->hostname, mp->client_id,
- mp->is_add, mp->client_index,
- mp->want_dhcp_event ? dhcp_compl_event_callback :
- NULL, mp->set_broadcast_flag, mp->pid);
+ sw_if_index = ntohl (mp->client.sw_if_index);
+ dscp = ip_dscp_decode (mp->client.dscp);
- BAD_SW_IF_INDEX_LABEL;
+ rv = dhcp_client_config (mp->is_add,
+ mp->client_index,
+ vm,
+ sw_if_index,
+ mp->client.hostname,
+ mp->client.id,
+ (mp->client.want_dhcp_event ?
+ dhcp_compl_event_callback :
+ NULL),
+ mp->client.set_broadcast_flag,
+ dscp, mp->client.pid);
+ BAD_SW_IF_INDEX_LABEL;
REPLY_MACRO (VL_API_DHCP_CLIENT_CONFIG_REPLY);
}
+typedef struct dhcp_client_send_walk_ctx_t_
+{
+ vl_api_registration_t *reg;
+ u32 context;
+} dhcp_client_send_walk_ctx_t;
+
+static int
+send_dhcp_client_entry (const dhcp_client_t * client, void *arg)
+{
+ dhcp_client_send_walk_ctx_t *ctx;
+ vl_api_dhcp_client_details_t *mp;
+
+ ctx = arg;
+
+ mp = vl_msg_api_alloc (sizeof (*mp));
+ clib_memset (mp, 0, sizeof (*mp));
+
+ mp->_vl_msg_id = ntohs (VL_API_DHCP_CLIENT_DETAILS);
+ mp->context = ctx->context;
+
+ dhcp_client_data_encode (&mp->client, client);
+ dhcp_client_lease_encode (&mp->lease, client);
+
+ vl_api_send_msg (ctx->reg, (u8 *) mp);
+
+ return (1);
+}
+
+static void
+vl_api_dhcp_client_dump_t_handler (vl_api_dhcp_client_dump_t * mp)
+{
+ vl_api_registration_t *reg;
+
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
+
+ dhcp_client_send_walk_ctx_t ctx = {
+ .reg = reg,
+ .context = mp->context,
+ };
+ dhcp_client_walk (send_dhcp_client_entry, &ctx);
+}
+
/*
* 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()
*/
*/
setup_message_id_table (am);
+ 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;
}