char* Request::GetData()
{
- return this->data;
+ return this->data;
}
Module* Request::GetSource()
{
- return this->source;
+ return this->source;
}
Module* Request::GetDest()
{
- return this->dest;
+ return this->dest;
}
char* Request::Send()
{
- if (this->dest)
- {
- return dest->OnRequest(this);
- }
- else
- {
- return NULL;
- }
+ if (this->dest)
+ {
+ return dest->OnRequest(this);
+ }
+ else
+ {
+ return NULL;
+ }
}
-Event::Event(char* anydata, Module* src, std::string eventid) : data(anydata), source(src), id(eventid) { };
+Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { };
char* Event::GetData()
{
- return this->data;
+ return this->data;
}
Module* Event::GetSource()
{
- return this->source;
+ return this->source;
}
char* Event::Send()
{
- FOREACH_MOD(I_OnEvent,OnEvent(this));
- return NULL;
+ FOREACH_MOD(I_OnEvent,OnEvent(this));
+ return NULL;
}
std::string Event::GetEventID()
{
- return this->id;
+ return this->id;
}
Module::Module(Server* Me) { }
Module::~Module() { }
void Module::OnUserConnect(userrec* user) { }
-void Module::OnUserQuit(userrec* user, std::string message) { }
+void Module::OnUserQuit(userrec* user, const std::string& message) { }
void Module::OnUserDisconnect(userrec* user) { }
void Module::OnUserJoin(userrec* user, chanrec* channel) { }
-void Module::OnUserPart(userrec* user, chanrec* channel, std::string partmessage) { }
-void Module::OnRehash(std::string parameter) { }
+void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
+void Module::OnRehash(const std::string ¶meter) { }
void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
int Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) { return false; }
-void Module::OnMode(userrec* user, void* dest, int target_type, std::string text) { };
+void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { };
Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
-void Module::OnOper(userrec* user, std::string opertype) { };
-void Module::OnPostOper(userrec* user, std::string opertype) { };
+void Module::OnOper(userrec* user, const std::string &opertype) { };
+void Module::OnPostOper(userrec* user, const std::string &opertype) { };
void Module::OnInfo(userrec* user) { };
void Module::OnWhois(userrec* source, userrec* dest) { };
int Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; };
int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
-int Module::OnUserPreNick(userrec* user, std::string newnick) { return 0; };
-void Module::OnUserPostNick(userrec* user, std::string oldnick) { };
+int Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; };
+void Module::OnUserPostNick(userrec* user, const std::string &oldnick) { };
int Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; };
void Module::On005Numeric(std::string &output) { };
-int Module::OnKill(userrec* source, userrec* dest, std::string reason) { return 0; };
-void Module::OnLoadModule(Module* mod,std::string name) { };
-void Module::OnUnloadModule(Module* mod,std::string name) { };
+int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { return 0; };
+void Module::OnLoadModule(Module* mod,const std::string &name) { };
+void Module::OnUnloadModule(Module* mod,const std::string &name) { };
void Module::OnBackgroundTimer(time_t curtime) { };
void Module::OnSendList(userrec* user, chanrec* channel, char mode) { };
-int Module::OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated) { return 0; };
+int Module::OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) { return 0; };
bool Module::OnCheckReady(userrec* user) { return true; };
void Module::OnUserRegister(userrec* user) { };
-int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, std::string reason) { return 0; };
-void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason) { };
-int Module::OnRawMode(userrec* user, chanrec* chan, char mode, std::string param, bool adding, int pcnt) { return 0; };
+int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; };
+void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { };
+int Module::OnRawMode(userrec* user, chanrec* chan, char mode, const std::string ¶m, bool adding, int pcnt) { return 0; };
int Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; };
-int Module::OnCheckKey(userrec* user, chanrec* chan, std::string keygiven) { return 0; };
+int Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; };
int Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; };
int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; };
int Module::OnStats(char symbol, userrec* user) { return 0; };
-int Module::OnChangeLocalUserHost(userrec* user, std::string newhost) { return 0; };
-int Module::OnChangeLocalUserGECOS(userrec* user, std::string newhost) { return 0; };
-int Module::OnLocalTopicChange(userrec* user, chanrec* chan, std::string topic) { return 0; };
+int Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; };
+int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; };
+int Module::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; };
void Module::OnEvent(Event* event) { return; };
char* Module::OnRequest(Request* request) { return NULL; };
-int Module::OnOperCompare(std::string password, std::string input) { return 0; };
+int Module::OnOperCompare(const std::string &password, const std::string &input) { return 0; };
void Module::OnGlobalOper(userrec* user) { };
void Module::OnGlobalConnect(userrec* user) { };
-int Module::OnAddBan(userrec* source, chanrec* channel,std::string banmask) { return 0; };
-int Module::OnDelBan(userrec* source, chanrec* channel,std::string banmask) { return 0; };
-void Module::OnRawSocketAccept(int fd, std::string ip, int localport) { };
+int Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
+int Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
+void Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { };
int Module::OnRawSocketWrite(int fd, char* buffer, int count) { return 0; };
void Module::OnRawSocketClose(int fd) { };
int Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; };
-void Module::OnUserMessage(userrec* user, void* dest, int target_type, std::string text, char status) { };
-void Module::OnUserNotice(userrec* user, void* dest, int target_type, std::string text, char status) { };
-void Module::OnRemoteKill(userrec* source, userrec* dest, std::string reason) { };
+void Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
+void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
+void Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason) { };
void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { };
-void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, std::string topic) { };
-void Module::OnGetServerDescription(std::string servername,std::string &description) { };
+void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { };
+void Module::OnGetServerDescription(const std::string &servername,std::string &description) { };
void Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { };
void Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { };
-void Module::ProtoSendMode(void* opaque, int target_type, void* target, std::string modeline) { };
-void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, std::string extname) { };
-void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, std::string extname) { };
+void Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { };
+void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname) { };
+void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname) { };
void Module::OnSyncOtherMetaData(Module* proto, void* opaque) { };
-void Module::OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata) { };
-void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, std::string extname, std::string extdata) { };
-void Module::OnWallops(userrec* user, std::string text) { };
-void Module::OnChangeHost(userrec* user, std::string newhost) { };
-void Module::OnChangeName(userrec* user, std::string gecos) { };
-void Module::OnAddGLine(long duration, userrec* source, std::string reason, std::string hostmask) { };
-void Module::OnAddZLine(long duration, userrec* source, std::string reason, std::string ipmask) { };
-void Module::OnAddKLine(long duration, userrec* source, std::string reason, std::string hostmask) { };
-void Module::OnAddQLine(long duration, userrec* source, std::string reason, std::string nickmask) { };
-void Module::OnAddELine(long duration, userrec* source, std::string reason, std::string hostmask) { };
-void Module::OnDelGLine(userrec* source, std::string hostmask) { };
-void Module::OnDelZLine(userrec* source, std::string ipmask) { };
-void Module::OnDelKLine(userrec* source, std::string hostmask) { };
-void Module::OnDelQLine(userrec* source, std::string nickmask) { };
-void Module::OnDelELine(userrec* source, std::string hostmask) { };
+void Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { };
+void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { };
+void Module::OnWallops(userrec* user, const std::string &text) { };
+void Module::OnChangeHost(userrec* user, const std::string &newhost) { };
+void Module::OnChangeName(userrec* user, const std::string &gecos) { };
+void Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
+void Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { };
+void Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
+void Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { };
+void Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
+void Module::OnDelGLine(userrec* source, const std::string &hostmask) { };
+void Module::OnDelZLine(userrec* source, const std::string &ipmask) { };
+void Module::OnDelKLine(userrec* source, const std::string &hostmask) { };
+void Module::OnDelQLine(userrec* source, const std::string &nickmask) { };
+void Module::OnDelELine(userrec* source, const std::string &hostmask) { };
void Module::OnCleanup(int target_type, void* item) { };
void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; };
void Module::OnChannelDelete(chanrec* chan) { };
{
InspSocket* s = (InspSocket*)*a;
if (s == sock)
- {
- log(DEBUG,"Forcibly removed socket");
- ServerInstance->SE->DelFd(s->GetFd());
- s->Close();
- module_sockets.erase(a);
- delete s;
- return;
- }
+ s->MarkAsClosed();
}
}
-long Server::PriorityAfter(std::string modulename)
+long Server::PriorityAfter(const std::string &modulename)
{
for (unsigned int j = 0; j < Config->module_names.size(); j++)
{
return PRIORITY_DONTCARE;
}
-long Server::PriorityBefore(std::string modulename)
+long Server::PriorityBefore(const std::string &modulename)
{
for (unsigned int j = 0; j < Config->module_names.size(); j++)
{
}
}
-void Server::SendOpers(std::string s)
+long Server::GetChannelCount()
+{
+ return (long)chanlist.size();
+}
+
+/* This is ugly, yes, but hash_map's arent designed to be
+ * addressed in this manner, and this is a bit of a kludge.
+ * Luckily its a specialist function and rarely used by
+ * many modules (in fact, it was specially created to make
+ * m_safelist possible, initially).
+ */
+
+chanrec* Server::GetChannelIndex(long index)
+{
+ int target = 0;
+ for (chan_hash::iterator n = chanlist.begin(); n != chanlist.end(); n++, target++)
+ {
+ if (index == target)
+ return n->second;
+ }
+ return NULL;
+}
+
+void Server::AddTimer(InspTimer* T)
+{
+ ::AddTimer(T);
+}
+
+void Server::SendOpers(const std::string &s)
{
WriteOpers("%s",s.c_str());
}
-bool Server::MatchText(std::string sliteral, std::string spattern)
+bool Server::MatchText(const std::string &sliteral, const std::string &spattern)
{
- char literal[MAXBUF],pattern[MAXBUF];
- strlcpy(literal,sliteral.c_str(),MAXBUF);
- strlcpy(pattern,spattern.c_str(),MAXBUF);
- return match(literal,pattern);
+ return match(sliteral.c_str(),spattern.c_str());
}
-void Server::SendToModeMask(std::string modes, int flags, std::string text)
+void Server::SendToModeMask(const std::string &modes, int flags, const std::string &text)
{
WriteMode(modes.c_str(),flags,"%s",text.c_str());
}
-chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key)
+chanrec* Server::JoinUserToChannel(userrec* user, const std::string &cname, const std::string &key)
{
return add_channel(user,cname.c_str(),key.c_str(),false);
}
-chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason)
+chanrec* Server::PartUserFromChannel(userrec* user, const std::string &cname, const std::string &reason)
{
return del_channel(user,cname.c_str(),reason.c_str(),false);
}
{
chanuserlist userl;
userl.clear();
- std::map<char*,char*> *list = chan->GetUsers();
- for (std::map<char*,char*>::iterator i = list->begin(); i != list->end(); i++)
- {
- char* o = i->second;
- userl.push_back((userrec*)o);
- }
+ CUList *list = chan->GetUsers();
+ for (CUList::iterator i = list->begin(); i != list->end(); i++)
+ userl.push_back(i->second);
return userl;
}
-void Server::ChangeUserNick(userrec* user, std::string nickname)
+void Server::ChangeUserNick(userrec* user, const std::string &nickname)
{
force_nickchange(user,nickname.c_str());
}
-void Server::KickUser(userrec* source, userrec* target, chanrec* chan, std::string reason)
+void Server::KickUser(userrec* source, userrec* target, chanrec* chan, const std::string &reason)
{
if (source)
{
}
}
-void Server::QuitUser(userrec* user, std::string reason)
+void Server::QuitUser(userrec* user, const std::string &reason)
{
kill_link(user,reason.c_str());
}
-bool Server::IsUlined(std::string server)
+bool Server::IsUlined(const std::string &server)
{
return is_uline(server.c_str());
}
-void Server::CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user)
+bool Server::CallCommandHandler(const std::string &commandname, char** parameters, int pcnt, userrec* user)
{
- ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
+ return ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
}
-bool Server::IsValidModuleCommand(std::string commandname, int pcnt, userrec* user)
+bool Server::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
{
return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user);
}
-void Server::Log(int level, std::string s)
+void Server::Log(int level, const std::string &s)
{
log(level,"%s",s.c_str());
}
void Server::AddCommand(command_t *f)
{
- ServerInstance->Parser->CreateCommand(f);
+ if (!ServerInstance->Parser->CreateCommand(f))
+ {
+ ModuleException err("Command "+std::string(f->command)+" already exists.");
+ throw (err);
+ }
}
void Server::SendMode(char **parameters, int pcnt, userrec *user)
ServerInstance->ModeGrok->ServerMode(parameters,pcnt,user);
}
-void Server::Send(int Socket, std::string s)
+void Server::Send(int Socket, const std::string &s)
{
Write_NoFormat(Socket,s.c_str());
}
-void Server::SendServ(int Socket, std::string s)
+void Server::SendServ(int Socket, const std::string &s)
{
WriteServ_NoFormat(Socket,s.c_str());
}
-void Server::SendFrom(int Socket, userrec* User, std::string s)
+void Server::SendFrom(int Socket, userrec* User, const std::string &s)
{
WriteFrom_NoFormat(Socket,User,s.c_str());
}
-void Server::SendTo(userrec* Source, userrec* Dest, std::string s)
+void Server::SendTo(userrec* Source, userrec* Dest, const std::string &s)
{
if (!Source)
{
// if source is NULL, then the message originates from the local server
- Write(Dest->fd,":%s %s",this->GetServerName().c_str(),s.c_str());
+ WriteServ_NoFormat(Dest->fd,s.c_str());
}
else
{
}
}
-void Server::SendChannelServerNotice(std::string ServName, chanrec* Channel, std::string text)
+void Server::SendChannelServerNotice(const std::string &ServName, chanrec* Channel, const std::string &text)
{
WriteChannelWithServ_NoFormat((char*)ServName.c_str(), Channel, text.c_str());
}
-void Server::SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender)
+void Server::SendChannel(userrec* User, chanrec* Channel, const std::string &s, bool IncludeSender)
{
if (IncludeSender)
{
return (common_channels(u1,u2) != 0);
}
-void Server::SendCommon(userrec* User, std::string text,bool IncludeSender)
+void Server::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
+{
+ std::string CompleteLine = LinePrefix;
+ std::string Word = "";
+ while (TextStream >> Word)
+ {
+ if (CompleteLine.length() + Word.length() + 3 > 500)
+ {
+ WriteServ_NoFormat(User->fd,CompleteLine.c_str());
+ CompleteLine = LinePrefix;
+ }
+ CompleteLine = CompleteLine + Word + " ";
+ }
+ WriteServ_NoFormat(User->fd,CompleteLine.c_str());
+}
+
+void Server::SendCommon(userrec* User, const std::string &text, bool IncludeSender)
{
if (IncludeSender)
{
}
}
-void Server::SendWallops(userrec* User, std::string text)
+void Server::SendWallops(userrec* User, const std::string &text)
{
WriteWallOps(User,false,"%s",text.c_str());
}
-void Server::ChangeHost(userrec* user, std::string host)
+void Server::ChangeHost(userrec* user, const std::string &host)
{
ChangeDisplayedHost(user,host.c_str());
}
-void Server::ChangeGECOS(userrec* user, std::string gecos)
+void Server::ChangeGECOS(userrec* user, const std::string &gecos)
{
ChangeName(user,gecos.c_str());
}
-bool Server::IsNick(std::string nick)
+bool Server::IsNick(const std::string &nick)
{
return (isnick(nick.c_str()) != 0);
}
-userrec* Server::FindNick(std::string nick)
+userrec* Server::FindNick(const std::string &nick)
{
return Find(nick);
}
return (socket < 65536 ? fd_ref_table[socket] : NULL);
}
-chanrec* Server::FindChannel(std::string channel)
+chanrec* Server::FindChannel(const std::string &channel)
{
return FindChan(channel.c_str());
}
return cmode(User,Chan);
}
-bool Server::IsOnChannel(userrec* User, chanrec* Chan)
-{
- return has_channel(User,Chan);
-}
-
std::string Server::GetServerName()
{
return Config->ServerName;
{
if (type == MT_SERVER)
{
- log(DEBUG,"*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion");
+ ModuleException e("Modes of type MT_SERVER are reserved for future expansion");
+ throw(e);
return false;
}
if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
{
- log(DEBUG,"*** API ERROR *** Parameters on MT_CLIENT modes are not supported");
+ ModuleException e("Parameters on MT_CLIENT modes are not supported");
+ throw(e);
return false;
}
if ((params_when_on>1) || (params_when_off>1))
{
- log(DEBUG,"*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported");
+ ModuleException e("More than one parameter for an MT_CHANNEL mode is not yet supported");
+ throw(e);
return false;
}
return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
}
else
{
- log(DEBUG,"*** API ERROR *** Muppet modechar detected.");
+ ModuleException e("Muppet modechar detected.");
+ throw(e);
}
return false;
}
}
-bool Server::UserToPseudo(userrec* user,std::string message)
+bool Server::UserToPseudo(userrec* user, const std::string &message)
{
unsigned int old_fd = user->fd;
Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
return true;
}
-bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
+bool Server::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
{
log(DEBUG,"PseudoToUser");
zombie->fd = alive->fd;
// Fix by brain - cant write the user until their fd table entry is updated
fd_ref_table[zombie->fd] = zombie;
Write(zombie->fd,":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
- for (unsigned int i = 0; i < zombie->chans.size(); i++)
+ for (std::vector<ucrec*>::const_iterator i = zombie->chans.begin(); i != zombie->chans.end(); i++)
{
- if (zombie->chans[i].channel != NULL)
+ if (((ucrec*)(*i))->channel != NULL)
{
- if (zombie->chans[i].channel->name)
- {
- chanrec* Ptr = zombie->chans[i].channel;
+ chanrec* Ptr = ((ucrec*)(*i))->channel;
WriteFrom(zombie->fd,zombie,"JOIN %s",Ptr->name);
if (Ptr->topicset)
{
}
userlist(zombie,Ptr);
WriteServ(zombie->fd,"366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
-
- }
}
}
if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->fd != FD_MAGIC_NUMBER))
return true;
}
-void Server::AddGLine(long duration, std::string source, std::string reason, std::string hostmask)
+void Server::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
}
-void Server::AddQLine(long duration, std::string source, std::string reason, std::string nickname)
+void Server::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
{
add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
}
-void Server::AddZLine(long duration, std::string source, std::string reason, std::string ipaddr)
+void Server::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
{
add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
}
-void Server::AddKLine(long duration, std::string source, std::string reason, std::string hostmask)
+void Server::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
}
-void Server::AddELine(long duration, std::string source, std::string reason, std::string hostmask)
+void Server::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
}
-bool Server::DelGLine(std::string hostmask)
+bool Server::DelGLine(const std::string &hostmask)
{
return del_gline(hostmask.c_str());
}
-bool Server::DelQLine(std::string nickname)
+bool Server::DelQLine(const std::string &nickname)
{
return del_qline(nickname.c_str());
}
-bool Server::DelZLine(std::string ipaddr)
+bool Server::DelZLine(const std::string &ipaddr)
{
return del_zline(ipaddr.c_str());
}
-bool Server::DelKLine(std::string hostmask)
+bool Server::DelKLine(const std::string &hostmask)
{
return del_kline(hostmask.c_str());
}
-bool Server::DelELine(std::string hostmask)
+bool Server::DelELine(const std::string &hostmask)
{
return del_eline(hostmask.c_str());
}
-long Server::CalcDuration(std::string delta)
+long Server::CalcDuration(const std::string &delta)
{
return duration(delta.c_str());
}
-bool Server::IsValidMask(std::string mask)
+bool Server::IsValidMask(const std::string &mask)
{
- const char* dest = mask.c_str();
+ char* dest = (char*)mask.c_str();
if (strchr(dest,'!')==0)
return false;
if (strchr(dest,'@')==0)
return false;
- for (unsigned int i = 0; i < strlen(dest); i++)
- if (dest[i] < 32)
+ for (char* i = dest; *i; i++)
+ if (*i < 32)
return false;
- for (unsigned int i = 0; i < strlen(dest); i++)
- if (dest[i] > 126)
+ for (char* i = dest; *i; i++)
+ if (*i > 126)
return false;
unsigned int c = 0;
- for (unsigned int i = 0; i < strlen(dest); i++)
- if (dest[i] == '!')
+ for (char* i = dest; *i; i++)
+ if (*i == '!')
c++;
if (c>1)
return false;
c = 0;
- for (unsigned int i = 0; i < strlen(dest); i++)
- if (dest[i] == '@')
+ for (char* i = dest; *i; i++)
+ if (*i == '@')
c++;
if (c>1)
return false;
return true;
}
-Module* Server::FindModule(std::string name)
+Module* Server::FindModule(const std::string &name)
{
for (int i = 0; i <= MODCOUNT; i++)
{
}
-ConfigReader::ConfigReader(std::string filename)
+ConfigReader::ConfigReader(const std::string &filename)
{
Config->ClearStack();
this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
this->error = CONF_FILE_NOT_FOUND;
};
-std::string ConfigReader::ReadValue(std::string tag, std::string name, int index)
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index)
{
+ /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
char val[MAXBUF];
- char t[MAXBUF];
- char n[MAXBUF];
- strlcpy(t,tag.c_str(),MAXBUF);
- strlcpy(n,name.c_str(),MAXBUF);
- int res = Config->ReadConf(cache,t,n,index,val);
+ int res = Config->ReadConf(cache, tag.c_str(), name.c_str(), index, val);
if (!res)
{
this->error = CONF_VALUE_NOT_FOUND;
return val;
}
-bool ConfigReader::ReadFlag(std::string tag, std::string name, int index)
+bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
{
+ /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
char val[MAXBUF];
- char t[MAXBUF];
- char n[MAXBUF];
- strlcpy(t,tag.c_str(),MAXBUF);
- strlcpy(n,name.c_str(),MAXBUF);
- int res = Config->ReadConf(cache,t,n,index,val);
+ std::string s;
+
+ int res = Config->ReadConf(cache, tag.c_str(), name.c_str(), index, val);
if (!res)
{
this->error = CONF_VALUE_NOT_FOUND;
return false;
}
- std::string s = val;
+
+ s = val;
+
return ((s == "yes") || (s == "YES") || (s == "true") || (s == "TRUE") || (s == "1"));
}
-long ConfigReader::ReadInteger(std::string tag, std::string name, int index, bool needs_unsigned)
+long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
{
char val[MAXBUF];
- char t[MAXBUF];
- char n[MAXBUF];
- strlcpy(t,tag.c_str(),MAXBUF);
- strlcpy(n,name.c_str(),MAXBUF);
- int res = Config->ReadConf(cache,t,n,index,val);
+
+ int res = Config->ReadConf(cache, tag.c_str(), name.c_str(), index, val);
if (!res)
{
this->error = CONF_VALUE_NOT_FOUND;
return 0;
}
- for (unsigned int i = 0; i < strlen(val); i++)
+ for (char* i = val; *i; i++)
{
- if (!isdigit(val[i]))
+ if (!isdigit(*i))
{
this->error = CONF_NOT_A_NUMBER;
return 0;
void ConfigReader::DumpErrors(bool bail, userrec* user)
{
- if (bail)
- {
- printf("There were errors in your configuration:\n%s",errorlog->str().c_str());
- exit(0);
- }
- else
- {
- char dataline[1024];
- if (user)
- {
- WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
- while (!errorlog->eof())
- {
- errorlog->getline(dataline,1024);
- WriteServ(user->fd,"NOTICE %s :%s",user->nick,dataline);
- }
- }
- else
- {
- WriteOpers("There were errors in the configuration file:",user->nick);
- while (!errorlog->eof())
- {
- errorlog->getline(dataline,1024);
- WriteOpers(dataline);
- }
- }
- return;
- }
+ if (bail)
+ {
+ printf("There were errors in your configuration:\n%s",errorlog->str().c_str());
+ exit(0);
+ }
+ else
+ {
+ char dataline[1024];
+
+ if (user)
+ {
+ WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
+
+ while (!errorlog->eof())
+ {
+ errorlog->getline(dataline,1024);
+ WriteServ(user->fd,"NOTICE %s :%s",user->nick,dataline);
+ }
+ }
+ else
+ {
+ WriteOpers("There were errors in the configuration file:",user->nick);
+
+ while (!errorlog->eof())
+ {
+ errorlog->getline(dataline,1024);
+ WriteOpers(dataline);
+ }
+ }
+
+ return;
+ }
}
-int ConfigReader::Enumerate(std::string tag)
+int ConfigReader::Enumerate(const std::string &tag)
{
return Config->EnumConf(cache,tag.c_str());
}
-int ConfigReader::EnumerateValues(std::string tag, int index)
+int ConfigReader::EnumerateValues(const std::string &tag, int index)
{
return Config->EnumValues(cache, tag.c_str(), index);
}
}
-FileReader::FileReader(std::string filename)
+FileReader::FileReader(const std::string &filename)
{
file_cache c;
readfile(c,filename.c_str());
{
}
-void FileReader::LoadFile(std::string filename)
+void FileReader::LoadFile(const std::string &filename)
{
file_cache c;
readfile(c,filename.c_str());
bool FileReader::Exists()
{
- if (fc.size() == 0)
- {
- return(false);
- }
- else
- {
- return(true);
- }
+ return (!(fc.size() == 0));
}
std::string FileReader::GetLine(int x)
std::vector<ircd_module*> factory(255);
int MODCOUNT = -1;
-
-