]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/commands.cpp
Comments, add more detail, remove dnsqueue.h include from tons of places
[user/henk/code/inspircd.git] / src / commands.cpp
index 4d09db9feb38b51bd239d0792dfae86dee078d0b..247fc89b725db10caf1042ffc63dff4953e265be 100644 (file)
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
+#include "configreader.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
@@ -26,21 +24,11 @@ using namespace std;
 #include <cstdio>
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
 #include <sstream>
 #include <vector>
-#include <deque>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
 #ifndef RUSAGE_SELF
 #define   RUSAGE_SELF     0
 #define   RUSAGE_CHILDREN     -1
@@ -56,7 +44,6 @@ using namespace std;
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
@@ -67,8 +54,8 @@ extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
 
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern ModuleList modules;
+extern FactoryList factory;
 extern time_t TIME;
 
 const long duration_m = 60;
@@ -79,7 +66,6 @@ const long duration_y = duration_w * 52;
 
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
@@ -90,109 +76,54 @@ extern std::vector<userrec*> local_users;
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 
-void split_chlist(userrec* user, userrec* dest, std::string &cl)
-{
-       std::stringstream channels(cl);
-       std::string line = "";
-       std::string cname = "";
-       while (!channels.eof())
-       {
-               channels >> cname;
-               line = line + cname + " ";
-               if (line.length() > 400)
-               {
-                       WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, line.c_str());
-                       line = "";
-               }
-       }
-       if (line.length())
-       {
-               WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, line.c_str());
-       }
-}
-
-void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long idle, char* nick)
+void split_chlist(userrec* user, userrec* dest, const std::string &cl)
 {
-       // bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER
-       if (dest->registered == 7)
+       std::string line;
+       std::ostringstream prefix;
+       std::string::size_type start, pos, length;
+       
+       prefix << ":" << Config->ServerName << " 319 " << user->nick << " " << dest->nick << " :";
+       line = prefix.str();
+       
+       for (start = 0; pos = cl.find(' ', start); start = pos+1)
        {
-               WriteServ(user->fd,"311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
-               if ((user == dest) || (strchr(user->modes,'o')))
-               {
-                       WriteServ(user->fd,"378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, (char*)inet_ntoa(dest->ip4));
-               }
-               std::string cl = chlist(dest,user);
-               if (cl.length())
-               {
-                       if (cl.length() > 400)
-                       {
-                               split_chlist(user,dest,cl);
-                       }
-                       else
-                       {
-                               WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, cl.c_str());
-                       }
-               }
-               WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str());
-               if (*dest->awaymsg)
-               {
-                       WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
-               }
-               if (strchr(dest->modes,'o'))
-               {
-                       if (*dest->oper)
-                       {
-                               WriteServ(user->fd,"313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("aeiou",dest->oper[0]) ? "an" : "a"),dest->oper, Config->Network);
-                       }
-                       else
-                       {
-                               WriteServ(user->fd,"313 %s %s :is an IRC operator",user->nick, dest->nick);
-                       }
-               }
-               if ((!signon) && (!idle))
+               length = (pos == std::string::npos) ? cl.length() : pos;
+               
+               if (line.length() + length - start > 510)
                {
-                       FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
+                       Write_NoFormat(user->fd, line.c_str());
+                       line = prefix.str();
                }
-               if (!strcasecmp(user->server,dest->server))
+               
+               if(pos == std::string::npos)
                {
-                       // idle time and signon line can only be sent if youre on the same server (according to RFC)
-                       WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon);
+                       line += cl.substr(start, length - start);
+                       break;
                }
                else
                {
-                       if ((idle) || (signon))
-                               WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
+                       line += cl.substr(start, length - start + 1);
                }
-               WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
        }
-       else
+       
+       if (line.length())
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, nick);
-               WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, nick);
+               Write_NoFormat(user->fd, line.c_str());
        }
 }
 
