X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fserver.c;h=1a586324b0af1dbc1bc9dc09327efe811929ea7d;hb=b7e9b979cc213314416d5cf890560408872d565b;hp=9bb6ccb801e44294ca872145f99b5b30a56de4fc;hpb=49584345810f98b779d6927f7997fcdd11b98569;p=umurmur.git diff --git a/src/server.c b/src/server.c index 9bb6ccb..1a58632 100644 --- 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,13 +67,13 @@ 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) { Log_info("IPv4 is not supported by this system"); @@ -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");