X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuserprocess.cpp;h=22a48fdcce3ca4e637ba573422434b00e5f3a2bc;hb=e00b5b82db1fdffd97704ea1b43bf921476adfa1;hp=104fff4ee15afd16e5413c361e5bad56916037d8;hpb=421e5985c39943b1193300c0b633cc819d42799c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 104fff4ee..22a48fdcc 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -20,7 +20,7 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include @@ -28,19 +28,11 @@ using namespace std; #include #include #include -#ifdef GCC3 #include -#else -#include -#endif #include #include #include #include -#include -#ifdef THREADED_DNS -#include -#endif #include "users.h" #include "ctables.h" #include "globals.h" @@ -52,7 +44,6 @@ using namespace std; #include "commands.h" #include "xline.h" #include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" #include "hashcomp.h" #include "socketengine.h" @@ -61,7 +52,6 @@ using namespace std; #include "command_parse.h" #include "cull_list.h" -extern int MODCOUNT; extern struct sockaddr_in client,server; extern socklen_t length; extern std::vector modules; @@ -70,7 +60,7 @@ extern std::vector module_sockets; extern time_t TIME; extern time_t OLDTIME; extern std::vector local_users; -char LOG_FILE[MAXBUF]; +extern InspSocket* socket_ref[MAX_DESCRIPTORS]; extern InspIRCd* ServerInstance; extern ServerConfig *Config; @@ -101,7 +91,7 @@ void ProcessUser(userrec* cu) } catch (ModuleException& modexcept) { - log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); } if (MOD_RESULT < 0) @@ -124,28 +114,19 @@ void ProcessUser(userrec* cu) { userrec *current; int currfd; - int floodlines; + int floodlines = 0; ServerInstance->stats->statsRecv += result; /* * perform a check on the raw buffer as an array (not a string!) to remove - * characters 0 and 7 which are illegal in the RFC - replace them with spaces. - * hopefully this should stop even more people whining about "Unknown command: *" - */ - - /* - * XXX - potential replacement for the below using my beloved pointers. --w00t - * - * for (char *c = data; data && *data; data++) - * { - * if (*data == 0 || *data == 7) - * data = ' '; - * } + * character 0 which is illegal in the RFC - replace them with spaces. + * XXX - no garauntee there's not \0's in the middle of the data, + * and no reason for it to be terminated either. -- Om */ for (int checker = 0; checker < result; checker++) { - if ((data[checker] == 0) || (data[checker] == 7)) + if (data[checker] == 0) data[checker] = ' '; } @@ -154,7 +135,6 @@ void ProcessUser(userrec* cu) current = cu; currfd = current->fd; - floodlines = 0; // add the data to the users buffer if (result > 0) @@ -162,7 +142,7 @@ void ProcessUser(userrec* cu) if (!current->AddBuffer(data)) { // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good. - if (current->registered == 7) + if (current->registered == REG_ALL) { // Make sure they arn't flooding long lines. if (TIME > current->reset_due) @@ -188,9 +168,9 @@ void ProcessUser(userrec* cu) } else { - 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)); + WriteOpers("*** Excess flood from %s",(char*)insp_ntoa(current->ip4)); + log(DEFAULT,"Excess flood from: %s",(char*)insp_ntoa(current->ip4)); + add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4)); apply_lines(APPLY_ZLINES); } @@ -199,15 +179,15 @@ void ProcessUser(userrec* cu) if (current->recvq.length() > (unsigned)Config->NetBufferSize) { - if (current->registered == 7) + if (current->registered == REG_ALL) { kill_link(current,"RecvQ exceeded"); } else { - 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)); + WriteOpers("*** Excess flood from %s",(char*)insp_ntoa(current->ip4)); + log(DEFAULT,"Excess flood from: %s",(char*)insp_ntoa(current->ip4)); + add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4)); apply_lines(APPLY_ZLINES); } @@ -217,18 +197,13 @@ void ProcessUser(userrec* cu) // while there are complete lines to process... while (current->BufferIsReady()) { - char sanitized[MAXBUF]; - - floodlines++; if (TIME > current->reset_due) { current->reset_due = TIME + current->threshold; current->lines_in = 0; } - current->lines_in++; - - if (current->lines_in > current->flood) + 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); @@ -236,9 +211,9 @@ void ProcessUser(userrec* cu) return; } - if ((floodlines > current->flood) && (current->flood != 0)) + if ((++floodlines > current->flood) && (current->flood != 0)) { - if (current->registered == 7) + if (current->registered == REG_ALL) { 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); @@ -246,7 +221,7 @@ void ProcessUser(userrec* cu) } else { - add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4)); + add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4)); apply_lines(APPLY_ZLINES); } @@ -257,29 +232,27 @@ void ProcessUser(userrec* cu) std::string single_line = current->GetBuffer(); current->bytes_in += single_line.length(); current->cmds_in++; - strlcpy(sanitized,single_line.c_str(),511); - - if (*sanitized) + if (single_line.length() > 512) + single_line.resize(512); + + userrec* old_comp = fd_ref_table[currfd]; + + ServerInstance->Parser->ProcessBuffer(single_line,current); + /* + * look for the user's record in case it's changed... if theyve quit, + * we cant do anything more with their buffer, so bail. + * there used to be an ugly, slow loop here. Now we have a reference + * table, life is much easier (and FASTER) + */ + userrec* new_comp = fd_ref_table[currfd]; + if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp)) { - userrec* old_comp = fd_ref_table[currfd]; - - ServerInstance->Parser->ProcessBuffer(sanitized,current); - /* - * look for the user's record in case it's changed... if theyve quit, - * we cant do anything more with their buffer, so bail. - * there used to be an ugly, slow loop here. Now we have a reference - * table, life is much easier (and FASTER) - */ - userrec* new_comp = fd_ref_table[currfd]; - if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp)) - { - return; - } - else - { - /* The user is still here, flush their buffer */ - current->FlushWriteBuf(); - } + return; + } + else + { + /* The user is still here, flush their buffer */ + current->FlushWriteBuf(); } } @@ -316,13 +289,14 @@ void DoSocketTimeouts(time_t TIME) for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) { InspSocket* s = (InspSocket*)*a; - if (s->Timeout(TIME)) + if ((s) && (s->GetFd() >= 0) && (s->GetFd() < MAX_DESCRIPTORS) && (socket_ref[s->GetFd()] != NULL) && (s->Timeout(TIME))) { - log(DEBUG,"Socket poll returned false, close and bail"); + log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail"); + socket_ref[s->GetFd()] = NULL; SE->DelFd(s->GetFd()); - s->Close(); module_sockets.erase(a); - delete s; + s->Close(); + DELETE(s); break; } @@ -341,15 +315,13 @@ void DoBackgroundUserStuff(time_t TIME) { CullList GlobalGoners; - for (std::vector::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++) + /* XXX: IT IS NOT SAFE TO USE AN ITERATOR HERE. DON'T EVEN THINK ABOUT IT. */ + for (unsigned long count2 = 0; count2 != local_users.size(); count2++) { - /* Sanity checks for corrupted iterators (yes, really) */ - userrec* curr = NULL; + if (count2 >= local_users.size()) + break; - if (*count2) - curr = (userrec*)(*count2); - if ((long)curr == -1) - return; + userrec* curr = local_users[count2]; if (curr) { @@ -357,42 +329,43 @@ void DoBackgroundUserStuff(time_t TIME) * registration timeout -- didnt send USER/NICK/HOST * in the time specified in their connection class. */ - if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7)) + if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != REG_ALL)) { log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); + //ZapThisDns(curr->fd); GlobalGoners.AddItem(curr,"Registration timeout"); continue; } - /* * user has signed on with USER/NICK/PASS, and dns has completed, all the modules * say this user is ok to proceed, fully connect them. */ - if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) + if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr))) { curr->dns_done = true; + //ZapThisDns(curr->fd); ServerInstance->stats->statsDnsBad++; FullConnectUser(curr,&GlobalGoners); continue; } - - if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) + if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr))) { log(DEBUG,"dns done, registered=3, and modules ready, OK"); FullConnectUser(curr,&GlobalGoners); + //ZapThisDns(curr->fd); continue; } - // It's time to PING this user. Send them a ping. - if ((TIME > curr->nping) && (curr->registered == 7)) + if ((TIME > curr->nping) && (curr->registered == REG_ALL)) { // This user didn't answer the last ping, remove them if (!curr->lastping) { GlobalGoners.AddItem(curr,"Ping timeout"); + curr->lastping = 1; + curr->nping = TIME+curr->pingmax; continue; } - Write(curr->fd,"PING :%s",Config->ServerName); curr->lastping = 0; curr->nping = TIME+curr->pingmax; @@ -402,95 +375,18 @@ void DoBackgroundUserStuff(time_t TIME) * 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()) { GlobalGoners.AddItem(curr,curr->GetWriteError()); continue; } } - } - - /* Remove all the queued users who are due to be quit, free memory used. */ - GlobalGoners.Apply(); -} -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("module",&Config->config_f); count++) - { - Config->ConfValue("module","name",count,configToken,&Config->config_f); - 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); + /* Remove all the queued users who are due to be quit, free memory used. */ + GlobalGoners.Apply(); } - -