NAT: VPP-1537 IPFIX per worker processing
[vpp.git] / src / plugins / nat / nat_ipfix_logging.c
index 0cc0f82..4bb96bc 100644 (file)
  * limitations under the License.
  */
 
-#include <vnet/flow/flow_report.h>
+#include <vnet/ipfix-export/flow_report.h>
 #include <vlibmemory/api.h>
-#include <nat/nat.h>
+#include <nat/nat_inlines.h>
 #include <nat/nat_ipfix_logging.h>
+#include <vppinfra/atomics.h>
 
+vlib_node_registration_t snat_ipfix_flush_node;
 snat_ipfix_logging_main_t snat_ipfix_logging_main;
 
 #define NAT44_SESSION_CREATE_LEN 26
 #define NAT_ADDRESSES_EXHAUTED_LEN 13
-#define MAX_ENTRIES_PER_USER_LEN 17
+#define MAX_ENTRIES_PER_USER_LEN 21
+#define MAX_SESSIONS_LEN 17
+#define MAX_BIBS_LEN 17
+#define MAX_FRAGMENTS_IP4_LEN 21
+#define MAX_FRAGMENTS_IP6_LEN 33
+#define NAT64_BIB_LEN 38
+#define NAT64_SES_LEN 62
 
 #define NAT44_SESSION_CREATE_FIELD_COUNT 8
 #define NAT_ADDRESSES_EXHAUTED_FIELD_COUNT 3
-#define MAX_ENTRIES_PER_USER_FIELD_COUNT 4
-
-typedef struct {
+#define MAX_ENTRIES_PER_USER_FIELD_COUNT 5
+#define MAX_SESSIONS_FIELD_COUNT 4
+#define MAX_BIBS_FIELD_COUNT 4
+#define MAX_FRAGMENTS_FIELD_COUNT 5
+#define NAT64_BIB_FIELD_COUNT 8
+#define NAT64_SES_FIELD_COUNT 12
+
+typedef struct
+{
   u8 nat_event;
   u32 src_ip;
   u32 nat_src_ip;
@@ -40,14 +54,78 @@ typedef struct {
   u32 vrf_id;
 } snat_ipfix_logging_nat44_ses_args_t;
 
-typedef struct {
+typedef struct
+{
   u32 pool_id;
 } snat_ipfix_logging_addr_exhausted_args_t;
 
-typedef struct {
+typedef struct
+{
+  u32 limit;
   u32 src_ip;
 } snat_ipfix_logging_max_entries_per_user_args_t;
 
+typedef struct
+{
+  u32 limit;
+} nat_ipfix_logging_max_sessions_args_t;
+
+typedef struct
+{
+  u32 limit;
+} nat_ipfix_logging_max_bibs_args_t;
+
+typedef struct
+{
+  u32 limit;
+  u32 src;
+} nat_ipfix_logging_max_frags_ip4_args_t;
+
+typedef struct
+{
+  u32 limit;
+  u64 src[2];
+} nat_ipfix_logging_max_frags_ip6_args_t;
+
+typedef struct
+{
+  u8 nat_event;
+  u64 src_ip[2];
+  u32 nat_src_ip;
+  u8 proto;
+  u16 src_port;
+  u16 nat_src_port;
+  u64 dst_ip[2];
+  u32 nat_dst_ip;
+  u32 vrf_id;
+  u16 dst_port;
+  u16 nat_dst_port;
+} nat_ipfix_logging_nat64_ses_args_t;
+
+typedef struct
+{
+  u8 nat_event;
+  u64 src_ip[2];
+  u32 nat_src_ip;
+  u8 proto;
+  u16 src_port;
+  u16 nat_src_port;
+  u32 vrf_id;
+} nat_ipfix_logging_nat64_bib_args_t;
+
+#define skip_if_disabled()                                        \
+do {                                                              \
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;     \
+  if (PREDICT_TRUE (!clib_atomic_fetch_or(&silm->enabled, 0)))    \
+    return;                                                       \
+} while (0)
+
+#define update_template_id(old_id, new_id)                \
+do {                                                      \
+  u16 template_id = clib_atomic_fetch_or(old_id, 0);      \
+  clib_atomic_cmp_and_swap(old_id, template_id, new_id);  \
+} while (0)
+
 /**
  * @brief Create an IPFIX template packet rewrite string
  *
@@ -63,12 +141,11 @@ typedef struct {
  */
 static inline u8 *
 snat_template_rewrite (flow_report_main_t * frm,
-                       flow_report_t * fr,
-                       ip4_address_t * collector_address,
-                       ip4_address_t * src_address,
-                       u16 collector_port,
-                       nat_event_t event,
-                       quota_exceed_event_t quota_event)
+                      flow_report_t * fr,
+                      ip4_address_t * collector_address,
+                      ip4_address_t * src_address,
+                      u16 collector_port,
+                      nat_event_t event, quota_exceed_event_t quota_event)
 {
   snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
   ip4_header_t *ip;
@@ -82,26 +159,79 @@ snat_template_rewrite (flow_report_main_t * frm,
   ip4_ipfix_template_packet_t *tp;
   u32 field_count = 0;
   flow_report_stream_t *stream;
+  u32 stream_index;
 
   stream = &frm->streams[fr->stream_index];
-  silm->stream_index = fr->stream_index;
+
+  stream_index = clib_atomic_fetch_or(&silm->stream_index, 0);
+  clib_atomic_cmp_and_swap (&silm->stream_index,
+                            stream_index, fr->stream_index);
 
   if (event == NAT_ADDRESSES_EXHAUTED)
     {
       field_count = NAT_ADDRESSES_EXHAUTED_FIELD_COUNT;
-      silm->addr_exhausted_template_id = fr->template_id;
+
+      update_template_id(&silm->addr_exhausted_template_id,
+                         fr->template_id);
     }
   else if (event == NAT44_SESSION_CREATE)
     {
       field_count = NAT44_SESSION_CREATE_FIELD_COUNT;
-      silm->nat44_session_template_id = fr->template_id;
+
+      update_template_id(&silm->nat44_session_template_id,
+                         fr->template_id);
+    }
+  else if (event == NAT64_BIB_CREATE)
+    {
+      field_count = NAT64_BIB_FIELD_COUNT;
+
+      update_template_id(&silm->nat64_bib_template_id,
+                         fr->template_id);
+    }
+  else if (event == NAT64_SESSION_CREATE)
+    {
+      field_count = NAT64_SES_FIELD_COUNT;
+
+      update_template_id(&silm->nat64_ses_template_id,
+                         fr->template_id);
     }
   else if (event == QUOTA_EXCEEDED)
     {
       if (quota_event == MAX_ENTRIES_PER_USER)
+       {
+         field_count = MAX_ENTRIES_PER_USER_FIELD_COUNT;
+
+          update_template_id(&silm->max_entries_per_user_template_id,
+                             fr->template_id);
+
+       }
+      else if (quota_event == MAX_SESSION_ENTRIES)
+       {
+         field_count = MAX_SESSIONS_FIELD_COUNT;
+
+          update_template_id(&silm->max_sessions_template_id,
+                             fr->template_id);
+       }
+      else if (quota_event == MAX_BIB_ENTRIES)
+       {
+         field_count = MAX_BIBS_FIELD_COUNT;
+
+          update_template_id(&silm->max_bibs_template_id,
+                             fr->template_id);
+       }
+      else if (quota_event == MAX_FRAGMENTS_PENDING_REASSEMBLY)
+       {
+         field_count = MAX_FRAGMENTS_FIELD_COUNT;
+
+          update_template_id(&silm->max_frags_ip4_template_id,
+                             fr->template_id);
+       }
+      else if (quota_event == MAX_FRAGMENTS_PENDING_REASSEMBLY_IP6)
         {
-          field_count = MAX_ENTRIES_PER_USER_FIELD_COUNT;
-          silm->max_entries_per_user_template_id = fr->template_id;
+          field_count = MAX_FRAGMENTS_FIELD_COUNT;
+
+          update_template_id(&silm->max_frags_ip6_template_id,
+                             fr->template_id);
         }
     }
 
@@ -160,19 +290,122 @@ snat_template_rewrite (flow_report_main_t * frm,
       f->e_id_length = ipfix_e_id_length (0, ingressVRFID, 4);
       f++;
     }
+  else if (event == NAT64_BIB_CREATE)
+    {
+      f->e_id_length = ipfix_e_id_length (0, observationTimeMilliseconds, 8);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, natEvent, 1);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, sourceIPv6Address, 16);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, postNATSourceIPv4Address, 4);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, protocolIdentifier, 1);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, sourceTransportPort, 2);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, postNAPTSourceTransportPort, 2);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, ingressVRFID, 4);
+      f++;
+    }
+  else if (event == NAT64_SESSION_CREATE)
+    {
+      f->e_id_length = ipfix_e_id_length (0, observationTimeMilliseconds, 8);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, natEvent, 1);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, sourceIPv6Address, 16);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, postNATSourceIPv4Address, 4);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, protocolIdentifier, 1);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, sourceTransportPort, 2);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, postNAPTSourceTransportPort, 2);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, destinationIPv6Address, 16);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, postNATDestinationIPv4Address, 4);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, destinationTransportPort, 2);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, postNAPTDestinationTransportPort,
+                                          2);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0, ingressVRFID, 4);
+      f++;
+    }
   else if (event == QUOTA_EXCEEDED)
     {
       if (quota_event == MAX_ENTRIES_PER_USER)
+       {
+         f->e_id_length = ipfix_e_id_length (0, observationTimeMilliseconds,
+                                             8);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natEvent, 1);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natQuotaExceededEvent, 4);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, maxEntriesPerUser, 4);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, sourceIPv4Address, 4);
+         f++;
+       }
+      else if (quota_event == MAX_SESSION_ENTRIES)
+        {
+         f->e_id_length = ipfix_e_id_length (0, observationTimeMilliseconds,
+                                             8);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natEvent, 1);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natQuotaExceededEvent, 4);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, maxSessionEntries, 4);
+         f++;
+        }
+      else if (quota_event == MAX_BIB_ENTRIES)
+        {
+         f->e_id_length = ipfix_e_id_length (0, observationTimeMilliseconds,
+                                             8);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natEvent, 1);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natQuotaExceededEvent, 4);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, maxBIBEntries, 4);
+         f++;
+        }
+      else if (quota_event == MAX_FRAGMENTS_PENDING_REASSEMBLY)
         {
-          f->e_id_length = ipfix_e_id_length (0, observationTimeMilliseconds,
-                                              8);
-          f++;
-          f->e_id_length = ipfix_e_id_length (0, natEvent, 1);
-          f++;
-          f->e_id_length = ipfix_e_id_length (0, natQuotaExceededEvent, 4);
-          f++;
-          f->e_id_length = ipfix_e_id_length (0, sourceIPv4Address, 4);
-          f++;
+         f->e_id_length = ipfix_e_id_length (0, observationTimeMilliseconds,
+                                             8);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natEvent, 1);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natQuotaExceededEvent, 4);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, maxFragmentsPendingReassembly,
+                                              4);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, sourceIPv4Address, 4);
+         f++;
+        }
+      else if (quota_event == MAX_FRAGMENTS_PENDING_REASSEMBLY_IP6)
+        {
+         f->e_id_length = ipfix_e_id_length (0, observationTimeMilliseconds,
+                                             8);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natEvent, 1);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, natQuotaExceededEvent, 4);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, maxFragmentsPendingReassembly,
+                                              4);
+         f++;
+         f->e_id_length = ipfix_e_id_length (0, sourceIPv6Address, 16);
+         f++;
         }
     }
 
