X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=fae96721df0f4f09f72d5398935b85ff0dcc9a4c;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=ba4cc48bbe7f3770172d2f3f5257a77e50bee465;hpb=b6caa4073c9c8a291dabfe6e6613b7f08917b214;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index ba4cc48bb..fae96721d 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -56,6 +56,7 @@ using namespace std; #include "helperfuncs.h" #include "hashcomp.h" #include "socketengine.h" +#include "userprocess.h" #include "typedefs.h" #include "command_parse.h" #include "cull_list.h" @@ -72,7 +73,7 @@ extern std::vector local_users; extern InspIRCd* ServerInstance; extern ServerConfig *Config; -extern userrec* fd_ref_table[65536]; +extern userrec* fd_ref_table[MAX_DESCRIPTORS]; char data[65536]; extern user_hash clientlist; @@ -81,15 +82,25 @@ extern chan_hash chanlist; void ProcessUser(userrec* cu) { int result = EAGAIN; + if (cu->fd == FD_MAGIC_NUMBER) + return; log(DEBUG,"Processing user with fd %d",cu->fd); 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; + result = -EAGAIN; } else { @@ -101,7 +112,7 @@ void ProcessUser(userrec* cu) result = cu->ReadData(data, 65535); } log(DEBUG,"Read result: %d",result); - if (result) + if ((result) && (result != -EAGAIN)) { ServerInstance->stats->statsRecv += result; // perform a check on the raw buffer as an array (not a string!) to remove @@ -124,14 +135,30 @@ void ProcessUser(userrec* cu) { // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good. if (current->registered == 7) - { - kill_link(current,"RecvQ exceeded"); + { + // Make sure they arn't flooding long lines. + if (TIME > current->reset_due) + { + current->reset_due = TIME + current->threshold; + current->lines_in = 0; + } + current->lines_in++; + if (current->lines_in > current->flood) + { + 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; + } else { + WriteServ(currfd, "NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick); + current->recvq = ""; + } } 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; @@ -144,9 +171,9 @@ void ProcessUser(userrec* cu) } 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; @@ -178,7 +205,7 @@ void ProcessUser(userrec* cu) } 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; @@ -228,7 +255,7 @@ void ProcessUser(userrec* cu) } } // result EAGAIN means nothing read - else if (result == EAGAIN) + else if ((result == EAGAIN) || (result == -EAGAIN)) { } else if (result == 0) @@ -240,20 +267,10 @@ void ProcessUser(userrec* cu) } } -/** - * 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::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) { InspSocket* s = (InspSocket*)*a; @@ -268,6 +285,16 @@ bool DoBackgroundUserStuff(time_t TIME) } 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::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++) { @@ -276,7 +303,7 @@ bool DoBackgroundUserStuff(time_t TIME) if (*count2) curr = (userrec*)(*count2); if ((long)curr == -1) - return false; + return; if (curr) { @@ -304,7 +331,6 @@ bool DoBackgroundUserStuff(time_t TIME) 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 @@ -317,7 +343,7 @@ bool DoBackgroundUserStuff(time_t TIME) 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() != "") @@ -333,30 +359,21 @@ bool DoBackgroundUserStuff(time_t TIME) /** 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) { - std::string logpath = GetFullProgDir(argv,argc) + "/ircd.log"; - Config->log_file = fopen(logpath.c_str(),"a+"); + if (Config->logpath == "") + { + Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log"; + } + Config->log_file = fopen(Config->logpath.c_str(),"a+"); if (!Config->log_file) { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",logpath.c_str()); + printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); Exit(ERROR); } -#ifdef IS_CYGWIN - printf("Logging to ircd.log...\n"); -#else - printf("Logging to %s...\n",logpath.c_str()); -#endif }