X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=2f25c549361f9acdef55cd58bc03fa94df97bc4b;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=0ea84448c5d40d53477e8b379c98793233969700;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 0ea84448c..2f25c5493 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -74,9 +74,9 @@ ListenSocket::~ListenSocket()
 	if (this->GetFd() > -1)
 	{
 		ServerInstance->SE->DelFd(this);
-		ServerInstance->Logs->Log("SOCKET", DEBUG,"Shut down listener on fd %d", this->fd);
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"Shut down listener on fd %d", this->fd);
 		if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this))
-			ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno));
+			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"Failed to cancel listener: %s", strerror(errno));
 		this->fd = -1;
 	}
 }
@@ -90,7 +90,7 @@ void ListenSocket::AcceptInternal()
 	socklen_t length = sizeof(client);
 	int incomingSockfd = ServerInstance->SE->Accept(this, &client.sa, &length);
 
-	ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd);
+	ServerInstance->Logs->Log("SOCKET",LOG_DEBUG,"HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd);
 	if (incomingSockfd < 0)
 	{
 		ServerInstance->stats->statsRefused++;
@@ -100,7 +100,7 @@ void ListenSocket::AcceptInternal()
 	socklen_t sz = sizeof(server);
 	if (getsockname(incomingSockfd, &server.sa, &sz))
 	{
-		ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Can't get peername: %s", strerror(errno));
 		irc::sockets::aptosa(bind_addr, bind_port, server);
 	}
 
@@ -116,7 +116,7 @@ void ListenSocket::AcceptInternal()
 	 */
 	if (incomingSockfd >= ServerInstance->SE->GetMaxFds())
 	{
-		ServerInstance->Logs->Log("SOCKET", DEBUG, "Server is full");
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Server is full");
 		ServerInstance->SE->Shutdown(incomingSockfd, 2);
 		ServerInstance->SE->Close(incomingSockfd);
 		ServerInstance->stats->statsRefused++;
@@ -142,16 +142,14 @@ void ListenSocket::AcceptInternal()
 		{
 			// recreate as a sockaddr_in using the IPv4 IP
 			uint16_t sport = client.in6.sin6_port;
-			uint32_t addr = *reinterpret_cast<uint32_t*>(client.in6.sin6_addr.s6_addr + 12);
 			client.in4.sin_family = AF_INET;
 			client.in4.sin_port = sport;
-			client.in4.sin_addr.s_addr = addr;
+			memcpy(&client.in4.sin_addr.s_addr, client.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t));
 
 			sport = server.in6.sin6_port;
-			addr = *reinterpret_cast<uint32_t*>(server.in6.sin6_addr.s6_addr + 12);
 			server.in4.sin_family = AF_INET;
 			server.in4.sin_port = sport;
-			server.in4.sin_addr.s_addr = addr;
+			memcpy(&server.in4.sin_addr.s_addr, server.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t));
 		}
 	}
 
@@ -175,7 +173,7 @@ void ListenSocket::AcceptInternal()
 	else
 	{
 		ServerInstance->stats->statsRefused++;
-		ServerInstance->Logs->Log("SOCKET",DEFAULT,"Refusing connection on %s - %s",
+		ServerInstance->Logs->Log("SOCKET",LOG_DEFAULT,"Refusing connection on %s - %s",
 			bind_desc.c_str(), res == MOD_RES_DENY ? "Connection refused by module" : "Module for this port not found");
 		ServerInstance->SE->Close(incomingSockfd);
 	}
@@ -186,10 +184,10 @@ void ListenSocket::HandleEvent(EventType e, int err)
 	switch (e)
 	{
 		case EVENT_ERROR:
-			ServerInstance->Logs->Log("SOCKET",DEFAULT,"ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err));
+			ServerInstance->Logs->Log("SOCKET",LOG_DEFAULT,"ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err));
 			break;
 		case EVENT_WRITE:
-			ServerInstance->Logs->Log("SOCKET",DEBUG,"*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!");
+			ServerInstance->Logs->Log("SOCKET",LOG_DEBUG,"*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!");
 			break;
 		case EVENT_READ:
 			this->AcceptInternal();