bfdd: remove BFD_*_FLAG macros

Lets use what FRR provide us instead of implementing a new macros.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>

diff --git a/bfdd/bfd.c b/bfdd/bfd.c
index 222bf32c94eb21252a18f938f504239f500b4afb..1f65231d13a27de34d3b9e5ceb4556d751d13d2d 100644 (file)
--- a/bfdd/bfd.c
+++ b/bfdd/bfd.c
@@ -164,7 +164,7 @@ int bfd_session_enable(struct bfd_session *bs)
        assert(bs->vrf);
 
        if (bs->key.ifname[0]
-           && BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH) == 0)
+           && CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH) == 0)
                bs->ifp = ifp;
 
        /* Sanity check: don't leak open sockets. */
@@ -179,7 +179,7 @@ int bfd_session_enable(struct bfd_session *bs)
         * could use the destination port (3784) for the source
         * port we wouldn't need a socket per session.
         */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_IPV6) == 0) {
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_IPV6) == 0) {
                psock = bp_peer_socket(bs);
                if (psock == -1)
                        return 0;
@@ -287,7 +287,7 @@ void ptm_bfd_echo_stop(struct bfd_session *bfd)
 {
        bfd->echo_xmt_TO = 0;
        bfd->echo_detect_TO = 0;
-       BFD_UNSET_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE);
+       UNSET_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE);
 
        bfd_echo_xmttimer_delete(bfd);
        bfd_echo_recvtimer_delete(bfd);
@@ -352,7 +352,7 @@ void ptm_bfd_sess_dn(struct bfd_session *bfd, uint8_t diag)
                control_notify(bfd, PTM_BFD_DOWN);
 
        /* Stop echo packet transmission if they are active */
-       if (BFD_CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE))
+       if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE))
                ptm_bfd_echo_stop(bfd);
 
        if (old_state != bfd->ses_state) {
@@ -548,19 +548,19 @@ static void _bfd_session_update(struct bfd_session *bs,
 {
        if (bpc->bpc_echo) {
                /* Check if echo mode is already active. */
-               if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
+               if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
                        goto skip_echo;
 
-               BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
+               SET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
 
                /* Activate/update echo receive timeout timer. */
                bs_echo_timer_handler(bs);
        } else {
                /* Check if echo mode is already disabled. */
-               if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
+               if (!CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
                        goto skip_echo;
 
-               BFD_UNSET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
+               UNSET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
                ptm_bfd_echo_stop(bs);
        }
 
@@ -582,10 +582,10 @@ skip_echo:
 
        if (bpc->bpc_shutdown) {
                /* Check if already shutdown. */
-               if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
+               if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
                        return;
 
-               BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
+               SET_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
 
                /* Disable all events. */
                bfd_recvtimer_delete(bs);
@@ -602,10 +602,10 @@ skip_echo:
                        ptm_bfd_snd(bs, 0);
        } else {
                /* Check if already working. */
-               if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
+               if (!CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
                        return;
 
-               BFD_UNSET_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
+               UNSET_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
 
                /* Change and notify state change. */
                bs->ses_state = PTM_BFD_DOWN;
@@ -616,15 +616,15 @@ skip_echo:
                bfd_xmttimer_update(bs, bs->xmt_TO);
        }
        if (bpc->bpc_cbit) {
-               if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CBIT))
+               if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CBIT))
                        return;
 
-               BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_CBIT);
+               SET_FLAG(bs->flags, BFD_SESS_FLAG_CBIT);
        } else {
-               if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CBIT))
+               if (!CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CBIT))
                        return;
 
-               BFD_UNSET_FLAG(bs->flags, BFD_SESS_FLAG_CBIT);
+               UNSET_FLAG(bs->flags, BFD_SESS_FLAG_CBIT);
        }
 }
 
@@ -703,7 +703,7 @@ struct bfd_session *ptm_bfd_sess_new(struct bfd_peer_cfg *bpc)
 
        /* Copy remaining data. */
        if (bpc->bpc_ipv4 == false)
-               BFD_SET_FLAG(bfd->flags, BFD_SESS_FLAG_IPV6);
+               SET_FLAG(bfd->flags, BFD_SESS_FLAG_IPV6);
 
        bfd->key.family = (bpc->bpc_ipv4) ? AF_INET : AF_INET6;
        switch (bfd->key.family) {
@@ -727,7 +727,7 @@ struct bfd_session *ptm_bfd_sess_new(struct bfd_peer_cfg *bpc)
        }
 
        if (bpc->bpc_mhop)
