nat: test all intf addrs in is_interface_addr()

[vpp.git] / src / svm / svmdbtool.c

diff --git a/src/svm/svmdbtool.c b/src/svm/svmdbtool.c
index a0af15f..feb7eed 100644 (file)
--- a/src/svm/svmdbtool.c
+++ b/src/svm/svmdbtool.c
@@ -33,7 +33,6 @@
 #include <vppinfra/bitmap.h>
 #include <vppinfra/fifo.h>
 #include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
 #include <vppinfra/heap.h>
 #include <vppinfra/pool.h>
 #include <vppinfra/format.h>
@@ -55,7 +54,7 @@ map_arg_setup (char *chroot_path)
   svmdbtool_main_t *sm = &svmdbtool_main;
   svmdb_map_args_t *ma = &sm->map_args;
 
-  memset (ma, 0, sizeof (*ma));
+  clib_memset (ma, 0, sizeof (*ma));
   ma->root_path = chroot_path;
   ma->size = sm->size;
   ma->uid = sm->uid;
@@ -269,7 +268,7 @@ test_reg (char *chroot_path, u8 * vbl)
 
   ma = map_arg_setup (chroot_path);
 
-  memset (&sa, 0, sizeof (sa));
+  clib_memset (&sa, 0, sizeof (sa));
   sa.sa_sigaction = sigaction_handler;
   sa.sa_flags = SA_SIGINFO;
   if (sigaction (SIGUSR2, &sa, 0) < 0)
@@ -278,7 +277,7 @@ test_reg (char *chroot_path, u8 * vbl)
       return;
     }
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   c = svmdb_map (ma);
 
@@ -378,6 +377,8 @@ main (int argc, char **argv)
   struct group _grp, *grp;
   char *s, buf[128];
 
+  clib_mem_init_thread_safe (0, 128 << 20);
+
   svmdbtool_main.uid = geteuid ();
   svmdbtool_main.gid = getegid ();