bgpd: Treat withdraw variable as a bool

Used as a bool, treated as a bool.  Make it a bool

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit aa056a2a6481aba66c727794d0ee988724be9316)

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 58f5e9a226093564f38fa9b93c4b14245ed77b97..9c6624e27fbcceddf8dc5ee10ed21311851dca88 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -4982,7 +4982,7 @@ void bgp_evpn_encode_prefix(struct stream *s, const struct prefix *p,
 }
 
 int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr,
-                       struct bgp_nlri *packet, int withdraw)
+                       struct bgp_nlri *packet, bool withdraw)
 {
        uint8_t *pnt;
        uint8_t *lim;

diff --git a/bgpd/bgp_evpn.h b/bgpd/bgp_evpn.h
index 67659ea1985d73b91ddaf0de5df31863f550fe4b..3cbc5af5af2a8730d3c03ba3b570783c8ecd916d 100644 (file)
--- a/bgpd/bgp_evpn.h
+++ b/bgpd/bgp_evpn.h
@@ -186,7 +186,7 @@ extern void bgp_evpn_encode_prefix(struct stream *s, const struct prefix *p,
                                   struct attr *attr, bool addpath_capable,
                                   uint32_t addpath_tx_id);
 extern int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr,
-                              struct bgp_nlri *packet, int withdraw);
+                              struct bgp_nlri *packet, bool withdraw);
 extern int bgp_evpn_import_route(struct bgp *bgp, afi_t afi, safi_t safi,
                                 const struct prefix *p,
                                 struct bgp_path_info *ri);

diff --git a/bgpd/bgp_flowspec.c b/bgpd/bgp_flowspec.c
index 98ec1ed07382f9a1572e190b85fef4a08c017a06..c511d01ae60790a2bb329d5de56eaed85a767a5a 100644 (file)
--- a/bgpd/bgp_flowspec.c
+++ b/bgpd/bgp_flowspec.c
@@ -95,7 +95,7 @@ static int bgp_fs_nlri_validate(uint8_t *nlri_content, uint32_t len,
 }
 
 int bgp_nlri_parse_flowspec(struct peer *peer, struct attr *attr,
-                           struct bgp_nlri *packet, int withdraw)
+                           struct bgp_nlri *packet, bool withdraw)
 {
        uint8_t *pnt;
        uint8_t *lim;
@@ -117,7 +117,7 @@ int bgp_nlri_parse_flowspec(struct peer *peer, struct attr *attr,
         * withdraw.  Flowspec should as well.
         */
        if (!attr)
-               withdraw = 1;
+               withdraw = true;
 
        if (packet->length >= FLOWSPEC_NLRI_SIZELIMIT_EXTENDED) {
                flog_err(EC_BGP_FLOWSPEC_PACKET,

diff --git a/bgpd/bgp_flowspec.h b/bgpd/bgp_flowspec.h
index d1a59a672d1211cb5f267842f964c41c30d1602f..64b6a8b134177405dbe473ccbc6ddcb33868e6ef 100644 (file)
--- a/bgpd/bgp_flowspec.h
+++ b/bgpd/bgp_flowspec.h
@@ -28,7 +28,7 @@
 #define BGP_FLOWSPEC_NLRI_STRING_MAX 512
 
 extern int bgp_nlri_parse_flowspec(struct peer *peer, struct attr *attr,
-                                  struct bgp_nlri *packet, int withdraw);
+                                  struct bgp_nlri *packet, bool withdraw);
 
 extern void bgp_flowspec_vty_init(void);
 

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 72d6a9231756538a102fb18831fb9da2988d8ed2..ec54943f3b4bffadf682e977696de2eeaddaae11 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -346,7 +346,7 @@ static void bgp_update_explicit_eors(struct peer *peer)
  * calling safi function and for evpn, passed as parameter
  */
 int bgp_nlri_parse(struct peer *peer, struct attr *attr,
-                  struct bgp_nlri *packet, int mp_withdraw)
+                  struct bgp_nlri *packet, bool mp_withdraw)
 {
        switch (packet->safi) {
        case SAFI_UNICAST:

diff --git a/bgpd/bgp_packet.h b/bgpd/bgp_packet.h
index 78ea8c9b0759401673f9b4b3845382237f765b11..a72e855e3ffe189fb40988ad2be97870600d8e1a 100644 (file)
--- a/bgpd/bgp_packet.h
+++ b/bgpd/bgp_packet.h
@@ -74,7 +74,7 @@ extern void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
 extern int bgp_capability_receive(struct peer *peer, bgp_size_t length);
 
 extern int bgp_nlri_parse(struct peer *peer, struct attr *attr,
-                         struct bgp_nlri *nlri, int mp_withdraw);
+                         struct bgp_nlri *nlri, bool mp_withdraw);
 
 extern void bgp_update_restarted_peers(struct peer *peer);
 extern void bgp_update_implicit_eors(struct peer *peer);

diff --git a/tests/bgpd/test_mp_attr.c b/tests/bgpd/test_mp_attr.c
index c5ce5d3cd2c01872392c79ee859eacf16f4b1269..bda453bab1382644eb65386f4309c98e0f199bed 100644 (file)
--- a/tests/bgpd/test_mp_attr.c
+++ b/tests/bgpd/test_mp_attr.c
@@ -1057,9 +1057,9 @@ static void parse_test(struct peer *peer, struct test_segment *t, int type)
 
        if (!parse_ret) {
                if (type == BGP_ATTR_MP_REACH_NLRI)
-                       nlri_ret = bgp_nlri_parse(peer, &attr, &nlri, 0);
+                       nlri_ret = bgp_nlri_parse(peer, &attr, &nlri, false);
                else if (type == BGP_ATTR_MP_UNREACH_NLRI)
-                       nlri_ret = bgp_nlri_parse(peer, &attr, &nlri, 1);
+                       nlri_ret = bgp_nlri_parse(peer, &attr, &nlri, true);
        }
        handle_result(peer, t, parse_ret, nlri_ret);
 }