X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=e481846942f0931664c5e39d82ddaad594010d6b;hb=caf0301c894d41aa04ceb685ef981d6292fecd2d;hp=b9e22c94903c1f79b891de20fcc18ff555a52f8c;hpb=5db1d322be106c8462dc691072f9415dc0766ed4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index b9e22c949..e48184694 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -58,9 +58,9 @@ ListenSocket::~ListenSocket()
 	if (this->GetFd() > -1)
 	{
 		ServerInstance->SE->DelFd(this);
-		ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd);
+		ServerInstance->Logs->Log("SOCKET", DEBUG,"Shut down listener on fd %d", this->fd);
 		if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this))
-			ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno));
+			ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno));
 		this->fd = -1;
 	}
 }
@@ -101,34 +101,42 @@ void ListenSocket::HandleEvent(EventType, int)
 	if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
 	{
 		char buf[MAXBUF];
+		char target[MAXBUF];
+
+		*target = *buf = '\0';
+
+		sockaddr* raddr = new sockaddr[2];
+
 #ifdef IPV6
 		if (this->family == AF_INET6)
 		{
-			inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
 			in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
+			inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
+			socklen_t raddrsz = sizeof(sockaddr_in6);
+			if (getpeername(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
+				inet_ntop(AF_INET6, &((const sockaddr_in6*)raddr)->sin6_addr, target, sizeof(target));
+			else
+				ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
 		}
 		else
 #endif
 		{
 			inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
 			in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
+			socklen_t raddrsz = sizeof(sockaddr_in);
+			if (getpeername(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
+				inet_ntop(AF_INET, &((const sockaddr_in*)raddr)->sin_addr, target, sizeof(target));
+			else
+				ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+
 		}
 
+		delete[] raddr;
+
 		ServerInstance->SE->NonBlocking(incomingSockfd);
 
-		if (ServerInstance->Config->GetIOHook(in_port))
-		{
-			try
-			{
-				ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, buf, in_port);
-			}
-			catch (CoreException& modexcept)
-			{
-				ServerInstance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-			}
-		}
 		ServerInstance->stats->statsAccept++;
-		ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
+		ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client, target);
 	}
 	else
 	{
@@ -309,7 +317,7 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma
  * It can only bind to IP addresses, if you wish to bind to hostnames
  * you should first resolve them using class 'Resolver'.
  */ 
-bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 {
 	/* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
 	sockaddr* servaddr = new sockaddr[2];
@@ -318,7 +326,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
 	int ret, size;
 
 	if (*addr == '*')
-		*addr = 0;
+		addr = "";
 
 #ifdef IPV6
 	if (*addr)
@@ -412,19 +420,19 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
 		{
 			if (SE->Listen(sockfd, Config->MaxConn) == -1)
 			{
-				this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
+				this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno));
 				return false;
 			}
 			else
 			{
-				this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
+				this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
 				SE->NonBlocking(sockfd);
 				return true;
 			}
 		}
 		else
 		{
-			this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
+			this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
 			return true;
 		}
 	}
@@ -478,7 +486,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 		Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
 		
 		if (strncmp(Addr, "::ffff:", 7) == 0)
-			this->Log(DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
+			this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
 		
 		if ((!*Type) || (!strcmp(Type,"clients")))
 		{
@@ -533,7 +541,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 			{
 				if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
 				{
-					this->Log(DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
+					this->Logs->Log("SOCKET",DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
 					delete *n;
 					Config->ports.erase(n);
 					break;