X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=9523e13ca0c5abfa7f522506fef9d7c7445a95c9;hb=878e437589ee448bc2e87200890cbd446accfc68;hp=e077c939ad2b0e283823fb7bce3d75109a155b61;hpb=ab01aaeeee9aed655df2eec2522072233fe3aa57;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index e077c939a..9523e13ca 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -18,20 +18,27 @@ using namespace std; +#include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" #include "inspircd_util.h" -#include "inspircd_config.h" #include #include #include #include #include + #ifdef USE_KQUEUE #include #include #include #endif + +#ifdef USE_EPOLL +#include +#define EP_DELAY 50 +#endif + #include #include #ifdef GCC3 @@ -81,7 +88,9 @@ int WHOWAS_STALE = 48; // default WHOWAS Entries last 2 days before they go 'sta int WHOWAS_MAX = 100; // default 100 people maximum in the WHOWAS list int DieDelay = 5; time_t startup_time = time(NULL); -int NetBufferSize = 10240; // NetBufferSize used as the buffer size for all read() ops +int NetBufferSize = 10240; // NetBufferSize used as the buffer size for all read() ops +int MaxConn = SOMAXCONN; // size of accept() backlog (128 by default on *BSD) +unsigned int SoftLimit = MAXCLIENTS; extern int MaxWhoResults; time_t nb_start = 0; int dns_timeout = 5; @@ -92,9 +101,9 @@ bool AllowHalfop = true; bool AllowProtect = true; bool AllowFounder = true; -extern std::vector modules; -std::vector module_names; -extern std::vector factory; +extern std::vector modules; +std::vector module_names; +extern std::vector factory; extern int MODCOUNT; int openSockfd[MAXSOCKS]; @@ -107,11 +116,20 @@ time_t TIME = time(NULL), OLDTIME = time(NULL); int kq, lkq, skq; #endif -typedef nspace::hash_map, irc::StrHashComp, __single_client_alloc> user_hash; -typedef nspace::hash_map, irc::StrHashComp, __single_client_alloc> chan_hash; -typedef nspace::hash_map, irc::InAddr_HashComp, __single_client_alloc> address_cache; -typedef nspace::hash_map, irc::StrHashComp, __single_client_alloc> whowas_hash; -typedef std::deque command_table; +#ifdef USE_EPOLL +int ep, lep, sep; +#endif + +bool has_been_netsplit = false; +extern std::vector include_stack; + +typedef nspace::hash_map, irc::StrHashComp> user_hash; +typedef nspace::hash_map, irc::StrHashComp> chan_hash; +typedef nspace::hash_map, irc::InAddr_HashComp> address_cache; +typedef nspace::hash_map, irc::StrHashComp> whowas_hash; +typedef std::deque command_table; +typedef std::map autoconnects; +typedef std::vector servernamelist; // This table references users by file descriptor. // its an array to make it VERY fast, as all lookups are referenced @@ -128,11 +146,13 @@ user_hash clientlist; chan_hash chanlist; whowas_hash whowas; command_table cmdlist; +autoconnects autoconns; file_cache MOTD; file_cache RULES; address_cache IP; ClassVector Classes; +servernamelist servernames; struct linger linger = { 0 }; char MyExecutable[1024]; @@ -153,7 +173,7 @@ void AddWhoWas(userrec* u); std::vector auth_cookies; std::stringstream config_f(stringstream::in | stringstream::out); -std::vector all_opers; +std::vector all_opers; char lowermap[255]; @@ -163,9 +183,30 @@ void AddOper(userrec* user) all_opers.push_back(user); } +void AddServerName(std::string servername) +{ + log(DEBUG,"Adding server name: %s",servername.c_str()); + for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++) + { + if (*a == servername) + return; + } + servernames.push_back(servername); +} + +const char* FindServerNamePtr(std::string servername) +{ + for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++) + { + if (*a == servername) + return a->c_str(); + } + return ""; +} + void DeleteOper(userrec* user) { - for (std::vector::iterator a = all_opers.begin(); a < all_opers.end(); a++) + for (std::vector::iterator a = all_opers.begin(); a < all_opers.end(); a++) { if (*a == user) { @@ -176,7 +217,7 @@ void DeleteOper(userrec* user) } } -long GetRevision() +std::string GetRevision() { char Revision[] = "$Revision$"; char *s1 = Revision; @@ -185,7 +226,7 @@ long GetRevision() s1 = savept; v2 = strtok_r(s1," ",&savept); s1 = savept; - return (long)(atof(v2)*10000); + return std::string(v2); } @@ -221,14 +262,16 @@ std::string getadminnick() void ReadConfig(bool bail, userrec* user) { - char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF]; - char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF]; + char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF],MCON[MAXBUF]; + char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF],SLIMT[MAXBUF]; ConnectClass c; std::stringstream errstr; + include_stack.clear(); if (!LoadConf(CONFIG_FILE,&config_f,&errstr)) { errstr.seekg(0); + log(DEFAULT,"There were errors in your configuration:\n%s",errstr.str().c_str()); if (bail) { printf("There were errors in your configuration:\n%s",errstr.str().c_str()); @@ -282,12 +325,25 @@ void ReadConfig(bool bail, userrec* user) ConfValue("dns","timeout",0,DNT,&config_f); ConfValue("options","moduledir",0,ModPath,&config_f); ConfValue("disabled","commands",0,DisabledCommands,&config_f); + ConfValue("options","somaxconn",0,MCON,&config_f); + ConfValue("options","softlimit",0,SLIMT,&config_f); + SoftLimit = atoi(SLIMT); + if ((SoftLimit < 1) || (SoftLimit > MAXCLIENTS)) + { + log(DEFAULT,"WARNING: value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS); + SoftLimit = MAXCLIENTS; + } + MaxConn = atoi(MCON); + if (MaxConn > SOMAXCONN) + log(DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); NetBufferSize = atoi(NB); MaxWhoResults = atoi(MW); dns_timeout = atoi(DNT); if (!dns_timeout) dns_timeout = 5; + if (!MaxConn) + MaxConn = SOMAXCONN; if (!DNSServer[0]) strlcpy(DNSServer,"127.0.0.1",MAXBUF); if (!ModPath[0]) @@ -380,15 +436,29 @@ void ReadConfig(bool bail, userrec* user) read_xline_defaults(); log(DEFAULT,"Applying K lines, Q lines and Z lines..."); apply_lines(); + + autoconns.clear(); + for (int i = 0; i < ConfValueEnum("link",&config_f); i++) + { + char Link_ServerName[MAXBUF],Link_AConn[MAXBUF]; + ConfValue("link","name",i,Link_ServerName,&config_f); + ConfValue("link","autoconnect",i,Link_AConn,&config_f); + if (strcmp(Link_AConn,"")) + { + autoconns[std::string(Link_ServerName)] = atoi(Link_AConn) + time(NULL); + } + } + + log(DEFAULT,"Done reading configuration file, InspIRCd is now starting."); if (!bail) { log(DEFAULT,"Adding and removing modules due to rehash..."); - std::vector old_module_names, new_module_names, added_modules, removed_modules; + std::vector old_module_names, new_module_names, added_modules, removed_modules; // store the old module names - for (std::vector::iterator t = module_names.begin(); t != module_names.end(); t++) + for (std::vector::iterator t = module_names.begin(); t != module_names.end(); t++) { old_module_names.push_back(*t); } @@ -402,10 +472,10 @@ void ReadConfig(bool bail, userrec* user) // now create a list of new modules that are due to be loaded // and a seperate list of modules which are due to be unloaded - for (std::vector::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++) + for (std::vector::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++) { bool added = true; - for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) + for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) { if (*old == *_new) added = false; @@ -413,10 +483,10 @@ void ReadConfig(bool bail, userrec* user) if (added) added_modules.push_back(*_new); } - for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) + for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) { bool removed = true; - for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) + for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) { if (*newm == *oldm) removed = false; @@ -428,7 +498,7 @@ void ReadConfig(bool bail, userrec* user) // to be removed. int rem = 0, add = 0; if (!removed_modules.empty()) - for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) + for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { if (UnloadModule(removing->c_str())) { @@ -442,7 +512,7 @@ void ReadConfig(bool bail, userrec* user) } } if (!added_modules.empty()) - for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { if (LoadModule(adding->c_str())) { @@ -480,9 +550,9 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri // we MUST declare this wherever we use FOREACH_RESULT int MOD_RESULT = 0; - if (strlen(cname) > CHANMAX-1) + if (strlen(cname) > CHANMAX) { - cname[CHANMAX-1] = '\0'; + cname[CHANMAX] = '\0'; } log(DEBUG,"add_channel: %s %s",user->nick,cname); @@ -783,6 +853,8 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool chanlist.erase(iter); } } + + return NULL; } @@ -1063,6 +1135,8 @@ void kill_link(userrec *user,const char* r) NetSendToAll(buffer); } + user->FlushWriteBuf(); + FOREACH_MOD OnUserDisconnect(user); if (user->fd > -1) @@ -1077,18 +1151,28 @@ void kill_link(userrec *user,const char* r) log(DEBUG,"kqueue: Failed to remove user from queue!"); } #endif - shutdown(user->fd,2); - close(user->fd); - } - - if (user->registered == 7) { - WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason); - AddWhoWas(user); +#ifdef USE_EPOLL + struct epoll_event ev; + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = user->fd; + int i = epoll_ctl(ep, EPOLL_CTL_DEL, user->fd, &ev); + if (i < 0) + { + log(DEBUG,"epoll: List deletion failure!"); + } +#endif + user->CloseSocket(); } + // this must come before the WriteOpers so that it doesnt try to fill their buffer with anything + // if they were an oper with +s. if (user->registered == 7) { purge_empty_chans(user); - } + // fix by brain: only show local quits because we only show local connects (it just makes SENSE) + if (!strcmp(user->server,ServerName)) + WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason); + AddWhoWas(user); + } if (iter != clientlist.end()) { @@ -1117,6 +1201,8 @@ void kill_link_silent(userrec *user,const char* r) Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason); log(DEBUG,"closing fd %lu",(unsigned long)user->fd); + user->FlushWriteBuf(); + if (user->registered == 7) { FOREACH_MOD OnUserQuit(user); WriteCommonExcept(user,"QUIT :%s",reason); @@ -1141,8 +1227,17 @@ void kill_link_silent(userrec *user,const char* r) log(DEBUG,"kqueue: Failed to remove user from queue!"); } #endif - shutdown(user->fd,2); - close(user->fd); +#ifdef USE_EPOLL + struct epoll_event ev; + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = user->fd; + int i = epoll_ctl(ep, EPOLL_CTL_DEL, user->fd, &ev); + if (i < 0) + { + log(DEBUG,"epoll: List deletion failure!"); + } +#endif + user->CloseSocket(); } if (user->registered == 7) { @@ -1189,15 +1284,15 @@ int main(int argc, char** argv) strlcpy(MyExecutable,argv[0],MAXBUF); // initialize the lowercase mapping table - for (int cn = 0; cn < 256; cn++) + for (unsigned int cn = 0; cn < 256; cn++) lowermap[cn] = cn; // lowercase the uppercase chars - for (int cn = 65; cn < 91; cn++) + for (unsigned int cn = 65; cn < 91; cn++) lowermap[cn] = tolower(cn); // now replace the specific chars for scandanavian comparison - lowermap['['] = '{'; - lowermap[']'] = '}'; - lowermap['\\'] = '|'; + lowermap[(unsigned)'['] = '{'; + lowermap[(unsigned)']'] = '}'; + lowermap[(unsigned)'\\'] = '|'; if (InspIRCd(argv,argc) == ERROR) { @@ -1251,10 +1346,10 @@ void AddWhoWas(userrec* u) whowas_hash::iterator iter = whowas.find(u->nick); WhoWasUser *a = new WhoWasUser(); strlcpy(a->nick,u->nick,NICKMAX); - strlcpy(a->ident,u->ident,15); + strlcpy(a->ident,u->ident,IDENTMAX); strlcpy(a->dhost,u->dhost,160); strlcpy(a->host,u->host,160); - strlcpy(a->fullname,u->fullname,128); + strlcpy(a->fullname,u->fullname,MAXGECOS); strlcpy(a->server,u->server,256); a->signon = u->signon; @@ -1265,7 +1360,7 @@ void AddWhoWas(userrec* u) if (iter == whowas.end()) { - if (whowas.size() >= WHOWAS_MAX) + if (whowas.size() >= (unsigned)WHOWAS_MAX) { for (whowas_hash::iterator i = whowas.begin(); i != whowas.end(); i++) { @@ -1338,16 +1433,16 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) log(DEBUG,"AddClient: %lu %s %d %s",(unsigned long)socket,host,port,ip); clientlist[tempnick]->fd = socket; - strncpy(clientlist[tempnick]->nick, tn2,NICKMAX); - strncpy(clientlist[tempnick]->host, host,160); - strncpy(clientlist[tempnick]->dhost, host,160); - strncpy(clientlist[tempnick]->server, ServerName,256); - strncpy(clientlist[tempnick]->ident, "unknown",15); + strlcpy(clientlist[tempnick]->nick, tn2,NICKMAX); + strlcpy(clientlist[tempnick]->host, host,160); + strlcpy(clientlist[tempnick]->dhost, host,160); + clientlist[tempnick]->server = (char*)FindServerNamePtr(ServerName); + strlcpy(clientlist[tempnick]->ident, "unknown",IDENTMAX); clientlist[tempnick]->registered = 0; clientlist[tempnick]->signon = TIME+dns_timeout; clientlist[tempnick]->lastping = 1; clientlist[tempnick]->port = port; - strncpy(clientlist[tempnick]->ip,ip,16); + strlcpy(clientlist[tempnick]->ip,ip,16); // set the registration timeout for this user unsigned long class_regtimeout = 90; @@ -1383,9 +1478,15 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) clientlist[tempnick]->chans[i].uc_modes = 0; } - if (clientlist.size() == MAXCLIENTS) + if (clientlist.size() > SoftLimit) { - kill_link(clientlist[tempnick],"No more connections allowed in this class"); + kill_link(clientlist[tempnick],"No more connections allowed"); + return; + } + + if (clientlist.size() >= MAXCLIENTS) + { + kill_link(clientlist[tempnick],"No more connections allowed"); return; } @@ -1396,7 +1497,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) // irc server at once (or the irc server otherwise initiating this many connections, files etc) // which for the time being is a physical impossibility (even the largest networks dont have more // than about 10,000 users on ONE server!) - if (socket > 65534) + if ((unsigned)socket > 65534) { kill_link(clientlist[tempnick],"Server is full"); return; @@ -1417,6 +1518,17 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) } fd_ref_table[socket] = clientlist[tempnick]; +#ifdef USE_EPOLL + struct epoll_event ev; + log(DEBUG,"epoll: Adduser to events, ep=%d socket=%d",ep,socket); + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = socket; + int i = epoll_ctl(ep, EPOLL_CTL_ADD, socket, &ev); + if (i < 0) + { + log(DEBUG,"epoll: List insertion failure!"); + } +#endif #ifdef USE_KQUEUE struct kevent ke; log(DEBUG,"kqueue: Add user to events, kq=%d socket=%d",kq,socket); @@ -1424,37 +1536,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) int i = kevent(kq, &ke, 1, 0, 0, NULL); if (i == -1) { - switch (errno) - { - case EACCES: - log(DEBUG,"kqueue: EACCES"); - break; - case EFAULT: - log(DEBUG,"kqueue: EFAULT"); - break; - case EBADF: - log(DEBUG,"kqueue: EBADF=%d",ke.ident); - break; - case EINTR: - log(DEBUG,"kqueue: EINTR"); - break; - case EINVAL: - log(DEBUG,"kqueue: EINVAL"); - break; - case ENOENT: - log(DEBUG,"kqueue: ENOENT"); - break; - case ENOMEM: - log(DEBUG,"kqueue: ENOMEM"); - break; - case ESRCH: - log(DEBUG,"kqueue: ESRCH"); - break; - default: - log(DEBUG,"kqueue: UNKNOWN!"); - break; - } - log(DEBUG,"kqueue: Failed to add user to queue!"); + log(DEBUG,"kqueue: List insertion failure!"); } #endif @@ -1513,7 +1595,7 @@ void FullConnectUser(userrec* user) std::stringstream v; v << "MESHED WALLCHOPS MODES=13 CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS; v << " MAXBANS=60 NICKLEN=" << NICKMAX; - v << " TOPICLEN=307 KICKLEN=307 MAXTARGETS=20 AWAYLEN=307 CHANMODES=ohvb,k,l,psmnti NETWORK="; + v << " TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=20 AWAYLEN=" << MAXAWAY << " CHANMODES=ohvb,k,l,psmnti NETWORK="; v << Network; std::string data005 = v.str(); FOREACH_MOD On005Numeric(data005); @@ -1543,6 +1625,7 @@ void FullConnectUser(userrec* user) // fix by brain: these should be AFTER the N token, so other servers know what the HELL we're on about... :) FOREACH_MOD OnUserConnect(user); + FOREACH_MOD OnGlobalConnect(user); WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip); } @@ -1569,8 +1652,12 @@ std::string GetVersionString() s1 = savept; #ifdef USE_KQUEUE char socketengine[] = "kqueue"; -#else +#endif +#ifdef USE_SELECT char socketengine[] = "select"; +#endif +#ifdef USE_EPOLL + char socketengine[] = "epoll"; #endif snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu) [SE=%s]",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION,socketengine); return versiondata; @@ -1590,7 +1677,7 @@ void handle_version(char **parameters, int pcnt, userrec *user) { if (me[j] != NULL) { - for (int x = 0; x < me[j]->connectors.size(); x++) + for (unsigned int x = 0; x < me[j]->connectors.size(); x++) { WriteServ(user->fd,"351 %s :Server %d:%d (%s): %s",user->nick,j,x,me[j]->connectors[x].GetServerName().c_str(),me[j]->connectors[x].GetVersionString().c_str()); } @@ -1608,7 +1695,7 @@ void handle_version(char **parameters, int pcnt, userrec *user) { if (me[j] != NULL) { - for (int x = 0; x < me[j]->connectors.size(); x++) + for (unsigned int x = 0; x < me[j]->connectors.size(); x++) { if (match(me[j]->connectors[x].GetServerName().c_str(),parameters[0])) { @@ -1640,7 +1727,7 @@ void handle_version(char **parameters, int pcnt, userrec *user) void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user) { - for (int i = 0; i < cmdlist.size(); i++) + for (unsigned int i = 0; i < cmdlist.size(); i++) { if (!strcasecmp(cmdlist[i].command,commandname)) { @@ -1668,7 +1755,7 @@ void DoSplitEveryone() { if (me[i] != NULL) { - for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) + for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) { if (strcasecmp(j->GetServerName().c_str(),ServerName)) { @@ -1702,6 +1789,7 @@ void DoSplitEveryone() } } } + has_been_netsplit = true; } @@ -1817,7 +1905,7 @@ void process_command(userrec *user, char* cmd) int total_params = 0; if (strlen(cmd)>2) { - for (int q = 0; q < strlen(cmd)-1; q++) + for (unsigned int q = 0; q < strlen(cmd)-1; q++) { if ((cmd[q] == ' ') && (cmd[q+1] == ':')) { @@ -1864,7 +1952,7 @@ void process_command(userrec *user, char* cmd) items = 0; command_p[0] = NULL; parameters = NULL; - for (int i = 0; i <= strlen(cmd); i++) + for (unsigned int i = 0; i <= strlen(cmd); i++) { cmd[i] = toupper(cmd[i]); } @@ -1875,7 +1963,7 @@ void process_command(userrec *user, char* cmd) strcpy(cmd,""); j = 0; /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */ - for (int i = 0; i < strlen(temp); i++) + for (unsigned int i = 0; i < strlen(temp); i++) { if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7)) { @@ -1889,7 +1977,7 @@ void process_command(userrec *user, char* cmd) command = cmd; if (strchr(cmd,' ')) { - for (int i = 0; i <= strlen(cmd); i++) + for (unsigned int i = 0; i <= strlen(cmd); i++) { /* capitalise the command ONLY, leave params intact */ cmd[i] = toupper(cmd[i]); @@ -1905,7 +1993,7 @@ void process_command(userrec *user, char* cmd) } else { - for (int i = 0; i <= strlen(cmd); i++) + for (unsigned int i = 0; i <= strlen(cmd); i++) { cmd[i] = toupper(cmd[i]); } @@ -1920,7 +2008,7 @@ void process_command(userrec *user, char* cmd) return; } - for (int x = 0; x < strlen(command); x++) + for (unsigned int x = 0; x < strlen(command); x++) { if (((command[x] < 'A') || (command[x] > 'Z')) && (command[x] != '.')) { @@ -1936,7 +2024,7 @@ void process_command(userrec *user, char* cmd) } } - for (int i = 0; i != cmdlist.size(); i++) + for (unsigned int i = 0; i != cmdlist.size(); i++) { if (cmdlist[i].command[0]) { @@ -1997,21 +2085,18 @@ void process_command(userrec *user, char* cmd) } if ((user->registered == 7) && (!strchr(user->modes,'o'))) { - char* mycmd; - char* savept2; - mycmd = strtok_r(DisabledCommands," ",&savept2); - while (mycmd) + std::stringstream dcmds(DisabledCommands); + while (!dcmds.eof()) { - if (!strcasecmp(mycmd,command)) + std::string thiscmd; + dcmds >> thiscmd; + if (!strcasecmp(thiscmd.c_str(),command)) { // command is disabled! WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command); return; } - mycmd = strtok_r(NULL," ",&savept2); } - - } if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4))) { @@ -2148,7 +2233,7 @@ void DoSync(serverrec* serv, char* tcp_host) { if (me[j] != NULL) { - for (int k = 0; k < me[j]->connectors.size(); k++) + for (unsigned int k = 0; k < me[j]->connectors.size(); k++) { if (is_uline(me[j]->connectors[k].GetServerName().c_str())) { @@ -2176,7 +2261,7 @@ void DoSync(serverrec* serv, char* tcp_host) for (int i = 0; i <= MODCOUNT; i++) { string_list l = modules[i]->OnUserSync(u->second); - for (int j = 0; j < l.size(); j++) + for (unsigned int j = 0; j < l.size(); j++) { snprintf(data,MAXBUF,"%s %s",CreateSum().c_str(),l[j].c_str()); serv->SendPacket(data,tcp_host); @@ -2197,7 +2282,7 @@ void DoSync(serverrec* serv, char* tcp_host) for (int i = 0; i <= MODCOUNT; i++) { string_list l = modules[i]->OnChannelSync(c->second); - for (int j = 0; j < l.size(); j++) + for (unsigned int j = 0; j < l.size(); j++) { snprintf(data,MAXBUF,"%s %s",CreateSum().c_str(),l[j].c_str()); serv->SendPacket(data,tcp_host); @@ -2241,7 +2326,7 @@ void NetSendMyRoutingTable() { if (me[i] != NULL) { - for (int j = 0; j < me[i]->connectors.size(); j++) + for (unsigned int j = 0; j < me[i]->connectors.size(); j++) { if ((me[i]->connectors[j].GetState() != STATE_DISCONNECTED) || (is_uline(me[i]->connectors[j].GetServerName().c_str()))) { @@ -2267,7 +2352,7 @@ void DoSplit(const char* params) { if (me[i] != NULL) { - for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) + for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) { if (!strcasecmp(j->GetServerName().c_str(),params)) { @@ -2301,6 +2386,7 @@ void DoSplit(const char* params) } } } + has_been_netsplit = true; } // removes a server. Will NOT remove its users! @@ -2315,7 +2401,7 @@ void RemoveServer(const char* name) { if (me[i] != NULL) { - for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) + for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) { if (!strcasecmp(j->GetServerName().c_str(),name)) { @@ -2342,7 +2428,7 @@ char* ModuleError() void erase_factory(int j) { int v = 0; - for (std::vector::iterator t = factory.begin(); t != factory.end(); t++) + for (std::vector::iterator t = factory.begin(); t != factory.end(); t++) { if (v == j) { @@ -2357,7 +2443,7 @@ void erase_factory(int j) void erase_module(int j) { int v1 = 0; - for (std::vector::iterator m = modules.begin(); m!= modules.end(); m++) + for (std::vector::iterator m = modules.begin(); m!= modules.end(); m++) { if (v1 == j) { @@ -2369,7 +2455,7 @@ void erase_module(int j) v1++; } int v2 = 0; - for (std::vector::iterator v = module_names.begin(); v != module_names.end(); v++) + for (std::vector::iterator v = module_names.begin(); v != module_names.end(); v++) { if (v2 == j) { @@ -2384,7 +2470,7 @@ void erase_module(int j) bool UnloadModule(const char* filename) { std::string filename_str = filename; - for (int j = 0; j != module_names.size(); j++) + for (unsigned int j = 0; j != module_names.size(); j++) { if (module_names[j] == filename_str) { @@ -2394,6 +2480,7 @@ bool UnloadModule(const char* filename) snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)"); return false; } + FOREACH_MOD OnUnloadModule(modules[j],module_names[j]); // found the module log(DEBUG,"Deleting module..."); erase_module(j); @@ -2414,18 +2501,26 @@ bool UnloadModule(const char* filename) bool LoadModule(const char* filename) { char modfile[MAXBUF]; +#ifdef STATIC_LINK + snprintf(modfile,MAXBUF,"%s",filename); +#else snprintf(modfile,MAXBUF,"%s/%s",ModPath,filename); +#endif std::string filename_str = filename; +#ifndef STATIC_LINK if (!DirValid(modfile)) { log(DEFAULT,"Module %s is not within the modules directory.",modfile); snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile); return false; } +#endif log(DEBUG,"Loading module: %s",modfile); +#ifndef STATIC_LINK if (FileExists(modfile)) { - for (int j = 0; j < module_names.size(); j++) +#endif + for (unsigned int j = 0; j < module_names.size(); j++) { if (module_names[j] == filename_str) { @@ -2447,6 +2542,7 @@ bool LoadModule(const char* filename) { Module* m = factory[MODCOUNT+1]->factory->CreateModule(); modules[MODCOUNT+1] = m; + FOREACH_MOD OnLoadModule(m,filename_str); /* save the module and the module's classfactory, if * this isnt done, random crashes can occur :/ */ module_names.push_back(filename); @@ -2457,6 +2553,7 @@ bool LoadModule(const char* filename) snprintf(MODERR,MAXBUF,"Factory function failed!"); return false; } +#ifndef STATIC_LINK } else { @@ -2464,10 +2561,31 @@ bool LoadModule(const char* filename) snprintf(MODERR,MAXBUF,"Module file could not be found"); return false; } +#endif MODCOUNT++; return true; } + +bool GotServer(std::string name) +{ + for (int j = 0; j < 32; j++) + { + if (me[j] != NULL) + { + for (unsigned int k = 0; k < me[j]->connectors.size(); k++) + { + if (name == me[j]->connectors[k].GetServerName()) + { + return true; + } + } + } + } + return false; +} + + int InspIRCd(char** argv, int argc) { struct sockaddr_in client,server; @@ -2475,9 +2593,11 @@ int InspIRCd(char** argv, int argc) int incomingSockfd, result = TRUE; socklen_t length; int count = 0; +#ifdef USE_SELECT int selectResult = 0, selectResult2 = 0; - char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; fd_set selectFds; +#endif + char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; timeval tv; std::string logpath = GetFullProgDir(argv,argc) + "/ircd.log"; @@ -2487,7 +2607,12 @@ int InspIRCd(char** argv, int argc) printf("ERROR: Could not write to logfile %s, bailing!\n\n",logpath.c_str()); Exit(ERROR); } + +#ifdef IS_CYGWIN + printf("Logging to ircd.log...\n"); +#else printf("Logging to %s...\n",logpath.c_str()); +#endif log(DEFAULT,"$Id$"); if (geteuid() == 0) @@ -2508,6 +2633,8 @@ int InspIRCd(char** argv, int argc) } log(DEBUG,"InspIRCd: startup: read config"); + AddServerName(ServerName); + int clientportcount = 0, serverportcount = 0; for (count = 0; count < ConfValueEnum("bind",&config_f); count++) @@ -2575,7 +2702,7 @@ int InspIRCd(char** argv, int argc) WritePID(PID); /* setup select call */ -#ifndef USE_KQUEUE +#ifdef USE_SELECT FD_ZERO(&selectFds); #endif log(DEBUG,"InspIRCd: startup: zero selects"); @@ -2638,19 +2765,63 @@ int InspIRCd(char** argv, int argc) } #endif +#ifdef USE_EPOLL + ep = epoll_create(MAXCLIENTS); + lep = epoll_create(32); + sep = epoll_create(128); + if ((ep == -1) || (lep == -1) || (sep == -1)) + { + log(DEFAULT,"main: epoll_create() failed!"); + printf("ERROR: could not initialise epoll event system. Shutting down.\n"); + Exit(ERROR); + } +#endif +#ifdef USE_EPOLL + log(DEFAULT,"epoll socket engine is enabled. Filling listen list. boundPortcount=%d",boundPortCount); + for (count = 0; count < boundPortCount; count++) + { + struct epoll_event ev; + log(DEBUG,"epoll: Add listening socket to events, ep=%d socket=%d",lep,openSockfd[count]); + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = openSockfd[count]; + int i = epoll_ctl(lep, EPOLL_CTL_ADD, openSockfd[count], &ev); + if (i < 0) + { + log(DEFAULT,"main: add listen ports, epoll_ctl failed!"); + printf("ERROR: could not initialise listening sockets in epoll list. Shutting down.\n"); + Exit(ERROR); + } + + } + for (int t = 0; t != SERVERportCount; t++) + { + struct epoll_event ev; + log(DEBUG,"epoll: Add listening server socket to events, ep=%d socket=%d",sep,me[t]->fd); + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = me[t]->fd; + int i = epoll_ctl(sep, EPOLL_CTL_ADD, me[t]->fd, &ev); + if (i == -1) + { + log(DEFAULT,"main: add server listen ports, epoll_ctl failed!"); + printf("ERROR: could not initialise server listening sockets in epoll list. Shutting down.\n"); + Exit(ERROR); + } + } +#else #ifdef USE_KQUEUE log(DEFAULT,"kqueue socket engine is enabled. Filling listen list."); for (count = 0; count < boundPortCount; count++) { struct kevent ke; log(DEBUG,"kqueue: Add listening socket to events, kq=%d socket=%d",lkq,openSockfd[count]); - EV_SET(&ke, openSockfd[count], EVFILT_READ, EV_ADD, 0, 5, NULL); + EV_SET(&ke, openSockfd[count], EVFILT_READ, EV_ADD, 0, MaxConn, NULL); int i = kevent(lkq, &ke, 1, 0, 0, NULL); if (i == -1) { log(DEFAULT,"main: add listen ports to kqueue failed!"); printf("ERROR: could not initialise listening sockets in kqueue. Shutting down.\n"); + Exit(ERROR); } } for (int t = 0; t != SERVERportCount; t++) @@ -2659,12 +2830,13 @@ int InspIRCd(char** argv, int argc) if (me[t]) { log(DEBUG,"kqueue: Add listening SERVER socket to events, kq=%d socket=%d",skq,me[t]->fd); - EV_SET(&ke, me[t]->fd, EVFILT_READ, EV_ADD, 0, 5, NULL); + EV_SET(&ke, me[t]->fd, EVFILT_READ, EV_ADD, 0, MaxConn, NULL); int i = kevent(skq, &ke, 1, 0, 0, NULL); if (i == -1) { log(DEFAULT,"main: add server listen ports to kqueue failed!"); printf("ERROR: could not initialise listening server sockets in kqueue. Shutting down.\n"); + Exit(ERROR); } } } @@ -2672,6 +2844,7 @@ int InspIRCd(char** argv, int argc) #else log(DEFAULT,"Using standard select socket engine."); +#endif #endif WritePID(PID); @@ -2684,7 +2857,13 @@ int InspIRCd(char** argv, int argc) struct kevent ke_list[33]; struct timespec ts; #endif +#ifdef USE_EPOLL + struct epoll_event event[33]; +#endif +#ifdef USE_SELECT fd_set serverfds; + fd_set sfd; +#endif timeval tvs; tvs.tv_usec = 10000L; tvs.tv_sec = 0; @@ -2692,7 +2871,6 @@ int InspIRCd(char** argv, int argc) tv.tv_usec = 10000L; char data[65536]; timeval tval; - fd_set sfd; tval.tv_usec = 10000L; tval.tv_sec = 0; int total_in_this_set = 0; @@ -2705,10 +2883,9 @@ int InspIRCd(char** argv, int argc) #ifdef _POSIX_PRIORITY_SCHEDULING sched_yield(); #endif -#ifndef USE_KQUEUE +#ifdef USE_SELECT FD_ZERO(&sfd); #endif - // we only read time() once per iteration rather than tons of times! OLDTIME = TIME; TIME = time(NULL); @@ -2719,6 +2896,25 @@ int InspIRCd(char** argv, int argc) // them in a list, then reap the list every second or so. if (((TIME % 5) == 0) && (!expire_run)) { + for (int i = 0; i < ConfValueEnum("link",&config_f); i++) + { + char Link_ServerName[MAXBUF],Link_AConn[MAXBUF]; + ConfValue("link","name",i,Link_ServerName,&config_f); + ConfValue("link","autoconnect",i,Link_AConn,&config_f); + if ((Link_AConn[0]) && (!GotServer(Link_ServerName))) + { + autoconnects::iterator a = autoconns.find(std::string(Link_ServerName)); + if (a != autoconns.end()) + { + if (TIME > a->second) + { + ConnectServer(Link_ServerName,NULL); + a->second = TIME + atoi(Link_AConn); + } + } + } + } + expire_lines(); FOREACH_MOD OnBackgroundTimer(TIME); expire_run = true; @@ -2730,6 +2926,16 @@ int InspIRCd(char** argv, int argc) // fix by brain - this must be below any manipulation of the hashmap by modules user_hash::iterator count2 = clientlist.begin(); +#ifdef USE_EPOLL + i = epoll_wait(sep, event, 1, EP_DELAY); + if (i > 0) + { + log(DEBUG,"epoll: Listening server socket event, i=%d, event.data.fd=%d",i,event[0].data.fd); + for (int x = 0; x != SERVERportCount; x++) + { + if ((me[x]) && ((unsigned)event[0].data.fd == (unsigned)me[x]->fd)) + { +#endif #ifdef USE_KQUEUE ts.tv_sec = 0; ts.tv_nsec = 30000L; @@ -2739,10 +2945,11 @@ int InspIRCd(char** argv, int argc) log(DEBUG,"kqueue: Listening server socket event, i=%d, ke.ident=%d",i,ke.ident); for (int x = 0; x != SERVERportCount; x++) { - if ((me[x]) && (ke.ident == me[x]->fd)) + if ((me[x]) && ((unsigned)ke.ident == (unsigned)me[x]->fd)) { -#else +#endif +#ifdef USE_SELECT FD_ZERO(&serverfds); for (int x = 0; x != SERVERportCount; x++) { @@ -2751,7 +2958,7 @@ int InspIRCd(char** argv, int argc) } tvs.tv_usec = 30000L; tvs.tv_sec = 0; - int servresult = select(32767, &serverfds, NULL, NULL, &tvs); + int servresult = select(FD_SETSIZE, &serverfds, NULL, NULL, &tvs); if (servresult > 0) { for (int x = 0; x != SERVERportCount; x++) @@ -2777,21 +2984,24 @@ int InspIRCd(char** argv, int argc) } } + std::deque msgs; + std::deque sums; for (int x = 0; x < SERVERportCount; x++) { - std::deque msgs; - std::deque sums; - msgs.clear(); + if (me[x]) + me[x]->FlushWriteBuffers(); sums.clear(); - if ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host, sums))) + msgs.clear(); + while ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host, sums))) // returns 0 or more lines (can be multiple lines!) { - for (int ctr = 0; ctr < msgs.size(); ctr++) + has_been_netsplit = false; + for (unsigned int ctr = 0; ctr < msgs.size(); ctr++) { strlcpy(tcp_msg,msgs[ctr].c_str(),MAXBUF); - strlcpy(tcp_sum,msgs[ctr].c_str(),MAXBUF); + strlcpy(tcp_sum,sums[ctr].c_str(),MAXBUF); log(DEBUG,"Processing: %s",tcp_msg); if (!tcp_msg[0]) - { + { log(DEBUG,"Invalid string from %s [route%lu]",tcp_host,(unsigned long)x); break; } @@ -2811,7 +3021,13 @@ int InspIRCd(char** argv, int argc) std::string msg = tcp_msg; FOREACH_MOD OnPacketReceive(msg,tcp_host); strlcpy(tcp_msg,msg.c_str(),MAXBUF); - handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum); + if (me[x]) + handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum); + if (!me[x]->FindHost(tcp_host)) + { + log(DEBUG,"Connector gone, bailing!"); + goto label; + } } goto label; } @@ -2819,7 +3035,7 @@ int InspIRCd(char** argv, int argc) while (count2 != clientlist.end()) { -#ifndef USE_KQUEUE +#ifdef USE_SELECT FD_ZERO(&sfd); #endif @@ -2835,6 +3051,9 @@ int InspIRCd(char** argv, int argc) if (count2->second) curr = count2->second; + if ((long)curr == -1) + goto label; + if ((curr) && (curr->fd != 0)) { #ifdef _POSIX_PRIORITY_SCHEDULING @@ -2845,14 +3064,17 @@ int InspIRCd(char** argv, int argc) // // This should be up to 64x faster than the // old implementation. -#ifndef USE_KQUEUE +#ifdef USE_SELECT while (total_in_this_set < 1024) { if (count2 != clientlist.end()) { curr = count2->second; + if ((long)curr == -1) + goto label; + int currfd = curr->fd; // we don't check the state of remote users. - if ((curr->fd != -1) && (curr->fd != FD_MAGIC_NUMBER)) + if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) { curr->FlushWriteBuf(); if (curr->GetWriteError() != "") @@ -2878,13 +3100,15 @@ int InspIRCd(char** argv, int argc) curr->dns_done = true; statsDnsBad++; FullConnectUser(curr); - goto label; + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; } if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) // both NICK and USER... and DNS { log(DEBUG,"dns done, registered=3, and modules ready, OK"); FullConnectUser(curr); - goto label; + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; } if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) { @@ -2908,17 +3132,20 @@ int InspIRCd(char** argv, int argc) endingiter = count2; count2 = xcount; // roll back to where we were #else - // KQUEUE: We don't go through a loop to fill the fd_set so instead we must manually do this loop every now and again. + // KQUEUE and EPOLL: We don't go through a loop to fill the fd_set so instead we must manually do this loop every now and again. // TODO: We dont need to do all this EVERY loop iteration, tone down the visits to this if we're using kqueue. cycle_iter++; - if (cycle_iter > 10) while (count2 != clientlist.end()) + if (cycle_iter > 20) while (count2 != clientlist.end()) { cycle_iter = 0; if (count2 != clientlist.end()) { curr = count2->second; + if ((long)curr == -1) + goto label; + int currfd = curr->fd; // we don't check the state of remote users. - if ((curr->fd != -1) && (curr->fd != FD_MAGIC_NUMBER)) + if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) { curr->FlushWriteBuf(); @@ -2931,11 +3158,12 @@ int InspIRCd(char** argv, int argc) // registration timeout -- didnt send USER/NICK/HOST in the time specified in // their connection class. - if ((TIME > curr->timeout) && (curr->registered != 7)) + if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7)) { log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); kill_link(curr,"Registration timeout"); - goto label; + goto label; + } if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) { @@ -2943,13 +3171,15 @@ int InspIRCd(char** argv, int argc) curr->dns_done = true; statsDnsBad++; FullConnectUser(curr); - goto label; + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; } if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) { log(DEBUG,"dns done, registered=3, and modules ready, OK"); FullConnectUser(curr); - goto label; + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; } if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) { @@ -2973,7 +3203,14 @@ int InspIRCd(char** argv, int argc) #endif v = 0; - +#ifdef USE_EPOLL + int i = epoll_wait(ep, event, 1, 5); + if (i > 0) + { + log(DEBUG,"epoll_wait call: ep=%d, i=%d",ep,i); + // EPOLL: we asked epoll_wait for ONE fd which is ready. Do something. + userrec* cu = fd_ref_table[event[0].data.fd]; +#endif #ifdef USE_KQUEUE ts.tv_sec = 0; ts.tv_nsec = 1000L; @@ -2984,15 +3221,18 @@ int InspIRCd(char** argv, int argc) log(DEBUG,"kevent call: kq=%d, i=%d",kq,i); // KQUEUE: kevent gives us ONE fd which is ready to have something done to it. Do something to it. userrec* cu = fd_ref_table[ke.ident]; -#else +#endif +#ifdef USE_SELECT + tval.tv_sec = 0; tval.tv_usec = 1000L; - selectResult2 = select(65535, &sfd, NULL, NULL, &tval); - + selectResult2 = select(FD_SETSIZE, &sfd, NULL, NULL, &tval); // now loop through all of the items in this pool if any are waiting - if (selectResult2 > 0) + if ((selectResult2 > 0) && (xcount != clientlist.end())) for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++) { // SELECT: we have to iterate... + if (count2a == clientlist.end()) + break; userrec* cu = count2a->second; #endif @@ -3000,10 +3240,15 @@ int InspIRCd(char** argv, int argc) sched_yield(); #endif result = EAGAIN; +#ifdef USE_EPOLL + // EPOLL: We already know we have a valid FD. No checks needed. + if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1)) +#endif #ifdef USE_KQUEUE // KQUEUE: We already know we have a valid FD. No checks needed. if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1)) -#else +#endif +#ifdef USE_SELECT // SELECT: We don't know if our FD is valid. if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1) && (FD_ISSET (cu->fd, &sfd))) #endif @@ -3014,7 +3259,7 @@ int InspIRCd(char** argv, int argc) FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2)); if (!MOD_RESULT) { - result = read(cu->fd, data, 65535); + result = cu->ReadData(data, 65535); } else result = result2; log(DEBUG,"Read result: %d",result); @@ -3052,7 +3297,7 @@ int InspIRCd(char** argv, int argc) } goto label; } - if (current->recvq.length() > NetBufferSize) + if (current->recvq.length() > (unsigned)NetBufferSize) { if (current->registered == 7) { @@ -3145,7 +3390,7 @@ int InspIRCd(char** argv, int argc) else if (result == 0) { -#ifndef USE_KQUEUE +#ifdef USE_SELECT if (count2->second) { #endif @@ -3154,7 +3399,7 @@ int InspIRCd(char** argv, int argc) // must bail here? kill_link removes the hash, corrupting the iterator log(DEBUG,"Bailing from client exit"); goto label; -#ifndef USE_KQUEUE +#ifdef USE_SELECT } #endif } @@ -3173,7 +3418,7 @@ int InspIRCd(char** argv, int argc) sched_yield(); #endif -#ifndef USE_KQUEUE +#ifdef USE_SELECT // set up select call for (count = 0; count < boundPortCount; count++) { @@ -3190,20 +3435,31 @@ int InspIRCd(char** argv, int argc) { if (FD_ISSET (openSockfd[count], &selectFds)) { -#else +#endif +#ifdef USE_KQUEUE ts.tv_sec = 0; ts.tv_nsec = 30000L; i = kevent(lkq, NULL, 0, ke_list, 32, &ts); if (i > 0) for (j = 0; j < i; j++) { - log(DEBUG,"kqueue: Listening socket event, i=%d, ke.ident=%d",i,ke.ident); + log(DEBUG,"kqueue: Listening socket event, i=%d, ke.ident=%d",i,ke_list[j].ident); // this isnt as efficient as it could be, we could create a reference table // to reference bound ports by fd, but this isnt a big bottleneck as the actual // number of listening ports on the average ircd is a small number (less than 20) // compared to the number of clients (possibly over 2000) for (count = 0; count < boundPortCount; count++) { - if (ke_list[j].ident == openSockfd[count]) + if ((unsigned)ke_list[j].ident == (unsigned)openSockfd[count]) + { +#endif +#ifdef USE_EPOLL + i = epoll_wait(lep, event, 32, EP_DELAY); + if (i > 0) for (j = 0; j < i; j++) + { + log(DEBUG,"epoll: Listening socket event, i=%d,events[j].data.fd=%d",i,event[j].data.fd); + for (count = 0; count < boundPortCount; count++) + { + if ((unsigned)event[j].data.fd == (unsigned)openSockfd[count]) { #endif char target[MAXBUF], resolved[MAXBUF]; @@ -3226,7 +3482,6 @@ int InspIRCd(char** argv, int argc) AddClient(incomingSockfd, resolved, ports[count], false, inet_ntoa (client.sin_addr)); log(DEBUG,"InspIRCd: adding client on port %lu fd=%lu",(unsigned long)ports[count],(unsigned long)incomingSockfd); } - //goto label; } } } @@ -3239,5 +3494,6 @@ int InspIRCd(char** argv, int argc) } /* not reached */ close (incomingSockfd); +return 0; }