libmemif: zero-copy-slave mode + header space

[vpp.git] / extras / libmemif / examples / icmp_responder-mt / main.c

diff --git a/extras/libmemif/examples/icmp_responder-mt/main.c b/extras/libmemif/examples/icmp_responder-mt/main.c
index c47fc53..c4ac907 100644 (file)
--- a/extras/libmemif/examples/icmp_responder-mt/main.c
+++ b/extras/libmemif/examples/icmp_responder-mt/main.c
@@ -324,13 +324,13 @@ memif_rx_poll (void *ptr)
       for (i = 0; i < rx; i++)
        {
          resolve_packet ((void *) (data->rx_bufs + i)->data,
-                         (data->rx_bufs + i)->data_len,
+                         (data->rx_bufs + i)->len,
                          (void *) (data->tx_bufs + i)->data,
-                         &(data->tx_bufs + i)->data_len, c->ip_addr);
+                         &(data->tx_bufs + i)->len, c->ip_addr);
        }
 
       /* mark memif buffers and shared memory buffers as free */
-      err = memif_buffer_free (c->conn, data->qid, data->rx_bufs, rx, &fb);
+      err = memif_refill_queue (c->conn, data->qid, rx, 0);
       if (err != MEMIF_ERR_SUCCESS)
        INFO ("memif_buffer_free: %s", memif_strerror (err));
       data->rx_buf_num -= fb;
@@ -355,7 +355,7 @@ error:
   goto close;
 
 close:
-  err = memif_buffer_free (c->conn, data->qid, data->rx_bufs, rx, &fb);
+  err = memif_refill_queue (c->conn, data->qid, rx, 0);
   if (err != MEMIF_ERR_SUCCESS)
     INFO ("memif_buffer_free: %s", memif_strerror (err));
   data->rx_buf_num -= fb;
@@ -454,14 +454,13 @@ memif_rx_interrupt (void *ptr)
          for (i = 0; i < rx; i++)
            {
              resolve_packet ((void *) (data->rx_bufs + i)->data,
-                             (data->rx_bufs + i)->data_len,
+                             (data->rx_bufs + i)->len,
                              (void *) (data->tx_bufs + i)->data,
-                             &(data->tx_bufs + i)->data_len, c->ip_addr);
+                             &(data->tx_bufs + i)->len, c->ip_addr);
            }
 
          /* mark memif buffers and shared memory buffers as free */
-         err =
-           memif_buffer_free (c->conn, data->qid, data->rx_bufs, rx, &fb);
+         err = memif_refill_queue (c->conn, data->qid, rx, 0);
          if (err != MEMIF_ERR_SUCCESS)
            INFO ("memif_buffer_free: %s", memif_strerror (err));
          data->rx_buf_num -= fb;
@@ -487,7 +486,7 @@ error:
   goto close;
 
 close:
-  err = memif_buffer_free (c->conn, data->qid, data->rx_bufs, rx, &fb);
+  err = memif_refill_queue (c->conn, data->qid, rx, 0);
   if (err != MEMIF_ERR_SUCCESS)
     INFO ("memif_buffer_free: %s", memif_strerror (err));
   data->rx_buf_num -= fb;
@@ -611,7 +610,6 @@ icmpr_memif_create (long index)
   args.num_s2m_rings = 2;
   args.num_m2s_rings = 2;
   strncpy ((char *) args.interface_name, IF_NAME, strlen (IF_NAME));
-  strncpy ((char *) args.instance_name, APP_NAME, strlen (APP_NAME));
   args.mode = 0;
   /* socket filename is not specified, because this app is supposed to
      connect to VPP over memif. so default socket filename will be used */
@@ -675,7 +673,7 @@ print_help ()
   printf (" (debug)");
 #endif
   printf ("\n");
-  printf ("memif version: %d\n", MEMIF_VERSION);
+  printf ("memif version: %d\n", memif_get_version ());
   printf ("commands:\n");
   printf ("\thelp - prints this help\n");
   printf ("\texit - exit app\n");
@@ -896,7 +894,7 @@ main ()
   /* if valid callback is passed as argument, fd event polling will be done by user
      all file descriptors and events will be passed to user in this callback */
   /* if callback is set to NULL libmemif will handle fd event polling */
-  err = memif_init (control_fd_update, APP_NAME);
+  err = memif_init (control_fd_update, APP_NAME, NULL, NULL);
   if (err != MEMIF_ERR_SUCCESS)
     INFO ("memif_init: %s", memif_strerror (err));