* ---------------------------------------------------
*/
-using namespace std;
-
+#include <stdarg.h>
#include "inspircd_config.h"
#include "inspircd.h"
-#include "inspircd_io.h"
+#include "configreader.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/errno.h>
+#include <signal.h>
#include <time.h>
#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
#include <sstream>
-#include <vector>
-#include <deque>
-#include <stdarg.h>
+#ifdef HAS_EXECINFO
+#include <execinfo.h>
+#endif
#include "connection.h"
#include "users.h"
#include "ctables.h"
#include "typedefs.h"
extern int MODCOUNT;
-extern std::vector<Module*> modules;
+extern ModuleList modules;
extern ServerConfig *Config;
extern InspIRCd* ServerInstance;
extern time_t TIME;
extern user_hash clientlist;
extern chan_hash chanlist;
+char LOG_FILE[MAXBUF];
+
extern std::vector<userrec*> local_users;
static char TIMESTR[26];
* Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
* is greater than the configured loglevel.
*/
-void log(int level, char *text, ...)
+void do_log(int level, const char *text, ...)
{
va_list argsPtr;
char textbuffer[MAXBUF];
- if (level < Config->LogLevel)
+ /* If we were given -debug we output all messages, regardless of configured loglevel */
+ if ((level < Config->LogLevel) && !Config->forcedebug)
return;
if (TIME != LAST)
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- if (Config->log_file)
- fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer);
-
- if (Config->nofork)
+ if (Config->writelog)
{
- printf("%s %s\n", TIMESTR, textbuffer);
+ fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer);
+ fflush(Config->log_file);
}
}
+
+ if (Config->nofork)
+ {
+ printf("%s %s\n", TIMESTR, textbuffer);
+ }
}
/** readfile()
if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
return;
- bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
- chop(tb);
-
if (fd_ref_table[sock])
{
+ bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
+ chop(tb);
+
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
try
return;
}
- va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
- chop(tb);
-
if (fd_ref_table[sock])
{
+
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
+ chop(tb);
+
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
try
if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
return;
- bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
- chop(tb);
-
if (fd_ref_table[sock])
{
+ bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
+ chop(tb);
+
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
try
{
va_list argsPtr;
char textbuffer[MAXBUF];
- char tb[MAXBUF];
- int bytes;
if ((sock < 0) || (sock > MAX_DESCRIPTORS))
return;
return;
}
+ if (!fd_ref_table[sock])
+ return;
+
va_start(argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,textbuffer);
- chop(tb);
-
- if (fd_ref_table[sock])
- {
- if (Config->GetIOHook(fd_ref_table[sock]->port))
- {
- try
- {
- Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
- }
- catch (ModuleException& modexcept)
- {
- log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
- }
- }
- else
- {
- fd_ref_table[sock]->AddWriteBuf(tb);
- }
-
- ServerInstance->stats->statsSent += bytes;
- }
- else
- log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
+
+ WriteServ_NoFormat(sock, textbuffer);
}
/** WriteFrom_NoFormat()
if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
return;
- bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
- chop(tb);
-
if (fd_ref_table[sock])
{
+ bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
+ chop(tb);
+
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
try
return;
}
- va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer);
- chop(tb);
-
if (fd_ref_table[sock])
{
+
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer);
+ chop(tb);
+
if (Config->GetIOHook(fd_ref_table[sock]->port))
{
try
-void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
+void WriteChannelWithServ(const char* ServName, chanrec* Ptr, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
}
}
-void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text)
+void WriteChannelWithServ_NoFormat(const char* ServName, chanrec* Ptr, const char* text)
{
CUList *ulist;
}
}
-std::string GetServerDescription(char* servername)
+std::string GetServerDescription(const char* servername)
{
std::string description = "";
* uses the oper list, which means if you have 2000 users but only 5 opers,
* it iterates 5 times.
*/
-void WriteOpers(char* text, ...)
+void WriteOpers(const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
+ WriteOpers_NoFormat(textbuffer);
+}
+
+void WriteOpers_NoFormat(const char* text)
+{
+ if (!text)
+ {
+ log(DEFAULT,"*** BUG *** WriteOpers_NoFormat was given an invalid parameter");
+ return;
+ }
+
for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
{
userrec* a = *i;
if (IS_LOCAL(a))
{
- if (a->modebits & UM_SERVERNOTICE)
+ if (a->modes[UM_SERVERNOTICE])
{
// send server notices to all with +s
- WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
+ WriteServ(a->fd,"NOTICE %s :%s",a->nick,text);
}
}
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+ snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
for (int n = 0; n < modelen; n++)
{
- if (!hasumode(t,modes[n]))
+ if (!t->modes[modes[n]-65])
{
send_to_user = false;
break;
for (int n = 0; n < modelen; n++)
{
- if (hasumode(t,modes[n]))
+ if (t->modes[modes[n]-65])
{
send_to_user = true;
break;
{
userrec* t = (userrec*)(*i);
- if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS))
+ if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS]))
{
WriteTo_NoFormat(source,t,formatbuffer);
}
if (n)
{
for (char* t = n; *t; t++)
- *t = lowermap[(unsigned)*t];
+ *t = lowermap[(unsigned char)*t];
}
}
if (i2 != chanlist.end())
{
FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
- delete i2->second;
+ DELETE(i2->second);
chanlist.erase(i2);
}
}
static char scratch[MAXBUF];
static char sparam[MAXBUF];
char* offset = scratch;
+ std::string extparam = "";
if (!chan)
{
*scratch = '\0';
*sparam = '\0';
- if (chan->binarymodes & CM_NOEXTERNAL)
- *offset++ = 'n';
- if (chan->binarymodes & CM_TOPICLOCK)
- *offset++ = 't';
- if (*chan->key)
- *offset++ = 'k';
- if (chan->limit)
- *offset++ = 'l';
- if (chan->binarymodes & CM_INVITEONLY)
- *offset++ = 'i';
- if (chan->binarymodes & CM_MODERATED)
- *offset++ = 'm';
- if (chan->binarymodes & CM_SECRET)
- *offset++ = 's';
- if (chan->binarymodes & CM_PRIVATE)
- *offset++ = 'p';
-
- if (*chan->key)
- {
- snprintf(sparam,MAXBUF," %s",showkey ? chan->key : "<key>");
- }
-
- if (chan->limit)
- {
- char foo[24];
- sprintf(foo," %lu",(unsigned long)chan->limit);
- strlcat(sparam,foo,MAXBUF);
- }
-
/* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
for(int n = 0; n < 64; n++)
{
- if(chan->custom_modes[n])
+ if(chan->modes[n])
{
*offset++ = n+65;
- std::string extparam = chan->GetModeParameter(n+65);
-
+ extparam = "";
+ switch (n)
+ {
+ case CM_KEY:
+ extparam = (showkey ? chan->key : "<key>");
+ break;
+ case CM_LIMIT:
+ extparam = ConvToStr(chan->limit);
+ break;
+ case CM_NOEXTERNAL:
+ case CM_TOPICLOCK:
+ case CM_INVITEONLY:
+ case CM_MODERATED:
+ case CM_SECRET:
+ case CM_PRIVATE:
+ /* We know these have no parameters */
+ break;
+ default:
+ extparam = chan->GetModeParameter(n+65);
+ break;
+ }
if (extparam != "")
{
charlcat(sparam,' ',MAXBUF);
/* Null terminate scratch */
*offset = '\0';
- strlcat(scratch,sparam,MAXMODES);
+ strlcat(scratch,sparam,MAXBUF);
return scratch;
}
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((!has_user) && (i->second->modebits & UM_INVISIBLE))
+ if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
{
/*
* user is +i, and source not on the channel, does not show
CUList *ulist= c->GetUsers();
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (!(i->second->modebits & UM_INVISIBLE))
+ if (!(i->second->modes[UM_INVISIBLE]))
count++;
}
}
-/* looks up a users password for their connection class (<ALLOW>/<DENY> tags) */
+/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+ * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
+ * then their ip will be taken as 'priority' anyway, so for example,
+ * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
+ */
ConnectClass GetClass(userrec *user)
{
for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
{
- if (match(user->host,i->host.c_str()))
+ if ((match(inet_ntoa(user->ip4),i->host.c_str())) || (match(user->host,i->host.c_str())))
{
return *i;
}
void Error(int status)
{
+ void *array[300];
+ size_t size;
+ char **strings;
+
signal(SIGALRM, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
signal(SIGTERM, SIG_IGN);
signal(SIGURG, SIG_IGN);
signal(SIGKILL, SIG_IGN);
log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
- send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*");
+#ifdef HAS_EXECINFO
+ log(DEFAULT,"Please report the backtrace lines shown below with any bugreport to the bugtracker at http://www.inspircd.org/bugtrack/");
+ size = backtrace(array, 30);
+ strings = backtrace_symbols(array, size);
+ for (size_t i = 0; i < size; i++) {
+ log(DEFAULT,"[%d] %s", i, strings[i]);
+ }
+ free(strings);
+ WriteOpers("*** SIGSEGV: Please see the ircd.log for backtrace and report the error to http://www.inspircd.org/bugtrack/");
+#else
+ log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port.");
+#endif
+ send_error("Somebody screwed up... Whoops. IRC Server terminating.");
+ signal(SIGSEGV, SIG_DFL);
+ if (raise(SIGSEGV) == -1)
+ {
+ log(DEFAULT,"What the hell, i couldnt re-raise SIGSEGV! Error: %s",strerror(errno));
+ }
Exit(status);
}
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
- if ((i->second->registered == 7) && (i->second->modebits & UM_INVISIBLE))
+ if ((i->second->registered == 7) && (i->second->modes[UM_INVISIBLE]))
c++;
}
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
- if (i->second->oper)
+ if (*(i->second->oper))
c++;
}
return c;
return true;
}
+/* Make Sure Modules Are Avaliable!
+ * (BugFix By Craig.. See? I do work! :p)
+ * Modified by brain, requires const char*
+ * to work with other API functions
+ */
+
+/* XXX - Needed? */
+bool FileExists (const char* file)
+{
+ FILE *input;
+ if ((input = fopen (file, "r")) == NULL)
+ {
+ return(false);
+ }
+ else
+ {
+ fclose (input);
+ return(true);
+ }
+}
+
+char* CleanFilename(char* name)
+{
+ char* p = name + strlen(name);
+ while ((p != name) && (*p != '/')) p--;
+ return (p != name ? ++p : p);
+}
+
bool DirValid(char* dirandfile)
{
char work[MAXBUF];
return shift_down;
}
+
+void OpenLog(char** argv, int argc)
+{
+ if (!*LOG_FILE)
+ {
+ if (Config->logpath == "")
+ {
+ Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+ }
+ }
+ else
+ {
+ Config->log_file = fopen(LOG_FILE,"a+");
+
+ if (!Config->log_file)
+ {
+ printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+ Exit(ERROR);
+ }
+
+ return;
+ }
+
+ Config->log_file = fopen(Config->logpath.c_str(),"a+");
+
+ if (!Config->log_file)
+ {
+ printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+ Exit(ERROR);
+ }
+}
+
+void CheckRoot()
+{
+ if (geteuid() == 0)
+ {
+ printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
+ log(DEFAULT,"InspIRCd: startup: not starting with UID 0!");
+ Exit(ERROR);
+ }
+}
+
+void CheckDie()
+{
+ if (*Config->DieValue)
+ {
+ printf("WARNING: %s\n\n",Config->DieValue);
+ log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue);
+ Exit(ERROR);
+ }
+}
+
+/* We must load the modules AFTER initializing the socket engine, now */
+void LoadAllModules(InspIRCd* ServerInstance)
+{
+ char configToken[MAXBUF];
+ Config->module_names.clear();
+ MODCOUNT = -1;
+
+ for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
+ {
+ Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
+ printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
+
+ if (!ServerInstance->LoadModule(configToken))
+ {
+ log(DEFAULT,"Exiting due to a module loader error.");
+ printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());
+ Exit(0);
+ }
+ }
+
+ log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1);
+}
projects / user / henk / code / inspircd.git / blobdiff