moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-10-31 23:55:01 -04:00
Code Issues Releases Wiki Activity

Abort if unable to write pid file, and close socket when aborting.

Browse Source
This commit is contained in:
Yang Tse 2006-07-19 15:28:30 +00:00
parent 46c5e562bf
commit ab4256d53a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/server/sockfilt.c
View File

@ -445,7 +445,12 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
} }
/* start accepting connections */ /* start accepting connections */
listen(sock, 4); rc = listen(sock, 4);
if(0 != rc) {
logmsg("listen() failed with error: %d", errno);
sclose(sock);
return CURL_SOCKET_BAD;
}
return sock; return sock;
} }
@ -464,10 +469,9 @@ static curl_socket_t mksock(bool use_ipv6)
sock = socket(AF_INET6, SOCK_STREAM, 0); sock = socket(AF_INET6, SOCK_STREAM, 0);
#endif #endif
if (sock < 0) { if (CURL_SOCKET_BAD == sock) {
perror("opening stream socket"); perror("opening stream socket");
logmsg("Error opening socket"); logmsg("Error opening socket");
return CURL_SOCKET_BAD;
} }
return sock; return sock;
@ -565,6 +569,10 @@ int main(int argc, char *argv[])
sock = mksock(use_ipv6); sock = mksock(use_ipv6);
if (CURL_SOCKET_BAD == sock) {
logmsg("Error opening socket: %d", errno);
return 1;
}
if(connectport) { if(connectport) {
/* Active mode, we should connect to the given port number */ /* Active mode, we should connect to the given port number */
@ -593,6 +601,7 @@ int main(int argc, char *argv[])
if(rc) { if(rc) {
perror("connecting stream socket"); perror("connecting stream socket");
logmsg("Error connecting to port %d", port); logmsg("Error connecting to port %d", port);
sclose(sock);
return 1; return 1;
} }
logmsg("====> Client connect"); logmsg("====> Client connect");
@ -621,8 +630,11 @@ int main(int argc, char *argv[])
fclose(pidfile); fclose(pidfile);
logmsg("Wrote pid %d to %s", pid, pidname); logmsg("Wrote pid %d to %s", pid, pidname);
} }
else else {
fprintf(stderr, "Couldn't write pid file\n"); fprintf(stderr, "Couldn't write pid file\n");
sclose(sock);
return 1;
}
while(juggle(&msgsock, sock, &mode)); while(juggle(&msgsock, sock, &mode));