X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fserver.c;h=9dc0c29b57969c59bfc0a5222f2d33e6dffef3b6;hb=d723b45fc42e04b9179ba29c65efc9484ec2924c;hp=09e05ddefaf0868fe799b5efe2565ca52c2c035c;hpb=896bf64f85e767ce90bf8370f3731fa835e07f31;p=umurmur.git

diff --git a/src/server.c b/src/server.c
index 09e05dd..9dc0c29 100644
--- a/src/server.c
+++ b/src/server.c
@@ -44,9 +44,11 @@
 #include "client.h"
 #include "conf.h"
 #include "log.h"
+#include "memory.h"
 #include "timer.h"
 #include "version.h"
 #include "util.h"
+#include "sharedmemory.h"
 
 /* globals */
 bool_t shutdown_server;
@@ -66,11 +68,11 @@ void checkIPversions()
 	int testsocket = -1;
 
 	testsocket = socket(PF_INET, SOCK_STREAM, 0);
-	hasv4 = (errno == EAFNOSUPPORT) ? false : true;
+	hasv4 = (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) ? false : true;
 	if (!(testsocket < 0)) close(testsocket);
 
 	testsocket = socket(PF_INET6, SOCK_STREAM, 0);
-	hasv6 = (errno == EAFNOSUPPORT) ? false : true;
+	hasv6 = (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) ? false : true;
 	if (!(testsocket < 0)) close(testsocket);
 
 	if(!hasv4)
@@ -84,7 +86,6 @@ void checkIPversions()
 		Log_info("IPv6 is not supported by this system");
 		nofServerSocks -= 2;
 	}
