From: Felix Morgner Date: Fri, 19 Jun 2015 22:32:41 +0000 (+0200) Subject: Merge pull request #62 from marcusball/master X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=ff0497c4e15d166d95d0c9840ec68e5f215024f5;hp=ad54a681ebcadfe38e437fe730a10f4a4aa3d69e Merge pull request #62 from marcusball/master Added socket errno EPROTONOSUPPORT to socket support check in checkIPversions() --- diff --git a/src/server.c b/src/server.c index e83a68a..1a58632 100644 --- a/src/server.c +++ b/src/server.c @@ -67,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"); @@ -85,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");