@@ -199,64 +432,154 @@ snat_template_rewrite (flow_report_main_t * frm,
 
 u8 *
 snat_template_rewrite_addr_exhausted (flow_report_main_t * frm,
-                                      flow_report_t * fr,
-                                      ip4_address_t * collector_address,
-                                      ip4_address_t * src_address,
-                                      u16 collector_port)
+                                     flow_report_t * fr,
+                                     ip4_address_t * collector_address,
+                                     ip4_address_t * src_address,
+                                     u16 collector_port,
+                                      ipfix_report_element_t *elts,
+                                      u32 n_elts, u32 *stream_index)
 {
   return snat_template_rewrite (frm, fr, collector_address, src_address,
-                                collector_port, NAT_ADDRESSES_EXHAUTED, 0);
+                               collector_port, NAT_ADDRESSES_EXHAUTED, 0);
 }
 
 u8 *
 snat_template_rewrite_nat44_session (flow_report_main_t * frm,
-                                     flow_report_t * fr,
-                                     ip4_address_t * collector_address,
-                                     ip4_address_t * src_address,
-                                     u16 collector_port)
+                                    flow_report_t * fr,
+                                    ip4_address_t * collector_address,
+                                    ip4_address_t * src_address,
+                                    u16 collector_port,
+                                     ipfix_report_element_t *elts,
+                                     u32 n_elts, u32 *stream_index)
 {
   return snat_template_rewrite (frm, fr, collector_address, src_address,
-                                collector_port, NAT44_SESSION_CREATE, 0);
+                               collector_port, NAT44_SESSION_CREATE, 0);
 }
 
 u8 *
 snat_template_rewrite_max_entries_per_usr (flow_report_main_t * frm,
-                                           flow_report_t * fr,
-                                           ip4_address_t * collector_address,
-                                           ip4_address_t * src_address,
-                                           u16 collector_port)
+                                          flow_report_t * fr,
+                                          ip4_address_t * collector_address,
+                                          ip4_address_t * src_address,
+                                          u16 collector_port,
+                                           ipfix_report_element_t *elts,
+                                           u32 n_elts, u32 *stream_index)
+{
+  return snat_template_rewrite (frm, fr, collector_address, src_address,
+                               collector_port, QUOTA_EXCEEDED,
+                               MAX_ENTRIES_PER_USER);
+}
+
+u8 *
+nat_template_rewrite_max_sessions (flow_report_main_t * frm,
+                                  flow_report_t * fr,
+                                  ip4_address_t * collector_address,
+                                  ip4_address_t * src_address,
+                                  u16 collector_port,
+                                   ipfix_report_element_t *elts,
+                                   u32 n_elts, u32 *stream_index)
+{
+  return snat_template_rewrite (frm, fr, collector_address, src_address,
+                               collector_port, QUOTA_EXCEEDED,
+                               MAX_SESSION_ENTRIES);
+}
+
+u8 *
+nat_template_rewrite_max_bibs (flow_report_main_t * frm,
+                              flow_report_t * fr,
+                              ip4_address_t * collector_address,
+                              ip4_address_t * src_address,
+                              u16 collector_port,
+                               ipfix_report_element_t *elts,
+                               u32 n_elts, u32 *stream_index)
+{
+  return snat_template_rewrite (frm, fr, collector_address, src_address,
+                               collector_port, QUOTA_EXCEEDED,
+                               MAX_BIB_ENTRIES);
+}
+
+u8 *
+nat_template_rewrite_max_frags_ip4 (flow_report_main_t * frm,
+                                   flow_report_t * fr,
+                                   ip4_address_t * collector_address,
+                                   ip4_address_t * src_address,
+                                   u16 collector_port,
+                                    ipfix_report_element_t *elts,
+                                    u32 n_elts, u32 *stream_index)
+{
+  return snat_template_rewrite (frm, fr, collector_address, src_address,
+                               collector_port, QUOTA_EXCEEDED,
+                               MAX_FRAGMENTS_PENDING_REASSEMBLY);
+}
+
+u8 *
+nat_template_rewrite_max_frags_ip6 (flow_report_main_t * frm,
+                                   flow_report_t * fr,
+                                   ip4_address_t * collector_address,
+                                   ip4_address_t * src_address,
+                                   u16 collector_port,
+                                    ipfix_report_element_t *elts,
+                                    u32 n_elts, u32 *stream_index)
+{
+  return snat_template_rewrite (frm, fr, collector_address, src_address,
+                               collector_port, QUOTA_EXCEEDED,
+                               MAX_FRAGMENTS_PENDING_REASSEMBLY_IP6);
+}
+
+u8 *
+nat_template_rewrite_nat64_bib (flow_report_main_t * frm,
+                               flow_report_t * fr,
+                               ip4_address_t * collector_address,
+                               ip4_address_t * src_address,
+                               u16 collector_port,
+                                ipfix_report_element_t *elts,
+                                u32 n_elts, u32 *stream_index)
+{
+  return snat_template_rewrite (frm, fr, collector_address, src_address,
+                               collector_port, NAT64_BIB_CREATE, 0);
+}
+
+u8 *
+nat_template_rewrite_nat64_session (flow_report_main_t * frm,
+                                   flow_report_t * fr,
+                                   ip4_address_t * collector_address,
+                                   ip4_address_t * src_address,
+                                   u16 collector_port,
+                                    ipfix_report_element_t *elts,
+                                    u32 n_elts, u32 *stream_index)
 {
   return snat_template_rewrite (frm, fr, collector_address, src_address,
-                                collector_port, QUOTA_EXCEEDED,
-                                MAX_ENTRIES_PER_USER);
+                               collector_port, NAT64_SESSION_CREATE, 0);
 }
 
 static inline void
 snat_ipfix_header_create (flow_report_main_t * frm,
-                          vlib_buffer_t * b0,
-                          u32 * offset)
+                         vlib_buffer_t * b0, u32 * offset)
 {
   snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
   flow_report_stream_t *stream;
-  ip4_ipfix_template_packet_t * tp;
-  ipfix_message_header_t * h = 0;
-  ipfix_set_header_t * s = 0;
-  ip4_header_t * ip;
-  udp_header_t * udp;
-
-  stream = &frm->streams[silm->stream_index];
+  ip4_ipfix_template_packet_t *tp;
+  ipfix_message_header_t *h = 0;
+  ipfix_set_header_t *s = 0;
+  u32 sequence_number;
+  u32 stream_index;
+  ip4_header_t *ip;
+  udp_header_t *udp;
+  
+  stream_index = clib_atomic_fetch_or(&silm->stream_index, 0);
+  stream = &frm->streams[stream_index];
 
   b0->current_data = 0;
   b0->current_length = sizeof (*ip) + sizeof (*udp) + sizeof (*h) +
-                       sizeof (*s);
-  b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
+    sizeof (*s);
+  b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VNET_BUFFER_F_FLOW_REPORT);
   vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
   vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
   tp = vlib_buffer_get_current (b0);
