ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 11:09:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

const std::string &

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3663 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-03-11 16:48:45 +00:00
parent 3f1d51e64a
commit a323e20162
2 changed files with 109 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
include/modules.h
View File

@ -1286,7 +1286,7 @@ class Server : public classbase
* @param modulename The module your module wants to be before in the call list
* @returns a priority ID which the core uses to relocate the module in the list
*/
long PriorityBefore(std::string modulename);
long PriorityBefore(const std::string &modulename);
/** For use with Module::Prioritize().
* When the return value of this function is returned from
@ -1296,12 +1296,12 @@ class Server : public classbase
* @param modulename The module your module wants to be after in the call list
* @returns a priority ID which the core uses to relocate the module in the list
*/
long PriorityAfter(std::string modulename);
long PriorityAfter(const std::string &modulename);
/** Sends text to all opers.
* This method sends a server notice to all opers with the usermode +s.
*/
virtual void SendOpers(std::string s);
virtual void SendOpers(const std::string &s);
/** Returns the version string of this server
*/
@ -1311,30 +1311,30 @@ class Server : public classbase
* This method writes a line of text to the log. If the level given is lower than the
* level given in the configuration, this command has no effect.
*/
virtual void Log(int level, std::string s);
virtual void Log(int level, const std::string &s);
/** Sends a line of text down a TCP/IP socket.
* This method writes a line of text to an established socket, cutting it to 510 characters
* plus a carriage return and linefeed if required.
*/
virtual void Send(int Socket, std::string s);
virtual void Send(int Socket, const std::string &s);
/** Sends text from the server to a socket.
* This method writes a line of text to an established socket, with the servername prepended
* as used by numerics (see RFC 1459)
*/
virtual void SendServ(int Socket, std::string s);
virtual void SendServ(int Socket, const std::string &s);
/** Writes text to a channel, but from a server, including all.
* This can be used to send server notices to a group of users.
*/
virtual void SendChannelServerNotice(std::string ServName, chanrec* Channel, std::string text);
virtual void SendChannelServerNotice(const std::string &ServName, chanrec* Channel, const std::string &text);
/** Sends text from a user to a socket.
* This method writes a line of text to an established socket, with the given user's nick/ident
* /host combination prepended, as used in PRIVSG etc commands (see RFC 1459)
*/
virtual void SendFrom(int Socket, userrec* User, std::string s);
virtual void SendFrom(int Socket, userrec* User, const std::string &s);
/** Sends text from a user to another user.
* This method writes a line of text to a user, with a user's nick/ident
@ -1350,7 +1350,7 @@ class Server : public classbase
*
* Which is useful for numerics and server notices to single users, etc.
*/
virtual void SendTo(userrec* Source, userrec* Dest, std::string s);
virtual void SendTo(userrec* Source, userrec* Dest, const std::string &s);
/** Sends text from a user to a channel (mulicast).
* This method writes a line of text to a channel, with the given user's nick/ident
@ -1358,7 +1358,7 @@ class Server : public classbase
* IncludeSender flag is set, then the text is also sent back to the user from which
* it originated, as seen in MODE (see RFC 1459).
*/
virtual void SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender);
virtual void SendChannel(userrec* User, chanrec* Channel, const std::string &s, bool IncludeSender);
/** Returns true if two users share a common channel.
* This method is used internally by the NICK and QUIT commands, and the Server::SendCommon
@ -1379,12 +1379,12 @@ class Server : public classbase
* This method writes a WALLOPS message to all users with the +w flag, originating from the
* specified user.
*/
virtual void SendWallops(userrec* User, std::string text);
virtual void SendWallops(userrec* User, const std::string &text);
/** Returns true if a nick is valid.
* Nicks for unregistered connections will return false.
*/
virtual bool IsNick(std::string nick);
virtual bool IsNick(const std::string &nick);
/** Returns a count of the number of users on a channel.
* This will NEVER be 0, as if the chanrec exists, it will have at least one user in the channel.
@ -1398,7 +1398,7 @@ class Server : public classbase
/** Attempts to look up a nick and return a pointer to it.
* This function will return NULL if the nick does not exist.
*/
virtual userrec* FindNick(std::string nick);
virtual userrec* FindNick(const std::string &nick);
/** Attempts to look up a nick using the file descriptor associated with that nick.
* This function will return NULL if the file descriptor is not associated with a valid user.
@ -1408,7 +1408,7 @@ class Server : public classbase
/** Attempts to look up a channel and return a pointer to it.
* This function will return NULL if the channel does not exist.
*/
virtual chanrec* FindChannel(std::string channel);
virtual chanrec* FindChannel(const std::string &channel);
/** Attempts to look up a user's privilages on a channel.
* This function will return a string containing either @, %, +, or an empty string,
@ -1532,28 +1532,28 @@ class Server : public classbase
* Then the text 'm00' will be sent to all users with EITHER mode x or i. Conversely if you used WM_AND, the
* user must have both modes set to receive the message.
*/
virtual void SendToModeMask(std::string modes, int flags, std::string text);
virtual void SendToModeMask(const std::string &modes, int flags, const std::string &text);
/** Forces a user to join a channel.
* This is similar to svsjoin and can be used to implement redirection, etc.
* On success, the return value is a valid pointer to a chanrec* of the channel the user was joined to.
* On failure, the result is NULL.
*/
virtual chanrec* JoinUserToChannel(userrec* user, std::string cname, std::string key);
virtual chanrec* JoinUserToChannel(userrec* user, const std::string &cname, const std::string &key);
/** Forces a user to part a channel.
* This is similar to svspart and can be used to implement redirection, etc.
* Although the return value of this function is a pointer to a channel record, the returned data is
* undefined and should not be read or written to. This behaviour may be changed in a future version.
*/
virtual chanrec* PartUserFromChannel(userrec* user, std::string cname, std::string reason);
virtual chanrec* PartUserFromChannel(userrec* user, const std::string &cname, const std::string &reason);
/** Forces a user nickchange.
* This command works similarly to SVSNICK, and can be used to implement Q-lines etc.
* If you specify an invalid nickname, the nick change will be dropped and the target user will receive
* the error numeric for it.
*/
virtual void ChangeUserNick(userrec* user, std::string nickname);
virtual void ChangeUserNick(userrec* user, const std::string &nickname);
/** Forces a user to quit with the specified reason.
* To the user, it will appear as if they typed /QUIT themselves, except for the fact that this function
@ -1565,7 +1565,7 @@ class Server : public classbase
* read from this pointer after calling the QuitUser method UNDER ANY CIRCUMSTANCES! The best course of
* action after calling this method is to immediately bail from your handler.
*/
virtual void QuitUser(userrec* user, std::string reason);
virtual void QuitUser(userrec* user, const std::string &reason);
/** Makes a user kick another user, with the specified reason.
* If source is NULL, the server will peform the kick.
@ -1574,13 +1574,13 @@ class Server : public classbase
* @param chan The channel to kick from
* @param reason The kick reason
*/
virtual void KickUser(userrec* source, userrec* target, chanrec* chan, std::string reason);
virtual void KickUser(userrec* source, userrec* target, chanrec* chan, const std::string &reason);
/** Matches text against a glob pattern.
* Uses the ircd's internal matching function to match string against a globbing pattern, e.g. *!*@*.com
* Returns true if the literal successfully matches the pattern, false if otherwise.
*/
virtual bool MatchText(std::string sliteral, std::string spattern);
virtual bool MatchText(const std::string &sliteral, const std::string &spattern);
/** Calls the handler for a command, either implemented by the core or by another module.
* You can use this function to trigger other commands in the ircd, such as PRIVMSG, JOIN,
@ -1594,14 +1594,14 @@ class Server : public classbase
* used for privilage checks, etc.
* @return True if the command exists
*/
virtual bool CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user);
virtual bool CallCommandHandler(const std::string &commandname, char** parameters, int pcnt, userrec* user);
/** This function returns true if the commandname exists, pcnt is equal to or greater than the number
* of paramters the command requires, the user specified is allowed to execute the command, AND
* if the command is implemented by a module (not the core). This has a few specific uses, usually
* within network protocols (see src/modules/m_spanningtree.cpp)
*/
virtual bool IsValidModuleCommand(std::string commandname, int pcnt, userrec* user);
virtual bool IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user);
/** Change displayed hostname of a user.
* You should always call this method to change a user's host rather than writing directly to the
@ -1622,7 +1622,7 @@ class Server : public classbase
* change modes of clients which are on remote servers and set modes of channels where there are
* no channel operators for that channel on the ulined server, amongst other things.
*/
virtual bool IsUlined(std::string server);
virtual bool IsUlined(const std::string &server);
/** Fetches the userlist of a channel. This function must be here and not a member of userrec or
* chanrec due to include constraints.
@ -1635,7 +1635,7 @@ class Server : public classbase
* remain until it is restored with a valid file descriptor, or is removed from IRC by an operator
* After this call, the pointer to user will be invalid.
*/
virtual bool UserToPseudo(userrec* user,std::string message);
virtual bool UserToPseudo(userrec* user, const std::string &message);
/** This user takes one user, and switches their file descriptor with another user, so that one user
* "becomes" the other. The user in 'alive' is booted off the server with the given message. The user
@ -1643,7 +1643,7 @@ class Server : public classbase
* stale sockets and file descriptor leaks can occur. After this call, the pointer to alive will be
* invalid, and the pointer to zombie will be equivalent in effect to the old pointer to alive.
*/
virtual bool PseudoToUser(userrec* alive,userrec* zombie,std::string message);
virtual bool PseudoToUser(userrec* alive, userrec* zombie, const std::string &message);
/** Adds a G-line
* The G-line is propogated to all of the servers in the mesh and enforced as soon as it is added.
@ -1652,7 +1652,7 @@ class Server : public classbase
* to indicate who or what sent the data, usually this is the nickname of a person, or a server
* name.
*/
virtual void AddGLine(long duration, std::string source, std::string reason, std::string hostmask);
virtual void AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask);
/** Adds a Q-line
* The Q-line is propogated to all of the servers in the mesh and enforced as soon as it is added.
@ -1661,7 +1661,7 @@ class Server : public classbase
* to indicate who or what sent the data, usually this is the nickname of a person, or a server
* name.
*/
virtual void AddQLine(long duration, std::string source, std::string reason, std::string nickname);
virtual void AddQLine(long duration, const std::string &source, const std::string &reason, const std::string nickname);
/** Adds a Z-line
* The Z-line is propogated to all of the servers in the mesh and enforced as soon as it is added.
@ -1670,7 +1670,7 @@ class Server : public classbase
* to indicate who or what sent the data, usually this is the nickname of a person, or a server
* name.
*/
virtual void AddZLine(long duration, std::string source, std::string reason, std::string ipaddr);
virtual void AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr);
/** Adds a K-line
* The K-line is enforced as soon as it is added.
@ -1679,7 +1679,7 @@ class Server : public classbase
* to indicate who or what sent the data, usually this is the nickname of a person, or a server
* name.
*/
virtual void AddKLine(long duration, std::string source, std::string reason, std::string hostmask);
virtual void AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask);
/** Adds a E-line
* The E-line is enforced as soon as it is added.
@ -1688,44 +1688,44 @@ class Server : public classbase
* to indicate who or what sent the data, usually this is the nickname of a person, or a server
* name.
*/
virtual void AddELine(long duration, std::string source, std::string reason, std::string hostmask);
virtual void AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask);
/** Deletes a G-Line from all servers
*/
virtual bool DelGLine(std::string hostmask);
virtual bool DelGLine(const std::string &hostmask);
/** Deletes a Q-Line from all servers
*/
virtual bool DelQLine(std::string nickname);
virtual bool DelQLine(const std::string &nickname);
/** Deletes a Z-Line from all servers
*/
virtual bool DelZLine(std::string ipaddr);
virtual bool DelZLine(const std::string &ipaddr);
/** Deletes a local K-Line
*/
virtual bool DelKLine(std::string hostmask);
virtual bool DelKLine(const std::string &hostmask);
/** Deletes a local E-Line
*/
virtual bool DelELine(std::string hostmask);
virtual bool DelELine(const std::string &hostmask);
/** Calculates a duration
* This method will take a string containing a formatted duration (e.g. "1w2d") and return its value
* as a total number of seconds. This is the same function used internally by /GLINE etc to set
* the ban times.
*/
virtual long CalcDuration(std::string duration);
virtual long CalcDuration(const std::string &duration);
/** Returns true if a nick!ident@host string is correctly formatted, false if otherwise.
*/
virtual bool IsValidMask(std::string mask);
virtual bool IsValidMask(const std::string &mask);
/** This function finds a module by name.
* You must provide the filename of the module. If the module cannot be found (is not loaded)
* the function will return NULL.
*/
virtual Module* FindModule(std::string name);
virtual Module* FindModule(const std::string &name);
/** Adds a class derived from InspSocket to the server's socket engine.
*/

