c11 safe string handling support

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

diff --git a/src/plugins/nat/nat64.c b/src/plugins/nat/nat64.c
index 1954893..86c65ed 100644 (file)
--- a/src/plugins/nat/nat64.c
+++ b/src/plugins/nat/nat64.c
@@ -157,7 +157,7 @@ nat64_get_worker_out2in (ip4_header_t * ip)
       ip46_address_t daddr;
       nat64_db_bib_entry_t *bibe;
 
-      memset (&daddr, 0, sizeof (daddr));
+      clib_memset (&daddr, 0, sizeof (daddr));
       daddr.ip4.as_u32 = ip->dst_address.as_u32;
 
       /* *INDENT-OFF* */
@@ -264,7 +264,7 @@ nat64_set_hash (u32 bib_buckets, u32 bib_memory_size, u32 st_buckets,
     {
       if (nat64_db_init (db, bib_buckets, bib_memory_size, st_buckets,
                          st_memory_size, nat64_free_out_addr_and_port))
-        clib_warning ("NAT64 DB init failed");
+       nat_log_err ("NAT64 DB init failed");
     }
   /* *INDENT-ON* */
 }
@@ -556,7 +556,7 @@ nat64_free_out_addr_and_port (struct nat64_db_s *db, ip4_address_t * addr,
          foreach_snat_protocol
 #undef _
        default:
-         clib_warning ("unknown protocol");
+         nat_log_notice ("unknown protocol");
          return;
        }
       break;
@@ -687,7 +687,7 @@ nat64_add_del_static_bib_entry (ip6_address_t * in_addr,
              foreach_snat_protocol
 #undef _
            default:
-             memset (&addr, 0, sizeof (addr));
+             clib_memset (&addr, 0, sizeof (addr));
              addr.ip4.as_u32 = out_addr->as_u32;
              if (nat64_db_bib_entry_find (db, &addr, 0, proto, fib_index, 0))
                return VNET_API_ERROR_INVALID_VALUE;
@@ -1052,7 +1052,7 @@ nat64_compose_ip6 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index)
          ip6->as_u32[3] = ip4->as_u32;
          break;
        default:
-         clib_warning ("invalid prefix length");
+         nat_log_notice ("invalid prefix length");
          break;
        }
     }
@@ -1125,7 +1125,7 @@ nat64_extract_ip4 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index)
       ip4->as_u32 = ip6->as_u32[3];
       break;
     default:
-      clib_warning ("invalid prefix length");
+      nat_log_notice ("invalid prefix length");
       break;
     }
 }
@@ -1206,7 +1206,7 @@ nat64_expire_walk_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
        case NAT64_CLEANER_RESCHEDULE:
          break;
        default:
-         clib_warning ("unknown event %u", event_type);
+         nat_log_notice ("unknown event %u", event_type);
          break;
        }