X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Flisp-cp%2Fcontrol.h;h=d9dc81d1a78a6d77ae4af1dbc68cbe6210ba6008;hb=2fdaece0876465d6980ac6922099502a84e1e029;hp=0193661ada727f46cd6e6a4c6c95e737aa8e62bd;hpb=f4691cd7befd4cf31a63adffc204d71b1f1548e1;p=vpp.git

diff --git a/vnet/vnet/lisp-cp/control.h b/vnet/vnet/lisp-cp/control.h
index 0193661ada7..d9dc81d1a78 100644
--- a/vnet/vnet/lisp-cp/control.h
+++ b/vnet/vnet/lisp-cp/control.h
@@ -21,7 +21,7 @@
 #include <vnet/lisp-cp/lisp_types.h>
 
 #define NUMBER_OF_RETRIES                   1
-#define PENDING_MREQ_EXPIRATION_TIME        3.0 /* seconds */
+#define PENDING_MREQ_EXPIRATION_TIME        3.0	/* seconds */
 #define PENDING_MREQ_QUEUE_LEN              5
 
 typedef struct
@@ -31,15 +31,15 @@ typedef struct
   u32 retries_num;
   f64 time_to_expire;
   u8 is_smr_invoked;
-  u64 * nonces;
+  u64 *nonces;
   u8 to_be_removed;
 } pending_map_request_t;
 
 typedef struct
 {
-  gid_address_t seid;
-  gid_address_t deid;
-  locator_pair_t * locator_pairs;
+  gid_address_t leid;
+  gid_address_t reid;
+  locator_pair_t *locator_pairs;
 } fwd_entry_t;
 
 typedef enum
@@ -63,6 +63,13 @@ typedef struct
   miss_packet_type_t type;
 } miss_packet_t;
 
+typedef enum
+{
+  MR_MODE_DST_ONLY = 0,
+  MR_MODE_SRC_DST,
+  _MR_MODE_MAX
+} map_request_mode_t;
+
 typedef struct
 {
   /* LISP feature status */
@@ -72,42 +79,42 @@ typedef struct
   gid_dictionary_t mapping_index_by_gid;
 
   /* pool of mappings */
-  mapping_t * mapping_pool;
+  mapping_t *mapping_pool;
 
   /* pool of locators */
-  locator_t * locator_pool;
+  locator_t *locator_pool;
 
   /* pool of locator-sets */
-  locator_set_t * locator_set_pool;
+  locator_set_t *locator_set_pool;
 
   /* vector of locator-set vectors composed of and indexed by locator index */
-  u32 ** locator_to_locator_sets;
+  u32 **locator_to_locator_sets;
 
   /* hash map of locators by name */
-  uword * locator_set_index_by_name;
+  uword *locator_set_index_by_name;
 
   /* vector of eid index vectors supported and indexed by locator-set index */
-  u32 ** locator_set_to_eids;
+  u32 **locator_set_to_eids;
 
   /* vectors of indexes for local locator-sets and mappings */
-  u32 * local_mappings_indexes;
-  u32 * local_locator_set_indexes;
+  u32 *local_mappings_indexes;
+  u32 *local_locator_set_indexes;
 
   /* hash map of forwarding entries by mapping index */
-  u32 * fwd_entry_by_mapping_index;
+  u32 *fwd_entry_by_mapping_index;
 
   /* forwarding entries pool */
-  fwd_entry_t * fwd_entry_pool;
+  fwd_entry_t *fwd_entry_pool;
 
   /* hash map keyed by nonce of pending map-requests */
-  uword * pending_map_requests_by_nonce;
+  uword *pending_map_requests_by_nonce;
 
   /* pool of pending map requests */
-  pending_map_request_t * pending_map_requests_pool;
+  pending_map_request_t *pending_map_requests_pool;
   volatile u32 *pending_map_request_lock;
 
   /* vector of map-resolvers */
-  map_resolver_t * map_resolvers;
+  map_resolver_t *map_resolvers;
 
   /* map resolver address currently being used for sending requests.
    * This has to be an actual address and not an index to map_resolvers vector
@@ -121,16 +128,16 @@ typedef struct
   u32 mreq_itr_rlocs;
 
   /* vni to vrf hash tables */
-  uword * table_id_by_vni;
-  uword * vni_by_table_id;
+  uword *table_id_by_vni;
+  uword *vni_by_table_id;
 
   /* vni to bd-index hash tables */
-  uword * bd_id_by_vni;
-  uword * vni_by_bd_id;
+  uword *bd_id_by_vni;
+  uword *vni_by_bd_id;
 
   /* track l2 and l3 interfaces that have been created for vni */
-  uword * dp_intf_by_vni;
-  uword * l2_dp_intf_by_vni;
+  uword *dp_intf_by_vni;
+  uword *l2_dp_intf_by_vni;
 
   /* Proxy ETR map index */
   u32 pitr_map_index;
@@ -138,24 +145,28 @@ typedef struct
   /* LISP PITR mode */
   u8 lisp_pitr;
 
+  /* map request mode */
+  u8 map_request_mode;
+
   /* commodity */
-  ip4_main_t * im4;
-  ip6_main_t * im6;
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
+  ip4_main_t *im4;
+  ip6_main_t *im6;
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
 } lisp_cp_main_t;
 
 /* lisp-gpe control plane */
 lisp_cp_main_t lisp_control_main;
 
 extern vlib_node_registration_t lisp_cp_input_node;
