diff options
author | 2016-03-13 02:22:06 +0100 | |
---|---|---|
committer | 2016-04-22 17:29:47 +0200 | |
commit | f1213b82771ce929c076339c24a777cfd59690e6 (patch) | |
tree | 3c74305e8848047d8ccd1228ee511d57cbf1b1a6 /vpp/app | |
parent | 2b836cf4d1e4e59ca34229a9fdf49d79216da20e (diff) |
Add clib_memcpy macro based on DPDK rte_memcpy implementation
Change-Id: I22cb443c4bd0bf298abb6f06e8e4ca65a44a2854
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vpp/app')
-rw-r--r-- | vpp/app/l2t.c | 10 | ||||
-rw-r--r-- | vpp/app/sticky_hash.c | 8 | ||||
-rw-r--r-- | vpp/app/vpe_cli.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vpp/app/l2t.c b/vpp/app/l2t.c index c230e059..eb6848ff 100644 --- a/vpp/app/l2t.c +++ b/vpp/app/l2t.c @@ -42,7 +42,7 @@ void get_interface_ethernet_address (l2t_main_t *lm, hi = vnet_get_sup_hw_interface (lm->vnet_main, sw_if_index); ei = pool_elt_at_index (em->interfaces, hi->hw_instance); - memcpy (dst, ei->address, sizeof (ei->address)); + clib_memcpy (dst, ei->address, sizeof (ei->address)); } /* packet trace format function */ @@ -326,8 +326,8 @@ l2tp_session_add_command_fn (vlib_main_t * vm, pool_get (lm->sessions, s); memset (s, 0, sizeof (*s)); - memcpy (&s->our_address, &our_address, sizeof (s->our_address)); - memcpy (&s->client_address, &client_address, sizeof (s->client_address)); + clib_memcpy (&s->our_address, &our_address, sizeof (s->our_address)); + clib_memcpy (&s->client_address, &client_address, sizeof (s->client_address)); s->sw_if_index = sw_if_index; s->vlan_id = clib_host_to_net_u16 (vlan_id); s->local_cookie = clib_host_to_net_u64 (local_cookie); @@ -348,13 +348,13 @@ l2tp_session_add_command_fn (vlib_main_t * vm, switch (lm->lookup_type) { case L2T_LOOKUP_SRC_ADDRESS: src_address_copy = clib_mem_alloc (sizeof (*src_address_copy)); - memcpy (src_address_copy, &client_address, sizeof (*src_address_copy)); + clib_memcpy (src_address_copy, &client_address, sizeof (*src_address_copy)); hash_set_mem (lm->session_by_src_address, src_address_copy, s - lm->sessions); break; case L2T_LOOKUP_DST_ADDRESS: dst_address_copy = clib_mem_alloc (sizeof (*dst_address_copy)); - memcpy (dst_address_copy, &our_address, sizeof (*dst_address_copy)); + clib_memcpy (dst_address_copy, &our_address, sizeof (*dst_address_copy)); hash_set_mem (lm->session_by_dst_address, dst_address_copy, s - lm->sessions); break; diff --git a/vpp/app/sticky_hash.c b/vpp/app/sticky_hash.c index 63b65d5e..d6d35512 100644 --- a/vpp/app/sticky_hash.c +++ b/vpp/app/sticky_hash.c @@ -169,8 +169,8 @@ sticky_hash_miss_node_fn (vlib_main_t * vm, h0 = vlib_buffer_get_current (b0); /* Add forward and reverse entries for this flow */ - memcpy (mp->fdata, h0, sizeof (mp->fdata)); - memcpy (mp->rdata, h0, sizeof (mp->rdata)); + clib_memcpy (mp->fdata, h0, sizeof (mp->fdata)); + clib_memcpy (mp->rdata, h0, sizeof (mp->rdata)); h0 = (classify_data_or_mask_t *)(mp->rdata); @@ -406,8 +406,8 @@ ip4_sticky_hash_init_command_fn (vlib_main_t * vm, vec_validate (fm, 3 * sizeof(u32x4) - 1); vec_validate (rm, 3 * sizeof(u32x4) - 1); - memcpy (fm, &fwd_mask, sizeof (fwd_mask)); - memcpy (rm, &rev_mask, sizeof (rev_mask)); + clib_memcpy (fm, &fwd_mask, sizeof (fwd_mask)); + clib_memcpy (rm, &rev_mask, sizeof (rev_mask)); rv = ip4_sticky_hash_enable_disable (mp, fwd_sw_if_index, fm, rev_sw_if_index, rm, diff --git a/vpp/app/vpe_cli.c b/vpp/app/vpe_cli.c index 23aa3cf7..32b6d03d 100644 --- a/vpp/app/vpe_cli.c +++ b/vpp/app/vpe_cli.c @@ -50,7 +50,7 @@ virtual_ip_cmd_fn_command_fn (vlib_main_t * vm, { mac_addr_t *ma; vec_add2 (mac_addrs, ma, 1); - memcpy(ma, mac_addr, sizeof (mac_addr)); + clib_memcpy(ma, mac_addr, sizeof (mac_addr)); } else { barf: return clib_error_return (0, "unknown input `%U'", |