#include <vnet/interface.h>
#include <vnet/api_errno.h>
-#include <vnet/dhcp/proxy.h>
+#include <vnet/dhcp/dhcp_proxy.h>
#include <vnet/dhcp/client.h>
-#include <vnet/dhcpv6/proxy.h>
#include <vnet/vnet_msg_enum.h>
#define foreach_vpe_api_msg \
_(DHCP_PROXY_CONFIG,dhcp_proxy_config) \
-_(DHCP_PROXY_CONFIG_2,dhcp_proxy_config_2) \
+_(DHCP_PROXY_DUMP,dhcp_proxy_dump) \
+_(DHCP_PROXY_DETAILS,dhcp_proxy_details) \
_(DHCP_PROXY_SET_VSS,dhcp_proxy_set_vss) \
_(DHCP_CLIENT_CONFIG, dhcp_client_config)
+
static void
-dhcpv4_proxy_config (vl_api_dhcp_proxy_config_t * mp)
+vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t * mp)
{
- vl_api_dhcp_proxy_config_reply_t *rmp;
+ vl_api_dhcp_proxy_set_vss_reply_t *rmp;
int rv;
- rv = dhcp_proxy_set_server ((ip4_address_t *) (&mp->dhcp_server),
- (ip4_address_t *) (&mp->dhcp_src_address),
- (u32) ntohl (mp->vrf_id),
- (int) mp->insert_circuit_id,
- (int) (mp->is_add == 0));
+ rv = dhcp_proxy_set_vss ((mp->is_ipv6 ?
+ FIB_PROTOCOL_IP6 :
+ FIB_PROTOCOL_IP4),
+ ntohl (mp->tbl_id),
+ ntohl (mp->oui),
+ ntohl (mp->fib_id), (int) mp->is_add == 0);
- REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
+ REPLY_MACRO (VL_API_DHCP_PROXY_SET_VSS_REPLY);
}
-static void
-dhcpv6_proxy_config (vl_api_dhcp_proxy_config_t * mp)
+static void vl_api_dhcp_proxy_config_t_handler
+ (vl_api_dhcp_proxy_config_t * mp)
{
- vl_api_dhcp_proxy_config_reply_t *rmp;
+ vl_api_dhcp_proxy_set_vss_reply_t *rmp;
+ ip46_address_t src, server;
int rv = -1;
- rv = dhcpv6_proxy_set_server ((ip6_address_t *) (&mp->dhcp_server),
- (ip6_address_t *) (&mp->dhcp_src_address),
- (u32) ntohl (mp->vrf_id),
- (int) mp->insert_circuit_id,
- (int) (mp->is_add == 0));
+ if (mp->is_ipv6)
+ {
+ clib_memcpy (&src.ip6, mp->dhcp_src_address, sizeof (src.ip6));
+ clib_memcpy (&server.ip6, mp->dhcp_server, sizeof (server.ip6));
+
+ rv = dhcp6_proxy_set_server (&server,
+ &src,
+ (u32) ntohl (mp->rx_vrf_id),
+ (u32) ntohl (mp->server_vrf_id),
+ (int) (mp->is_add == 0));
+ }
+ else
+ {
+ ip46_address_reset (&src);
+ ip46_address_reset (&server);
- REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
-}
+ clib_memcpy (&src.ip4, mp->dhcp_src_address, sizeof (src.ip4));
+ clib_memcpy (&server.ip4, mp->dhcp_server, sizeof (server.ip4));
-static void
-dhcpv4_proxy_config_2 (vl_api_dhcp_proxy_config_2_t * mp)
-{
- vl_api_dhcp_proxy_config_reply_t *rmp;
- int rv;
+ rv = dhcp4_proxy_set_server (&server,
+ &src,
+ (u32) ntohl (mp->rx_vrf_id),
+ (u32) ntohl (mp->server_vrf_id),
+ (int) (mp->is_add == 0));
+ }
- rv = dhcp_proxy_set_server_2 ((ip4_address_t *) (&mp->dhcp_server),
- (ip4_address_t *) (&mp->dhcp_src_address),
- (u32) ntohl (mp->rx_vrf_id),
- (u32) ntohl (mp->server_vrf_id),
- (int) mp->insert_circuit_id,
- (int) (mp->is_add == 0));
- REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_2_REPLY);
+ REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
}
-
static void
-dhcpv6_proxy_config_2 (vl_api_dhcp_proxy_config_2_t * mp)
+vl_api_dhcp_proxy_dump_t_handler (vl_api_dhcp_proxy_dump_t * mp)
{
- vl_api_dhcp_proxy_config_reply_t *rmp;
- int rv = -1;
+ unix_shared_memory_queue_t *q;
- rv = dhcpv6_proxy_set_server_2 ((ip6_address_t *) (&mp->dhcp_server),
- (ip6_address_t *) (&mp->dhcp_src_address),
- (u32) ntohl (mp->rx_vrf_id),
- (u32) ntohl (mp->server_vrf_id),
- (int) mp->insert_circuit_id,
- (int) (mp->is_add == 0));
+ q = vl_api_client_index_to_input_queue (mp->client_index);
+ if (q == 0)
+ return;
- REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_2_REPLY);
+ dhcp_proxy_dump ((mp->is_ip6 == 0 ?
+ FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4), q, mp->context);
}
-
-static void
-vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t * mp)
+void
+dhcp_send_details (fib_protocol_t proto,
+ void *opaque,
+ u32 context,
+ const ip46_address_t * server,
+ const ip46_address_t * src,
+ u32 server_fib_id,
+ u32 rx_fib_id, u32 vss_fib_id, u32 vss_oui)
{
- vl_api_dhcp_proxy_set_vss_reply_t *rmp;
- int rv;
- if (!mp->is_ipv6)
- rv = dhcp_proxy_set_option82_vss (ntohl (mp->tbl_id),
- ntohl (mp->oui),
- ntohl (mp->fib_id),
- (int) mp->is_add == 0);
- else
- rv = dhcpv6_proxy_set_vss (ntohl (mp->tbl_id),
- ntohl (mp->oui),
- ntohl (mp->fib_id), (int) mp->is_add == 0);
+ vl_api_dhcp_proxy_details_t *mp;
+ unix_shared_memory_queue_t *q = opaque;
- REPLY_MACRO (VL_API_DHCP_PROXY_SET_VSS_REPLY);
+ mp = vl_msg_api_alloc (sizeof (*mp));
+ if (!mp)
+ return;
+ memset (mp, 0, sizeof (*mp));
+ mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_DETAILS);
+ mp->context = context;
+
+ mp->rx_vrf_id = htonl (rx_fib_id);
+ mp->server_vrf_id = htonl (server_fib_id);
+ mp->vss_oui = htonl (vss_oui);
+ mp->vss_fib_id = htonl (vss_fib_id);
+
+ mp->is_ipv6 = (proto == FIB_PROTOCOL_IP6);
+
+ if (mp->is_ipv6)
+ {
+ memcpy (mp->dhcp_server, server, 16);
+ memcpy (mp->dhcp_src_address, src, 16);
+ }
+ else
+ {
+ /* put the address in the first bytes */
+ memcpy (mp->dhcp_server, &server->ip4, 4);
+ memcpy (mp->dhcp_src_address, &src->ip4, 4);
+ }
+ vl_msg_api_send_shmem (q, (u8 *) & mp);
}
-static void vl_api_dhcp_proxy_config_t_handler
- (vl_api_dhcp_proxy_config_t * mp)
+static void
+vl_api_dhcp_proxy_details_t_handler (vl_api_dhcp_proxy_details_t * mp)
{
- if (mp->is_ipv6 == 0)
- dhcpv4_proxy_config (mp);
- else
- dhcpv6_proxy_config (mp);
+ clib_warning ("BUG");
}
void
vl_msg_api_send_shmem (q, (u8 *) & mp);
}
-static void vl_api_dhcp_proxy_config_2_t_handler
- (vl_api_dhcp_proxy_config_2_t * mp)
-{
- if (mp->is_ipv6 == 0)
- dhcpv4_proxy_config_2 (mp);
- else
- dhcpv6_proxy_config_2 (mp);
-}
-
static void vl_api_dhcp_client_config_t_handler
(vl_api_dhcp_client_config_t * mp)
{