Merge pull request #13450 from patrasar/mld_core

[mirror_frr.git] / zebra / zebra_ptm.c

diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index e77dcedd9e106232bddda245713fe2ca1dc9f05e..a678e71734716bec5488ffed97636e3508bd9740 100644 (file)
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -16,6 +16,7 @@
 #include "ptm_lib.h"
 #include "rib.h"
 #include "stream.h"
+#include "lib/version.h"
 #include "vrf.h"
 #include "vty.h"
 #include "lib_errors.h"
@@ -141,9 +142,9 @@ void zebra_ptm_finish(void)
                free(ptm_cb.in_data);
 
        /* Cancel events. */
-       THREAD_OFF(ptm_cb.t_read);
-       THREAD_OFF(ptm_cb.t_write);
-       THREAD_OFF(ptm_cb.t_timer);
+       EVENT_OFF(ptm_cb.t_read);
+       EVENT_OFF(ptm_cb.t_write);
+       EVENT_OFF(ptm_cb.t_timer);
 
        if (ptm_cb.wb)
                buffer_free(ptm_cb.wb);
@@ -197,7 +198,7 @@ static int zebra_ptm_send_message(char *data, int size)
                                ptm_cb.reconnect_time, &ptm_cb.t_timer);
                return -1;
        case BUFFER_EMPTY:
-               THREAD_OFF(ptm_cb.t_write);
+               EVENT_OFF(ptm_cb.t_write);
                break;
        case BUFFER_PENDING:
                event_add_write(zrouter.master, zebra_ptm_flush_messages, NULL,
@@ -635,7 +636,7 @@ void zebra_ptm_sock_read(struct event *thread)
        int rc;
 
        errno = 0;
-       sock = THREAD_FD(thread);
+       sock = EVENT_FD(thread);
 
        if (sock == -1)
                return;
@@ -1184,7 +1185,7 @@ struct ptm_process {
 TAILQ_HEAD(ppqueue, ptm_process) ppqueue;
 
 DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_PTM_BFD_PROCESS,
-                   "PTM BFD process registration table.");
+                   "PTM BFD process reg table");
 
 /*
  * Prototypes.