* ---------------------------------------------------
*/
-using namespace std;
-
-#include "inspircd_config.h"
#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_names.h"
+#include "commands/cmd_names.h"
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+ return new cmd_names(Instance);
+}
-void cmd_names::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /NAMES
+ */
+CmdResult cmd_names::Handle (const char** parameters, int pcnt, userrec *user)
{
chanrec* c;
if (!pcnt)
{
- WriteServ(user->fd,"366 %s * :End of /NAMES list.",user->nick);
- return;
+ user->WriteServ("366 %s * :End of /NAMES list.",user->nick);
+ return CMD_SUCCESS;
}
- if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-1,0))
- return;
- c = FindChan(parameters[0]);
+ if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+ return CMD_SUCCESS;
+
+ c = ServerInstance->FindChan(parameters[0]);
if (c)
{
- if (((c) && (!has_channel(user,c))) && (c->binarymodes & CM_SECRET))
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, c->name);
- return;
- }
- userlist(user,c);
- WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
+ if ((c->modes[CM_SECRET]) && (!c->HasUser(user)))
+ {
+ user->WriteServ("401 %s %s :No such nick/channel",user->nick, c->name);
+ return CMD_FAILURE;
+ }
+ c->UserList(user);
+ user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, c->name);
}
else
{
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+ user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
}
-}
-
+ return CMD_SUCCESS;
+}