-               BFD_SET_FLAG(bfd->flags, BFD_SESS_FLAG_MH);
+               SET_FLAG(bfd->flags, BFD_SESS_FLAG_MH);
 
        bfd->key.mhop = bpc->bpc_mhop;
 
@@ -901,7 +901,7 @@ static void bs_neighbour_admin_down_handler(struct bfd_session *bfd,
                control_notify(bfd, PTM_BFD_ADM_DOWN);
 
        /* Stop echo packet transmission if they are active */
-       if (BFD_CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE))
+       if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE))
                ptm_bfd_echo_stop(bfd);
 
        if (old_state != bfd->ses_state) {
@@ -976,14 +976,14 @@ void bs_echo_timer_handler(struct bfd_session *bs)
         *     Section 3).
         *   - Check that we are already at the up state.
         */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO) == 0
-           || BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO) == 0
+           || CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)
            || bs->ses_state != PTM_BFD_UP)
                return;
 
        /* Remote peer asked to stop echo. */
        if (bs->remote_timers.required_min_echo == 0) {
-               if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO_ACTIVE))
+               if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO_ACTIVE))
                        ptm_bfd_echo_stop(bs);
 
                return;
@@ -1002,7 +1002,7 @@ void bs_echo_timer_handler(struct bfd_session *bs)
        else
                bs->echo_xmt_TO = bs->timers.required_min_echo;
 
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO_ACTIVE) == 0
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO_ACTIVE) == 0
            || old_timer != bs->echo_xmt_TO)
                ptm_bfd_echo_start(bs);
 }
@@ -1241,7 +1241,7 @@ const char *bs_to_string(const struct bfd_session *bs)
        static char buf[256];
        char addr_buf[INET6_ADDRSTRLEN];
        int pos;
-       bool is_mhop = BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH);
+       bool is_mhop = CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH);
 
        pos = snprintf(buf, sizeof(buf), "mhop:%s", is_mhop ? "yes" : "no");
        pos += snprintf(buf + pos, sizeof(buf) - pos, " peer:%s",
@@ -1644,11 +1644,11 @@ static void _bfd_session_remove_manual(struct hash_bucket *hb,
        struct bfd_session *bs = hb->data;
 
        /* Delete only manually configured sessions. */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG) == 0)
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG) == 0)
                return;
 
        bs->refcount--;
-       BFD_UNSET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
+       UNSET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
 
        /* Don't delete sessions still in use. */
        if (bs->refcount != 0)

diff --git a/bfdd/bfd.h b/bfdd/bfd.h
index 2ae74d7880b1074e104e96ccd483ee0f65e4e1ae..4f696a68bc424349e5147e9cae7f8d2cc8011d8f 100644 (file)
--- a/bfdd/bfd.h
+++ b/bfdd/bfd.h
@@ -172,10 +172,6 @@ enum bfd_session_flags {
        BFD_SESS_FLAG_CBIT = 1 << 9,    /* CBIT is set */
 };
 
-#define BFD_SET_FLAG(field, flag) (field |= flag)
-#define BFD_UNSET_FLAG(field, flag) (field &= ~flag)
-#define BFD_CHECK_FLAG(field, flag) (field & flag)
-
 /* BFD session hash keys */
 struct bfd_key {
        uint16_t family;

diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
index 12e508c601211f8a7d46d4c8577b94f6cb333359..6853f6f694841caaf5df66968c68e9a0ebdb5498 100644 (file)
--- a/bfdd/bfd_packet.c
+++ b/bfdd/bfd_packet.c
@@ -76,7 +76,7 @@ int _ptm_bfd_send(struct bfd_session *bs, uint16_t *port, const void *data,
        ssize_t rv;
        int sd = -1;
 
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_IPV6)) {
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_IPV6)) {
                memset(&sin6, 0, sizeof(sin6));
                sin6.sin6_family = AF_INET6;
                memcpy(&sin6.sin6_addr, &bs->key.peer, sizeof(sin6.sin6_addr));
@@ -85,7 +85,7 @@ int _ptm_bfd_send(struct bfd_session *bs, uint16_t *port, const void *data,
 
                sin6.sin6_port =
                        (port) ? *port
-                              : (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH))
+                              : (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH))
                                         ? htons(BFD_DEF_MHOP_DEST_PORT)
                                         : htons(BFD_DEFDESTPORT);
 
