#include "inspircd.h"
#include "configreader.h"
#include <algorithm>
-#include <dirent.h>
-#include <dlfcn.h>
#include "users.h"
#include "modules.h"
#include "wildcard.h"
#include "socket.h"
#include "command_parse.h"
+/* Directory Searching for Unix-Only */
+#ifndef WIN32
+#include <dirent.h>
+#include <dlfcn.h>
+#endif
+
bool InspIRCd::ULine(const char* server)
{
if (!server)
if (!*server)
return true;
- return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
+ return (Config->ulines.find(server) != Config->ulines.end());
+}
+
+bool InspIRCd::SilentULine(const char* server)
+{
+ std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
+ if (n != Config->ulines.end())
+ return n->second;
+ else return false;
}
int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
{
int MOD_RESULT = 0;
FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber))
- Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
if (MOD_RESULT == 1)
return 0;
if (MOD_RESULT == -1)
return 1;
- Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
return strcmp(data,input);
}
+std::string InspIRCd::TimeString(time_t curtime)
+{
+ return std::string(ctime(&curtime),24);
+}
+
long InspIRCd::Duration(const char* str)
{
char n_field[MAXBUF];
new_parameters[splithere] = item.c_str();
new_parameters[extra] = extrastuff.c_str();
- if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED)
- return 1;
+ CommandObj->Handle(new_parameters,pcnt,user);
dupes[item.c_str()] = true;
}
std::map<irc::string, bool> dupes;
/* Only one commasepstream here */
- ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]);
irc::commasepstream items1(parameters[splithere]);
std::string item = "*";
unsigned int max = 0;
* record out from under us (e.g. if we /kill a comma sep list, and we're
* in that list ourselves) abort if we're gone.
*/
- if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED)
- return 1;
+ CommandObj->Handle(new_parameters,pcnt,user);
dupes[item.c_str()] = true;
}
bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
{
- nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ command_table::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
{
command_t* CommandParser::GetHandler(const std::string &commandname)
{
- nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ command_table::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
return n->second;
CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
{
- nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ command_table::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
{
const char *command_p[127];
int items = 0;
irc::tokenstream tokens(cmd);
- std::string command = tokens.GetToken();
+ std::string command;
+ tokens.GetToken(command);
+
+ /* A client sent a nick prefix on their command (ick)
+ * rhapsody and some braindead bouncers do this --
+ * the rfc says they shouldnt but also says the ircd should
+ * discard it if they do.
+ */
+ if (*command.c_str() == ':')
+ tokens.GetToken(command);
- while (((para[items] = tokens.GetToken()) != "") && (items < 127))
+ while (tokens.GetToken(para[items]) && (items < 127))
{
command_p[items] = para[items].c_str();
items++;
return;
}
- nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(command);
+ command_table::iterator cm = cmdlist.find(command);
if (cm != cmdlist.end())
{
{
if (!user->IsModeSet(cm->second->flags_needed))
{
- user->WriteServ("481 %s :Permission Denied- You do not have the required operator privileges",user->nick);
+ user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick);
return;
}
if (!user->HasPermission(command))
{
- user->WriteServ("481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
+ user->WriteServ("481 %s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
return;
}
}
- if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled()))
+ if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
{
/* command is disabled! */
user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
{
user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
/* If syntax is given, display this as the 461 reply */
- if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length()))
+ if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
return;
}
*/
CmdResult result = cm->second->Handle(command_p,items,user);
- if (result != CMD_USER_DELETED)
- {
- FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
- }
+ FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
return;
}
else
bool CommandParser::RemoveCommands(const char* source)
{
- nspace::hash_map<std::string,command_t*>::iterator i,safei;
+ command_table::iterator i,safei;
for (i = cmdlist.begin(); i != cmdlist.end(); i++)
{
safei = i;
return true;
}
-void CommandParser::RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source)
+void CommandParser::RemoveCommand(command_table::iterator safei, const char* source)
{
command_t* x = safei->second;
if (x->source == std::string(source))
if (buffer.length())
{
- ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
- this->ProcessCommand(user,buffer);
+ if (!user->muted)
+ {
+ ServerInstance->Log(DEBUG,"C[%d] -> :%s %s",user->GetFd(), user->nick, buffer.c_str());
+ this->ProcessCommand(user,buffer);
+ }
}
}
if (so_handle)
{
if (RFCCommands.find(f->command) == RFCCommands.end())
- {
RFCCommands[f->command] = so_handle;
- ServerInstance->Log(DEBUG,"Monitoring RFC-specified reloadable command at %8x",so_handle);
- }
else
{
ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
if (cmdlist.find(f->command) == cmdlist.end())
{
cmdlist[f->command] = f;
- ServerInstance->Log(DEBUG,"Added command %s (%d parameters)", f->command.c_str(), f->min_params);
return true;
}
else return false;
{
*v = dlsym(h, "init_command");
const char* err = dlerror();
- if (err)
+ if (err && !(*v))
{
ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err);
return false;
command_t* (*cmd_factory_func)(InspIRCd*);
snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
- ServerInstance->Log(DEBUG,"Load command: %s", filename);
-
h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
if (!h)
{
RFCCommands.clear();
+ printf("\nLoading core commands");
+ fflush(stdout);
+
DIR* library = opendir(LIBRARYDIR);
if (library)
{
{
if (match(entry->d_name, "cmd_*.so"))
{
+ printf(".");
+ fflush(stdout);
this->LoadCommand(entry->d_name);
}
}
closedir(library);
+ printf("\n");
}
this->CreateCommand(new cmd_reload(ServerInstance));