diff options
Diffstat (limited to 'zebra/zebra_ptm.c')
| -rw-r--r-- | zebra/zebra_ptm.c | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c index 301f1c3f74..e77dcedd9e 100644 --- a/zebra/zebra_ptm.c +++ b/zebra/zebra_ptm.c @@ -169,13 +169,13 @@ static void zebra_ptm_flush_messages(struct event *thread) ptm_cb.ptm_sock = -1; zebra_ptm_reset_status(0); ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; case BUFFER_PENDING: ptm_cb.t_write = NULL; - thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, - ptm_cb.ptm_sock, &ptm_cb.t_write); + event_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, + ptm_cb.ptm_sock, &ptm_cb.t_write); break; case BUFFER_EMPTY: break; @@ -193,15 +193,15 @@ static int zebra_ptm_send_message(char *data, int size) ptm_cb.ptm_sock = -1; zebra_ptm_reset_status(0); ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return -1; case BUFFER_EMPTY: THREAD_OFF(ptm_cb.t_write); break; case BUFFER_PENDING: - thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, - ptm_cb.ptm_sock, &ptm_cb.t_write); + event_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, + ptm_cb.ptm_sock, &ptm_cb.t_write); break; } @@ -220,8 +220,8 @@ void zebra_ptm_connect(struct event *t) if (ptm_cb.ptm_sock != -1) { if (init) { ptm_cb.t_read = NULL; - thread_add_read(zrouter.master, zebra_ptm_sock_read, - NULL, ptm_cb.ptm_sock, &ptm_cb.t_read); + event_add_read(zrouter.master, zebra_ptm_sock_read, + NULL, ptm_cb.ptm_sock, &ptm_cb.t_read); zebra_bfd_peer_replay_req(); } zebra_ptm_send_status_req(); @@ -232,8 +232,8 @@ void zebra_ptm_connect(struct event *t) ptm_cb.reconnect_time = ZEBRA_PTM_RECONNECT_TIME_MAX; ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); } else if (ptm_cb.reconnect_time >= ZEBRA_PTM_RECONNECT_TIME_MAX) { ptm_cb.reconnect_time = ZEBRA_PTM_RECONNECT_TIME_INITIAL; } @@ -656,15 +656,14 @@ void zebra_ptm_sock_read(struct event *thread) ptm_cb.ptm_sock = -1; zebra_ptm_reset_status(0); ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, - &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; } ptm_cb.t_read = NULL; - thread_add_read(zrouter.master, zebra_ptm_sock_read, NULL, - ptm_cb.ptm_sock, &ptm_cb.t_read); + event_add_read(zrouter.master, zebra_ptm_sock_read, NULL, + ptm_cb.ptm_sock, &ptm_cb.t_read); } /* BFD peer/dst register/update */ @@ -698,8 +697,8 @@ void zebra_ptm_bfd_dst_register(ZAPI_HANDLER_ARGS) if (ptm_cb.ptm_sock == -1) { ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; } @@ -857,8 +856,8 @@ void zebra_ptm_bfd_dst_deregister(ZAPI_HANDLER_ARGS) if (ptm_cb.ptm_sock == -1) { ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; } @@ -985,8 +984,8 @@ void zebra_ptm_bfd_client_register(ZAPI_HANDLER_ARGS) if (ptm_cb.ptm_sock == -1) { ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; } @@ -1044,8 +1043,8 @@ int zebra_ptm_bfd_client_deregister(struct zserv *client) if (ptm_cb.ptm_sock == -1) { ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return 0; } |