From: Arran Cudbard-Bell Date: Fri, 31 Jan 2020 22:35:52 +0000 (-0500) Subject: fr_event_timer_delete doesn't need to take el X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d38e9d25fb430765f2a3fa7158ed0df3d2dc8137;p=thirdparty%2Ffreeradius-server.git fr_event_timer_delete doesn't need to take el We should probably figure out something for the file descriptors too --- diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c index 169d669385e..19092a5e4fa 100644 --- a/src/bin/radsniff.c +++ b/src/bin/radsniff.c @@ -1011,7 +1011,7 @@ static int _request_free(rs_request_t *request) if (request->event) { int rcode; - rcode = fr_event_timer_delete(events, &request->event); + rcode = fr_event_timer_delete(&request->event); if (rcode < 0) { fprintf(stderr, "Failed deleting timer: %s\n", fr_strerror()); RS_ASSERT(0 == 1); @@ -1457,7 +1457,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt original->rt_rsp++; fr_radius_packet_free(&original->linked); - fr_event_timer_delete(event->list, &original->event); + fr_event_timer_delete(&original->event); /* * ...nope it's the first response to a request. */ @@ -1666,7 +1666,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt original->expect = talloc_steal(original, search.expect); /* Disarm the timer for the cleanup event for the original request */ - fr_event_timer_delete(event->list, &original->event); + fr_event_timer_delete(&original->event); /* * ...nope it's a new request. */ diff --git a/src/lib/io/load.c b/src/lib/io/load.c index 93b0d44470d..09042e9c68b 100644 --- a/src/lib/io/load.c +++ b/src/lib/io/load.c @@ -238,7 +238,7 @@ int fr_load_generator_stop(fr_load_t *l) { if (!l->ev) return 0; - return fr_event_timer_delete(l->el, &l->ev); + return fr_event_timer_delete(&l->ev); } diff --git a/src/lib/io/master.c b/src/lib/io/master.c index 6957d41fa1a..09d94f46286 100644 --- a/src/lib/io/master.c +++ b/src/lib/io/master.c @@ -916,7 +916,7 @@ static void track_free(fr_io_track_t *track) { fr_io_thread_t *thread = track->client->thread; - if (track->ev) (void) fr_event_timer_delete(thread->el, &track->ev); + if (track->ev) (void) fr_event_timer_delete(&track->ev); talloc_free_children(track); diff --git a/src/lib/server/connection.c b/src/lib/server/connection.c index 961898b2267..17f3a89149e 100644 --- a/src/lib/server/connection.c +++ b/src/lib/server/connection.c @@ -526,7 +526,7 @@ static void connection_state_closed_enter(fr_connection_t *conn) STATE_TRANSITION(FR_CONNECTION_STATE_CLOSED); - fr_event_timer_delete(conn->el, &conn->connection_timer); + fr_event_timer_delete(&conn->connection_timer); /* * If there's a close callback, call it, so that the @@ -638,7 +638,7 @@ static void connection_state_failed_enter(fr_connection_t *conn) /* * Explicit error occurred, delete the connection timer */ - fr_event_timer_delete(conn->el, &conn->connection_timer); + fr_event_timer_delete(&conn->connection_timer); /* * Record what state the connection is currently in @@ -776,7 +776,7 @@ static void connection_state_halted_enter(fr_connection_t *conn) { rad_assert(conn->is_closed); - fr_event_timer_delete(conn->el, &conn->connection_timer); + fr_event_timer_delete(&conn->connection_timer); STATE_TRANSITION(FR_CONNECTION_STATE_HALTED); WATCH_PRE(conn); @@ -804,7 +804,7 @@ static void connection_state_connected_enter(fr_connection_t *conn) STATE_TRANSITION(FR_CONNECTION_STATE_CONNECTED); - fr_event_timer_delete(conn->el, &conn->connection_timer); + fr_event_timer_delete(&conn->connection_timer); WATCH_PRE(conn); if (conn->open) { HANDLER_BEGIN(conn, conn->open); diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c index 2886ba0f397..ce446479804 100644 --- a/src/lib/server/trunk.c +++ b/src/lib/server/trunk.c @@ -2523,7 +2523,7 @@ static void _trunk_connection_on_closed(UNUSED fr_connection_t *conn, UNUSED fr_ /* * Remove the reconnect event */ - if (trunk->conf.lifetime > 0) fr_event_timer_delete(trunk->el, &tconn->lifetime_ev); + if (trunk->conf.lifetime > 0) fr_event_timer_delete(&tconn->lifetime_ev); } /** Connection failed @@ -3613,7 +3613,7 @@ static int _trunk_free(fr_trunk_t *trunk) * We really don't want this firing after * we've freed everything. */ - fr_event_timer_delete(trunk->el, &trunk->manage_ev); + fr_event_timer_delete(&trunk->manage_ev); /* * Now free the connections in each of the lists. diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c index 98e6f7fce13..4c7f36ffe11 100644 --- a/src/lib/unlang/module.c +++ b/src/lib/unlang/module.c @@ -81,7 +81,7 @@ static void unlang_event_fd_read_handler(UNUSED fr_event_list_t *el, int fd, UNU static int _unlang_event_free(unlang_module_event_t *ev) { if (ev->ev) { - (void) fr_event_timer_delete(ev->request->el, &(ev->ev)); + (void) fr_event_timer_delete(&(ev->ev)); return 0; } diff --git a/src/lib/unlang/xlat.c b/src/lib/unlang/xlat.c index 778ca2a18c6..d0ca01f3cc0 100644 --- a/src/lib/unlang/xlat.c +++ b/src/lib/unlang/xlat.c @@ -107,7 +107,7 @@ static unlang_t xlat_instruction = { static int _unlang_xlat_event_free(unlang_xlat_event_t *ev) { if (ev->ev) { - (void) fr_event_timer_delete(ev->request->el, &(ev->ev)); + (void) fr_event_timer_delete(&(ev->ev)); return 0; } diff --git a/src/lib/util/event.c b/src/lib/util/event.c index 3b38d2d2148..7103e805855 100644 --- a/src/lib/util/event.c +++ b/src/lib/util/event.c @@ -965,18 +965,16 @@ int fr_event_fd_insert(TALLOC_CTX *ctx, fr_event_list_t *el, int fd, /** Delete a timer event from the event list * - * @param[in] el to delete event from. * @param[in] ev_p of the event being deleted. * @return * - 0 on success. * - -1 on failure. */ -int fr_event_timer_delete(fr_event_list_t *el, fr_event_timer_t const **ev_p) +int fr_event_timer_delete(fr_event_timer_t const **ev_p) { fr_event_timer_t *ev; if (unlikely(!*ev_p)) return 0; - if (!fr_cond_assert((*ev_p)->el == el)) return -1; memcpy(&ev, ev_p, sizeof(ev)); return talloc_free(ev); @@ -1410,7 +1408,7 @@ int fr_event_timer_run(fr_event_list_t *el, fr_time_t *when) /* * Delete the event before calling it. */ - fr_event_timer_delete(el, ev->parent); + fr_event_timer_delete(ev->parent); callback(el, *when, uctx); @@ -1867,7 +1865,7 @@ static int _event_list_free(fr_event_list_t *el) { fr_event_timer_t const *ev; - while ((ev = fr_heap_peek(el->times)) != NULL) fr_event_timer_delete(el, &ev); + while ((ev = fr_heap_peek(el->times)) != NULL) fr_event_timer_delete(&ev); talloc_free_children(el); diff --git a/src/lib/util/event.h b/src/lib/util/event.h index 4876b5dbbb0..5d702fb2114 100644 --- a/src/lib/util/event.h +++ b/src/lib/util/event.h @@ -224,7 +224,7 @@ int fr_event_timer_at(TALLOC_CTX *ctx, fr_event_list_t *el, fr_event_timer_t co fr_time_t when, fr_event_timer_cb_t callback, void const *uctx); int fr_event_timer_in(TALLOC_CTX *ctx, fr_event_list_t *el, fr_event_timer_t const **ev, fr_time_delta_t delta, fr_event_timer_cb_t callback, void const *uctx); -int fr_event_timer_delete(fr_event_list_t *el, fr_event_timer_t const **ev); +int fr_event_timer_delete(fr_event_timer_t const **ev); int fr_event_timer_run(fr_event_list_t *el, fr_time_t *when); uintptr_t fr_event_user_insert(fr_event_list_t *el, fr_event_user_handler_t user, void *uctx) CC_HINT(nonnull(1,2)); diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c index 8dbb90ae1fe..74cf28448e8 100644 --- a/src/modules/proto_bfd/proto_bfd.c +++ b/src/modules/proto_bfd/proto_bfd.c @@ -917,7 +917,7 @@ static int bfd_start_packets(bfd_state_t *session) /* * Reset the timers. */ - fr_event_timer_delete(session->el, &session->ev_packet); + fr_event_timer_delete(&session->ev_packet); session->last_sent = fr_time(); @@ -956,7 +956,7 @@ static void bfd_set_timeout(bfd_state_t *session, fr_time_t when) { fr_time_t now = when; - fr_event_timer_delete(session->el, &session->ev_timeout); + fr_event_timer_delete(&session->ev_timeout); now += fr_time_delta_from_usec(session->detection_time); @@ -1003,8 +1003,8 @@ static int bfd_start_control(bfd_state_t *session) static int bfd_stop_control(bfd_state_t *session) { - fr_event_timer_delete(session->el, &session->ev_timeout); - fr_event_timer_delete(session->el, &session->ev_packet); + fr_event_timer_delete(&session->ev_timeout); + fr_event_timer_delete(&session->ev_packet); return 1; } diff --git a/src/modules/proto_detail/proto_detail_file.c b/src/modules/proto_detail/proto_detail_file.c index b6ce90653e9..50ca0f3411b 100644 --- a/src/modules/proto_detail/proto_detail_file.c +++ b/src/modules/proto_detail/proto_detail_file.c @@ -117,7 +117,7 @@ static void mod_vnode_extend(fr_listen_t *li, UNUSED uint32_t fflags) if (has_worker) return; - if (thread->ev) fr_event_timer_delete(thread->el, &thread->ev); + if (thread->ev) fr_event_timer_delete(&thread->ev); work_init(thread); } diff --git a/src/modules/proto_radius/proto_radius_load.c b/src/modules/proto_radius/proto_radius_load.c index 6335b495cf8..1671a9229ca 100644 --- a/src/modules/proto_radius/proto_radius_load.c +++ b/src/modules/proto_radius/proto_radius_load.c @@ -185,7 +185,7 @@ static ssize_t mod_write(fr_listen_t *li, UNUSED void *packet_ctx, fr_time_t req */ state = fr_load_generator_have_reply(thread->l, request_time); if (state == FR_LOAD_DONE) { - fr_event_timer_delete(thread->el, &thread->ev); + fr_event_timer_delete(&thread->ev); fr_exit_now(1); } diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c index 544131cfc4e..2fcad9c1bb7 100644 --- a/src/modules/rlm_radius/rlm_radius_udp.c +++ b/src/modules/rlm_radius/rlm_radius_udp.c @@ -1188,7 +1188,7 @@ static void status_check_reply(udp_request_t *u) if (u->num_replies < 3) return; - if (u->ev) (void) fr_event_timer_delete(h->c->el, &u->ev); + if (u->ev) (void) fr_event_timer_delete(&u->ev); DEBUG("Have enough replies to status check, marking connection as active - %s", h->name); fr_trunk_connection_signal_active(h->c->tconn); @@ -1292,7 +1292,7 @@ drain: (void) rr_track_delete(h->id, rr); u->rr = NULL; - if (u->ev) (void) fr_event_timer_delete(c->el, &u->ev); + if (u->ev) (void) fr_event_timer_delete(&u->ev); h->last_reply = fr_time(); code = h->buffer[0]; @@ -1465,7 +1465,7 @@ static void request_cancel(UNUSED fr_connection_t *conn, fr_trunk_request_t *tre if (u->packet) TALLOC_FREE(u->packet); - if (u->ev) (void) fr_event_timer_delete(h->c->el, &u->ev); + if (u->ev) (void) fr_event_timer_delete(&u->ev); u->rcode = RLM_MODULE_FAIL; u->h = NULL; @@ -1622,7 +1622,7 @@ static int udp_request_free(udp_request_t *u) */ if (!u->h) return 0; - if (u->ev) (void) fr_event_timer_delete(u->h->c->el, &u->ev); + if (u->ev) (void) fr_event_timer_delete(&u->ev); /* * The module is doing async proxying, we don't need to @@ -1635,7 +1635,7 @@ static int udp_request_free(udp_request_t *u) /* * Don't perform zombie checks on Status-Server */ - if (u == u->h->status_u) return NULL; + if (u == u->h->status_u) return 0; /* * The module is doing synchronous proxying. i.e. where diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c index 5b47e02f06c..5d79b2eee55 100644 --- a/src/modules/rlm_rest/io.c +++ b/src/modules/rlm_rest/io.c @@ -266,7 +266,7 @@ static int _rest_io_timer_modify(CURLM *mandle, long timeout_ms, void *ctx) } if (timeout_ms < 0) { - if (fr_event_timer_delete(t->el, &t->ev) < 0) { + if (fr_event_timer_delete(&t->ev) < 0) { PERROR("Failed deleting multi-handle timer"); return -1; } diff --git a/src/modules/rlm_unbound/io.c b/src/modules/rlm_unbound/io.c index 66d66b0f313..6810b243c73 100644 --- a/src/modules/rlm_unbound/io.c +++ b/src/modules/rlm_unbound/io.c @@ -230,7 +230,7 @@ static void _unbound_io_service_errored(UNUSED fr_event_list_t *el, * that it fired. This is imperfect but unbound * doesn't have a callback for receiving errors. */ - if (fr_event_timer_delete(ev->ev_b->el, &ev->timer) < 0) { + if (fr_event_timer_delete(&ev->timer) < 0) { PERROR("ubound event %p - Failed disarming timeout", ev); } @@ -345,7 +345,7 @@ static int _unbound_io_event_deactivate(struct ub_event *ub_ev) if (ev->events & UB_EV_TIMEOUT) { DEBUG4("unbound event %p - Disarming timeout", ev); - if (ev->timer && (fr_event_timer_delete(ev->ev_b->el, &ev->timer) < 0)) { + if (ev->timer && (fr_event_timer_delete(&ev->timer) < 0)) { PERROR("ubound event %p - Failed disarming timeout", ev); ret = -1; @@ -380,7 +380,7 @@ static int _unbound_io_timer_modify(struct ub_event *ub_ev, UNUSED struct ub_eve ev, uctx, ev->uctx); ev->uctx = uctx; } - if (ev->timer && (fr_event_timer_delete(ev->ev_b->el, &ev->timer) < 0)) { + if (ev->timer && (fr_event_timer_delete(&ev->timer) < 0)) { PERROR("ubound event %p - Failed disarming timeout", ev); ret = -1; /* Continue ? */ @@ -411,7 +411,7 @@ static int _unbound_io_timer_deactivate(struct ub_event *ub_ev) DEBUG4("unbound event %p - Disarming timeout", ev); - if (ev->timer && (fr_event_timer_delete(ev->ev_b->el, &ev->timer) < 0)) { + if (ev->timer && (fr_event_timer_delete(&ev->timer) < 0)) { PERROR("unbound event %p - Failed disarming timeout", ev); return -1;