zebra: 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/zebra/zebra_neigh.c b/zebra/zebra_neigh.c
index 941088afd60678f05352da8cf97477f1c75d3be3..a222e7f6e8bcd0638b926aec226226640f4bbb56 100644 (file)
--- a/zebra/zebra_neigh.c
+++ b/zebra/zebra_neigh.c
@@ -83,7 +83,7 @@ zebra_neigh_new(ifindex_t ifindex, struct ipaddr *ip, struct ethaddr *mac)
        n->ifindex = ifindex;
        if (mac) {
                memcpy(&n->mac, mac, sizeof(*mac));
-               n->flags |= ZEBRA_NEIGH_ENT_ACTIVE;
+               SET_FLAG(n->flags, ZEBRA_NEIGH_ENT_ACTIVE);
        }
 
        /* Add to rb_tree */
@@ -118,10 +118,8 @@ static void zebra_neigh_free(struct zebra_neigh_ent *n)
                /* if rules are still using the neigh mark it as inactive and
                 * update the dataplane
                 */
-               if (n->flags & ZEBRA_NEIGH_ENT_ACTIVE) {
-                       n->flags &= ~ZEBRA_NEIGH_ENT_ACTIVE;
-                       memset(&n->mac, 0, sizeof(n->mac));
-               }
+               UNSET_FLAG(n->flags, ZEBRA_NEIGH_ENT_ACTIVE);
+               memset(&n->mac, 0, sizeof(n->mac));
                zebra_neigh_pbr_rules_update(n);
                return;
        }
@@ -181,7 +179,7 @@ void zebra_neigh_add(struct interface *ifp, struct ipaddr *ip,
                        return;
 
                memcpy(&n->mac, mac, sizeof(*mac));
-               n->flags |= ZEBRA_NEIGH_ENT_ACTIVE;
+               SET_FLAG(n->flags, ZEBRA_NEIGH_ENT_ACTIVE);
 
                /* update rules linked to the neigh */
                zebra_neigh_pbr_rules_update(n);
@@ -201,7 +199,7 @@ void zebra_neigh_deref(struct zebra_pbr_rule *rule)
        rule->action.neigh = NULL;
        /* remove rule from the list and free if it is inactive */
        list_delete_node(n->pbr_rule_list, &rule->action.neigh_listnode);
-       if (!(n->flags & ZEBRA_NEIGH_ENT_ACTIVE))
+       if (!CHECK_FLAG(n->flags, ZEBRA_NEIGH_ENT_ACTIVE))
                zebra_neigh_free(n);
 }
 

diff --git a/zebra/zebra_netns_id.c b/zebra/zebra_netns_id.c
index 1af3a3e857fac536e5ae4866f559c60d68203e03..4cee3b89f198f3917c85a841816fef3cdf4228e3 100644 (file)
--- a/zebra/zebra_netns_id.c
+++ b/zebra/zebra_netns_id.c
@@ -42,7 +42,7 @@
 #define NETLINK_SOCKET_BUFFER_SIZE 512
 #define NETLINK_ALIGNTO             4
 #define NETLINK_ALIGN(len)                                                     \
-       (((len) + NETLINK_ALIGNTO - 1) & ~(NETLINK_ALIGNTO - 1))
+       CHECK_FLAG(((len) + NETLINK_ALIGNTO - 1), ~(NETLINK_ALIGNTO - 1))
 #define NETLINK_NLATTR_LEN(_a, _b)   (unsigned int)((char *)_a - (char *)_b)
 
 #endif /* defined(HAVE_NETLINK) */
@@ -66,7 +66,7 @@ static struct nlmsghdr *initiate_nlh(char *buf, unsigned int *seq, int type)
        nlh->nlmsg_type = type;
        nlh->nlmsg_flags = NLM_F_REQUEST;
        if (type == RTM_NEWNSID)
-               nlh->nlmsg_flags |= NLM_F_ACK;
+               SET_FLAG(nlh->nlmsg_flags, NLM_F_ACK);
        nlh->nlmsg_seq = *seq = frr_sequence32_next();
        return nlh;
 }

diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c
index 1bb1292e346e3ede19d74d79badd6c4b8ef308bf..617a2225f895fb277e24d8294f8feaba29ec037f 100644 (file)
--- a/zebra/zebra_netns_notify.c
+++ b/zebra/zebra_netns_notify.c
@@ -304,7 +304,7 @@ static void zebra_ns_notify_read(struct event *t)
                char *netnspath;
                struct zebra_netns_info *netnsinfo;
 
-               if (!(event->mask & (IN_CREATE | IN_DELETE)))
+               if (!CHECK_FLAG(event->mask, (IN_CREATE | IN_DELETE)))
                        continue;
 
                if (offsetof(struct inotify_event, name) + event->len
@@ -350,7 +350,7 @@ static void zebra_ns_notify_read(struct event *t)
                memcpy(event_name, event->name, event->len);
                event_name[event->len - 1] = 0;
 
-               if (event->mask & IN_DELETE) {
+               if (CHECK_FLAG(event->mask, IN_DELETE)) {
                        zebra_ns_delete(event_name);
                        continue;
                }

diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index 934b8ba0db088572131b590f8a77d76eda5be7a3..ff97a11c172b432b396dfa0cd00d0b1b3ce04ab5 100644 (file)
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -1795,8 +1795,8 @@ static struct nexthop *nexthop_set_resolved(afi_t afi,
                break;
        }
 
-       if (newhop->flags & NEXTHOP_FLAG_ONLINK)
-               resolved_hop->flags |= NEXTHOP_FLAG_ONLINK;
+       if (CHECK_FLAG(newhop->flags, NEXTHOP_FLAG_ONLINK))
+               SET_FLAG(resolved_hop->flags, NEXTHOP_FLAG_ONLINK);
 
        /* Copy labels of the resolved route and the parent resolving to it */
        if (policy) {