Changeset: e77a493ae696 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e77a493ae696
Modified Files:
tools/merovingian/daemon/client.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/control.c
Branch: Jun2016
Log Message:
Use closesocket for closing sockets.
Not that it matters on non-Windows: closesocket is defined to be the
same as close.
diffs (225 lines):
diff --git a/tools/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -529,7 +529,7 @@ acceptConnections(int sock, int usock)
rv = recvmsg(msgsock, &msgh, 0);
if (rv == -1) {
- close(msgsock);
+ closesocket(msgsock);
continue;
}
@@ -539,12 +539,12 @@ acceptConnections(int sock, int usock)
break;
case '1':
/* filedescriptor, no way */
- close(msgsock);
+ closesocket(msgsock);
Mfprintf(stderr, "client error: fd passing not
supported\n");
continue;
default:
/* some unknown state */
- close(msgsock);
+ closesocket(msgsock);
Mfprintf(stderr, "client error: unknown initial
byte\n");
continue;
}
@@ -562,19 +562,19 @@ acceptConnections(int sock, int usock)
p->next = threads;
threads = p;
} else {
- close(msgsock);
+ closesocket(msgsock);
free(data);
free(p);
}
} while (_mero_keep_listening);
shutdown(sock, SHUT_RDWR);
- close(sock);
+ closesocket(sock);
return(NO_ERR);
error:
_mero_keep_listening = 0;
shutdown(sock, SHUT_RDWR);
- close(sock);
+ closesocket(sock);
return(newErr("accept connection: %s", msg));
}
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -978,10 +978,10 @@ controlRunner(void *d)
snprintf(origin, sizeof(origin), "(local)");
ctl_handle_client(origin, msgsock, NULL, NULL);
- close(msgsock);
+ closesocket(msgsock);
} while (_mero_keep_listening);
shutdown(usock, SHUT_RDWR);
- close(usock);
+ closesocket(usock);
Mfprintf(_mero_ctlout, "control channel closed\n");
return NULL;
}
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -803,7 +803,7 @@ main(int argc, char *argv[])
{
Mfprintf(stderr, "cannot create broadcast
package, "
"discovery services
disabled\n");
- close(usock);
+ closesocket(usock);
usock = -1;
}
@@ -830,7 +830,7 @@ main(int argc, char *argv[])
Mfprintf(stderr, "unable to create control command
thread: %s\n",
strerror(thret));
ctid = 0;
- close(unsock);
+ closesocket(unsock);
}
/* start neighbour discovery and notification thread */
@@ -850,7 +850,7 @@ main(int argc, char *argv[])
if (ctid != 0)
pthread_join(ctid, NULL);
if (usock >= 0) {
- close(usock);
+ closesocket(usock);
if (dtid != 0)
pthread_join(dtid, NULL);
}
diff --git a/tools/merovingian/utils/control.c
b/tools/merovingian/utils/control.c
--- a/tools/merovingian/utils/control.c
+++ b/tools/merovingian/utils/control.c
@@ -66,7 +66,7 @@ char* control_send(
strncpy(server.sun_path, host, sizeof(server.sun_path) - 1);
if (connect(sock, (SOCKPTR) &server, sizeof(struct
sockaddr_un)) == -1) {
snprintf(sbuf, sizeof(sbuf), "cannot connect: %s",
strerror(errno));
- close(sock);
+ closesocket(sock);
return(strdup(sbuf));
}
} else {
@@ -85,7 +85,7 @@ char* control_send(
if (hp == NULL) {
snprintf(sbuf, sizeof(sbuf), "cannot lookup hostname:
%s",
hstrerror(h_errno));
- close(sock);
+ closesocket(sock);
return(strdup(sbuf));
}
memset(&server, 0, sizeof(struct sockaddr_in));
@@ -94,7 +94,7 @@ char* control_send(
server.sin_port = htons((unsigned short) (port & 0xFFFF));
if (connect(sock, (SOCKPTR) &server, sizeof(struct
sockaddr_in)) == -1) {
snprintf(sbuf, sizeof(sbuf), "cannot connect: %s",
strerror(errno));
- close(sock);
+ closesocket(sock);
return(strdup(sbuf));
}
@@ -105,7 +105,7 @@ char* control_send(
/* perform login ritual */
if (len <= 2) {
snprintf(sbuf, sizeof(sbuf), "no response from
monetdbd");
- close(sock);
+ closesocket(sock);
return(strdup(sbuf));
}
rbuf[len] = 0;
@@ -136,7 +136,7 @@ char* control_send(
snprintf(sbuf, sizeof(sbuf), "cannot connect: "
"unsupported monetdbd server");
}
- close(sock);
+ closesocket(sock);
return(strdup(sbuf));
}
@@ -152,7 +152,7 @@ char* control_send(
len = send(sock, sbuf, len, 0);
free(p);
if (len == -1) {
- close(sock);
+ closesocket(sock);
return(strdup("cannot send challenge
response to server"));
}
break;
@@ -324,7 +324,7 @@ char* control_send(
rbuf[len - 1] = '\0';
} else {
if ((len = recv(sock, rbuf, sizeof(rbuf), 0)) <= 0) {
- close(sock);
+ closesocket(sock);
return(strdup("no response from monetdbd after
login"));
}
rbuf[len - 1] = '\0';
@@ -338,7 +338,7 @@ char* control_send(
close_stream(fdout);
close_stream(fdin);
} else {
- close(sock);
+ closesocket(sock);
}
return(strdup(buf));
}
@@ -350,7 +350,7 @@ char* control_send(
} else {
len = snprintf(sbuf, sizeof(sbuf), "%s %s\n", database,
command);
if (send(sock, sbuf, len, 0) == -1) {
- close(sock);
+ closesocket(sock);
return(strdup("failed to send control command to
server"));
}
}
@@ -364,7 +364,7 @@ char* control_send(
close_stream(fdin);
close_stream(fdout);
} else {
- close(sock);
+ closesocket(sock);
}
return(strdup("failed to allocate memory"));
}
@@ -389,7 +389,7 @@ char* control_send(
close_stream(fdin);
close_stream(fdout);
} else {
- close(sock);
+ closesocket(sock);
}
return(strdup("failed to allocate more
memory"));
}
@@ -402,7 +402,7 @@ char* control_send(
close_stream(fdin);
close_stream(fdout);
} else {
- close(sock);
+ closesocket(sock);
}
free(buf);
return(strdup("incomplete response from monetdbd"));
@@ -427,7 +427,7 @@ char* control_send(
*ret = strdup(rbuf + 1);
} else {
if ((len = recv(sock, rbuf, sizeof(rbuf), 0)) <= 0) {
- close(sock);
+ closesocket(sock);
return(strdup("incomplete response from
monetdbd"));
}
rbuf[len - 1] = '\0';
@@ -439,7 +439,7 @@ char* control_send(
close_stream(fdin);
close_stream(fdout);
} else {
- close(sock);
+ closesocket(sock);
}
return(NULL);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
