aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-04-21 08:01:16 -0400
committerAndrew Yourtchenko <ayourtch@gmail.com>2020-08-13 17:20:47 +0000
commit367d6d86b61547bd71fdfed547f82734ec4d1bc5 (patch)
tree7752953f6777414776e7fa48af219e38c1ab8270
parent99c6344d75ef002d9288d9c8d485fb961aee4de9 (diff)
vat: fix increment_address(...)
vl_api_address_t uses a packed enum for the address family, compare a->af directly with ADDRESS_IP4 / ADDRESS_IP6 instead of running a->af through clib_host_to_net_u32(...) before compare. Indirectly fixes api_ip_route_add_del(...) w/ count > 1. Type: fix Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: Ib7f562ec9e92ee63e52a338d318fcf1ce6221755 (cherry picked from commit 54582663ab7d7105bc2407036a311d68707e5ab9)
-rw-r--r--src/vat/api_format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index c82c367cd5d..e81300013b2 100644
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -762,9 +762,9 @@ increment_v6_address (vl_api_ip6_address_t * i)
static void
increment_address (vl_api_address_t * a)
{
- if (clib_net_to_host_u32 (a->af) == ADDRESS_IP4)
+ if (a->af == ADDRESS_IP4)
increment_v4_address (&a->un.ip4);
- else if (clib_net_to_host_u32 (a->af) == ADDRESS_IP6)
+ else if (a->af == ADDRESS_IP6)
increment_v6_address (&a->un.ip6);
}