-  ip = (ip4_header_t *) &tp->ip4;
-  udp = (udp_header_t *) (ip+1);
-  h = (ipfix_message_header_t *)(udp+1);
-  s = (ipfix_set_header_t *)(h+1);
+  ip = (ip4_header_t *) & tp->ip4;
+  udp = (udp_header_t *) (ip + 1);
+  h = (ipfix_message_header_t *) (udp + 1);
+  s = (ipfix_set_header_t *) (h + 1);
 
   ip->ip_version_and_header_length = 0x45;
   ip->ttl = 254;
@@ -268,27 +591,28 @@ snat_ipfix_header_create (flow_report_main_t * frm,
   udp->dst_port = clib_host_to_net_u16 (frm->collector_port);
   udp->checksum = 0;
 
-  h->export_time = clib_host_to_net_u32 (
-    (u32) (((f64)frm->unix_time_0) + (vlib_time_now(frm->vlib_main) -
-    frm->vlib_time_0)));
-  h->sequence_number = clib_host_to_net_u32 (stream->sequence_number++);
+  h->export_time = clib_host_to_net_u32 ((u32)
+                                        (((f64) frm->unix_time_0) +
+                                         (vlib_time_now (frm->vlib_main) -
+                                          frm->vlib_time_0)));
+
+  sequence_number = clib_atomic_fetch_add (&stream->sequence_number, 1);
+  h->sequence_number = clib_host_to_net_u32 (sequence_number);
   h->domain_id = clib_host_to_net_u32 (stream->domain_id);
 
-  *offset = (u32) (((u8 *)(s+1)) - (u8 *)tp);
+  *offset = (u32) (((u8 *) (s + 1)) - (u8 *) tp);
 }
 
 static inline void
 snat_ipfix_send (flow_report_main_t * frm,
-                 vlib_frame_t * f,
-                 vlib_buffer_t * b0,
-                 u16 template_id)
+                vlib_frame_t * f, vlib_buffer_t * b0, u16 template_id)
 {
-  ip4_ipfix_template_packet_t * tp;
-  ipfix_message_header_t * h = 0;
-  ipfix_set_header_t * s = 0;
-  ip4_header_t * ip;
-  udp_header_t * udp;
-  vlib_main_t * vm = frm->vlib_main;
+  ip4_ipfix_template_packet_t *tp;
+  ipfix_message_header_t *h = 0;
+  ipfix_set_header_t *s = 0;
+  ip4_header_t *ip;
+  udp_header_t *udp;
+  vlib_main_t *vm = frm->vlib_main;
 
   tp = vlib_buffer_get_current (b0);
   ip = (ip4_header_t *) & tp->ip4;
@@ -297,11 +621,11 @@ snat_ipfix_send (flow_report_main_t * frm,
   s = (ipfix_set_header_t *) (h + 1);
 
   s->set_id_length = ipfix_set_id_length (template_id,
-                                          b0->current_length -
-                                          (sizeof (*ip) + sizeof (*udp) +
-                                           sizeof (*h)));
+                                         b0->current_length -
+                                         (sizeof (*ip) + sizeof (*udp) +
+                                          sizeof (*h)));
   h->version_length = version_length (b0->current_length -
-                                      (sizeof (*ip) + sizeof (*udp)));
+                                     (sizeof (*ip) + sizeof (*udp)));
 
   ip->length = clib_host_to_net_u16 (b0->current_length);
   ip->checksum = ip4_header_checksum (ip);
