Initial support for listening on UNIX socket endpoints.

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

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 9ee224704ce46925b409f58601636b2af410ac1a..e54d1efb22556ba7007c4bc1d4b2092811d92f2b 100644 (file)
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -22,6 +22,12 @@
 #include "inspircd.h"
 #include "modules/ssl.h"
 
+enum
+{
+       // From ircd-ratbox.
+       RPL_REDIR = 10
+};
+
 /** Handle /JUMPSERVER
  */
 class CommandJumpserver : public Command
@@ -42,7 +48,7 @@ class CommandJumpserver : public Command
                redirect_new_users = false;
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
                int n_done = 0;
                reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3];
@@ -52,7 +58,7 @@ class CommandJumpserver : public Command
                std::string n_done_s;
 
                /* No parameters: jumpserver disabled */
-               if (!parameters.size())
+               if (parameters.empty())
                {
                        if (port)
                                user->WriteNotice("*** Disabled jumpserver (previously set to '" + redirect_to + ":" + ConvToStr(port) + "')");
@@ -108,12 +114,15 @@ class CommandJumpserver : public Command
                        if (redirect_all_immediately)
                        {
                                /* Redirect everyone but the oper sending the command */
-                               for (UserManager::LocalList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
+                               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+                               for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); )
                                {
+                                       // Quitting the user removes it from the list
                                        LocalUser* t = *i;
+                                       ++i;
                                        if (!t->IsOper())
                                        {
-                                               t->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead", parameters[0].c_str(), GetPort(t));
+                                               t->WriteNumeric(RPL_REDIR, parameters[0], GetPort(t), "Please use this Server/Port instead");
                                                ServerInstance->Users->QuitUser(t, reason);
                                                n_done++;
                                        }
@@ -137,7 +146,7 @@ class CommandJumpserver : public Command
 
        int GetPort(LocalUser* user)
        {
-               int p = (SSLClientCert::GetCertificate(&user->eh) ? sslport : port);
+               int p = (SSLIOHook::IsSSL(&user->eh) ? sslport : port);
                if (p == 0)
                        p = user->GetServerPort();
                return p;
@@ -157,10 +166,9 @@ class ModuleJumpServer : public Module
                if (js.redirect_new_users)
                {
                        int port = js.GetPort(user);
-                       user->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead",
-                               js.redirect_to.c_str(), port);
+                       user->WriteNumeric(RPL_REDIR, js.redirect_to, port, "Please use this Server/Port instead");
                        ServerInstance->Users->QuitUser(user, js.reason);
-                       return MOD_RES_PASSTHRU;
+                       return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }