mirror of
https://github.com/curl/curl.git
synced 2026-04-14 13:01:42 +08:00
Before this patch, standard `E*` errno codes were redefined on Windows,
onto matching winsock2 `WSA*` error codes, which have different values.
This broke uses where using the `E*` value in non-socket context, or
other places expecting a POSIX `errno`, e.g. file I/O, threads, IDN or
interfacing with dependencies.
Fix it by introducing a curl-specific `SOCKE*` set of macros that map to
`WSA*` on Windows and standard POSIX codes on other platforms. Then
verify and update the code to use `SOCKE*` or `E*` macro depending on
context.
- Add `SOCKE*` macros that map to either winsock2 or POSIX error codes.
And use them with `SOCKERRNO` or in contexts requiring
platform-dependent socket error codes.
This fixes `E*` uses which were supposed be POSIX values, not `WSA*`
socket errors, on Windows:
- lib/curl_multibyte.c
- lib/curl_threads.c
- lib/idn.c
- lib/vtls/gtls.c
- lib/vtls/rustls.c
- src/tool_cb_wrt.c
- src/tool_dirhie.c
- Ban `E*` codes having a `SOCKE*` mapping, via checksrc.
Authored-by: Daniel Stenberg
- Add exceptions for `E*` codes used in file I/O, or other contexts
requiring POSIX error codes.
Also:
- ftp: fix missing `SOCKEACCES` mapping for Windows.
- add `SOCKENOMEM` for `Curl_getaddrinfo()` via `asyn-thread.c`.
- tests/server/sockfilt: fix to set `SOCKERRNO` in local `select()`
override on Windows.
- lib/inet_ntop: fix to return `WSAEINVAL` on Windows, where `ENOSPC` is
used on other platforms. To simulate Windows' built-in `inet_ntop()`,
as tested on a Win10 machine.
Note:
- WINE returns `STATUS_INVALID_PARAMETER` = `0xC000000D`.
- Microsoft documentation says it returns `WSA_INVALID_PARAMETER`
(= `ERROR_INVALID_PARAMETER`) 87:
https://learn.microsoft.com/windows/win32/api/ws2tcpip/nf-ws2tcpip-inet_ntop#return-value
- lib/inet_ntop: drop redundant `CURL_SETERRNO(ENOSPC)`.
`inet_ntop4()` already sets it before returning `NULL`.
- replace stray `WSAEWOULDBLOCK` with `USE_WINSOCK` macro to detect
winsock2.
- move existing `SOCKE*` mappings from `tests/server` to
`curl_setup_once.h`.
- add missing `EINTR`, `EINVAL` constants for WinCE.
Follow-up to abf80aae38 #16612
Follow-up to d69425ed7d #16615
Bug: https://github.com/curl/curl/pull/16553#issuecomment-2704679377
Closes #16621
224 lines
5.3 KiB
C
224 lines
5.3 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 "test.h"
|
|
#include "first.h"
|
|
|
|
#ifdef HAVE_LOCALE_H
|
|
# include <locale.h> /* for setlocale() */
|
|
#endif
|
|
|
|
#ifdef CURLDEBUG
|
|
# define MEMDEBUG_NODEFINES
|
|
# include "memdebug.h"
|
|
#endif
|
|
|
|
#include "timediff.h"
|
|
|
|
#include "tool_binmode.h"
|
|
|
|
int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc,
|
|
struct timeval *tv)
|
|
{
|
|
if(nfds < 0) {
|
|
SET_SOCKERRNO(SOCKEINVAL);
|
|
return -1;
|
|
}
|
|
#ifdef USE_WINSOCK
|
|
/*
|
|
* Winsock select() requires that at least one of the three fd_set
|
|
* pointers is not NULL and points to a non-empty fdset. IOW Winsock
|
|
* select() can not be used to sleep without a single fd_set.
|
|
*/
|
|
if(!nfds) {
|
|
Sleep((DWORD)curlx_tvtoms(tv));
|
|
return 0;
|
|
}
|
|
#endif
|
|
return select(nfds, rd, wr, exc, tv);
|
|
}
|
|
|
|
void wait_ms(int ms)
|
|
{
|
|
if(ms < 0)
|
|
return;
|
|
#ifdef USE_WINSOCK
|
|
Sleep((DWORD)ms);
|
|
#else
|
|
{
|
|
struct timeval t;
|
|
curlx_mstotv(&t, ms);
|
|
select_wrapper(0, NULL, NULL, NULL, &t);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
char *libtest_arg2 = NULL;
|
|
char *libtest_arg3 = NULL;
|
|
char *libtest_arg4 = NULL;
|
|
int test_argc;
|
|
char **test_argv;
|
|
|
|
struct timeval tv_test_start; /* for test timing */
|
|
|
|
int unitfail; /* for unittests */
|
|
|
|
#ifdef CURLDEBUG
|
|
static void memory_tracking_init(void)
|
|
{
|
|
char *env;
|
|
/* if CURL_MEMDEBUG is set, this starts memory tracking message logging */
|
|
env = curl_getenv("CURL_MEMDEBUG");
|
|
if(env) {
|
|
/* use the value as file name */
|
|
char fname[CURL_MT_LOGFNAME_BUFSIZE];
|
|
if(strlen(env) >= CURL_MT_LOGFNAME_BUFSIZE)
|
|
env[CURL_MT_LOGFNAME_BUFSIZE-1] = '\0';
|
|
strcpy(fname, env);
|
|
curl_free(env);
|
|
curl_dbg_memdebug(fname);
|
|
/* this weird stuff here is to make curl_free() get called before
|
|
curl_dbg_memdebug() as otherwise memory tracking will log a free()
|
|
without an alloc! */
|
|
}
|
|
/* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */
|
|
env = curl_getenv("CURL_MEMLIMIT");
|
|
if(env) {
|
|
char *endptr;
|
|
long num = strtol(env, &endptr, 10);
|
|
if((endptr != env) && (endptr == env + strlen(env)) && (num > 0))
|
|
curl_dbg_memlimit(num);
|
|
curl_free(env);
|
|
}
|
|
}
|
|
#else
|
|
# define memory_tracking_init() Curl_nop_stmt
|
|
#endif
|
|
|
|
/* returns a hexdump in a static memory area */
|
|
char *hexdump(const unsigned char *buf, size_t len)
|
|
{
|
|
static char dump[200 * 3 + 1];
|
|
char *p = dump;
|
|
size_t i;
|
|
if(len > 200)
|
|
return NULL;
|
|
for(i = 0; i < len; i++, p += 3)
|
|
msnprintf(p, 4, "%02x ", buf[i]);
|
|
return dump;
|
|
}
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
char *URL;
|
|
CURLcode result;
|
|
int basearg;
|
|
test_func_t test_func;
|
|
|
|
CURL_SET_BINMODE(stdout);
|
|
|
|
memory_tracking_init();
|
|
|
|
/*
|
|
* Setup proper locale from environment. This is needed to enable locale-
|
|
* specific behavior by the C library in order to test for undesired side
|
|
* effects that could cause in libcurl.
|
|
*/
|
|
#ifdef HAVE_SETLOCALE
|
|
setlocale(LC_ALL, "");
|
|
#endif
|
|
|
|
test_argc = argc;
|
|
test_argv = argv;
|
|
|
|
#ifdef CURLTESTS_BUNDLED
|
|
{
|
|
char *test_name;
|
|
|
|
--test_argc;
|
|
++test_argv;
|
|
|
|
basearg = 2;
|
|
|
|
if(argc < (basearg + 1)) {
|
|
fprintf(stderr, "Pass testname and URL as arguments please\n");
|
|
return 1;
|
|
}
|
|
|
|
test_name = argv[basearg - 1];
|
|
test_func = NULL;
|
|
{
|
|
size_t tmp;
|
|
for(tmp = 0; tmp < CURL_ARRAYSIZE(s_tests); ++tmp) {
|
|
if(strcmp(test_name, s_tests[tmp].name) == 0) {
|
|
test_func = s_tests[tmp].ptr;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if(!test_func) {
|
|
fprintf(stderr, "Test '%s' not found.\n", test_name);
|
|
return 1;
|
|
}
|
|
|
|
fprintf(stderr, "Test: %s\n", test_name);
|
|
}
|
|
#else
|
|
basearg = 1;
|
|
|
|
if(argc < (basearg + 1)) {
|
|
fprintf(stderr, "Pass URL as argument please\n");
|
|
return 1;
|
|
}
|
|
|
|
test_func = test;
|
|
#endif
|
|
|
|
if(argc > (basearg + 1))
|
|
libtest_arg2 = argv[basearg + 1];
|
|
|
|
if(argc > (basearg + 2))
|
|
libtest_arg3 = argv[basearg + 2];
|
|
|
|
if(argc > (basearg + 2))
|
|
libtest_arg4 = argv[basearg + 3];
|
|
|
|
URL = argv[basearg]; /* provide this to the rest */
|
|
|
|
fprintf(stderr, "URL: %s\n", URL);
|
|
|
|
result = test_func(URL);
|
|
fprintf(stderr, "Test ended with result %d\n", result);
|
|
|
|
#ifdef _WIN32
|
|
/* flush buffers of all streams regardless of mode */
|
|
_flushall();
|
|
#endif
|
|
|
|
/* Regular program status codes are limited to 0..127 and 126 and 127 have
|
|
* special meanings by the shell, so limit a normal return code to 125 */
|
|
return (int)result <= 125 ? (int)result : 125;
|
|
}
|