X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat64.h;h=addba7a370476ca0f45833ad6aa9ea458d087c5b;hb=039cbfe254be998f7311bc4638bb262b44efac19;hp=68224cab01343145d6a7f66a2f1850f010f9ff29;hpb=2ba92e32e0197f676dd905e5edcb4ff3e1bec241;p=vpp.git

diff --git a/src/plugins/nat/nat64.h b/src/plugins/nat/nat64.h
index 68224cab013..addba7a3704 100644
--- a/src/plugins/nat/nat64.h
+++ b/src/plugins/nat/nat64.h
@@ -39,6 +39,11 @@ typedef enum
 #undef _
 } nat64_tcp_ses_state_t;
 
+enum
+{
+  NAT64_CLEANER_RESCHEDULE = 1,
+} nat64_cleaner_process_event_e;
+
 typedef struct
 {
   ip6_address_t prefix;
@@ -47,6 +52,19 @@ typedef struct
   u32 fib_index;
 } nat64_prefix_t;
 
+typedef struct
+{
+  ip6_address_t in_addr;
+  u16 in_port;
+  ip4_address_t out_addr;
+  u16 out_port;
+  u32 fib_index;
+  u32 thread_index;
+  u8 proto;
+  u8 is_add;
+  u8 done;
+} nat64_static_bib_to_update_t;
+
 typedef struct
 {
   /** Interface pool */
@@ -55,21 +73,43 @@ typedef struct
   /** Address pool vector */
   snat_address_t *addr_pool;
 
+  /** sw_if_indices whose interface addresses should be auto-added */
+  u32 *auto_add_sw_if_indices;
+
   /** Pref64 vector */
   nat64_prefix_t *pref64;
 
-  /** BIB and session DB */
-  nat64_db_t db;
+  /** BIB and session DB per thread */
+  nat64_db_t *db;
+
+  /** Worker handoff */
+  u32 fq_in2out_index;
+  u32 fq_out2in_index;
+
+  /** Pool of static BIB entries to be added/deleted in worker threads */
+  nat64_static_bib_to_update_t *static_bibs;
+
+  u32 error_node_index;
 
-  /* values of various timeouts */
+  /** config parameters */
+  u32 bib_buckets;
+  u32 bib_memory_size;
+  u32 st_buckets;
+  u32 st_memory_size;
+
+  /** values of various timeouts */
   u32 udp_timeout;
   u32 icmp_timeout;
   u32 tcp_trans_timeout;
   u32 tcp_est_timeout;
   u32 tcp_incoming_syn_timeout;
 
-  u8 is_disabled;
+  /* Total count of interfaces enabled */
+  u32 total_enabled_count;
+  /* The process node which orcherstrates the cleanup */
+  u32 nat64_expire_walk_node_index;
 
+  ip4_main_t *ip4_main;
   snat_main_t *sm;
 } nat64_main_t;
 
@@ -102,6 +142,16 @@ typedef int (*nat64_pool_addr_walk_fn_t) (snat_address_t * addr, void *ctx);
  */
 void nat64_pool_addr_walk (nat64_pool_addr_walk_fn_t fn, void *ctx);
 
+/**
+ * @brief NAT64 pool address from specific (DHCP addressed) interface.
+ *
+ * @param sw_if_index Index of the interface.
+ * @param is_add      1 if add, 0 if delete.
+ *
+ * @returns 0 on success, non-zero value otherwise.
+ */
+int nat64_add_interface_address (u32 sw_if_index, int is_add);
+
 /**
  * @brief Enable/disable NAT64 feature on the interface.
  *
@@ -157,27 +207,17 @@ int nat64_add_del_static_bib_entry (ip6_address_t * in_addr,
 /**
  * @brief Alloce IPv4 address and port pair from NAT64 pool.
  *
- * @param fib_index FIB index of tenant.
- * @param proto     L4 protocol.
- * @param addr      Allocated IPv4 address.
- * @param port      Allocated port number.
+ * @param fib_index    FIB index of tenant.
+ * @param proto        L4 protocol.
+ * @param addr         Allocated IPv4 address.
+ * @param port         Allocated port number.
+ * @param thread_index Thread index.
  *
  * @returns 0 on success, non-zero value otherwise.
  */
 int nat64_alloc_out_addr_and_port (u32 fib_index, snat_protocol_t proto,
-				   ip4_address_t * addr, u16 * port);
-
-/**
- * @brief Free IPv4 address and port pair from NAT64 pool.
- *
- * @param addr  IPv4 address to free.
- * @param port  Port number to free.
- * @param proto L4 protocol.
- *
- * @returns 0 on success, non-zero value otherwise.
- */
-void nat64_free_out_addr_and_port (ip4_address_t * addr, u16 port,
-				   snat_protocol_t proto);
+				   ip4_address_t * addr, u16 * port,
+				   u32 thread_index);
 
 /**
  * @brief Set UDP session timeout.
@@ -308,8 +348,34 @@ void nat64_compose_ip6 (ip6_address_t * ip6, ip4_address_t * ip4,
 void nat64_extract_ip4 (ip6_address_t * ip6, ip4_address_t * ip4,
 			u32 fib_index);
 
-#define u8_ptr_add(ptr, index) (((u8 *)ptr) + index)
-#define u16_net_add(u, val) clib_host_to_net_u16(clib_net_to_host_u16(u) + (val))
+/**
+ * @brief Set NAT64 hash tables configuration.
+ *
+ * @param bib_buckets Number of BIB hash buckets.
+ * @param bib_memory_size Memory size of BIB hash.
+ * @param st_buckets Number of session table hash buckets.
+ * @param st_memory_size Memory size of session table hash.
+ */
+void nat64_set_hash (u32 bib_buckets, u32 bib_memory_size, u32 st_buckets,
+		     u32 st_memory_size);
+
+/**
+ * @brief Get worker thread index for NAT64 in2out.
+ *
+ * @param addr IPv6 src address.
+ *
+ * @returns worker thread index.
+ */
+u32 nat64_get_worker_in2out (ip6_address_t * addr);
+
+/**
+ * @brief Get worker thread index for NAT64 out2in.
+ *
+ * @param ip IPv4 header.
+ *
+ * @returns worker thread index.
+ */
+u32 nat64_get_worker_out2in (ip4_header_t * ip);
 
 #endif /* __included_nat64_h__ */