X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=9523e13ca0c5abfa7f522506fef9d7c7445a95c9;hb=878e437589ee448bc2e87200890cbd446accfc68;hp=e5d46300862266bf974c8fe229853f502c48df44;hpb=8516fe8689952df3eb2e4b7a01ef4f640940fd03;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index e5d463008..9523e13ca 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -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 @@ -90,6 +90,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; @@ -119,11 +120,16 @@ int kq, lkq, skq; 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 @@ -140,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]; @@ -175,6 +183,27 @@ 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++) @@ -188,7 +217,7 @@ void DeleteOper(userrec* user) } } -long GetRevision() +std::string GetRevision() { char Revision[] = "$Revision$"; char *s1 = Revision; @@ -197,7 +226,7 @@ long GetRevision() s1 = savept; v2 = strtok_r(s1," ",&savept); s1 = savept; - return (long)(atof(v2)*10000); + return std::string(v2); } @@ -234,13 +263,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()); @@ -295,7 +326,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!"); @@ -398,6 +436,20 @@ 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) { @@ -498,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); @@ -801,6 +853,8 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool chanlist.erase(iter); } } + + return NULL; } @@ -1107,15 +1161,16 @@ void kill_link(userrec *user,const char* r) log(DEBUG,"epoll: List deletion failure!"); } #endif - shutdown(user->fd,2); - close(user->fd); + 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); - WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason); + // 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); } @@ -1182,8 +1237,7 @@ void kill_link_silent(userrec *user,const char* r) log(DEBUG,"epoll: List deletion failure!"); } #endif - shutdown(user->fd,2); - close(user->fd); + user->CloseSocket(); } if (user->registered == 7) { @@ -1230,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) { @@ -1292,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; @@ -1306,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++) { @@ -1379,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; @@ -1424,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; } @@ -1437,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; @@ -1535,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); @@ -1565,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); } @@ -1616,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()); } @@ -1634,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])) { @@ -1666,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)) { @@ -1728,6 +1789,7 @@ void DoSplitEveryone() } } } + has_been_netsplit = true; } @@ -1843,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] == ':')) { @@ -1890,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]); } @@ -1901,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)) { @@ -1915,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]); @@ -1931,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]); } @@ -1946,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] != '.')) { @@ -1962,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]) { @@ -2023,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))) { @@ -2174,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())) { @@ -2202,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); @@ -2223,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); @@ -2267,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()))) { @@ -2327,6 +2386,7 @@ void DoSplit(const char* params) } } } + has_been_netsplit = true; } // removes a server. Will NOT remove its users! @@ -2410,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) { @@ -2420,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); @@ -2440,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) { @@ -2473,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); @@ -2483,6 +2553,7 @@ bool LoadModule(const char* filename) snprintf(MODERR,MAXBUF,"Factory function failed!"); return false; } +#ifndef STATIC_LINK } else { @@ -2490,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; @@ -2501,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"; @@ -2513,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) @@ -2534,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++) @@ -2601,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"); @@ -2759,7 +2860,10 @@ int InspIRCd(char** argv, int argc) #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; @@ -2767,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; @@ -2793,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; @@ -2811,7 +2933,7 @@ int InspIRCd(char** argv, int argc) 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)) + if ((me[x]) && ((unsigned)event[0].data.fd == (unsigned)me[x]->fd)) { #endif #ifdef USE_KQUEUE @@ -2823,7 +2945,7 @@ 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)) { #endif @@ -2836,11 +2958,7 @@ int InspIRCd(char** argv, int argc) } tvs.tv_usec = 30000L; tvs.tv_sec = 0; -#ifdef IS_SOLARIS - int servresult = select(1024, &serverfds, NULL, NULL, &tvs); -#else - int servresult = select(32767, &serverfds, NULL, NULL, &tvs); -#endif + int servresult = select(FD_SETSIZE, &serverfds, NULL, NULL, &tvs); if (servresult > 0) { for (int x = 0; x != SERVERportCount; x++) @@ -2870,14 +2988,17 @@ int InspIRCd(char** argv, int argc) 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!) { - 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]) { @@ -2902,9 +3023,13 @@ int InspIRCd(char** argv, int argc) 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; + } } - sums.clear(); // we're done, clear the list for the next operation - msgs.clear(); + goto label; } } @@ -3033,7 +3158,7 @@ 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"); @@ -3100,12 +3225,7 @@ int InspIRCd(char** argv, int argc) #ifdef USE_SELECT tval.tv_sec = 0; tval.tv_usec = 1000L; -#ifdef IS_SOLARIS - selectResult2 = select(1024, &sfd, NULL, NULL, &tval); -#else - selectResult2 = select(65535, &sfd, NULL, NULL, &tval); -#endif - + 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++) @@ -3139,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); @@ -3177,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) { @@ -3329,7 +3449,7 @@ int InspIRCd(char** argv, int argc) // 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 @@ -3339,7 +3459,7 @@ int InspIRCd(char** argv, int argc) 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]) + if ((unsigned)event[j].data.fd == (unsigned)openSockfd[count]) { #endif char target[MAXBUF], resolved[MAXBUF]; @@ -3374,5 +3494,6 @@ int InspIRCd(char** argv, int argc) } /* not reached */ close (incomingSockfd); +return 0; }