X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Flisp-cp%2Fcontrol.h;h=78d1ffe5e7084712abcbd1e49c59c654a9e2a604;hb=67ec589d231cd27261ccf2265ee8627cfce0fa00;hp=7b0380fbc0ab12a3a7acd08c93da08d2b518718b;hpb=7048ff1e3af7a3979a9134cbbb8157df8e1a8a53;p=vpp.git

diff --git a/src/vnet/lisp-cp/control.h b/src/vnet/lisp-cp/control.h
index 7b0380fbc0a..78d1ffe5e70 100644
--- a/src/vnet/lisp-cp/control.h
+++ b/src/vnet/lisp-cp/control.h
@@ -20,6 +20,7 @@
 #include <vnet/lisp-cp/gid_dictionary.h>
 #include <vnet/lisp-cp/lisp_types.h>
 #include <vppinfra/timing_wheel.h>
+#include <vppinfra/tw_timer_1t_3w_1024sl_ov.h>
 
 #define NUMBER_OF_RETRIES                   1
 #define PENDING_MREQ_EXPIRATION_TIME        3.0	/* seconds */
@@ -103,6 +104,12 @@ typedef struct
   u32 ip4;
 } lisp_api_l2_arp_entry_t;
 
+typedef struct
+{
+  u8 mac[6];
+  u8 ip6[16];
+} lisp_api_ndp_entry_t;
+
 typedef enum
 {
   MR_MODE_DST_ONLY = 0,
@@ -111,7 +118,10 @@ typedef enum
 } map_request_mode_t;
 
 #define foreach_lisp_flag_bit       \
-  _(USE_PETR, "Use Proxy-ETR")                  \
+  _(USE_PETR, "Use Proxy-ETR")                    \
+  _(XTR_MODE, "ITR/ETR mode")                     \
+  _(PETR_MODE, "Proxy-ETR mode")                   \
+  _(PITR_MODE, "Proxy-ITR mode")                  \
   _(STATS_ENABLED, "Statistics enabled")
 
 typedef enum lisp_flag_bits
@@ -134,6 +144,12 @@ typedef struct
   u32 bd;
 } lisp_l2_arp_key_t;
 
+typedef enum
+{
+  LISP_TRANSPORT_PROTOCOL_UDP = 1,
+  LISP_TRANSPORT_PROTOCOL_API
+} lisp_transport_protocol_t;
+
 typedef struct
 {
   u64 nonce;
@@ -180,6 +196,12 @@ typedef struct
   /* hash map of forwarding entries by mapping index */
   u32 *fwd_entry_by_mapping_index;
 
+  /* pool of vectors of rmts per lcl mapping in adjacencies */
+  u32 **lcl_to_rmt_adjacencies;
+
+  /* hash of pool positions of vectors of rmts by lcl mapping index */
+  u32 *lcl_to_rmt_adjs_by_lcl_idx;
+
   /* forwarding entries pool */
   fwd_entry_t *fwd_entry_pool;
 
@@ -228,12 +250,10 @@ typedef struct
   /* Proxy ITR map index */
   u32 pitr_map_index;
 
-  /** Proxy ETR map index */
+  /** Proxy ETR map index used for 'use-petr'.
+   *  Not related to PETR tunnel mode  */
   u32 petr_map_index;
 
-  /* LISP PITR mode */
-  u8 lisp_pitr;
-
   /* mapping index for NSH */
   u32 nsh_map_index;
 
@@ -246,8 +266,8 @@ typedef struct
   /* enable/disable rloc-probing */
   u8 rloc_probing;
 
-  /* timing wheel for mappping timeouts */
-  timing_wheel_t wheel;
+  /* timing wheel for mapping timeouts */
+    TWT (tw_timer_wheel) wheel;
 
   /** Per thread pool of records shared with thread0 */
   map_records_arg_t **map_records_args_pool;
@@ -259,6 +279,12 @@ typedef struct
   u32 max_expired_map_registers;
   u32 expired_map_registers;
 
+  /** either UDP based or binary API. Default is UDP */
+  lisp_transport_protocol_t transport_protocol;
+
+  /** Retry service node index */
+  u32 retry_service_index;
+
   /* commodity */
   ip4_main_t *im4;
   ip6_main_t *im6;
@@ -329,9 +355,11 @@ vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
 				 u32 * map_index_result);
 
 int
-vnet_lisp_add_del_mapping (gid_address_t * deid, locator_t * dlocs, u8 action,
-			   u8 authoritative, u32 ttl, u8 is_add, u8 is_static,
-			   u32 * res_map_index);
+vnet_lisp_add_mapping (vnet_lisp_add_del_mapping_args_t * a,
+		       locator_t * rlocs, u32 * res_map_index,
+		       u8 * is_changed);
+
+int vnet_lisp_del_mapping (gid_address_t * eid, u32 * res_map_index);
 
 typedef struct
 {
@@ -354,6 +382,7 @@ int vnet_lisp_add_del_map_server (ip_address_t * addr, u8 is_add);
 
 clib_error_t *vnet_lisp_enable_disable (u8 is_enabled);
 u8 vnet_lisp_enable_disable_status (void);
+void vnet_lisp_create_retry_process (lisp_cp_main_t * lcm);
 
 int vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add);
 int vnet_lisp_use_petr (ip_address_t * ip, u8 is_add);
@@ -379,7 +408,8 @@ int vnet_lisp_rloc_probe_enable_disable (u8 is_enable);
 int vnet_lisp_map_register_enable_disable (u8 is_enable);
 u8 vnet_lisp_map_register_state_get (void);
 u8 vnet_lisp_rloc_probe_state_get (void);
-int vnet_lisp_add_del_l2_arp_entry (gid_address_t * key, u8 * mac, u8 is_add);
+int vnet_lisp_add_del_l2_arp_ndp_entry (gid_address_t * key, u8 * mac,
+					u8 is_add);
 u32 *vnet_lisp_l2_arp_bds_get (void);
 lisp_api_l2_arp_entry_t *vnet_lisp_l2_arp_entries_get_by_bd (u32 bd);
 int vnet_lisp_nsh_set_locator_set (u8 * locator_set_name, u8 is_add);
@@ -387,6 +417,17 @@ int vnet_lisp_map_register_set_ttl (u32 ttl);
 u32 vnet_lisp_map_register_get_ttl (void);
 int vnet_lisp_map_register_fallback_threshold_set (u32 value);
 u32 vnet_lisp_map_register_fallback_threshold_get (void);
+u32 *vnet_lisp_ndp_bds_get (void);
+lisp_api_ndp_entry_t *vnet_lisp_ndp_entries_get_by_bd (u32 bd);
+u32 vnet_lisp_set_transport_protocol (u8 protocol);
+lisp_transport_protocol_t vnet_lisp_get_transport_protocol (void);
+
+extern int vnet_lisp_enable_disable_xtr_mode (u8 is_enabled);
+extern int vnet_lisp_enable_disable_pitr_mode (u8 is_enabled);
+extern int vnet_lisp_enable_disable_petr_mode (u8 is_enabled);
+extern u8 vnet_lisp_get_xtr_mode (void);
+extern u8 vnet_lisp_get_pitr_mode (void);
+extern u8 vnet_lisp_get_petr_mode (void);
 
 map_records_arg_t *parse_map_reply (vlib_buffer_t * b);