Changeset: b6a63d4c2e57 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6a63d4c2e57
Modified Files:
tools/merovingian/daemon/connections.c
Branch: Nov2019
Log Message:
Use modern code.
diffs (44 lines):
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
@@ -33,7 +33,6 @@ openConnectionTCP(int *ret, bool bind_ip
int sock = -1, check = 0;
socklen_t length = 0;
int on = 1;
- int i = 0;
char sport[16];
snprintf(sport, 16, "%hu", port);
@@ -93,20 +92,22 @@ openConnectionTCP(int *ret, bool bind_ip
return(newErr("creation of stream socket failed: %s",
strerror(errno)));
if (bind_ipv6) {
- memset(&server_ipv6, 0, sizeof(server_ipv6));
- server_ipv6.sin6_family = AF_INET6;
+ server_ipv6 = (struct sockaddr_in6) {
+ .sin6_family = AF_INET6,
+ .sin6_port = htons((unsigned short) (port &
0xFFFF)),
+ .sin6_addr = ipv6_any_addr,
+ };
length = (socklen_t) sizeof(server_ipv6);
- server_ipv6.sin6_port = htons((unsigned short) ((port)
& 0xFFFF));
- server_ipv6.sin6_addr = ipv6_any_addr;
+ server = (struct sockaddr*) &server_ipv6;
} else {
- server_ipv4.sin_family = AF_INET;
- for (i = 0; i < 8; i++)
- server_ipv4.sin_zero[i] = 0;
+ server_ipv4 = (struct sockaddr_in) {
+ .sin_family = AF_INET,
+ .sin_port = htons((unsigned short) (port &
0xFFFF)),
+ .sin_addr.s_addr = htonl(INADDR_ANY),
+ };
length = (socklen_t) sizeof(server_ipv4);
- server_ipv4.sin_port = htons((unsigned short) ((port) &
0xFFFF));
- server_ipv4.sin_addr.s_addr = htonl(INADDR_ANY);
+ server = (struct sockaddr*) &server_ipv4;
}
- server = bind_ipv6 ? (struct sockaddr*) &server_ipv6 : (struct
sockaddr*) &server_ipv4;
#if !defined(SOCK_CLOEXEC) && defined(HAVE_FCNTL)
(void) fcntl(sock, F_SETFD, FD_CLOEXEC);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
