* ---------------------------------------------------
*/
-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 "configreader.h"
#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_whowas.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];
+#include "commands/cmd_whowas.h"
-extern whowas_users whowas;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+ return new cmd_whowas(Instance);
+}
-void cmd_whowas::Handle (char **parameters, int pcnt, userrec* user)
+CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
{
- whowas_users::iterator i = whowas.find(parameters[0]);
+ irc::whowas::whowas_users::iterator i = ServerInstance->whowas.find(parameters[0]);
- if (i == whowas.end())
+ ServerInstance->Log(DEBUG,"Entered cmd_whowas");
+
+ if (i == ServerInstance->whowas.end())
{
- WriteServ(user->fd,"406 %s %s :There was no such nickname",user->nick,parameters[0]);
+ ServerInstance->Log(DEBUG,"No such nick in whowas");
+ user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
+ user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+ return CMD_FAILURE;
}
else
{
- whowas_set* grp = (whowas_set*)i->second;
+ ServerInstance->Log(DEBUG,"Whowas set found");
+ irc::whowas::whowas_set* grp = i->second;
if (grp->size())
{
- for (whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
+ for (irc::whowas::whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
{
- WhoWasGroup* u = (WhoWasGroup*)*ux;
+ ServerInstance->Log(DEBUG,"Spool whowas entry");
+ irc::whowas::WhoWasGroup* u = *ux;
time_t rawtime = u->signon;
tm *timeinfo;
char b[MAXBUF];
timeinfo = localtime(&rawtime);
+
+ /* XXX - 'b' could be only 25 chars long and then strlcpy() would terminate it for us too? */
strlcpy(b,asctime(timeinfo),MAXBUF);
b[24] = 0;
- WriteServ(user->fd,"314 %s %s %s %s * :%s",user->nick,parameters[0],u->ident,u->dhost,u->gecos);
- WriteServ(user->fd,"312 %s %s %s :%s",user->nick,parameters[0], *Config->HideWhoisServer ? Config->HideWhoisServer : u->server,b);
+ user->WriteServ("314 %s %s %s %s * :%s",user->nick,parameters[0],u->ident,u->dhost,u->gecos);
+
+ if(*user->oper)
+ user->WriteServ("379 %s %s :was connecting from *@%s", user->nick, parameters[0], u->host);
+
+ if(*ServerInstance->Config->HideWhoisServer && !(*user->oper))
+ user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], ServerInstance->Config->HideWhoisServer, b);
+ else
+ user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], u->server, b);
}
}
else
{
- WriteServ(user->fd,"406 %s %s :There was no such nickname",user->nick,parameters[0]);
+ ServerInstance->Log(DEBUG,"Oops, empty whowas set found");
+ user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
+ user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+ return CMD_FAILURE;
}
}
- WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
-}
+ user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+ return CMD_SUCCESS;
+}