X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Fnat%2Fnat64.h;h=2bca1f9b73beca76efd7f2b08e93d2ecb4c82102;hb=bed1421b9;hp=e2334a5ac6fb0e1f335743c315abf9e6c3427250;hpb=e71eb5922a293eca36dbd323970741daaca3c5c7;p=vpp.git

diff --git a/src/plugins/nat/nat64.h b/src/plugins/nat/nat64.h
index e2334a5ac6f..2bca1f9b73b 100644
--- a/src/plugins/nat/nat64.h
+++ b/src/plugins/nat/nat64.h
@@ -39,7 +39,7 @@ typedef enum
 #undef _
 } nat64_tcp_ses_state_t;
 
-enum
+typedef enum
 {
   NAT64_CLEANER_RESCHEDULE = 1,
 } nat64_cleaner_process_event_e;
@@ -89,8 +89,6 @@ typedef struct
   /** Pool of static BIB entries to be added/deleted in worker threads */
   nat64_static_bib_to_update_t *static_bibs;
 
-  u32 error_node_index;
-
   /** config parameters */
   u32 bib_buckets;
   u32 bib_memory_size;
@@ -102,13 +100,26 @@ typedef struct
   u32 icmp_timeout;
   u32 tcp_trans_timeout;
   u32 tcp_est_timeout;
-  u32 tcp_incoming_syn_timeout;
 
   /* Total count of interfaces enabled */
   u32 total_enabled_count;
   /* The process node which orcherstrates the cleanup */
   u32 nat64_expire_walk_node_index;
 
+  /* counters/gauges */
+  vlib_simple_counter_main_t total_bibs;
+  vlib_simple_counter_main_t total_sessions;
+
+  /** node index **/
+  u32 error_node_index;
+
+  u32 in2out_node_index;
+  u32 in2out_slowpath_node_index;
+  u32 in2out_reass_node_index;
+
+  u32 out2in_node_index;
+  u32 out2in_reass_node_index;
+
   ip4_main_t *ip4_main;
   snat_main_t *sm;
 } nat64_main_t;
@@ -120,13 +131,15 @@ extern vlib_node_registration_t nat64_out2in_node;
 /**
  * @brief Add/delete address to NAT64 pool.
  *
+ * @param thread_index Thread index used by ipfix nat logging (not address per thread).
  * @param addr   IPv4 address.
  * @param vrf_id VRF id of tenant, ~0 means independent of VRF.
  * @param is_add 1 if add, 0 if delete.
  *
  * @returns 0 on success, non-zero value otherwise.
  */
-int nat64_add_del_pool_addr (ip4_address_t * addr, u32 vrf_id, u8 is_add);
+int nat64_add_del_pool_addr (u32 thread_index,
+			     ip4_address_t * addr, u32 vrf_id, u8 is_add);
 
 /**
  * @brief Call back function when walking addresses in NAT64 pool, non-zero
@@ -256,11 +269,10 @@ u32 nat64_get_icmp_timeout (void);
  *
  * @param trans Transitory timeout in seconds (if 0 reset to default value 240sec).
  * @param est Established timeout in seconds (if 0 reset to default value 7440sec).
- * @param incoming_syn Incoming SYN timeout in seconds (if 0 reset to default value 6sec).
  *
  * @returns 0 on success, non-zero value otherwise.
  */
-int nat64_set_tcp_timeouts (u32 trans, u32 est, u32 incoming_syn);
+int nat64_set_tcp_timeouts (u32 trans, u32 est);
 
 /**
  * @brief Get TCP transitory timeout.
@@ -276,13 +288,6 @@ u32 nat64_get_tcp_trans_timeout (void);
  */
 u32 nat64_get_tcp_est_timeout (void);
 
-/**
- * @brief Get TCP incoming SYN timeout.
- *
- * @returns TCP incoming SYN timeout in seconds.
- */
-u32 nat64_get_tcp_incoming_syn_timeout (void);
-
 /**
  * @brief Reset NAT64 session timeout.
  *
@@ -377,9 +382,6 @@ u32 nat64_get_worker_in2out (ip6_address_t * addr);
  */
 u32 nat64_get_worker_out2in (ip4_header_t * ip);
 
-#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))
-
 #endif /* __included_nat64_h__ */
 
 /*