moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

tests/server/sockfilt.c: Improved log error messages

Browse Source 
Include error code and parameters in error messages.
This commit is contained in:
Marc Hoersken 2013-01-06 22:23:32 +01:00
parent dd561c3834
commit a77d18efaf
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/server/sockfilt.c
View File

@ -265,7 +265,8 @@ static ssize_t fullread(int filedes, void *buffer, size_t nbytes)
error = ERRNO;
if((error == EINTR) || (error == EAGAIN))
continue;
logmsg("unrecoverable read() failure: %s", strerror(error));
logmsg("unrecoverable read() failure: (%d) %s",
error, strerror(error));
return -1;
}
@ -309,7 +310,8 @@ static ssize_t fullwrite(int filedes, const void *buffer, size_t nbytes)
error = ERRNO;
if((error == EINTR) || (error == EAGAIN))
continue;
logmsg("unrecoverable write() failure: %s", strerror(error));
logmsg("unrecoverable write() failure: (%d) %s",
error, strerror(error));
return -1;
}
@ -780,9 +782,13 @@ static bool juggle(curl_socket_t *sockfdp,
if(*mode == PASSIVE_LISTEN) {
/* there's no stream set up yet, this is an indication that there's a
client connecting. */
sockfd = accept(sockfd, NULL, NULL);
if(CURL_SOCKET_BAD == sockfd)
logmsg("accept() failed");
listenfd = sockfd;
sockfd = accept(listenfd, NULL, NULL);
if(CURL_SOCKET_BAD == sockfd) {
error = SOCKERRNO;
logmsg("accept(%d, NULL, NULL) failed with error: (%d) %s",
listenfd, error, strerror(error));
}
else {
logmsg("====> Client connect");
if(!write_stdout("CNCT\n", 5))
@ -954,8 +960,8 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
rc = listen(sock, 5);
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen() failed with error: (%d) %s",
error, strerror(error));
logmsg("listen(%d, 5) failed with error: (%d) %s",
sock, error, strerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}