Changeset: 484afd19e56e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=484afd19e56e
Modified Files:
tools/merovingian/daemon/client.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/control.c
Branch: Oct2014
Log Message:
In merovingian code, don't use SOCKET_ERROR and INVALID_SOCKET.
diffs (263 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
@@ -418,7 +418,7 @@ acceptConnections(int sock, int usock)
/* nothing interesting has happened */
continue;
}
- if (retval == SOCKET_ERROR) {
+ if (retval == -1) {
if (_mero_keep_listening == 0)
break;
if (errno != EINTR) {
@@ -428,7 +428,7 @@ acceptConnections(int sock, int usock)
continue;
}
if (FD_ISSET(sock, &fds)) {
- if ((msgsock = accept(sock, (SOCKPTR)0, (socklen_t *)
0)) == INVALID_SOCKET) {
+ if ((msgsock = accept(sock, (SOCKPTR)0, (socklen_t *)
0)) == -1) {
if (_mero_keep_listening == 0)
break;
if (errno != EINTR) {
@@ -444,7 +444,7 @@ acceptConnections(int sock, int usock)
int rv;
char ccmsg[CMSG_SPACE(sizeof(int))];
- if ((msgsock = accept(usock, (SOCKPTR)0, (socklen_t
*)0)) == INVALID_SOCKET) {
+ if ((msgsock = accept(usock, (SOCKPTR)0, (socklen_t
*)0)) == -1) {
if (_mero_keep_listening == 0)
break;
if (errno != EINTR) {
diff --git a/tools/merovingian/daemon/connections.c
b/tools/merovingian/daemon/connections.c
--- a/tools/merovingian/daemon/connections.c
+++ b/tools/merovingian/daemon/connections.c
@@ -53,7 +53,7 @@ openConnectionTCP(int *ret, unsigned sho
#endif
sock = socket(AF_INET, SOCK_STREAM, 0);
- if (sock == INVALID_SOCKET)
+ if (sock == -1)
return(newErr("creation of stream socket failed: %s",
strerror(errno)));
@@ -73,13 +73,13 @@ openConnectionTCP(int *ret, unsigned sho
length = (socklen_t) sizeof(server);
server.sin_port = htons((unsigned short) ((port) & 0xFFFF));
- if (bind(sock, (SOCKPTR) &server, length) == SOCKET_ERROR) {
+ if (bind(sock, (SOCKPTR) &server, length) == -1) {
closesocket(sock);
return(newErr("binding to stream socket port %hu failed: %s",
port, strerror(errno)));
}
- if (getsockname(sock, (SOCKPTR) &server, &length) == SOCKET_ERROR) {
+ if (getsockname(sock, (SOCKPTR) &server, &length) == -1) {
closesocket(sock);
return(newErr("failed getting socket name: %s",
strerror(errno)));
@@ -131,10 +131,10 @@ openConnectionUDP(int *ret, unsigned sho
for (rp = result; rp != NULL; rp = rp->ai_next) {
sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
- if (sock == INVALID_SOCKET)
+ if (sock == -1)
continue;
- if (bind(sock, rp->ai_addr, rp->ai_addrlen) != SOCKET_ERROR)
+ if (bind(sock, rp->ai_addr, rp->ai_addrlen) != -1)
break; /* working */
closesocket(sock);
@@ -168,7 +168,7 @@ openConnectionUNIX(int *ret, char *path,
int omask;
sock = socket(AF_UNIX, SOCK_STREAM, 0);
- if (sock == INVALID_SOCKET)
+ if (sock == -1)
return(newErr("creation of UNIX stream socket failed: %s",
strerror(errno)));
@@ -179,7 +179,7 @@ openConnectionUNIX(int *ret, char *path,
/* have to use umask to restrict permissions to avoid a race
* condition */
omask = umask(mode);
- if (bind(sock, (SOCKPTR) &server, sizeof(struct sockaddr_un)) ==
SOCKET_ERROR) {
+ if (bind(sock, (SOCKPTR) &server, sizeof(struct sockaddr_un)) == -1) {
umask(omask);
return(newErr("binding to UNIX stream socket at %s failed: %s",
path, strerror(errno)));
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
@@ -953,7 +953,7 @@ controlRunner(void *d)
/* nothing interesting has happened */
continue;
}
- if (retval == SOCKET_ERROR) {
+ if (retval == -1) {
if (_mero_keep_listening == 0)
break;
continue;
@@ -965,7 +965,7 @@ controlRunner(void *d)
continue;
}
- if ((msgsock = accept(sock, (SOCKPTR) 0, (socklen_t *) 0)) ==
INVALID_SOCKET) {
+ if ((msgsock = accept(sock, (SOCKPTR) 0, (socklen_t *) 0)) ==
-1) {
if (_mero_keep_listening == 0)
break;
if (errno != EINTR) {
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
@@ -124,7 +124,7 @@ FILE *_mero_ctlout = NULL;
/* stream to the stderr for the control runner */
FILE *_mero_ctlerr = NULL;
/* broadcast socket for announcements */
-int _mero_broadcastsock = INVALID_SOCKET;
+int _mero_broadcastsock = -1;
/* broadcast address/port */
struct sockaddr_in _mero_broadcastaddr;
/* hostname of this machine */
@@ -918,9 +918,9 @@ main(int argc, char *argv[])
if (discovery == 1) {
_mero_broadcastsock = socket(AF_INET, SOCK_DGRAM, 0);
ret = 1;
- if (_mero_broadcastsock == INVALID_SOCKET ||
+ if (_mero_broadcastsock == -1 ||
setsockopt(_mero_broadcastsock,
- SOL_SOCKET, SO_BROADCAST,
&ret, sizeof(ret)) == SOCKET_ERROR)
+ SOL_SOCKET, SO_BROADCAST,
&ret, sizeof(ret)) == -1)
{
Mfprintf(stderr, "cannot create broadcast
package, "
"discovery services
disabled\n");
diff --git a/tools/merovingian/daemon/multiplex-funnel.c
b/tools/merovingian/daemon/multiplex-funnel.c
--- a/tools/merovingian/daemon/multiplex-funnel.c
+++ b/tools/merovingian/daemon/multiplex-funnel.c
@@ -80,7 +80,7 @@ MFconnectionManager(void *d)
i = select(mfpipe[0] + 1, &fds, NULL, NULL, &tv);
if (i == 0)
continue;
- if (i == SOCKET_ERROR && errno != EINTR) {
+ if (i == -1 && errno != EINTR) {
Mfprintf(stderr, "failed to select on mfpipe: %s\n",
strerror(errno));
break;
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
+++ b/tools/merovingian/daemon/proxy.c
@@ -104,7 +104,7 @@ startProxy(int psock, stream *cfdin, str
struct sockaddr_in server;
struct sockaddr *serv;
socklen_t servsize;
- int ssock = INVALID_SOCKET;
+ int ssock = -1;
char *port, *t;
char *conn;
struct stat statbuf;
@@ -134,7 +134,7 @@ startProxy(int psock, stream *cfdin, str
return(newErr("unsupported protocol/scheme in redirect: %s",
url));
}
- if (ssock != INVALID_SOCKET) {
+ if (ssock != -1) {
/* UNIX socket connect, don't proxy, but pass socket fd */
struct sockaddr_un server;
struct msghdr msg;
@@ -144,13 +144,13 @@ startProxy(int psock, stream *cfdin, str
char buf[1];
int *c_d;
- if ((ssock = socket(PF_UNIX, SOCK_STREAM, 0)) == INVALID_SOCKET)
+ if ((ssock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
return(newErr("cannot open socket: %s",
strerror(errno)));
memset(&server, 0, sizeof(struct sockaddr_un));
server.sun_family = AF_UNIX;
strncpy(server.sun_path, conn, sizeof(server.sun_path) - 1);
free(conn);
- if (connect(ssock, (SOCKPTR) &server, sizeof(struct
sockaddr_un)) == SOCKET_ERROR) {
+ if (connect(ssock, (SOCKPTR) &server, sizeof(struct
sockaddr_un)) == -1) {
return(newErr("cannot connect: %s", strerror(errno)));
}
@@ -185,7 +185,7 @@ startProxy(int psock, stream *cfdin, str
}
/* block until the server acknowledges that it has psock
* connected with itself */
- if (recv(ssock, buf, 1, 0) == SOCKET_ERROR) {
+ if (recv(ssock, buf, 1, 0) == -1) {
close(ssock);
return(newErr("could not receive initial byte: %s",
strerror(errno)));
}
@@ -212,11 +212,11 @@ startProxy(int psock, stream *cfdin, str
servsize = sizeof(server);
ssock = socket(serv->sa_family, SOCK_STREAM, IPPROTO_TCP);
- if (ssock == INVALID_SOCKET) {
+ if (ssock == -1) {
return(newErr("cannot open socket: %s",
strerror(errno)));
}
- if (connect(ssock, serv, servsize) == SOCKET_ERROR) {
+ if (connect(ssock, serv, servsize) == -1) {
closesocket(ssock);
return(newErr("cannot connect: %s", strerror(errno)));
}
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
@@ -67,7 +67,7 @@ char* control_send(
if (port == -1) {
struct sockaddr_un server;
/* UNIX socket connect */
- if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == INVALID_SOCKET)
{
+ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1) {
snprintf(sbuf, sizeof(sbuf), "cannot open connection:
%s",
strerror(errno));
return(strdup(sbuf));
@@ -75,7 +75,7 @@ char* control_send(
memset(&server, 0, sizeof(struct sockaddr_un));
server.sun_family = AF_UNIX;
strncpy(server.sun_path, host, sizeof(server.sun_path) - 1);
- if (connect(sock, (SOCKPTR) &server, sizeof(struct
sockaddr_un)) == SOCKET_ERROR) {
+ if (connect(sock, (SOCKPTR) &server, sizeof(struct
sockaddr_un)) == -1) {
snprintf(sbuf, sizeof(sbuf), "cannot connect: %s",
strerror(errno));
close(sock);
return(strdup(sbuf));
@@ -87,7 +87,7 @@ char* control_send(
char *p;
/* TCP socket connect */
- if ((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) ==
INVALID_SOCKET) {
+ if ((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
snprintf(sbuf, sizeof(sbuf), "cannot open connection:
%s",
strerror(errno));
return(strdup(sbuf));
@@ -103,7 +103,7 @@ char* control_send(
server.sin_family = hp->h_addrtype;
memcpy(&server.sin_addr, hp->h_addr_list[0], hp->h_length);
server.sin_port = htons((unsigned short) (port & 0xFFFF));
- if (connect(sock, (SOCKPTR) &server, sizeof(struct
sockaddr_in)) == SOCKET_ERROR) {
+ if (connect(sock, (SOCKPTR) &server, sizeof(struct
sockaddr_in)) == -1) {
snprintf(sbuf, sizeof(sbuf), "cannot connect: %s",
strerror(errno));
close(sock);
return(strdup(sbuf));
@@ -162,7 +162,7 @@ char* control_send(
p, ver == 2 ? ":control" : "");
len = send(sock, sbuf, len, 0);
free(p);
- if (len == SOCKET_ERROR) {
+ if (len == -1) {
close(sock);
return(strdup("cannot send challenge
response to server"));
}
@@ -331,7 +331,7 @@ char* control_send(
mnstr_flush(fdout);
} else {
len = snprintf(sbuf, sizeof(sbuf), "%s %s\n", database,
command);
- if (send(sock, sbuf, len, 0) == SOCKET_ERROR) {
+ if (send(sock, sbuf, len, 0) == -1) {
close(sock);
return(strdup("failed to send control command to
server"));
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
