]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/helperfuncs.cpp
Fixed usercounts to not screw up on remote users
[user/henk/code/inspircd.git] / src / helperfuncs.cpp
index 98e26ff697faf1268ed536022604d7cf8aeacdab..ea7b1f9dc574c84ae7e482fad24eebb84b9a04d7 100644 (file)
@@ -1,18 +1,28 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+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>
-#ifdef USE_KQUEUE
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-#endif
-#include <cstdio>
 #include <time.h>
 #include <string>
 #ifdef GCC3
 #else
 #include <hash_map>
 #endif
-#include <map>
 #include <sstream>
 #include <vector>
-#include <errno.h>
 #include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
+#include <stdarg.h>
 #include "connection.h"
 #include "users.h"
-#include "servers.h"
 #include "ctables.h"
 #include "globals.h"
 #include "modules.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-using namespace std;
-
-#ifdef USE_KQUEUE
-extern int kq;
-#endif
-
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
 
 extern time_t TIME;
-
 extern bool nofork;
-
 extern char lowermap[255];
-
-extern int LogLevel;
 extern char ServerName[MAXBUF];
 extern char Network[MAXBUF];
 extern char ServerDesc[MAXBUF];
-extern char AdminName[MAXBUF];
-extern char AdminEmail[MAXBUF];
-extern char AdminNick[MAXBUF];
-extern char diepass[MAXBUF];
-extern char restartpass[MAXBUF];
-extern char motd[MAXBUF];
-extern char rules[MAXBUF];
 extern char list[MAXBUF];
-extern char PrefixQuit[MAXBUF];
-extern char DieValue[MAXBUF];
 
 extern int debugging;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
-extern int DieDelay;
-extern time_t startup_time;
-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 SERVERportCount;
-extern int ports[MAXSOCKS];
-extern int defaultRoute;
-
-extern std::vector<long> auth_cookies;
+extern int LogLevel;
+
 extern std::stringstream config_f;
 
-extern serverrec* me[32];
+
 
 extern FILE *log_file;
 extern userrec* fd_ref_table[65536];
@@ -108,21 +77,15 @@ extern std::vector<userrec*> all_opers;
 
 extern ClassVector Classes;
 
-
-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, WhoWasUser*, nspace::hash<string>, StrHashComp> whowas_hash;
+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 std::deque<command_t> command_table;
 
-
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern command_table cmdlist;
 extern file_cache MOTD;
 extern file_cache RULES;
-extern address_cache IP;
 
 void log(int level,char *text, ...)
 {
@@ -197,7 +160,6 @@ void Write(int sock,char *text, ...)
         char textbuffer[MAXBUF];
         va_list argsPtr;
         char tb[MAXBUF];
-        int res;
 
         va_start (argsPtr, text);
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
@@ -226,7 +188,6 @@ void WriteServ(int sock, char* text, ...)
                 return;
         }
         char textbuffer[MAXBUF],tb[MAXBUF];
-        int res;
         va_list argsPtr;
         va_start (argsPtr, text);
 
@@ -257,7 +218,6 @@ void WriteFrom(int sock, userrec *user,char* text, ...)
         }
         char textbuffer[MAXBUF],tb[MAXBUF];
         va_list argsPtr;
-        int res;
         va_start (argsPtr, text);
 
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
@@ -320,7 +280,7 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
         va_end(argsPtr);
 
         std::vector<char*> *ulist = Ptr->GetUsers();
