aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/dhcp/dhcp6_proxy_node.c
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-05-22 09:20:20 -0400
committerDamjan Marion <dmarion.lists@gmail.com>2017-05-24 19:48:43 +0000
commit630198f04916deb35c5b7774823ae1a5dd168a6c (patch)
tree093682c49f0a3a7e114d52abb77a5f85bdb7a7b0 /src/vnet/dhcp/dhcp6_proxy_node.c
parent31426c6fee43caf18602a2a7e2ce32c3dda75a29 (diff)
IPv6 Performance bugs
- inline the FIB lookup function; this requires access to the bihash, so for files that use more than one type this casues problems. those files that include ip6_fib.h unnecessarily have been updated - better use of the feature arcs. ip6-lookup and interface-output are now sentinels (end-node-index in the cm speak) rather than enabled features. Change-Id: I9d1375fee63f7dbb2d327da6124d8e60b63367ec Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/dhcp/dhcp6_proxy_node.c')
-rw-r--r--src/vnet/dhcp/dhcp6_proxy_node.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/vnet/dhcp/dhcp6_proxy_node.c b/src/vnet/dhcp/dhcp6_proxy_node.c
index de73154dddb..885313a588e 100644
--- 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,
@@ -966,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;
@@ -985,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);
}