-extern vlib_node_registration_t lisp_cp_lookup_node;
+extern vlib_node_registration_t lisp_cp_lookup_ip4_node;
+extern vlib_node_registration_t lisp_cp_lookup_ip6_node;
 
-clib_error_t *
-lisp_cp_init ();
+clib_error_t *lisp_cp_init ();
 
 always_inline lisp_cp_main_t *
-vnet_lisp_cp_get_main() {
+vnet_lisp_cp_get_main ()
+{
   return &lisp_control_main;
 }
 
@@ -164,10 +175,10 @@ typedef struct
   u8 is_add;
   union
   {
-    u8 * name;
+    u8 *name;
     u32 index;
   };
-  locator_t * locators;
+  locator_t *locators;
   u8 local;
 } vnet_lisp_add_del_locator_set_args_t;
 
@@ -176,7 +187,7 @@ vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a,
 			       u32 * ls_index);
 int
 vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a,
-                           locator_set_t * ls, u32 * ls_index);
+			   locator_set_t * ls, u32 * ls_index);
 
 typedef struct
 {
@@ -189,29 +200,29 @@ typedef struct
   u8 authoritative;
 
   u8 local;
+  u8 is_static;
 } vnet_lisp_add_del_mapping_args_t;
 
 int
-vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t *a,
-			   u32 * map_index);
+vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a,
+			     u32 * map_index);
 int
 vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
-                                 u32 * map_index_result);
+				 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,
-                           u32 * res_map_index);
+			   u8 authoritative, u32 ttl, u8 is_add, u8 is_static,
+			   u32 * res_map_index);
 
 typedef struct
 {
-  gid_address_t deid;
-  gid_address_t seid;
+  gid_address_t reid;
+  gid_address_t leid;
   u8 is_add;
 } vnet_lisp_add_del_adjacency_args_t;
 
-int
-vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a);
+int vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a);
 
 typedef struct
 {
@@ -222,28 +233,25 @@ typedef struct
 int
 vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a);
 
-clib_error_t *
-vnet_lisp_enable_disable (u8 is_enabled);
-u8
-vnet_lisp_enable_disable_status (void);
+clib_error_t *vnet_lisp_enable_disable (u8 is_enabled);
+u8 vnet_lisp_enable_disable_status (void);
 
-int
-vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add);
+int vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add);
 
 typedef struct
 {
   u8 is_add;
-  u8 * locator_set_name;
+  u8 *locator_set_name;
 } vnet_lisp_add_del_mreq_itr_rloc_args_t;
 
 int
 vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a);
 
-int
-vnet_lisp_clear_all_remote_adjacencies (void);
+int vnet_lisp_clear_all_remote_adjacencies (void);
 
-int
-vnet_lisp_eid_table_map (u32 vni, u32 vrf, u8 is_l2, u8 is_add);
+int vnet_lisp_eid_table_map (u32 vni, u32 vrf, u8 is_l2, u8 is_add);
+int vnet_lisp_set_map_request_mode (u8 mode);
+u8 vnet_lisp_get_map_request_mode (void);
 
 static inline void
 lisp_pending_map_request_lock (lisp_cp_main_t * lcm)
@@ -261,3 +269,11 @@ lisp_pending_map_request_unlock (lisp_cp_main_t * lcm)
 }
 
 #endif /* VNET_CONTROL_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */