Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: fix error handling around UNIX sockets #11265

Closed
wants to merge 3 commits into from
Closed

tests: fix error handling around UNIX sockets #11265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f028fc1
tests: fix error messages & handling around sockets
dfandrich Jun 7, 2023
821bb05
fixup Windows type error fixes
dfandrich Jun 8, 2023
0b5c51d
TESTING log when waiting at end of tests
dfandrich Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/runtests.pl
View file
Open in desktop
Expand Up @@ -2779,6 +2779,7 @@ sub displaylogs {
# a new one shortly. If all runners are busy, wait indefinitely for one to
# finish.
my $runnerwait = scalar(@runnersidle) && scalar(@runtests) ? 0 : undef;
print STDERR "TESTING waiting indefinitely for test completion\n" if(!scalar(@runtests));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this print a debugging leftover or meant to actually be a plain STDERR output? It looks like an anomaly in the code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a debugging leftover. It won't be submitted.

my $ridready = runnerar_ready($runnerwait);
if($ridready) {
# This runner is ready to be serviced
Expand Down
13 changes: 6 additions & 7 deletions tests/server/mqttd.c
View file
Open in desktop
Expand Up @@ -771,7 +771,7 @@ static bool incoming(curl_socket_t listenfd)
if(CURL_SOCKET_BAD == newfd) {
error = SOCKERRNO;
logmsg("accept(%d, NULL, NULL) failed with error: (%d) %s",
sockfd, error, strerror(error));
sockfd, error, sstrerror(error));
}
else {
logmsg("====> Client connect, fd %d. Read config from %s",
Expand Down Expand Up @@ -810,7 +810,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(rc) {
error = SOCKERRNO;
logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
if(maxretr) {
rc = wait_ms(delay);
if(rc) {
Expand Down Expand Up @@ -860,7 +860,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(rc) {
error = SOCKERRNO;
logmsg("Error binding socket on port %hu: (%d) %s",
*listenport, error, strerror(error));
*listenport, error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand All @@ -882,7 +882,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(getsockname(sock, &localaddr.sa, &la_size) < 0) {
error = SOCKERRNO;
logmsg("getsockname() failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand Down Expand Up @@ -914,7 +914,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen(%d, 5) failed with error: (%d) %s",
sock, error, strerror(error));
sock, error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand Down Expand Up @@ -1041,8 +1041,7 @@ int main(int argc, char *argv[])

if(CURL_SOCKET_BAD == sock) {
error = SOCKERRNO;
logmsg("Error creating socket: (%d) %s",
error, strerror(error));
logmsg("Error creating socket: (%d) %s", error, sstrerror(error));
goto mqttd_cleanup;
}

Expand Down
15 changes: 7 additions & 8 deletions tests/server/rtspd.c
View file
Open in desktop
Expand Up @@ -717,7 +717,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
}
else if(got < 0) {
error = SOCKERRNO;
logmsg("recv() returned error: (%d) %s", error, strerror(error));
logmsg("recv() returned error: (%d) %s", error, sstrerror(error));
fail = 1;
}
if(fail) {
Expand Down Expand Up @@ -1170,8 +1170,7 @@ int main(int argc, char *argv[])

if(CURL_SOCKET_BAD == sock) {
error = SOCKERRNO;
logmsg("Error creating socket: (%d) %s",
error, strerror(error));
logmsg("Error creating socket: (%d) %s", error, sstrerror(error));
goto server_cleanup;
}

Expand All @@ -1180,7 +1179,7 @@ int main(int argc, char *argv[])
(void *)&flag, sizeof(flag))) {
error = SOCKERRNO;
logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
goto server_cleanup;
}

Expand All @@ -1205,7 +1204,7 @@ int main(int argc, char *argv[])
if(0 != rc) {
error = SOCKERRNO;
logmsg("Error binding socket on port %hu: (%d) %s",
port, error, strerror(error));
port, error, sstrerror(error));
goto server_cleanup;
}

Expand All @@ -1226,7 +1225,7 @@ int main(int argc, char *argv[])
if(getsockname(sock, &localaddr.sa, &la_size) < 0) {
error = SOCKERRNO;
logmsg("getsockname() failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
sclose(sock);
goto server_cleanup;
}
Expand Down Expand Up @@ -1259,7 +1258,7 @@ int main(int argc, char *argv[])
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen() failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
goto server_cleanup;
}

Expand All @@ -1286,7 +1285,7 @@ int main(int argc, char *argv[])
if(CURL_SOCKET_BAD == msgsock) {
error = SOCKERRNO;
logmsg("MAJOR ERROR: accept() failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
break;
}

Expand Down
15 changes: 7 additions & 8 deletions tests/server/sockfilt.c
View file
Open in desktop
Expand Up @@ -1091,7 +1091,7 @@ static bool juggle(curl_socket_t *sockfdp,
if(CURL_SOCKET_BAD == newfd) {
error = SOCKERRNO;
logmsg("accept(%d, NULL, NULL) failed with error: (%d) %s",
sockfd, error, strerror(error));
sockfd, error, sstrerror(error));
}
else {
logmsg("====> Client connect");
Expand Down Expand Up @@ -1155,7 +1155,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(rc) {
error = SOCKERRNO;
logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
if(maxretr) {
rc = wait_ms(delay);
if(rc) {
Expand Down Expand Up @@ -1207,7 +1207,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(rc) {
error = SOCKERRNO;
logmsg("Error binding socket on port %hu: (%d) %s",
*listenport, error, strerror(error));
*listenport, error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand All @@ -1229,7 +1229,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(getsockname(sock, &localaddr.sa, &la_size) < 0) {
error = SOCKERRNO;
logmsg("getsockname() failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand Down Expand Up @@ -1267,7 +1267,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen(%d, 5) failed with error: (%d) %s",
sock, error, strerror(error));
sock, error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand Down Expand Up @@ -1414,8 +1414,7 @@ int main(int argc, char *argv[])

if(CURL_SOCKET_BAD == sock) {
error = SOCKERRNO;
logmsg("Error creating socket: (%d) %s",
error, strerror(error));
logmsg("Error creating socket: (%d) %s", error, sstrerror(error));
write_stdout("FAIL\n", 5);
goto sockfilt_cleanup;
}
Expand Down Expand Up @@ -1451,7 +1450,7 @@ int main(int argc, char *argv[])
if(rc) {
error = SOCKERRNO;
logmsg("Error connecting to port %hu: (%d) %s",
connectport, error, strerror(error));
connectport, error, sstrerror(error));
write_stdout("FAIL\n", 5);
goto sockfilt_cleanup;
}
Expand Down
22 changes: 14 additions & 8 deletions tests/server/socksd.c
View file
Open in desktop
Expand Up @@ -304,7 +304,7 @@ static curl_socket_t socksconnect(unsigned short connectport,
if(rc) {
int error = SOCKERRNO;
logmsg("Error connecting to %s:%hu: (%d) %s",
connectaddr, connectport, error, strerror(error));
connectaddr, connectport, error, sstrerror(error));
return CURL_SOCKET_BAD;
}
logmsg("Connected fine to %s:%d", connectaddr, connectport);
Expand Down Expand Up @@ -740,7 +740,7 @@ static bool incoming(curl_socket_t listenfd)
if(CURL_SOCKET_BAD == newfd) {
error = SOCKERRNO;
logmsg("accept(%d, NULL, NULL) failed with error: (%d) %s",
sockfd, error, strerror(error));
sockfd, error, sstrerror(error));
}
else {
curl_socket_t remotefd;
Expand Down Expand Up @@ -810,7 +810,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(rc) {
error = SOCKERRNO;
logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
if(maxretr) {
rc = wait_ms(delay);
if(rc) {
Expand Down Expand Up @@ -866,8 +866,14 @@ static curl_socket_t sockdaemon(curl_socket_t sock,

if(rc) {
error = SOCKERRNO;
logmsg("Error binding socket on port %hu: (%d) %s",
*listenport, error, strerror(error));
#ifdef USE_UNIX_SOCKETS
if(socket_domain == AF_UNIX)
logmsg("Error binding socket on path %s: (%d) %s",
unix_socket, error, sstrerror(error));
else
#endif
logmsg("Error binding socket on port %hu: (%d) %s",
*listenport, error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand All @@ -891,7 +897,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(getsockname(sock, &localaddr.sa, &la_size) < 0) {
error = SOCKERRNO;
logmsg("getsockname() failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand Down Expand Up @@ -923,7 +929,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen(%d, 5) failed with error: (%d) %s",
sock, error, strerror(error));
sock, error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
Expand Down Expand Up @@ -1071,7 +1077,7 @@ int main(int argc, char *argv[])
if(CURL_SOCKET_BAD == sock) {
error = SOCKERRNO;
logmsg("Error creating socket: (%d) %s",
error, strerror(error));
error, sstrerror(error));
goto socks5_cleanup;
}

Expand Down
36 changes: 20 additions & 16 deletions tests/server/sws.c
View file
Open in desktop
Expand Up @@ -956,7 +956,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
/* nothing to read at the moment */
return 0;
}
logmsg("recv() returned error: (%d) %s", error, strerror(error));
logmsg("recv() returned error: (%d) %s", error, sstrerror(error));
fail = 1;
}
if(fail) {
Expand Down Expand Up @@ -1304,7 +1304,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
if(CURL_SOCKET_BAD == serverfd) {
error = SOCKERRNO;
logmsg("Error creating socket for server connection: (%d) %s",
error, strerror(error));
error, sstrerror(error));
return CURL_SOCKET_BAD;
}

Expand Down Expand Up @@ -1360,7 +1360,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
if(rc) {
error = SOCKERRNO;
logmsg("Error connecting to server port %hu: (%d) %s",
port, error, strerror(error));
port, error, sstrerror(error));
sclose(serverfd);
return CURL_SOCKET_BAD;
}
Expand Down Expand Up @@ -1813,14 +1813,14 @@ static curl_socket_t accept_connection(curl_socket_t sock)
return 0;
}
logmsg("MAJOR ERROR: accept() failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
return CURL_SOCKET_BAD;
}

if(0 != curlx_nonblock(msgsock, TRUE)) {
error = SOCKERRNO;
logmsg("curlx_nonblock failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
sclose(msgsock);
return CURL_SOCKET_BAD;
}
Expand All @@ -1829,7 +1829,7 @@ static curl_socket_t accept_connection(curl_socket_t sock)
(void *)&flag, sizeof(flag))) {
error = SOCKERRNO;
logmsg("setsockopt(SO_KEEPALIVE) failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
sclose(msgsock);
return CURL_SOCKET_BAD;
}
Expand Down Expand Up @@ -2133,8 +2133,7 @@ int main(int argc, char *argv[])

if(CURL_SOCKET_BAD == sock) {
error = SOCKERRNO;
logmsg("Error creating socket: (%d) %s",
error, strerror(error));
logmsg("Error creating socket: (%d) %s", error, sstrerror(error));
goto sws_cleanup;
}

Expand All @@ -2143,13 +2142,13 @@ int main(int argc, char *argv[])
(void *)&flag, sizeof(flag))) {
error = SOCKERRNO;
logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
goto sws_cleanup;
}
if(0 != curlx_nonblock(sock, TRUE)) {
error = SOCKERRNO;
logmsg("curlx_nonblock failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
goto sws_cleanup;
}

Expand Down Expand Up @@ -2177,7 +2176,14 @@ int main(int argc, char *argv[])
}
if(0 != rc) {
error = SOCKERRNO;
logmsg("Error binding socket: (%d) %s", error, strerror(error));
#ifdef USE_UNIX_SOCKETS
if(socket_domain == AF_UNIX)
logmsg("Error binding socket on path %s: (%d) %s",
unix_socket, error, sstrerror(error));
else
#endif
logmsg("Error binding socket on port %hu: (%d) %s",
port, error, sstrerror(error));
goto sws_cleanup;
}

Expand All @@ -2198,7 +2204,7 @@ int main(int argc, char *argv[])
if(getsockname(sock, &localaddr.sa, &la_size) < 0) {
error = SOCKERRNO;
logmsg("getsockname() failed with error: (%d) %s",
error, strerror(error));
error, sstrerror(error));
sclose(sock);
goto sws_cleanup;
}
Expand Down Expand Up @@ -2236,8 +2242,7 @@ int main(int argc, char *argv[])
rc = listen(sock, 5);
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen() failed with error: (%d) %s",
error, strerror(error));
logmsg("listen() failed with error: (%d) %s", error, sstrerror(error));
goto sws_cleanup;
}

Expand Down Expand Up @@ -2309,8 +2314,7 @@ int main(int argc, char *argv[])

if(rc < 0) {
error = SOCKERRNO;
logmsg("select() failed with error: (%d) %s",
error, strerror(error));
logmsg("select() failed with error: (%d) %s", error, sstrerror(error));
goto sws_cleanup;
}

Expand Down