X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat64_db.c;h=ca8358ef8a210e4de656a33ae94a27cafb1c0c12;hb=refs%2Fchanges%2F80%2F16380%2F3;hp=3edc1a4300665c2377394ecb0ad92a545db87987;hpb=a431ad1c486ad0fd9ca35e14c527fe7611965fc2;p=vpp.git

diff --git a/src/plugins/nat/nat64_db.c b/src/plugins/nat/nat64_db.c
index 3edc1a43006..ca8358ef8a2 100644
--- a/src/plugins/nat/nat64_db.c
+++ b/src/plugins/nat/nat64_db.c
@@ -18,6 +18,8 @@
  */
 #include <nat/nat64_db.h>
 #include <nat/nat_ipfix_logging.h>
+#include <nat/nat_inlines.h>
+#include <nat/nat_syslog.h>
 #include <vnet/fib/fib_table.h>
 
 int
@@ -85,7 +87,7 @@ nat64_db_bib_entry_create (nat64_db_t * db, ip6_address_t * in_addr,
 
   db->bib.bib_entries_num++;
 
-  memset (bibe, 0, sizeof (*bibe));
+  clib_memset (bibe, 0, sizeof (*bibe));
   bibe->in_addr.as_u64[0] = in_addr->as_u64[0];
   bibe->in_addr.as_u64[1] = in_addr->as_u64[1];
   bibe->in_port = in_port;
@@ -107,7 +109,7 @@ nat64_db_bib_entry_create (nat64_db_t * db, ip6_address_t * in_addr,
   kv.key[2] = bibe_key.as_u64[2];
   clib_bihash_add_del_24_8 (&db->bib.in2out, &kv, 1);
 
-  memset (&bibe_key.addr, 0, sizeof (bibe_key.addr));
+  clib_memset (&bibe_key.addr, 0, sizeof (bibe_key.addr));
   bibe_key.addr.ip4.as_u32 = bibe->out_addr.as_u32;
   bibe_key.fib_index = 0;
   bibe_key.port = bibe->out_port;
@@ -178,7 +180,7 @@ nat64_db_bib_entry_free (nat64_db_t * db, nat64_db_bib_entry_t * bibe)
   kv.key[2] = bibe_key.as_u64[2];
   clib_bihash_add_del_24_8 (&db->bib.in2out, &kv, 0);
 
-  memset (&bibe_key.addr, 0, sizeof (bibe_key.addr));
+  clib_memset (&bibe_key.addr, 0, sizeof (bibe_key.addr));
   bibe_key.addr.ip4.as_u32 = bibe->out_addr.as_u32;
   bibe_key.fib_index = 0;
   bibe_key.port = bibe->out_port;
@@ -406,7 +408,7 @@ nat64_db_st_entry_create (nat64_db_t * db, nat64_db_bib_entry_t * bibe,
 
   db->st.st_entries_num++;
 
-  memset (ste, 0, sizeof (*ste));
+  clib_memset (ste, 0, sizeof (*ste));
   ste->in_r_addr.as_u64[0] = in_r_addr->as_u64[0];
   ste->in_r_addr.as_u64[1] = in_r_addr->as_u64[1];
   ste->out_r_addr.as_u32 = out_r_addr->as_u32;
@@ -418,7 +420,7 @@ nat64_db_st_entry_create (nat64_db_t * db, nat64_db_bib_entry_t * bibe,
   bibe->ses_num++;
 
   /* create hash lookup */
-  memset (&ste_key, 0, sizeof (ste_key));
+  clib_memset (&ste_key, 0, sizeof (ste_key));
   ste_key.l_addr.as_u64[0] = bibe->in_addr.as_u64[0];
   ste_key.l_addr.as_u64[1] = bibe->in_addr.as_u64[1];
   ste_key.r_addr.as_u64[0] = ste->in_r_addr.as_u64[0];
@@ -435,7 +437,7 @@ nat64_db_st_entry_create (nat64_db_t * db, nat64_db_bib_entry_t * bibe,
   kv.key[5] = ste_key.as_u64[5];
   clib_bihash_add_del_48_8 (&db->st.in2out, &kv, 1);
 
-  memset (&ste_key, 0, sizeof (ste_key));
+  clib_memset (&ste_key, 0, sizeof (ste_key));
   ste_key.l_addr.ip4.as_u32 = bibe->out_addr.as_u32;
   ste_key.r_addr.ip4.as_u32 = ste->out_r_addr.as_u32;
   ste_key.l_port = bibe->out_port;
@@ -455,7 +457,9 @@ nat64_db_st_entry_create (nat64_db_t * db, nat64_db_bib_entry_t * bibe,
 				   &ste->in_r_addr, &ste->out_r_addr,
 				   ste->r_port, ste->r_port, fib->ft_table_id,
 				   1);
-
+  nat_syslog_nat64_sadd (bibe->fib_index, &bibe->in_addr, bibe->in_port,
+			 &bibe->out_addr, bibe->out_port, &ste->out_r_addr,
+			 ste->r_port, bibe->proto);
   return ste;
 }
 
@@ -490,7 +494,7 @@ nat64_db_st_entry_free (nat64_db_t * db, nat64_db_st_entry_t * ste)
   db->st.st_entries_num--;
 
   /* delete hash lookup */
-  memset (&ste_key, 0, sizeof (ste_key));
+  clib_memset (&ste_key, 0, sizeof (ste_key));
   ste_key.l_addr.as_u64[0] = bibe->in_addr.as_u64[0];
   ste_key.l_addr.as_u64[1] = bibe->in_addr.as_u64[1];
   ste_key.r_addr.as_u64[0] = ste->in_r_addr.as_u64[0];
@@ -507,7 +511,7 @@ nat64_db_st_entry_free (nat64_db_t * db, nat64_db_st_entry_t * ste)
   kv.key[5] = ste_key.as_u64[5];
   clib_bihash_add_del_48_8 (&db->st.in2out, &kv, 0);
 
-  memset (&ste_key, 0, sizeof (ste_key));
+  clib_memset (&ste_key, 0, sizeof (ste_key));
   ste_key.l_addr.ip4.as_u32 = bibe->out_addr.as_u32;
   ste_key.r_addr.ip4.as_u32 = ste->out_r_addr.as_u32;
   ste_key.l_port = bibe->out_port;
@@ -527,6 +531,9 @@ nat64_db_st_entry_free (nat64_db_t * db, nat64_db_st_entry_t * ste)
 				   &ste->in_r_addr, &ste->out_r_addr,
 				   ste->r_port, ste->r_port, fib->ft_table_id,
 				   0);
+  nat_syslog_nat64_sdel (bibe->fib_index, &bibe->in_addr, bibe->in_port,
+			 &bibe->out_addr, bibe->out_port, &ste->out_r_addr,
+			 ste->r_port, bibe->proto);
 
   /* delete from pool */
   pool_put (st, ste);
@@ -564,7 +571,7 @@ nat64_db_st_entry_find (nat64_db_t * db, ip46_address_t * l_addr,
       break;
     }
 
-  memset (&ste_key, 0, sizeof (ste_key));
+  clib_memset (&ste_key, 0, sizeof (ste_key));
   ste_key.l_addr.as_u64[0] = l_addr->as_u64[0];
   ste_key.l_addr.as_u64[1] = l_addr->as_u64[1];
   ste_key.r_addr.as_u64[0] = r_addr->as_u64[0];