mirror of
https://github.com/curl/curl.git
synced 2026-06-22 15:45:38 +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
408 lines
13 KiB
C
408 lines
13 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 "unitcheck.h"
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_NETINET_IN6_H
|
|
#include <netinet/in6.h>
|
|
#endif
|
|
#ifdef HAVE_NETDB_H
|
|
#include <netdb.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
#ifdef __VMS
|
|
#include <in.h>
|
|
#include <inet.h>
|
|
#endif
|
|
|
|
#include "urldata.h"
|
|
#include "connect.h"
|
|
#include "cfilters.h"
|
|
#include "cf-ip-happy.h"
|
|
#include "multiif.h"
|
|
#include "select.h"
|
|
#include "curl_trc.h"
|
|
|
|
static CURLcode t2600_setup(CURL **easy)
|
|
{
|
|
CURLcode res = CURLE_OK;
|
|
|
|
global_init(CURL_GLOBAL_ALL);
|
|
*easy = curl_easy_init();
|
|
if(!*easy) {
|
|
curl_global_cleanup();
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
curl_global_trace("all");
|
|
curl_easy_setopt(*easy, CURLOPT_VERBOSE, 1L);
|
|
return res;
|
|
}
|
|
|
|
static void t2600_stop(CURL *easy)
|
|
{
|
|
curl_easy_cleanup(easy);
|
|
curl_global_cleanup();
|
|
}
|
|
|
|
struct test_case {
|
|
int id;
|
|
const char *url;
|
|
const char *resolve_info;
|
|
long ip_version;
|
|
timediff_t connect_timeout_ms;
|
|
timediff_t he_timeout_ms;
|
|
timediff_t cf4_fail_delay_ms;
|
|
timediff_t cf6_fail_delay_ms;
|
|
|
|
int exp_cf4_creations;
|
|
int exp_cf6_creations;
|
|
timediff_t min_duration_ms;
|
|
timediff_t max_duration_ms;
|
|
CURLcode exp_res;
|
|
const char *pref_family;
|
|
};
|
|
|
|
struct ai_family_stats {
|
|
const char *family;
|
|
int creations;
|
|
timediff_t first_created;
|
|
timediff_t last_created;
|
|
};
|
|
|
|
struct test_result {
|
|
CURLcode res;
|
|
struct curltime started;
|
|
struct curltime ended;
|
|
struct ai_family_stats cf4;
|
|
struct ai_family_stats cf6;
|
|
};
|
|
|
|
static const struct test_case *current_tc;
|
|
static struct test_result *current_tr;
|
|
static int test_idx;
|
|
|
|
struct cf_test_ctx {
|
|
int idx;
|
|
int ai_family;
|
|
uint8_t transport;
|
|
char id[16];
|
|
struct curltime started;
|
|
timediff_t fail_delay_ms;
|
|
struct ai_family_stats *stats;
|
|
};
|
|
|
|
static void cf_test_destroy(struct Curl_cfilter *cf, struct Curl_easy *data)
|
|
{
|
|
struct cf_test_ctx *ctx = cf->ctx;
|
|
#ifndef CURL_DISABLE_VERBOSE_STRINGS
|
|
infof(data, "%04dms: cf[%s] destroyed",
|
|
(int)curlx_timediff_ms(curlx_now(), current_tr->started), ctx->id);
|
|
#else
|
|
(void)data;
|
|
#endif
|
|
curlx_free(ctx);
|
|
cf->ctx = NULL;
|
|
}
|
|
|
|
static CURLcode cf_test_connect(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
bool *done)
|
|
{
|
|
struct cf_test_ctx *ctx = cf->ctx;
|
|
timediff_t duration_ms;
|
|
|
|
(void)data;
|
|
*done = FALSE;
|
|
duration_ms = curlx_timediff_ms(curlx_now(), ctx->started);
|
|
if(duration_ms >= ctx->fail_delay_ms) {
|
|
infof(data, "%04dms: cf[%s] fail delay reached",
|
|
(int)duration_ms, ctx->id);
|
|
return CURLE_COULDNT_CONNECT;
|
|
}
|
|
if(duration_ms) {
|
|
infof(data, "%04dms: cf[%s] continuing", (int)duration_ms, ctx->id);
|
|
curlx_wait_ms(10);
|
|
}
|
|
Curl_expire(data, ctx->fail_delay_ms - duration_ms, EXPIRE_TIMEOUT);
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode cf_test_adjust_pollset(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
struct easy_pollset *ps)
|
|
{
|
|
struct cf_test_ctx *ctx = cf->ctx;
|
|
/* just for testing, give one socket with events back */
|
|
return Curl_pollset_set(data, ps, ctx->idx, TRUE, TRUE);
|
|
}
|
|
|
|
static CURLcode cf_test_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
const struct Curl_addrinfo *ai,
|
|
uint8_t transport)
|
|
{
|
|
static const struct Curl_cftype cft_test = {
|
|
"TEST",
|
|
CF_TYPE_IP_CONNECT,
|
|
CURL_LOG_LVL_NONE,
|
|
cf_test_destroy,
|
|
cf_test_connect,
|
|
Curl_cf_def_close,
|
|
Curl_cf_def_shutdown,
|
|
cf_test_adjust_pollset,
|
|
Curl_cf_def_data_pending,
|
|
Curl_cf_def_send,
|
|
Curl_cf_def_recv,
|
|
Curl_cf_def_cntrl,
|
|
Curl_cf_def_conn_is_alive,
|
|
Curl_cf_def_conn_keep_alive,
|
|
Curl_cf_def_query,
|
|
};
|
|
|
|
struct cf_test_ctx *ctx = NULL;
|
|
struct Curl_cfilter *cf = NULL;
|
|
timediff_t created_at;
|
|
CURLcode res;
|
|
|
|
(void)data;
|
|
(void)conn;
|
|
ctx = curlx_calloc(1, sizeof(*ctx));
|
|
if(!ctx) {
|
|
res = CURLE_OUT_OF_MEMORY;
|
|
goto out;
|
|
}
|
|
ctx->idx = test_idx++;
|
|
ctx->ai_family = ai->ai_family;
|
|
ctx->transport = transport;
|
|
ctx->started = curlx_now();
|
|
#ifdef USE_IPV6
|
|
if(ctx->ai_family == AF_INET6) {
|
|
ctx->stats = ¤t_tr->cf6;
|
|
ctx->fail_delay_ms = current_tc->cf6_fail_delay_ms;
|
|
curl_msprintf(ctx->id, "v6-%d", ctx->stats->creations);
|
|
ctx->stats->creations++;
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
ctx->stats = ¤t_tr->cf4;
|
|
ctx->fail_delay_ms = current_tc->cf4_fail_delay_ms;
|
|
curl_msprintf(ctx->id, "v4-%d", ctx->stats->creations);
|
|
ctx->stats->creations++;
|
|
}
|
|
|
|
created_at = curlx_timediff_ms(ctx->started, current_tr->started);
|
|
if(ctx->stats->creations == 1)
|
|
ctx->stats->first_created = created_at;
|
|
ctx->stats->last_created = created_at;
|
|
infof(data, "%04dms: cf[%s] created", (int)created_at, ctx->id);
|
|
|
|
res = Curl_cf_create(&cf, &cft_test, ctx);
|
|
if(res)
|
|
goto out;
|
|
|
|
Curl_expire(data, ctx->fail_delay_ms, EXPIRE_TIMEOUT);
|
|
|
|
out:
|
|
*pcf = (!res) ? cf : NULL;
|
|
if(res) {
|
|
curlx_free(cf);
|
|
curlx_free(ctx);
|
|
}
|
|
return res;
|
|
}
|
|
|
|
static void check_result(const struct test_case *tc,
|
|
struct test_result *tr)
|
|
{
|
|
char msg[256];
|
|
timediff_t duration_ms;
|
|
|
|
duration_ms = curlx_timediff_ms(tr->ended, tr->started);
|
|
curl_mfprintf(stderr, "%d: test case took %dms\n", tc->id, (int)duration_ms);
|
|
|
|
if(tr->res != tc->exp_res
|
|
&& CURLE_OPERATION_TIMEDOUT != tr->res) {
|
|
/* on CI we encounter the TIMEOUT result, since images get less CPU
|
|
* and events are not as sharply timed. */
|
|
curl_msprintf(msg, "%d: expected result %d but got %d",
|
|
tc->id, tc->exp_res, tr->res);
|
|
fail(msg);
|
|
}
|
|
if(tr->cf4.creations != tc->exp_cf4_creations) {
|
|
curl_msprintf(msg, "%d: expected %d ipv4 creations, but got %d",
|
|
tc->id, tc->exp_cf4_creations, tr->cf4.creations);
|
|
fail(msg);
|
|
}
|
|
if(tr->cf6.creations != tc->exp_cf6_creations) {
|
|
curl_msprintf(msg, "%d: expected %d ipv6 creations, but got %d",
|
|
tc->id, tc->exp_cf6_creations, tr->cf6.creations);
|
|
fail(msg);
|
|
}
|
|
|
|
duration_ms = curlx_timediff_ms(tr->ended, tr->started);
|
|
if(duration_ms < tc->min_duration_ms) {
|
|
curl_msprintf(msg, "%d: expected min duration of %dms, but took %dms",
|
|
tc->id, (int)tc->min_duration_ms, (int)duration_ms);
|
|
fail(msg);
|
|
}
|
|
if(duration_ms > tc->max_duration_ms) {
|
|
curl_msprintf(msg, "%d: expected max duration of %dms, but took %dms",
|
|
tc->id, (int)tc->max_duration_ms, (int)duration_ms);
|
|
fail(msg);
|
|
}
|
|
if(tr->cf6.creations && tr->cf4.creations && tc->pref_family) {
|
|
/* did ipv4 and ipv6 both, expect the preferred family to start right arway
|
|
* with the other being delayed by the happy_eyeball_timeout */
|
|
struct ai_family_stats *stats1 = !strcmp(tc->pref_family, "v6") ?
|
|
&tr->cf6 : &tr->cf4;
|
|
struct ai_family_stats *stats2 = !strcmp(tc->pref_family, "v6") ?
|
|
&tr->cf4 : &tr->cf6;
|
|
|
|
if(stats1->first_created > 100) {
|
|
curl_msprintf(msg, "%d: expected ip%s to start right away, instead "
|
|
"first attempt made after %dms",
|
|
tc->id, stats1->family, (int)stats1->first_created);
|
|
fail(msg);
|
|
}
|
|
if(stats2->first_created < tc->he_timeout_ms) {
|
|
curl_msprintf(msg, "%d: expected ip%s to start delayed after %dms, "
|
|
"instead first attempt made after %dms",
|
|
tc->id, stats2->family, (int)tc->he_timeout_ms,
|
|
(int)stats2->first_created);
|
|
fail(msg);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void test_connect(CURL *easy, const struct test_case *tc)
|
|
{
|
|
struct test_result tr;
|
|
struct curl_slist *list = NULL;
|
|
|
|
Curl_debug_set_transport_provider(TRNSPRT_TCP, cf_test_create);
|
|
current_tc = tc;
|
|
current_tr = &tr;
|
|
|
|
list = curl_slist_append(NULL, tc->resolve_info);
|
|
fail_unless(list, "error allocating resolve list entry");
|
|
curl_easy_setopt(easy, CURLOPT_RESOLVE, list);
|
|
curl_easy_setopt(easy, CURLOPT_IPRESOLVE, tc->ip_version);
|
|
curl_easy_setopt(easy, CURLOPT_CONNECTTIMEOUT_MS,
|
|
(long)tc->connect_timeout_ms);
|
|
curl_easy_setopt(easy, CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS,
|
|
(long)tc->he_timeout_ms);
|
|
|
|
curl_easy_setopt(easy, CURLOPT_URL, tc->url);
|
|
memset(&tr, 0, sizeof(tr));
|
|
tr.cf6.family = "v6";
|
|
tr.cf4.family = "v4";
|
|
|
|
tr.started = curlx_now();
|
|
tr.res = curl_easy_perform(easy);
|
|
tr.ended = curlx_now();
|
|
|
|
curl_easy_setopt(easy, CURLOPT_RESOLVE, NULL);
|
|
curl_slist_free_all(list);
|
|
list = NULL;
|
|
current_tc = NULL;
|
|
current_tr = NULL;
|
|
|
|
check_result(tc, &tr);
|
|
}
|
|
|
|
/*
|
|
* How these test cases work:
|
|
* - replace the creation of the TCP socket filter with our test filter
|
|
* - test filter does nothing and reports failure after configured delay
|
|
* - we feed addresses into the resolve cache to simulate different cases
|
|
* - we monitor how many instances of ipv4/v6 attempts are made and when
|
|
* - for mixed families, we expect HAPPY_EYEBALLS_TIMEOUT to trigger
|
|
*
|
|
* Max Duration checks needs to be conservative since CI jobs are not
|
|
* as sharp.
|
|
*/
|
|
#define TURL "http://test.com:123"
|
|
|
|
#define R_FAIL CURLE_COULDNT_CONNECT
|
|
/* timeout values accounting for low cpu resources in CI */
|
|
#define TC_TMOT 90000 /* 90 sec max test duration */
|
|
#define CNCT_TMOT 60000 /* 60sec connect timeout */
|
|
|
|
static CURLcode test_unit2600(const char *arg)
|
|
{
|
|
CURL *easy;
|
|
|
|
UNITTEST_BEGIN(t2600_setup(&easy))
|
|
|
|
static const struct test_case TEST_CASES[] = {
|
|
/* TIMEOUT_MS, FAIL_MS CREATED DURATION Result, HE_PREF */
|
|
/* CNCT HE v4 v6 v4 v6 MIN MAX */
|
|
{ 1, TURL, "test.com:123:192.0.2.1", CURL_IPRESOLVE_WHATEVER,
|
|
CNCT_TMOT, 150, 250, 250, 1, 0, 200, TC_TMOT, R_FAIL, NULL },
|
|
/* 1 ipv4, fails after ~200ms, reports COULDNT_CONNECT */
|
|
{ 2, TURL, "test.com:123:192.0.2.1,192.0.2.2", CURL_IPRESOLVE_WHATEVER,
|
|
CNCT_TMOT, 150, 250, 250, 2, 0, 400, TC_TMOT, R_FAIL, NULL },
|
|
/* 2 ipv4, fails after ~400ms, reports COULDNT_CONNECT */
|
|
#ifdef USE_IPV6
|
|
{ 3, TURL, "test.com:123:::1", CURL_IPRESOLVE_WHATEVER,
|
|
CNCT_TMOT, 150, 250, 250, 0, 1, 200, TC_TMOT, R_FAIL, NULL },
|
|
/* 1 ipv6, fails after ~200ms, reports COULDNT_CONNECT */
|
|
{ 4, TURL, "test.com:123:::1,::2", CURL_IPRESOLVE_WHATEVER,
|
|
CNCT_TMOT, 150, 250, 250, 0, 2, 400, TC_TMOT, R_FAIL, NULL },
|
|
/* 2 ipv6, fails after ~400ms, reports COULDNT_CONNECT */
|
|
{ 5, TURL, "test.com:123:192.0.2.1,::1", CURL_IPRESOLVE_WHATEVER,
|
|
CNCT_TMOT, 150, 250, 250, 1, 1, 350, TC_TMOT, R_FAIL, "v6" },
|
|
/* mixed ip4+6, v6 always first, v4 kicks in on HE, fails after ~350ms */
|
|
{ 6, TURL, "test.com:123:::1,192.0.2.1", CURL_IPRESOLVE_WHATEVER,
|
|
CNCT_TMOT, 150, 250, 250, 1, 1, 350, TC_TMOT, R_FAIL, "v6" },
|
|
/* mixed ip6+4, v6 starts, v4 never starts due to high HE, TIMEOUT */
|
|
{ 7, TURL, "test.com:123:192.0.2.1,::1", CURL_IPRESOLVE_V4,
|
|
CNCT_TMOT, 150, 500, 500, 1, 0, 400, TC_TMOT, R_FAIL, NULL },
|
|
/* mixed ip4+6, but only use v4, check it uses full connect timeout,
|
|
although another address of the 'wrong' family is available */
|
|
{ 8, TURL, "test.com:123:::1,192.0.2.1", CURL_IPRESOLVE_V6,
|
|
CNCT_TMOT, 150, 500, 500, 0, 1, 400, TC_TMOT, R_FAIL, NULL },
|
|
/* mixed ip4+6, but only use v6, check it uses full connect timeout,
|
|
although another address of the 'wrong' family is available */
|
|
{ 9, TURL, "test.com:123:::1,192.0.2.1,::2,::3", CURL_IPRESOLVE_WHATEVER,
|
|
CNCT_TMOT, 50, 400, 400, 1, 3, 550, TC_TMOT, R_FAIL, NULL },
|
|
/* 1 v4, 3 v6, fails after (3*HE)+400ms, ~550ms, COULDNT_CONNECT */
|
|
|
|
#endif
|
|
};
|
|
|
|
size_t i;
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(TEST_CASES); ++i) {
|
|
test_connect(easy, &TEST_CASES[i]);
|
|
}
|
|
|
|
UNITTEST_END(t2600_stop(easy))
|
|
}
|