ip: Protocol Independent IP Neighbors

[vpp.git] / src / plugins / dhcp / dhcp6_pd_client_dp.c

diff --git a/src/plugins/dhcp/dhcp6_pd_client_dp.c b/src/plugins/dhcp/dhcp6_pd_client_dp.c
index 74a1f16..980c83c 100644 (file)
--- a/src/plugins/dhcp/dhcp6_pd_client_dp.c
+++ b/src/plugins/dhcp/dhcp6_pd_client_dp.c
@@ -20,10 +20,10 @@
 #include <vnet/mfib/ip6_mfib.h>
 #include <vnet/fib/fib.h>
 #include <vnet/adj/adj_mcast.h>
-#include <vnet/ip/ip6_neighbor.h>
 #include <dhcp/dhcp6_pd_client_dp.h>
 #include <dhcp/dhcp6_client_common_dp.h>
 #include <vnet/ip/ip_types_api.h>
+#include <vnet/ip/ip6_link.h>
 
 dhcp6_pd_client_main_t dhcp6_pd_client_main;
 dhcp6_pd_client_public_main_t dhcp6_pd_client_public_main;
@@ -85,35 +85,26 @@ create_buffer_for_client_message (vlib_main_t * vm,
                                  * client_state, u32 type)
 {
   dhcp6_client_common_main_t *ccm = &dhcp6_client_common_main;
-  vnet_main_t *vnm = vnet_get_main ();
-
   vlib_buffer_t *b;
   u32 bi;
   ip6_header_t *ip;
   udp_header_t *udp;
   dhcpv6_header_t *dhcp;
-  ip6_address_t src_addr;
+  const ip6_address_t *src_addr;
   u32 dhcp_opt_len = 0;
   client_state->transaction_start = vlib_time_now (vm);
   u32 n_prefixes;
   u32 i;
 
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  vnet_sw_interface_t *sup_sw = vnet_get_sup_sw_interface (vnm, sw_if_index);
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index);
-
-  /* Interface(s) down? */
-  if ((hw->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) == 0)
-    return NULL;
-  if ((sup_sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) == 0)
-    return NULL;
-  if ((sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) == 0)
-    return NULL;
+  /*
+   * Note: do NOT psychoanalyze link-state here.
+   * If the interface is down, let the driver turf the packet.
+   */
 
   /* Get a link-local address */
-  src_addr = ip6_neighbor_get_link_local_address (sw_if_index);
+  src_addr = ip6_get_link_local_address (sw_if_index);
 
-  if (src_addr.as_u8[0] != 0xfe)
+  if (src_addr->as_u8[0] != 0xfe)
     {
       clib_warning ("Could not find source address to send DHCPv6 packet");
       return NULL;
@@ -138,7 +129,7 @@ create_buffer_for_client_message (vlib_main_t * vm,
   udp = (udp_header_t *) (ip + 1);
   dhcp = (dhcpv6_header_t *) (udp + 1);
 
-  ip->src_address = src_addr;
+  ip->src_address = *src_addr;
   ip->hop_limit = 255;
   ip->ip_version_traffic_class_and_flow_label =
     clib_host_to_net_u32 (0x6 << 28);
@@ -298,10 +289,10 @@ check_pd_send_client_message (vlib_main_t * vm,
   else
     {
       client_state->sleep_interval =
-       (2 + random_f64_from_to (-0.1, 0.1)) * client_state->sleep_interval;
+       (2.0 + random_f64_from_to (-0.1, 0.1)) * client_state->sleep_interval;
       if (client_state->sleep_interval > params->mrt)
        client_state->sleep_interval =
-         (1 + random_f64_from_to (-0.1, 0.1)) * params->mrt;
+         (1.0 + random_f64_from_to (-0.1, 0.1)) * params->mrt;
 
       client_state->due_time = current_time + client_state->sleep_interval;
 
@@ -404,12 +395,9 @@ dhcp6_pd_send_client_message (vlib_main_t * vm, u32 sw_if_index, u8 stop,
       client_state->buffer =
        create_buffer_for_client_message (vm, sw_if_index, client_state,
                                          params->msg_type);
-      if (!client_state->buffer)
-       client_state->keep_sending_client_message = 0;
-      else
-       vlib_process_signal_event (vm,
-                                  send_dhcp6_pd_client_message_process_node.index,
-                                  1, 0);
+      if (client_state->buffer)
+       vlib_process_signal_event
+         (vm, send_dhcp6_pd_client_message_process_node.index, 1, 0);
     }
 }