@@ -98,7 +98,7 @@ int _ptm_bfd_send(struct bfd_session *bs, uint16_t *port, const void *data,
                memcpy(&sin.sin_addr, &bs->key.peer, sizeof(sin.sin_addr));
                sin.sin_port =
                        (port) ? *port
-                              : (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH))
+                              : (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH))
                                         ? htons(BFD_DEF_MHOP_DEST_PORT)
                                         : htons(BFD_DEFDESTPORT);
 
@@ -133,15 +133,15 @@ void ptm_bfd_echo_snd(struct bfd_session *bfd)
 
        if (!bvrf)
                return;
-       if (!BFD_CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE))
-               BFD_SET_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE);
+       if (!CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE))
+               SET_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE);
 
        memset(&bep, 0, sizeof(bep));
        bep.ver = BFD_ECHO_VERSION;
        bep.len = BFD_ECHO_PKT_LEN;
        bep.my_discr = htonl(bfd->discrs.my_discr);
 
-       if (BFD_CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_IPV6)) {
+       if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_IPV6)) {
                sd = bvrf->bg_echov6;
                memset(&sin6, 0, sizeof(sin6));
                sin6.sin6_family = AF_INET6;
@@ -194,7 +194,7 @@ static int ptm_bfd_process_echo_pkt(struct bfd_vrf_global *bvrf, int s)
                return -1;
        }
 
-       if (!BFD_CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE)) {
+       if (!CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_ECHO_ACTIVE)) {
                log_debug("echo-packet: echo disabled [%s] (id:%u)",
                          bs_to_string(bfd), my_discr);
                return -1;
@@ -222,7 +222,7 @@ void ptm_bfd_snd(struct bfd_session *bfd, int fbit)
        cp.flags = 0;
        BFD_SETSTATE(cp.flags, bfd->ses_state);
 
-       if (BFD_CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_CBIT))
+       if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_CBIT))
                BFD_SETCBIT(cp.flags, BFD_CBIT);
 
        BFD_SETDEMANDBIT(cp.flags, BFD_DEF_DEMAND);
@@ -932,7 +932,7 @@ int bp_peer_socket(const struct bfd_session *bs)
 
        if (bs->key.ifname[0])
                device_to_bind = (const char *)bs->key.ifname;
-       else if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)
+       else if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)
            && bs->key.vrfname[0])
                device_to_bind = (const char *)bs->key.vrfname;
 
@@ -965,7 +965,7 @@ int bp_peer_socket(const struct bfd_session *bs)
        sin.sin_len = sizeof(sin);
 #endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
        memcpy(&sin.sin_addr, &bs->key.local, sizeof(sin.sin_addr));
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH) == 0)
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH) == 0)
                sin.sin_addr.s_addr = INADDR_ANY;
 
        pcount = 0;
@@ -999,7 +999,7 @@ int bp_peer_socketv6(const struct bfd_session *bs)
 
        if (bs->key.ifname[0])
                device_to_bind = (const char *)bs->key.ifname;
-       else if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)
+       else if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)
            && bs->key.vrfname[0])
                device_to_bind = (const char *)bs->key.vrfname;
 

diff --git a/bfdd/bfdd_nb_config.c b/bfdd/bfdd_nb_config.c
index 48dcce3ddf44dda5a4b4e3e0d1ebe77c6fff4698..c1123c4c330ebd38a50c17d6b141b4576fe77138 100644 (file)
--- a/bfdd/bfdd_nb_config.c
+++ b/bfdd/bfdd_nb_config.c
@@ -99,7 +99,7 @@ static int bfd_session_create(enum nb_event event, const struct lyd_node *dnode,
                /* This session was already configured by another daemon. */
                if (bs != NULL) {
                        /* Now it is configured also by CLI. */
-                       BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
+                       SET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
                        bs->refcount++;
 
                        resource->ptr = bs;
@@ -115,11 +115,11 @@ static int bfd_session_create(enum nb_event event, const struct lyd_node *dnode,
 
                /* Set configuration flags. */
                bs->refcount = 1;
-               BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
+               SET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
                if (mhop)
-                       BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_MH);
+                       SET_FLAG(bs->flags, BFD_SESS_FLAG_MH);
                if (bs->key.family == AF_INET6)
-                       BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_IPV6);
+                       SET_FLAG(bs->flags, BFD_SESS_FLAG_IPV6);
 
                resource->ptr = bs;
                break;
@@ -164,10 +164,10 @@ static int bfd_session_destroy(enum nb_event event,
        case NB_EV_APPLY:
                bs = nb_running_unset_entry(dnode);
                /* CLI is not using this session anymore. */
-               if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG) == 0)
+               if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG) == 0)
                        break;
 
