X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=87da59b5736edbc7b11387692932c217cd14df7d;hb=dada179fb63917ced15976da5e83c7c6ddc65f2f;hp=8b2c12ab69123ec25cfba034bf93bdfafe74be7b;hpb=a038282348588f716d31128f68b8e06d2e2aa99d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 8b2c12ab6..87da59b57 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. * E-mail: * * @@ -18,10 +18,10 @@ 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 @@ -36,7 +36,7 @@ using namespace std; #ifdef USE_EPOLL #include -#define EP_DELAY 50 +#define EP_DELAY 5 #endif #include @@ -51,9 +51,10 @@ using namespace std; #include #include #include -#include "connection.h" +#ifdef THREADED_DNS +#include +#endif #include "users.h" -#include "servers.h" #include "ctables.h" #include "globals.h" #include "modules.h" @@ -67,6 +68,9 @@ using namespace std; #include "dnsqueue.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "socketengine.h" +#include "socket.h" +#include "dns.h" int LogLevel = DEFAULT; char ServerName[MAXBUF]; @@ -90,6 +94,7 @@ int DieDelay = 5; time_t startup_time = time(NULL); 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; @@ -104,6 +109,8 @@ extern std::vector modules; std::vector module_names; extern std::vector factory; +std::vector module_sockets; + extern int MODCOUNT; int openSockfd[MAXSOCKS]; bool nofork = false; @@ -120,6 +127,7 @@ 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; @@ -127,6 +135,7 @@ typedef nspace::hash_map, irc::InAddr_Has 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 @@ -135,7 +144,7 @@ userrec* fd_ref_table[65536]; int statsAccept = 0, statsRefused = 0, statsUnknown = 0, statsCollisions = 0, statsDns = 0, statsDnsGood = 0, statsDnsBad = 0, statsConnects = 0, statsSent= 0, statsRecv = 0; -serverrec* me[32]; +Server* MyServer = new Server; FILE *log_file; @@ -149,12 +158,13 @@ file_cache RULES; address_cache IP; ClassVector Classes; +servernamelist servernames; struct linger linger = { 0 }; char MyExecutable[1024]; int boundPortCount = 0; int portCount = 0, SERVERportCount = 0, ports[MAXSOCKS]; -int defaultRoute = 0; + char ModPath[MAXBUF]; /* prototypes */ @@ -166,7 +176,6 @@ char* Passwd(userrec *user); bool IsDenied(userrec *user); void AddWhoWas(userrec* u); -std::vector auth_cookies; std::stringstream config_f(stringstream::in | stringstream::out); std::vector all_opers; @@ -179,6 +188,28 @@ 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(); + } + AddServerName(servername); + return FindServerNamePtr(servername); +} + void DeleteOper(userrec* user) { for (std::vector::iterator a = all_opers.begin(); a < all_opers.end(); a++) @@ -238,13 +269,15 @@ std::string getadminnick() void ReadConfig(bool bail, userrec* user) { 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]; + 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()); @@ -264,7 +297,7 @@ void ReadConfig(bool bail, userrec* user) } else { - WriteOpers("There were errors in the configuration file:",user->nick); + WriteOpers("There were errors in the configuration file:"); while (!errstr.eof()) { errstr.getline(dataline,1024); @@ -299,7 +332,14 @@ void ReadConfig(bool bail, userrec* user) 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!"); @@ -531,10 +571,13 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri if (!FindChan(cname)) { - MOD_RESULT = 0; - FOREACH_RESULT(OnUserPreJoin(user,NULL,cname)); - if (MOD_RESULT == 1) { - return NULL; + if (!strcasecmp(ServerName,user->server)) + { + MOD_RESULT = 0; + FOREACH_RESULT(OnUserPreJoin(user,NULL,cname)); + if (MOD_RESULT == 1) { + return NULL; + } } /* create a new one */ @@ -564,9 +607,9 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri { log(DEBUG,"add_channel: joining to: %s",Ptr->name); - // the override flag allows us to bypass channel modes + // remote users are allowed us to bypass channel modes // and bans (used by servers) - if ((!override) || (!strcasecmp(user->server,ServerName))) + if (!strcasecmp(ServerName,user->server)) { log(DEBUG,"Not overriding..."); MOD_RESULT = 0; @@ -703,21 +746,6 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri Ptr->AddUser((char*)user); WriteChannel(Ptr,user,"JOIN :%s",Ptr->name); - if (!override) // we're not overriding... so this isnt part of a netburst, broadcast it. - { - // use the stamdard J token with no privilages. - char buffer[MAXBUF]; - if (created == 2) - { - snprintf(buffer,MAXBUF,"J %s @%s",user->nick,Ptr->name); - } - else - { - snprintf(buffer,MAXBUF,"J %s %s",user->nick,Ptr->name); - } - NetSendToAll(buffer); - } - log(DEBUG,"Sent JOIN to client"); if (Ptr->topicset) @@ -774,25 +802,9 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool if (reason) { WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason); - - if (!local) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"L %s %s :%s",user->nick,Ptr->name,reason); - NetSendToAll(buffer); - } - - } else { - if (!local) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"L %s %s :",user->nick,Ptr->name); - NetSendToAll(buffer); - } - WriteChannel(Ptr,user,"PART :%s",Ptr->name); } user->chans[i].uc_modes = 0; @@ -819,6 +831,8 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool chanlist.erase(iter); } } + + return NULL; } @@ -845,12 +859,12 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) int MOD_RESULT = 0; FOREACH_RESULT(OnAccessCheck(src,user,Ptr,AC_KICK)); - if (MOD_RESULT == ACR_DENY) + if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server))) return; - if (MOD_RESULT == ACR_DEFAULT) + if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server))) { - if (((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr))) && (!is_uline(src->server))) + if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr))) { if (cstatus(src,Ptr) == STATUS_HOP) { @@ -865,10 +879,13 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) } } - MOD_RESULT = 0; - FOREACH_RESULT(OnUserPreKick(src,user,Ptr,reason)); - if (MOD_RESULT) - return; + if (!is_uline(src->server)) + { + MOD_RESULT = 0; + FOREACH_RESULT(OnUserPreKick(src,user,Ptr,reason)); + if (MOD_RESULT) + return; + } FOREACH_MOD OnUserKick(src,user,Ptr,reason); @@ -1090,13 +1107,8 @@ void kill_link(userrec *user,const char* r) log(DEBUG,"closing fd %lu",(unsigned long)user->fd); if (user->registered == 7) { - FOREACH_MOD OnUserQuit(user); + FOREACH_MOD OnUserQuit(user,reason); WriteCommonExcept(user,"QUIT :%s",reason); - - // Q token must go to ALL servers!!! - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"Q %s :%s",user->nick,reason); - NetSendToAll(buffer); } user->FlushWriteBuf(); @@ -1106,25 +1118,7 @@ void kill_link(userrec *user,const char* r) if (user->fd > -1) { FOREACH_MOD OnRawSocketClose(user->fd); -#ifdef USE_KQUEUE - struct kevent ke; - EV_SET(&ke, user->fd, EVFILT_READ, EV_DELETE, 0, 0, NULL); - int i = kevent(kq, &ke, 1, 0, 0, NULL); - if (i == -1) - { - log(DEBUG,"kqueue: Failed to remove user from queue!"); - } -#endif -#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 + engine_delete_fd; user->CloseSocket(); } @@ -1168,13 +1162,8 @@ void kill_link_silent(userrec *user,const char* r) user->FlushWriteBuf(); if (user->registered == 7) { - FOREACH_MOD OnUserQuit(user); + FOREACH_MOD OnUserQuit(user,reason); WriteCommonExcept(user,"QUIT :%s",reason); - - // Q token must go to ALL servers!!! - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"Q %s :%s",user->nick,reason); - NetSendToAll(buffer); } FOREACH_MOD OnUserDisconnect(user); @@ -1182,25 +1171,7 @@ void kill_link_silent(userrec *user,const char* r) if (user->fd > -1) { FOREACH_MOD OnRawSocketClose(user->fd); -#ifdef USE_KQUEUE - struct kevent ke; - EV_SET(&ke, user->fd, EVFILT_READ, EV_DELETE, 0, 0, NULL); - int i = kevent(kq, &ke, 1, 0, 0, NULL); - if (i == -1) - { - log(DEBUG,"kqueue: Failed to remove user from queue!"); - } -#endif -#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 + engine_delete_fd; user->CloseSocket(); } @@ -1219,6 +1190,15 @@ void kill_link_silent(userrec *user,const char* r) } +/*void *task(void *arg) +{ + for (;;) { + cout << (char *)arg; + cout.flush(); + } + return NULL; +}*/ + int main(int argc, char** argv) { Start(); @@ -1245,18 +1225,19 @@ 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) { @@ -1310,10 +1291,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; @@ -1324,7 +1305,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++) { @@ -1357,6 +1338,51 @@ void AddWhoWas(userrec* u) } } +#ifdef THREADED_DNS +void* dns_task(void* arg) +{ + userrec* u = (userrec*)arg; + log(DEBUG,"DNS thread for user %s",u->nick); + DNS dns1; + DNS dns2; + std::string host; + std::string ip; + if (dns1.ReverseLookup(u->ip)) + { + log(DEBUG,"DNS Step 1"); + while (!dns1.HasResult()) + { + usleep(100); + } + host = dns1.GetResult(); + if (host != "") + { + log(DEBUG,"DNS Step 2: '%s'",host.c_str()); + if (dns2.ForwardLookup(host)) + { + while (!dns2.HasResult()) + { + usleep(100); + } + ip = dns2.GetResultIP(); + log(DEBUG,"DNS Step 3 '%s'(%d) '%s'(%d)",ip.c_str(),ip.length(),u->ip,strlen(u->ip)); + if (ip == std::string(u->ip)) + { + log(DEBUG,"DNS Step 4"); + if (host.length() < 160) + { + log(DEBUG,"DNS Step 5"); + strcpy(u->host,host.c_str()); + strcpy(u->dhost,host.c_str()); + } + } + } + } + } + u->dns_done = true; + return NULL; +} +#endif /* add a client connection to the sockets list */ void AddClient(int socket, char* host, int port, bool iscached, char* ip) @@ -1397,16 +1423,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; @@ -1442,9 +1468,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"); + return; + } + + if (clientlist.size() >= MAXCLIENTS) { - kill_link(clientlist[tempnick],"No more connections allowed in this class"); + kill_link(clientlist[tempnick],"No more connections allowed"); return; } @@ -1455,7 +1487,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; @@ -1475,29 +1507,13 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) } } fd_ref_table[socket] = clientlist[tempnick]; + engine_add_fd; -#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); - EV_SET(&ke, socket, EVFILT_READ, EV_ADD, 0, 0, NULL); - int i = kevent(kq, &ke, 1, 0, 0, NULL); - if (i == -1) - { - log(DEBUG,"kqueue: List insertion failure!"); - } - -#endif + // initialize their dns lookup thread + //if (pthread_create(&clientlist[tempnick]->dnsthread, NULL, dns_task, (void *)clientlist[tempnick]) != 0) + //{ + // log(DEBUG,"Failed to create DNS lookup thread for user %s",clientlist[tempnick]->nick); + //} } /* shows the message of the day, and any other on-logon stuff */ @@ -1541,8 +1557,6 @@ void FullConnectUser(userrec* user) } } - // fix by brain: move this below the xline checks to prevent spurious quits going onto the net that dont belong - user->registered = 7; WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Network); WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Network,user->nick,user->ident,user->host); @@ -1551,9 +1565,9 @@ void FullConnectUser(userrec* user) WriteServ(user->fd,"004 %s %s %s iowghraAsORVSxNCWqBzvdHtGI lvhopsmntikrRcaqOALQbSeKVfHGCuzN",user->nick,ServerName,VERSION); // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it... std::stringstream v; - v << "MESHED WALLCHOPS MODES=13 CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS; + v << "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); @@ -1577,12 +1591,11 @@ void FullConnectUser(userrec* user) } ShowMOTD(user); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"N %lu %s %s %s %s +%s %s %s :%s",(unsigned long)user->age,user->nick,user->host,user->dhost,user->ident,user->modes,user->ip,ServerName,user->fullname); - NetSendToAll(buffer); - - // fix by brain: these should be AFTER the N token, so other servers know what the HELL we're on about... :) + // fix 3 by brain, move registered = 7 below these so that spurious modes and host changes dont go out + // onto the network and produce 'fake direction' FOREACH_MOD OnUserConnect(user); + FOREACH_MOD OnGlobalConnect(user); + user->registered = 7; WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip); } @@ -1607,92 +1620,76 @@ std::string GetVersionString() s1 = savept; v2 = strtok_r(s1," ",&savept); s1 = savept; -#ifdef USE_KQUEUE - char socketengine[] = "kqueue"; -#endif -#ifdef USE_SELECT - char socketengine[] = "select"; -#endif -#ifdef USE_EPOLL - char socketengine[] = "epoll"; + char socketengine[] = engine_name; +#ifdef THREADED_DNS + char dnsengine[] = "multithread"; +#else + char dnsengine[] = "singlethread"; #endif - snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu) [SE=%s]",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION,socketengine); + snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s [FLAGS=%lu,%s,%s]",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION,socketengine,dnsengine); return versiondata; } void handle_version(char **parameters, int pcnt, userrec *user) { - if (!pcnt) - { - WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str()); - } - else + WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str()); +} + + +bool is_valid_cmd(const char* commandname, int pcnt, userrec * user) +{ + for (unsigned int i = 0; i < cmdlist.size(); i++) { - if (!strcmp(parameters[0],"*")) + if (!strcasecmp(cmdlist[i].command,commandname)) { - for (int j = 0; j < 32; j++) + if (cmdlist[i].handler_function) { - if (me[j] != NULL) + if ((pcnt>=cmdlist[i].min_params) && (strcasecmp(cmdlist[i].source,""))) { - for (int x = 0; x < me[j]->connectors.size(); x++) + if ((strchr(user->modes,cmdlist[i].flags_needed)) || (!cmdlist[i].flags_needed)) { - 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()); - } - } - } - return; - } - if (match(ServerName,parameters[0])) - { - WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str()); - return; - } - bool displayed = false, found = false; - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int x = 0; x < me[j]->connectors.size(); x++) - { - if (match(me[j]->connectors[x].GetServerName().c_str(),parameters[0])) - { - found = true; - if ((me[j]->connectors[x].GetVersionString() != "") && (!displayed)) + if (cmdlist[i].flags_needed) { - displayed = true; - WriteServ(user->fd,"351 %s :%s",user->nick,me[j]->connectors[x].GetVersionString().c_str()); + if ((user->HasPermission((char*)commandname)) || (is_uline(user->server))) + { + return true; + } + else + { + return false; + } } + return true; } } } } - if ((!displayed) && (found)) - { - WriteServ(user->fd,"402 %s %s :Server %s has no version information",user->nick,parameters[0],parameters[0]); - return; - } - if (!found) - { - WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); - } } - return; + return false; } - // calls a handler function for a command 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)) { - if (!strcasecmp(cmdlist[i].command,commandname)) + if (cmdlist[i].handler_function) { - if (cmdlist[i].handler_function) + if (pcnt>=cmdlist[i].min_params) { - if (pcnt>=cmdlist[i].min_params) + if ((strchr(user->modes,cmdlist[i].flags_needed)) || (!cmdlist[i].flags_needed)) { - if (strchr(user->modes,cmdlist[i].flags_needed)) + if (cmdlist[i].flags_needed) + { + if ((user->HasPermission((char*)commandname)) || (is_uline(user->server))) + { + cmdlist[i].handler_function(parameters,pcnt,user); + } + } + else { cmdlist[i].handler_function(parameters,pcnt,user); } @@ -1700,57 +1697,10 @@ void call_handler(const char* commandname,char **parameters, int pcnt, userrec * } } } -} - -void DoSplitEveryone() -{ - bool go_again = true; - while (go_again) - { - go_again = false; - for (int i = 0; i < 32; i++) - { - if (me[i] != NULL) - { - for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) - { - if (strcasecmp(j->GetServerName().c_str(),ServerName)) - { - j->routes.clear(); - j->CloseConnection(); - me[i]->connectors.erase(j); - go_again = true; - break; - } - } - } - } - } - log(DEBUG,"Removed server. Will remove clients..."); - // iterate through the userlist and remove all users on this server. - // because we're dealing with a mesh, we dont have to deal with anything - // "down-route" from this server (nice huh) - go_again = true; - char reason[MAXBUF]; - while (go_again) - { - go_again = false; - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (strcasecmp(u->second->server,ServerName)) - { - snprintf(reason,MAXBUF,"%s %s",ServerName,u->second->server); - kill_link(u->second,reason); - go_again = true; - break; - } - } } - has_been_netsplit = true; } - void force_nickchange(userrec* user,const char* newnick) { char nick[MAXBUF]; @@ -1862,7 +1812,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] == ':')) { @@ -1909,7 +1859,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]); } @@ -1920,7 +1870,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)) { @@ -1934,7 +1884,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]); @@ -1950,7 +1900,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]); } @@ -1965,7 +1915,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] != '.')) { @@ -1981,7 +1931,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]) { @@ -2172,209 +2122,6 @@ void process_buffer(const char* cmdbuf,userrec *user) } } -void DoSync(serverrec* serv, char* tcp_host) -{ - char data[MAXBUF]; - log(DEBUG,"Sending sync"); - // send start of sync marker: Y - // at this point the ircd receiving it starts broadcasting this netburst to all ircds - // except the ones its receiving it from. - snprintf(data,MAXBUF,"%s Y %lu",CreateSum().c_str(),(unsigned long)TIME); - serv->SendPacket(data,tcp_host); - // send users and channels - - NetSendMyRoutingTable(); - - // send all routing table and uline voodoo. The ordering of these commands is IMPORTANT! - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (is_uline(me[j]->connectors[k].GetServerName().c_str())) - { - snprintf(data,MAXBUF,"%s H %s",CreateSum().c_str(),me[j]->connectors[k].GetServerName().c_str()); - serv->SendPacket(data,tcp_host); - } - } - } - } - - // send our version for the remote side to cache - snprintf(data,MAXBUF,"%s v %s %s",CreateSum().c_str(),ServerName,GetVersionString().c_str()); - serv->SendPacket(data,tcp_host); - - // sync the users and channels, give the modules a look-in. - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - snprintf(data,MAXBUF,"%s N %lu %s %s %s %s +%s %s %s :%s",CreateSum().c_str(),(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->ip,u->second->server,u->second->fullname); - serv->SendPacket(data,tcp_host); - if (strchr(u->second->modes,'o')) - { - snprintf(data,MAXBUF,"%s | %s %s",CreateSum().c_str(),u->second->nick,u->second->oper); - serv->SendPacket(data,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++) - { - snprintf(data,MAXBUF,"%s %s",CreateSum().c_str(),l[j].c_str()); - serv->SendPacket(data,tcp_host); - } - } - char* chl = chlist(u->second,u->second); - if (strcmp(chl,"")) - { - snprintf(data,MAXBUF,"%s J %s %s",CreateSum().c_str(),u->second->nick,chl); - serv->SendPacket(data,tcp_host); - } - } - // send channel modes, topics etc... - for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++) - { - snprintf(data,MAXBUF,"M %s +%s",c->second->name,chanmodes(c->second)); - serv->SendPacket(data,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++) - { - snprintf(data,MAXBUF,"%s %s",CreateSum().c_str(),l[j].c_str()); - serv->SendPacket(data,tcp_host); - } - } - if (c->second->topic[0]) - { - snprintf(data,MAXBUF,"%s T %lu %s %s :%s",CreateSum().c_str(),(unsigned long)c->second->topicset,c->second->setby,c->second->name,c->second->topic); - serv->SendPacket(data,tcp_host); - } - // send current banlist - - for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++) - { - snprintf(data,MAXBUF,"%s M %s +b %s",CreateSum().c_str(),c->second->name,b->data); - serv->SendPacket(data,tcp_host); - } - } - // sync global zlines, glines, etc - sync_xlines(serv,tcp_host); - - snprintf(data,MAXBUF,"%s F %lu",CreateSum().c_str(),(unsigned long)TIME); - serv->SendPacket(data,tcp_host); - log(DEBUG,"Sent sync"); - // ircd sends its serverlist after the end of sync here -} - - -void NetSendMyRoutingTable() -{ - // send out a line saying what is reachable to us. - // E.g. if A is linked to B C and D, send out: - // $ A B C D - // if its only linked to B and D send out: - // $ A B D - // if it has no links, dont even send out the line at all. - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"$ %s",ServerName); - bool sendit = false; - for (int i = 0; i < 32; i++) - { - if (me[i] != NULL) - { - for (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()))) - { - strlcat(buffer," ",MAXBUF); - strlcat(buffer,me[i]->connectors[j].GetServerName().c_str(),MAXBUF); - sendit = true; - } - } - } - } - if (sendit) - NetSendToAll(buffer); -} - - -void DoSplit(const char* params) -{ - bool go_again = true; - while (go_again) - { - go_again = false; - for (int i = 0; i < 32; i++) - { - if (me[i] != NULL) - { - for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) - { - if (!strcasecmp(j->GetServerName().c_str(),params)) - { - j->routes.clear(); - j->CloseConnection(); - me[i]->connectors.erase(j); - go_again = true; - break; - } - } - } - } - } - log(DEBUG,"Removed server. Will remove clients..."); - // iterate through the userlist and remove all users on this server. - // because we're dealing with a mesh, we dont have to deal with anything - // "down-route" from this server (nice huh) - go_again = true; - char reason[MAXBUF]; - snprintf(reason,MAXBUF,"%s %s",ServerName,params); - while (go_again) - { - go_again = false; - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (!strcasecmp(u->second->server,params)) - { - kill_link(u->second,reason); - go_again = true; - break; - } - } - } - has_been_netsplit = true; -} - -// removes a server. Will NOT remove its users! - -void RemoveServer(const char* name) -{ - bool go_again = true; - while (go_again) - { - go_again = false; - for (int i = 0; i < 32; i++) - { - if (me[i] != NULL) - { - for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) - { - if (!strcasecmp(j->GetServerName().c_str(),name)) - { - j->routes.clear(); - j->CloseConnection(); - me[i]->connectors.erase(j); - go_again = true; - break; - } - } - } - } - } -} - - char MODERR[MAXBUF]; char* ModuleError() @@ -2427,7 +2174,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) { @@ -2437,6 +2184,16 @@ bool UnloadModule(const char* filename) snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)"); return false; } + /* Give the module a chance to tidy out all its metadata */ + for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++) + { + modules[j]->OnCleanup(TYPE_CHANNEL,c->second); + } + for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + { + modules[j]->OnCleanup(TYPE_USER,u->second); + } + FOREACH_MOD OnUnloadModule(modules[j],module_names[j]); // found the module log(DEBUG,"Deleting module..."); erase_module(j); @@ -2476,7 +2233,7 @@ bool LoadModule(const char* filename) if (FileExists(modfile)) { #endif - 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) { @@ -2496,7 +2253,7 @@ bool LoadModule(const char* filename) } if (factory[MODCOUNT+1]->factory) { - Module* m = factory[MODCOUNT+1]->factory->CreateModule(); + Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer); modules[MODCOUNT+1] = m; /* save the module and the module's classfactory, if * this isnt done, random crashes can occur :/ */ @@ -2518,39 +2275,23 @@ bool LoadModule(const char* filename) } #endif MODCOUNT++; + FOREACH_MOD OnLoadModule(modules[MODCOUNT],filename_str); return true; } -bool GotServer(std::string name) -{ - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (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) +int InspIRCd(char** argv, int argc) { struct sockaddr_in client,server; char addrs[MAXBUF][255]; 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"; @@ -2586,7 +2327,9 @@ int InspIRCd(char** argv, int argc) } log(DEBUG,"InspIRCd: startup: read config"); - int clientportcount = 0, serverportcount = 0; + AddServerName(ServerName); + + int clientportcount = 0; for (count = 0; count < ConfValueEnum("bind",&config_f); count++) { @@ -2595,24 +2338,7 @@ int InspIRCd(char** argv, int argc) ConfValue("bind","type",count,Type,&config_f); if (!strcmp(Type,"servers")) { - char Default[MAXBUF]; - strcpy(Default,"no"); - ConfValue("bind","default",count,Default,&config_f); - if (strchr(Default,'y')) - { - defaultRoute = serverportcount; - log(DEBUG,"InspIRCd: startup: binding '%s:%s' is default server route",Addr,configToken); - } - me[serverportcount] = new serverrec(ServerName,100L,false); - if (!me[serverportcount]->CreateListener(Addr,atoi(configToken))) - { - log(DEFAULT,"Warning: Failed to bind port %lu",(unsigned long)atoi(configToken)); - printf("Warning: Failed to bind port %lu\n",(unsigned long)atoi(configToken)); - } - else - { - serverportcount++; - } + // modules handle this bind type now. } else { @@ -2623,9 +2349,8 @@ int InspIRCd(char** argv, int argc) log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type); } portCount = clientportcount; - SERVERportCount = serverportcount; - log(DEBUG,"InspIRCd: startup: read %lu total client ports and %lu total server ports",(unsigned long)portCount,(unsigned long)SERVERportCount); + log(DEBUG,"InspIRCd: startup: read %lu total client ports",(unsigned long)portCount); log(DEBUG,"InspIRCd: startup: InspIRCd is now starting!"); printf("\n"); @@ -2653,7 +2378,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"); @@ -2703,115 +2428,13 @@ int InspIRCd(char** argv, int argc) } } - // BUGFIX: We cannot initialize this before forking, as the kqueue data is not inherited by child processes! -#ifdef USE_KQUEUE - kq = kqueue(); - lkq = kqueue(); - skq = kqueue(); - if ((kq == -1) || (lkq == -1) || (skq == -1)) - { - log(DEFAULT,"main: kqueue() failed!"); - printf("ERROR: could not initialise kqueue event system. Shutting down.\n"); - Exit(ERROR); - } -#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, 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++) - { - struct kevent ke; - 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, 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); - } - } - } - - -#else - log(DEFAULT,"Using standard select socket engine."); -#endif -#endif + engine_init; + engine_server_fill; WritePID(PID); length = sizeof (client); - char tcp_msg[MAXBUF],tcp_host[MAXBUF],tcp_sum[MAXBUF]; - -#ifdef USE_KQUEUE - struct kevent ke; - struct kevent ke_list[33]; - struct timespec ts; -#endif -#ifdef USE_EPOLL - struct epoll_event event[33]; -#endif - fd_set serverfds; + engine_structs; timeval tvs; tvs.tv_usec = 10000L; tvs.tv_sec = 0; @@ -2819,12 +2442,13 @@ 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; int i = 0, v = 0, j = 0, cycle_iter = 0; bool expire_run = false; + + cycle_iter = i = j = 0; // stop the compiler whining - these may be marked unused in certain socket engine types /* main loop, this never returns */ for (;;) @@ -2839,31 +2463,30 @@ int InspIRCd(char** argv, int argc) OLDTIME = TIME; TIME = time(NULL); +#ifndef THREADED_DNS dns_poll(); +#endif - // *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue - // them in a list, then reap the list every second or so. - if (((TIME % 5) == 0) && (!expire_run)) + unsigned int numsockets = module_sockets.size(); + for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) { - for (int i = 0; i < ConfValueEnum("link",&config_f); i++) + InspSocket* s = (InspSocket*)*a; + if ((s) && (!s->Poll())) { - 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); - } - } - } + log(DEBUG,"Socket poll returned false, close and bail"); + s->Close(); + module_sockets.erase(a); + delete s; + break; } + // we gained a socket, sarper + if (module_sockets.size() != numsockets) break; + } + // *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue + // them in a list, then reap the list every second or so. + if (((TIME % 5) == 0) && (!expire_run)) + { expire_lines(); FOREACH_MOD OnBackgroundTimer(TIME); expire_run = true; @@ -2875,545 +2498,348 @@ 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]) && (event[0].data.fd == me[x]->fd)) - { -#endif -#ifdef USE_KQUEUE - ts.tv_sec = 0; - ts.tv_nsec = 30000L; - i = kevent(skq, NULL, 0, &ke, 1, &ts); - if (i > 0) + + while (count2 != clientlist.end()) { - 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)) - { - -#endif #ifdef USE_SELECT - FD_ZERO(&serverfds); - for (int x = 0; x != SERVERportCount; x++) - { - if (me[x]) - FD_SET(me[x]->fd, &serverfds); - } - tvs.tv_usec = 30000L; - tvs.tv_sec = 0; - int servresult = select(FD_SETSIZE, &serverfds, NULL, NULL, &tvs); - if (servresult > 0) - { - for (int x = 0; x != SERVERportCount; x++) - { - if ((me[x]) && (FD_ISSET (me[x]->fd, &serverfds))) - { + FD_ZERO(&sfd); #endif - char remotehost[MAXBUF],resolved[MAXBUF]; - length = sizeof (client); - incomingSockfd = accept (me[x]->fd, (sockaddr *) &client, &length); - if (incomingSockfd != -1) - { - strlcpy(remotehost,(char *)inet_ntoa(client.sin_addr),MAXBUF); - if(CleanAndResolve(resolved, remotehost) != TRUE) - { - strlcpy(resolved,remotehost,MAXBUF); - } - // add to this connections ircd_connector vector - // *FIX* - we need the LOCAL port not the remote port in &client! - me[x]->AddIncoming(incomingSockfd,resolved,me[x]->port); - } - } - } - } - - std::deque msgs; - std::deque sums; - for (int x = 0; x < SERVERportCount; x++) - { - if (me[x]) - me[x]->FlushWriteBuffers(); - sums.clear(); - msgs.clear(); - while ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host, sums))) // returns 0 or more lines (can be multiple lines!) - { - has_been_netsplit = false; - for (int ctr = 0; ctr < msgs.size(); ctr++) - { - strlcpy(tcp_msg,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; - } - // during a netburst, send all data to all other linked servers - if ((((nb_start>0) && (tcp_msg[0] != 'Y') && (tcp_msg[0] != 'X') && (tcp_msg[0] != 'F'))) || (is_uline(tcp_host))) - { - if (is_uline(tcp_host)) - { - if ((tcp_msg[0] != 'Y') && (tcp_msg[0] != 'X') && (tcp_msg[0] != 'F')) - { - NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum); - } - } - else - NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum); - } - std::string msg = tcp_msg; - FOREACH_MOD OnPacketReceive(msg,tcp_host); - strlcpy(tcp_msg,msg.c_str(),MAXBUF); - 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; - } - } - while (count2 != clientlist.end()) - { -#ifdef USE_SELECT - FD_ZERO(&sfd); -#endif - - total_in_this_set = 0; + total_in_this_set = 0; - user_hash::iterator xcount = count2; - user_hash::iterator endingiter = count2; + user_hash::iterator xcount = count2; + user_hash::iterator endingiter = count2; - if (count2 == clientlist.end()) break; + if (count2 == clientlist.end()) break; - userrec* curr = NULL; + userrec* curr = NULL; - if (count2->second) - curr = count2->second; + if (count2->second) + curr = count2->second; - if ((long)curr == -1) - goto label; + if ((long)curr == -1) + goto label; - if ((curr) && (curr->fd != 0)) - { + if ((curr) && (curr->fd != 0)) + { #ifdef _POSIX_PRIORITY_SCHEDULING - sched_yield(); + sched_yield(); #endif - // assemble up to 64 sockets into an fd_set - // to implement a pooling mechanism. - // - // This should be up to 64x faster than the - // old implementation. + // assemble up to 64 sockets into an fd_set + // to implement a pooling mechanism. + // + // This should be up to 64x faster than the + // old implementation. #ifdef USE_SELECT - while (total_in_this_set < 1024) - { - if (count2 != clientlist.end()) + while (total_in_this_set < 1024) { - curr = count2->second; - if ((long)curr == -1) - goto label; - int currfd = curr->fd; - // we don't check the state of remote users. - if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) + if (count2 != clientlist.end()) { - curr->FlushWriteBuf(); - if (curr->GetWriteError() != "") - { - log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str()); - kill_link(curr,curr->GetWriteError().c_str()); - goto label; - } - - FD_SET (curr->fd, &sfd); - - // registration timeout -- didnt send USER/NICK/HOST in the time specified in - // their connection class. - if ((TIME > curr->timeout) && (curr->registered != 7)) - { - log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); - kill_link(curr,"Registration timeout"); + curr = count2->second; + if ((long)curr == -1) goto label; - } - if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) + int currfd = curr->fd; + // we don't check the state of remote users. + if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) { - log(DEBUG,"signon exceed, registered=3, and modules ready, OK"); - curr->dns_done = true; - statsDnsBad++; - FullConnectUser(curr); - 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); - if (fd_ref_table[currfd] != curr) // something changed, bail pronto - goto label; - } - if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) - { - if ((!curr->lastping) && (curr->registered == 7)) + curr->FlushWriteBuf(); + if (curr->GetWriteError() != "") { - log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick); - kill_link(curr,"Ping timeout"); + log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str()); + kill_link(curr,curr->GetWriteError().c_str()); goto label; } - Write(curr->fd,"PING :%s",ServerName); - log(DEBUG,"InspIRCd: pinging: %s",curr->nick); - curr->lastping = 0; - curr->nping = TIME+curr->pingmax; // was hard coded to 120 + + FD_SET (curr->fd, &sfd); + + // registration timeout -- didnt send USER/NICK/HOST in the time specified in + // their connection class. + if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7)) + { + log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); + kill_link(curr,"Registration timeout"); + goto label; + } + if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) + { + log(DEBUG,"signon exceed, registered=3, and modules ready, OK"); + curr->dns_done = true; + statsDnsBad++; + FullConnectUser(curr); + 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); + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; + } + if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) + { + if ((!curr->lastping) && (curr->registered == 7)) + { + log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick); + kill_link(curr,"Ping timeout"); + goto label; + } + Write(curr->fd,"PING :%s",ServerName); + log(DEBUG,"InspIRCd: pinging: %s",curr->nick); + curr->lastping = 0; + curr->nping = TIME+curr->pingmax; // was hard coded to 120 + } } + count2++; + total_in_this_set++; } - count2++; - total_in_this_set++; + else break; } - else break; - } - endingiter = count2; - count2 = xcount; // roll back to where we were + endingiter = count2; + count2 = xcount; // roll back to where we were #else - // 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 > 20) while (count2 != clientlist.end()) - { - cycle_iter = 0; - if (count2 != clientlist.end()) + // 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 > 20) while (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 ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) + cycle_iter = 0; + if (count2 != clientlist.end()) { - - curr->FlushWriteBuf(); - if (curr->GetWriteError() != "") - { - log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str()); - kill_link(curr,curr->GetWriteError().c_str()); - goto label; - } - - // registration timeout -- didnt send USER/NICK/HOST in the time specified in - // their connection class. - if ((TIME > curr->timeout) && (curr->registered != 7)) - { - log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); - kill_link(curr,"Registration timeout"); - goto label; - - } - if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) - { - log(DEBUG,"signon exceed, registered=3, and modules ready, OK: %d %d",TIME,curr->signon); - curr->dns_done = true; - statsDnsBad++; - FullConnectUser(curr); - 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); - if (fd_ref_table[currfd] != curr) // something changed, bail pronto - goto label; - } - if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) + curr = count2->second; + if ((long)curr == -1) + goto label; + int currfd = curr->fd; + // we don't check the state of remote users. + if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) { - if ((!curr->lastping) && (curr->registered == 7)) - { - log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick); - kill_link(curr,"Ping timeout"); - goto label; - } - Write(curr->fd,"PING :%s",ServerName); - log(DEBUG,"InspIRCd: pinging: %s",curr->nick); - curr->lastping = 0; - curr->nping = TIME+curr->pingmax; // was hard coded to 120 + curr->FlushWriteBuf(); + if (curr->GetWriteError() != "") + { + log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str()); + kill_link(curr,curr->GetWriteError().c_str()); + goto label; + } + + // registration timeout -- didnt send USER/NICK/HOST in the time specified in + // their connection class. + if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7)) + { + log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); + kill_link(curr,"Registration timeout"); + goto label; + + } + if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) + { + log(DEBUG,"signon exceed, registered=3, and modules ready, OK: %d %d",TIME,curr->signon); + curr->dns_done = true; + statsDnsBad++; + FullConnectUser(curr); + 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); + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; + } + if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) + { + if ((!curr->lastping) && (curr->registered == 7)) + { + log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick); + kill_link(curr,"Ping timeout"); + goto label; + } + Write(curr->fd,"PING :%s",ServerName); + log(DEBUG,"InspIRCd: pinging: %s",curr->nick); + curr->lastping = 0; + curr->nping = TIME+curr->pingmax; // was hard coded to 120 + } } } + else break; + count2++; } - else break; - count2++; - } - // increment the counter right to the end of the list, as kqueue processes everything in one go + // increment the counter right to the end of the list, as kqueue processes everything in one go #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; - // for now, we only read 1 event. We could read soooo many more :) - int i = kevent(kq, NULL, 0, &ke, 1, &ts); - if (i > 0) - { - 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]; -#endif -#ifdef USE_SELECT - tval.tv_sec = 0; - tval.tv_usec = 1000L; - 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) && (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 + v = 0; + engine_fill; #ifdef _POSIX_PRIORITY_SCHEDULING - 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)) + sched_yield(); #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 - { - log(DEBUG,"Data waiting on socket %d",cu->fd); - int MOD_RESULT = 0; - int result2 = 0; - FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2)); - if (!MOD_RESULT) - { - result = cu->ReadData(data, 65535); - } - else result = result2; - log(DEBUG,"Read result: %d",result); - if (result) + result = EAGAIN; + if (engine_check) { - 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: *" - for (int checker = 0; checker < result; checker++) - { - if ((data[checker] == 0) || (data[checker] == 7)) - data[checker] = ' '; - } - if (result > 0) - data[result] = '\0'; - userrec* current = cu; - int currfd = current->fd; - int floodlines = 0; - // add the data to the users buffer - if (result > 0) - if (!current->AddBuffer(data)) + log(DEBUG,"Data waiting on socket %d",cu->fd); + int MOD_RESULT = 0; + int result2 = 0; + FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2)); + if (!MOD_RESULT) { - // 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"); - } - else - { - WriteOpers("*** Excess flood from %s",current->ip); - log(DEFAULT,"Excess flood from: %s",current->ip); - add_zline(120,ServerName,"Flood from unregistered connection",current->ip); - apply_lines(); - } - goto label; + result = cu->ReadData(data, 65535); } - if (current->recvq.length() > NetBufferSize) + else { - if (current->registered == 7) - { - kill_link(current,"RecvQ exceeded"); - } - else - { - WriteOpers("*** Excess flood from %s",current->ip); - log(DEFAULT,"Excess flood from: %s",current->ip); - add_zline(120,ServerName,"Flood from unregistered connection",current->ip); - apply_lines(); - } - goto label; + log(DEBUG,"Data result returned by module: %d",MOD_RESULT); + result = result2; } - // while there are complete lines to process... - while (current->BufferIsReady()) + log(DEBUG,"Read result: %d",result); + if (result) { - 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) + 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: *" + for (int checker = 0; checker < result; checker++) { - 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"); - goto label; + if ((data[checker] == 0) || (data[checker] == 7)) + data[checker] = ' '; } - if ((floodlines > current->flood) && (current->flood != 0)) + if (result > 0) + data[result] = '\0'; + userrec* current = cu; + int currfd = current->fd; + int floodlines = 0; + // add the data to the users buffer + if (result > 0) + 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) { - 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"); + kill_link(current,"RecvQ exceeded"); } else { + WriteOpers("*** Excess flood from %s",current->ip); + log(DEFAULT,"Excess flood from: %s",current->ip); add_zline(120,ServerName,"Flood from unregistered connection",current->ip); - apply_lines(); - } - goto label; + apply_lines(); + } + goto label; } - char sanitized[MAXBUF]; - // use GetBuffer to copy single lines into the sanitized string - std::string single_line = current->GetBuffer(); - current->bytes_in += single_line.length(); - current->cmds_in++; - if (single_line.length()>512) + if (current->recvq.length() > (unsigned)NetBufferSize) { - 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"); + if (current->registered == 7) + { + kill_link(current,"RecvQ exceeded"); + } + else + { + WriteOpers("*** Excess flood from %s",current->ip); + log(DEFAULT,"Excess flood from: %s",current->ip); + add_zline(120,ServerName,"Flood from unregistered connection",current->ip); + apply_lines(); + } goto label; } - strlcpy(sanitized,single_line.c_str(),MAXBUF); - if (*sanitized) + // while there are complete lines to process... + while (current->BufferIsReady()) { - userrec* old_comp = fd_ref_table[currfd]; - // we're gonna re-scan to check if the nick is gone, after every - // command - if it has, we're gonna bail - process_buffer(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)) + 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) + { + 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"); goto label; - + } + if ((floodlines > current->flood) && (current->flood != 0)) + { + if (current->registered == 7) + { + 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"); + } + else + { + add_zline(120,ServerName,"Flood from unregistered connection",current->ip); + apply_lines(); + } + goto label; + } + char sanitized[MAXBUF]; + // use GetBuffer to copy single lines into the sanitized string + 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"); + goto label; + } + strlcpy(sanitized,single_line.c_str(),MAXBUF); + if (*sanitized) + { + userrec* old_comp = fd_ref_table[currfd]; + // we're gonna re-scan to check if the nick is gone, after every + // command - if it has, we're gonna bail + process_buffer(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)) + goto label; + + } } + goto label; } - goto label; - } - if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) + if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) + { + log(DEBUG,"killing: %s",cu->nick); + kill_link(cu,strerror(errno)); + goto label; + } + } + // result EAGAIN means nothing read + if (result == EAGAIN) { - log(DEBUG,"killing: %s",cu->nick); - kill_link(cu,strerror(errno)); - goto label; } - } - // result EAGAIN means nothing read - if (result == EAGAIN) - { - } - else - if (result == 0) - { -#ifdef USE_SELECT - if (count2->second) - { -#endif - log(DEBUG,"InspIRCd: Exited: %s",cu->nick); - kill_link(cu,"Client exited"); - // must bail here? kill_link removes the hash, corrupting the iterator - log(DEBUG,"Bailing from client exit"); - goto label; -#ifdef USE_SELECT + else + if (result == 0) + { + engine_cleanup; + } + else if (result > 0) + { } -#endif - } - else if (result > 0) - { } } + for (int q = 0; q < total_in_this_set; q++) + { + count2++; + } } - for (int q = 0; q < total_in_this_set; q++) - { - count2++; - } - } - + #ifdef _POSIX_PRIORITY_SCHEDULING - sched_yield(); + sched_yield(); #endif -#ifdef USE_SELECT - // set up select call - for (count = 0; count < boundPortCount; count++) - { - FD_SET (openSockfd[count], &selectFds); - } - - tv.tv_usec = 30000L; - selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv); - /* select is reporting a waiting socket. Poll them all to find out which */ - if (selectResult > 0) - { - for (count = 0; count < boundPortCount; count++) - { - if (FD_ISSET (openSockfd[count], &selectFds)) - { -#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_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]) - { -#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 (event[j].data.fd == openSockfd[count]) - { -#endif + engine_scanset; char target[MAXBUF], resolved[MAXBUF]; length = sizeof (client); incomingSockfd = accept (openSockfd[count], (struct sockaddr *) &client, &length); + log(DEBUG,"Accepted socket %d",incomingSockfd); strlcpy (target, (char *) inet_ntoa (client.sin_addr), MAXBUF); strlcpy (resolved, target, MAXBUF); @@ -3443,5 +2869,6 @@ int InspIRCd(char** argv, int argc) } /* not reached */ close (incomingSockfd); +return 0; }