+/* XXX - these really belong in helperfuncs perhaps -- w00t */
 bool is_uline(const char* server)
 {
-       char ServName[MAXBUF];
-
        if (!server)
                return false;
-       if (!(*server))
+       if (!*server)
                return true;
 
-       for (int i = 0; i < Config->ConfValueEnum("uline",&Config->config_f); i++)
-       {
-               Config->ConfValue("uline","server",i,ServName,&Config->config_f);
-               if (!strcasecmp(server,ServName))
-               {
-                       return true;
-               }
-       }
-       return false;
+       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
 }
 
-int operstrcmp(char* data,char* input)
+int operstrcmp(const char* data,const char* input)
 {
        int MOD_RESULT = 0;
        FOREACH_RESULT(I_OnOperCompare,OnOperCompare(data,input))
@@ -209,17 +140,16 @@ long duration(const char* str)
 {
        char n_field[MAXBUF];
        long total = 0;
-       const char* str_end = str + strlen(str);
        n_field[0] = 0;
 
        if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
        {
                std::string n = str;
-               n = n + "s";
+               n += 's';
                return duration(n.c_str());
        }
        
-       for (char* i = (char*)str; i < str_end; i++)
+       for (char* i = (char*)str; *i; i++)
        {
                // if we have digits, build up a string for the value in n_field,
                // up to 10 digits in size.
@@ -267,22 +197,22 @@ long duration(const char* str)
 
 /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
 
-bool host_matches_everyone(std::string mask, userrec* user)
+bool host_matches_everyone(const std::string &mask, userrec* user)
 {
-       char insanemasks[MAXBUF];
        char buffer[MAXBUF];
        char itrigger[MAXBUF];
-       Config->ConfValue("insane","hostmasks",0,insanemasks,&Config->config_f);
-       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
-       if (*itrigger == 0)
+       long matches = 0;
+       
+       if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
+       
+       if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
                return false;
-       long matches = 0;
+       
        for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
                strlcpy(buffer,u->second->ident,MAXBUF);
-               strlcat(buffer,"@",MAXBUF);
+               charlcat(buffer,'@',MAXBUF);
                strlcat(buffer,u->second->host,MAXBUF);
                if (match(buffer,mask.c_str()))
                        matches++;
@@ -296,22 +226,23 @@ bool host_matches_everyone(std::string mask, userrec* user)
        return false;
 }
 
-bool ip_matches_everyone(std::string ip, userrec* user)
+bool ip_matches_everyone(const std::string &ip, userrec* user)
 {
-       char insanemasks[MAXBUF];
        char itrigger[MAXBUF];
-       Config->ConfValue("insane","ipmasks",0,insanemasks,&Config->config_f);
-       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
-       if (*itrigger == 0)
+       long matches = 0;
+       
+       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
+       
+       if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
                return false;
-       long matches = 0;
+       
        for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
-               if (match((char*)inet_ntoa(u->second->ip4),ip.c_str()))
+               if (match(insp_ntoa(u->second->ip4),ip.c_str()))
                        matches++;
        }
+       
        float percent = ((float)matches / (float)clientlist.size()) * 100;
        if (percent > (float)atof(itrigger))
        {
@@ -321,22 +252,23 @@ bool ip_matches_everyone(std::string ip, userrec* user)
        return false;
 }
 
-bool nick_matches_everyone(std::string nick, userrec* user)
+bool nick_matches_everyone(const std::string &nick, userrec* user)
 {
-       char insanemasks[MAXBUF];
        char itrigger[MAXBUF];
-       Config->ConfValue("insane","nickmasks",0,insanemasks,&Config->config_f);
-       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
-       if (*itrigger == 0)
+       long matches = 0;
+       
+       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
+       
+       if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
                return false;
-       long matches = 0;
+
        for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
                if (match(u->second->nick,nick.c_str()))
                        matches++;
        }
+       
        float percent = ((float)matches / (float)clientlist.size()) * 100;
        if (percent > (float)atof(itrigger))
        {