extern time_t TIME;
extern time_t OLDTIME;
extern std::vector<userrec*> local_users;
+char LOG_FILE[MAXBUF];
extern InspIRCd* ServerInstance;
extern ServerConfig *Config;
if (Config->GetIOHook(cu->port))
{
int result2 = 0;
- int MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2);
- log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+ int MOD_RESULT = 0;
+ try
+ {
+ MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2);
+ log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
if (MOD_RESULT < 0)
{
result = -EAGAIN;
}
else
{
- WriteOpers("*** Excess flood from %s",current->ip);
- log(DEFAULT,"Excess flood from: %s",current->ip);
- add_zline(120,Config->ServerName,"Flood from unregistered connection",current->ip);
+ WriteOpers("*** Excess flood from %s",(char*)inet_ntoa(current->ip4));
+ log(DEFAULT,"Excess flood from: %s",(char*)inet_ntoa(current->ip4));
+ add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
apply_lines(APPLY_ZLINES);
}
return;
}
else
{
- WriteOpers("*** Excess flood from %s",current->ip);
- log(DEFAULT,"Excess flood from: %s",current->ip);
- add_zline(120,Config->ServerName,"Flood from unregistered connection",current->ip);
+ WriteOpers("*** Excess flood from %s",(char*)inet_ntoa(current->ip4));
+ log(DEFAULT,"Excess flood from: %s",(char*)inet_ntoa(current->ip4));
+ add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
apply_lines(APPLY_ZLINES);
}
return;
}
else
{
- add_zline(120,Config->ServerName,"Flood from unregistered connection",current->ip);
+ add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
apply_lines(APPLY_ZLINES);
}
return;
std::string single_line = current->GetBuffer();
current->bytes_in += single_line.length();
current->cmds_in++;
- if (single_line.length()>512)
- {
- log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
- WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
- kill_link(current,"Excess flood");
- return;
- }
- strlcpy(sanitized,single_line.c_str(),MAXBUF);
+ strlcpy(sanitized,single_line.c_str(),511);
if (*sanitized)
{
userrec* old_comp = fd_ref_table[currfd];
}
}
-/**
- * This function is called once a second from the mainloop.
- * It is intended to do background checking on all the user structs, e.g.
- * stuff like ping checks, registration timeouts, etc.
- * The function returns false when it is finished, and true if
- * it needs to be run again (e.g. it has processed one of a batch of
- * QUIT messages, but couldnt continue iterating because the iterator
- * became invalid). This function is also responsible for checking
- * if InspSocket derived classes are timed out.
- */
-bool DoBackgroundUserStuff(time_t TIME)
+void DoSocketTimeouts(time_t TIME)
{
unsigned int numsockets = module_sockets.size();
- SocketEngine* SE = ServerInstance->SE;
+ SocketEngine* SE = ServerInstance->SE;
for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
{
InspSocket* s = (InspSocket*)*a;
}
if (module_sockets.size() != numsockets) break;
}
+}
+
+/**
+ * This function is called once a second from the mainloop.
+ * It is intended to do background checking on all the user structs, e.g.
+ * stuff like ping checks, registration timeouts, etc. This function is
+ * also responsible for checking if InspSocket derived classes are timed out.
+ */
+void DoBackgroundUserStuff(time_t TIME)
+{
CullList* GlobalGoners = new CullList();
for (std::vector<userrec*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
{
if (*count2)
curr = (userrec*)(*count2);
if ((long)curr == -1)
- return false;
+ return;
if (curr)
{
continue;
}
// It's time to PING this user. Send them a ping.
- // XXX: We were checking isnick() here -- why when we check curr->registered? - Brain
if ((TIME > curr->nping) && (curr->registered == 7))
{
// This user didn't answer the last ping, remove them
curr->lastping = 0;
curr->nping = TIME+curr->pingmax;
}
- // XXX: We can flush the write buffer as the last thing we do, because if they
+ // We can flush the write buffer as the last thing we do, because if they
// match any of the above conditions its no use flushing their buffer anyway.
curr->FlushWriteBuf();
if (curr->GetWriteError() != "")
/** Free to memory used
*/
delete GlobalGoners;
- /** XXX: The old system prior to 1.0RC2 would call this function
- * repeatedly until everything was ship-shape, however now we are
- * using CullList to avoid bailing from the loop, so this is no
- * longer required. We always return false here so this only executes
- * once. At some future date the while loop may be removed from
- * the mainloop which calls this function.
- */
- return false;
+ return;
}
void OpenLog(char** argv, int argc)
{
- if (Config->logpath == "")
+ if (!*LOG_FILE)
{
- Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+ 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)
for (int count = 0; count < Config->ConfValueEnum("module",&Config->config_f); count++)
{
Config->ConfValue("module","name",count,configToken,&Config->config_f);
- printf("Loading module... \033[1;32m%s\033[0m\n",configToken);
+ 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\nYou might want to do './inspircd start' instead of 'bin/inspircd'\n\n",ServerInstance->ModuleError());
+ printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());
Exit(0);
}
}