*/
#include <vlib/vlib.h>
#include <vnet/dhcp/proxy.h>
+#include <vnet/fib/fib_table.h>
dhcp_client_main_t dhcp_client_main;
static u8 * format_dhcp_client_state (u8 * s, va_list * va);
static vlib_node_registration_t dhcp_client_process_node;
-void __attribute__((weak))
-api_config_default_ip_route (u8 is_ipv6, u8 is_add, u32 vrf_id,
- u32 sw_if_index, u8 *next_hop_addr)
-{
- /* dummy function */
- return;
-}
-
static void
dhcp_client_acquire_address (dhcp_client_main_t * dcm, dhcp_client_t * c)
{
/* Replace the existing hostname if necessary */
vec_free (c->hostname);
vec_validate (c->hostname, o->length - 1);
- memcpy (c->hostname, o->data, o->length);
+ clib_memcpy (c->hostname, o->data, o->length);
}
break;
/*
* Configure default IP route:
- * - vrf_id is 0 by default.
*/
if (c->router_address.as_u32)
- api_config_default_ip_route (0 /* is_ipv6 */,
- 1 /* is_add */,
- 0 /* vrf_id */,
- c->sw_if_index,
- (u8 *)&c->router_address);
+ {
+ fib_prefix_t all_0s =
+ {
+ .fp_len = 0,
+ .fp_addr.ip4.as_u32 = 0x0,
+ .fp_proto = FIB_PROTOCOL_IP4,
+ };
+ ip46_address_t nh =
+ {
+ .ip4 = c->router_address,
+ };
+
+ fib_table_entry_path_add (fib_table_get_index_for_sw_if_index(
+ FIB_PROTOCOL_IP4,
+ c->sw_if_index),
+ &all_0s,
+ FIB_SOURCE_DHCP,
+ FIB_ENTRY_FLAG_NONE,
+ FIB_PROTOCOL_IP4,
+ &nh,
+ c->sw_if_index,
+ ~0,
+ 1,
+ MPLS_LABEL_INVALID,
+ FIB_ROUTE_PATH_FLAG_NONE);
+ }
/*
* Call the user's event callback to report DHCP information
{
f = vlib_get_frame_to_node (vm, hw->output_node_index);
vnet_buffer(b)->sw_if_index[VLIB_TX] = c->sw_if_index;
- memcpy (b->data, c->l2_rewrite, vec_len(c->l2_rewrite));
+ clib_memcpy (b->data, c->l2_rewrite, vec_len(c->l2_rewrite));
ip = (void *)
(((u8 *)vlib_buffer_get_current (b)) + vec_len (c->l2_rewrite));
}
udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_dhcp_to_server);
/* Send the interface MAC address */
- memcpy (dhcp->client_hardware_address, c->l2_rewrite + 6, 6);
+ clib_memcpy (dhcp->client_hardware_address, c->l2_rewrite + 6, 6);
/* Lease renewal, set up client_ip_address */
if (is_broadcast == 0)
{
o->option = 54;
o->length = 4;
- memcpy (o->data, &c->dhcp_server.as_u32, 4);
+ clib_memcpy (o->data, &c->dhcp_server.as_u32, 4);
o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
}
{
o->option = 50;
o->length = 4;
- memcpy (o->data, &c->leased_address.as_u32, 4);
+ clib_memcpy (o->data, &c->leased_address.as_u32, 4);
o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
}
{
o->option = 12;
o->length = vec_len (c->hostname);
- memcpy (o->data, c->hostname, vec_len (c->hostname));
+ clib_memcpy (o->data, c->hostname, vec_len (c->hostname));
o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
}
*/
o->option = 55;
o->length = vec_len (c->option_55_data);
- memcpy (o->data, c->option_55_data, vec_len(c->option_55_data));
+ clib_memcpy (o->data, c->option_55_data, vec_len(c->option_55_data));
o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
/* End of list */
if (now > c->lease_expires)
{
if (c->router_address.as_u32)
- api_config_default_ip_route (0 /* is_ipv6 */,
- 0 /* is_add */,
- 0 /* vrf_id */,
- c->sw_if_index,
- (u8 *)&c->router_address);
+ {
+ fib_prefix_t all_0s =
+ {
+ .fp_len = 0,
+ .fp_addr.ip4.as_u32 = 0x0,
+ .fp_proto = FIB_PROTOCOL_IP4,
+ };
+ ip46_address_t nh = {
+ .ip4 = c->router_address,
+ };
+
+ fib_table_entry_path_remove(fib_table_get_index_for_sw_if_index(
+ FIB_PROTOCOL_IP4,
+ c->sw_if_index),
+ &all_0s,
+ FIB_SOURCE_DHCP,
+ FIB_PROTOCOL_IP4,
+ &nh,
+ c->sw_if_index,
+ ~0,
+ 1,
+ FIB_ROUTE_PATH_FLAG_NONE);
+ }
dhcp_client_release_address (dcm, c);
c->state = DHCP_DISCOVER;
p = hash_get (dcm->client_by_sw_if_index, sw_if_index);
if (p == 0)
return clib_error_return (0, "dhcp client not configured");
- c = pool_elt_at_index (dcm->clients, sw_if_index);
+ c = pool_elt_at_index (dcm->clients, p[0]);
vlib_cli_output (vm, "%U", format_dhcp_client, dcm, c, verbose);
return 0;
}
vlib_main_t * vm = dcm->vlib_main;
dhcp_client_t * c;
uword * p;
+ fib_prefix_t all_1s =
+ {
+ .fp_len = 32,
+ .fp_addr.ip4.as_u32 = 0xffffffff,
+ .fp_proto = FIB_PROTOCOL_IP4,
+ };
+ fib_prefix_t all_0s =
+ {
+ .fp_len = 0,
+ .fp_addr.ip4.as_u32 = 0x0,
+ .fp_proto = FIB_PROTOCOL_IP4,
+ };
p = hash_get (dcm->client_by_sw_if_index, a->sw_if_index);
} while (c->transaction_id == 0);
set_l2_rewrite (dcm, c);
hash_set (dcm->client_by_sw_if_index, a->sw_if_index, c - dcm->clients);
+
+ /* this add is ref counted by FIB so we can add for each itf */
+ fib_table_entry_special_add(fib_table_get_index_for_sw_if_index(
+ FIB_PROTOCOL_IP4,
+ c->sw_if_index),
+ &all_1s,
+ FIB_SOURCE_DHCP,
+ FIB_ENTRY_FLAG_LOCAL,
+ ADJ_INDEX_INVALID);
+
+ /*
+ * enable the interface to RX IPv4 packets
+ * this is also ref counted
+ */
+ ip4_sw_interface_enable_disable (c->sw_if_index, 1);
+
vlib_process_signal_event (vm, dhcp_client_process_node.index,
EVENT_DHCP_CLIENT_WAKEUP, c - dcm->clients);
}
{
c = pool_elt_at_index (dcm->clients, p[0]);
+ fib_table_entry_special_remove(fib_table_get_index_for_sw_if_index(
+ FIB_PROTOCOL_IP4,
+ c->sw_if_index),
+ &all_1s,
+ FIB_SOURCE_DHCP);
+
if (c->router_address.as_u32)
- api_config_default_ip_route (0 /* is_ipv6 */,
- 0 /* is_add */,
- 0 /* vrf_id */,
- c->sw_if_index,
- (u8 *)&c->router_address);
+ {
+ ip46_address_t nh = {
+ .ip4 = c->router_address,
+ };
+
+ fib_table_entry_path_remove(fib_table_get_index_for_sw_if_index(
+ FIB_PROTOCOL_IP4,
+ c->sw_if_index),
+ &all_0s,
+ FIB_SOURCE_DHCP,
+ FIB_PROTOCOL_IP4,
+ &nh,
+ c->sw_if_index,
+ ~0,
+ 1,
+ FIB_ROUTE_PATH_FLAG_NONE);
+ }
+ ip4_sw_interface_enable_disable (c->sw_if_index, 0);
+
vec_free (c->option_55_data);
vec_free (c->hostname);
vec_free (c->client_identifier);
Code Review / vpp.git / blobdiff