#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
-#include "inspircd_util.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/errno.h>
#include "inspstring.h"
#include "helperfuncs.h"
#include "hashcomp.h"
+#include "typedefs.h"
extern int MODCOUNT;
extern std::vector<Module*> modules;
-
+extern ServerConfig *Config;
extern time_t TIME;
-extern bool nofork;
extern char lowermap[255];
-extern char ServerName[MAXBUF];
-extern char Network[MAXBUF];
-extern char ServerDesc[MAXBUF];
-extern char list[MAXBUF];
-
-extern int debugging;
-extern int LogLevel;
-
-extern std::stringstream config_f;
-
-
-
-extern FILE *log_file;
+static char list[MAXBUF];
extern userrec* fd_ref_table[65536];
-
-extern int statsAccept, statsRefused, statsUnknown, statsCollisions, statsDns, statsDnsGood, statsDnsBad, statsConnects, statsSent, statsRecv;
-
+extern serverstats* stats;
static char already_sent[65536];
extern std::vector<userrec*> all_opers;
-
-extern ClassVector Classes;
-
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
-typedef std::deque<command_t> command_table;
-
extern user_hash clientlist;
extern chan_hash chanlist;
extern command_table cmdlist;
-extern file_cache MOTD;
-extern file_cache RULES;
void log(int level,char *text, ...)
{
va_list argsPtr;
time_t rawtime;
struct tm * timeinfo;
- if (level < LogLevel)
+ if (level < Config->LogLevel)
return;
time(&rawtime);
- timeinfo = localtime (&rawtime);
+ timeinfo = localtime(&rawtime);
- if (log_file)
+ if (Config->log_file)
{
char b[MAXBUF];
va_start (argsPtr, text);
va_end(argsPtr);
strlcpy(b,asctime(timeinfo),MAXBUF);
b[24] = ':'; // we know this is the end of the time string
- fprintf(log_file,"%s %s\n",b,textbuffer);
- if (nofork)
+ if (Config->log_file)
+ fprintf(Config->log_file,"%s %s\n",b,textbuffer);
+ if (Config->nofork)
{
// nofork enabled? display it on terminal too
printf("%s %s\n",b,textbuffer);
{
fgets(linebuf,sizeof(linebuf),file);
linebuf[strlen(linebuf)-1]='\0';
- if (linebuf[0] == 0)
+ if (!*linebuf)
{
strcpy(linebuf," ");
}
int MOD_RESULT = 0;
FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
fd_ref_table[sock]->AddWriteBuf(tb);
- statsSent += bytes;
+ stats->statsSent += bytes;
}
else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer);
+ int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,textbuffer);
chop(tb);
if (fd_ref_table[sock])
{
int MOD_RESULT = 0;
FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
fd_ref_table[sock]->AddWriteBuf(tb);
- statsSent += bytes;
+ stats->statsSent += bytes;
}
else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
}
int MOD_RESULT = 0;
FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
fd_ref_table[sock]->AddWriteBuf(tb);
- statsSent += bytes;
+ stats->statsSent += bytes;
}
else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
}
// if no source given send it from the server.
if (!source)
{
- WriteServ(dest->fd,":%s %s",ServerName,textbuffer);
+ WriteServ(dest->fd,":%s %s",Config->ServerName,textbuffer);
}
else
{
}
else
{
- return ServerDesc; // not a remote server that can be found, it must be me.
+ return Config->ServerDesc; // not a remote server that can be found, it must be me.
}
}
va_end(argsPtr);
// FIX: Stops a message going to the same person more than once
- memset(&already_sent,0,65536);
+ memset(&already_sent,0,MAXCLIENTS);
bool sent_to_at_least_one = false;
- for (int i = 0; i < MAXCHANS; i++)
+ for (unsigned int i = 0; i < u->chans.size(); i++)
{
if (u->chans[i].channel)
{
std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
- for (unsigned int j = 0; j < ulist->size(); j++)
+ unsigned int x = ulist->size();
+ for (unsigned int j = 0; j < x; j++)
{
char* o = (*ulist)[j];
userrec* otheruser = (userrec*)o;
memset(&already_sent,0,65536);
- for (int i = 0; i < MAXCHANS; i++)
+ for (unsigned int i = 0; i < u->chans.size(); i++)
{
if (u->chans[i].channel)
{
}
}
-void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
+void ServerNoticeAll(char* text, ...)
{
- if ((!text) || (!source))
- {
- log(DEFAULT,"*** BUG *** NoticeAllOpers was given an invalid parameter");
- return;
- }
+ if (!text)
+ return;
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
- {
- userrec* a = *i;
- if ((a) && (a->fd != FD_MAGIC_NUMBER))
- {
- if (strchr(a->modes,'s'))
- {
- // send server notices to all with +s
- WriteServ(a->fd,"NOTICE %s :*** Notice From %s: %s",a->nick,source->nick,textbuffer);
- }
- }
- }
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+ {
+ WriteServ(i->second->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+ }
+ }
}
-// returns TRUE of any users on channel C occupy server 'servername'.
-bool ChanAnyOnThisServer(chanrec *c,char* servername)
+void ServerPrivmsgAll(char* text, ...)
{
- log(DEBUG,"ChanAnyOnThisServer");
-
- std::vector<char*> *ulist = c->GetUsers();
- for (unsigned int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* user = (userrec*)o;
- if (!strcasecmp(user->server,servername))
- return true;
- }
- return false;
-}
-
-// returns true if user 'u' shares any common channels with any users on server 'servername'
+ if (!text)
+ return;
-bool CommonOnThisServer(userrec* u,const char* servername)
-{
- log(DEBUG,"ChanAnyOnThisServer");
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
- for (int i = 0; i < MAXCHANS; i++)
- {
- if (u->chans[i].channel)
- {
- std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
- for (unsigned int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* user = (userrec*)o;
- if (!strcasecmp(user->server,servername))
- return true;
- }
- }
- }
- return false;
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+ {
+ WriteServ(i->second->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+ }
+ }
}
-
void WriteMode(const char* modes, int flags, const char* text, ...)
{
if ((!text) || (!modes) || (!flags))
long GetMaxBans(char* name)
{
char CM[MAXBUF];
- for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++)
+ for (int count = 0; count < Config->ConfValueEnum("banlist",&Config->config_f); count++)
{
- ConfValue("banlist","chan",count,CM,&config_f);
+ Config->ConfValue("banlist","chan",count,CM,&Config->config_f);
if (match(name,CM))
{
- ConfValue("banlist","limit",count,CM,&config_f);
+ Config->ConfValue("banlist","limit",count,CM,&Config->config_f);
return atoi(CM);
}
}
void purge_empty_chans(userrec* u)
{
- int go_again = 1, purge = 0;
+ int purge = 0;
// firstly decrement the count on each channel
- for (int f = 0; f < MAXCHANS; f++)
+ for (unsigned int f = 0; f < u->chans.size(); f++)
{
if (u->chans[f].channel)
{
}
}
- for (int i = 0; i < MAXCHANS; i++)
+ for (unsigned int i = 0; i < u->chans.size(); i++)
{
if (u->chans[i].channel)
{
if (i2->second)
delete i2->second;
chanlist.erase(i2);
- go_again = 1;
purge++;
u->chans[i].channel = NULL;
}
}
-char scratch[MAXBUF];
-char sparam[MAXBUF];
-
char* chanmodes(chanrec *chan)
{
+ static char scratch[MAXBUF];
+ static char sparam[MAXBUF];
+ char* offset = scratch;
+
if (!chan)
{
log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter");
- strcpy(scratch,"");
+ *scratch = '\0';
return scratch;
}
- strcpy(scratch,"");
- strcpy(sparam,"");
+ *scratch = '\0';
+ *sparam = '\0';
if (chan->binarymodes & CM_NOEXTERNAL)
- {
- strlcat(scratch,"n",MAXMODES);
- }
+ *offset++ = 'n';
if (chan->binarymodes & CM_TOPICLOCK)
- {
- strlcat(scratch,"t",MAXMODES);
- }
- if (chan->key[0])
- {
- strlcat(scratch,"k",MAXMODES);
- }
+ *offset++ = 't';
+ if (*chan->key)
+ *offset++ = 'k';
if (chan->limit)
- {
- strlcat(scratch,"l",MAXMODES);
- }
+ *offset++ = 'l';
if (chan->binarymodes & CM_INVITEONLY)
- {
- strlcat(scratch,"i",MAXMODES);
- }
+ *offset++ = 'i';
if (chan->binarymodes & CM_MODERATED)
- {
- strlcat(scratch,"m",MAXMODES);
- }
+ *offset++ = 'm';
if (chan->binarymodes & CM_SECRET)
- {
- strlcat(scratch,"s",MAXMODES);
- }
+ *offset++ = 's';
if (chan->binarymodes & CM_PRIVATE)
- {
- strlcat(scratch,"p",MAXMODES);
- }
- if (chan->key[0])
- {
- strlcat(sparam," ",MAXBUF);
- strlcat(sparam,chan->key,MAXBUF);
- }
+ *offset++ = 'p';
+ if (*chan->key)
+ snprintf(sparam,MAXBUF," %s",chan->key);
if (chan->limit)
{
char foo[24];
}
if (*chan->custom_modes)
{
- strlcat(scratch,chan->custom_modes,MAXMODES);
- for (int z = 0; chan->custom_modes[z] != 0; z++)
+ for (char* t = chan->custom_modes; *t; t++)
+ *offset++ = *t;
+ for (int z = 0; chan->custom_modes[z]; z++)
{
std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
if (extparam != "")
}
}
}
- log(DEBUG,"chanmodes: %s %s%s",chan->name,scratch,sparam);
+ /* Null terminate scratch */
+ *offset = '\0';
strlcat(scratch,sparam,MAXMODES);
return scratch;
}
return 0;
}
- strcpy(list,"");
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
if (i->second)
char* Passwd(userrec *user)
{
- for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+ for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
{
- if (match(user->host,i->host) && (i->type == CC_ALLOW))
+ if ((i->type == CC_ALLOW) && match(user->host,i->host))
{
return i->pass;
}
bool IsDenied(userrec *user)
{
- for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+ for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
{
- if (match(user->host,i->host) && (i->type == CC_DENY))
+ if ((i->type == CC_DENY) && match(user->host,i->host))
{
return true;
}
log(DEBUG,"send_error: %s",s);
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
- if (isnick(i->second->nick))
- {
- WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s);
- }
- else
- {
- // fix - unregistered connections receive ERROR, not NOTICE
- Write(i->second->fd,"ERROR :%s",s);
- }
+ if (IS_LOCAL(i->second))
+ {
+ if (i->second->registered == 7)
+ {
+ WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s);
+ }
+ else
+ {
+ // fix - unregistered connections receive ERROR, not NOTICE
+ Write(i->second->fd,"ERROR :%s",s);
+ }
+ }
}
}
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
- if ((i->second->fd) && (i->second->registered != 7))
+ if ((i->second->fd > -1) && (i->second->registered != 7))
c++;
}
return c;
return chanlist.size();
}
-long count_servs(void)
-{
- return 0;
-}
-
-long servercount(void)
-{
- return count_servs()+1;
-}
-
long local_count()
{
int c = 0;
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
- if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++;
+ if ((isnick(i->second->nick)) && (i->second->fd > -1)) c++;
}
return c;
}
void ShowMOTD(userrec *user)
{
- char buf[65536];
+ static char mbuf[MAXBUF];
+ static char crud[MAXBUF];
std::string WholeMOTD = "";
- if (!MOTD.size())
+ if (!Config->MOTD.size())
{
WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
return;
}
- snprintf(buf,65535,":%s 375 %s :- %s message of the day\r\n", ServerName, user->nick, ServerName);
- WholeMOTD = WholeMOTD + buf;
- for (unsigned int i = 0; i != MOTD.size(); i++)
- {
- snprintf(buf,65535,":%s 372 %s :- %s\r\n", ServerName, user->nick, MOTD[i].c_str());
- WholeMOTD = WholeMOTD + buf;
- }
- snprintf(buf,65535,":%s 376 %s :End of message of the day.\r\n", ServerName, user->nick);
- WholeMOTD = WholeMOTD + buf;
+ snprintf(crud,MAXBUF,":%s 372 %s :- ", Config->ServerName, user->nick);
+ snprintf(mbuf,MAXBUF,":%s 375 %s :- %s message of the day\r\n", Config->ServerName, user->nick, Config->ServerName);
+ WholeMOTD = WholeMOTD + mbuf;
+ for (unsigned int i = 0; i < Config->MOTD.size(); i++)
+ WholeMOTD = WholeMOTD + std::string(crud) + Config->MOTD[i].c_str() + std::string("\r\n");
+ snprintf(mbuf,MAXBUF,":%s 376 %s :End of message of the day.\r\n", Config->ServerName, user->nick);
+ WholeMOTD = WholeMOTD + mbuf;
// only one write operation
user->AddWriteBuf(WholeMOTD);
- statsSent += WholeMOTD.length();
+ stats->statsSent += WholeMOTD.length();
}
void ShowRULES(userrec *user)
{
- if (!RULES.size())
+ if (!Config->RULES.size())
{
WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick);
return;
}
- WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,ServerName);
- for (unsigned int i = 0; i != RULES.size(); i++)
- {
- WriteServ(user->fd,"NOTICE %s :%s",user->nick,RULES[i].c_str());
- }
- WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,ServerName);
+ WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,Config->ServerName);
+ for (unsigned int i = 0; i < Config->RULES.size(); i++)
+ WriteServ(user->fd,"NOTICE %s :%s",user->nick,Config->RULES[i].c_str());
+ WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,Config->ServerName);
}
// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
for (int i = 0; i <= MODCOUNT; i++)
{
int res = modules[i]->OnCheckReady(user);
- if (!res)
- return false;
+ if (!res)
+ return false;
}
return true;
}
-char islast(const char* s)
-{
- return '+';
-}
-
-long map_count(const char* s)
-{
- int c = 0;
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s))) c++;
- }
- return c;
-}
-
void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source)
{
command_t comm;
bool DirValid(char* dirandfile)
{
char work[MAXBUF];
+ char buffer[MAXBUF], otherdir[MAXBUF];
strlcpy(work,dirandfile,MAXBUF);
int p = strlen(work);
// we just want the dir
- while (strlen(work))
+ while (*work)
{
if (work[p] == '/')
{
}
work[p--] = '\0';
}
- char buffer[MAXBUF], otherdir[MAXBUF];
// Get the current working directory
if( getcwd( buffer, MAXBUF ) == NULL )
return false;
std::string GetFullProgDir(char** argv, int argc)
{
char work[MAXBUF];
+ char buffer[MAXBUF], otherdir[MAXBUF];
strlcpy(work,argv[0],MAXBUF);
int p = strlen(work);
// we just want the dir
- while (strlen(work))
+ while (*work)
{
if (work[p] == '/')
{
}
work[p--] = '\0';
}
- char buffer[MAXBUF], otherdir[MAXBUF];
// Get the current working directory
if( getcwd( buffer, MAXBUF ) == NULL )
return "";
projects / user / henk / code / inspircd.git / blobdiff