From 786a9bd9eb6c66fb69acb388e127b809f029a391 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 9 Jan 2020 09:01:10 -0500 Subject: [PATCH] zebra: Convert zserv_nexthop_num_warn to return bool Allow us to key of the warning if we have one. Signed-off-by: Donald Sharp --- zebra/zapi_msg.c | 6 ++++-- zebra/zapi_msg.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index e436e5a288..6d7e842354 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1411,8 +1411,7 @@ stream_failure: return; } - -void zserv_nexthop_num_warn(const char *caller, const struct prefix *p, +bool zserv_nexthop_num_warn(const char *caller, const struct prefix *p, const unsigned int nexthop_num) { if (nexthop_num > zrouter.multipath_num) { @@ -1423,7 +1422,10 @@ void zserv_nexthop_num_warn(const char *caller, const struct prefix *p, EC_ZEBRA_MORE_NH_THAN_MULTIPATH, "%s: Prefix %s has %d nexthops, but we can only use the first %d", caller, buff, nexthop_num, zrouter.multipath_num); + return true; } + + return false; } /* diff --git a/zebra/zapi_msg.h b/zebra/zapi_msg.h index e7c755c2bf..9f23a313bf 100644 --- a/zebra/zapi_msg.h +++ b/zebra/zapi_msg.h @@ -90,7 +90,7 @@ zsend_ipset_entry_notify_owner(struct zebra_pbr_ipset_entry *ipset, enum zapi_ipset_entry_notify_owner note); extern void zsend_iptable_notify_owner(struct zebra_pbr_iptable *iptable, enum zapi_iptable_notify_owner note); -extern void zserv_nexthop_num_warn(const char *caller, const struct prefix *p, +extern bool zserv_nexthop_num_warn(const char *caller, const struct prefix *p, const unsigned int nexthop_num); extern void zsend_capabilities_all_clients(void); -- 2.39.5