From 5f450b558b9d47e53c53f49b9c02b2fe52fb6e92 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 8 Sep 2024 16:18:57 +0200 Subject: [PATCH 01/16] move definition to util.h --- tests/server/mqttd.c | 1 - tests/server/resolve.c | 2 -- tests/server/rtspd.c | 1 - tests/server/sockfilt.c | 2 -- tests/server/socksd.c | 1 - tests/server/sws.c | 1 - tests/server/tftpd.c | 1 - tests/server/util.c | 2 ++ 8 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index 2fc3a5f94a..46760b94dd 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -102,7 +102,6 @@ struct configurable { static struct configurable config; -const char *serverlogfile = DEFAULT_LOGFILE; static const char *configfile = DEFAULT_CONFIG; static const char *logdir = "log"; static char loglockfile[256]; diff --git a/tests/server/resolve.c b/tests/server/resolve.c index 56964e03a9..0a0c884b94 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -53,8 +53,6 @@ static bool use_ipv6 = FALSE; static const char *ipv_inuse = "IPv4"; -const char *serverlogfile = ""; /* for a util.c function we don't use */ - int main(int argc, char *argv[]) { int arg = 1; diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 181568395f..47f52afa46 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -128,7 +128,6 @@ static void storerequest(char *reqbuf, size_t totalsize); #define DEFAULT_LOGFILE "log/rtspd.log" #endif -const char *serverlogfile = DEFAULT_LOGFILE; static const char *logdir = "log"; static char loglockfile[256]; diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 18f75a5236..90b7b5568b 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -135,8 +135,6 @@ test 1003 which tests exceedingly large server response lines */ #define BUFFER_SIZE 17010 -const char *serverlogfile = DEFAULT_LOGFILE; - static bool verbose = FALSE; static bool bind_only = FALSE; #ifdef USE_IPV6 diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 92b261454e..7b3b32cd12 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -134,7 +134,6 @@ struct configurable { static struct configurable config; -const char *serverlogfile = DEFAULT_LOGFILE; static const char *reqlogfile = DEFAULT_REQFILE; static const char *configfile = DEFAULT_CONFIG; diff --git a/tests/server/sws.c b/tests/server/sws.c index fa83bc6a9a..f65bdd5f92 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -135,7 +135,6 @@ static void storerequest(const char *reqbuf, size_t totalsize); #define DEFAULT_LOGFILE "log/sws.log" #endif -const char *serverlogfile = DEFAULT_LOGFILE; static const char *logdir = "log"; static char loglockfile[256]; diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 93f6537c6d..28542b15ef 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -205,7 +205,6 @@ static bool use_ipv6 = FALSE; #endif static const char *ipv_inuse = "IPv4"; -const char *serverlogfile = DEFAULT_LOGFILE; static const char *logdir = "log"; static char loglockfile[256]; static const char *pidname = ".tftpd.pid"; diff --git a/tests/server/util.c b/tests/server/util.c index d9f6d2162a..62934233ca 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -62,6 +62,8 @@ #define EINVAL 22 /* errno.h value */ #endif +const char *serverlogfile = DEFAULT_LOGFILE; + static struct timeval tvnow(void); /* This function returns a pointer to STATIC memory. It converts the given From 280b7988a19d33743ecde48d5fff3dd4055d12b6 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 9 Sep 2024 01:53:18 +0200 Subject: [PATCH 02/16] util.c: fix shadowed variable --- tests/server/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/server/util.c b/tests/server/util.c index 62934233ca..923e19e573 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -204,12 +204,12 @@ const char *sstrerror(int err) /* set by the main code to point to where the test dir is */ const char *path = "."; -FILE *test2fopen(long testno, const char *logdir) +FILE *test2fopen(long testno, const char *logdir2) { FILE *stream; char filename[256]; /* first try the alternative, preprocessed, file */ - msnprintf(filename, sizeof(filename), ALTTEST_DATA_PATH, logdir, testno); + msnprintf(filename, sizeof(filename), ALTTEST_DATA_PATH, logdir2, testno); stream = fopen(filename, "rb"); if(stream) return stream; From 4b06df475deedbe940aba3353b857872f3ff9dac Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 8 Sep 2024 21:01:01 +0200 Subject: [PATCH 03/16] decollision --- tests/server/rtspd.c | 10 ---------- tests/server/sws.c | 7 ------- tests/server/util.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 47f52afa46..1f1739553a 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -154,16 +154,6 @@ static char loglockfile[256]; #define END_OF_HEADERS "\r\n\r\n" -enum { - DOCNUMBER_NOTHING = -7, - DOCNUMBER_QUIT = -6, - DOCNUMBER_BADCONNECT = -5, - DOCNUMBER_INTERNAL = -4, - DOCNUMBER_CONNECT = -3, - DOCNUMBER_WERULEZ = -2, - DOCNUMBER_404 = -1 -}; - /* sent as reply to a QUIT */ static const char *docquit = diff --git a/tests/server/sws.c b/tests/server/sws.c index f65bdd5f92..2d2b183f4f 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -184,13 +184,6 @@ const char *cmdfile = DEFAULT_CMDFILE; #define END_OF_HEADERS "\r\n\r\n" -enum { - DOCNUMBER_NOTHING = -4, - DOCNUMBER_QUIT = -3, - DOCNUMBER_WERULEZ = -2, - DOCNUMBER_404 = -1 -}; - static const char *end_of_headers = END_OF_HEADERS; /* sent as reply to a QUIT */ diff --git a/tests/server/util.h b/tests/server/util.h index 991c0703ce..f4d8707c67 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -25,6 +25,16 @@ ***************************************************************************/ #include "server_setup.h" +enum { + DOCNUMBER_NOTHING = -7, + DOCNUMBER_QUIT = -6, + DOCNUMBER_BADCONNECT = -5, + DOCNUMBER_INTERNAL = -4, + DOCNUMBER_CONNECT = -3, + DOCNUMBER_WERULEZ = -2, + DOCNUMBER_404 = -1 +}; + char *data_to_hex(char *data, size_t len); void logmsg(const char *msg, ...) CURL_PRINTF(1, 2); long timediff(struct timeval newer, struct timeval older); From 8ff402d5eb1e4e35f1f580f5de9c099d2f1cd03c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 16:52:16 +0100 Subject: [PATCH 04/16] server: drop sleep macro --- tests/server/util.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/server/util.h b/tests/server/util.h index f4d8707c67..eb598bda77 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -55,8 +55,6 @@ extern const char *cmdfile; #include #include -#define sleep(sec) Sleep ((sec)*1000) - #undef perror #define perror(m) win32_perror(m) void win32_perror(const char *msg); From ee713df069920ba7feeb15d57eae2029a7e50302 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 16:53:32 +0100 Subject: [PATCH 05/16] server: drop perror redefine (win32) --- tests/server/util.c | 12 ++++++------ tests/server/util.h | 5 ----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/server/util.c b/tests/server/util.c index 923e19e573..1e2d024521 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -145,7 +145,7 @@ void logmsg(const char *msg, ...) #ifdef _WIN32 /* use instead of perror() on generic Windows */ -void win32_perror(const char *msg) +static void win32_perror(const char *msg) { char buf[512]; int err = SOCKERRNO; @@ -176,7 +176,7 @@ int win32_init(void) err = WSAStartup(wVersionRequested, &wsaData); if(err) { - perror("Winsock init failed"); + win32_perror("Winsock init failed"); logmsg("Error initialising Winsock -- aborting"); return 1; } @@ -184,7 +184,7 @@ int win32_init(void) if(LOBYTE(wsaData.wVersion) != LOBYTE(wVersionRequested) || HIBYTE(wsaData.wVersion) != HIBYTE(wVersionRequested) ) { WSACleanup(); - perror("Winsock init failed"); + win32_perror("Winsock init failed"); logmsg("No suitable winsock.dll found -- aborting"); return 1; } @@ -635,7 +635,7 @@ static unsigned int WINAPI main_window_loop(void *lpParameter) wc.hInstance = (HINSTANCE)lpParameter; wc.lpszClassName = TEXT("MainWClass"); if(!RegisterClass(&wc)) { - perror("RegisterClass failed"); + win32_perror("RegisterClass failed"); return (DWORD)-1; } @@ -647,14 +647,14 @@ static unsigned int WINAPI main_window_loop(void *lpParameter) (HWND)NULL, (HMENU)NULL, wc.hInstance, (LPVOID)NULL); if(!hidden_main_window) { - perror("CreateWindowEx failed"); + win32_perror("CreateWindowEx failed"); return (DWORD)-1; } do { ret = GetMessage(&msg, NULL, 0, 0); if(ret == -1) { - perror("GetMessage failed"); + win32_perror("GetMessage failed"); return (DWORD)-1; } else if(ret) { diff --git a/tests/server/util.h b/tests/server/util.h index eb598bda77..3e5278d068 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -54,11 +54,6 @@ extern const char *cmdfile; #ifdef _WIN32 #include #include - -#undef perror -#define perror(m) win32_perror(m) -void win32_perror(const char *msg); - int win32_init(void); const char *sstrerror(int err); #else /* _WIN32 */ From 2c7f785b945586262ebd5114bb87148bdbf7d2aa Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 16:59:40 +0100 Subject: [PATCH 06/16] server: drop two util macros --- tests/server/util.c | 4 ++-- tests/server/util.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/server/util.c b/tests/server/util.c index 1e2d024521..b8a47b1fbb 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -209,13 +209,13 @@ FILE *test2fopen(long testno, const char *logdir2) FILE *stream; char filename[256]; /* first try the alternative, preprocessed, file */ - msnprintf(filename, sizeof(filename), ALTTEST_DATA_PATH, logdir2, testno); + msnprintf(filename, sizeof(filename), "%s/test%ld", logdir2, testno); stream = fopen(filename, "rb"); if(stream) return stream; /* then try the source version */ - msnprintf(filename, sizeof(filename), TEST_DATA_PATH, path, testno); + msnprintf(filename, sizeof(filename), "%s/data/test%ld", path, testno); stream = fopen(filename, "rb"); return stream; diff --git a/tests/server/util.h b/tests/server/util.h index 3e5278d068..69121c587f 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -39,8 +39,6 @@ char *data_to_hex(char *data, size_t len); void logmsg(const char *msg, ...) CURL_PRINTF(1, 2); long timediff(struct timeval newer, struct timeval older); -#define TEST_DATA_PATH "%s/data/test%ld" -#define ALTTEST_DATA_PATH "%s/test%ld" #define SERVERLOGS_LOCKDIR "lock" /* within logdir */ /* global variable, where to find the 'data' dir */ From e545a06c3004359029b8dd8d5a1e3aedc6fb5cc0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 17:12:12 +0100 Subject: [PATCH 07/16] server: sync timediff_t type across modules fix unused timediff warning with clang-cl ``` C:/projects/curl/tests/server/util.c(463,13): error : unused function 'timediff' [-Werror,-Wunused-function] ``` https://ci.appveyor.com/project/curlorg/curl/builds/51606010/job/p1e4tmsahj0p043r#L208 --- tests/server/util.c | 25 ++++++++++++++----------- tests/server/util.h | 1 - 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/server/util.c b/tests/server/util.c index b8a47b1fbb..c36f8eade3 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -54,6 +54,7 @@ #include "getpart.h" #include "util.h" #include "timeval.h" +#include "timediff.h" #ifdef USE_WINSOCK #undef EINTR @@ -221,6 +222,19 @@ FILE *test2fopen(long testno, const char *logdir2) return stream; } +#if !defined(MSDOS) && !defined(USE_WINSOCK) +static long timediff(struct timeval newer, struct timeval older) +{ + timediff_t diff = newer.tv_sec-older.tv_sec; + if(diff >= (LONG_MAX/1000)) + return LONG_MAX; + else if(diff <= (LONG_MIN/1000)) + return LONG_MIN; + return (long)(newer.tv_sec-older.tv_sec)*1000+ + (long)(newer.tv_usec-older.tv_usec)/1000; +} +#endif + /* * Portable function used for waiting a specific amount of ms. * Waiting indefinitely with this function is not allowed, a @@ -457,17 +471,6 @@ static struct timeval tvnow(void) #endif -long timediff(struct timeval newer, struct timeval older) -{ - timediff_t diff = newer.tv_sec-older.tv_sec; - if(diff >= (LONG_MAX/1000)) - return LONG_MAX; - else if(diff <= (LONG_MIN/1000)) - return LONG_MIN; - return (long)(newer.tv_sec-older.tv_sec)*1000+ - (long)(newer.tv_usec-older.tv_usec)/1000; -} - /* vars used to keep around previous signal handlers */ typedef void (*SIGHANDLER_T)(int); diff --git a/tests/server/util.h b/tests/server/util.h index 69121c587f..105e4f73c1 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -37,7 +37,6 @@ enum { char *data_to_hex(char *data, size_t len); void logmsg(const char *msg, ...) CURL_PRINTF(1, 2); -long timediff(struct timeval newer, struct timeval older); #define SERVERLOGS_LOCKDIR "lock" /* within logdir */ From 9684070a5c930446b5a76133972b9b785c929be8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 17:15:43 +0100 Subject: [PATCH 08/16] server: make cmdfile local to sws --- tests/server/sws.c | 2 +- tests/server/util.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/server/sws.c b/tests/server/sws.c index 2d2b183f4f..c095ebbf23 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -150,7 +150,7 @@ static char loglockfile[256]; /* file in which additional instructions may be found */ #define DEFAULT_CMDFILE "log/server.cmd" -const char *cmdfile = DEFAULT_CMDFILE; +static const char *cmdfile = DEFAULT_CMDFILE; /* very-big-path support */ #define MAXDOCNAMELEN 140000 diff --git a/tests/server/util.h b/tests/server/util.h index 105e4f73c1..212fc453da 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -46,8 +46,6 @@ extern const char *path; /* global variable, log file name */ extern const char *serverlogfile; -extern const char *cmdfile; - #ifdef _WIN32 #include #include From 37baecbe5ae510f4e03aa0a9491000b7a586cb25 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 17:19:13 +0100 Subject: [PATCH 09/16] server: formatting --- tests/server/util.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/server/util.h b/tests/server/util.h index 212fc453da..588f94abcb 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -26,13 +26,13 @@ #include "server_setup.h" enum { - DOCNUMBER_NOTHING = -7, - DOCNUMBER_QUIT = -6, + DOCNUMBER_NOTHING = -7, + DOCNUMBER_QUIT = -6, DOCNUMBER_BADCONNECT = -5, - DOCNUMBER_INTERNAL = -4, - DOCNUMBER_CONNECT = -3, - DOCNUMBER_WERULEZ = -2, - DOCNUMBER_404 = -1 + DOCNUMBER_INTERNAL = -4, + DOCNUMBER_CONNECT = -3, + DOCNUMBER_WERULEZ = -2, + DOCNUMBER_404 = -1 }; char *data_to_hex(char *data, size_t len); From f65e9c7758ab84f90d1164b7c40307386db3b546 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 17:21:31 +0100 Subject: [PATCH 10/16] server/util: drop unused fcntl.h --- tests/server/util.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/server/util.h b/tests/server/util.h index 588f94abcb..f2ff369b4a 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -48,7 +48,6 @@ extern const char *serverlogfile; #ifdef _WIN32 #include -#include int win32_init(void); const char *sstrerror(int err); #else /* _WIN32 */ From eddd708a9947bfb79c40a3848a40a68332452d13 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 17:23:05 +0100 Subject: [PATCH 11/16] server/util: drop unused process.h (win32) --- tests/server/util.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/server/util.h b/tests/server/util.h index f2ff369b4a..315e11d01c 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -47,13 +47,11 @@ extern const char *path; extern const char *serverlogfile; #ifdef _WIN32 -#include int win32_init(void); const char *sstrerror(int err); -#else /* _WIN32 */ - +#else #define sstrerror(e) strerror(e) -#endif /* _WIN32 */ +#endif /* fopens the test case file */ FILE *test2fopen(long testno, const char *logdir); From 1a86c75b4beefc66f63d1f24b7c77de0b0869497 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 28 Feb 2025 19:07:22 +0100 Subject: [PATCH 12/16] formatting --- tests/server/util.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/server/util.h b/tests/server/util.h index 315e11d01c..1c22e4fcf0 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -78,16 +78,13 @@ void install_signal_handlers(bool keep_sigalrm); void restore_signal_handlers(bool keep_sigalrm); #ifdef USE_UNIX_SOCKETS - #include /* for curl_socket_t */ - #ifdef HAVE_SYS_UN_H #include /* for sockaddr_un */ -#endif /* HAVE_SYS_UN_H */ - +#endif int bind_unix_socket(curl_socket_t sock, const char *unix_socket, - struct sockaddr_un *sau); -#endif /* USE_UNIX_SOCKETS */ + struct sockaddr_un *sau); +#endif /* USE_UNIX_SOCKETS */ unsigned short util_ultous(unsigned long ulnum); From 564402de4eb9afc80fa74b18f9ba57547ab2985a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 28 Feb 2025 19:11:35 +0100 Subject: [PATCH 13/16] move EINT* values to util.h --- tests/server/mqttd.c | 5 ----- tests/server/rtspd.c | 7 ------- tests/server/sockfilt.c | 11 ----------- tests/server/socksd.c | 5 ----- tests/server/sws.c | 9 --------- tests/server/util.c | 7 ------- tests/server/util.h | 14 ++++++++++++++ 7 files changed, 14 insertions(+), 44 deletions(-) diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index 46760b94dd..8e0b578232 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -64,11 +64,6 @@ /* include memdebug.h last */ #include "memdebug.h" -#ifdef USE_WINSOCK -#undef EINTR -#define EINTR 4 /* errno.h value */ -#endif - #define DEFAULT_PORT 1883 /* MQTT default port */ #ifndef DEFAULT_LOGFILE diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 1f1739553a..2e48f7dd85 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -56,13 +56,6 @@ /* include memdebug.h last */ #include "memdebug.h" -#ifdef USE_WINSOCK -#undef EINTR -#define EINTR 4 /* errno.h value */ -#undef ERANGE -#define ERANGE 34 /* errno.h value */ -#endif - #ifdef USE_IPV6 static bool use_ipv6 = FALSE; #endif diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 90b7b5568b..b18f4d17e0 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -114,17 +114,6 @@ /* include memdebug.h last */ #include "memdebug.h" -#ifdef USE_WINSOCK -#undef EINTR -#define EINTR 4 /* errno.h value */ -#undef EAGAIN -#define EAGAIN 11 /* errno.h value */ -#undef ENOMEM -#define ENOMEM 12 /* errno.h value */ -#undef EINVAL -#define EINVAL 22 /* errno.h value */ -#endif - #define DEFAULT_PORT 8999 #ifndef DEFAULT_LOGFILE diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 7b3b32cd12..fda729c7f9 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -85,11 +85,6 @@ /* include memdebug.h last */ #include "memdebug.h" -#ifdef USE_WINSOCK -#undef EINTR -#define EINTR 4 /* errno.h value */ -#endif - #define DEFAULT_PORT 8905 #ifndef DEFAULT_LOGFILE diff --git a/tests/server/sws.c b/tests/server/sws.c index c095ebbf23..5b7a4397d6 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -58,15 +58,6 @@ /* include memdebug.h last */ #include "memdebug.h" -#ifdef USE_WINSOCK -#undef EINTR -#define EINTR 4 /* errno.h value */ -#undef EAGAIN -#define EAGAIN 11 /* errno.h value */ -#undef ERANGE -#define ERANGE 34 /* errno.h value */ -#endif - static int socket_domain = AF_INET; static bool use_gopher = FALSE; static int serverlogslocked = 0; diff --git a/tests/server/util.c b/tests/server/util.c index c36f8eade3..67f583fcdf 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -56,13 +56,6 @@ #include "timeval.h" #include "timediff.h" -#ifdef USE_WINSOCK -#undef EINTR -#define EINTR 4 /* errno.h value */ -#undef EINVAL -#define EINVAL 22 /* errno.h value */ -#endif - const char *serverlogfile = DEFAULT_LOGFILE; static struct timeval tvnow(void); diff --git a/tests/server/util.h b/tests/server/util.h index 1c22e4fcf0..0b112d24b4 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -25,6 +25,20 @@ ***************************************************************************/ #include "server_setup.h" +#ifdef USE_WINSOCK +/* errno.h values */ +#undef EINTR +#define EINTR 4 +#undef EAGAIN +#define EAGAIN 11 +#undef ENOMEM +#define ENOMEM 12 +#undef EINVAL +#define EINVAL 22 +#undef ERANGE +#define ERANGE 34 +#endif + enum { DOCNUMBER_NOTHING = -7, DOCNUMBER_QUIT = -6, From bfa37f646327719c042ff91db14d38bf5387619f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 9 Sep 2024 00:41:21 +0200 Subject: [PATCH 14/16] untangle serverlogfile from per-file default --- tests/server/mqttd.c | 2 ++ tests/server/rtspd.c | 2 ++ tests/server/sockfilt.c | 2 ++ tests/server/socksd.c | 2 ++ tests/server/sws.c | 2 ++ tests/server/tftpd.c | 2 ++ tests/server/util.c | 2 +- 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index 8e0b578232..9a7a0baef3 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -927,6 +927,8 @@ int main(int argc, char *argv[]) int error; int arg = 1; + serverlogfile = DEFAULT_LOGFILE; + while(argc > arg) { if(!strcmp("--version", argv[arg])) { printf("mqttd IPv4%s\n", diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 2e48f7dd85..5d0fbd8a85 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -1045,6 +1045,8 @@ int main(int argc, char *argv[]) memset(&req, 0, sizeof(req)); + serverlogfile = DEFAULT_LOGFILE; + while(argc > arg) { if(!strcmp("--version", argv[arg])) { printf("rtspd IPv4%s" diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index b18f4d17e0..80b44c0003 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -1393,6 +1393,8 @@ int main(int argc, char *argv[]) enum sockmode mode = PASSIVE_LISTEN; /* default */ const char *addr = NULL; + serverlogfile = DEFAULT_LOGFILE; + while(argc > arg) { if(!strcmp("--version", argv[arg])) { printf("sockfilt IPv4%s\n", diff --git a/tests/server/socksd.c b/tests/server/socksd.c index fda729c7f9..8216dbf63d 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -973,6 +973,8 @@ int main(int argc, char *argv[]) bool unlink_socket = false; #endif + serverlogfile = DEFAULT_LOGFILE; + while(argc > arg) { if(!strcmp("--version", argv[arg])) { printf("socksd IPv4%s\n", diff --git a/tests/server/sws.c b/tests/server/sws.c index 5b7a4397d6..b8e6b0fb37 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -2043,6 +2043,8 @@ int main(int argc, char *argv[]) /* a default CONNECT port is basically pointless but still ... */ size_t socket_idx; + serverlogfile = DEFAULT_LOGFILE; + while(argc > arg) { if(!strcmp("--version", argv[arg])) { puts("sws IPv4" diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 28542b15ef..0e62855242 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -563,6 +563,8 @@ int main(int argc, char **argv) memset(&test, 0, sizeof(test)); + serverlogfile = DEFAULT_LOGFILE; + while(argc > arg) { if(!strcmp("--version", argv[arg])) { printf("tftpd IPv4%s\n", diff --git a/tests/server/util.c b/tests/server/util.c index 67f583fcdf..947e76d1f6 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -56,7 +56,7 @@ #include "timeval.h" #include "timediff.h" -const char *serverlogfile = DEFAULT_LOGFILE; +const char *serverlogfile = NULL; /* needs init from main() */ static struct timeval tvnow(void); From fc0c171c678d0539450005f8f4f2f9c508206eac Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 28 Feb 2025 19:32:17 +0100 Subject: [PATCH 15/16] drop DEFAULT_LOGFILE macro in favour --logfile arg --- tests/server/mqttd.c | 6 +----- tests/server/rtspd.c | 6 +----- tests/server/sockfilt.c | 6 +----- tests/server/socksd.c | 6 +----- tests/server/sws.c | 6 +----- tests/server/tftpd.c | 6 +----- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index 9a7a0baef3..dbc844d823 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -66,10 +66,6 @@ #define DEFAULT_PORT 1883 /* MQTT default port */ -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/mqttd.log" -#endif - #ifndef DEFAULT_CONFIG #define DEFAULT_CONFIG "mqttd.config" #endif @@ -927,7 +923,7 @@ int main(int argc, char *argv[]) int error; int arg = 1; - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/mqttd.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 5d0fbd8a85..5e7fbfca36 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -117,10 +117,6 @@ static void storerequest(char *reqbuf, size_t totalsize); #define DEFAULT_PORT 8999 -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/rtspd.log" -#endif - static const char *logdir = "log"; static char loglockfile[256]; @@ -1045,7 +1041,7 @@ int main(int argc, char *argv[]) memset(&req, 0, sizeof(req)); - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/rtspd.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 80b44c0003..04ec469fb7 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -116,10 +116,6 @@ #define DEFAULT_PORT 8999 -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/sockfilt.log" -#endif - /* buffer is this excessively large only to be able to support things like test 1003 which tests exceedingly large server response lines */ #define BUFFER_SIZE 17010 @@ -1393,7 +1389,7 @@ int main(int argc, char *argv[]) enum sockmode mode = PASSIVE_LISTEN; /* default */ const char *addr = NULL; - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/sockfilt.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 8216dbf63d..e98071ea73 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -87,10 +87,6 @@ #define DEFAULT_PORT 8905 -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/socksd.log" -#endif - #ifndef DEFAULT_REQFILE #define DEFAULT_REQFILE "log/socksd-request.log" #endif @@ -973,7 +969,7 @@ int main(int argc, char *argv[]) bool unlink_socket = false; #endif - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/socksd.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/sws.c b/tests/server/sws.c index b8e6b0fb37..fc40d3eac9 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -122,10 +122,6 @@ static void storerequest(const char *reqbuf, size_t totalsize); #define DEFAULT_PORT 8999 -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/sws.log" -#endif - static const char *logdir = "log"; static char loglockfile[256]; @@ -2043,7 +2039,7 @@ int main(int argc, char *argv[]) /* a default CONNECT port is basically pointless but still ... */ size_t socket_idx; - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/sws.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 0e62855242..5f29fd38d5 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -150,10 +150,6 @@ struct bf { #undef MIN #define MIN(x,y) ((x)<(y)?(x):(y)) -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/tftpd.log" -#endif - #define REQUEST_DUMP "server.input" #define DEFAULT_PORT 8999 /* UDP */ @@ -563,7 +559,7 @@ int main(int argc, char **argv) memset(&test, 0, sizeof(test)); - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/tftpd.log" while(argc > arg) { if(!strcmp("--version", argv[arg])) { From 25cca212d7b7a8f898100474baf6bde0aabbc5b2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 28 Feb 2025 20:25:49 +0100 Subject: [PATCH 16/16] drop DEFAULT_LOGFILE macro in favour --logfile arg fixup --- tests/server/tftpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 5f29fd38d5..1adaec610d 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -559,7 +559,7 @@ int main(int argc, char **argv) memset(&test, 0, sizeof(test)); - serverlogfile = "log/tftpd.log" + serverlogfile = "log/tftpd.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) {