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

ip: unformat_ip_address should no modify its argument on failure

Browse Source 
When failing to match an ip address, we should not reset the ip address
that could have been initialized by a previous match.

Type: fix

Change-Id: I026766391eb3eb8230f75f66bf4b681e774741d9
Signed-off-by: Benoît Ganne <bganne@cisco.com>
This commit is contained in:
Benoît Ganne
2022-04-26 18:44:19 +02:00
committed by Beno�t Ganne
parent d1ca70c7e1
commit dd2f12ba6a
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vat/ip_types.c
View File

@ -42,14 +42,15 @@ unformat_ip_address (unformat_input_t * input, va_list * args)
{
ip_address_t *a = va_arg (*args, ip_address_t *);
clib_memset (a, 0, sizeof (*a));
if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (a)))
ip_addr_version (a) = AF_IP4;
else if (unformat_user (input, unformat_ip6_address, &ip_addr_v6 (a)))
ip_addr_version (a) = AF_IP6;
else
return 0;
return 1;
if (unformat_user (input, unformat_ip46_address, &ip_addr_46 (a),
IP46_TYPE_ANY))
{
ip_addr_version (a) =
ip46_address_is_ip4 (&ip_addr_46 (a)) ? AF_IP4 : AF_IP6;
return 1;
}
return 0;
}
u8 *

17
src/vnet/ip/ip_types.c
View File

@ -42,14 +42,15 @@ unformat_ip_address (unformat_input_t * input, va_list * args)
{
ip_address_t *a = va_arg (*args, ip_address_t *);
clib_memset (a, 0, sizeof (*a));
if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (a)))
ip_addr_version (a) = AF_IP4;
else if (unformat_user (input, unformat_ip6_address, &ip_addr_v6 (a)))
ip_addr_version (a) = AF_IP6;
else
return 0;
return 1;
if (unformat_user (input, unformat_ip46_address, &ip_addr_46 (a),
IP46_TYPE_ANY))
{
ip_addr_version (a) =
ip46_address_is_ip4 (&ip_addr_46 (a)) ? AF_IP4 : AF_IP6;
return 1;
}
return 0;
}
u8 *