Remove an extern, partly because it's unused, partly because it then gets shadowed...

[user/henk/code/inspircd.git] / src / message.cpp

diff --git a/src/message.cpp b/src/message.cpp
index 042901503984dd6006216710648fb21df8fe07c6..28a11fda9645f1cc0ed58624bdfeaf62c5875b1f 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -18,7 +18,7 @@ using namespace std;
 
 #include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
+#include "configreader.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
@@ -63,11 +63,11 @@ int common_channels(userrec *u, userrec *u2)
        }
        for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
        {
-               for (std::vector<ucrec*>::const_iterator z = u2->chans.begin(); i != u2->chans.end(); z++)
+               for (std::vector<ucrec*>::const_iterator z = u2->chans.begin(); z != u2->chans.end(); z++)
                {
                        if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*z))->channel != NULL))
                        {
-                               if ((((ucrec*)(*i))->channel == ((ucrec*)(*z))->channel) && (((ucrec*)(*i))->channel) && (((ucrec*)(*z))->channel))
+                               if ((((ucrec*)(*i))->channel == ((ucrec*)(*z))->channel))
                                {
                                        if ((c_count(u)) && (c_count(u2)))
                                        {
@@ -166,15 +166,24 @@ void NonBlocking(int s)
        fcntl(s, F_SETFL, flags | O_NONBLOCK);
 }
 
-int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
+int CleanAndResolve (char *resolvedHost, const char *unresolvedHost, bool forward)
 {
+       int fd;
+       std::string ipaddr;
+
        DNS d(Config->DNSServer);
-       int fd = d.ReverseLookup(unresolvedHost);
+       if (forward)
+               fd = d.ForwardLookup(unresolvedHost);
+       else
+               fd = d.ReverseLookup(unresolvedHost);
        if (fd < 0)
                return 0;
        time_t T = time(NULL)+1;
        while ((!d.HasResult()) && (time(NULL)<T));
-       std::string ipaddr = d.GetResult();
+       if (forward)
+               ipaddr = d.GetResultIP();
+       else
+               ipaddr = d.GetResult();
        strlcpy(resolvedHost,ipaddr.c_str(),MAXBUF);
        return (ipaddr != "");
 }
@@ -214,14 +223,14 @@ void ChangeName(userrec* user, const char* gecos)
 
 void ChangeDisplayedHost(userrec* user, const char* host)
 {
-        if (user->fd > -1)
-        {
-                int MOD_RESULT = 0;
-                FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(user,host));
-                if (MOD_RESULT)
-                        return;
+       if (user->fd > -1)
+       {
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(user,host));
+               if (MOD_RESULT)
+                       return;
                FOREACH_MOD(I_OnChangeHost,OnChangeHost(user,host));
-        }
+       }
        strlcpy(user->dhost,host,63);
        WriteServ(user->fd,"396 %s %s :is now your hidden host",user->nick,user->dhost);
 }
@@ -230,23 +239,23 @@ void ChangeDisplayedHost(userrec* user, const char* host)
 
 int isident(const char* n)
 {
-        if (!n || !*n)
-        {
-                return 0;
-        }
-        for (char* i = (char*)n; *i; i++)
-        {
-                if ((*i >= 'A') && (*i <= '}'))
-                {
-                        continue;
-                }
-                if (strchr(".-0123456789",*i))
-                {
-                        continue;
-                }
+       if (!n || !*n)
+       {
                return 0;
-        }
-        return 1;
+       }
+       for (char* i = (char*)n; *i; i++)
+       {
+               if ((*i >= 'A') && (*i <= '}'))
+               {
+                       continue;
+               }
+               if (strchr(".-0123456789",*i))
+               {
+                       continue;
+               }
+               return 0;
+       }
+       return 1;
 }
 
 
@@ -391,29 +400,35 @@ char lst[MAXBUF];
 
 std::string chlist(userrec *user,userrec* source)
 {
-       std::string cmp = "";
-       std::string lst = "";
+       /* Should this be a stringstream? Not sure if it would be faster as streams are more oriented at appending stuff, which is all we do */
+       std::ostringstream list;
+       
        if (!user || !source)
-       {
-               return lst;
-       }
-       bool userinvisible = (user->modebits & UM_INVISIBLE);
+               return "";
+       
        for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
        {
-               if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*i))->channel->name))
+               ucrec* rec = *i;
+               
+               if(rec->channel && rec->channel->name)
                {
-                       cmp = std::string(((ucrec*)(*i))->channel->name) + " ";
-                       if (!strstr(lst.c_str(),cmp.c_str()))
-                       {
-                               // if the channel is NOT private/secret, OR the source user is on the channel, AND the user is not invisible.
-                               // if the user is the same as the source, shortcircuit the comparison.
-                               if ((source == user) || ((((!(((ucrec*)(*i))->channel->binarymodes & CM_PRIVATE)) && (!(((ucrec*)(*i))->channel->binarymodes & CM_SECRET)) && (!userinvisible)) || (((ucrec*)(*i))->channel->HasUser(source)))))
+                       /* XXX - Why does this check need to be here at all? :< */
+                       /* Commenting this out until someone finds a case where we need it */
+                       //if (lst.find(rec->channel->name) == std::string::npos)
+                       //{
+                       
+                               /*
+                                * If the target is the same as the sender, let them see all their channels.
+                                * If the channel is NOT private/secret AND the user is not invisible.
+                                * If the user is an oper, and the <options:operspywhois> option is set.
+                                */
+                               if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET]) && !(user->modebits & UM_INVISIBLE)) || (rec->channel->HasUser(source))))
                                {
-                                       lst = lst + std::string(cmode(user,((ucrec*)(*i))->channel)) + std::string(((ucrec*)(*i))->channel->name) + " ";
+                                       list << cmode(user, rec->channel) << rec->channel->name << " ";
                                }
-                       }
+                       //}
                }
        }
-       return lst;
+       
+       return list.str();
 }
-