-               BFD_UNSET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
+               UNSET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
                bs->refcount--;
                /* There are still daemons using it. */
                if (bs->refcount > 0)
@@ -384,10 +384,10 @@ int bfdd_bfd_sessions_single_hop_administrative_down_modify(
        bs = nb_running_get_entry(dnode, NULL, true);
 
        if (!shutdown) {
-               if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
+               if (!CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
                        return NB_OK;
 
-               BFD_UNSET_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
+               UNSET_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
 
                /* Change and notify state change. */
                bs->ses_state = PTM_BFD_DOWN;
@@ -396,15 +396,15 @@ int bfdd_bfd_sessions_single_hop_administrative_down_modify(
                /* Enable all timers. */
                bfd_recvtimer_update(bs);
                bfd_xmttimer_update(bs, bs->xmt_TO);
-               if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO)) {
+               if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO)) {
                        bfd_echo_recvtimer_update(bs);
                        bfd_echo_xmttimer_update(bs, bs->echo_xmt_TO);
                }
        } else {
-               if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
+               if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
                        return NB_OK;
 
-               BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
+               SET_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
 
                /* Disable all events. */
                bfd_recvtimer_delete(bs);
@@ -448,18 +448,18 @@ int bfdd_bfd_sessions_single_hop_echo_mode_modify(enum nb_event event,
        bs = nb_running_get_entry(dnode, NULL, true);
 
        if (!echo) {
-               if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
+               if (!CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
                        return NB_OK;
 
-               BFD_UNSET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
+               UNSET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
                ptm_bfd_echo_stop(bs);
        } else {
-               if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
+               if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
                        return NB_OK;
 
-               BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
+               SET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
                /* Apply setting immediately. */
-               if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
+               if (!CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
                        bs_echo_timer_handler(bs);
        }
 

diff --git a/bfdd/bfdd_nb_state.c b/bfdd/bfdd_nb_state.c
index dfca3d14178b375c658ba0ccc2e68cad8213a96e..2a44d46c41b8ebac584fc6e2510a9142e16fc172 100644 (file)
--- a/bfdd/bfdd_nb_state.c
+++ b/bfdd/bfdd_nb_state.c
@@ -211,7 +211,7 @@ struct yang_data *bfdd_bfd_sessions_single_hop_stats_detection_mode_get_elem(
         *
         * TODO: support demand mode.
         */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
                detection_mode = 1;
        else
                detection_mode = 2;

diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index 2a98b0fb0209ad6e7b37118174ed579d3d75c274..a4f2e28b5cec05bf7042279aa89386c3a95dd78a 100644 (file)
--- a/bfdd/bfdd_vty.c
+++ b/bfdd/bfdd_vty.c
@@ -84,7 +84,7 @@ static void _display_peer_header(struct vty *vty, struct bfd_session *bs)
                inet_ntop(bs->key.family, &bs->key.peer, addr_buf,
                          sizeof(addr_buf)));
 
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH))
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH))
                vty_out(vty, " multihop");
 
        if (memcmp(&bs->key.local, &zero_addr, sizeof(bs->key.local)))
@@ -143,7 +143,7 @@ static void _display_peer(struct vty *vty, struct bfd_session *bs)
        vty_out(vty, "\t\tDiagnostics: %s\n", diag2str(bs->local_diag));
        vty_out(vty, "\t\tRemote diagnostics: %s\n", diag2str(bs->remote_diag));
        vty_out(vty, "\t\tPeer Type: %s\n",
-               BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG) ? "configured" : "dynamic");
+               CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG) ? "configured" : "dynamic");
 
        vty_out(vty, "\t\tLocal timers:\n");
        vty_out(vty, "\t\t\tDetect-multiplier: %" PRIu32 "\n",
@@ -235,7 +235,7 @@ static struct json_object *__display_peer_json(struct bfd_session *bs)
                            bs->timers.required_min_rx / 1000);
        json_object_int_add(jo, "transmit-interval",
                            bs->timers.desired_min_tx / 1000);
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
                json_object_int_add(jo, "echo-interval",
                                    bs->timers.required_min_echo / 1000);
        else
