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

ip: comparing IP prefixes should not modify them

Browse Source 
Type: improvement

make the ip_prefix_cmp take const paramenters.
plus some other miscellaneous functions.

Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: Ib69bacfb09483a8a8f8b89900c92d3d55c354ac6
This commit is contained in:
Neale Ranns
2021-10-25 09:47:09 +00:00
parent fc8d0c5103
commit b28652ed7a
5 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vat/ip_types.c
View File

@ -344,23 +344,24 @@ ip_prefix_copy (void *dst, void *src)
}
int
ip_prefix_cmp (ip_prefix_t * p1, ip_prefix_t * p2)
ip_prefix_cmp (const ip_prefix_t *ipp1, const ip_prefix_t *ipp2)
{
ip_prefix_t p1 = *ipp1, p2 = *ipp2;
int cmp = 0;
ip_prefix_normalize (p1);
ip_prefix_normalize (p2);
ip_prefix_normalize (&p1);
ip_prefix_normalize (&p2);
cmp = ip_address_cmp (&ip_prefix_addr (p1), &ip_prefix_addr (p2));
cmp = ip_address_cmp (&ip_prefix_addr (&p1), &ip_prefix_addr (&p2));
if (cmp == 0)
{
if (ip_prefix_len (p1) < ip_prefix_len (p2))
if (ip_prefix_len (&p1) < ip_prefix_len (&p2))
{
cmp = 1;
}
else
{
if (ip_prefix_len (p1) > ip_prefix_len (p2))
if (ip_prefix_len (&p1) > ip_prefix_len (&p2))
cmp = 2;
}
}