ospf6d: Convert to using %pFX

[mirror_frr.git] / bfdd / event.c

diff --git a/bfdd/event.c b/bfdd/event.c
index 5ba54c2b0b2a1422a4b7eadc5e9d9d5bc4b4fc1d..654928b9b3759a7bd745dbe3aa7cd25935023328 100644 (file)
--- a/bfdd/event.c
+++ b/bfdd/event.c
@@ -43,14 +43,11 @@ 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;
 
        tv_normalize(&tv);
-#ifdef BFD_EVENT_DEBUG
-       log_debug("%s: sec = %ld, usec = %ld", __func__, tv.tv_sec, tv.tv_usec);
-#endif /* BFD_EVENT_DEBUG */
 
        thread_add_timer_tv(master, bfd_recvtimer_cb, bs, &tv,
                            &bs->recvtimer_ev);
@@ -64,14 +61,11 @@ 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;
 
        tv_normalize(&tv);
-#ifdef BFD_EVENT_DEBUG
-       log_debug("%s: sec = %ld, usec = %ld", __func__, tv.tv_sec, tv.tv_usec);
-#endif /* BFD_EVENT_DEBUG */
 
        thread_add_timer_tv(master, bfd_echo_recvtimer_cb, bs, &tv,
                            &bs->echo_recvtimer_ev);
@@ -85,14 +79,11 @@ 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;
 
        tv_normalize(&tv);
-#ifdef BFD_EVENT_DEBUG
-       log_debug("%s: sec = %ld, usec = %ld", __func__, tv.tv_sec, tv.tv_usec);
-#endif /* BFD_EVENT_DEBUG */
 
        thread_add_timer_tv(master, bfd_xmt_cb, bs, &tv, &bs->xmttimer_ev);
 }
@@ -105,14 +96,11 @@ 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;
 
        tv_normalize(&tv);
-#ifdef BFD_EVENT_DEBUG
-       log_debug("%s: sec = %ld, usec = %ld", __func__, tv.tv_sec, tv.tv_usec);
-#endif /* BFD_EVENT_DEBUG */
 
        thread_add_timer_tv(master, bfd_echo_xmt_cb, bs, &tv,
                            &bs->echo_xmttimer_ev);