bgpd: Convert peer_af_flag_check() to bool

Since we increased peer->af_flags from uint32_t to uint64_t,
peer_af_flag_check() was historically returning integer, and not bool
as should be.

The bug was that if we have af_flags higher than uint32_t it will never
returned a right value.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 8ef18a34d035d3719cdffb8c7a01b035cd0347c3..928a41e9ede0fa4504f0633939d49d49a837d775 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -17154,7 +17154,7 @@ static bool peergroup_af_flag_check(struct peer *peer, afi_t afi, safi_t safi,
                if (CHECK_FLAG(peer->af_flags_invert[afi][safi], flag))
                        return !peer_af_flag_check(peer, afi, safi, flag);
                else
-                       return !!peer_af_flag_check(peer, afi, safi, flag);
+                       return peer_af_flag_check(peer, afi, safi, flag);
        }
 
        return !!CHECK_FLAG(peer->af_flags_override[afi][safi], flag);

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 0fd0dafa2232c9c5baeb52764f7dc7cce5a09c13..26da5d3e26be12d35a04f866e4adb4ed1b9dfb50 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -977,9 +977,10 @@ void peer_flag_inherit(struct peer *peer, uint64_t flag)
                COND_FLAG(peer->flags, flag, group_val);
 }
 
-int peer_af_flag_check(struct peer *peer, afi_t afi, safi_t safi, uint32_t flag)
+bool peer_af_flag_check(struct peer *peer, afi_t afi, safi_t safi,
+                       uint64_t flag)
 {
-       return CHECK_FLAG(peer->af_flags[afi][safi], flag);
+       return !!CHECK_FLAG(peer->af_flags[afi][safi], flag);
 }
 
 void peer_af_flag_inherit(struct peer *peer, afi_t afi, safi_t safi,

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 2a7c7a31437ec331c864fa83a48b69ac2332f55c..44da63bd54120d494ad6ba575084fa3731beb8a3 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -2247,7 +2247,8 @@ extern int peer_af_flag_set(struct peer *peer, afi_t afi, safi_t safi,
                            uint64_t flag);
 extern int peer_af_flag_unset(struct peer *peer, afi_t afi, safi_t safi,
                              uint64_t flag);
-extern int peer_af_flag_check(struct peer *, afi_t, safi_t, uint32_t);
+extern bool peer_af_flag_check(struct peer *peer, afi_t afi, safi_t safi,
+                              uint64_t flag);
 extern void peer_af_flag_inherit(struct peer *peer, afi_t afi, safi_t safi,
                                 uint64_t flag);
 extern void peer_change_action(struct peer *peer, afi_t afi, safi_t safi,