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>

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 78e96d130c06a28d92b4ddd5ca1d04ed33216ed7..96feb19c29d03e99cbec771192ada90ae446cf8a 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -5679,7 +5679,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 1dce4820d680a05a67bbe8f202c1aa14cad388d6..a034bfbd7ec8006001ab638e6ed2afe1035fc1fe 100644 (file)
--- a/bgpd/bgp_evpn.h
+++ b/bgpd/bgp_evpn.h
@@ -150,7 +150,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 5e1be21402dcc08fe2303bcb0bf4cbab3ea83f9b..70bdbaf0356f94cdc24a687c0eff71d5de7b59e6 100644 (file)
--- a/bgpd/bgp_flowspec.c
+++ b/bgpd/bgp_flowspec.c
@@ -82,7 +82,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;
@@ -103,7 +103,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 58fc1775ab2be6e479b7c85fd5a491629cc38c0b..bc2f00511e0de103c745d7a4bb06a0dacdfdf504 100644 (file)
--- a/bgpd/bgp_flowspec.h
+++ b/bgpd/bgp_flowspec.h
@@ -15,7 +15,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 1c76828a2f2063c085a7c5f590bc52048f57afae..9469a0778f9722be2737910baa05a1687e2d8e95 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -331,7 +331,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 7a18d17e41600a87f1fb20bf4723f8ab0cbe485c..04bdb81849bd806822166016380c9b71776e81dd 100644 (file)
--- a/bgpd/bgp_packet.h
+++ b/bgpd/bgp_packet.h
@@ -59,7 +59,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 54596dbdfb014d0cf80e76124249c02bc3e48c00..ae7903e0ccfc4adf7041972be539d522aa896018 100644 (file)
--- a/tests/bgpd/test_mp_attr.c
+++ b/tests/bgpd/test_mp_attr.c
@@ -1042,9 +1042,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);
 }