VPP-214: IPSec cli/api vector ck and ik initialization

[vpp.git] / vnet / vnet / unix / tuntap.c

diff --git a/vnet/vnet/unix/tuntap.c b/vnet/vnet/unix/tuntap.c
index 77c60fd..28b2584 100644 (file)
--- a/vnet/vnet/unix/tuntap.c
+++ b/vnet/vnet/unix/tuntap.c
@@ -139,7 +139,7 @@ tuntap_tx (vlib_main_t * vm,
       if (tm->is_ether && (!tm->have_normal_interface))
         {
           vlib_buffer_reset(b);
-          memcpy (vlib_buffer_get_current (b), tm->ether_dst_mac, 6);
+          clib_memcpy (vlib_buffer_get_current (b), tm->ether_dst_mac, 6);
         }
 
       /* Re-set iovecs if present. */
@@ -200,12 +200,11 @@ tuntap_rx (vlib_main_t * vm,
   tuntap_main_t * tm = &tuntap_main;
   vlib_buffer_t * b;
   u32 bi;
+  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
 #if DPDK == 0
-  const uword buffer_size = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
   u32 free_list_index = VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX;
 #else
   dpdk_main_t * dm = &dpdk_main;
-  const uword buffer_size = MBUF_SIZE;
   u32 free_list_index = dm->vlib_buffer_free_list_index;
 #endif
 
@@ -262,7 +261,7 @@ tuntap_rx (vlib_main_t * vm,
 #endif
        b = vlib_get_buffer (vm, tm->rx_buffers[i_rx]);
 #if DPDK == 1
-        mb = (((struct rte_mbuf *)b)-1);
+       mb = rte_mbuf_from_vlib_buffer(b);
 #endif
        b->flags = 0;
        b->current_data = 0;
@@ -445,12 +444,7 @@ tuntap_config (vlib_main_t * vm, unformat_input_t * input)
   u8 * name;
   int flags = IFF_TUN | IFF_NO_PI;
   int is_enabled = 0, is_ether = 0, have_normal_interface = 0;
-#if DPDK == 0
-  const uword buffer_size = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
-#else
-  const uword buffer_size = MBUF_SIZE;
-#endif
-
+  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
@@ -589,7 +583,7 @@ tuntap_config (vlib_main_t * vm, unformat_input_t * input)
           goto done;
         }
       else
-        memcpy (tm->ether_dst_mac, ifr.ifr_hwaddr.sa_data, 6);
+        clib_memcpy (tm->ether_dst_mac, ifr.ifr_hwaddr.sa_data, 6);
     }
 
   if (have_normal_interface)
@@ -670,7 +664,7 @@ tuntap_ip4_add_del_interface_address (ip4_main_t * im,
   /* See if we already know about this subif */
   memset (&subif_addr, 0, sizeof (subif_addr));
   subif_addr.sw_if_index = sw_if_index;
-  memcpy (&subif_addr.addr, address, sizeof (*address));
+  clib_memcpy (&subif_addr.addr, address, sizeof (*address));
   
   p = mhash_get (&tm->subif_mhash, &subif_addr);
 
@@ -696,7 +690,7 @@ tuntap_ip4_add_del_interface_address (ip4_main_t * im,
 
       /* Set ipv4 address, netmask. */
       sin->sin_family = AF_INET;
-      memcpy (&sin->sin_addr.s_addr, address, 4);
+      clib_memcpy (&sin->sin_addr.s_addr, address, 4);
       if (ioctl (tm->dev_tap_fd, SIOCSIFADDR, &ifr) < 0)
        clib_unix_warning ("ioctl SIOCSIFADDR");
     
@@ -762,7 +756,7 @@ tuntap_ip6_add_del_interface_address (ip6_main_t * im,
   memset (&subif_addr, 0, sizeof (subif_addr));
   subif_addr.sw_if_index = sw_if_index;
   subif_addr.is_v6 = 1;
-  memcpy (&subif_addr.addr, address, sizeof (*address));
+  clib_memcpy (&subif_addr.addr, address, sizeof (*address));
   
   p = mhash_get (&tm->subif_mhash, &subif_addr);
 
@@ -792,7 +786,7 @@ tuntap_ip6_add_del_interface_address (ip6_main_t * im,
 
       ifr6.ifr6_ifindex = ifr.ifr_ifindex;
       ifr6.ifr6_prefixlen = address_length;
-      memcpy (&ifr6.ifr6_addr, address, 16);
+      clib_memcpy (&ifr6.ifr6_addr, address, 16);
 
       if (ioctl (sockfd, SIOCSIFADDR, &ifr6) < 0)
         clib_unix_warning ("set address");
@@ -810,7 +804,7 @@ tuntap_ip6_add_del_interface_address (ip6_main_t * im,
 
       ifr6.ifr6_ifindex = ifr.ifr_ifindex;
       ifr6.ifr6_prefixlen = address_length;
-      memcpy (&ifr6.ifr6_addr, address, 16);
+      clib_memcpy (&ifr6.ifr6_addr, address, 16);
 
       if (ioctl (sockfd, SIOCDIFADDR, &ifr6) < 0)
         clib_unix_warning ("del address");