ldpd: 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/ldpd/adjacency.c b/ldpd/adjacency.c
index 8caa3c4e2414306b0cbf23e71f76d8098d858b4c..4172321774892e703b646bda2c72f182686e2419 100644 (file)
--- a/ldpd/adjacency.c
+++ b/ldpd/adjacency.c
@@ -181,7 +181,7 @@ static void adj_itimer(struct thread *thread)
        log_debug("%s: lsr-id %pI4", __func__, &adj->lsr_id);
 
        if (adj->source.type == HELLO_TARGETED) {
-               if (!(adj->source.target->flags & F_TNBR_CONFIGURED) &&
+               if (!CHECK_FLAG(adj->source.target->flags, F_TNBR_CONFIGURED) &&
                    adj->source.target->pw_count == 0 &&
                    adj->source.target->rlfa_count == 0) {
                        /* remove dynamic targeted neighbor */
@@ -256,7 +256,7 @@ tnbr_find(struct ldpd_conf *xconf, int af, union ldpd_addr *addr)
 struct tnbr *
 tnbr_check(struct ldpd_conf *xconf, struct tnbr *tnbr)
 {
-       if (!(tnbr->flags & (F_TNBR_CONFIGURED|F_TNBR_DYNAMIC)) &&
+       if (!CHECK_FLAG(tnbr->flags, (F_TNBR_CONFIGURED|F_TNBR_DYNAMIC)) &&
            tnbr->pw_count == 0 && tnbr->rlfa_count == 0) {
                tnbr_del(xconf, tnbr);
                return (NULL);

diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c
index a8cffd6d91fe5b4fc852d000385e9027e8988fd4..8d78c88555db29701574152ab8a30b65c9b2bff8 100644 (file)
--- a/ldpd/ldp_vty_exec.c
+++ b/ldpd/ldp_vty_exec.c
@@ -422,10 +422,10 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg,
                rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf);
                vty_out (vty, "Local:\n");
                vty_out (vty, "  LSR Id: %pI4:0\n",&rtr_id);
-               if (ldpd_conf->ipv4.flags & F_LDPD_AF_ENABLED)
+               if (CHECK_FLAG(ldpd_conf->ipv4.flags, F_LDPD_AF_ENABLED))
                        vty_out (vty, "  Transport Address (IPv4): %s\n",
                            log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr));
-               if (ldpd_conf->ipv6.flags & F_LDPD_AF_ENABLED)
+               if (CHECK_FLAG(ldpd_conf->ipv6.flags, F_LDPD_AF_ENABLED))
                        vty_out (vty, "  Transport Address (IPv6): %s\n",
                            log_addr(AF_INET6, &ldpd_conf->ipv6.trans_addr));
                vty_out (vty, "Discovery Sources:\n");
@@ -538,10 +538,10 @@ show_discovery_detail_msg_json(struct imsg *imsg, struct show_params *params,
        case IMSG_CTL_SHOW_DISCOVERY:
                rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf);
                json_object_string_addf(json, "lsrId", "%pI4", &rtr_id);
-               if (ldpd_conf->ipv4.flags & F_LDPD_AF_ENABLED)
+               if (CHECK_FLAG(ldpd_conf->ipv4.flags, F_LDPD_AF_ENABLED))
                        json_object_string_add(json, "transportAddressIPv4",
                            log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr));
-               if (ldpd_conf->ipv6.flags & F_LDPD_AF_ENABLED)
+               if (CHECK_FLAG(ldpd_conf->ipv6.flags, F_LDPD_AF_ENABLED))
                        json_object_string_add(json, "transportAddressIPv6",
                            log_addr(AF_INET6, &ldpd_conf->ipv6.trans_addr));
                json_interfaces = json_object_new_object();
@@ -982,11 +982,11 @@ show_nbr_capabilities(struct vty *vty, struct ctl_nbr *nbr)
            "   - Typed Wildcard (0x050B)\n"
            "   - Unrecognized Notification (0x0603)\n");
        vty_out (vty, "  Capabilities Received:\n");
-       if (nbr->flags & F_NBR_CAP_DYNAMIC)
+       if (CHECK_FLAG(nbr->flags, F_NBR_CAP_DYNAMIC))
                vty_out (vty,"   - Dynamic Announcement (0x0506)\n");
-       if (nbr->flags & F_NBR_CAP_TWCARD)
+       if (CHECK_FLAG(nbr->flags, F_NBR_CAP_TWCARD))
                vty_out (vty, "   - Typed Wildcard (0x050B)\n");
-       if (nbr->flags & F_NBR_CAP_UNOTIF)
+       if (CHECK_FLAG(nbr->flags, F_NBR_CAP_UNOTIF))
                vty_out (vty,"   - Unrecognized Notification (0x0603)\n");
 }
 
@@ -1051,7 +1051,7 @@ show_nbr_capabilities_json(struct ctl_nbr *nbr, json_object *json_nbr)
        json_object_object_add(json_nbr, "receivedCapabilities", json_array);
 
        /* Dynamic Announcement (0x0506) */
-       if (nbr->flags & F_NBR_CAP_DYNAMIC) {
+       if (CHECK_FLAG(nbr->flags, F_NBR_CAP_DYNAMIC)) {
                json_cap = json_object_new_object();
                json_object_string_add(json_cap, "description",
                    "Dynamic Announcement");
@@ -1060,7 +1060,7 @@ show_nbr_capabilities_json(struct ctl_nbr *nbr, json_object *json_nbr)
        }
 
        /* Typed Wildcard (0x050B) */
-       if (nbr->flags & F_NBR_CAP_TWCARD) {
+       if (CHECK_FLAG(nbr->flags, F_NBR_CAP_TWCARD)) {
                json_cap = json_object_new_object();
                json_object_string_add(json_cap, "description",
                    "Typed Wildcard");
@@ -1069,7 +1069,7 @@ show_nbr_capabilities_json(struct ctl_nbr *nbr, json_object *json_nbr)
        }
 
        /* Unrecognized Notification (0x0603) */
-       if (nbr->flags & F_NBR_CAP_UNOTIF) {
+       if (CHECK_FLAG(nbr->flags, F_NBR_CAP_UNOTIF)) {
                json_cap = json_object_new_object();
                json_object_string_add(json_cap, "description",
                    "Unrecognized Notification");