X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=f0d007cb949a7df723dcf5a2009c0d1c0ba10456;hb=9fc9227cf51585dd2e44c2fcd0014c8da8f8739f;hp=18b220e180d3af46d97b6422c30f06dc3c5660cb;hpb=fca2a3c8ea88ecfefd3bfb729bcdcdb674bbe946;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 18b220e18..f0d007cb9 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -98,12 +98,12 @@ std::vector module_names; extern std::vector factory; std::vector fd_reap; -std::vector pending_connects; - extern int MODCOUNT; - +int openSockfd[MAXSOCKS]; bool nofork = false; +time_t TIME = time(NULL); + namespace nspace { #ifdef GCC34 @@ -201,7 +201,6 @@ long MyKey = C.GenKey(); int has_channel(userrec *u, chanrec *c); int usercount(chanrec *c); int usercount_i(chanrec *c); -void update_stats_l(int fd,int data_out); char* Passwd(userrec *user); bool IsDenied(userrec *user); void AddWhoWas(userrec* u); @@ -328,7 +327,7 @@ void ReadConfig(bool bail, userrec* user) if (bail) { printf("There were errors in your configuration:\n%s",errstr.str().c_str()); - exit(0); + Exit(0); } else { @@ -471,7 +470,6 @@ void Write(int sock,char *text, ...) if (sock != -1) { write(sock,tb,strlen(tb)); - update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */ } } @@ -495,7 +493,6 @@ void WriteServ(int sock, char* text, ...) if (sock != -1) { write(sock,tb,strlen(tb)); - update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */ } } @@ -519,7 +516,6 @@ void WriteFrom(int sock, userrec *user,char* text, ...) if (sock != -1) { write(sock,tb,strlen(tb)); - update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */ } } @@ -1067,22 +1063,6 @@ userrec* Find(std::string nick) return iter->second; } -void update_stats_l(int fd,int data_out) /* add one line-out to stats L for this fd */ -{ - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (i->second) - { - if (i->second->fd == fd) - { - i->second->bytes_out+=data_out; - i->second->cmds_out++; - } - } - } -} - - /* find a channel record by channel name and return a pointer to it */ chanrec* FindChan(const char* chan) @@ -1103,6 +1083,22 @@ chanrec* FindChan(const char* chan) } +long GetMaxBans(char* name) +{ + char CM[MAXBUF]; + for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++) + { + ConfValue("banlist","chan",count,CM,&config_f); + if (match(name,CM)) + { + ConfValue("banlist","limit",count,CM,&config_f); + return atoi(CM); + } + } + return 64; +} + + void purge_empty_chans(void) { int go_again = 1, purge = 0; @@ -1244,7 +1240,7 @@ void userlist(userrec *user,chanrec *c) { /* list overflowed into * multiple numerics */ - WriteServ(user->fd,list); + WriteServ(user->fd,"%s",list); snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); } } @@ -1252,7 +1248,7 @@ void userlist(userrec *user,chanrec *c) } /* if whats left in the list isnt empty, send it */ if (list[strlen(list)-1] != ':') { - WriteServ(user->fd,list); + WriteServ(user->fd,"%s",list); } } @@ -1375,7 +1371,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri strlcpy(chanlist[cname]->name, cname,CHANMAX); chanlist[cname]->topiclock = 1; chanlist[cname]->noexternal = 1; - chanlist[cname]->created = time(NULL); + chanlist[cname]->created = TIME; strcpy(chanlist[cname]->topic, ""); strncpy(chanlist[cname]->setby, user->nick,NICKMAX); chanlist[cname]->topicset = 0; @@ -1397,17 +1393,19 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri // the override flag allows us to bypass channel modes // and bans (used by servers) - if (!override) + if ((!override) || (!strcasecmp(user->server,ServerName))) { + log(DEBUG,"Not overriding..."); int MOD_RESULT = 0; FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname)); if (MOD_RESULT == 1) { return NULL; } + log(DEBUG,"MOD_RESULT=%d",MOD_RESULT); - if (MOD_RESULT == 0) + if (!MOD_RESULT) { - + log(DEBUG,"add_channel: checking key, invite, etc"); if (strcmp(Ptr->key,"")) { log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key); @@ -1718,7 +1716,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) /* This function pokes and hacks at a parameter list like the following: * - * PART #winbot, #darkgalaxy :m00! + * PART #winbot,#darkgalaxy :m00! * * to turn it into a series of individual calls like this: * @@ -2046,9 +2044,9 @@ void Error(int status) signal (SIGSEGV, SIG_IGN); signal (SIGURG, SIG_IGN); signal (SIGKILL, SIG_IGN); - log(DEBUG,"*** fell down a pothole in the road to perfection ***"); + log(DEFAULT,"*** fell down a pothole in the road to perfection ***"); send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*"); - exit(status); + Exit(status); } @@ -2060,7 +2058,7 @@ int main(int argc, char **argv) if (!FileExists(CONFIG_FILE)) { printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE); - log(DEBUG,"main: no config"); + log(DEFAULT,"main: no config"); printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n"); Exit(ERROR); } @@ -2079,7 +2077,7 @@ int main(int argc, char **argv) if (InspIRCd() == ERROR) { - log(DEBUG,"main: daemon function bailed"); + log(DEFAULT,"main: daemon function bailed"); printf("ERROR: could not initialise. Shutting down.\n"); Exit(ERROR); } @@ -2148,7 +2146,7 @@ void AddWhoWas(userrec* u) for (user_hash::iterator i = whowas.begin(); i != whowas.end(); i++) { // 3600 seconds in an hour ;) - if ((i->second->signon)<(time(NULL)-(WHOWAS_STALE*3600))) + if ((i->second->signon)<(TIME-(WHOWAS_STALE*3600))) { if (i->second) delete i->second; i->second = a; @@ -2208,34 +2206,27 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) strncpy(clientlist[tempnick]->server, ServerName,256); strncpy(clientlist[tempnick]->ident, "unknown",9); clientlist[tempnick]->registered = 0; - clientlist[tempnick]->signon = time(NULL); - clientlist[tempnick]->nping = time(NULL)+240; + clientlist[tempnick]->signon = TIME+dns_timeout; + clientlist[tempnick]->nping = TIME+240+dns_timeout; clientlist[tempnick]->lastping = 1; clientlist[tempnick]->port = port; strncpy(clientlist[tempnick]->ip,ip,32); // set the registration timeout for this user unsigned long class_regtimeout = 90; - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) - { - if (match(clientlist[tempnick]->host,i->host) && (i->type == CC_ALLOW)) - { - class_regtimeout = (unsigned long)i->registration_timeout; - break; - } - } - int class_flood = 0; + for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) { if (match(clientlist[tempnick]->host,i->host) && (i->type == CC_ALLOW)) { + class_regtimeout = (unsigned long)i->registration_timeout; class_flood = i->flood; break; } } - clientlist[tempnick]->timeout = time(NULL)+class_regtimeout; + clientlist[tempnick]->timeout = TIME+class_regtimeout; clientlist[tempnick]->flood = class_flood; for (int i = 0; i < MAXCHANS; i++) @@ -2247,21 +2238,36 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) if (clientlist.size() == MAXCLIENTS) kill_link(clientlist[tempnick],"No more connections allowed in this class"); - char* r = matches_zline(ip); - if (r) + + char* e = matches_exception(ip); + if (!e) { - char reason[MAXBUF]; - snprintf(reason,MAXBUF,"Z-Lined: %s",r); - kill_link(clientlist[tempnick],reason); + char* r = matches_zline(ip); + if (r) + { + char reason[MAXBUF]; + snprintf(reason,MAXBUF,"Z-Lined: %s",r); + kill_link(clientlist[tempnick],reason); + } } } - +// this function counts all users connected, wether they are registered or NOT. int usercnt(void) { return clientlist.size(); } +// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state +int registered_usercount(void) +{ + int c = 0; + for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + { + if ((i->second->fd) && (isnick(i->second->nick))) c++; + } + return c; +} int usercount_invisible(void) { @@ -2331,17 +2337,21 @@ long local_count() void ShowMOTD(userrec *user) { - if (!MOTD.size()) - { - WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick); - return; - } - WriteServ(user->fd,"375 %s :- %s message of the day",user->nick,ServerName); - for (int i = 0; i != MOTD.size(); i++) - { - WriteServ(user->fd,"372 %s :- %s",user->nick,MOTD[i].c_str()); - } - WriteServ(user->fd,"376 %s :End of %s message of the day.",user->nick,ServerName); + std::string WholeMOTD = ""; + if (!MOTD.size()) + { + WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick); + return; + } + WholeMOTD = std::string(":") + std::string(ServerName) + std::string(" 375 ") + std::string(user->nick) + std::string(" :- ") + std::string(ServerName) + " message of the day\r\n"; + for (int i = 0; i != MOTD.size(); i++) + { + WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 372 ") + std::string(user->nick) + std::string(" :- ") + MOTD[i] + std::string("\r\n"); + } + WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 376 ") + std::string(user->nick) + std::string(" :End of message of the day.\r\n"); + // only one write operation + send(user->fd,WholeMOTD.c_str(),WholeMOTD.length(),0); + } void ShowRULES(userrec *user) @@ -2363,7 +2373,7 @@ void ShowRULES(userrec *user) void FullConnectUser(userrec* user) { user->registered = 7; - user->idle_lastmsg = time(NULL); + user->idle_lastmsg = TIME; log(DEBUG,"ConnectUser: %s",user->nick); if (strcmp(Passwd(user),"") && (!user->haspassed)) @@ -2379,23 +2389,26 @@ void FullConnectUser(userrec* user) char match_against[MAXBUF]; snprintf(match_against,MAXBUF,"%s@%s",user->ident,user->host); - char* r = matches_gline(match_against); - if (r) - { - char reason[MAXBUF]; - snprintf(reason,MAXBUF,"G-Lined: %s",r); - kill_link_silent(user,reason); - return; - } - - r = matches_kline(user->host); - if (r) - { - char reason[MAXBUF]; - snprintf(reason,MAXBUF,"K-Lined: %s",r); - kill_link_silent(user,reason); - return; - } + char* e = matches_exception(match_against); + if (!e) + { + char* r = matches_gline(match_against); + if (r) + { + char reason[MAXBUF]; + snprintf(reason,MAXBUF,"G-Lined: %s",r); + kill_link_silent(user,reason); + return; + } + r = matches_kline(user->host); + if (r) + { + char reason[MAXBUF]; + snprintf(reason,MAXBUF,"K-Lined: %s",r); + kill_link_silent(user,reason); + return; + } + } 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); @@ -2437,50 +2450,14 @@ void FullConnectUser(userrec* user) NetSendToAll(buffer); } -// handles any connects where DNS isnt done yet, times out stale dns queries on users, and lets completed queries connect. -void HandlePendingConnects() -{ - if (pending_connects.size()) - { - for (std::vector::iterator i = pending_connects.begin(); i <= pending_connects.end(); i++) - { - std::string t = *i; - userrec* a = Find(t); - if (a) - { - // this user's dns is done now. - if ((a->dns_done) && (a->registered == 3)) - { - FullConnectUser(a); // attack! attack!.... - pending_connects.erase(i); - return; // ...RUN AWAY! RUN AWAY! - } - // this users dns is NOT done, but its timed out. - if ((time(NULL) > a->signon+dns_timeout) && (a->registered == 3)) - { - WriteServ(a->fd,"NOTICE Auth :Failed to resolve your hostname, using your IP address instead."); - FullConnectUser(a); - pending_connects.erase(i); - return; - } - } - } - } -} - /* shows the message of the day, and any other on-logon stuff */ void ConnectUser(userrec *user) { // dns is already done, things are fast. no need to wait for dns to complete just pass them straight on - if (user->dns_done) + if ((user->dns_done) && (user->registered >= 3)) { FullConnectUser(user); } - else - { - // add them to the pending queue - pending_connects.push_back(user->nick); - } } void handle_version(char **parameters, int pcnt, userrec *user) @@ -2865,7 +2842,7 @@ void process_command(userrec *user, char* cmd) log(DEBUG,"Processing command"); /* activity resets the ping pending timer */ - user->nping = time(NULL) + 120; + user->nping = TIME + 120; if ((items) < cmdlist[i].min_params) { log(DEBUG,"process_command: not enough parameters: %s %s",user->nick,command); @@ -2909,6 +2886,8 @@ void process_command(userrec *user, char* cmd) { user->bytes_in += strlen(temp); user->cmds_in++; + user->bytes_out+=strlen(temp); + user->cmds_out++; } cmdlist[i].use_count++; cmdlist[i].total_bytes+=strlen(temp); @@ -2941,11 +2920,12 @@ void process_command(userrec *user, char* cmd) } -void createcommand(char* cmd, handlerfunc f, char flags, int minparams) +void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source) { command_t comm; /* create the command and push it onto the table */ strlcpy(comm.command,cmd,MAXBUF); + strlcpy(comm.source,source,MAXBUF); comm.handler_function = f; comm.flags_needed = flags; comm.min_params = minparams; @@ -2955,57 +2935,80 @@ void createcommand(char* cmd, handlerfunc f, char flags, int minparams) log(DEBUG,"Added command %s (%d parameters)",cmd,minparams); } +bool removecommands(const char* source) +{ + bool go_again = true; + while (go_again) + { + go_again = false; + for (std::deque::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) + { + if (!strcmp(i->source,source)) + { + log(DEBUG,"removecommands(%s) Removing dependent command: %s",i->source,i->command); + cmdlist.erase(i); + go_again = true; + break; + } + } + } + return true; +} + void SetupCommandTable(void) { - createcommand("USER",handle_user,0,4); - createcommand("NICK",handle_nick,0,1); - createcommand("QUIT",handle_quit,0,0); - createcommand("VERSION",handle_version,0,0); - createcommand("PING",handle_ping,0,1); - createcommand("PONG",handle_pong,0,1); - createcommand("ADMIN",handle_admin,0,0); - createcommand("PRIVMSG",handle_privmsg,0,2); - createcommand("INFO",handle_info,0,0); - createcommand("TIME",handle_time,0,0); - createcommand("WHOIS",handle_whois,0,1); - createcommand("WALLOPS",handle_wallops,'o',1); - createcommand("NOTICE",handle_notice,0,2); - createcommand("JOIN",handle_join,0,1); - createcommand("NAMES",handle_names,0,1); - createcommand("PART",handle_part,0,1); - createcommand("KICK",handle_kick,0,2); - createcommand("MODE",handle_mode,0,1); - createcommand("TOPIC",handle_topic,0,1); - createcommand("WHO",handle_who,0,1); - createcommand("MOTD",handle_motd,0,0); - createcommand("RULES",handle_rules,0,0); - createcommand("OPER",handle_oper,0,2); - createcommand("LIST",handle_list,0,0); - createcommand("DIE",handle_die,'o',1); - createcommand("RESTART",handle_restart,'o',1); - createcommand("KILL",handle_kill,'o',2); - createcommand("REHASH",handle_rehash,'o',0); - createcommand("LUSERS",handle_lusers,0,0); - createcommand("STATS",handle_stats,0,1); - createcommand("USERHOST",handle_userhost,0,1); - createcommand("AWAY",handle_away,0,0); - createcommand("ISON",handle_ison,0,0); - createcommand("SUMMON",handle_summon,0,0); - createcommand("USERS",handle_users,0,0); - createcommand("INVITE",handle_invite,0,2); - createcommand("PASS",handle_pass,0,1); - createcommand("TRACE",handle_trace,'o',0); - createcommand("WHOWAS",handle_whowas,0,1); - createcommand("CONNECT",handle_connect,'o',1); - createcommand("SQUIT",handle_squit,'o',0); - createcommand("MODULES",handle_modules,'o',0); - createcommand("LINKS",handle_links,0,0); - createcommand("MAP",handle_map,0,0); - createcommand("KLINE",handle_kline,'o',1); - createcommand("GLINE",handle_gline,'o',1); - createcommand("ZLINE",handle_zline,'o',1); - createcommand("QLINE",handle_qline,'o',1); - createcommand("SERVER",handle_server,0,0); + createcommand("USER",handle_user,0,4,""); + createcommand("NICK",handle_nick,0,1,""); + createcommand("QUIT",handle_quit,0,0,""); + createcommand("VERSION",handle_version,0,0,""); + createcommand("PING",handle_ping,0,1,""); + createcommand("PONG",handle_pong,0,1,""); + createcommand("ADMIN",handle_admin,0,0,""); + createcommand("PRIVMSG",handle_privmsg,0,2,""); + createcommand("INFO",handle_info,0,0,""); + createcommand("TIME",handle_time,0,0,""); + createcommand("WHOIS",handle_whois,0,1,""); + createcommand("WALLOPS",handle_wallops,'o',1,""); + createcommand("NOTICE",handle_notice,0,2,""); + createcommand("JOIN",handle_join,0,1,""); + createcommand("NAMES",handle_names,0,1,""); + createcommand("PART",handle_part,0,1,""); + createcommand("KICK",handle_kick,0,2,""); + createcommand("MODE",handle_mode,0,1,""); + createcommand("TOPIC",handle_topic,0,1,""); + createcommand("WHO",handle_who,0,1,""); + createcommand("MOTD",handle_motd,0,0,""); + createcommand("RULES",handle_rules,0,0,""); + createcommand("OPER",handle_oper,0,2,""); + createcommand("LIST",handle_list,0,0,""); + createcommand("DIE",handle_die,'o',1,""); + createcommand("RESTART",handle_restart,'o',1,""); + createcommand("KILL",handle_kill,'o',2,""); + createcommand("REHASH",handle_rehash,'o',0,""); + createcommand("LUSERS",handle_lusers,0,0,""); + createcommand("STATS",handle_stats,0,1,""); + createcommand("USERHOST",handle_userhost,0,1,""); + createcommand("AWAY",handle_away,0,0,""); + createcommand("ISON",handle_ison,0,0,""); + createcommand("SUMMON",handle_summon,0,0,""); + createcommand("USERS",handle_users,0,0,""); + createcommand("INVITE",handle_invite,0,2,""); + createcommand("PASS",handle_pass,0,1,""); + createcommand("TRACE",handle_trace,'o',0,""); + createcommand("WHOWAS",handle_whowas,0,1,""); + createcommand("CONNECT",handle_connect,'o',1,""); + createcommand("SQUIT",handle_squit,'o',0,""); + createcommand("MODULES",handle_modules,'o',0,""); + createcommand("LINKS",handle_links,0,0,""); + createcommand("MAP",handle_map,0,0,""); + createcommand("KLINE",handle_kline,'o',1,""); + createcommand("GLINE",handle_gline,'o',1,""); + createcommand("ZLINE",handle_zline,'o',1,""); + createcommand("QLINE",handle_qline,'o',1,""); + createcommand("ELINE",handle_eline,'o',1,""); + createcommand("LOADMODULE",handle_loadmodule,'o',1,""); + createcommand("UNLOADMODULE",handle_unloadmodule,'o',1,""); + createcommand("SERVER",handle_server,0,0,""); } void process_buffer(const char* cmdbuf,userrec *user) @@ -3066,7 +3069,7 @@ void DoSync(serverrec* serv, char* tcp_host) // 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,"Y %d",time(NULL)); + snprintf(data,MAXBUF,"Y %d",TIME); serv->SendPacket(data,tcp_host); // send users and channels for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) @@ -3139,7 +3142,7 @@ void DoSync(serverrec* serv, char* tcp_host) } } - snprintf(data,MAXBUF,"F %d",time(NULL)); + snprintf(data,MAXBUF,"F %d",TIME); serv->SendPacket(data,tcp_host); log(DEBUG,"Sent sync"); // ircd sends its serverlist after the end of sync here @@ -3253,19 +3256,118 @@ void RemoveServer(const char* name) int reap_counter = 0; +char MODERR[MAXBUF]; + +char* ModuleError() +{ + return MODERR; +} + +bool UnloadModule(const char* filename) +{ + for (int j = 0; j != module_names.size(); j++) + { + if (module_names[j] == std::string(filename)) + { + // found the module + log(DEBUG,"Deleting module..."); + delete factory[j]->factory; + log(DEBUG,"Deleting module factory..."); + delete factory[j]; + log(DEBUG,"Erasing module entry..."); + factory[j] = NULL; + // here we should locate ALL resources claimed by this module... and release them + // for example commands + log(DEBUG,"Erasing module vector..."); + for (std::vector::iterator t = factory.begin(); t != factory.end(); t++) + { + if (*t == NULL) + { + factory.erase(t); + break; + } + } + log(DEBUG,"Erasing module name vector..."); + for (std::vector::iterator v = module_names.begin(); v != module_names.end(); v++) + { + if (*v == std::string(filename)) + { + module_names.erase(v); + break; + } + } + log(DEBUG,"Removing dependent commands..."); + removecommands(filename); + log(DEFAULT,"Module %s unloaded",filename); + MODCOUNT--; + return true; + } + } + log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename); + snprintf(MODERR,MAXBUF,"Module not loaded"); + return false; +} + +bool LoadModule(const char* filename) +{ + char modfile[MAXBUF]; + snprintf(modfile,MAXBUF,"%s/%s",MOD_PATH,filename,&config_f); + log(DEBUG,"Loading module: %s",modfile); + if (FileExists(modfile)) + { + for (int j = 0; j < module_names.size(); j++) + { + if (module_names[j] == std::string(filename)) + { + log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); + snprintf(MODERR,MAXBUF,"Module already loaded"); + return false; + } + } + factory[MODCOUNT+1] = new ircd_module(modfile); + if (factory[MODCOUNT+1]->LastError()) + { + log(DEFAULT,"Unable to load %s: %s",modfile,factory[MODCOUNT+1]->LastError()); + snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError()); + MODCOUNT--; + return false; + } + if (factory[MODCOUNT+1]->factory) + { + modules[MODCOUNT+1] = factory[MODCOUNT+1]->factory->CreateModule(); + /* save the module and the module's classfactory, if + * this isnt done, random crashes can occur :/ */ + module_names.push_back(filename); + } + else + { + log(DEFAULT,"Unable to load %s",modfile); + snprintf(MODERR,MAXBUF,"Factory function failed!"); + return false; + } + } + else + { + log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile); + snprintf(MODERR,MAXBUF,"Module file could not be found"); + return false; + } + MODCOUNT++; + return true; +} int InspIRCd(void) { struct sockaddr_in client,server; char addrs[MAXBUF][255]; - int openSockfd[MAXSOCKS], incomingSockfd, result = TRUE; + int incomingSockfd, result = TRUE; socklen_t length; int count = 0; int selectResult = 0, selectResult2 = 0; char *temp, configToken[MAXBUF], stuff[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; char resolvedHost[MAXBUF]; fd_set selectFds; - struct timeval tv; + timeval tv; log_file = fopen("ircd.log","a+"); if (!log_file) @@ -3280,7 +3382,7 @@ int InspIRCd(void) { printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n"); Exit(ERROR); - log(DEBUG,"InspIRCd: startup: not starting with UID 0!"); + log(DEFAULT,"InspIRCd: startup: not starting with UID 0!"); } SetupCommandTable(); log(DEBUG,"InspIRCd: startup: default command table set up"); @@ -3289,6 +3391,7 @@ int InspIRCd(void) if (strcmp(DieValue,"")) { printf("WARNING: %s\n\n",DieValue); + log(DEFAULT,"Ut-Oh, somebody didn't read their config file: '%s'",DieValue); exit(0); } log(DEBUG,"InspIRCd: startup: read config"); @@ -3338,49 +3441,18 @@ int InspIRCd(void) printf("\n"); /* BugFix By Craig! :p */ - count = 0; + MODCOUNT = -1; for (count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++) { - char modfile[MAXBUF]; ConfValue("module","name",count2,configToken,&config_f); - snprintf(modfile,MAXBUF,"%s/%s",MOD_PATH,configToken,&config_f); - printf("Loading module... \033[1;37m%s\033[0;37m\n",modfile); - log(DEBUG,"InspIRCd: startup: Loading module: %s",modfile); - /* If The File Doesnt exist, Trying to load it - * Will Segfault the IRCd.. So, check to see if - * it Exists, Before Proceeding. */ - if (FileExists(modfile)) - { - factory[count] = new ircd_module(modfile); - if (factory[count]->LastError()) - { - log(DEBUG,"Unable to load %s: %s",modfile,factory[count]->LastError()); - printf("Unable to load %s: %s\nExiting...\n",modfile,factory[count]->LastError()); - Exit(ERROR); - } - if (factory[count]->factory) - { - modules[count] = factory[count]->factory->CreateModule(); - /* save the module and the module's classfactory, if - * this isnt done, random crashes can occur :/ */ - module_names.push_back(modfile); - } - else - { - log(DEBUG,"Unable to load %s",modfile); - printf("Unable to load %s\nExiting...\n",modfile); - Exit(ERROR); - } - /* Increase the Count */ - count++; - } - else + printf("Loading module... \033[1;37m%s\033[0;37m\n",configToken); + if (!LoadModule(configToken)) { - log(DEBUG,"InspIRCd: startup: Module Not Found %s",modfile); - printf("Module Not Found: \033[1;37m%s\033[0;37m, Skipping\n",modfile); + log(DEBUG,"Exiting due to a module loader error."); + printf("There was an error loading a module: %s\n",ModuleError()); + Exit(0); } } - MODCOUNT = count - 1; log(DEBUG,"Total loaded modules: %d",MODCOUNT+1); printf("\nInspIRCd is now running!\n"); @@ -3395,11 +3467,15 @@ int InspIRCd(void) { if (DaemonSeed() == ERROR) { - log(DEBUG,"InspIRCd: startup: can't daemonise"); + log(DEFAULT,"InspIRCd: startup: can't daemonise"); printf("ERROR: could not go into daemon mode. Shutting down.\n"); Exit(ERROR); } } + + char PID[MAXBUF]; + ConfValue("pid","file",0,PID,&config_f); + WritePID(PID); /* setup select call */ @@ -3416,7 +3492,7 @@ int InspIRCd(void) } if (BindSocket(openSockfd[boundPortCount],client,server,ports[count],addrs[count]) == ERROR) { - log(DEBUG,"InspIRCd: startup: failed to bind port %d",ports[count]); + log(DEFAULT,"InspIRCd: startup: failed to bind port %d",ports[count]); } else /* well we at least bound to one socket so we'll continue */ { @@ -3429,13 +3505,28 @@ int InspIRCd(void) /* if we didn't bind to anything then abort */ if (boundPortCount == 0) { - log(DEBUG,"InspIRCd: startup: no ports bound, bailing!"); + log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!"); return (ERROR); } length = sizeof (client); char udp_msg[MAXBUF], tcp_host[MAXBUF]; + + fd_set serverfds; + timeval tvs; + tvs.tv_usec = 7000L; + tvs.tv_sec = 0; + tv.tv_sec = 0; + tv.tv_usec = 7000L; + char data[10240]; + timeval tval; + fd_set sfd; + tval.tv_usec = 7000L; + tval.tv_sec = 0; + int total_in_this_set = 0; + int v = 0; + bool expire_run = false; /* main loop, this never returns */ for (;;) @@ -3443,23 +3534,24 @@ int InspIRCd(void) #ifdef _POSIX_PRIORITY_SCHEDULING sched_yield(); #endif - // update the status of klines, etc - expire_lines(); - - fd_set sfd; - timeval tval; + // poll dns queue + dns_poll(); FD_ZERO(&sfd); - // poll dns queue - dns_poll(); - - // handle pending connects - HandlePendingConnects(); + // we only read time() once per iteration rather than tons of times! + TIME = time(NULL); user_hash::iterator count2 = clientlist.begin(); // *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(); + expire_run = true; + } + if ((TIME % 5) == 1) + expire_run = false; if (reap_counter>300) { if (fd_reap.size() > 0) @@ -3477,9 +3569,7 @@ int InspIRCd(void) } reap_counter++; - fd_set serverfds; FD_ZERO(&serverfds); - timeval tvs; for (int x = 0; x != UDPportCount; x++) { @@ -3487,9 +3577,9 @@ int InspIRCd(void) FD_SET(me[x]->fd, &serverfds); } - tvs.tv_usec = 0; - tvs.tv_sec = 0; + // serverFds timevals went here + tvs.tv_usec = 7000L; int servresult = select(32767, &serverfds, NULL, NULL, &tvs); if (servresult > 0) { @@ -3500,14 +3590,17 @@ int InspIRCd(void) char remotehost[MAXBUF],resolved[MAXBUF]; length = sizeof (client); incomingSockfd = accept (me[x]->fd, (sockaddr *) &client, &length); - strlcpy(remotehost,(char *)inet_ntoa(client.sin_addr),MAXBUF); - if(CleanAndResolve(resolved, remotehost) != TRUE) + if (incomingSockfd != -1) { - strlcpy(resolved,remotehost,MAXBUF); + 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); } - // 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); } } } @@ -3550,15 +3643,13 @@ int InspIRCd(void) while (count2 != clientlist.end()) { - char data[10240]; - tval.tv_usec = tval.tv_sec = 0; FD_ZERO(&sfd); - int total_in_this_set = 0; + total_in_this_set = 0; user_hash::iterator xcount = count2; user_hash::iterator endingiter = count2; - if (!count2->second) break; + if (count2 == clientlist.end()) break; if (count2->second) if (count2->second->fd != 0) @@ -3579,13 +3670,24 @@ int InspIRCd(void) // registration timeout -- didnt send USER/NICK/HOST in the time specified in // their connection class. - if ((time(NULL) > count2->second->timeout) && (count2->second->registered != 7)) + if ((TIME > count2->second->timeout) && (count2->second->registered != 7)) { log(DEBUG,"InspIRCd: registration timeout: %s",count2->second->nick); kill_link(count2->second,"Registration timeout"); goto label; } - if (((time(NULL)) > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7)) + if ((TIME > count2->second->signon) && (count2->second->registered == 3)) + { + count2->second->dns_done = true; + FullConnectUser(count2->second); + goto label; + } + if ((count2->second->dns_done) && (count2->second->registered == 3)) // both NICK and USER... and DNS + { + FullConnectUser(count2->second); + goto label; + } + if ((TIME > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7)) { if ((!count2->second->lastping) && (count2->second->registered == 7)) { @@ -3596,7 +3698,7 @@ int InspIRCd(void) Write(count2->second->fd,"PING :%s",ServerName); log(DEBUG,"InspIRCd: pinging: %s",count2->second->nick); count2->second->lastping = 0; - count2->second->nping = time(NULL)+120; + count2->second->nping = TIME+120; } } count2++; @@ -3608,10 +3710,11 @@ int InspIRCd(void) endingiter = count2; count2 = xcount; // roll back to where we were - int v = 0; + v = 0; + + // tvals defined here - tval.tv_usec = 0; - tval.tv_sec = 0; + tval.tv_usec = 7000L; selectResult2 = select(65535, &sfd, NULL, NULL, &tval); // now loop through all of the items in this pool if any are waiting @@ -3626,14 +3729,11 @@ int InspIRCd(void) result = EAGAIN; if ((count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd))) { - log(DEBUG,"Reading fd %d",count2a->second->fd); memset(data, 0, 10240); result = read(count2a->second->fd, data, 10240); if (result) { - if (result > 0) - log(DEBUG,"Read %d characters from socket",result); userrec* current = count2a->second; int currfd = current->fd; char* l = strtok(data,"\n"); @@ -3732,7 +3832,7 @@ int InspIRCd(void) FD_SET (openSockfd[count], &selectFds); } - tv.tv_usec = 1; + tv.tv_usec = 7000L; selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv); /* select is reporting a waiting socket. Poll them all to find out which */