commit fca0c242e4edfdb05231ef18d60c14273067ff0a
author Neale Ranns <nranns@cisco.com> Fri Jan 13 07:57:46 2017 -0800
committer Neale Ranns <nranns@cisco.com> Thu Jan 26 05:14:35 2017 -0800
tree 440c9952bd79e9c58699eb787a619803c5fa49fa
parent dc90d423a547f3f948953e427b681f2834c8a9d6

DHCPv[46] proxy tests

Change-Id: I6aaf9c602cd515ed9d4416d286f9191d048c1a87
Signed-off-by: Neale Ranns <nranns@cisco.com>

src/vnet/dhcp/proxy_node.c

diff --git a/src/vnet/dhcp/proxy_node.c b/src/vnet/dhcp/proxy_node.c
index d0d99d7..6a58fcd 100644
--- a/src/vnet/dhcp/proxy_node.c
+++ b/src/vnet/dhcp/proxy_node.c
@@ -703,6 +703,12 @@
   dhcp_server_t * server = 0;
   u32 server_index = 0;
   u32 rx_fib_index = 0;
+  const fib_prefix_t all_1s =
+  {
+      .fp_len = 32,
+      .fp_addr.ip4.as_u32 = 0xffffffff,
+      .fp_proto = FIB_PROTOCOL_IP4,
+  };
 
   if (addr->as_u32 == 0)
     return VNET_API_ERROR_INVALID_DST_ADDRESS;
@@ -720,8 +726,18 @@
       if (is_del)
         {
           memset (server, 0, sizeof (*server));
-          return 0;
+          fib_table_entry_special_remove(rx_fib_index,
+                                         &all_1s,
+                                         FIB_SOURCE_DHCP);
+         return 0;
         }
+      if (!server->valid)
+          fib_table_entry_special_add(rx_fib_index,
+                                      &all_1s,
+                                      FIB_SOURCE_DHCP,
+                                      FIB_ENTRY_FLAG_LOCAL,
+                                      ADJ_INDEX_INVALID);
+
       goto initialize_it;
     }
 
@@ -738,6 +754,11 @@
       server = pool_elt_at_index (dpm->dhcp_servers, server_index);
       memset (server, 0, sizeof (*server));
       pool_put (dpm->dhcp_servers, server);
+
+      fib_table_entry_special_remove(rx_fib_index,
+                                     &all_1s,
+                                     FIB_SOURCE_DHCP);
+
       return 0;
     }
 
@@ -752,9 +773,16 @@
     }
 
   pool_get (dpm->dhcp_servers, server);
+
+  fib_table_entry_special_add(rx_fib_index,
+                              &all_1s,
+                              FIB_SOURCE_DHCP,
+                              FIB_ENTRY_FLAG_LOCAL,
+                              ADJ_INDEX_INVALID);
   
  initialize_it:
 
+
   server->dhcp_server.as_u32 = addr->as_u32;
   server->server_fib_index = 
       fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4,