X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fsocket.c;h=fac8cd4838ecc632ea213848f9a31d107e4158b7;hb=1c17e2e;hp=cefbb863c7a9748371f5e1d55590ff398919a48f;hpb=33f22a8a72d9d853c08f0b932b240d130e69c3ac;p=vpp.git

diff --git a/src/plugins/memif/socket.c b/src/plugins/memif/socket.c
index cefbb863c7a..fac8cd4838e 100644
--- a/src/plugins/memif/socket.c
+++ b/src/plugins/memif/socket.c
@@ -87,7 +87,7 @@ memif_msg_enq_hello (clib_socket_t * sock)
   h->min_version = MEMIF_VERSION;
   h->max_version = MEMIF_VERSION;
   h->max_m2s_ring = MEMIF_MAX_M2S_RING;
-  h->max_s2m_ring = MEMIF_MAX_M2S_RING;
+  h->max_s2m_ring = MEMIF_MAX_S2M_RING;
   h->max_region = MEMIF_MAX_REGION;
   h->max_log2_ring_size = MEMIF_MAX_LOG2_RING_SIZE;
   s = format (0, "VPP %s%c", VPP_BUILD_VER, 0);
@@ -356,7 +356,7 @@ memif_msg_receive_add_ring (memif_if_t * mif, memif_msg_t * msg, int fd)
     }
 
   // clear previous cache data if interface reconncected
-  memset (mq, 0, sizeof (memif_queue_t));
+  clib_memset (mq, 0, sizeof (memif_queue_t));
   mq->int_fd = fd;
   mq->int_clib_file_index = ~0;
   mq->log2_ring_size = ar->log2_ring_size;
@@ -408,7 +408,6 @@ memif_msg_receive_disconnect (memif_if_t * mif, memif_msg_t * msg)
 static clib_error_t *
 memif_msg_receive (memif_if_t ** mifp, clib_socket_t * sock, clib_file_t * uf)
 {
-  memif_main_t *mm = &memif_main;
   memif_msg_t msg = { 0 };
   clib_error_t *err = 0;
   int fd = -1;
@@ -426,7 +425,7 @@ memif_msg_receive (memif_if_t ** mifp, clib_socket_t * sock, clib_file_t * uf)
       goto error;
     }
 
-  vlib_log_debug (mm->log_class, "Message type %u received", msg.type);
+  memif_log_debug (mif, "Message type %u received", msg.type);
   /* process the message based on its type */
   switch (msg.type)
     {
@@ -499,7 +498,7 @@ memif_msg_receive (memif_if_t ** mifp, clib_socket_t * sock, clib_file_t * uf)
   return 0;
 
 error:
-  vlib_log_err (mm->log_class, "%U", format_clib_error, err);
+  memif_log_err (mif, "%U", format_clib_error, err);
   return err;
 }
 
@@ -639,8 +638,8 @@ memif_master_conn_fd_error (clib_file_t * uf)
 	}
     }
 
-  vlib_log_warn (mm->log_class, "Error on unknown file descriptor %d",
-		 uf->file_descriptor);
+  memif_log_warn (0, "Error on unknown file descriptor %d",
+		  uf->file_descriptor);
   memif_file_del (uf);
   return 0;
 }
@@ -657,7 +656,7 @@ memif_conn_fd_accept_ready (clib_file_t * uf)
   clib_socket_t *client;
 
   client = clib_mem_alloc (sizeof (clib_socket_t));
-  memset (client, 0, sizeof (clib_socket_t));
+  clib_memset (client, 0, sizeof (clib_socket_t));
   err = clib_socket_accept (msf->sock, client);
   if (err)
     goto error;
@@ -683,7 +682,7 @@ memif_conn_fd_accept_ready (clib_file_t * uf)
   return 0;
 
 error:
-  vlib_log_err (mm->log_class, "%U", format_clib_error, err);
+  memif_log_err (0, "%U", format_clib_error, err);
   clib_mem_free (client);
   return err;
 }