]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Use timeout setting from the connection configuration
authorNick Porter <nick@portercomputing.co.uk>
Thu, 2 Feb 2023 10:17:03 +0000 (10:17 +0000)
committerNick Porter <nick@portercomputing.co.uk>
Wed, 15 Feb 2023 16:11:34 +0000 (16:11 +0000)
src/modules/rlm_rest/rest.c

index 4a1e1f93bf2a1125cdadfafb2c6f25142d21fed5..5c98fe61c5e665dc96e6b05fe03074c4d26d0d6e 100644 (file)
@@ -1729,7 +1729,6 @@ int rest_request_config(module_ctx_t const *mctx, rlm_rest_section_t const *sect
                        char const *uri, char const *username, char const *password)
 {
        rlm_rest_t const        *inst = talloc_get_type_abort(mctx->inst->data, rlm_rest_t);
-       rlm_rest_thread_t const *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t);
        rlm_rest_curl_context_t *ctx = talloc_get_type_abort(randle->uctx, rlm_rest_curl_context_t);
        CURL                    *candle = randle->candle;
        fr_time_delta_t         timeout;
@@ -1771,7 +1770,7 @@ int rest_request_config(module_ctx_t const *mctx, rlm_rest_section_t const *sect
        FR_CURL_REQUEST_SET_OPTION(CURLOPT_NOSIGNAL, 1L);
        FR_CURL_REQUEST_SET_OPTION(CURLOPT_USERAGENT, "FreeRADIUS " RADIUSD_VERSION_STRING);
 
-       timeout = fr_pool_timeout(t->pool);
+       timeout = inst->conn_config.connect_timeout;
        RDEBUG3("Connect timeout is %pVs, request timeout is %pVs",
                fr_box_time_delta(timeout), fr_box_time_delta(section->timeout));
        FR_CURL_REQUEST_SET_OPTION(CURLOPT_CONNECTTIMEOUT_MS, fr_time_delta_to_msec(timeout));