vrrpd,vtysh,watchfrr: remove use of the EVENT_OFF macro

Replace deprecated macro with direct function call.

Signed-off-by: Mark Stapp <mjs@cisco.com>

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 017387924c7f3c3a075214c9045a7da7bda6a63d..d27448c95b5f2a228c884c351fbe66c67dd40a6c 100644 (file)
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -899,7 +899,7 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
 
                if (pkt->hdr.priority == 0) {
                        vrrp_send_advertisement(r);
-                       EVENT_OFF(r->t_adver_timer);
+                       event_cancel(&r->t_adver_timer);
                        event_add_timer_msec(master, vrrp_adver_timer_expire, r,
                                             r->vr->advertisement_interval *
                                                     CS2MS,
@@ -912,13 +912,13 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
                                "Received advertisement from %s w/ priority %hhu; switching to Backup",
                                r->vr->vrid, family2str(r->family), sipstr,
                                pkt->hdr.priority);
-                       EVENT_OFF(r->t_adver_timer);
+                       event_cancel(&r->t_adver_timer);
                        if (r->vr->version == 3) {
                                r->master_adver_interval =
                                        htons(pkt->hdr.v3.adver_int);
                        }
                        vrrp_recalculate_timers(r);
-                       EVENT_OFF(r->t_master_down_timer);
+                       event_cancel(&r->t_master_down_timer);
                        event_add_timer_msec(master,
                                             vrrp_master_down_timer_expire, r,
                                             r->master_down_interval * CS2MS,
@@ -935,7 +935,7 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
                break;
        case VRRP_STATE_BACKUP:
                if (pkt->hdr.priority == 0) {
-                       EVENT_OFF(r->t_master_down_timer);
+                       event_cancel(&r->t_master_down_timer);
                        event_add_timer_msec(
                                master, vrrp_master_down_timer_expire, r,
                                r->skew_time * CS2MS, &r->t_master_down_timer);
@@ -946,7 +946,7 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
                                        ntohs(pkt->hdr.v3.adver_int);
                        }
                        vrrp_recalculate_timers(r);
-                       EVENT_OFF(r->t_master_down_timer);
+                       event_cancel(&r->t_master_down_timer);
                        event_add_timer_msec(master,
                                             vrrp_master_down_timer_expire, r,
                                             r->master_down_interval * CS2MS,
@@ -1416,7 +1416,7 @@ static void vrrp_change_state_backup(struct vrrp_router *r)
                vrrp_zebra_radv_set(r, false);
 
        /* Disable Adver_Timer */
-       EVENT_OFF(r->t_adver_timer);
+       event_cancel(&r->t_adver_timer);
 
        r->advert_pending = false;
        r->garp_pending = false;
@@ -1643,10 +1643,10 @@ static int vrrp_shutdown(struct vrrp_router *r)
        }
 
        /* Cancel all timers */
-       EVENT_OFF(r->t_adver_timer);
-       EVENT_OFF(r->t_master_down_timer);
-       EVENT_OFF(r->t_read);
-       EVENT_OFF(r->t_write);
+       event_cancel(&r->t_adver_timer);
+       event_cancel(&r->t_master_down_timer);
+       event_cancel(&r->t_read);
+       event_cancel(&r->t_write);
 
        /* Protodown macvlan */
        if (r->mvl_ifp)

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index fba39526c6d4b54bf7c9ef303759447b8f4722fb..a247080abd5e731d1bc08b75d1d93f1934637c26 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -4400,7 +4400,7 @@ static void vtysh_log_read(struct event *thread)
                                "log monitor connection closed unexpectedly");
                buf.hdr.textlen = strlen(buf.text);
 
-               EVENT_OFF(vclient->log_reader);
+               event_cancel(&vclient->log_reader);
                close(vclient->log_fd);
                vclient->log_fd = -1;
 
@@ -4522,7 +4522,7 @@ DEFPY (no_vtysh_terminal_monitor,
                         * a close notification...
                         */
                        if (vclient->log_fd != -1) {
-                               EVENT_OFF(vclient->log_reader);
+                               event_cancel(&vclient->log_reader);
 
                                close(vclient->log_fd);
                                vclient->log_fd = -1;

diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index cde38aed8cab7ca12002094be31d495e4d6a6450..559514d3422a37bf47bebc991f414c60ac24cc62 100644 (file)
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -594,7 +594,7 @@ static void restart_done(struct daemon *dmn)
                        dmn->name, state_str[dmn->state]);
                return;
        }
-       EVENT_OFF(dmn->t_wakeup);
+       event_cancel(&dmn->t_wakeup);
 
        if (try_connect(dmn) < 0)
                SET_WAKEUP_DOWN(dmn);
@@ -622,9 +622,9 @@ static void daemon_down(struct daemon *dmn, const char *why)
                close(dmn->fd);
                dmn->fd = -1;
        }
-       EVENT_OFF(dmn->t_read);
-       EVENT_OFF(dmn->t_write);
-       EVENT_OFF(dmn->t_wakeup);
+       event_cancel(&dmn->t_read);
+       event_cancel(&dmn->t_write);
+       event_cancel(&dmn->t_wakeup);
        if (try_connect(dmn) < 0)
                SET_WAKEUP_DOWN(dmn);
 
@@ -750,7 +750,7 @@ static void daemon_up(struct daemon *dmn, const char *why)
        if (gs.numdown == 0) {
                daemon_send_ready(0);
 
-               EVENT_OFF(gs.t_operational);
+               event_cancel(&gs.t_operational);
 
                event_add_timer(master, daemon_restarting_operational, NULL,
                                gs.operational_timeout, &gs.t_operational);
@@ -948,7 +948,7 @@ static void phase_check(void)
                                        gs.start_command, 1, 0);
                }
                gs.phase = PHASE_NONE;
-               EVENT_OFF(gs.t_phase_hanging);
+               event_cancel(&gs.t_phase_hanging);
                zlog_notice("Phased global restart has completed.");
                break;
        }