bgpd: changes for code maintainability

these changes are for improving the code maintainability and readability

Signed-off-by: sri-mohan1 <sri.mohan@samsung.com>

diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index c89ccc9792f7807a85ddd1d091936197b1863630..8719af56b3f561073b02898cbb0ad462bf1fdc35 100644 (file)
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -607,10 +607,10 @@ static void bgp_process_nexthop_update(struct bgp_nexthop_cache *bnc,
        }
 
        if (nhr->metric != bnc->metric)
-               bnc->change_flags |= BGP_NEXTHOP_METRIC_CHANGED;
+               SET_FLAG(bnc->change_flags, BGP_NEXTHOP_METRIC_CHANGED);
 
        if (nhr->nexthop_num != bnc->nexthop_num)
-               bnc->change_flags |= BGP_NEXTHOP_CHANGED;
+               SET_FLAG(bnc->change_flags, BGP_NEXTHOP_CHANGED);
 
        if (import_check && (nhr->type == ZEBRA_ROUTE_BGP ||
                             !prefix_same(&bnc->prefix, &nhr->prefix))) {
@@ -636,11 +636,12 @@ static void bgp_process_nexthop_update(struct bgp_nexthop_cache *bnc,
                        UNSET_FLAG(bnc->flags, BGP_NEXTHOP_PEER_NOTIFIED);
 
                if (!bnc->is_evpn_gwip_nexthop)
-                       bnc->flags |= BGP_NEXTHOP_VALID;
+                       SET_FLAG(bnc->flags, BGP_NEXTHOP_VALID);
                bnc->metric = nhr->metric;
                bnc->nexthop_num = nhr->nexthop_num;
 
-               bnc->flags &= ~BGP_NEXTHOP_LABELED_VALID; /* check below */
+               UNSET_FLAG(bnc->flags,
+                          BGP_NEXTHOP_LABELED_VALID); /* check below */
 
                for (i = 0; i < nhr->nexthop_num; i++) {
                        int num_labels = 0;
@@ -670,8 +671,7 @@ static void bgp_process_nexthop_update(struct bgp_nexthop_cache *bnc,
                        /* There is at least one label-switched path */
                        if (nexthop->nh_label &&
                                nexthop->nh_label->num_labels) {
-
-                               bnc->flags |= BGP_NEXTHOP_LABELED_VALID;
+                               SET_FLAG(bnc->flags, BGP_NEXTHOP_LABELED_VALID);
                                num_labels = nexthop->nh_label->num_labels;
                        }
 
@@ -695,7 +695,7 @@ static void bgp_process_nexthop_update(struct bgp_nexthop_cache *bnc,
                         * determined
                         * that there has been a change.
                         */
-                       if (bnc->change_flags & BGP_NEXTHOP_CHANGED)
+                       if (CHECK_FLAG(bnc->change_flags, BGP_NEXTHOP_CHANGED))
                                continue;
 
                        for (oldnh = bnc->nexthop; oldnh; oldnh = oldnh->next)
@@ -703,7 +703,7 @@ static void bgp_process_nexthop_update(struct bgp_nexthop_cache *bnc,
                                        break;
 
                        if (!oldnh)
-                               bnc->change_flags |= BGP_NEXTHOP_CHANGED;
+                               SET_FLAG(bnc->change_flags, BGP_NEXTHOP_CHANGED);
                }
                bnc_nexthop_free(bnc);
                bnc->nexthop = nhlist_head;
@@ -727,19 +727,22 @@ static void bgp_process_nexthop_update(struct bgp_nexthop_cache *bnc,
                                                       : "failed"));
 
                        if (evpn_resolved) {
-                               bnc->flags |= BGP_NEXTHOP_VALID;
-                               bnc->flags &= ~BGP_NEXTHOP_EVPN_INCOMPLETE;
-                               bnc->change_flags |= BGP_NEXTHOP_MACIP_CHANGED;
+                               SET_FLAG(bnc->flags, BGP_NEXTHOP_VALID);
+                               UNSET_FLAG(bnc->flags,
+                                          BGP_NEXTHOP_EVPN_INCOMPLETE);
+                               SET_FLAG(bnc->change_flags,
+                                        BGP_NEXTHOP_MACIP_CHANGED);
                        } else {
-                               bnc->flags |= BGP_NEXTHOP_EVPN_INCOMPLETE;
-                               bnc->flags &= ~BGP_NEXTHOP_VALID;
+                               SET_FLAG(bnc->flags,
+                                        BGP_NEXTHOP_EVPN_INCOMPLETE);
+                               UNSET_FLAG(bnc->flags, BGP_NEXTHOP_VALID);
                        }
                }
        } else {
                memset(&bnc->resolved_prefix, 0, sizeof(bnc->resolved_prefix));
-               bnc->flags &= ~BGP_NEXTHOP_EVPN_INCOMPLETE;
-               bnc->flags &= ~BGP_NEXTHOP_VALID;
-               bnc->flags &= ~BGP_NEXTHOP_LABELED_VALID;
+               UNSET_FLAG(bnc->flags, BGP_NEXTHOP_EVPN_INCOMPLETE);
+               UNSET_FLAG(bnc->flags, BGP_NEXTHOP_VALID);
+               UNSET_FLAG(bnc->flags, BGP_NEXTHOP_LABELED_VALID);
                bnc->nexthop_num = nhr->nexthop_num;
 
                /* notify bgp fsm if nbr ip goes from valid->invalid */
@@ -1181,7 +1184,7 @@ static void sendmsg_zebra_rnh(struct bgp_nexthop_cache *bnc, int command)
 static void register_zebra_rnh(struct bgp_nexthop_cache *bnc)
 {
        /* Check if we have already registered */
-       if (bnc->flags & BGP_NEXTHOP_REGISTERED)
+       if (CHECK_FLAG(bnc->flags, BGP_NEXTHOP_REGISTERED))
                return;
 
        if (bnc->ifindex_ipv6_ll) {