IPv6 Performance bugs

[vpp.git] / src / vnet / dhcp / dhcp6_proxy_node.c

diff --git a/src/vnet/dhcp/dhcp6_proxy_node.c b/src/vnet/dhcp/dhcp6_proxy_node.c
index 524cb09..885313a 100644 (file)
--- a/src/vnet/dhcp/dhcp6_proxy_node.c
+++ b/src/vnet/dhcp/dhcp6_proxy_node.c
@@ -19,9 +19,9 @@
 #include <vnet/pg/pg.h>
 #include <vnet/dhcp/dhcp_proxy.h>
 #include <vnet/dhcp/dhcp6_packet.h>
-#include <vnet/fib/ip6_fib.h>
 #include <vnet/mfib/mfib_table.h>
 #include <vnet/mfib/ip6_mfib.h>
+#include <vnet/fib/fib.h>
 
 static char * dhcpv6_proxy_error_strings[] = {
 #define dhcpv6_proxy_error(n,s) s,
@@ -883,6 +883,7 @@ dhcp6_proxy_set_server (ip46_address_t *addr,
          mfib_table_entry_update(rx_fib_index,
                                  &all_dhcp_servers,
                                  MFIB_SOURCE_DHCP,
+                                 MFIB_RPF_ID_NONE,
                                  MFIB_ENTRY_FLAG_ACCEPT_ALL_ITF);
          mfib_table_lock(rx_fib_index, FIB_PROTOCOL_IP6);
      }
@@ -965,7 +966,7 @@ static u8 *
 format_dhcp6_proxy_server (u8 * s, va_list * args)
 {
   dhcp_proxy_t * proxy = va_arg (*args, dhcp_proxy_t *);
-  ip6_fib_t *server_fib;
+  fib_table_t *server_fib;
   dhcp_server_t *server;
   ip6_mfib_t *rx_fib;
 
@@ -984,9 +985,10 @@ format_dhcp6_proxy_server (u8 * s, va_list * args)
 
   vec_foreach(server, proxy->dhcp_servers)
   {
-      server_fib = ip6_fib_get(server->server_fib_index);
+      server_fib = fib_table_get(server->server_fib_index,
+                                 FIB_PROTOCOL_IP6);
       s = format (s, "%u,%U  ",
-                  server_fib->table_id,
+                  server_fib->ft_table_id,
                   format_ip46_address, &server->dhcp_server, IP46_TYPE_ANY);
   }