Removal of ancient TRUE/FALSE #defines (C-ish stuff)

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

diff --git a/src/message.cpp b/src/message.cpp
index 8614acf0e8e49d0a2f056316313e0dcd9b3b5510..0a41e5b8a6d0943dbb44f7feab7ec369f861f8a0 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -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 != "");
 }
@@ -397,7 +406,7 @@ std::string chlist(userrec *user,userrec* source)
        {
                return lst;
        }
-       bool userinvisible = (strchr(user->modes,'i'));
+       bool userinvisible = (user->modebits & UM_INVISIBLE);
        for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
        {
                if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*i))->channel->name))
@@ -407,7 +416,7 @@ std::string chlist(userrec *user,userrec* source)
                        {
                                // 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)))))
+                               if ((source == user) || ((((!(((ucrec*)(*i))->channel->modes[CM_PRIVATE])) && (!(((ucrec*)(*i))->channel->modes[CM_SECRET])) && (!userinvisible)) || (((ucrec*)(*i))->channel->HasUser(source)))))
                                {
                                        lst = lst + std::string(cmode(user,((ucrec*)(*i))->channel)) + std::string(((ucrec*)(*i))->channel->name) + " ";
                                }