@@ -457,7 +457,7 @@ static void _display_peer_brief(struct vty *vty, struct bfd_session *bs)
 {
        char addr_buf[INET6_ADDRSTRLEN];
 
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)) {
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)) {
                vty_out(vty, "%-10u", bs->discrs.my_discr);
                inet_ntop(bs->key.family, &bs->key.local, addr_buf, sizeof(addr_buf));
                vty_out(vty, " %-40s", addr_buf);

diff --git a/bfdd/config.c b/bfdd/config.c
index 4ae7bfdc0849707fabd598bd54abf53c9a480c20..9c2d621d39de7c18a8cf4e6e96b7d00589978a8b 100644 (file)
--- a/bfdd/config.c
+++ b/bfdd/config.c
@@ -474,12 +474,12 @@ char *config_notify_config(const char *op, struct bfd_session *bs)
        json_object_int_add(resp, "remote-echo-interval",
                            bs->remote_timers.required_min_echo / 1000);
 
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
                json_object_boolean_true_add(resp, "echo-mode");
        else
                json_object_boolean_false_add(resp, "echo-mode");
 
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN))
                json_object_boolean_true_add(resp, "shutdown");
        else
                json_object_boolean_false_add(resp, "shutdown");
@@ -511,12 +511,12 @@ static int json_object_add_peer(struct json_object *jo, struct bfd_session *bs)
        char addr_buf[INET6_ADDRSTRLEN];
 
        /* Add peer 'key' information. */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_IPV6))
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_IPV6))
                json_object_boolean_true_add(jo, "ipv6");
        else
                json_object_boolean_false_add(jo, "ipv6");
 
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)) {
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH)) {
                json_object_boolean_true_add(jo, "multihop");
                json_object_string_add(jo, "peer-address",
                                       inet_ntop(bs->key.family, &bs->key.peer,

diff --git a/bfdd/event.c b/bfdd/event.c
index 5ba54c2b0b2a1422a4b7eadc5e9d9d5bc4b4fc1d..c03f384c72e811fbd43a0c04f51d9503174f34cf 100644 (file)
--- a/bfdd/event.c
+++ b/bfdd/event.c
@@ -43,7 +43,7 @@ void bfd_recvtimer_update(struct bfd_session *bs)
        bfd_recvtimer_delete(bs);
 
        /* Don't add event if peer is deactivated. */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
            bs->sock == -1)
                return;
 
@@ -64,7 +64,7 @@ void bfd_echo_recvtimer_update(struct bfd_session *bs)
        bfd_echo_recvtimer_delete(bs);
 
        /* Don't add event if peer is deactivated. */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
            bs->sock == -1)
                return;
 
@@ -85,7 +85,7 @@ void bfd_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
        bfd_xmttimer_delete(bs);
 
        /* Don't add event if peer is deactivated. */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
            bs->sock == -1)
                return;
 
@@ -105,7 +105,7 @@ void bfd_echo_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
        bfd_echo_xmttimer_delete(bs);
 
        /* Don't add event if peer is deactivated. */
-       if (BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
+       if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
            bs->sock == -1)
                return;
 

diff --git a/bfdd/ptm_adapter.c b/bfdd/ptm_adapter.c
index dcca70b796f07751debf14f17b1eb2dfd998404f..ab014f1576a5bc93b3910a1c2c7e98a3215152d5 100644 (file)
--- a/bfdd/ptm_adapter.c
+++ b/bfdd/ptm_adapter.c
@@ -423,9 +423,9 @@ static void bfdd_dest_register(struct stream *msg, vrf_id_t vrf_id)
                }
        } else {
                /* Don't try to change echo/shutdown state. */
-               bpc.bpc_echo = BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
+               bpc.bpc_echo = CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
                bpc.bpc_shutdown =
-                       BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
+                       CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN);
        }
 
        /* Create client peer notification register. */
@@ -462,7 +462,7 @@ static void bfdd_dest_deregister(struct stream *msg, vrf_id_t vrf_id)
        pcn = pcn_lookup(pc, bs);
        pcn_free(pcn);
        if (bs->refcount ||
-           BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG))
+           CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG))
                return;
 
        bs->ses_state = PTM_BFD_ADM_DOWN;