]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Handle deprecation of CURLINFO_LASTSOCKET
authorNick Porter <nick@portercomputing.co.uk>
Tue, 17 Sep 2024 15:36:12 +0000 (16:36 +0100)
committerNick Porter <nick@portercomputing.co.uk>
Tue, 17 Sep 2024 15:36:12 +0000 (16:36 +0100)
src/modules/rlm_rest/rest.c

index 035f5578fe749c6c0ed4e046a02bafa4626f60f9..e7fb019c5dcbb7902ac44d748fbf90ce6a06d367 100644 (file)
@@ -480,10 +480,15 @@ int mod_conn_alive(void *instance, void *handle)
        rlm_rest_handle_t       *randle = handle;
        CURL                    *candle = randle->handle;
 
-       long last_socket;
        CURLcode ret;
 
-       ret = curl_easy_getinfo(candle, CURLINFO_LASTSOCKET, &last_socket);
+#if CURL_AT_LEAST_VERSION(7,45,0)
+       curl_socket_t   socket;
+       ret = curl_easy_getinfo(candle, CURLINFO_ACTIVESOCKET, &socket);
+#else
+       long    socket;
+       ret = curl_easy_getinfo(candle, CURLINFO_LASTSOCKET, &socket);
+#endif
        if (ret != CURLE_OK) {
                ERROR("rlm_rest (%s): Couldn't determine socket state: %i - %s", inst->xlat_name, ret,
                      curl_easy_strerror(ret));
@@ -491,7 +496,7 @@ int mod_conn_alive(void *instance, void *handle)
                return false;
        }
 
-       if (last_socket == -1) {
+       if (socket == -1) {
                return false;
        }