X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=14b2abb3ea2e77d7134109d177089f8f9a73687b;hb=bf6ec00f3dc5ae23da1e8a4e20d44555eca0593a;hp=8b7f277310c504d6f9d0e3b56630bac4d18210d1;hpb=a643172dd76776544773eeb4aa49b79a98ac5ca1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 8b7f27731..14b2abb3e 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -14,16 +14,25 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
-#include <fcntl.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
+
+#ifdef USE_KQUEUE
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#endif
+
+#ifdef USE_EPOLL
+#include <sys/epoll.h>
+#endif
+
 #include <time.h>
 #include <string>
 #ifdef GCC3
@@ -34,11 +43,7 @@
 #include <map>
 #include <sstream>
 #include <vector>
-#include <errno.h>
 #include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
 #include "connection.h"
 #include "users.h"
 #include "servers.h"
@@ -52,14 +57,16 @@
 #include "xline.h"
 #include "commands.h"
 #include "inspstring.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
 
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
+#ifdef USE_KQUEUE
+extern int kq;
 #endif
 
-using namespace std;
+#ifdef USE_EPOLL
+int ep;
+#endif
 
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
@@ -91,12 +98,11 @@ extern int NetBufferSize;
 extern int MaxWhoResults;
 extern time_t nb_start;
 
-extern std::vector<int> fd_reap;
 extern std::vector<std::string> module_names;
 
 extern int boundPortCount;
 extern int portCount;
-extern int UDPportCount;
+extern int SERVERportCount;
 extern int ports[MAXSOCKS];
 extern int defaultRoute;
 
@@ -107,80 +113,18 @@ extern serverrec* me[32];
 
 extern FILE *log_file;
 
+extern userrec* fd_ref_table[65536];
 
-namespace nspace
-{
-#ifdef GCC34
-        template<> struct hash<in_addr>
-#else
-        template<> struct nspace::hash<in_addr>
-#endif
-        {
-                size_t operator()(const struct in_addr &a) const
-                {
-                        size_t q;
-                        memcpy(&q,&a,sizeof(size_t));
-                        return q;
-                }
-        };
-#ifdef GCC34
-        template<> struct hash<string>
-#else
-        template<> struct nspace::hash<string>
-#endif
-        {
-                size_t operator()(const string &s) const
-                {
-                        char a[MAXBUF];
-                        static struct hash<const char *> strhash;
-                        strlcpy(a,s.c_str(),MAXBUF);
-                        strlower(a);
-                        return strhash(a);
-                }
-        };
-}
-
-struct StrHashComp
-{
-
-	bool operator()(const string& s1, const string& s2) const
-	{
-		char a[MAXBUF],b[MAXBUF];
-		strlcpy(a,s1.c_str(),MAXBUF);
-		strlcpy(b,s2.c_str(),MAXBUF);
-                strlower(a);
-                strlower(b);
-		return (strcasecmp(a,b) == 0);
-	}
-
-};
-
-struct InAddr_HashComp
-{
-
-	bool operator()(const in_addr &s1, const in_addr &s2) const
-	{
-		size_t q;
-		size_t p;
-		
-		memcpy(&q,&s1,sizeof(size_t));
-		memcpy(&p,&s2,sizeof(size_t));
-		
-		return (q == p);
-	}
-
-};
-
-
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
-typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
+typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
+typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
+typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
+typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
 typedef std::deque<command_t> command_table;
 
 
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern user_hash whowas;
+extern whowas_hash whowas;
 extern command_table cmdlist;
 extern file_cache MOTD;
 extern file_cache RULES;
@@ -445,7 +389,7 @@ void Server::SendToModeMask(std::string modes, int flags, std::string text)
 
 chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key)
 {
-	return add_channel(user,cname.c_str(),key.c_str(),true);
+	return add_channel(user,cname.c_str(),key.c_str(),false);
 }
 
 chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason)
@@ -472,7 +416,6 @@ void Server::ChangeUserNick(userrec* user, std::string nickname)
 
 void Server::QuitUser(userrec* user, std::string reason)
 {
-	send_network_quit(user->nick,reason.c_str());
 	kill_link(user,reason.c_str());
 }
 
@@ -589,6 +532,11 @@ userrec* Server::FindNick(std::string nick)
 	return Find(nick);
 }
 
+userrec* Server::FindDescriptor(int socket)
+{
+	return (socket < 65536 ? fd_ref_table[socket] : NULL);
+}
+
 chanrec* Server::FindChannel(std::string channel)
 {
 	return FindChan(channel.c_str());
@@ -614,6 +562,11 @@ std::string Server::GetNetworkName()
 	return getnetworkname();
 }
 
+std::string Server::GetServerDescription()
+{
+	return getserverdesc();
+}
+
 Admin Server::GetAdmin()
 {
 	return Admin(getadminname(),getadminemail(),getadminnick());
@@ -667,17 +620,40 @@ bool Server::UserToPseudo(userrec* user,std::string message)
 {
 	unsigned int old_fd = user->fd;
 	user->fd = FD_MAGIC_NUMBER;
+	user->ClearBuffer();
 	Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
-	close(old_fd);
-	shutdown (old_fd,2);
+#ifdef USE_KQUEUE
+        struct kevent ke;
+        EV_SET(&ke, old_fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
+        int i = kevent(kq, &ke, 1, 0, 0, NULL);
+        if (i == -1)
+        {
+                log(DEBUG,"kqueue: Failed to remove user from queue!");
+        }
+#endif
+#ifdef USE_EPOLL
+        struct epoll_event ev;
+        ev.events = EPOLLIN | EPOLLET;
+        ev.data.fd = old_fd;
+        int i = epoll_ctl(ep, EPOLL_CTL_DEL, old_fd, &ev);
+        if (i < 0)
+        {
+                log(DEBUG,"epoll: List deletion failure!");
+        }
+#endif
+
+        shutdown(old_fd,2);
+        close(old_fd);
 }
 
 bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
 {
 	zombie->fd = alive->fd;
 	alive->fd = FD_MAGIC_NUMBER;
+	alive->ClearBuffer();
 	Write(zombie->fd,":%s!%s@%s NICK %s",alive->nick,alive->ident,alive->host,zombie->nick);
 	kill_link(alive,message.c_str());
+	fd_ref_table[zombie->fd] = zombie;
         for (int i = 0; i != MAXCHANS; i++)
         {
                 if (zombie->chans[i].channel != NULL)
@@ -693,8 +669,6 @@ bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
                         	}
                         	userlist(zombie,Ptr);
                         	WriteServ(zombie->fd,"366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
-                        	//WriteServ(zombie->fd,"324 %s %s +%s",zombie->nick, Ptr->name,chanmodes(Ptr));
-                        	//WriteServ(zombie->fd,"329 %s %s %d", zombie->nick, Ptr->name, Ptr->created);
 
                         }
                 }
@@ -883,7 +857,7 @@ std::string ConfigReader::ReadValue(std::string tag, std::string name, int index
 		this->error = CONF_VALUE_NOT_FOUND;
 		return "";
 	}
-	return std::string(val);
+	return val;
 }
 
 bool ConfigReader::ReadFlag(std::string tag, std::string name, int index)