std::string reason;
int port;
- CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", "o", 0)
+ CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", "o", 0, 4)
{
this->source = "m_jumpserver.so";
- syntax = "[<server> <port> <+/-a> :<reason>]";
+ syntax = "[<server> <port> <+/-an> <reason>]";
redirect_to.clear();
reason.clear();
port = 0;
case 'n':
redirect_new_users = direction;
break;
+ default:
+ user->WriteServ("NOTICE %s :*** Invalid JUMPSERVER flag: %c", user->nick.c_str(), *n);
+ return CMD_FAILURE;
+ break;
}
}
+ if (!atoi(parameters[1].c_str()))
+ {
+ user->WriteServ("NOTICE %s :*** Invalid port number", user->nick.c_str());
+ return CMD_FAILURE;
+ }
+
if (redirect_all_immediately)
{
/* Redirect everyone but the oper sending the command */
class ModuleJumpServer : public Module
{
- CommandJumpserver* js;
+ CommandJumpserver js;
public:
ModuleJumpServer(InspIRCd* Me)
- : Module(Me)
+ : Module(Me), js(Me)
{
-
- js = new CommandJumpserver(ServerInstance);
- ServerInstance->AddCommand(js);
+ ServerInstance->AddCommand(&js);
Implementation eventlist[] = { I_OnUserRegister };
ServerInstance->Modules->Attach(eventlist, this, 1);
}
virtual int OnUserRegister(User* user)
{
- if (js->port && js->redirect_new_users)
+ if (js.port && js.redirect_new_users)
{
- user->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead", user->nick.c_str(), js->redirect_to.c_str(), js->port);
- ServerInstance->Users->QuitUser(user, js->reason);
+ user->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead",
+ user->nick.c_str(), js.redirect_to.c_str(), js.port);
+ ServerInstance->Users->QuitUser(user, js.reason);
return 0;
}
return 0;