c11 safe string handling support

[vpp.git] / src / plugins / nat / nat66.c

diff --git a/src/plugins/nat/nat66.c b/src/plugins/nat/nat66.c
index 6257c99..a0f6ec7 100644 (file)
--- a/src/plugins/nat/nat66.c
+++ b/src/plugins/nat/nat66.c
@@ -165,7 +165,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
       fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, vrf_id,
                                                     FIB_SOURCE_PLUGIN_HI);
       pool_get (nm->sm, sm);
-      memset (sm, 0, sizeof (*sm));
+      clib_memset (sm, 0, sizeof (*sm));
       sm->l_addr.as_u64[0] = l_addr->as_u64[0];
       sm->l_addr.as_u64[1] = l_addr->as_u64[1];
       sm->e_addr.as_u64[0] = e_addr->as_u64[0];
@@ -178,7 +178,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
       kv.key[2] = sm_key.as_u64[2];
       kv.value = sm - nm->sm;
       if (clib_bihash_add_del_24_8 (&nm->sm_l, &kv, 1))
-       clib_warning ("nat66-static-map-by-local add key failed");
+       nat_log_warn ("nat66-static-map-by-local add key failed");
       sm_key.addr.as_u64[0] = e_addr->as_u64[0];
       sm_key.addr.as_u64[1] = e_addr->as_u64[1];
       sm_key.fib_index = 0;
@@ -186,7 +186,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
       kv.key[1] = sm_key.as_u64[1];
       kv.key[2] = sm_key.as_u64[2];
       if (clib_bihash_add_del_24_8 (&nm->sm_e, &kv, 1))
-       clib_warning ("nat66-static-map-by-external add key failed");
+       nat_log_warn ("nat66-static-map-by-external add key failed");
 
       vlib_validate_combined_counter (&nm->session_counters, kv.value);
       vlib_zero_combined_counter (&nm->session_counters, kv.value);
@@ -198,7 +198,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
 
       kv.value = sm - nm->sm;
       if (clib_bihash_add_del_24_8 (&nm->sm_l, &kv, 0))
-       clib_warning ("nat66-static-map-by-local delete key failed");
+       nat_log_warn ("nat66-static-map-by-local delete key failed");
       sm_key.addr.as_u64[0] = e_addr->as_u64[0];
       sm_key.addr.as_u64[1] = e_addr->as_u64[1];
       sm_key.fib_index = 0;
@@ -206,7 +206,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
       kv.key[1] = sm_key.as_u64[1];
       kv.key[2] = sm_key.as_u64[2];
       if (clib_bihash_add_del_24_8 (&nm->sm_e, &kv, 0))
-       clib_warning ("nat66-static-map-by-external delete key failed");
+       nat_log_warn ("nat66-static-map-by-external delete key failed");
       fib_table_unlock (sm->fib_index, FIB_PROTOCOL_IP6,
                        FIB_SOURCE_PLUGIN_HI);
       pool_put (nm->sm, sm);