dhcp: multiple additions

DHCP additions:
1) DHCPv4 will only relay a message back to the client, if the Option82 information is present. So make this the default.
2) It is no longer possible to select via the API to "insert circuit ID" - since this is now default
3) Remove the version 2 API since it's now the same as version 1.
4) Adding the VSS option is now conditional only on the presence of VSS config (not the 'insert' option in the set API)
5) DHCP proxy dump via API

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

1 files changed, 9 insertions, 10 deletions

diff --git a/src/vnet/dhcpv6/proxy.h b/src/vnet/dhcpv6/proxy.h
index 9e18913a970..77ced3619c4 100644
--- a/src/vnet/dhcpv6/proxy.h
+++ b/src/vnet/dhcpv6/proxy.h
@@ -48,9 +48,7 @@ typedef union {
 typedef struct {
   ip6_address_t dhcp6_server;
   ip6_address_t dhcp6_src_address;
-  u32 insert_vss;
   u32 server_fib6_index;
-  u32 valid;
 } dhcpv6_server_t;
 
 typedef struct {
@@ -70,7 +68,7 @@ typedef struct {
   dhcpv6_vss_info *vss;
 
   /* hash lookup specific vrf_id -> VSS vector index*/
-  uword  *vss_index_by_vrf_id;
+  u32 *vss_index_by_rx_fib_index;
    
   /* convenience */
   vlib_main_t * vlib_main;
@@ -79,17 +77,18 @@ typedef struct {
 
 dhcpv6_proxy_main_t dhcpv6_proxy_main;
 
-int dhcpv6_proxy_set_server (ip6_address_t *addr, ip6_address_t *src_address,
-                             u32 fib_id, int insert_vss, int is_del);
-
 int dhcpv6_proxy_set_vss(u32 tbl_id,
                          u32 oui,
                          u32 fib_id, 
                          int is_del);
 
-int dhcpv6_proxy_set_server_2 (ip6_address_t *addr, ip6_address_t *src_address,
-                             u32 rx_fib_id,
-                             u32 server_fib_id,
-                             int insert_vss, int is_del);
+int dhcpv6_proxy_set_server(ip6_address_t *addr,
+                            ip6_address_t *src_address,
+                            u32 rx_fib_id,
+                            u32 server_fib_id,
+                            int is_del);
+
+void dhcpv6_proxy_dump(void *opaque,
+                       u32 context);
 
 #endif /* included_dhcpv6_proxy_h */