moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-10 11:35:07 -05:00
Code Issues Releases Wiki Activity

when terminating do it falling through cleanup code

Browse Source
This commit is contained in:
Yang Tse 2008-02-28 10:13:07 +00:00
parent 3d74649908
commit 22e84d92b7
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/server/sockfilt.c
View File

@ -280,6 +280,7 @@ static bool juggle(curl_socket_t *sockfdp,
ssize_t nread_socket; ssize_t nread_socket;
ssize_t bytes_written; ssize_t bytes_written;
ssize_t buffer_len; ssize_t buffer_len;
int error;
/* 'buffer' is this excessively large only to be able to support things like /* 'buffer' is this excessively large only to be able to support things like
test 1003 which tests exceedingly large server response lines */ test 1003 which tests exceedingly large server response lines */
@ -358,10 +359,13 @@ static bool juggle(curl_socket_t *sockfdp,
rc = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout); rc = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout);
} while((rc == -1) && (SOCKERRNO == EINTR)); } while((rc == -1) && ((error = SOCKERRNO) == EINTR));
if(rc < 0) if(rc < 0) {
logmsg("select() failed with error: (%d) %s",
error, strerror(error));
return FALSE; return FALSE;
}
if(rc == 0) if(rc == 0)
/* timeout */ /* timeout */
@ -620,8 +624,9 @@ int main(int argc, char *argv[])
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
struct sockaddr_in6 me6; struct sockaddr_in6 me6;
#endif /* ENABLE_IPV6 */ #endif /* ENABLE_IPV6 */
curl_socket_t sock; curl_socket_t sock = CURL_SOCKET_BAD;
curl_socket_t msgsock; curl_socket_t msgsock = CURL_SOCKET_BAD;
int wrotepidfile = 0;
char *pidname= (char *)".sockfilt.pid"; char *pidname= (char *)".sockfilt.pid";
int rc; int rc;
int error; int error;
@ -732,7 +737,7 @@ int main(int argc, char *argv[])
error = SOCKERRNO; error = SOCKERRNO;
logmsg("Error creating socket: (%d) %s", logmsg("Error creating socket: (%d) %s",
error, strerror(error)); error, strerror(error));
return 1; goto sockfilt_cleanup;
} }
if(connectport) { if(connectport) {
@ -767,8 +772,7 @@ int main(int argc, char *argv[])
error = SOCKERRNO; error = SOCKERRNO;
logmsg("Error connecting to port %d: (%d) %s", logmsg("Error connecting to port %d: (%d) %s",
port, error, strerror(error)); port, error, strerror(error));
sclose(sock); goto sockfilt_cleanup;
return 1;
} }
logmsg("====> Client connect"); logmsg("====> Client connect");
msgsock = sock; /* use this as stream */ msgsock = sock; /* use this as stream */
@ -777,7 +781,7 @@ int main(int argc, char *argv[])
/* passive daemon style */ /* passive daemon style */
sock = sockdaemon(sock, &port); sock = sockdaemon(sock, &port);
if(CURL_SOCKET_BAD == sock) if(CURL_SOCKET_BAD == sock)
return 1; goto sockfilt_cleanup;
msgsock = CURL_SOCKET_BAD; /* no stream socket yet */ msgsock = CURL_SOCKET_BAD; /* no stream socket yet */
} }
@ -789,17 +793,24 @@ int main(int argc, char *argv[])
else else
logmsg("Listening on port %d", port); logmsg("Listening on port %d", port);
if(!write_pidfile(pidname)) { wrotepidfile = write_pidfile(pidname);
sclose(sock); if(!wrotepidfile)
return 1; goto sockfilt_cleanup;
}
while(juggle(&msgsock, sock, &mode)); while(juggle(&msgsock, sock, &mode));
sockfilt_cleanup:
if((msgsock != sock) && (msgsock != CURL_SOCKET_BAD))
sclose(msgsock);
if(sock != CURL_SOCKET_BAD)
sclose(sock); sclose(sock);
if(wrotepidfile)
unlink(pidname); unlink(pidname);
logmsg("sockfilt exits"); logmsg("============> sockfilt quits");
return 0; return 0;
} }