Null pointer references

[umurmur.git] / src / server.c

diff --git a/src/server.c b/src/server.c
index 09e05ddefaf0868fe799b5efe2565ca52c2c035c..8aa356c58c2f0df6e69f580f947e8137dd4183c7 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -47,6 +47,7 @@
 #include "timer.h"
 #include "version.h"
 #include "util.h"
+#include "sharedmemory.h"
 
 /* globals */
 bool_t shutdown_server;
@@ -66,11 +67,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 +85,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");
@@ -95,10 +95,17 @@ void checkIPversions()
 struct sockaddr_storage** Server_setupAddressesAndPorts()
 {
        struct sockaddr_storage** addresses = calloc(2, sizeof(void*));
+       if(!addresses)
+               Log_fatal("Not enough memory to allocate addresses");
 
        struct sockaddr_storage* v4address = calloc(1, sizeof(struct sockaddr_storage));
+       if(!v4address)
+               Log_fatal("Not enough memory to allocate IPv4 address");
        v4address->ss_family = AF_INET;
+
        struct sockaddr_storage* v6address = calloc(1, sizeof(struct sockaddr_storage));
+       if(!v6address)
+               Log_fatal("Not enough memory to allocate IPv6 address");
        v6address->ss_family = AF_INET6;
 
 #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
@@ -142,6 +149,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 +182,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,6 +207,9 @@ 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
        }
 }
 
@@ -209,8 +225,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 +247,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);
@@ -251,8 +273,11 @@ void Server_setupUDPSockets(struct sockaddr_storage* addresses[2], struct pollfd
 
        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 +295,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");