Improve L2FIB delete entry handling and "show l2fib" CLI options

[vpp.git] / src / vat / main.c

diff --git a/src/vat/main.c b/src/vat/main.c
index aa990a3..4357114 100644 (file)
--- a/src/vat/main.c
+++ b/src/vat/main.c
@@ -117,7 +117,7 @@ do_one_file (vat_main_t * vam)
       vec_free (this_cmd);
 
       this_cmd =
-       (u8 *) clib_macro_eval (&vam->macro_main, (char *) vam->inbuf,
+       (u8 *) clib_macro_eval (&vam->macro_main, (i8 *) vam->inbuf,
                                1 /* complain */ );
 
       if (vam->exec_mode == 0)
@@ -389,7 +389,7 @@ main (int argc, char **argv)
   if (vam->socket_name && vat_socket_connect (vam))
     fformat (stderr, "WARNING: socket connection failed");
 
-  if (vam->socket_client_main.socket_fd == 0
+  if ((!vam->socket_client_main || vam->socket_client_main->socket_fd == 0)
       && connect_to_vpe ("vpp_api_test") < 0)
     {
       svm_region_exit ();