89
src/modules.cpp
View File

@ -339,7 +339,7 @@ void Server::RemoveSocket(InspSocket* sock)
}
}
long Server::PriorityAfter(std::string modulename)
long Server::PriorityAfter(const std::string &modulename)
{
for (unsigned int j = 0; j < Config->module_names.size(); j++)
{
@ -351,7 +351,7 @@ long Server::PriorityAfter(std::string modulename)
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++)
{
@ -419,30 +419,27 @@ void Server::AddTimer(InspTimer* T)
::AddTimer(T);
}
void Server::SendOpers(std::string s)
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);
}
@ -456,12 +453,12 @@ chanuserlist Server::GetUsers(chanrec* chan)
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)
{
@ -473,7 +470,7 @@ void Server::KickUser(userrec* source, userrec* target, chanrec* chan, std::stri
}
}
void Server::QuitUser(userrec* user, std::string reason)
void Server::QuitUser(userrec* user, const std::string &reason)
{
kill_link(user,reason.c_str());
}
@ -483,17 +480,17 @@ bool Server::IsUlined(std::string server)
return is_uline(server.c_str());
}
bool Server::CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user)
bool Server::CallCommandHandler(const std::string &commandname, char** parameters, int pcnt, userrec* 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());
}
@ -512,22 +509,22 @@ 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)
{
@ -541,12 +538,12 @@ void Server::SendTo(userrec* Source, userrec* Dest, std::string s)
}
}
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)
{
@ -563,7 +560,7 @@ bool Server::CommonChannels(userrec* u1, userrec* u2)
return (common_channels(u1,u2) != 0);
}
void Server::DumpText(userrec* User, std::string LinePrefix, stringstream &TextStream)
void Server::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
{
std::string CompleteLine = LinePrefix;
std::string Word = "";
@ -579,7 +576,7 @@ void Server::DumpText(userrec* User, std::string LinePrefix, stringstream &TextS
WriteServ_NoFormat(User->fd,CompleteLine.c_str());
}
void Server::SendCommon(userrec* User, std::string text,bool IncludeSender)
void Server::SendCommon(userrec* User, const std::string &text, bool IncludeSender)
{
if (IncludeSender)
{
@ -591,27 +588,27 @@ void Server::SendCommon(userrec* User, std::string text,bool 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);
}
@ -621,7 +618,7 @@ userrec* Server::FindDescriptor(int socket)
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());
}
@ -699,7 +696,7 @@ int Server::CountUsers(chanrec* c)
}
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());
@ -719,7 +716,7 @@ bool Server::UserToPseudo(userrec* user,std::string message)
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;
@ -761,62 +758,62 @@ bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
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)
{
char* dest = (char*)mask.c_str();
if (strchr(dest,'!')==0)
@ -845,7 +842,7 @@ bool Server::IsValidMask(std::string mask)
return true;
}
Module* Server::FindModule(std::string name)
Module* Server::FindModule(const std::string &name)
{
for (int i = 0; i <= MODCOUNT; i++)
{