-        for (int j = 0; j < ulist->size(); j++)
+        for (unsigned int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
                 userrec* otheruser = (userrec*)o;
@@ -347,7 +307,7 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
         va_end(argsPtr);
 
         std::vector<char*> *ulist = Ptr->GetUsers();
-        for (int j = 0; j < ulist->size(); j++)
+        for (unsigned int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
                 userrec* otheruser = (userrec*)o;
@@ -380,7 +340,7 @@ void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
 
 
         std::vector<char*> *ulist = Ptr->GetUsers();
-        for (int j = 0; j < ulist->size(); j++)
+        for (unsigned int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
                 userrec* otheruser = (userrec*)o;
@@ -406,7 +366,7 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
         va_end(argsPtr);
 
         std::vector<char*> *ulist = Ptr->GetUsers();
-        for (int j = 0; j < ulist->size(); j++)
+        for (unsigned int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
                 userrec* otheruser = (userrec*)o;
@@ -417,20 +377,16 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
 
 std::string GetServerDescription(char* servername)
 {
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),servername))
-                                {
-                                        return me[j]->connectors[k].GetDescription();
-                                }
-                        }
-                }
-                return ServerDesc; // not a remote server that can be found, it must be me.
-        }
+       std::string description = "";
+       FOREACH_MOD OnGetServerDescription(servername,description);
+       if (description != "")
+       {
+               return description;
+       }
+       else
+       {
+               return ServerDesc; // not a remote server that can be found, it must be me.
+       }
 }
 
 /* write a formatted string to all users who share at least one common
@@ -456,7 +412,7 @@ void WriteCommon(userrec *u, char* text, ...)
         va_end(argsPtr);
 
         // FIX: Stops a message going to the same person more than once
-        bzero(&already_sent,65536);
+        memset(&already_sent,0,65536);
 
         bool sent_to_at_least_one = false;
 
@@ -465,7 +421,7 @@ void WriteCommon(userrec *u, char* text, ...)
                 if (u->chans[i].channel)
                 {
                         std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (int j = 0; j < ulist->size(); j++)
+                        for (unsigned int j = 0; j < ulist->size(); j++)
                         {
                                 char* o = (*ulist)[j];
                                 userrec* otheruser = (userrec*)o;
@@ -508,14 +464,14 @@ void WriteCommonExcept(userrec *u, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        bzero(&already_sent,65536);
+        memset(&already_sent,0,65536);
 
         for (int i = 0; i < MAXCHANS; i++)
         {
                 if (u->chans[i].channel)
                 {
                         std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (int j = 0; j < ulist->size(); j++)
+                        for (unsigned int j = 0; j < ulist->size(); j++)
                         {
                                 char* o = (*ulist)[j];
                                 userrec* otheruser = (userrec*)o;
@@ -587,12 +543,6 @@ void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
                 }
         }
 
-        if (!local_only)
-        {
-                char buffer[MAXBUF];
-                snprintf(buffer,MAXBUF,"V %s @* :%s",source->nick,textbuffer);
-                NetSendToAll(buffer);
-        }
 }
 // returns TRUE of any users on channel C occupy server 'servername'.
 
@@ -601,7 +551,7 @@ bool ChanAnyOnThisServer(chanrec *c,char* servername)
         log(DEBUG,"ChanAnyOnThisServer");
 
         std::vector<char*> *ulist = c->GetUsers();
-        for (int j = 0; j < ulist->size(); j++)
+        for (unsigned int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
                 userrec* user = (userrec*)o;
@@ -622,7 +572,7 @@ bool CommonOnThisServer(userrec* u,const char* servername)
                 if (u->chans[i].channel)
                 {
                         std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (int j = 0; j < ulist->size(); j++)
+                        for (unsigned int j = 0; j < ulist->size(); j++)
                         {
                                 char* o = (*ulist)[j];
                                 userrec* user = (userrec*)o;
@@ -634,189 +584,6 @@ bool CommonOnThisServer(userrec* u,const char* servername)
         return false;
 }
 
-void NetSendToCommon(userrec* u, char* s)
-{
-        char buffer[MAXBUF];
-        snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
-        log(DEBUG,"NetSendToCommon: '%s' '%s'",u->nick,s);
-
-        std::string msg = buffer;
-        FOREACH_MOD OnPacketTransmit(msg,s);
-        strlcpy(buffer,msg.c_str(),MAXBUF);
-
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                if (CommonOnThisServer(u,me[j]->connectors[k].GetServerName().c_str()))
-                                {
-                                        me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
-                                }
-                        }
-                }
-        }
-}
-
-
-void NetSendToAll(char* s)
-{
-        char buffer[MAXBUF];
-        snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
-        log(DEBUG,"NetSendToAll: '%s'",s);
-
-        std::string msg = buffer;
-        FOREACH_MOD OnPacketTransmit(msg,s);
-        strlcpy(buffer,msg.c_str(),MAXBUF);
-
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
-                        }
-                }
-        }
-}
-
-
-void NetSendToAll_WithSum(char* s,char* u)
-{
-        char buffer[MAXBUF];
-        snprintf(buffer,MAXBUF,":%s %s",u,s);
-
-        log(DEBUG,"NetSendToAll: '%s'",s);
-
-        std::string msg = buffer;
-        FOREACH_MOD OnPacketTransmit(msg,s);
-        strlcpy(buffer,msg.c_str(),MAXBUF);
-
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
-                        }
-                }
-        }
-}
-
-void NetSendToAllAlive(char* s)
-{
-        char buffer[MAXBUF];
-        snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
-        log(DEBUG,"NetSendToAllAlive: '%s'",s);
-
-        std::string msg = buffer;
-        FOREACH_MOD OnPacketTransmit(msg,s);
-        strlcpy(buffer,msg.c_str(),MAXBUF);
-
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                if (me[j]->connectors[k].GetState() != STATE_DISCONNECTED)
-                                {
-                                        me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
-                                }
-                                else
-                                {
-                                        log(DEBUG,"%s is dead, not sending to it.",me[j]->connectors[k].GetServerName().c_str());
-                                }
-                        }
-                }
-        }
-}
-
-
-void NetSendToOne(char* target,char* s)
-{
-        char buffer[MAXBUF];
-        snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
-        log(DEBUG,"NetSendToOne: '%s' '%s'",target,s);
-
-        std::string msg = buffer;
-        FOREACH_MOD OnPacketTransmit(msg,s);
-        strlcpy(buffer,msg.c_str(),MAXBUF);
-
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
-                                {
-                                        me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
-                                }
-                        }
-                }
-        }
-}
-
-void NetSendToAllExcept(const char* target,char* s)
-{
-        char buffer[MAXBUF];
-        snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
-        log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s);
-
-        std::string msg = buffer;
-        FOREACH_MOD OnPacketTransmit(msg,s);
-        strlcpy(buffer,msg.c_str(),MAXBUF);
-
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
-                                {
-                                        me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
-                                }
-                        }
-                }
-        }
-}
-
-void NetSendToAllExcept_WithSum(const char* target,char* s,char* u)
-{
-        char buffer[MAXBUF];
-        snprintf(buffer,MAXBUF,":%s %s",u,s);
-
-        log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s);
-
-        std::string msg = buffer;
-        FOREACH_MOD OnPacketTransmit(msg,s);
-        strlcpy(buffer,msg.c_str(),MAXBUF);
-
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
-                                {
-                                        me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
-                                }
-                        }
-                }
-        }
-}
-
 
 void WriteMode(const char* modes, int flags, const char* text, ...)
 {
@@ -894,13 +661,6 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...)
                 }
         }
 
-        if (!local_only)
-        {
-                char buffer[MAXBUF];
-                snprintf(buffer,MAXBUF,"V %s * :%s",source->nick,textbuffer);
-                NetSendToAll(buffer);
-        }
-
 }
 
 
@@ -928,13 +688,6 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
                         }
                 }
         }
-
-        if (!local_only)
-        {
-                char buffer[MAXBUF];
-                snprintf(buffer,MAXBUF,"@ %s :%s",source->nick,textbuffer);
-                NetSendToAll(buffer);
-        }
 }
 
 /* convert a string to lowercase. Note following special circumstances
@@ -952,7 +705,7 @@ void strlower(char *n)
         if (n)
         {
                 for (char* t = n; *t; t++)
-                        *t = lowermap[*t];
+                        *t = lowermap[(unsigned)*t];
         }
 }
 
@@ -1139,7 +892,7 @@ void userlist(userrec *user,chanrec *c)
         snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
 
         std::vector<char*> *ulist = c->GetUsers();
-        for (int i = 0; i < ulist->size(); i++)
+        for (unsigned int i = 0; i < ulist->size(); i++)
         {
                 char* o = (*ulist)[i];
                 userrec* otheruser = (userrec*)o;
@@ -1293,7 +1046,7 @@ int registered_usercount(void)
         int c = 0;
         for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
         {
-                if ((i->second->fd) && (isnick(i->second->nick))) c++;
+                if (i->second->registered == 7) c++;
         }
         return c;
 }
@@ -1301,10 +1054,9 @@ int registered_usercount(void)
 int usercount_invisible(void)
 {
         int c = 0;
-
         for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
         {
-                if ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'i'))) c++;
+                if ((isnick(i->second->nick)) && (strchr(i->second->modes,'i'))) c++;
         }
         return c;
 }
@@ -1312,10 +1064,9 @@ int usercount_invisible(void)
 int usercount_opers(void)
 {
         int c = 0;
-
         for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
         {
-                if ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++;
+                if ((isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++;
         }
         return c;
 }
@@ -1339,21 +1090,7 @@ long chancount(void)
 
 long count_servs(void)
 {
-        int c = 0;
-        for (int i = 0; i < 32; i++)
-        {
-                if (me[i] != NULL)
-                {
-                        for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
-                        {
-                                if (strcasecmp(j->GetServerName().c_str(),ServerName))
-                                {
-                                        c++;
-                                }
-                        }
-                }
-        }
-        return c;
+        return 0;
 }
 
 long servercount(void)
@@ -1382,7 +1119,7 @@ void ShowMOTD(userrec *user)
         }
         snprintf(buf,65535,":%s 375 %s :- %s message of the day\r\n", ServerName, user->nick, ServerName);
         WholeMOTD = WholeMOTD + buf;
-        for (int i = 0; i != MOTD.size(); i++)
+        for (unsigned int i = 0; i != MOTD.size(); i++)
         {
                 snprintf(buf,65535,":%s 372 %s :- %s\r\n", ServerName, user->nick, MOTD[i].c_str());
                 WholeMOTD = WholeMOTD + buf;
@@ -1402,7 +1139,7 @@ void ShowRULES(userrec *user)
                 return;
         }
         WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,ServerName);
-        for (int i = 0; i != RULES.size(); i++)
+        for (unsigned int i = 0; i != RULES.size(); i++)
         {
                                 WriteServ(user->fd,"NOTICE %s :%s",user->nick,RULES[i].c_str());
         }
@@ -1425,25 +1162,7 @@ bool AllModulesReportReady(userrec* user)
 
 char islast(const char* s)
 {
-        char c = '`';
-        for (int j = 0; j < 32; j++)
-        {
-                if (me[j] != NULL)
-                {
-                        for (int k = 0; k < me[j]->connectors.size(); k++)
-                        {
-                                if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s))
-                                {
-                                        c = '|';
-                                }
-                                if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s))
-                                {
-                                        c = '`';
-                                }
-                        }
-                }
-        }
-        return c;
+        return '+';
 }
 
 long map_count(const char* s)
@@ -1526,6 +1245,7 @@ void SetupCommandTable(void)
         createcommand("LOADMODULE",handle_loadmodule,'o',1,"<core>");
         createcommand("UNLOADMODULE",handle_unloadmodule,'o',1,"<core>");
         createcommand("SERVER",handle_server,0,0,"<core>");
+       createcommand("COMMANDS",handle_commands,0,0,"<core>");
 }
 
 bool DirValid(char* dirandfile)