X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=31fbffb617cfe5fa99dcae6907d7a63fbba408b6;hb=f48750e54a87cd95d7673059146177c2d888b050;hp=5882a1c0f693d157ed4dfd31d44ef1cd18612675;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 5882a1c0f..31fbffb61 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <string>
 #include "configreader.h"
 #include "socket.h"
-#include "inspircd.h"
 #include "socketengine.h"
 #include "wildcard.h"
 
@@ -47,10 +47,8 @@ ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerIns
 		if ((!*addr) || (strchr(addr,':')))
 			this->family = AF_INET6;
 		else
-			this->family = AF_INET;
-#else
-		this->family = AF_INET;
 #endif
+		this->family = AF_INET;
 		Instance->SE->AddFd(this);
 	}
 }
@@ -81,14 +79,12 @@ void ListenSocket::HandleEvent(EventType et, int errornum)
 		length = sizeof(sockaddr_in6);
 	}
 	else
+#endif
 	{
 		uslen = sizeof(sockaddr_in);
 		length = sizeof(sockaddr_in);
 	}
-#else
-	uslen = sizeof(sockaddr_in);
-	length = sizeof(sockaddr_in);
-#endif
+
 	incomingSockfd = _accept (this->GetFd(), (sockaddr*)client, &length);
 
 	if ((incomingSockfd > -1) && (!_getsockname(incomingSockfd, sock_us, &uslen)))
@@ -101,14 +97,12 @@ void ListenSocket::HandleEvent(EventType et, int errornum)
 			in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
 		}
 		else
+#endif
 		{
 			inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
 			in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
 		}
-#else
-		inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
-		in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
-#endif
+
 		NonBlocking(incomingSockfd);
 		if (ServerInstance->Config->GetIOHook(in_port))
 		{
@@ -304,22 +298,22 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma
 void irc::sockets::Blocking(int s)
 {
 #ifndef WIN32
-    int flags = fcntl(s, F_GETFL, 0);
+	int flags = fcntl(s, F_GETFL, 0);
 	fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
 #else
-    unsigned long opt = 0;
-    ioctlsocket(s, FIONBIO, &opt);
+	unsigned long opt = 0;
+	ioctlsocket(s, FIONBIO, &opt);
 #endif
 }
 
 void irc::sockets::NonBlocking(int s)
 {
 #ifndef WIN32
-    int flags = fcntl(s, F_GETFL, 0);
+	int flags = fcntl(s, F_GETFL, 0);
 	fcntl(s, F_SETFL, flags | O_NONBLOCK);
 #else
-    unsigned long opt = 1;
-    ioctlsocket(s, FIONBIO, &opt);
+	unsigned long opt = 1;
+	ioctlsocket(s, FIONBIO, &opt);
 #endif
 }