Use InvalidateCache in the sockaddrs overload of OnSetClientIP.

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

diff --git a/src/users.cpp b/src/users.cpp
index 6b2432cc4efd502434fdb50cbe3c5f1a1cc33fc7..9e06485e5182c6a1ed511a152e7510438261790a 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -637,7 +637,7 @@ void OperInfo::init()
                        {
                                this->AllowedUserModes.set();
                        }
-                       else if (*c >= 'A' && *c < 'z')
+                       else if (*c >= 'A' && *c <= 'z')
                        {
                                this->AllowedUserModes[*c - 'A'] = true;
                        }
@@ -650,7 +650,7 @@ void OperInfo::init()
                        {
                                this->AllowedChanModes.set();
                        }
-                       else if (*c >= 'A' && *c < 'z')
+                       else if (*c >= 'A' && *c <= 'z')
                        {
                                this->AllowedChanModes[*c - 'A'] = true;
                        }
@@ -837,6 +837,7 @@ void LocalUser::FullConnect()
 void User::InvalidateCache()
 {
        /* Invalidate cache */
+       cachedip.clear();
        cached_fullhost.clear();
        cached_hostip.clear();
        cached_makehost.clear();
@@ -1001,15 +1002,13 @@ irc::sockets::cidr_mask User::GetCIDRMask()
 
 bool User::SetClientIP(const char* sip, bool recheck_eline)
 {
-       cachedip.clear();
-       cached_hostip.clear();
+       this->InvalidateCache();
        return irc::sockets::aptosa(sip, 0, client_sa);
 }
 
 void User::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
 {
-       cachedip.clear();
-       cached_hostip.clear();
+       this->InvalidateCache();
        memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
 }
 
@@ -1321,26 +1320,19 @@ void User::SendText(const char *text, ...)
 
 void User::SendText(const std::string &LinePrefix, std::stringstream &TextStream)
 {
-       char line[MAXBUF];
-       int start_pos = LinePrefix.length();
-       int pos = start_pos;
-       memcpy(line, LinePrefix.data(), pos);
+       std::string line;
        std::string Word;
        while (TextStream >> Word)
        {
-               int len = Word.length();
-               if (pos + len + 12 > MAXBUF)
+               size_t lineLength = LinePrefix.length() + line.length() + Word.length() + 13;
+               if (lineLength > MAXBUF)
                {
-                       line[pos] = '\0';
-                       SendText(std::string(line));
-                       pos = start_pos;
+                       SendText(LinePrefix + line);
+                       line.clear();
                }
-               line[pos] = ' ';
-               memcpy(line + pos + 1, Word.data(), len);
-               pos += len + 1;
+               line += " " + Word;
        }
-       line[pos] = '\0';
-       SendText(std::string(line));
+       SendText(LinePrefix + line);
 }
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels
@@ -1405,6 +1397,8 @@ void User::DoHostCycle(const std::string &quitline)
 
        FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
 
+       // Users shouldn't see themselves quitting when host cycling
+       exceptions.erase(this);
        for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
        {
                LocalUser* u = IS_LOCAL(i->first);
@@ -1549,7 +1543,7 @@ void User::SplitChanList(User* dest, const std::string &cl)
 {
        std::string line;
        std::ostringstream prefix;
-       std::string::size_type start, pos, length;
+       std::string::size_type start, pos;
 
        prefix << this->nick << " " << dest->nick << " :";
        line = prefix.str();
@@ -1557,23 +1551,13 @@ void User::SplitChanList(User* dest, const std::string &cl)
 
        for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
        {
-               length = (pos == std::string::npos) ? cl.length() : pos;
-
-               if (line.length() + namelen + length - start > 510)
+               if (line.length() + namelen + pos - start > 510)
                {
                        ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
                        line = prefix.str();
                }
 
-               if(pos == std::string::npos)
-               {
-                       line.append(cl.substr(start, length - start));
-                       break;
-               }
-               else
-               {
-                       line.append(cl.substr(start, length - start + 1));
-               }
+               line.append(cl.substr(start, pos - start + 1));
        }
 
        if (line.length() != prefix.str().length())