From: Alan T. DeKok Date: Tue, 25 Sep 2018 22:11:58 +0000 (-0400) Subject: parent things from the parent structure X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec816d773d400a31069966ddc147cd21f17bad77;p=thirdparty%2Ffreeradius-server.git parent things from the parent structure --- diff --git a/src/lib/io/master.c b/src/lib/io/master.c index eb6fd9bb79a..d0712b79cb9 100644 --- a/src/lib/io/master.c +++ b/src/lib/io/master.c @@ -2288,7 +2288,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti * */ if (!live->pending_clients) { - MEM(live->pending_clients = fr_heap_create(inst->ctx, pending_client_cmp, + MEM(live->pending_clients = fr_heap_create(live, pending_client_cmp, fr_io_client_t, pending_id)); } @@ -2649,10 +2649,10 @@ int fr_master_io_listen(TALLOC_CTX *ctx, fr_io_instance_t *inst, fr_schedule_t * /* * Create the trie of clients for this socket. */ - MEM(live->trie = fr_trie_alloc(inst->ctx)); + MEM(live->trie = fr_trie_alloc(live)); - MEM(live->alive_clients = fr_heap_create(inst->ctx, pending_client_cmp, - fr_io_client_t, alive_id)); + MEM(live->alive_clients = fr_heap_create(live, pending_client_cmp, + fr_io_client_t, alive_id)); talloc_set_destructor(live->alive_clients, _client_heap_free); /*