mirror of
https://github.com/curl/curl.git
synced 2026-05-14 16:26:20 +03:00
Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up tob12da22db1#18866 Follow-up todb98daab05#18844 Follow-up to4deea9396b#18814 Follow-up to9678ff5b1b#18776 Follow-up to10bac43b87#18774 Follow-up to20142f5d06#18634 Follow-up tobf7375ecc5#18503 Follow-up to9863599d69#18502 Follow-up to3bb5e58c10#17827 Closes #19626
268 lines
7.9 KiB
C
268 lines
7.9 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "first.h"
|
|
|
|
#include "testtrace.h"
|
|
|
|
static int tse_found_tls_session = FALSE;
|
|
|
|
static size_t write_tse_cb(char *ptr, size_t size, size_t nmemb, void *opaque)
|
|
{
|
|
CURL *curl = opaque;
|
|
(void)ptr;
|
|
if(!tse_found_tls_session) {
|
|
struct curl_tlssessioninfo *tlssession;
|
|
CURLcode rc;
|
|
|
|
rc = curl_easy_getinfo(curl, CURLINFO_TLS_SSL_PTR, &tlssession);
|
|
if(rc) {
|
|
curl_mfprintf(stderr, "curl_easy_getinfo(CURLINFO_TLS_SSL_PTR) "
|
|
"failed: %s\n", curl_easy_strerror(rc));
|
|
return rc;
|
|
}
|
|
if(tlssession->backend == CURLSSLBACKEND_NONE) {
|
|
curl_mfprintf(stderr, "curl_easy_getinfo(CURLINFO_TLS_SSL_PTR) "
|
|
"gave no backend\n");
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
if(!tlssession->internals) {
|
|
curl_mfprintf(stderr, "curl_easy_getinfo(CURLINFO_TLS_SSL_PTR) "
|
|
"missing\n");
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
tse_found_tls_session = TRUE;
|
|
}
|
|
return size * nmemb;
|
|
}
|
|
|
|
static CURL *tse_add_transfer(CURLM *multi, CURLSH *share,
|
|
struct curl_slist *resolve,
|
|
const char *url, long http_version)
|
|
{
|
|
CURL *curl;
|
|
CURLMcode mc;
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init failed\n");
|
|
return NULL;
|
|
}
|
|
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, cli_debug_cb);
|
|
curl_easy_setopt(curl, CURLOPT_URL, url);
|
|
curl_easy_setopt(curl, CURLOPT_SHARE, share);
|
|
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_AUTOREFERER, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, http_version);
|
|
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_tse_cb);
|
|
curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl);
|
|
curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
|
|
if(resolve)
|
|
curl_easy_setopt(curl, CURLOPT_RESOLVE, resolve);
|
|
|
|
|
|
mc = curl_multi_add_handle(multi, curl);
|
|
if(mc != CURLM_OK) {
|
|
curl_mfprintf(stderr, "curl_multi_add_handle: %s\n",
|
|
curl_multi_strerror(mc));
|
|
curl_easy_cleanup(curl);
|
|
return NULL;
|
|
}
|
|
return curl;
|
|
}
|
|
|
|
static CURLcode test_cli_tls_session_reuse(const char *URL)
|
|
{
|
|
CURLM *multi = NULL;
|
|
CURLMcode mc;
|
|
int running_handles = 0, numfds;
|
|
CURLMsg *msg;
|
|
CURLSH *share = NULL;
|
|
CURLU *cu;
|
|
struct curl_slist *resolve = NULL;
|
|
char resolve_buf[1024];
|
|
int msgs_in_queue;
|
|
int add_more, waits, ongoing = 0;
|
|
char *host = NULL, *port = NULL;
|
|
long http_version = CURL_HTTP_VERSION_1_1;
|
|
CURLcode res = (CURLcode)1;
|
|
|
|
if(!URL || !libtest_arg2) {
|
|
curl_mfprintf(stderr, "need args: URL proto\n");
|
|
return (CURLcode)2;
|
|
}
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
return (CURLcode)3;
|
|
}
|
|
|
|
if(!strcmp("h2", libtest_arg2))
|
|
http_version = CURL_HTTP_VERSION_2;
|
|
else if(!strcmp("h3", libtest_arg2))
|
|
http_version = CURL_HTTP_VERSION_3ONLY;
|
|
|
|
cu = curl_url();
|
|
if(!cu) {
|
|
curl_mfprintf(stderr, "out of memory\n");
|
|
res = (CURLcode)1;
|
|
goto cleanup;
|
|
}
|
|
if(curl_url_set(cu, CURLUPART_URL, URL, 0)) {
|
|
curl_mfprintf(stderr, "not a URL: '%s'\n", URL);
|
|
goto cleanup;
|
|
}
|
|
if(curl_url_get(cu, CURLUPART_HOST, &host, 0)) {
|
|
curl_mfprintf(stderr, "could not get host of '%s'\n", URL);
|
|
goto cleanup;
|
|
}
|
|
if(curl_url_get(cu, CURLUPART_PORT, &port, 0)) {
|
|
curl_mfprintf(stderr, "could not get port of '%s'\n", URL);
|
|
goto cleanup;
|
|
}
|
|
|
|
curl_msnprintf(resolve_buf, sizeof(resolve_buf)-1, "%s:%s:127.0.0.1",
|
|
host, port);
|
|
resolve = curl_slist_append(resolve, resolve_buf);
|
|
|
|
multi = curl_multi_init();
|
|
if(!multi) {
|
|
curl_mfprintf(stderr, "curl_multi_init failed\n");
|
|
goto cleanup;
|
|
}
|
|
|
|
share = curl_share_init();
|
|
if(!share) {
|
|
curl_mfprintf(stderr, "curl_share_init failed\n");
|
|
goto cleanup;
|
|
}
|
|
curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
|
|
|
|
|
|
if(!tse_add_transfer(multi, share, resolve, URL, http_version))
|
|
goto cleanup;
|
|
++ongoing;
|
|
add_more = 6;
|
|
waits = 3;
|
|
do {
|
|
mc = curl_multi_perform(multi, &running_handles);
|
|
if(mc != CURLM_OK) {
|
|
curl_mfprintf(stderr, "curl_multi_perform: %s\n",
|
|
curl_multi_strerror(mc));
|
|
goto cleanup;
|
|
}
|
|
|
|
if(running_handles) {
|
|
mc = curl_multi_poll(multi, NULL, 0, 1000000, &numfds);
|
|
if(mc != CURLM_OK) {
|
|
curl_mfprintf(stderr, "curl_multi_poll: %s\n",
|
|
curl_multi_strerror(mc));
|
|
goto cleanup;
|
|
}
|
|
}
|
|
|
|
if(waits) {
|
|
--waits;
|
|
}
|
|
else {
|
|
while(add_more) {
|
|
if(!tse_add_transfer(multi, share, resolve, URL, http_version))
|
|
goto cleanup;
|
|
++ongoing;
|
|
--add_more;
|
|
}
|
|
}
|
|
|
|
/* Check for finished handles and remove. */
|
|
/* !checksrc! disable EQUALSNULL 1 */
|
|
while((msg = curl_multi_info_read(multi, &msgs_in_queue)) != NULL) {
|
|
if(msg->msg == CURLMSG_DONE) {
|
|
long status = 0;
|
|
curl_off_t xfer_id;
|
|
curl_easy_getinfo(msg->easy_handle, CURLINFO_XFER_ID, &xfer_id);
|
|
curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &status);
|
|
if(msg->data.result == CURLE_SEND_ERROR ||
|
|
msg->data.result == CURLE_RECV_ERROR) {
|
|
/* We get these if the server had a GOAWAY in transit on
|
|
* reusing a connection */
|
|
}
|
|
else if(msg->data.result) {
|
|
curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T
|
|
": failed with %d\n", xfer_id, msg->data.result);
|
|
goto cleanup;
|
|
}
|
|
else if(status != 200) {
|
|
curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T
|
|
": wrong http status %ld (expected 200)\n", xfer_id,
|
|
status);
|
|
goto cleanup;
|
|
}
|
|
curl_multi_remove_handle(multi, msg->easy_handle);
|
|
curl_easy_cleanup(msg->easy_handle);
|
|
--ongoing;
|
|
curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T" retiring "
|
|
"(%d now running)\n", xfer_id, running_handles);
|
|
}
|
|
}
|
|
|
|
curl_mfprintf(stderr, "running_handles=%d, yet_to_start=%d\n",
|
|
running_handles, add_more);
|
|
|
|
} while(ongoing || add_more);
|
|
|
|
if(!tse_found_tls_session) {
|
|
curl_mfprintf(stderr, "CURLINFO_TLS_SSL_PTR not found during run\n");
|
|
res = CURLE_FAILED_INIT;
|
|
goto cleanup;
|
|
}
|
|
|
|
curl_mfprintf(stderr, "exiting\n");
|
|
res = CURLE_OK;
|
|
|
|
cleanup:
|
|
|
|
if(multi) {
|
|
CURL **list = curl_multi_get_handles(multi);
|
|
if(list) {
|
|
int i;
|
|
for(i = 0; list[i]; i++) {
|
|
curl_multi_remove_handle(multi, list[i]);
|
|
curl_easy_cleanup(list[i]);
|
|
}
|
|
curl_free(list);
|
|
}
|
|
curl_multi_cleanup(multi);
|
|
}
|
|
curl_share_cleanup(share);
|
|
curl_slist_free_all(resolve);
|
|
curl_free(host);
|
|
curl_free(port);
|
|
if(cu)
|
|
curl_url_cleanup(cu);
|
|
curl_global_cleanup();
|
|
|
|
return res;
|
|
}
|