X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=ca12a9ba3bf836182c16a55f704555178c338027;hb=a0f7d012791d79b67b56b62415f7901d5e48870f;hp=3e87b8c5a3f0479d536aa63d529769ce41268427;hpb=41c5e43ff2e50131778714c1f4ce5d04adb82fa9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 3e87b8c5a..ca12a9ba3 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -92,7 +92,7 @@ class IdentRequestSocket : public EventHandler
 	{
 		age = ServerInstance->Time();
 
-		SetFd(socket(user->server_sa.sa.sa_family, SOCK_STREAM, 0));
+		SetFd(socket(user->server_sa.family(), SOCK_STREAM, 0));
 
 		if (GetFd() == -1)
 			throw ModuleException("Could not create socket");
@@ -105,7 +105,7 @@ class IdentRequestSocket : public EventHandler
 		memcpy(&bindaddr, &user->server_sa, sizeof(bindaddr));
 		memcpy(&connaddr, &user->client_sa, sizeof(connaddr));
 
-		if (connaddr.sa.sa_family == AF_INET6)
+		if (connaddr.family() == AF_INET6)
 		{
 			bindaddr.in6.sin6_port = 0;
 			connaddr.in6.sin6_port = htons(113);
@@ -126,7 +126,7 @@ class IdentRequestSocket : public EventHandler
 		SocketEngine::NonBlocking(GetFd());
 
 		/* Attempt connection (nonblocking) */
-		if (SocketEngine::Connect(this, &connaddr.sa, connaddr.sa_size()) == -1 && errno != EINPROGRESS)
+		if (SocketEngine::Connect(this, connaddr) == -1 && errno != EINPROGRESS)
 		{
 			this->Close();
 			throw ModuleException("connect() failed");
@@ -140,16 +140,15 @@ class IdentRequestSocket : public EventHandler
 		}
 	}
 
-	void OnConnected()
+	void OnEventHandlerWrite() CXX11_OVERRIDE
 	{
-		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnConnected()");
 		SocketEngine::ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 
 		char req[32];
 
 		/* Build request in the form 'localport,remoteport\r\n' */
 		int req_size;
-		if (user->client_sa.sa.sa_family == AF_INET6)
+		if (user->client_sa.family() == AF_INET6)
 			req_size = snprintf(req, sizeof(req), "%d,%d\r\n",
 				ntohs(user->client_sa.in6.sin6_port), ntohs(user->server_sa.in6.sin6_port));
 		else
@@ -163,30 +162,6 @@ class IdentRequestSocket : public EventHandler
 			done = true;
 	}
 
-	void HandleEvent(EventType et, int errornum = 0)
-	{
-		switch (et)
-		{
-			case EVENT_READ:
-				/* fd readable event, received ident response */
-				ReadResponse();
-			break;
-			case EVENT_WRITE:
-				/* fd writeable event, successfully connected! */
-				OnConnected();
-			break;
-			case EVENT_ERROR:
-				/* fd error event, ohshi- */
-				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "EVENT_ERROR");
-				/* We *must* Close() here immediately or we get a
-				 * huge storm of EVENT_ERROR events!
-				 */
-				Close();
-				done = true;
-			break;
-		}
-	}
-
 	void Close()
 	{
 		/* Remove ident socket from engine, and close it, but dont detatch it
@@ -204,7 +179,7 @@ class IdentRequestSocket : public EventHandler
 		return done;
 	}
 
-	void ReadResponse()
+	void OnEventHandlerRead() CXX11_OVERRIDE
 	{
 		/* We don't really need to buffer for incomplete replies here, since IDENT replies are
 		 * extremely short - there is *no* sane reason it'd be in more than one packet
@@ -264,6 +239,12 @@ class IdentRequestSocket : public EventHandler
 		}
 	}
 
+	void OnEventHandlerError(int errornum) CXX11_OVERRIDE
+	{
+		Close();
+		done = true;
+	}
+
 	CullResult cull() CXX11_OVERRIDE
 	{
 		Close();
@@ -277,7 +258,8 @@ class ModuleIdent : public Module
 	bool NoLookupPrefix;
 	SimpleExtItem<IdentRequestSocket, stdalgo::culldeleter> ext;
  public:
-	ModuleIdent() : ext("ident_socket", this)
+	ModuleIdent()
+		: ext("ident_socket", ExtensionItem::EXT_USER, this)
 	{
 	}
 
@@ -289,12 +271,16 @@ class ModuleIdent : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("ident");
-		RequestTimeout = tag->getInt("timeout", 5, 1);
+		RequestTimeout = tag->getDuration("timeout", 5, 1);
 		NoLookupPrefix = tag->getBool("nolookupprefix", false);
 	}
 
 	void OnUserInit(LocalUser *user) CXX11_OVERRIDE
 	{
+		// The ident protocol requires that clients are connecting over a protocol with ports.
+		if (user->client_sa.family() != AF_INET && user->client_sa.family() != AF_INET6)
+			return;
+
 		ConfigTag* tag = user->MyClass->config;
 		if (!tag->getBool("useident", true))
 			return;