Replace GetServerPort() with server_sa.port().

[user/henk/code/inspircd.git] / src / modules / m_close.cpp

diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index f3c751f177558f9df8af90a690657206c7745629..c2a94a6ff57d6e83a8ac35a839674211e96d65d9 100644 (file)
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -31,18 +31,20 @@ class CommandClose : public Command
                flags_needed = 'o';
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *src)
+       CmdResult Handle(User* src, const Params& parameters) CXX11_OVERRIDE
        {
                std::map<std::string,int> closed;
 
                const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-               for (UserManager::LocalList::const_iterator u = list.begin(); u != list.end(); ++u)
+               for (UserManager::LocalList::const_iterator u = list.begin(); u != list.end(); )
                {
+                       // Quitting the user removes it from the list
                        LocalUser* user = *u;
+                       ++u;
                        if (user->registered != REG_ALL)
                        {
                                ServerInstance->Users->QuitUser(user, "Closing all unknown connections per request");
-                               std::string key = ConvToStr(user->GetIPString())+"."+ConvToStr(user->GetServerPort());
+                               std::string key = ConvToStr(user->GetIPString())+"."+ConvToStr(user->server_sa.port());
                                closed[key]++;
                        }
                }