@@ -311,7 +635,7 @@ snat_ipfix_send (flow_report_main_t * frm,
     {
       udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
       if (udp->checksum == 0)
-        udp->checksum = 0xffff;
+       udp->checksum = 0xffff;
     }
 
   ASSERT (ip->checksum == ip4_header_checksum (ip));
@@ -320,61 +644,57 @@ snat_ipfix_send (flow_report_main_t * frm,
 }
 
 static void
-snat_ipfix_logging_nat44_ses (u8 nat_event, u32 src_ip, u32 nat_src_ip,
-                              snat_protocol_t snat_proto, u16 src_port,
-                              u16 nat_src_port, u32 vrf_id, int do_flush)
+snat_ipfix_logging_nat44_ses (u32 thread_index, u8 nat_event, u32 src_ip,
+                              u32 nat_src_ip, snat_protocol_t snat_proto,
+                              u16 src_port, u16 nat_src_port, u32 vrf_id,
+                              int do_flush)
 {
   snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
   flow_report_main_t *frm = &flow_report_main;
   vlib_frame_t *f;
   vlib_buffer_t *b0 = 0;
   u32 bi0 = ~0;
   u32 offset;
-  vlib_main_t * vm = frm->vlib_main;
+  vlib_main_t *vm = frm->vlib_main;
   u64 now;
-  vlib_buffer_free_list_t *fl;
   u8 proto = ~0;
-
-  if (!silm->enabled)
-    return;
+  u16 template_id;
 
   proto = snat_proto_to_ip_proto (snat_proto);
 
   now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
   now += silm->milisecond_time_0;
 
-  b0 = silm->nat44_session_buffer;
+  b0 = sitd->nat44_session_buffer;
 
   if (PREDICT_FALSE (b0 == 0))
     {
       if (do_flush)
-        return;
+       return;
 
       if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-        {
-          clib_warning ("can't allocate buffer for NAT IPFIX event");
-          return;
-        }
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
 
-      b0 = silm->nat44_session_buffer =
-        vlib_get_buffer (vm, bi0);
-      fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-      vlib_buffer_init_for_free_list (b0, fl);
+      b0 = sitd->nat44_session_buffer = vlib_get_buffer (vm, bi0);
       VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
       offset = 0;
     }
   else
     {
       bi0 = vlib_get_buffer_index (vm, b0);
-      offset = silm->nat44_session_next_record_offset;
+      offset = sitd->nat44_session_next_record_offset;
     }
 
-  f = silm->nat44_session_frame;
+  f = sitd->nat44_session_frame;
   if (PREDICT_FALSE (f == 0))
     {
-      u32 * to_next;
+      u32 *to_next;
       f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
-      silm->nat44_session_frame = f;
+      sitd->nat44_session_frame = f;
       to_next = vlib_frame_vector_args (f);
       to_next[0] = bi0;
       f->n_vectors = 1;
@@ -386,95 +706,94 @@ snat_ipfix_logging_nat44_ses (u8 nat_event, u32 src_ip, u32 nat_src_ip,
   if (PREDICT_TRUE (do_flush == 0))
     {
       u64 time_stamp = clib_host_to_net_u64 (now);
-      clib_memcpy (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
       offset += sizeof (time_stamp);
 
-      clib_memcpy (b0->data + offset, &nat_event, sizeof (nat_event));
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
       offset += sizeof (nat_event);
 
-      clib_memcpy (b0->data + offset, &src_ip, sizeof (src_ip));
+      clib_memcpy_fast (b0->data + offset, &src_ip, sizeof (src_ip));
       offset += sizeof (src_ip);
 
-      clib_memcpy (b0->data + offset, &nat_src_ip, sizeof (nat_src_ip));
+      clib_memcpy_fast (b0->data + offset, &nat_src_ip, sizeof (nat_src_ip));
       offset += sizeof (nat_src_ip);
 
-      clib_memcpy (b0->data + offset, &proto, sizeof (proto));
+      clib_memcpy_fast (b0->data + offset, &proto, sizeof (proto));
       offset += sizeof (proto);
 
-      clib_memcpy (b0->data + offset, &src_port, sizeof (src_port));
+      clib_memcpy_fast (b0->data + offset, &src_port, sizeof (src_port));
       offset += sizeof (src_port);
 
-      clib_memcpy (b0->data + offset, &nat_src_port, sizeof (nat_src_port));
+      clib_memcpy_fast (b0->data + offset, &nat_src_port, sizeof (nat_src_port));
       offset += sizeof (nat_src_port);
 
-      clib_memcpy (b0->data + offset, &vrf_id, sizeof(vrf_id));
+      clib_memcpy_fast (b0->data + offset, &vrf_id, sizeof (vrf_id));
       offset += sizeof (vrf_id);
 
       b0->current_length += NAT44_SESSION_CREATE_LEN;
     }
 
-  if (PREDICT_FALSE (do_flush || (offset + NAT44_SESSION_CREATE_LEN) > frm->path_mtu))
+  if (PREDICT_FALSE
+      (do_flush || (offset + NAT44_SESSION_CREATE_LEN) > frm->path_mtu))
     {
-      snat_ipfix_send (frm, f, b0, silm->nat44_session_template_id);
-      silm->nat44_session_frame = 0;
-      silm->nat44_session_buffer = 0;
+      template_id = clib_atomic_fetch_or (
+        &silm->nat44_session_template_id,
+        0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->nat44_session_frame = 0;
+      sitd->nat44_session_buffer = 0;
       offset = 0;
     }
-  silm->nat44_session_next_record_offset = offset;
- }
+  sitd->nat44_session_next_record_offset = offset;
+}
 
 static void
-snat_ipfix_logging_addr_exhausted (u32 pool_id, int do_flush)
+snat_ipfix_logging_addr_exhausted (u32 thread_index, u32 pool_id, int do_flush)
 {
   snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
   flow_report_main_t *frm = &flow_report_main;
   vlib_frame_t *f;
   vlib_buffer_t *b0 = 0;
   u32 bi0 = ~0;
   u32 offset;
-  vlib_main_t * vm = frm->vlib_main;
+  vlib_main_t *vm = frm->vlib_main;
   u64 now;
-  vlib_buffer_free_list_t *fl;
   u8 nat_event = NAT_ADDRESSES_EXHAUTED;
-
-  if (!silm->enabled)
-    return;
+  u16 template_id;
 
   now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
   now += silm->milisecond_time_0;
 
-  b0 = silm->addr_exhausted_buffer;
+  b0 = sitd->addr_exhausted_buffer;
 
   if (PREDICT_FALSE (b0 == 0))
     {
       if (do_flush)
-        return;
+       return;
 
       if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-        {
-          clib_warning ("can't allocate buffer for NAT IPFIX event");
-          return;
-        }
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
 
-      b0 = silm->addr_exhausted_buffer =
-        vlib_get_buffer (vm, bi0);
-      fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-      vlib_buffer_init_for_free_list (b0, fl);
+      b0 = sitd->addr_exhausted_buffer = vlib_get_buffer (vm, bi0);
       VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
       offset = 0;
     }
   else
     {
       bi0 = vlib_get_buffer_index (vm, b0);
-      offset = silm->addr_exhausted_next_record_offset;
+      offset = sitd->addr_exhausted_next_record_offset;
     }
 
-  f = silm->addr_exhausted_frame;
+  f = sitd->addr_exhausted_frame;
   if (PREDICT_FALSE (f == 0))
     {
-      u32 * to_next;
+      u32 *to_next;
       f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
-      silm->addr_exhausted_frame = f;
+      sitd->addr_exhausted_frame = f;
       to_next = vlib_frame_vector_args (f);
       to_next[0] = bi0;
       f->n_vectors = 1;
@@ -486,81 +805,81 @@ snat_ipfix_logging_addr_exhausted (u32 pool_id, int do_flush)
   if (PREDICT_TRUE (do_flush == 0))
     {
       u64 time_stamp = clib_host_to_net_u64 (now);
-      clib_memcpy (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
       offset += sizeof (time_stamp);
 
-      clib_memcpy (b0->data + offset, &nat_event, sizeof (nat_event));
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
       offset += sizeof (nat_event);
 
-      clib_memcpy (b0->data + offset, &pool_id, sizeof(pool_id));
+      clib_memcpy_fast (b0->data + offset, &pool_id, sizeof (pool_id));
       offset += sizeof (pool_id);
 
       b0->current_length += NAT_ADDRESSES_EXHAUTED_LEN;
     }
 
-  if (PREDICT_FALSE (do_flush || (offset + NAT_ADDRESSES_EXHAUTED_LEN) > frm->path_mtu))
+  if (PREDICT_FALSE
+      (do_flush || (offset + NAT_ADDRESSES_EXHAUTED_LEN) > frm->path_mtu))
     {
-      snat_ipfix_send (frm, f, b0, silm->addr_exhausted_template_id);
-      silm->addr_exhausted_frame = 0;
-      silm->addr_exhausted_buffer = 0;
+      template_id = clib_atomic_fetch_or (
+          &silm->addr_exhausted_template_id,
+          0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->addr_exhausted_frame = 0;
+      sitd->addr_exhausted_buffer = 0;
       offset = 0;
     }
-  silm->addr_exhausted_next_record_offset = offset;
+  sitd->addr_exhausted_next_record_offset = offset;
 }
 
 static void
-snat_ipfix_logging_max_entries_per_usr (u32 src_ip, int do_flush)
+snat_ipfix_logging_max_entries_per_usr (u32 thread_index,
+                                        u32 limit, u32 src_ip, int do_flush)
 {
   snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
   flow_report_main_t *frm = &flow_report_main;
   vlib_frame_t *f;
   vlib_buffer_t *b0 = 0;
   u32 bi0 = ~0;
   u32 offset;
-  vlib_main_t * vm = frm->vlib_main;
+  vlib_main_t *vm = frm->vlib_main;
   u64 now;
-  vlib_buffer_free_list_t *fl;
   u8 nat_event = QUOTA_EXCEEDED;
   u32 quota_event = MAX_ENTRIES_PER_USER;
-
-  if (!silm->enabled)
-    return;
+  u16 template_id;
 
   now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
   now += silm->milisecond_time_0;
 
-  b0 = silm->max_entries_per_user_buffer;
+  b0 = sitd->max_entries_per_user_buffer;
 
   if (PREDICT_FALSE (b0 == 0))
     {
       if (do_flush)
-        return;
+       return;
 
       if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-        {
-          clib_warning ("can't allocate buffer for NAT IPFIX event");
-          return;
-        }
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
 
-      b0 = silm->max_entries_per_user_buffer =
-        vlib_get_buffer (vm, bi0);
-      fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-      vlib_buffer_init_for_free_list (b0, fl);
+      b0 = sitd->max_entries_per_user_buffer = vlib_get_buffer (vm, bi0);
       VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
       offset = 0;
     }
   else
     {
       bi0 = vlib_get_buffer_index (vm, b0);
-      offset = silm->max_entries_per_user_next_record_offset;
+      offset = sitd->max_entries_per_user_next_record_offset;
     }
 
-  f = silm->max_entries_per_user_frame;
+  f = sitd->max_entries_per_user_frame;
   if (PREDICT_FALSE (f == 0))
     {
-      u32 * to_next;
+      u32 *to_next;
       f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
-      silm->max_entries_per_user_frame = f;
+      sitd->max_entries_per_user_frame = f;
       to_next = vlib_frame_vector_args (f);
       to_next[0] = bi0;
       f->n_vectors = 1;
@@ -572,187 +891,909 @@ snat_ipfix_logging_max_entries_per_usr (u32 src_ip, int do_flush)
   if (PREDICT_TRUE (do_flush == 0))
     {
       u64 time_stamp = clib_host_to_net_u64 (now);
-      clib_memcpy (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
       offset += sizeof (time_stamp);
 
-      clib_memcpy (b0->data + offset, &nat_event, sizeof (nat_event));
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
       offset += sizeof (nat_event);
 
-      clib_memcpy (b0->data + offset, &quota_event, sizeof(quota_event));
+      clib_memcpy_fast (b0->data + offset, &quota_event, sizeof (quota_event));
       offset += sizeof (quota_event);
 
-      clib_memcpy (b0->data + offset, &src_ip, sizeof (src_ip));
+      clib_memcpy_fast (b0->data + offset, &limit, sizeof (limit));
+      offset += sizeof (limit);
+
+      clib_memcpy_fast (b0->data + offset, &src_ip, sizeof (src_ip));
       offset += sizeof (src_ip);
 
       b0->current_length += MAX_ENTRIES_PER_USER_LEN;
     }
 
-  if (PREDICT_FALSE (do_flush || (offset + MAX_ENTRIES_PER_USER_LEN) > frm->path_mtu))
+  if (PREDICT_FALSE
+      (do_flush || (offset + MAX_ENTRIES_PER_USER_LEN) > frm->path_mtu))
     {
-      snat_ipfix_send (frm, f, b0, silm->max_entries_per_user_template_id);
-      silm->max_entries_per_user_frame = 0;
-      silm->max_entries_per_user_buffer = 0;
+      template_id = clib_atomic_fetch_or (
+          &silm->max_entries_per_user_template_id,
+          0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->max_entries_per_user_frame = 0;
+      sitd->max_entries_per_user_buffer = 0;
       offset = 0;
     }
-  silm->max_entries_per_user_next_record_offset = offset;
+  sitd->max_entries_per_user_next_record_offset = offset;
 }
 
 static void
-snat_ipfix_logging_nat44_ses_rpc_cb (snat_ipfix_logging_nat44_ses_args_t *a)
+nat_ipfix_logging_max_ses (u32 thread_index, u32 limit, int do_flush)
 {
-  snat_ipfix_logging_nat44_ses(a->nat_event, a->src_ip, a->nat_src_ip,
-                               a->snat_proto, a->src_port, a->nat_src_port,
-                               a->vrf_id, 0);
-}
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
+  flow_report_main_t *frm = &flow_report_main;
+  vlib_frame_t *f;
+  vlib_buffer_t *b0 = 0;
+  u32 bi0 = ~0;
+  u32 offset;
+  vlib_main_t *vm = frm->vlib_main;
+  u64 now;
+  u8 nat_event = QUOTA_EXCEEDED;
+  u32 quota_event = MAX_SESSION_ENTRIES;
+  u16 template_id;
 
-/**
- * @brief Generate NAT44 session create event
- *
- * @param src_ip       source IPv4 address
- * @param nat_src_ip   transaltes source IPv4 address
- * @param snat_proto   NAT transport protocol
- * @param src_port     source port
- * @param nat_src_port translated source port
- * @param vrf_id       VRF ID
- */
-void
-snat_ipfix_logging_nat44_ses_create (u32 src_ip,
-                                     u32 nat_src_ip,
-                                     snat_protocol_t snat_proto,
-                                     u16 src_port,
-                                     u16 nat_src_port,
-                                     u32 vrf_id)
-{
-  snat_ipfix_logging_nat44_ses_args_t a;
+  now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
+  now += silm->milisecond_time_0;
 
-  a.nat_event = NAT44_SESSION_CREATE;
-  a.src_ip = src_ip;
-  a.nat_src_ip = nat_src_ip;
-  a.snat_proto = snat_proto;
-  a.src_port = src_port;
-  a.nat_src_port = nat_src_port;
-  a.vrf_id = vrf_id;
+  b0 = sitd->max_sessions_buffer;
 
-  vl_api_rpc_call_main_thread (snat_ipfix_logging_nat44_ses_rpc_cb, (u8 *) &a,
-                               sizeof (a));
-}
+  if (PREDICT_FALSE (b0 == 0))
+    {
+      if (do_flush)
+       return;
 
-/**
- * @brief Generate NAT44 session delete event
- *
- * @param src_ip       source IPv4 address
- * @param nat_src_ip   transaltes source IPv4 address
- * @param snat_proto   NAT transport protocol
- * @param src_port     source port
- * @param nat_src_port translated source port
- * @param vrf_id       VRF ID
- */
-void
-snat_ipfix_logging_nat44_ses_delete (u32 src_ip,
-                                     u32 nat_src_ip,
-                                     snat_protocol_t snat_proto,
-                                     u16 src_port,
-                                     u16 nat_src_port,
-                                     u32 vrf_id)
-{
-  snat_ipfix_logging_nat44_ses_args_t a;
+      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
 
-  a.nat_event = NAT44_SESSION_DELETE;
-  a.src_ip = src_ip;
-  a.nat_src_ip = nat_src_ip;
-  a.snat_proto = snat_proto;
-  a.src_port = src_port;
-  a.nat_src_port = nat_src_port;
-  a.vrf_id = vrf_id;
+      b0 = sitd->max_sessions_buffer = vlib_get_buffer (vm, bi0);
+      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+      offset = 0;
+    }
+  else
+    {
+      bi0 = vlib_get_buffer_index (vm, b0);
+      offset = sitd->max_sessions_next_record_offset;
+    }
 
-  vl_api_rpc_call_main_thread (snat_ipfix_logging_nat44_ses_rpc_cb, (u8 *) &a,
-                               sizeof (a));
-}
+  f = sitd->max_sessions_frame;
+  if (PREDICT_FALSE (f == 0))
+    {
+      u32 *to_next;
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      sitd->max_sessions_frame = f;
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+    }
 
-vlib_frame_t *
-snat_data_callback_nat44_session (flow_report_main_t * frm,
-                                  flow_report_t * fr,
-                                  vlib_frame_t * f,
-                                  u32 * to_next,
-                                  u32 node_index)
-{
-  snat_ipfix_logging_nat44_ses(0, 0, 0, 0, 0, 0, 0, 1);
-  return f;
-}
+  if (PREDICT_FALSE (offset == 0))
+    snat_ipfix_header_create (frm, b0, &offset);
 
-static void
-snat_ipfix_logging_addr_exhausted_rpc_cb
- (snat_ipfix_logging_addr_exhausted_args_t * a)
-{
-  snat_ipfix_logging_addr_exhausted(a->pool_id, 0);
-}
+  if (PREDICT_TRUE (do_flush == 0))
+    {
+      u64 time_stamp = clib_host_to_net_u64 (now);
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      offset += sizeof (time_stamp);
 
-/**
- * @brief Generate NAT addresses exhausted event
- *
- * @param pool_id NAT pool ID
- */
-void
-snat_ipfix_logging_addresses_exhausted(u32 pool_id)
-{
-  //TODO: This event SHOULD be rate limited
-  snat_ipfix_logging_addr_exhausted_args_t a;
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
+      offset += sizeof (nat_event);
+
+      clib_memcpy_fast (b0->data + offset, &quota_event, sizeof (quota_event));
+      offset += sizeof (quota_event);
 
-  a.pool_id = pool_id;
+      clib_memcpy_fast (b0->data + offset, &limit, sizeof (limit));
+      offset += sizeof (limit);
 
-  vl_api_rpc_call_main_thread (snat_ipfix_logging_addr_exhausted_rpc_cb,
-                               (u8 *) &a, sizeof (a));
-}
+      b0->current_length += MAX_SESSIONS_LEN;
+    }
 
-vlib_frame_t *
-snat_data_callback_addr_exhausted (flow_report_main_t * frm,
-                                   flow_report_t * fr,
-                                   vlib_frame_t * f,
-                                   u32 * to_next,
-                                   u32 node_index)
-{
-  snat_ipfix_logging_addr_exhausted(0, 1);
-  return f;
+  if (PREDICT_FALSE
+      (do_flush || (offset + MAX_SESSIONS_LEN) > frm->path_mtu))
+    {
+      template_id = clib_atomic_fetch_or (
+        &silm->max_sessions_template_id,
+        0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->max_sessions_frame = 0;
+      sitd->max_sessions_buffer = 0;
+      offset = 0;
+    }
+  sitd->max_sessions_next_record_offset = offset;
 }
 
 static void
-snat_ipfix_logging_max_entries_per_usr_rpc_cb
- (snat_ipfix_logging_max_entries_per_user_args_t * a)
+nat_ipfix_logging_max_bib (u32 thread_index, u32 limit, int do_flush)
 {
-  snat_ipfix_logging_max_entries_per_usr(a->src_ip, 0);
-}
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
+  flow_report_main_t *frm = &flow_report_main;
+  vlib_frame_t *f;
+  vlib_buffer_t *b0 = 0;
+  u32 bi0 = ~0;
+  u32 offset;
+  vlib_main_t *vm = frm->vlib_main;
+  u64 now;
+  u8 nat_event = QUOTA_EXCEEDED;
+  u32 quota_event = MAX_BIB_ENTRIES;
+  u16 template_id;
 
-/**
- * @brief Generate maximum entries per user exceeded event
- *
- * @param src_ip source IPv4 address
- */
-void
-snat_ipfix_logging_max_entries_per_user(u32 src_ip)
-{
-  //TODO: This event SHOULD be rate limited
-  snat_ipfix_logging_max_entries_per_user_args_t a;
+  now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
+  now += silm->milisecond_time_0;
 
-  a.src_ip = src_ip;
+  b0 = sitd->max_bibs_buffer;
 
-  vl_api_rpc_call_main_thread (snat_ipfix_logging_max_entries_per_usr_rpc_cb,
-                               (u8 *) &a, sizeof (a));
-}
+  if (PREDICT_FALSE (b0 == 0))
+    {
+      if (do_flush)
+       return;
 
-vlib_frame_t *
-snat_data_callback_max_entries_per_usr (flow_report_main_t * frm,
-                                        flow_report_t * fr,
-                                        vlib_frame_t * f,
-                                        u32 * to_next,
-                                        u32 node_index)
-{
-  snat_ipfix_logging_max_entries_per_usr(0, 1);
-  return f;
-}
+      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
 
-/**
- * @brief Enable/disable NAT plugin IPFIX logging
- *
+      b0 = sitd->max_bibs_buffer = vlib_get_buffer (vm, bi0);
+      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+      offset = 0;
+    }
+  else
+    {
+      bi0 = vlib_get_buffer_index (vm, b0);
+      offset = sitd->max_bibs_next_record_offset;
+    }
+
+  f = sitd->max_bibs_frame;
+  if (PREDICT_FALSE (f == 0))
+    {
+      u32 *to_next;
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      sitd->max_bibs_frame = f;
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+    }
+
+  if (PREDICT_FALSE (offset == 0))
+    snat_ipfix_header_create (frm, b0, &offset);
+
+  if (PREDICT_TRUE (do_flush == 0))
+    {
+      u64 time_stamp = clib_host_to_net_u64 (now);
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      offset += sizeof (time_stamp);
+
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
+      offset += sizeof (nat_event);
+
+      clib_memcpy_fast (b0->data + offset, &quota_event, sizeof (quota_event));
+      offset += sizeof (quota_event);
+
+      clib_memcpy_fast (b0->data + offset, &limit, sizeof (limit));
+      offset += sizeof (limit);
+
+      b0->current_length += MAX_BIBS_LEN;
+    }
+
+  if (PREDICT_FALSE
+      (do_flush || (offset + MAX_BIBS_LEN) > frm->path_mtu))
+    {
+      template_id = clib_atomic_fetch_or (
+        &silm->max_bibs_template_id,
+        0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->max_bibs_frame = 0;
+      sitd->max_bibs_buffer = 0;
+      offset = 0;
+    }
+  sitd->max_bibs_next_record_offset = offset;
+}
+
+static void
+nat_ipfix_logging_max_frag_ip4 (u32 thread_index,
+                                u32 limit, u32 src, int do_flush)
+{
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
+  flow_report_main_t *frm = &flow_report_main;
+  vlib_frame_t *f;
+  vlib_buffer_t *b0 = 0;
+  u32 bi0 = ~0;
+  u32 offset;
+  vlib_main_t *vm = frm->vlib_main;
+  u64 now;
+  u8 nat_event = QUOTA_EXCEEDED;
+  u32 quota_event = MAX_FRAGMENTS_PENDING_REASSEMBLY;
+  u16 template_id;
+
+  now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
+  now += silm->milisecond_time_0;
+
+  b0 = sitd->max_frags_ip4_buffer;
+
+  if (PREDICT_FALSE (b0 == 0))
+    {
+      if (do_flush)
+       return;
+
+      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
+
+      b0 = sitd->max_frags_ip4_buffer = vlib_get_buffer (vm, bi0);
+      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+      offset = 0;
+    }
+  else
+    {
+      bi0 = vlib_get_buffer_index (vm, b0);
+      offset = sitd->max_frags_ip4_next_record_offset;
+    }
+
+  f = sitd->max_frags_ip4_frame;
+  if (PREDICT_FALSE (f == 0))
+    {
+      u32 *to_next;
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      sitd->max_frags_ip4_frame = f;
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+    }
+
+  if (PREDICT_FALSE (offset == 0))
+    snat_ipfix_header_create (frm, b0, &offset);
+
+  if (PREDICT_TRUE (do_flush == 0))
+    {
+      u64 time_stamp = clib_host_to_net_u64 (now);
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      offset += sizeof (time_stamp);
+
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
+      offset += sizeof (nat_event);
+
+      clib_memcpy_fast (b0->data + offset, &quota_event, sizeof (quota_event));
+      offset += sizeof (quota_event);
+
+      clib_memcpy_fast (b0->data + offset, &limit, sizeof (limit));
+      offset += sizeof (limit);
+
+      clib_memcpy_fast (b0->data + offset, &src, sizeof (src));
+      offset += sizeof (src);
+
+      b0->current_length += MAX_FRAGMENTS_IP4_LEN;
+    }
+
+  if (PREDICT_FALSE
+      (do_flush || (offset + MAX_BIBS_LEN) > frm->path_mtu))
+    {
+      template_id = clib_atomic_fetch_or (
+        &silm->max_frags_ip4_template_id,
+        0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->max_frags_ip4_frame = 0;
+      sitd->max_frags_ip4_buffer = 0;
+      offset = 0;
+    }
+  sitd->max_frags_ip4_next_record_offset = offset;
+}
+
+static void
+nat_ipfix_logging_max_frag_ip6 (u32 thread_index,
+                                u32 limit, ip6_address_t * src, int do_flush)
+{
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
+  flow_report_main_t *frm = &flow_report_main;
+  vlib_frame_t *f;
+  vlib_buffer_t *b0 = 0;
+  u32 bi0 = ~0;
+  u32 offset;
+  vlib_main_t *vm = frm->vlib_main;
+  u64 now;
+  u8 nat_event = QUOTA_EXCEEDED;
+  u32 quota_event = MAX_FRAGMENTS_PENDING_REASSEMBLY;
+  u16 template_id;
+
+  now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
+  now += silm->milisecond_time_0;
+
+  b0 = sitd->max_frags_ip6_buffer;
+
+  if (PREDICT_FALSE (b0 == 0))
+    {
+      if (do_flush)
+       return;
+
+      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
+
+      b0 = sitd->max_frags_ip6_buffer = vlib_get_buffer (vm, bi0);
+      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+      offset = 0;
+    }
+  else
+    {
+      bi0 = vlib_get_buffer_index (vm, b0);
+      offset = sitd->max_frags_ip6_next_record_offset;
+    }
+
+  f = sitd->max_frags_ip6_frame;
+  if (PREDICT_FALSE (f == 0))
+    {
+      u32 *to_next;
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      sitd->max_frags_ip6_frame = f;
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+    }
+
+  if (PREDICT_FALSE (offset == 0))
+    snat_ipfix_header_create (frm, b0, &offset);
+
+  if (PREDICT_TRUE (do_flush == 0))
+    {
+      u64 time_stamp = clib_host_to_net_u64 (now);
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      offset += sizeof (time_stamp);
+
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
+      offset += sizeof (nat_event);
+
+      clib_memcpy_fast (b0->data + offset, &quota_event, sizeof (quota_event));
+      offset += sizeof (quota_event);
+
+      clib_memcpy_fast (b0->data + offset, &limit, sizeof (limit));
+      offset += sizeof (limit);
+
+      clib_memcpy_fast (b0->data + offset, src, sizeof (ip6_address_t));
+      offset += sizeof (ip6_address_t);
+
+      b0->current_length += MAX_FRAGMENTS_IP6_LEN;
+    }
+
+  if (PREDICT_FALSE
+      (do_flush || (offset + MAX_BIBS_LEN) > frm->path_mtu))
+    {
+      template_id = clib_atomic_fetch_or (
+        &silm->max_frags_ip6_template_id,
+        0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->max_frags_ip6_frame = 0;
+      sitd->max_frags_ip6_buffer = 0;
+      offset = 0;
+    }
+  sitd->max_frags_ip6_next_record_offset = offset;
+}
+
+static void
+nat_ipfix_logging_nat64_bibe (u32 thread_index, u8 nat_event,
+                              ip6_address_t * src_ip, u32 nat_src_ip,
+                              u8 proto, u16 src_port, u16 nat_src_port,
+                              u32 vrf_id, int do_flush)
+{
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
+  flow_report_main_t *frm = &flow_report_main;
+  vlib_frame_t *f;
+  vlib_buffer_t *b0 = 0;
+  u32 bi0 = ~0;
+  u32 offset;
+  vlib_main_t *vm = frm->vlib_main;
+  u64 now;
+  u16 template_id;
+
+  now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
+  now += silm->milisecond_time_0;
+
+  b0 = sitd->nat64_bib_buffer;
+
+  if (PREDICT_FALSE (b0 == 0))
+    {
+      if (do_flush)
+       return;
+
+      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
+
+      b0 = sitd->nat64_bib_buffer = vlib_get_buffer (vm, bi0);
+      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+      offset = 0;
+    }
+  else
+    {
+      bi0 = vlib_get_buffer_index (vm, b0);
+      offset = sitd->nat64_bib_next_record_offset;
+    }
+
+  f = sitd->nat64_bib_frame;
+  if (PREDICT_FALSE (f == 0))
+    {
+      u32 *to_next;
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      sitd->nat64_bib_frame = f;
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+    }
+
+  if (PREDICT_FALSE (offset == 0))
+    snat_ipfix_header_create (frm, b0, &offset);
+
+  if (PREDICT_TRUE (do_flush == 0))
+    {
+      u64 time_stamp = clib_host_to_net_u64 (now);
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      offset += sizeof (time_stamp);
+
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
+      offset += sizeof (nat_event);
+
+      clib_memcpy_fast (b0->data + offset, src_ip, sizeof (ip6_address_t));
+      offset += sizeof (ip6_address_t);
+
+      clib_memcpy_fast (b0->data + offset, &nat_src_ip, sizeof (nat_src_ip));
+      offset += sizeof (nat_src_ip);
+
+      clib_memcpy_fast (b0->data + offset, &proto, sizeof (proto));
+      offset += sizeof (proto);
+
+      clib_memcpy_fast (b0->data + offset, &src_port, sizeof (src_port));
+      offset += sizeof (src_port);
+
+      clib_memcpy_fast (b0->data + offset, &nat_src_port, sizeof (nat_src_port));
+      offset += sizeof (nat_src_port);
+
+      clib_memcpy_fast (b0->data + offset, &vrf_id, sizeof (vrf_id));
+      offset += sizeof (vrf_id);
+
+      b0->current_length += NAT64_BIB_LEN;
+    }
+
+  if (PREDICT_FALSE
+      (do_flush || (offset + NAT64_BIB_LEN) > frm->path_mtu))
+    {
+      template_id = clib_atomic_fetch_or (
+        &silm->nat64_bib_template_id,
+        0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->nat64_bib_frame = 0;
+      sitd->nat64_bib_buffer = 0;
+      offset = 0;
+    }
+  sitd->nat64_bib_next_record_offset = offset;
+}
+
+static void
+nat_ipfix_logging_nat64_ses (u32 thread_index, u8 nat_event,
+                             ip6_address_t * src_ip, u32 nat_src_ip,
+                             u8 proto, u16 src_port, u16 nat_src_port,
+                             ip6_address_t * dst_ip, u32 nat_dst_ip,
+                             u16 dst_port, u16 nat_dst_port,
+                             u32 vrf_id, int do_flush)
+{
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  snat_ipfix_per_thread_data_t *sitd = &silm->per_thread_data[thread_index];
+  flow_report_main_t *frm = &flow_report_main;
+  vlib_frame_t *f;
+  vlib_buffer_t *b0 = 0;
+  u32 bi0 = ~0;
+  u32 offset;
+  vlib_main_t *vm = frm->vlib_main;
+  u64 now;
+  u16 template_id;
+
+  now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
+  now += silm->milisecond_time_0;
+
+  b0 = sitd->nat64_ses_buffer;
+
+  if (PREDICT_FALSE (b0 == 0))
+    {
+      if (do_flush)
+       return;
+
+      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+       {
+         nat_log_err ("can't allocate buffer for NAT IPFIX event");
+         return;
+       }
+
+      b0 = sitd->nat64_ses_buffer = vlib_get_buffer (vm, bi0);
+      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+      offset = 0;
+    }
+  else
+    {
+      bi0 = vlib_get_buffer_index (vm, b0);
+      offset = sitd->nat64_ses_next_record_offset;
+    }
+
+  f = sitd->nat64_ses_frame;
+  if (PREDICT_FALSE (f == 0))
+    {
+      u32 *to_next;
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      sitd->nat64_ses_frame = f;
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+    }
+
+  if (PREDICT_FALSE (offset == 0))
+    snat_ipfix_header_create (frm, b0, &offset);
+
+  if (PREDICT_TRUE (do_flush == 0))
+    {
+      u64 time_stamp = clib_host_to_net_u64 (now);
+      clib_memcpy_fast (b0->data + offset, &time_stamp, sizeof (time_stamp));
+      offset += sizeof (time_stamp);
+
+      clib_memcpy_fast (b0->data + offset, &nat_event, sizeof (nat_event));
+      offset += sizeof (nat_event);
+
+      clib_memcpy_fast (b0->data + offset, src_ip, sizeof (ip6_address_t));
+      offset += sizeof (ip6_address_t);
+
+      clib_memcpy_fast (b0->data + offset, &nat_src_ip, sizeof (nat_src_ip));
+      offset += sizeof (nat_src_ip);
+
+      clib_memcpy_fast (b0->data + offset, &proto, sizeof (proto));
+      offset += sizeof (proto);
+
+      clib_memcpy_fast (b0->data + offset, &src_port, sizeof (src_port));
+      offset += sizeof (src_port);
+
+      clib_memcpy_fast (b0->data + offset, &nat_src_port, sizeof (nat_src_port));
+      offset += sizeof (nat_src_port);
+
+      clib_memcpy_fast (b0->data + offset, dst_ip, sizeof (ip6_address_t));
+      offset += sizeof (ip6_address_t);
+
+      clib_memcpy_fast (b0->data + offset, &nat_dst_ip, sizeof (nat_dst_ip));
+      offset += sizeof (nat_dst_ip);
+
+      clib_memcpy_fast (b0->data + offset, &dst_port, sizeof (dst_port));
+      offset += sizeof (dst_port);
+
+      clib_memcpy_fast (b0->data + offset, &nat_dst_port, sizeof (nat_dst_port));
+      offset += sizeof (nat_dst_port);
+
+      clib_memcpy_fast (b0->data + offset, &vrf_id, sizeof (vrf_id));
+      offset += sizeof (vrf_id);
+
+      b0->current_length += NAT64_SES_LEN;
+    }
+
+  if (PREDICT_FALSE
+      (do_flush || (offset + NAT64_SES_LEN) > frm->path_mtu))
+    {
+      template_id = clib_atomic_fetch_or (
+        &silm->nat64_ses_template_id,
+        0);
+      snat_ipfix_send (frm, f, b0, template_id);
+      sitd->nat64_ses_frame = 0;
+      sitd->nat64_ses_buffer = 0;
+      offset = 0;
+    }
+  sitd->nat64_ses_next_record_offset = offset;
+}
+
+void
+snat_ipfix_flush (u32 thread_index)
+{
+  int do_flush = 1;
+
+  snat_ipfix_logging_nat44_ses (thread_index,
+                                0, 0, 0, 0, 0, 0, 0, do_flush);
+  snat_ipfix_logging_addr_exhausted (thread_index, 0, do_flush);
+  snat_ipfix_logging_max_entries_per_usr (thread_index, 0, 0, do_flush);
+  nat_ipfix_logging_max_ses (thread_index, 0, do_flush);
+  nat_ipfix_logging_max_bib (thread_index, 0, do_flush);
+  nat_ipfix_logging_max_frag_ip4 (thread_index, 0, 0, do_flush);
+  nat_ipfix_logging_max_frag_ip6 (thread_index, 0, 0, do_flush);
+  nat_ipfix_logging_nat64_bibe (thread_index,
+                                0, 0, 0, 0, 0, 0, 0, do_flush);
+  nat_ipfix_logging_nat64_ses (thread_index,
+                               0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, do_flush);
+}
+
+void
+snat_ipfix_flush_from_main (void)
+{
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  vlib_main_t *worker_vm;
+  int i;
+
+  if (PREDICT_TRUE (!clib_atomic_fetch_or(&silm->enabled, 0)))
+    return;
+
+  if (PREDICT_FALSE (!silm->worker_vms))
+    {
+      for (i = 1; i < vec_len (vlib_mains); i++)
+        {
+          worker_vm = vlib_mains[i];
+          if (worker_vm)
+            vec_add1 (silm->worker_vms, worker_vm);
+        }
+    }
+
+  /* Trigger flush for each worker thread */
+  for (i = 1; i < vec_len (silm->worker_vms); i++)
+    {
+      worker_vm = silm->worker_vms[i];
+      if (worker_vm)
+       vlib_node_set_interrupt_pending (worker_vm,
+                                        snat_ipfix_flush_node.index);
+    }
+
+  /* Finally flush main thread */
+  snat_ipfix_flush (0);
+}
+
+/**
+ * @brief Generate NAT44 session create event
+ *
+ * @param thread_index thread index
+ * @param src_ip       source IPv4 address
+ * @param nat_src_ip   transaltes source IPv4 address
+ * @param snat_proto   NAT transport protocol
+ * @param src_port     source port
+ * @param nat_src_port translated source port
+ * @param vrf_id       VRF ID
+ */
+void
+snat_ipfix_logging_nat44_ses_create (u32 thread_index,
+                                     u32 src_ip,
+                                    u32 nat_src_ip,
+                                    snat_protocol_t snat_proto,
+                                    u16 src_port,
+                                    u16 nat_src_port, u32 vrf_id)
+{
+  skip_if_disabled ();
+
+  snat_ipfix_logging_nat44_ses (thread_index, NAT44_SESSION_CREATE, src_ip,
+                                nat_src_ip, snat_proto, src_port, nat_src_port,
+                               vrf_id, 0);
+}
+
+/**
+ * @brief Generate NAT44 session delete event
+ *
+ * @param thread_index thread index
+ * @param src_ip       source IPv4 address
+ * @param nat_src_ip   transaltes source IPv4 address
+ * @param snat_proto   NAT transport protocol
+ * @param src_port     source port
+ * @param nat_src_port translated source port
+ * @param vrf_id       VRF ID
+ */
+void
+snat_ipfix_logging_nat44_ses_delete (u32 thread_index,
+                                     u32 src_ip,
+                                    u32 nat_src_ip,
+                                    snat_protocol_t snat_proto,
+                                    u16 src_port,
+                                    u16 nat_src_port, u32 vrf_id)
+{
+  skip_if_disabled ();
+
+  snat_ipfix_logging_nat44_ses (thread_index, NAT44_SESSION_DELETE, src_ip,
+                                nat_src_ip, snat_proto, src_port, nat_src_port,
+                               vrf_id, 0);
+}
+
+/**
+ * @brief Generate NAT addresses exhausted event
+ *
+ * @param thread_index thread index
+ * @param pool_id NAT pool ID
+ */
+void
+snat_ipfix_logging_addresses_exhausted (u32 thread_index, u32 pool_id)
+{
+  //TODO: This event SHOULD be rate limited
+  skip_if_disabled ();
+
+  snat_ipfix_logging_addr_exhausted (thread_index, pool_id, 0);
+}
+
+/**
+ * @brief Generate maximum entries per user exceeded event
+ *
+ * @param thread_index thread index
+ * @param limit maximum NAT entries that can be created per user
+ * @param src_ip source IPv4 address
+ */
+void
+snat_ipfix_logging_max_entries_per_user (u32 thread_index, u32 limit, u32 src_ip)
+{
+  //TODO: This event SHOULD be rate limited
+  skip_if_disabled ();
+
+  snat_ipfix_logging_max_entries_per_usr (thread_index, limit, src_ip, 0);
+}
+
+vlib_frame_t *
+deterministic_nat_data_callback
+(flow_report_main_t * frm,
+                                       flow_report_t * fr,
+                                       vlib_frame_t * f,
+                                       u32 * to_next, u32 node_index)
+{
+  snat_ipfix_flush_from_main();
+
+  return f;
+}
+
+/**
+ * @brief Generate maximum session entries exceeded event
+ *
+ * @param thread_index thread index
+ * @param limit configured limit
+ */
+void
+nat_ipfix_logging_max_sessions (u32 thread_index, u32 limit)
+{
+  //TODO: This event SHOULD be rate limited
+  skip_if_disabled ();
+
+  nat_ipfix_logging_max_ses (thread_index, limit, 0);
+}
+
+/**
+ * @brief Generate maximum BIB entries exceeded event
+ *
+ * @param thread_index thread index
+ * @param limit configured limit
+ */
+void
+nat_ipfix_logging_max_bibs (u32 thread_index, u32 limit)
+{
+  //TODO: This event SHOULD be rate limited
+  skip_if_disabled ();
+
+  nat_ipfix_logging_max_bib (thread_index, limit, 0);
+}
+
+/**
+ * @brief Generate maximum IPv4 fragments pending reassembly exceeded event
+ *
+ * @param thread_index thread index
+ * @param limit configured limit
+ * @param src source IPv4 address
+ */
+void
+nat_ipfix_logging_max_fragments_ip4 (u32 thread_index,
+                                     u32 limit, ip4_address_t * src)
+{
+  //TODO: This event SHOULD be rate limited
+  skip_if_disabled ();
+
+  nat_ipfix_logging_max_frag_ip4 (thread_index, limit, src->as_u32, 0);
+}
+
+/**
+ * @brief Generate maximum IPv6 fragments pending reassembly exceeded event
+ *
+ * @param thread_index thread index
+ * @param limit configured limit
+ * @param src source IPv6 address
+ */
+void
+nat_ipfix_logging_max_fragments_ip6 (u32 thread_index,
+                                     u32 limit, ip6_address_t * src)
+{
+  //TODO: This event SHOULD be rate limited
+  skip_if_disabled ();
+
+  nat_ipfix_logging_max_frag_ip6 (thread_index, limit, src, 0);
+}
+
+/**
+ * @brief Generate NAT64 BIB create and delete events
+ *
+ * @param thread_index thread index
+ * @param src_ip       source IPv6 address
+ * @param nat_src_ip   transaltes source IPv4 address
+ * @param proto        L4 protocol
+ * @param src_port     source port
+ * @param nat_src_port translated source port
+ * @param vrf_id       VRF ID
+ * @param is_create    non-zero value if create event otherwise delete event
+ */
+void
+nat_ipfix_logging_nat64_bib (u32 thread_index, ip6_address_t * src_ip,
+                             ip4_address_t * nat_src_ip, u8 proto,
+                             u16 src_port, u16 nat_src_port, u32 vrf_id,
+                             u8 is_create)
+{
+  u8 nat_event;
+
+  skip_if_disabled ();
+
+  nat_event = is_create ? NAT64_BIB_CREATE : NAT64_BIB_DELETE;
+
+  nat_ipfix_logging_nat64_bibe (thread_index, nat_event, src_ip,
+                                nat_src_ip->as_u32, proto, src_port,
+                                nat_src_port, vrf_id, 0);
+}
+
+/**
+ * @brief Generate NAT64 session create and delete events
+ *
+ * @param thread_index thread index
+ * @param src_ip       source IPv6 address
+ * @param nat_src_ip   transaltes source IPv4 address
+ * @param proto        L4 protocol
+ * @param src_port     source port
+ * @param nat_src_port translated source port
+ * @param dst_ip       destination IPv6 address
+ * @param nat_dst_ip   destination IPv4 address
+ * @param dst_port     destination port
+ * @param nat_dst_port translated destination port
+ * @param vrf_id       VRF ID
+ * @param is_create    non-zero value if create event otherwise delete event
+ */
+void
+nat_ipfix_logging_nat64_session (u32 thread_index,
+                                 ip6_address_t * src_ip,
+                                 ip4_address_t * nat_src_ip, u8 proto,
+                                 u16 src_port, u16 nat_src_port,
+                                 ip6_address_t * dst_ip,
+                                 ip4_address_t * nat_dst_ip, u16 dst_port,
+                                 u16 nat_dst_port, u32 vrf_id, u8 is_create)
+{
+  u8 nat_event;
+
+  skip_if_disabled ();
+
+  nat_event = is_create ? NAT64_SESSION_CREATE : NAT64_SESSION_DELETE;
+
+  nat_ipfix_logging_nat64_ses (thread_index, nat_event, src_ip,
+                               nat_src_ip->as_u32, proto, src_port,
+                               nat_src_port, dst_ip, nat_dst_ip->as_u32,
+                               dst_port, nat_dst_port, vrf_id, 0);
+}
+
+vlib_frame_t *
+data_callback (flow_report_main_t * frm, flow_report_t * fr,
+               vlib_frame_t * f, u32 * to_next, u32 node_index)
+{
+  snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+
+  if (PREDICT_FALSE (++silm->call_counter >= vec_len (frm->reports)))
+    {
+      snat_ipfix_flush_from_main();
+      silm->call_counter = 0;
+    }
+
+  return f;
+}
+
+/**
+ * @brief Enable/disable NAT plugin IPFIX logging
+ *
  * @param enable    1 if enable, 0 if disable
  * @param domain_id observation domain ID
  * @param src_port  source port number
@@ -762,55 +1803,117 @@ snat_data_callback_max_entries_per_usr (flow_report_main_t * frm,
 int
 snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port)
 {
-  snat_main_t * sm = &snat_main;
+  snat_main_t *sm = &snat_main;
   snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
   flow_report_main_t *frm = &flow_report_main;
   vnet_flow_report_add_del_args_t a;
   int rv;
   u8 e = enable ? 1 : 0;
 
-  if (silm->enabled == e)
+  if (clib_atomic_cmp_and_swap (&silm->enabled, e ^ 1, e) == e)
     return 0;
 
-  silm->enabled = e;
-
-  memset (&a, 0, sizeof (a));
+  clib_memset (&a, 0, sizeof (a));
   a.is_add = enable;
   a.domain_id = domain_id ? domain_id : 1;
   a.src_port = src_port ? src_port : UDP_DST_PORT_ipfix;
+  a.flow_data_callback = data_callback;
 
   if (sm->deterministic)
     {
       a.rewrite_callback = snat_template_rewrite_max_entries_per_usr;
-      a.flow_data_callback = snat_data_callback_max_entries_per_usr;
 
       rv = vnet_flow_report_add_del (frm, &a, NULL);
       if (rv)
-        {
-          clib_warning ("vnet_flow_report_add_del returned %d", rv);
-          return -1;
-        }
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
     }
   else
     {
       a.rewrite_callback = snat_template_rewrite_nat44_session;
-      a.flow_data_callback = snat_data_callback_nat44_session;
 
       rv = vnet_flow_report_add_del (frm, &a, NULL);
       if (rv)
-        {
-          clib_warning ("vnet_flow_report_add_del returned %d", rv);
-          return -1;
-        }
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
 
       a.rewrite_callback = snat_template_rewrite_addr_exhausted;
-      a.flow_data_callback = snat_data_callback_addr_exhausted;
 
       rv = vnet_flow_report_add_del (frm, &a, NULL);
       if (rv)
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
+
+      a.rewrite_callback = nat_template_rewrite_max_sessions;
+
+      rv = vnet_flow_report_add_del (frm, &a, NULL);
+      if (rv)
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
+
+      a.rewrite_callback = nat_template_rewrite_max_bibs;
+
+      rv = vnet_flow_report_add_del (frm, &a, NULL);
+      if (rv)
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
+
+      a.rewrite_callback = nat_template_rewrite_max_frags_ip4;
+
+      rv = vnet_flow_report_add_del (frm, &a, NULL);
+      if (rv)
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
+
+      a.rewrite_callback = nat_template_rewrite_max_frags_ip6;
+
+      rv = vnet_flow_report_add_del (frm, &a, NULL);
+      if (rv)
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
+
+      a.rewrite_callback = nat_template_rewrite_nat64_bib;
+
+      rv = vnet_flow_report_add_del (frm, &a, NULL);
+      if (rv)
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
+
+      a.rewrite_callback = nat_template_rewrite_nat64_session;
+
+      rv = vnet_flow_report_add_del (frm, &a, NULL);
+      if (rv)
+       {
+         nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+         return -1;
+       }
+
+      if (sm->endpoint_dependent)
         {
-          clib_warning ("vnet_flow_report_add_del returned %d", rv);
-          return -1;
+          a.rewrite_callback = snat_template_rewrite_max_entries_per_usr;
+
+          rv = vnet_flow_report_add_del (frm, &a, NULL);
+          if (rv)
+            {
+              nat_log_warn ("vnet_flow_report_add_del returned %d", rv);
+              return -1;
+            }
         }
     }
 
@@ -826,10 +1929,33 @@ void
 snat_ipfix_logging_init (vlib_main_t * vm)
 {
   snat_ipfix_logging_main_t *silm = &snat_ipfix_logging_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
 
   silm->enabled = 0;
+  silm->worker_vms = 0;
+  silm->call_counter = 0;
 
   /* Set up time reference pair */
   silm->vlib_time_0 = vlib_time_now (vm);
   silm->milisecond_time_0 = unix_time_now_nsec () * 1e-6;
+
+  vec_validate (silm->per_thread_data, tm->n_vlib_mains - 1);
 }
+
+static uword
+ipfix_flush_process (vlib_main_t *vm,
+                    vlib_node_runtime_t *rt,
+                     vlib_frame_t *f)
+{
+  snat_ipfix_flush(vm->thread_index);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (snat_ipfix_flush_node) = {
+  .function = ipfix_flush_process,
+  .name = "snat-ipfix-flush",
+  .type = VLIB_NODE_TYPE_INPUT,
+  .state = VLIB_NODE_STATE_INTERRUPT,
+};
+/* *INDENT-ON* */