ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ip: set ip4 mask for ip_copy and ip_set when dealing with ip4 type

Browse Source 
Type: fix

Signed-off-by: jiangxiaoming <jiangxiaoming@outlook.com>
Change-Id: I3ace7dfe3ddacb4f7fa7a974a2ffe2b3cf902ff9
(cherry picked from commit 9268b5823fa7a16195f638e5b1f9c54b430f2f3c)
This commit is contained in:
jiangxiaoming
2020-06-22 09:06:16 +08:00
committed by Andrew Yourtchenko
parent 15c9670d9d
commit 806f3f6177
1 changed files with 8 additions and 2 deletions

10
src/vnet/ip/ip.c

@ -81,7 +81,10 @@ void
ip_copy (ip46_address_t * dst, ip46_address_t * src, u8 is_ip4)
{
if (is_ip4)
dst->ip4.as_u32 = src->ip4.as_u32;
{
ip46_address_mask_ip4 (dst);
dst->ip4.as_u32 = src->ip4.as_u32;
}
else
clib_memcpy_fast (&dst->ip6, &src->ip6, sizeof (ip6_address_t));
}
@ -90,7 +93,10 @@ void
ip_set (ip46_address_t * dst, void *src, u8 is_ip4)
{
if (is_ip4)
dst->ip4.as_u32 = ((ip4_address_t *) src)->as_u32;
{
ip46_address_mask_ip4 (dst);
dst->ip4.as_u32 = ((ip4_address_t *) src)->as_u32;
}
else
clib_memcpy_fast (&dst->ip6, (ip6_address_t *) src,
sizeof (ip6_address_t));