-
 	if(nofServerSocks == 0)
 	{
 		Log_fatal("Neither IPv4 nor IPv6 are supported by this system");
@@ -94,11 +95,11 @@ void checkIPversions()
 /* Initialize the address structures for IPv4 and IPv6 */
 struct sockaddr_storage** Server_setupAddressesAndPorts()
 {
-	struct sockaddr_storage** addresses = calloc(2, sizeof(void*));
+	struct sockaddr_storage** addresses = Memory_safeCalloc(2, sizeof(void*));
 
-	struct sockaddr_storage* v4address = calloc(1, sizeof(struct sockaddr_storage));
+	struct sockaddr_storage* v4address = Memory_safeCalloc(1, sizeof(struct sockaddr_storage));
 	v4address->ss_family = AF_INET;
-	struct sockaddr_storage* v6address = calloc(1, sizeof(struct sockaddr_storage));
+	struct sockaddr_storage* v6address = Memory_safeCalloc(1, sizeof(struct sockaddr_storage));
 	v6address->ss_family = AF_INET6;
 
 #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
@@ -142,6 +143,10 @@ void Server_runLoop(struct pollfd* pollfds)
 		struct sockaddr_storage remote;
 		int i;
 
+#ifdef USE_SHAREDMEMORY_API
+    Sharedmemory_alivetick();
+#endif
+
 		for(i = 0; i < nofServerSocks; i++) {
 			pollfds[i].revents = 0;
 		}
@@ -171,12 +176,14 @@ void Server_runLoop(struct pollfd* pollfds)
 		/* Check for new connection */
 		for (i = 0; i < nofServerSocks / 2; i++) {
 			if (pollfds[i].revents) {
-				static int tcpfd;
-				static uint32_t addrlen = sizeof(struct sockaddr_storage);
+				int tcpfd;
+				uint32_t addrlen = sizeof(struct sockaddr_storage);
 				tcpfd = accept(pollfds[i].fd, (struct sockaddr *)&remote, &addrlen);
 				fcntl(tcpfd, F_SETFL, O_NONBLOCK);
 				setsockopt(tcpfd, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof(int));
-				Log_debug("Connection from %s port %d\n", Util_addressToString(&remote), Util_addressToPort(&remote));
+				char *addressString = Util_addressToString(&remote);
+				Log_debug("Connection from %s port %d\n", addressString, Util_addressToPort(&remote));
+				free(addressString);
 				if (Client_add(tcpfd, &remote) < 0)
 					close(tcpfd);
 			}
@@ -194,12 +201,15 @@ void Server_runLoop(struct pollfd* pollfds)
 			if (pollfds[nofServerSocks + i].revents & POLLOUT)
 				Client_write_fd(pollfds[nofServerSocks + i].fd);
 		}
+#ifdef USE_SHAREDMEMORY_API
+    Sharedmemory_update();
+#endif
 	}
 }
 
 void Server_setupTCPSockets(struct sockaddr_storage* addresses[2], struct pollfd* pollfds)
 {
-	uint8_t yes = 1;
+	int yes = 1;
 	int sockets[2];
 
 	if (hasv4) {
@@ -209,8 +219,11 @@ void Server_setupTCPSockets(struct sockaddr_storage* addresses[2], struct pollfd
 			Log_fatal("socket IPv4");
 		if (setsockopt(sockets[0], SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) != 0)
 			Log_fatal("setsockopt IPv4: %s", strerror(errno));
-		if (bind(sockets[0], (struct sockaddr *)addresses[0], sizeof (struct sockaddr_in)) < 0)
-			Log_fatal("bind %s %d: %s", Util_addressToString(addresses[0]), Util_addressToPort(addresses[0]), strerror(errno));
+		if (bind(sockets[0], (struct sockaddr *)addresses[0], sizeof (struct sockaddr_in)) < 0) {
+			char *addressString = Util_addressToString(addresses[0]);
+			Log_fatal("bind %s %d: %s", addressString, Util_addressToPort(addresses[0]), strerror(errno));
+			free(addressString);
+		}
 		if (listen(sockets[0], 3) < 0)
 			Log_fatal("listen IPv4");
 		fcntl(sockets[0], F_SETFL, O_NONBLOCK);
@@ -228,8 +241,11 @@ void Server_setupTCPSockets(struct sockaddr_storage* addresses[2], struct pollfd
 			Log_fatal("setsockopt IPv6: %s", strerror(errno));
 		if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(int)) != 0)
 			Log_fatal("setsockopt IPv6: %s", strerror(errno));
-		if (bind(sockets[1], (struct sockaddr *)addresses[1], sizeof (struct sockaddr_in6)) < 0)
-			Log_fatal("bind %s %d: %s", Util_addressToString(addresses[1]), Util_addressToPort(addresses[1]), strerror(errno));
+		if (bind(sockets[1], (struct sockaddr *)addresses[1], sizeof (struct sockaddr_in6)) < 0) {
+			char *addressString = Util_addressToString(addresses[1]);
+			Log_fatal("bind %s %d: %s", addressString, Util_addressToPort(addresses[1]), strerror(errno));
+			free(addressString);
+		}
 		if (listen(sockets[1], 3) < 0)
 			Log_fatal("listen IPv6");
 		fcntl(sockets[1], F_SETFL, O_NONBLOCK);
@@ -246,13 +262,15 @@ void Server_setupUDPSockets(struct sockaddr_storage* addresses[2], struct pollfd
 	int val = 0;
 	int sockets[2] = {-1, -1};
 
-	if((udpsocks = calloc(nofServerSocks / 2, sizeof(int))) == NULL)
-		Log_fatal("Out of memory (%s:%s)", __FILE__, __LINE__);
+	udpsocks = Memory_safeCalloc(nofServerSocks / 2, sizeof(int));
 
 	if (hasv4) {
 		sockets[0] = socket(PF_INET, SOCK_DGRAM, 0);
-		if (bind(sockets[0], (struct sockaddr *) addresses[0], sizeof (struct sockaddr_in)) < 0)
-			Log_fatal("bind %s %d: %s", Util_addressToString(addresses[0]), Util_addressToPort(addresses[0]), strerror(errno));
+		if (bind(sockets[0], (struct sockaddr *) addresses[0], sizeof (struct sockaddr_in)) < 0) {
+			char *addressString = Util_addressToString(addresses[0]);
+			Log_fatal("bind %s %d: %s", addressString, Util_addressToPort(addresses[0]), strerror(errno));
+			free(addressString);
+		}
 		val = 0xe0;
 		if (setsockopt(sockets[0], IPPROTO_IP, IP_TOS, &val, sizeof(val)) < 0)
 			Log_warn("Server: Failed to set TOS for UDP Socket");
@@ -270,8 +288,11 @@ void Server_setupUDPSockets(struct sockaddr_storage* addresses[2], struct pollfd
 		sockets[1] = socket(PF_INET6, SOCK_DGRAM, 0);
 		if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(int)) != 0)
 			Log_fatal("setsockopt IPv6: %s", strerror(errno));
-		if (bind(sockets[1], (struct sockaddr *) addresses[1], sizeof (struct sockaddr_in6)) < 0)
-			Log_fatal("bind %s %d: %s", Util_addressToString(addresses[1]), Util_addressToPort(addresses[1]), strerror(errno));
+		if (bind(sockets[1], (struct sockaddr *) addresses[1], sizeof (struct sockaddr_in6)) < 0) {
+			char *addressString = Util_addressToString(addresses[1]);
+			Log_fatal("bind %s %d: %s", addressString, Util_addressToPort(addresses[1]), strerror(errno));
+			free(addressString);
+		}
 		val = 0xe0;
 		if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_TCLASS, &val, sizeof(val)) < 0)
 			Log_warn("Server: Failed to set TOS for UDP Socket");
@@ -294,8 +315,7 @@ void Server_run()
 	checkIPversions();
 
 	/* max clients + server sokets + client connecting that will be disconnected */
-	if ((pollfds = calloc((getIntConf(MAX_CLIENTS) + nofServerSocks + 1) , sizeof(struct pollfd))) == NULL)
-		Log_fatal("out of memory");
+	pollfds = Memory_safeCalloc((getIntConf(MAX_CLIENTS) + nofServerSocks + 1) , sizeof(struct pollfd));
 
 	/* Figure out bind address and port */
 	struct sockaddr_storage** addresses = Server_setupAddressesAndPorts();