029611f31b
Daniel Stenberg
2026-09-18
Subject
rtspd: read the test number from the server.cmd file
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
tests/server/first.h+2 -0
| @@ -181,6 +181,8 @@ static const char *server_unix_socket = NULL; | |
| static uint16_t server_port = 0; | |
| static const char *socket_type = "IPv4"; | |
| static int socket_domain = AF_INET; | |
| + | /* file in which additional instructions may be found */ |
| + | extern const char *cmdfile; |
| #define SERVERLOGS_LOCKDIR "lock" /* within logdir */ | |
tests/server/rtspd.c+23 -2
| @@ -141,6 +141,24 @@ static const char doc404_RTSP[] = "RTSP/1.0 404 Not Found\r\n" | |
| #define RTP_DATA_SIZE 12 | |
| static const char RTP_DATA[] = "$_1234\n\0Rsdf"; | |
| + | /* parse the file on disk that might have a test number for us */ |
| + | static int rtspd_cmdfile(struct rtspd_httprequest *req) |
| + | { |
| + | FILE *f = curlx_fopen(cmdfile, FOPEN_READTEXT); |
| + | if(f) { |
| + | int testnum = DOCNUMBER_NOTHING; |
| + | char buf[256]; |
| + | while(fgets(buf, sizeof(buf), f)) { |
| + | if(sscanf(buf, "Testnum %d", &testnum) == 1) { |
| + | logmsg("[%s] cmdfile says testnum %d", cmdfile, testnum); |
| + | req->testno = testnum; |
| + | } |
| + | } |
| + | curlx_fclose(f); |
| + | } |
| + | return 0; |
| + | } |
| + | |
| static int rtspd_ProcessRequest(struct rtspd_httprequest *req) | |
| { | |
| const char *line = &req->reqbuf[req->checkindex]; | |
| @@ -388,8 +406,11 @@ static int rtspd_ProcessRequest(struct rtspd_httprequest *req) | |
| else | |
| req->testno = DOCNUMBER_CONNECT; | |
| } | |
| - | else { |
| - | logmsg("Did not find test number in PATH"); |
| + | if(req->testno == DOCNUMBER_NOTHING) |
| + | /* might get the test number */ |
| + | rtspd_cmdfile(req); |
| + | if(req->testno == DOCNUMBER_NOTHING) { |
| + | logmsg("Did not find test number"); |
| req->testno = DOCNUMBER_404; | |
| } | |
| } | |
tests/server/sws.c+1 -1
| @@ -104,7 +104,7 @@ static size_t num_sockets = 0; | |
| (is_proxy ? REQUEST_PROXY_DUMP : REQUEST_DUMP) | |
| /* file in which additional instructions may be found */ | |
| - | static const char *cmdfile = "log/server.cmd"; |
| + | const char *cmdfile = "log/server.cmd"; |
| /* very-big-path support */ | |
| #define MAXDOCNAMELEN 140000 | |