When a server sends a SERVER command with <5 params, dont just close the connection...

[user/henk/code/inspircd.git] / src / modules / m_ident.cpp

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 3c1106b4d56e22f503a5caf45e006ba41a817f5f..16629d700610b343711b303d3126d04be8528e87 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for RFC 1413 ident lookups */
 
@@ -147,13 +144,9 @@ class RFC1413 : public InspSocket
                        {
                                themlen = sizeof(sockaddr_in6);
                                uslen = sizeof(sockaddr_in6);
-                               success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
                        }
-                       else
-                               success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
-#else
-                       success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
 #endif
+                       success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
                        if (success)
                        {
                                delete[] sock_us;
@@ -167,10 +160,8 @@ class RFC1413 : public InspSocket
                                if (this->u->GetProtocolFamily() == AF_INET6)
                                        snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in6*)sock_them)->sin6_port),ntohs(((sockaddr_in6*)sock_us)->sin6_port));
                                else
-                                       snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
-#else
-                               snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
 #endif
+                               snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
                                this->Write(ident_request);
                                delete[] sock_us;
                                delete[] sock_them;
@@ -198,9 +189,11 @@ class ModuleIdent : public Module
                Conf = new ConfigReader(ServerInstance);
                IdentTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
                PortBind = Conf->ReadValue("ident", "bind", 0);
+
                if (!IdentTimeout)
                        IdentTimeout = 1;
-               DELETE(Conf);
+
+               delete Conf;
        }
 
        ModuleIdent(InspIRCd* Me)
@@ -285,7 +278,6 @@ class ModuleIdent : public Module
                                // to NULL and check it so that we dont write users who have gone away.
                                ident->u = NULL;
                                ServerInstance->SE->DelFd(ident);
-                               //delete ident;
                        }
                        if (user->GetExt("IDENT", identstr))
                        {
@@ -329,27 +321,4 @@ class ModuleIdent : public Module
 
 };
 
-class ModuleIdentFactory : public ModuleFactory
-{
- public:
-       ModuleIdentFactory()
-       {
-       }
-
-       ~ModuleIdentFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleIdent(Me);
-       }
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleIdentFactory;
-}
-
+MODULE_INIT(ModuleIdent)