X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=5db288ffaa4745f9109f2216e19ad09f1fe64c5f;hb=e66fefe4310264f8f11b5035b174fc8cb9287149;hp=bf95d24c980fb0aef5ca6b62e9613b7ef54c54d2;hpb=85730cbc570b2671a45fc4e197c96e05a1d40288;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands.cpp b/src/commands.cpp index bf95d24c9..5db288ffa 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -16,25 +16,14 @@ using namespace std; +#include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" #include "inspircd_util.h" -#include "inspircd_config.h" #include #include #include #include - -#ifdef USE_KQUEUE -#include -#include -#include -#endif - -#ifdef USE_EPOLL -#include -#endif - #include #include #include @@ -50,103 +39,51 @@ using namespace std; #include #include #include +#ifdef THREADED_DNS +#include +#endif #ifndef RUSAGE_SELF #define RUSAGE_SELF 0 #define RUSAGE_CHILDREN -1 #endif -#include "connection.h" #include "users.h" -#include "servers.h" #include "ctables.h" #include "globals.h" #include "modules.h" #include "dynamic.h" #include "wildcard.h" #include "message.h" +#include "commands.h" #include "mode.h" #include "xline.h" #include "inspstring.h" #include "dnsqueue.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "socketengine.h" +#include "typedefs.h" -#ifdef USE_KQUEUE -extern int kq; -#endif - -#ifdef USE_EPOLL -int ep; -#endif +extern SocketEngine* SE; +extern ServerConfig* Config; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; - -extern int LogLevel; -extern char ServerName[MAXBUF]; -extern char Network[MAXBUF]; -extern char ServerDesc[MAXBUF]; -extern char AdminName[MAXBUF]; -extern char AdminEmail[MAXBUF]; -extern char AdminNick[MAXBUF]; -extern char diepass[MAXBUF]; -extern char restartpass[MAXBUF]; -extern char motd[MAXBUF]; -extern char rules[MAXBUF]; -extern char list[MAXBUF]; -extern char PrefixQuit[MAXBUF]; -extern char DieValue[MAXBUF]; - -extern int debugging; extern int WHOWAS_STALE; extern int WHOWAS_MAX; -extern int DieDelay; extern time_t startup_time; -extern int NetBufferSize; -extern int MaxWhoResults; -extern time_t nb_start; - -extern bool nofork; - extern time_t TIME; -extern std::vector module_names; - -extern char MyExecutable[1024]; -extern int boundPortCount; -extern int portCount; -extern int SERVERportCount; -extern int ports[MAXSOCKS]; -extern int defaultRoute; - -extern std::vector auth_cookies; -extern std::stringstream config_f; - -extern serverrec* me[32]; - -extern FILE *log_file; - -extern ClassVector Classes; - const long duration_m = 60; const long duration_h = duration_m * 60; const long duration_d = duration_h * 24; const long duration_w = duration_d * 7; const long duration_y = duration_w * 52; -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; - - extern user_hash clientlist; extern chan_hash chanlist; extern whowas_hash whowas; extern command_table cmdlist; -extern file_cache MOTD; -extern file_cache RULES; extern address_cache IP; extern std::vector all_opers; @@ -156,7 +93,7 @@ extern std::vector all_opers; // by an integer, meaning there is no need for a scan/search operation. extern userrec* fd_ref_table[65536]; -extern int statsAccept,statsRefused,statsUnknown,statsCollisions,statsDns,statsDnsGood,statsDnsBad,statsConnects,statsSent,statsRecv; +extern serverstats* stats; void handle_join(char **parameters, int pcnt, userrec *user) { @@ -189,7 +126,7 @@ void handle_part(char **parameters, int pcnt, userrec *user) void handle_commands(char **parameters, int pcnt, userrec *user) { - for (int i = 0; i < cmdlist.size(); i++) + for (unsigned int i = 0; i < cmdlist.size(); i++) { WriteServ(user->fd,"902 %s :%s %s %d",user->nick,cmdlist[i].command,cmdlist[i].source,cmdlist[i].min_params); } @@ -207,7 +144,7 @@ void handle_kick(char **parameters, int pcnt, userrec *user) return; } - if (!has_channel(user,Ptr)) + if ((!has_channel(user,Ptr)) && (!is_uline(user->server))) { WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, parameters[0]); return; @@ -231,10 +168,6 @@ void handle_kick(char **parameters, int pcnt, userrec *user) kick_channel(user,u,Ptr,reason); } - // this must be propogated so that channel membership is kept in step network-wide - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"k %s %s %s :%s",user->nick,u->nick,Ptr->name,reason); - NetSendToAll(buffer); } void handle_loadmodule(char **parameters, int pcnt, userrec *user) @@ -266,10 +199,10 @@ void handle_unloadmodule(char **parameters, int pcnt, userrec *user) void handle_die(char **parameters, int pcnt, userrec *user) { log(DEBUG,"die: %s",user->nick); - if (!strcmp(parameters[0],diepass)) + if (!strcmp(parameters[0],Config->diepass)) { WriteOpers("*** DIE command from %s!%s@%s, terminating...",user->nick,user->ident,user->host); - sleep(DieDelay); + sleep(Config->DieDelay); Exit(ERROR); } else @@ -282,13 +215,13 @@ void handle_restart(char **parameters, int pcnt, userrec *user) { char *argv[32]; log(DEFAULT,"Restart: %s",user->nick); - if (!strcmp(parameters[0],restartpass)) + if (!strcmp(parameters[0],Config->restartpass)) { WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host); - argv[0] = MyExecutable; + argv[0] = Config->MyExecutable; argv[1] = "-wait"; - if (nofork) + if (Config->nofork) { argv[2] = "-nofork"; } @@ -308,7 +241,7 @@ void handle_restart(char **parameters, int pcnt, userrec *user) } sleep(2); - execv(MyExecutable,argv); + execv(Config->MyExecutable,argv); exit(0); } @@ -334,16 +267,14 @@ void handle_kill(char **parameters, int pcnt, userrec *user) return; } - if (strcmp(ServerName,u->server)) + if (u->fd < 0) { // remote kill WriteOpers("*** Remote kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]); - snprintf(killreason,MAXBUF,"[%s] Killed (%s (%s))",ServerName,user->nick,parameters[1]); + snprintf(killreason,MAXBUF,"[%s] Killed (%s (%s))",Config->ServerName,user->nick,parameters[1]); WriteCommonExcept(u,"QUIT :%s",killreason); - // K token must go to ALL servers!!! - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"K %s %s :%s",user->nick,u->nick,killreason); - NetSendToAll(buffer); + + FOREACH_MOD OnRemoteKill(user,u,killreason); user_hash::iterator iter = clientlist.find(u->nick); if (iter != clientlist.end()) @@ -362,8 +293,8 @@ void handle_kill(char **parameters, int pcnt, userrec *user) else { // local kill - log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerName,user->dhost,user->nick,parameters[1]); - WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerName,user->dhost,user->nick,parameters[1]); + log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, Config->ServerName,user->dhost,user->nick,parameters[1]); + WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, Config->ServerName,user->dhost,user->nick,parameters[1]); WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]); snprintf(killreason,MAXBUF,"Killed (%s (%s))",user->nick,parameters[1]); kill_link(u,killreason); @@ -452,11 +383,7 @@ void handle_invite(char **parameters, int pcnt, userrec *user) u->InviteTo(c->name); WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name); WriteServ(user->fd,"341 %s %s %s",user->nick,u->nick,c->name); - - // i token must go to ALL servers!!! - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"i %s %s %s",u->nick,user->nick,c->name); - NetSendToAll(buffer); + FOREACH_MOD OnUserInvite(user,u,c); } else { @@ -486,7 +413,7 @@ void handle_topic(char **parameters, int pcnt, userrec *user) { if (((Ptr) && (!has_channel(user,Ptr))) && (Ptr->binarymodes & CM_SECRET)) { - WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name); + WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, Ptr->name); return; } if (Ptr->topicset) @@ -531,7 +458,7 @@ void handle_topic(char **parameters, int pcnt, userrec *user) topic[MAXTOPIC] = '\0'; } - if (!strcasecmp(user->server,ServerName)) + if (user->fd > -1) { int MOD_RESULT = 0; FOREACH_RESULT(OnLocalTopicChange(user,Ptr,topic)); @@ -539,15 +466,14 @@ void handle_topic(char **parameters, int pcnt, userrec *user) return; } - strlcpy(Ptr->topic,topic,MAXBUF); + strlcpy(Ptr->topic,topic,MAXTOPIC); strlcpy(Ptr->setby,user->nick,NICKMAX); Ptr->topicset = TIME; WriteChannel(Ptr,user,"TOPIC %s :%s",Ptr->name, Ptr->topic); - - // t token must go to ALL servers!!! - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"t %s %s :%s",user->nick,Ptr->name,topic); - NetSendToAll(buffer); + if (user->fd > -1) + { + FOREACH_MOD OnPostLocalTopicChange(user,Ptr,topic); + } } else { @@ -574,7 +500,7 @@ void handle_names(char **parameters, int pcnt, userrec *user) { if (((c) && (!has_channel(user,c))) && (c->binarymodes & CM_SECRET)) { - WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name); + WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, c->name); return; } userlist(user,c); @@ -595,7 +521,18 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user) if (loop_call(handle_privmsg,parameters,pcnt,user,0,pcnt-2,0)) return; - if (parameters[0][0] == '#') + if (parameters[0][0] == '$') + { + // notice to server mask + char* servermask = parameters[0]; + servermask++; + if (match(Config->ServerName,servermask)) + { + ServerPrivmsgAll("%s",parameters[1]); + } + return; + } + else if (parameters[0][0] == '#') { chan = FindChan(parameters[0]); if (chan) @@ -627,11 +564,7 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user) } ChanExceptSender(chan, user, "PRIVMSG %s :%s", chan->name, parameters[1]); - - // if any users of this channel are on remote servers, broadcast the packet - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,chan->name,parameters[1]); - NetSendToCommon(user,buffer); + FOREACH_MOD OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1]); } else { @@ -640,7 +573,7 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user) } return; } - + dest = Find(parameters[0]); if (dest) { @@ -659,19 +592,13 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user) } parameters[1] = (char*)temp.c_str(); - - - if (!strcmp(dest->server,user->server)) + if (dest->fd > -1) { // direct write, same server WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]); } - else - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,dest->nick,parameters[1]); - NetSendToOne(dest->server,buffer); - } + + FOREACH_MOD OnUserMessage(user,dest,TYPE_USER,parameters[1]); } else { @@ -689,7 +616,18 @@ void handle_notice(char **parameters, int pcnt, userrec *user) if (loop_call(handle_notice,parameters,pcnt,user,0,pcnt-2,0)) return; - if (parameters[0][0] == '#') + if (parameters[0][0] == '$') + { + // notice to server mask + char* servermask = parameters[0]; + servermask++; + if (match(Config->ServerName,servermask)) + { + NoticeAll(user, true, "%s",parameters[1]); + } + return; + } + else if (parameters[0][0] == '#') { chan = FindChan(parameters[0]); if (chan) @@ -722,10 +660,7 @@ void handle_notice(char **parameters, int pcnt, userrec *user) ChanExceptSender(chan, user, "NOTICE %s :%s", chan->name, parameters[1]); - // if any users of this channel are on remote servers, broadcast the packet - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,chan->name,parameters[1]); - NetSendToCommon(user,buffer); + FOREACH_MOD OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1]); } else { @@ -747,17 +682,13 @@ void handle_notice(char **parameters, int pcnt, userrec *user) } parameters[1] = (char*)temp.c_str(); - if (!strcmp(dest->server,user->server)) + if (dest->fd > -1) { // direct write, same server WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]); } - else - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,dest->nick,parameters[1]); - NetSendToOne(dest->server,buffer); - } + + FOREACH_MOD OnUserNotice(user,dest,TYPE_USER,parameters[1]); } else { @@ -785,6 +716,7 @@ void handle_info(char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"371 %s : Jazza",user->nick); WriteServ(user->fd,"371 %s : ",user->nick); WriteServ(user->fd,"371 %s :Testers: CC",user->nick); + WriteServ(user->fd,"371 %s : Om",user->nick); WriteServ(user->fd,"371 %s : Piggles",user->nick); WriteServ(user->fd,"371 %s : Foamy",user->nick); WriteServ(user->fd,"371 %s : Hart",user->nick); @@ -800,6 +732,7 @@ void handle_info(char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"371 %s : Rob",user->nick); WriteServ(user->fd,"371 %s : angelic",user->nick); WriteServ(user->fd,"371 %s : Jason",user->nick); + WriteServ(user->fd,"371 %s : ThaPrince",user->nick); WriteServ(user->fd,"371 %s : ",user->nick); WriteServ(user->fd,"371 %s :Thanks to irc-junkie and searchirc",user->nick); WriteServ(user->fd,"371 %s :for the nice comments and the help",user->nick); @@ -816,64 +749,109 @@ void handle_time(char **parameters, int pcnt, userrec *user) time_t rawtime; struct tm * timeinfo; - time ( &rawtime ); - timeinfo = localtime ( &rawtime ); - WriteServ(user->fd,"391 %s %s :%s",user->nick,ServerName, asctime (timeinfo) ); + time(&rawtime); + timeinfo = localtime(&rawtime); + WriteServ(user->fd,"391 %s %s :%s",user->nick,Config->ServerName,asctime(timeinfo)); } void handle_whois(char **parameters, int pcnt, userrec *user) { userrec *dest; - - if (loop_call(handle_whois,parameters,pcnt,user,0,pcnt-1,0)) - return; + if (loop_call(handle_whois,parameters,pcnt,user,0,pcnt-1,0)) + return; dest = Find(parameters[0]); if (dest) { - // bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER - if (dest->registered == 7) + do_whois(user,dest,0,0,parameters[0]); + } + else + { + /* no such nick/channel */ + WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); + WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[0]); + } +} + +void split_chlist(userrec* user, userrec* dest, std::string &cl) +{ + std::stringstream channels(cl); + std::string line = ""; + std::string cname = ""; + while (!channels.eof()) + { + channels >> cname; + line = line + cname + " "; + if (line.length() > 400) + { + WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, line.c_str()); + line = ""; + } + } + if (line.length()) + { + WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, line.c_str()); + } +} + +void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long idle, char* nick) +{ + // bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER + if (dest->registered == 7) + { + WriteServ(user->fd,"311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname); + if ((user == dest) || (strchr(user->modes,'o'))) { - WriteServ(user->fd,"311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname); - if ((user == dest) || (strchr(user->modes,'o'))) + WriteServ(user->fd,"378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->ip); + } + std::string cl = chlist(dest,user); + if (cl.length()) + { + if (cl.length() > 400) { - WriteServ(user->fd,"378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->ip); + split_chlist(user,dest,cl); } - char* cl = chlist(dest,user); - if (strcmp(cl,"")) + else { - WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, cl); + WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, cl.c_str()); } - WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str()); - if (strcmp(dest->awaymsg,"")) + } + WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str()); + if (*dest->awaymsg) + { + WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg); + } + if (strchr(dest->modes,'o')) + { + if (*dest->oper) { - WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg); + WriteServ(user->fd,"313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("aeiou",dest->oper[0]) ? "an" : "a"),dest->oper, Config->Network); } - if ((strchr(dest->modes,'o')) && (strcmp(dest->oper,""))) + else { - WriteServ(user->fd,"313 %s %s :is %s %s on %s",user->nick, dest->nick, - (strchr("aeiou",dest->oper[0]) ? "an" : "a"),dest->oper, Network); + WriteServ(user->fd,"313 %s %s :is opered but has an unknown type",user->nick, dest->nick); } + } + if ((!signon) && (!idle)) + { FOREACH_MOD OnWhois(user,dest); - if (!strcasecmp(user->server,dest->server)) - { - // idle time and signon line can only be sent if youre on the same server (according to RFC) - WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon); - } - - WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick); + } + if (!strcasecmp(user->server,dest->server)) + { + // idle time and signon line can only be sent if youre on the same server (according to RFC) + WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon); } else { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); - WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[0]); + if ((idle) || (signon)) + WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon); } + WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick); } else { - /* no such nick/channel */ - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); - WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[0]); + WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, nick); + WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, nick); } } @@ -898,25 +876,31 @@ void handle_quit(char **parameters, int pcnt, userrec *user) reason[MAXQUIT-1] = '\0'; } - Write(user->fd,"ERROR :Closing link (%s@%s) [%s%s]",user->ident,user->host,PrefixQuit,parameters[0]); - WriteOpers("*** Client exiting: %s!%s@%s [%s%s]",user->nick,user->ident,user->host,PrefixQuit,parameters[0]); - WriteCommonExcept(user,"QUIT :%s%s",PrefixQuit,parameters[0]); + /* We should only prefix the quit for a local user. Remote users have + * already been prefixed, where neccessary, by the upstream server. + */ + if (user->fd > -1) + { + Write(user->fd,"ERROR :Closing link (%s@%s) [%s%s]",user->ident,user->host,Config->PrefixQuit,parameters[0]); + WriteOpers("*** Client exiting: %s!%s@%s [%s%s]",user->nick,user->ident,user->host,Config->PrefixQuit,parameters[0]); + WriteCommonExcept(user,"QUIT :%s%s",Config->PrefixQuit,parameters[0]); + } + else + { + WriteOpers("*** Client exiting at %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]); + WriteCommonExcept(user,"QUIT :%s",parameters[0]); + } + FOREACH_MOD OnUserQuit(user,std::string(Config->PrefixQuit)+std::string(parameters[0])); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"Q %s :%s%s",user->nick,PrefixQuit,parameters[0]); - NetSendToAll(buffer); } else { Write(user->fd,"ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host); WriteOpers("*** Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host); WriteCommonExcept(user,"QUIT :Client exited"); + FOREACH_MOD OnUserQuit(user,"Client exited"); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"Q %s :Client exited",user->nick); - NetSendToAll(buffer); } - FOREACH_MOD OnUserQuit(user); AddWhoWas(user); } @@ -925,25 +909,7 @@ void handle_quit(char **parameters, int pcnt, userrec *user) /* push the socket on a stack of sockets due to be closed at the next opportunity */ if (user->fd > -1) { -#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 + SE->DelFd(user->fd); user->CloseSocket(); } @@ -970,7 +936,7 @@ void handle_who(char **parameters, int pcnt, userrec *user) { if ((!strcmp(parameters[0],"0")) || (!strcmp(parameters[0],"*"))) { - if (user->chans[0].channel) + if ((user->chans.size()) && (user->chans[0].channel)) { int n_list = 0; for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) @@ -989,7 +955,7 @@ void handle_who(char **parameters, int pcnt, userrec *user) if (strchr(i->second->modes,'o')) { strlcat(tmp, "*", 9); } WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr ? Ptr->name : "*", i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname); n_list++; - if (n_list > MaxWhoResults) + if (n_list > Config->MaxWhoResults) { WriteServ(user->fd,"523 %s WHO :Command aborted: More results than configured limit",user->nick); break; @@ -1028,7 +994,7 @@ void handle_who(char **parameters, int pcnt, userrec *user) strlcat(tmp, cmode(i->second, Ptr),5); WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname); n_list++; - if (n_list > MaxWhoResults) + if (n_list > Config->MaxWhoResults) { WriteServ(user->fd,"523 %s WHO :Command aborted: More results than configured limit",user->nick); break; @@ -1056,7 +1022,7 @@ void handle_who(char **parameters, int pcnt, userrec *user) strlcat(tmp, "H" ,9); } if (strchr(u->modes,'o')) { strlcat(tmp, "*" ,9); } - WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, u->chans[0].channel ? u->chans[0].channel->name + WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, u->chans.size() ? u->chans[0].channel->name : "*", u->ident, u->dhost, u->server, u->nick, tmp, u->fullname); } WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]); @@ -1077,7 +1043,7 @@ void handle_who(char **parameters, int pcnt, userrec *user) } else { strlcat(tmp, "H" ,9); } - WriteServ(user->fd,"352 %s %s %s %s %s %s %s* :0 %s", user->nick, oper->chans[0].channel ? oper->chans[0].channel->name + WriteServ(user->fd,"352 %s %s %s %s %s %s %s* :0 %s", user->nick, oper->chans.size() ? oper->chans[0].channel->name : "*", oper->ident, oper->dhost, oper->server, oper->nick, tmp, oper->fullname); } WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]); @@ -1089,6 +1055,7 @@ void handle_who(char **parameters, int pcnt, userrec *user) void handle_wallops(char **parameters, int pcnt, userrec *user) { WriteWallOps(user,false,"%s",parameters[0]); + FOREACH_MOD OnWallops(user,parameters[0]); } void handle_list(char **parameters, int pcnt, userrec *user) @@ -1109,31 +1076,41 @@ void handle_list(char **parameters, int pcnt, userrec *user) void handle_rehash(char **parameters, int pcnt, userrec *user) { WriteServ(user->fd,"382 %s %s :Rehashing",user->nick,CleanFilename(CONFIG_FILE)); - ReadConfig(false,user); - FOREACH_MOD OnRehash(); - WriteOpers("%s is rehashing config file %s",user->nick,CleanFilename(CONFIG_FILE)); + std::string parameter = ""; + if (pcnt) + { + parameter = parameters[0]; + } + else + { + WriteOpers("%s is rehashing config file %s",user->nick,CleanFilename(CONFIG_FILE)); + Config->Read(false,user); + } + FOREACH_MOD OnRehash(parameter); } void handle_lusers(char **parameters, int pcnt, userrec *user) { - WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,usercnt()-usercount_invisible(),usercount_invisible(),servercount()); + // this lusers command shows one server at all times because + // a protocol module must override it to show those stats. + WriteServ(user->fd,"251 %s :There are %d users and %d invisible on 1 server",user->nick,usercnt()-usercount_invisible(),usercount_invisible()); WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers()); WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown()); WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount()); - WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),count_servs()); + WriteServ(user->fd,"254 %s :I have %d clients and 0 servers",user->nick,local_count()); } void handle_admin(char **parameters, int pcnt, userrec *user) { - WriteServ(user->fd,"256 %s :Administrative info for %s",user->nick,ServerName); - WriteServ(user->fd,"257 %s :Name - %s",user->nick,AdminName); - WriteServ(user->fd,"258 %s :Nickname - %s",user->nick,AdminNick); - WriteServ(user->fd,"258 %s :E-Mail - %s",user->nick,AdminEmail); + WriteServ(user->fd,"256 %s :Administrative info for %s",user->nick,Config->ServerName); + WriteServ(user->fd,"257 %s :Name - %s",user->nick,Config->AdminName); + WriteServ(user->fd,"258 %s :Nickname - %s",user->nick,Config->AdminNick); + WriteServ(user->fd,"258 %s :E-Mail - %s",user->nick,Config->AdminEmail); } void handle_ping(char **parameters, int pcnt, userrec *user) { - WriteServ(user->fd,"PONG %s :%s",ServerName,parameters[0]); + WriteServ(user->fd,"PONG %s :%s",Config->ServerName,parameters[0]); } void handle_pong(char **parameters, int pcnt, userrec *user) @@ -1162,9 +1139,12 @@ void handle_user(char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"461 %s USER :Not enough parameters",user->nick); } else { - strcpy(user->ident,"~"); /* we arent checking ident... but these days why bother anyway? */ - strlcat(user->ident,parameters[0],IDENTMAX); - strlcpy(user->fullname,parameters[3],128); + /* We're not checking ident, but I'm not sure I like the idea of '~' prefixing.. */ + /* XXX - Should this IDENTMAX + 1 be IDENTMAX - 1? Ok, users.h has it defined as + * char ident[IDENTMAX+2]; - WTF? + */ + snprintf(user->ident, IDENTMAX+1, "~%s", parameters[0]); + strlcpy(user->fullname,parameters[3],MAXGECOS); user->registered = (user->registered | 1); } } @@ -1228,12 +1208,12 @@ void handle_away(char **parameters, int pcnt, userrec *user) { if (pcnt) { - strlcpy(user->awaymsg,parameters[0],512); + strlcpy(user->awaymsg,parameters[0],MAXAWAY); WriteServ(user->fd,"306 %s :You have been marked as being away",user->nick); } else { - strlcpy(user->awaymsg,"",512); + strlcpy(user->awaymsg,"",MAXAWAY); WriteServ(user->fd,"305 %s :You are no longer marked as being away",user->nick); } } @@ -1291,7 +1271,7 @@ void handle_trace(char **parameters, int pcnt, userrec *user) void handle_modules(char **parameters, int pcnt, userrec *user) { - for (int i = 0; i < module_names.size(); i++) + for (unsigned int i = 0; i < Config->module_names.size(); i++) { Version V = modules[i]->GetVersion(); char modulename[MAXBUF]; @@ -1307,7 +1287,7 @@ void handle_modules(char **parameters, int pcnt, userrec *user) strlcat(flagstate,", service provider",MAXBUF); if (!flagstate[0]) strcpy(flagstate," "); - strlcpy(modulename,module_names[i].c_str(),256); + strlcpy(modulename,Config->module_names[i].c_str(),256); if (strchr(user->modes,'o')) { WriteServ(user->fd,"900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,modules[i],V.Major,V.Minor,V.Revision,V.Build,CleanFilename(modulename),flagstate+2); @@ -1322,7 +1302,6 @@ void handle_modules(char **parameters, int pcnt, userrec *user) void handle_stats(char **parameters, int pcnt, userrec *user) { - char Link_ServerName[MAXBUF],Link_IPAddr[MAXBUF],Link_Port[MAXBUF]; if (pcnt != 1) { return; @@ -1338,22 +1317,15 @@ void handle_stats(char **parameters, int pcnt, userrec *user) if (*parameters[0] == 'c') { - for (int i = 0; i < ConfValueEnum("link",&config_f); i++) - { - ConfValue("link","name",i,Link_ServerName,&config_f); - ConfValue("link","ipaddr",i,Link_IPAddr,&config_f); - ConfValue("link","port",i,Link_Port,&config_f); - WriteServ(user->fd,"213 %s C *@%s * %s %s 0 M",user->nick,Link_IPAddr,Link_ServerName,Link_Port); - WriteServ(user->fd,"244 %s H * * %s",user->nick,Link_ServerName); - } + /* This stats symbol must be handled by a linking module */ } if (*parameters[0] == 'i') { int idx = 0; - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) + for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) { - WriteServ(user->fd,"215 %s I * * * %d %d %s *",user->nick,MAXCLIENTS,idx,ServerName); + WriteServ(user->fd,"215 %s I * * * %d %d %s *",user->nick,MAXCLIENTS,idx,Config->ServerName); idx++; } } @@ -1361,7 +1333,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user) if (*parameters[0] == 'y') { int idx = 0; - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) + for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) { WriteServ(user->fd,"218 %s Y %d %d 0 %d %d",user->nick,idx,120,i->flood,i->registration_timeout); idx++; @@ -1370,10 +1342,11 @@ void handle_stats(char **parameters, int pcnt, userrec *user) if (*parameters[0] == 'U') { - for (int i = 0; i < ConfValueEnum("uline",&config_f); i++) + char ulined[MAXBUF]; + for (int i = 0; i < Config->ConfValueEnum("uline",&Config->config_f); i++) { - ConfValue("uline","server",i,Link_ServerName,&config_f); - WriteServ(user->fd,"248 %s U %s",user->nick,Link_ServerName); + Config->ConfValue("uline","server",i,ulined,&Config->config_f); + WriteServ(user->fd,"248 %s U %s",user->nick,ulined); } } @@ -1389,7 +1362,6 @@ void handle_stats(char **parameters, int pcnt, userrec *user) } } WriteServ(user->fd,"249 %s :%d OPER(s)",user->nick,idx); - //249 [Brain] :bwoadway-monitor (~wgmon@204.152.186.58) Idle: 18 } if (*parameters[0] == 'k') @@ -1420,7 +1392,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user) /* stats m (list number of times each command has been used, plus bytecount) */ if (*parameters[0] == 'm') { - for (int i = 0; i < cmdlist.size(); i++) + for (unsigned int i = 0; i < cmdlist.size(); i++) { if (cmdlist[i].handler_function) { @@ -1441,7 +1413,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"249 %s :Users(HASH_MAP) %d (%d bytes, %d buckets)",user->nick,clientlist.size(),clientlist.size()*sizeof(userrec),clientlist.bucket_count()); WriteServ(user->fd,"249 %s :Channels(HASH_MAP) %d (%d bytes, %d buckets)",user->nick,chanlist.size(),chanlist.size()*sizeof(chanrec),chanlist.bucket_count()); WriteServ(user->fd,"249 %s :Commands(VECTOR) %d (%d bytes)",user->nick,cmdlist.size(),cmdlist.size()*sizeof(command_t)); - WriteServ(user->fd,"249 %s :MOTD(VECTOR) %d, RULES(VECTOR) %d",user->nick,MOTD.size(),RULES.size()); + WriteServ(user->fd,"249 %s :MOTD(VECTOR) %d, RULES(VECTOR) %d",user->nick,Config->MOTD.size(),Config->RULES.size()); WriteServ(user->fd,"249 %s :address_cache(HASH_MAP) %d (%d buckets)",user->nick,IP.size(),IP.bucket_count()); WriteServ(user->fd,"249 %s :Modules(VECTOR) %d (%d)",user->nick,modules.size(),modules.size()*sizeof(Module)); WriteServ(user->fd,"249 %s :ClassFactories(VECTOR) %d (%d)",user->nick,factory.size(),factory.size()*sizeof(ircd_module)); @@ -1458,25 +1430,25 @@ void handle_stats(char **parameters, int pcnt, userrec *user) if (*parameters[0] == 'T') { - WriteServ(user->fd,"249 Brain :accepts %d refused %d",statsAccept,statsRefused); - WriteServ(user->fd,"249 Brain :unknown commands %d",statsUnknown); - WriteServ(user->fd,"249 Brain :nick collisions %d",statsCollisions); - WriteServ(user->fd,"249 Brain :dns requests %d succeeded %d failed %d",statsDns,statsDnsGood,statsDnsBad); - WriteServ(user->fd,"249 Brain :connections %d",statsConnects); - WriteServ(user->fd,"249 Brain :bytes sent %dK recv %dK",(statsSent / 1024),(statsRecv / 1024)); + WriteServ(user->fd,"249 Brain :accepts %d refused %d",stats->statsAccept,stats->statsRefused); + WriteServ(user->fd,"249 Brain :unknown commands %d",stats->statsUnknown); + WriteServ(user->fd,"249 Brain :nick collisions %d",stats->statsCollisions); + WriteServ(user->fd,"249 Brain :dns requests %d succeeded %d failed %d",stats->statsDns,stats->statsDnsGood,stats->statsDnsBad); + WriteServ(user->fd,"249 Brain :connections %d",stats->statsConnects); + WriteServ(user->fd,"249 Brain :bytes sent %dK recv %dK",(stats->statsSent / 1024),(stats->statsRecv / 1024)); } /* stats o */ if (*parameters[0] == 'o') { - for (int i = 0; i < ConfValueEnum("oper",&config_f); i++) + for (int i = 0; i < Config->ConfValueEnum("oper",&Config->config_f); i++) { char LoginName[MAXBUF]; char HostName[MAXBUF]; char OperType[MAXBUF]; - ConfValue("oper","name",i,LoginName,&config_f); - ConfValue("oper","host",i,HostName,&config_f); - ConfValue("oper","type",i,OperType,&config_f); + Config->ConfValue("oper","name",i,LoginName,&Config->config_f); + Config->ConfValue("oper","host",i,HostName,&Config->config_f); + Config->ConfValue("oper","type",i,OperType,&Config->config_f); WriteServ(user->fd,"243 %s O %s * %s %s 0",user->nick,HostName,LoginName,OperType); } } @@ -1525,175 +1497,41 @@ void handle_stats(char **parameters, int pcnt, userrec *user) } -void ConnectServer(char* servermask,userrec* user) -{ - char Link_ServerName[1024]; - char Link_IPAddr[1024]; - char Link_Port[1024]; - char Link_Pass[1024]; - int LinkPort; - bool found = false; - - for (int i = 0; i < ConfValueEnum("link",&config_f); i++) - { - if (!found) - { - ConfValue("link","name",i,Link_ServerName,&config_f); - ConfValue("link","ipaddr",i,Link_IPAddr,&config_f); - ConfValue("link","port",i,Link_Port,&config_f); - ConfValue("link","sendpass",i,Link_Pass,&config_f); - LinkPort = atoi(Link_Port); - if (match(Link_ServerName,servermask)) { - found = true; - break; - } - } - } - - if (!found) { - if (user) - WriteServ(user->fd,"NOTICE %s :*** Failed to connect to %s: No servers matching this pattern are configured for linking.",user->nick,servermask); - return; - } - - if (user) - { - WriteServ(user->fd,"NOTICE %s :*** Connecting to %s (%s) port %s...",user->nick,Link_ServerName,Link_IPAddr,Link_Port); - } - else WriteOpers("*** Autoconnecting to %s (%s) port %s...",Link_ServerName,Link_IPAddr,Link_Port); - - if (me[defaultRoute]) - { - me[defaultRoute]->BeginLink(Link_IPAddr,LinkPort,Link_Pass,Link_ServerName,me[defaultRoute]->port); - return; - } - else - { - if (user) - WriteServ(user->fd,"NOTICE %s :No default route is defined for server connections on this server. You must define a server connection to be default route so that sockets can be bound to it.",user->nick); - } -} - - void handle_connect(char **parameters, int pcnt, userrec *user) { - ConnectServer(parameters[0],user); } void handle_squit(char **parameters, int pcnt, userrec *user) { - // send out an squit across the mesh and then clear the server list (for local squit) - if (!pcnt) - { - WriteOpers("SQUIT command issued by %s",user->nick); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"& %s",ServerName); - NetSendToAll(buffer); - DoSplitEveryone(); - } - else - { - if (!strcasecmp("*",parameters[0])) - { - WriteServ(user->fd,"NOTICE %s :*** You cannot issue an SQUIT this wide! If this is REALLY what you want, use a less wide mask.",user->nick); - WriteOpers("*** WARNING! %s tried to SQUIT all servers at once!",user->nick); - return; - } - if (!strcasecmp(ServerName,parameters[0])) - { - WriteServ(user->fd,"NOTICE %s :*** To take the local server out of the mesh, just use /SQUIT with no parameters instead.",user->nick); - return; - } - bool have_this_server = true; - int n_count = 0; - std::string server_to_squit = ""; - while (have_this_server) - { - have_this_server = 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 a valid ircd_connector. - have_this_server = true; - server_to_squit = me[j]->connectors[x].GetServerName().c_str(); - break; - } - } - } - } - if (have_this_server) - { - WriteOpers("SQUIT command issued by %s to remove %s from the mesh",user->nick,server_to_squit.c_str()); - WriteServ(user->fd,"NOTICE %s :*** Removing remote server %s.",user->nick,server_to_squit.c_str()); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"& %s",server_to_squit.c_str()); - NetSendToAll(buffer); - DoSplit(server_to_squit.c_str()); - n_count++; - } - } - if (!n_count) - { - WriteServ(user->fd,"402 %s %s :Your pattern did not match any servers.",user->nick,parameters[0]); - } - } } void handle_links(char **parameters, int pcnt, userrec *user) { - WriteServ(user->fd,"364 %s %s %s :0 %s",user->nick,ServerName,ServerName,ServerDesc); - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - WriteServ(user->fd,"364 %s %s %s :1 %s",user->nick,me[j]->connectors[k].GetServerName().c_str(),ServerName,me[j]->connectors[k].GetDescription().c_str()); - } - } - } + WriteServ(user->fd,"364 %s %s %s :0 %s",user->nick,Config->ServerName,Config->ServerName,Config->ServerDesc); WriteServ(user->fd,"365 %s * :End of /LINKS list.",user->nick); } void handle_map(char **parameters, int pcnt, userrec *user) { - char line[MAXBUF]; - snprintf(line,MAXBUF,"006 %s :%s",user->nick,ServerName); - while (strlen(line) < 50) - strcat(line," "); - WriteServ(user->fd,"%s%d (%.2f%%)",line,local_count(),(float)(((float)local_count()/(float)registered_usercount())*100)); - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - int state = me[j]->connectors[k].GetState(); - snprintf(line,MAXBUF,"006 %s :%c%s%s",user->nick,islast(me[j]->connectors[k].GetServerName().c_str()),state == STATE_NOAUTH_INBOUND || state == STATE_NOAUTH_OUTBOUND ? "-*" : "--", me[j]->connectors[k].GetServerName().c_str()); - while (strlen(line) < 50) - strcat(line," "); - WriteServ(user->fd,"%s%d (%.2f%%)",line,map_count(me[j]->connectors[k].GetServerName().c_str()),(float)(((float)map_count(me[j]->connectors[k].GetServerName().c_str())/(float)registered_usercount())*100)); - } - } - } + // as with /LUSERS this does nothing without a linking + // module to override its behaviour and display something + // better. + WriteServ(user->fd,"006 %s :%s",user->nick,Config->ServerName); WriteServ(user->fd,"007 %s :End of /MAP",user->nick); } bool is_uline(const char* server) { + char ServName[MAXBUF]; + if (!server) return false; if (!(*server)) return true; - char ServName[MAXBUF]; - for (int i = 0; i < ConfValueEnum("uline",&config_f); i++) + + for (int i = 0; i < Config->ConfValueEnum("uline",&Config->config_f); i++) { - ConfValue("uline","server",i,ServName,&config_f); + Config->ConfValue("uline","server",i,ServName,&Config->config_f); if (!strcasecmp(server,ServName)) { return true; @@ -1725,29 +1563,26 @@ void handle_oper(char **parameters, int pcnt, userrec *user) int j; bool found = false; bool fail2 = false; - char global[MAXBUF]; snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host); - for (int i = 0; i < ConfValueEnum("oper",&config_f); i++) + for (int i = 0; i < Config->ConfValueEnum("oper",&Config->config_f); i++) { - ConfValue("oper","name",i,LoginName,&config_f); - ConfValue("oper","password",i,Password,&config_f); - ConfValue("oper","type",i,OperType,&config_f); - ConfValue("oper","host",i,HostName,&config_f); + Config->ConfValue("oper","name",i,LoginName,&Config->config_f); + Config->ConfValue("oper","password",i,Password,&Config->config_f); + Config->ConfValue("oper","type",i,OperType,&Config->config_f); + Config->ConfValue("oper","host",i,HostName,&Config->config_f); if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (match(TheHost,HostName))) { fail2 = true; - for (j =0; j < ConfValueEnum("type",&config_f); j++) + for (j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++) { - ConfValue("type","name",j,TypeName,&config_f); + Config->ConfValue("type","name",j,TypeName,&Config->config_f); if (!strcmp(TypeName,OperType)) { /* found this oper's opertype */ - snprintf(global,MAXBUF,"| %s %s",user->nick,TypeName); - NetSendToAll(global); - ConfValue("type","host",j,HostName,&config_f); + Config->ConfValue("type","host",j,HostName,&Config->config_f); if (*HostName) ChangeDisplayedHost(user,HostName); strlcpy(user->oper,TypeName,NICKMAX); @@ -1769,9 +1604,7 @@ void handle_oper(char **parameters, int pcnt, userrec *user) { strcat(user->modes,"o"); WriteServ(user->fd,"MODE %s :+o",user->nick); - snprintf(global,MAXBUF,"M %s +o",user->nick); - NetSendToAll(global); - FOREACH_MOD OnOper(user); + FOREACH_MOD OnOper(user,OperType); log(DEFAULT,"OPER: %s!%s@%s opered as type: %s",user->nick,user->ident,user->host,OperType); AddOper(user); } @@ -1864,10 +1697,6 @@ void handle_nick(char **parameters, int pcnt, userrec *user) WriteCommon(user,"NICK %s",parameters[0]); - // N token must go to ALL servers!!! - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"n %s %s",user->nick,parameters[0]); - NetSendToAll(buffer); } char oldnick[NICKMAX]; @@ -1888,9 +1717,22 @@ void handle_nick(char **parameters, int pcnt, userrec *user) user->registered = (user->registered | 2); // dont attempt to look up the dns until they pick a nick... because otherwise their pointer WILL change // and unless we're lucky we'll get a duff one later on. + //user->dns_done = (!lookup_dns(user->nick)); + //if (user->dns_done) + // log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick); + +#ifdef THREADED_DNS + // initialize their dns lookup thread + if (pthread_create(&user->dnsthread, NULL, dns_task, (void *)user) != 0) + { + log(DEBUG,"Failed to create DNS lookup thread for user %s",user->nick); + } +#else user->dns_done = (!lookup_dns(user->nick)); if (user->dns_done) log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick); +#endif + } if (user->registered == 3) { @@ -1904,1744 +1746,155 @@ void handle_nick(char **parameters, int pcnt, userrec *user) } } - -void handle_v(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) +long duration(const char* str) { - char* servername = strtok(params," "); - char* versionstr = strtok(NULL,"\r\n"); - - if ((!servername) || (!versionstr)) - return; + char n_field[MAXBUF]; + long total = 0; + const char* str_end = str + strlen(str); + n_field[0] = 0; - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int x = 0; x < me[j]->connectors.size(); x++) - { - if (!strcasecmp(me[j]->connectors[x].GetServerName().c_str(),servername)) - { - me[j]->connectors[x].SetVersionString(versionstr); - WriteOpers("Server '%s' (%d:%d) announces itself as version '%s'",me[j]->connectors[x].GetServerName().c_str(),j,x,me[j]->connectors[x].GetVersionString().c_str()); - } - } - } + if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y'))) + { + std::string n = str; + n = n + "s"; + return duration(n.c_str()); } -} - -void handle_V(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* src = strtok(params," "); - char* dest = strtok(NULL," :"); - char* text = strtok(NULL,"\r\n"); - - if ((!src) || (!dest) || (!text)) - return; - - text++; - userrec* user = Find(src); - if (user) + for (char* i = (char*)str; i < str_end; i++) { - // notice all - only issuable by a server - if (!strcmp(dest,"*")) - { - NoticeAll(user,true,"%s",text); - } - if (!strcmp(dest,"@*")) + // if we have digits, build up a string for the value in n_field, + // up to 10 digits in size. + if ((*i >= '0') && (*i <= '9')) { - NoticeAllOpers(user,true,"%s",text); + strlcat(n_field,i,10); } else { - userrec* dst = Find(dest); - if (dst) - { - WriteTo(user, dst, "NOTICE %s :%s", dst->nick, text); - } - else + // we dont have a digit, check for numeric tokens + switch (tolower(*i)) { - chanrec* d = FindChan(dest); - if (d) - { - ChanExceptSender(d, user, "NOTICE %s :%s", d->name, text); - } - } - } - } - -} + case 's': + total += atoi(n_field); + break; + case 'm': + total += (atoi(n_field)*duration_m); + break; -void handle_P(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* src = strtok(params," "); - char* dest = strtok(NULL," :"); - char* text = strtok(NULL,"\r\n"); + case 'h': + total += (atoi(n_field)*duration_h); + break; - if ((!src) || (!dest) || (!text)) - return; + case 'd': + total += (atoi(n_field)*duration_d); + break; - text++; - - userrec* user = Find(src); - if (user) - { - userrec* dst = Find(dest); - - if (dst) - { - WriteTo(user, dst, "PRIVMSG %s :%s", dst->nick, text); - } - else - { - chanrec* d = FindChan(dest); - if (d) - { - ChanExceptSender(d, user, "PRIVMSG %s :%s", d->name, text); + case 'w': + total += (atoi(n_field)*duration_w); + break; + + case 'y': + total += (atoi(n_field)*duration_y); + break; } + n_field[0] = 0; } } + // add trailing seconds + total += atoi(n_field); + return total; } -void handle_i(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* nick = strtok(params," "); - char* from = strtok(NULL," "); - char* channel = strtok(NULL," "); - - if ((!nick) || (!from) || (!channel)) - return; +/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */ - userrec* u = Find(nick); - userrec* user = Find(from); - chanrec* c = FindChan(channel); - if ((c) && (u) && (user)) +bool host_matches_everyone(std::string mask, userrec* user) +{ + char insanemasks[MAXBUF]; + char buffer[MAXBUF]; + char itrigger[MAXBUF]; + Config->ConfValue("insane","hostmasks",0,insanemasks,&Config->config_f); + Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f); + if (*itrigger == 0) + strlcpy(itrigger,"95.5",MAXBUF); + if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1')) + return false; + long matches = 0; + for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { - u->InviteTo(c->name); - WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name); + strlcpy(buffer,u->second->ident,MAXBUF); + strlcat(buffer,"@",MAXBUF); + strlcat(buffer,u->second->host,MAXBUF); + if (match(buffer,mask.c_str())) + matches++; } -} - -void handle_t(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* setby = strtok(params," "); - char* channel = strtok(NULL," :"); - char* topic = strtok(NULL,"\r\n"); - - if ((!setby) || (!channel) || (!topic)) - return; - - topic++; - userrec* u = Find(setby); - chanrec* c = FindChan(channel); - if ((c) && (u)) - { - WriteChannelLocal(c,u,"TOPIC %s :%s",c->name,topic); - strlcpy(c->topic,topic,MAXTOPIC); - strlcpy(c->setby,u->nick,NICKMAX); - c->topicset = TIME; - } -} - - -void handle_T(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* tm = strtok(params," "); - char* setby = strtok(NULL," "); - char* channel = strtok(NULL," :"); - char* topic = strtok(NULL,"\r\n"); - - if ((!tm) || (!setby) || (!channel) || (!topic)) - return; - - topic++; - time_t TS = atoi(tm); - chanrec* c = FindChan(channel); - if (c) - { - // in the case of topics and TS, the *NEWER* - if (TS <= c->topicset) - { - WriteChannelLocal(c,NULL,"TOPIC %s :%s",c->name,topic); - strlcpy(c->topic,topic,MAXTOPIC); - strlcpy(c->setby,setby,NICKMAX); - } - } -} - -void handle_M(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* pars[128]; - char original[MAXBUF],target[MAXBUF]; - strlcpy(original,params,MAXBUF); - int index = 0; - char* parameter = strtok(params," "); - - if (!parameter) - return; - - strlcpy(target,parameter,MAXBUF); - while (parameter) - { - if (parameter[0] == ':') - parameter++; - pars[index++] = parameter; - parameter = strtok(NULL," "); - } - log(DEBUG,"*** MODE: '%s %s'",pars[0],pars[1]); - merge_mode(pars,index); - if (FindChan(target)) - { - WriteChannelLocal(FindChan(target), NULL, "MODE %s",original); - return; - } - if (Find(target)) - { - if (original[0]) - Write(Find(target)->fd,":%s MODE %s",ServerName,original); - } -} - -// m is modes set by users only (not servers) valid targets are channels or users. - -void handle_m(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - // m blah #chatspike +b *!test@*4 - char* pars[128]; - char original[MAXBUF]; - - if (!params) - return; - - strlcpy(original,params,MAXBUF); - - if (!strchr(params,' ')) - { - WriteOpers("WARNING! 'm' token in data stream without any parameters! Something fishy is going on!"); - return; - } - - int index = 0; - - char* src = strtok(params," "); - - if (!src) - return; - - userrec* user = Find(src); - - if (user) - { - log(DEBUG,"Found user: %s",user->nick); - char* parameter = strtok(NULL," "); - while (parameter) - { - pars[index++] = parameter; - parameter = strtok(NULL," "); - } - - log(DEBUG,"Calling merge_mode2"); - if (index) - merge_mode2(pars,index,user); - } -} - - -void handle_L(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* nick = NULL; - char* channel = NULL; - char* reason = NULL; - log(DEBUG,"L TOKEN PARS: '%s'",params); - if (strstr(params,":#")) - { - nick = strtok(params," "); - channel = strtok(NULL,"\r\n"); - if ((!nick) || (!channel)) - return; - channel++; - reason = ""; - } - else - { - nick = strtok(params," "); - channel = strtok(NULL," :"); - reason = strtok(NULL,"\r\n"); - if ((!nick) || (!channel) || (!reason)) - return; - reason++; - } - userrec* user = Find(nick); - if ((user) && (channel) && (reason)) - { - if ((!reason) && (*reason != '\0')) - { - del_channel(user,channel,reason,true); - } - else - { - del_channel(user,channel,NULL,true); - } - } -} - -void handle_K(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* src = strtok(params," "); - char* nick = strtok(NULL," :"); - char* reason = strtok(NULL,"\r\n"); - if ((!src) || (!nick) || (!reason)) - return; - char kreason[MAXBUF]; - reason++; - - userrec* u = Find(nick); - userrec* user = Find(src); - - if ((user) && (u)) - { - WriteTo(user, u, "KILL %s :%s!%s!%s!%s (%s)", u->nick, tcp_host, ServerName, user->dhost,user->nick,reason); - WriteOpers("*** Remote kill from %s by %s: %s!%s@%s (%s)",tcp_host,user->nick,u->nick,u->ident,u->host,reason); - snprintf(kreason,MAXBUF,"[%s] Killed (From: '%s' (%s))",tcp_host,user->nick,reason); - kill_link(u,kreason); - } -} - -void handle_Q(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* nick = strtok(params," :"); - char* reason = strtok(NULL,"\r\n"); - - if ((!nick) || (!reason)) - return; - reason++; - - userrec* user = Find(nick); - - if (user) - { - if (strlen(reason)>MAXQUIT) - { - reason[MAXQUIT-1] = '\0'; - } - - - WriteCommonExcept(user,"QUIT :%s",reason); - - user_hash::iterator iter = clientlist.find(user->nick); - - if (iter != clientlist.end()) - { - log(DEBUG,"deleting user hash value %d",iter->second); - clientlist.erase(iter); - } - - if (user->registered == 7) - { - purge_empty_chans(user); - } - delete user; - } -} - -void handle_n(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* oldnick = strtok(params," "); - char* newnick = strtok(NULL," "); - - if ((!oldnick) || (!newnick)) - return; - - userrec* user = Find(oldnick); - - if (user) - { - if (is_uline(tcp_host)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(OnUserPreNick(user,newnick)); - if (MOD_RESULT) { - // if a module returns true, the nick change couldnt be allowed - statsCollisions++; - kill_link(user,"Nickname collision"); - return; - } - if (matches_qline(newnick)) - { - statsCollisions++; - kill_link(user,"Nickname collision"); - return; - } - - // broadcast this because its a services thingy - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"n %s %s",user->nick,newnick); - NetSendToAllExcept_WithSum(tcp_host,buffer,tcp_sum); - } - WriteCommon(user,"NICK %s",newnick); - user = ReHashNick(user->nick, newnick); - if (!user) return; - if (!user->nick) return; - strlcpy(user->nick, newnick,NICKMAX); - log(DEBUG,"new nick set: %s",user->nick); - } -} - -// k : -void handle_k(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* src = strtok(params," "); - char* dest = strtok(NULL," "); - char* channel = strtok(NULL," :"); - char* reason = strtok(NULL,"\r\n"); - - if ((!src) || (!dest) || (!channel) || (!reason)) - return; - - reason++; - userrec* s = Find(src); - userrec* d = Find(dest); - chanrec* c = FindChan(channel); - if ((s) && (d) && (c)) - { - kick_channel(s,d,c,reason); - return; - } - d = Find(channel); - c = FindChan(dest); - if ((s) && (d) && (c)) - { - kick_channel(s,d,c,reason); - return; - } -} - -void handle_AT(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* who = strtok(params," :"); - char* text = strtok(NULL,"\r\n"); - - if ((!who) || (!text)) - return; - - text++; - userrec* s = Find(who); - if (s) - { - WriteWallOps(s,true,text); - } -} - -void handle_H(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - log(DEBUG,"Adding ULined server %s to my map",params); - ircd_connector s; - s.SetState(STATE_DISCONNECTED); - - if (!params) - return; - - s.SetServerName(params); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),params)) - { - // dont allow a server to be added twice - log(DEBUG,"ULined server %s already in the map!",params); - return; - } - } - } - } - - source->connectors.push_back(s); - WriteOpers("Non-Mesh server %s has joined the network",params); -} - -void handle_N(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* tm = strtok(params," "); - char* nick = strtok(NULL," "); - char* host = strtok(NULL," "); - char* dhost = strtok(NULL," "); - char* ident = strtok(NULL," "); - char* modes = strtok(NULL," "); - char* ipaddr = strtok(NULL," "); - char* server = strtok(NULL," :"); - char* gecos = strtok(NULL,"\r\n"); - - if ((!tm) || (!nick) || (!host) || (!dhost) || (!ident) || (!modes) || (!ipaddr) || (!server) || (!gecos)) - return; - - if (*gecos == ':') - gecos++; - - if (*modes == '+') - modes++; - - time_t TS = atoi(tm); - user_hash::iterator iter = clientlist.find(nick); - if (iter != clientlist.end()) - { - // nick collision - statsCollisions++; - WriteOpers("Nickname collision: %s@%s != %s@%s",nick,server,iter->second->nick,iter->second->server); - char str[MAXBUF]; - snprintf(str,MAXBUF,"Killed (Nick Collision (%s@%s < %s@%s))",nick,server,iter->second->nick,iter->second->server); - WriteServ(iter->second->fd, "KILL %s :%s",iter->second->nick,str); - kill_link(iter->second,str); - } - clientlist[nick] = new userrec(); - // remote users have an fd of -1. This is so that our Write abstraction - // routines know to route any messages to this record away to whatever server - // theyre on. - clientlist[nick]->fd = -1; - strlcpy(clientlist[nick]->nick, nick,NICKMAX); - strlcpy(clientlist[nick]->host, host,160); - strlcpy(clientlist[nick]->dhost, dhost,160); - strlcpy(clientlist[nick]->server, server,256); - strlcpy(clientlist[nick]->ident, ident,10); // +1 char to compensate for tilde - strlcpy(clientlist[nick]->fullname, gecos,128); - strlcpy(clientlist[nick]->ip,ipaddr,16); - clientlist[nick]->signon = TS; - clientlist[nick]->nping = 0; // this is ignored for a remote user anyway. - clientlist[nick]->lastping = 1; - clientlist[nick]->port = 0; // so is this... - clientlist[nick]->registered = 7; // this however we need to set for them to receive messages and appear online - clientlist[nick]->idle_lastmsg = TIME; // this is unrealiable and wont actually be used locally - for (int i = 0; i < MAXCHANS; i++) - { - clientlist[nick]->chans[i].channel = NULL; - clientlist[nick]->chans[i].uc_modes = 0; - } - FOREACH_MOD OnGlobalConnect(clientlist[nick]); - if (strchr(clientlist[nick]->modes,'o')) - { - FOREACH_MOD OnGlobalOper(clientlist[nick]); - } -} - -void handle_F(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - if (!params) - return; - long tdiff = TIME - atoi(params); - if (tdiff) - WriteOpers("TS split for %s -> %s: %d",source->name,reply->name,tdiff); -} - -void handle_a(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* nick = strtok(params," :"); - char* gecos = strtok(NULL,"\r\n"); - - if ((!nick) || (!gecos)) - return; - - userrec* user = Find(nick); - - if (user) - strlcpy(user->fullname,gecos,MAXBUF); -} - -void handle_b(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* nick = strtok(params," "); - char* host = strtok(NULL," "); - - if ((!nick) || (!host)) - return; - - userrec* user = Find(nick); - - if (user) - strlcpy(user->dhost,host,160); -} - -void handle_plus(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - // %s %s %d %d - // + test3.chatspike.net 7010 -2016508415 - char* servername = strtok(params," "); - char* ipaddr = strtok(NULL," "); - char* ipport = strtok(NULL," "); - char* cookie = strtok(NULL," "); - - if ((!servername) || (!ipaddr) || (!ipport) || (!cookie)) - return; - - log(DEBUG,"*** Connecting back to %s:%d",ipaddr,atoi(ipport)); - - - bool conn_already = false; - for (int i = 0; i < 32; i++) - { - if (me[i] != NULL) - { - for (int j = 0; j < me[i]->connectors.size(); j++) - { - if (!strcasecmp(me[i]->connectors[j].GetServerName().c_str(),servername)) - { - if (me[i]->connectors[j].GetServerPort() == atoi(ipport)) - { - log(DEBUG,"Already got a connection to %s:%d, ignoring +",ipaddr,atoi(ipport)); - conn_already = true; - } - } - } - } - } - if (!conn_already) - me[defaultRoute]->MeshCookie(ipaddr,atoi(ipport),atoi(cookie),servername); -} - -void handle_R(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* server = strtok(params," "); - char* data = strtok(NULL,"\r\n"); - - if ((!data) || (!server)) - { - log(DEBUG,"Someones playing silly buggers, attempting to send to a null server or send a null message (BUG?)"); - return; - } - - log(DEBUG,"Forwarded packet '%s' to '%s'",data,server); - NetSendToOne(server,data); -} - -void handle_J(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* nick = strtok(params," "); - char* channel = strtok(NULL," "); - - if ((!nick) || (!channel)) - return; - - userrec* user = Find(nick); - - while (channel) - { - if ((user != NULL) && (strcmp(channel,""))) - { - char privilage = '\0'; - if (channel[0] != '#') - { - privilage = channel[0]; - channel++; - } - add_channel(user,channel,"",true); - - // now work out the privilages they should have on each channel - // and send the appropriate servermodes. - for (int i = 0; i != MAXCHANS; i++) - { - if (user->chans[i].channel) - { - if (!strcasecmp(user->chans[i].channel->name,channel)) - { - if (privilage == '@') - { - user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_OP; - WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +o %s",channel,user->nick); - } - if (privilage == '%') - { - user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_HOP; - WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +h %s",channel,user->nick); - } - if (privilage == '+') - { - user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_VOICE; - WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +v %s",channel,user->nick); - } - } - } - } - - } - channel = strtok(NULL," "); - } -} - -void handle_dollar(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - log(DEBUG,"Storing routing table..."); - char* sourceserver = strtok(params," "); - char* server = strtok(NULL," "); - - if ((!sourceserver) || (!server)) - return; - - for (int i = 0; i < 32; i++) - { - if (me[i] != NULL) - { - for (int j = 0; j < me[i]->connectors.size(); j++) - { - if (!strcasecmp(me[i]->connectors[j].GetServerName().c_str(),sourceserver)) - { - me[i]->connectors[j].routes.clear(); - log(DEBUG,"Found entry for source server."); - while (server) - { - // store each route - me[i]->connectors[j].routes.push_back(server); - log(DEBUG,"*** Stored route: %s -> %s -> %s",ServerName,sourceserver,server); - server = strtok(NULL," "); - } - return; - } - } - } - } - log(DEBUG,"Warning! routing table received from nonexistent server!"); -} - -void handle_amp(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - if (!params) - return; - - log(DEBUG,"Netsplit! %s split from mesh, removing!",params); - WriteOpers("*** NOTICE - Controlled netsplit: %s split from %s",params,ServerName); - 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; - } - } - } - log(DEBUG,"Done with netsplit."); -} - -unsigned long authcookie; - -void handle_hash(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - // # : - log(DEBUG,"Adding G-line"); - char* mask = strtok(params," "); - char* who = strtok(NULL," "); - char* create_time = strtok(NULL," "); - char* duration = strtok(NULL," :"); - char* reason = strtok(NULL,"\r\n"); - - if ((!mask) || (!who) || (!create_time) || (!duration) || (!reason)) - return; - - reason++; - add_gline(atoi(duration),(const char*)who,(const char*)reason,(const char*)mask); - // we must update the creation time on this gline - // now that we've added it, or it wont expire at the right time. - gline_set_creation_time(mask,atoi(create_time)); - if (!atoi(duration)) - { - WriteOpers("*** %s Added permenant G-Line on %s.",who,mask); - } - else - { - WriteOpers("*** %s Added timed G-Line on %s to expire in %d seconds.",who,mask,atoi(duration)); - } - apply_lines(); -} - -void handle_dot(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - log(DEBUG,"Removing G-line"); - char* mask = strtok(params," "); - char* who = strtok(NULL," "); - - if ((!mask) || (!who)) - return; - - if (mask) - { - if (del_gline((const char*)mask)) - { - if (who) - { - WriteOpers("*** %s Removed G-line on %s.",who,mask); - } - } - } -} - -void handle_add_sqline(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - // { : - log(DEBUG,"Adding Q-line"); - char* mask = strtok(params," "); - char* who = strtok(NULL," "); - char* create_time = strtok(NULL," "); - char* duration = strtok(NULL," :"); - char* reason = strtok(NULL,"\r\n"); - - if ((!mask) || (!who) || (!create_time) || (!duration) || (!reason)) - return; - - reason++; - add_qline(atoi(duration),(const char*)who,(const char*)reason,(const char*)mask); - // we must update the creation time on this gline - // now that we've added it, or it wont expire at the right time. - qline_set_creation_time(mask,atoi(create_time)); - qline_make_global(mask); - if (!atoi(duration)) - { - WriteOpers("*** %s Added permenant Q-Line on %s.",who,mask); - } - else - { - WriteOpers("*** %s Added timed Q-Line on %s to expire in %d seconds.",who,mask,atoi(duration)); - } - apply_lines(); -} - -void handle_del_sqline(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - log(DEBUG,"Removing Q-line"); - char* mask = strtok(params," "); - char* who = strtok(NULL," "); - - if ((!mask) || (!who)) - return; - - if (mask) - { - if (del_qline((const char*)mask)) - { - if (who) - { - WriteOpers("*** %s Removed Q-line on %s.",who,mask); - } - } - } -} - -void handle_add_szline(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - // } : - log(DEBUG,"Adding Z-line"); - char* mask = strtok(params," "); - char* who = strtok(NULL," "); - char* create_time = strtok(NULL," "); - char* duration = strtok(NULL," :"); - char* reason = strtok(NULL,"\r\n"); - - if ((!mask) || (!who) || (!create_time) || (!duration) || (!reason)) - return; - - reason++; - add_zline(atoi(duration),(const char*)who,(const char*)reason,(const char*)mask); - // we must update the creation time on this gline - // now that we've added it, or it wont expire at the right time. - zline_set_creation_time(mask,atoi(create_time)); - zline_make_global(mask); - if (!atoi(duration)) - { - WriteOpers("*** %s Added permenant Z-Line on %s.",who,mask); - } - else + float percent = ((float)matches / (float)clientlist.size()) * 100; + if (percent > (float)atof(itrigger)) { - WriteOpers("*** %s Added timed Z-Line on %s to expire in %d seconds.",who,mask,atoi(duration)); + WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent); + return true; } - apply_lines(); + return false; } -void handle_del_szline(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) +bool ip_matches_everyone(std::string ip, userrec* user) { - log(DEBUG,"Removing Z-line"); - char* mask = strtok(params," "); - char* who = strtok(NULL," "); - - if ((!mask) || (!who)) - return; - - if (mask) + char insanemasks[MAXBUF]; + char itrigger[MAXBUF]; + Config->ConfValue("insane","ipmasks",0,insanemasks,&Config->config_f); + Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f); + if (*itrigger == 0) + strlcpy(itrigger,"95.5",MAXBUF); + if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1')) + return false; + long matches = 0; + for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { - if (del_zline((const char*)mask)) - { - if (who) - { - WriteOpers("*** %s Removed Q-line on %s.",who,mask); - } - } + if (match(u->second->ip,ip.c_str())) + matches++; } -} - -void handle_pipe(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host, char* tcp_sum) -{ - char* nick = strtok(params," "); - char* type = strtok(params," "); - - if ((!nick) || (!type)) - return; - - userrec* u = Find(nick); - if (u) + float percent = ((float)matches / (float)clientlist.size()) * 100; + if (percent > (float)atof(itrigger)) { - strlcpy(u->oper,type,NICKMAX); - } -} - - -void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host,char* ipaddr,int port,char* tcp_sum) -{ - char buffer[MAXBUF]; - int MOD_RESULT = 0; - - ircd_connector* cn = source->FindHost(tcp_host); - - switch(token) - { - // Y - // start netburst - case 'Y': - nb_start = TIME; - WriteOpers("Server %s is starting netburst.",tcp_host); - // now broadcast this new servers address out to all servers that are linked to us, - // except the newcomer. They'll all attempt to connect back to it. - authcookie = rand()*rand(); - snprintf(buffer,MAXBUF,"~ %lu",(unsigned long)authcookie); - NetSendToAll_WithSum(buffer,tcp_sum); - break; - // ~ - // Store authcookie - // once stored, this authcookie permits other servers to log in - // without user or password, using it. - case '~': - auth_cookies.push_back(atoi(params)); - log(DEBUG,"*** Stored auth cookie, will permit servers with auth-cookie %d",atoi(params)); - break; - // connect back to a server using an authcookie - case '+': - handle_plus(token,params,source,reply,tcp_host,tcp_sum); - break; - // routing table - case '$': - handle_dollar(token,params,source,reply,tcp_host,tcp_sum); - break; - // node unreachable - we cant route to a server, sooooo we slit it off. - // servers can generate these for themselves for an squit. - case '&': - handle_amp(token,params,source,reply,tcp_host,tcp_sum); - break; - // R - // redirect token, send all of along to the given - // server as this server has been found to still have a route to it - case 'R': - handle_R(token,params,source,reply,tcp_host,tcp_sum); - break; - // ? - // ping - case '?': - snprintf(buffer,MAXBUF,"%s !",CreateSum().c_str()); - reply->SendPacket(buffer,tcp_host); - break; - // ? - // pong - case '!': - if (cn) - cn->ResetPing(); - break; - // * - // no operation - case '*': - break; - // no operation - reserved to prevent services issues - case ':': - break; - // N : - // introduce remote client - case 'N': - handle_N(token,params,source,reply,tcp_host,tcp_sum); - break; - // a : - // change GECOS (SETNAME) - case 'a': - handle_a(token,params,source,reply,tcp_host,tcp_sum); - break; - // b : - // change displayed host (SETHOST) - case 'b': - handle_b(token,params,source,reply,tcp_host,tcp_sum); - break; - // t : - // change a channel topic - case 't': - handle_t(token,params,source,reply,tcp_host,tcp_sum); - break; - // i - // invite a user to a channel - case 'i': - handle_i(token,params,source,reply,tcp_host,tcp_sum); - break; - // k : - // kick a user from a channel - case 'k': - handle_k(token,params,source,reply,tcp_host,tcp_sum); - break; - // n - // change nickname of client -- a server should only be able to - // change the nicknames of clients that reside on it unless - // they are ulined. - case 'n': - handle_n(token,params,source,reply,tcp_host,tcp_sum); - break; - // J - // Join user to channel list, merge channel permissions - case 'J': - handle_J(token,params,source,reply,tcp_host,tcp_sum); - break; - // T : - // change channel topic (netburst only) - case 'T': - handle_T(token,params,source,reply,tcp_host,tcp_sum); - break; - // M [MODE-PARAMETERS] - // Server setting modes on an object - case 'M': - handle_M(token,params,source,reply,tcp_host,tcp_sum); - break; - // m [MODE-PARAMETERS] - // User setting modes on an object - case 'm': - handle_m(token,params,source,reply,tcp_host,tcp_sum); - break; - // P : - // Send a private/channel message - case 'P': - handle_P(token,params,source,reply,tcp_host,tcp_sum); - break; - // V : - // Send a private/channel notice - case 'V': - handle_V(token,params,source,reply,tcp_host,tcp_sum); - break; - // v - case 'v': - handle_v(token,params,source,reply,tcp_host,tcp_sum); - break; - // L : - // User parting a channel - case 'L': - handle_L(token,params,source,reply,tcp_host,tcp_sum); - break; - // Q : - // user quitting - case 'Q': - handle_Q(token,params,source,reply,tcp_host,tcp_sum); - break; - // H - // introduce non-meshable server (such as a services server) - case 'H': - handle_H(token,params,source,reply,tcp_host,tcp_sum); - break; - // K : - // remote kill - case 'K': - handle_K(token,params,source,reply,tcp_host,tcp_sum); - break; - // @ : - // wallops - case '@': - handle_AT(token,params,source,reply,tcp_host,tcp_sum); - break; - // # : - // add gline - case '#': - handle_hash(token,params,source,reply,tcp_host,tcp_sum); - break; - // . - // remove gline - case '.': - handle_dot(token,params,source,reply,tcp_host,tcp_sum); - break; - // # : - // add gline - case '{': - handle_add_sqline(token,params,source,reply,tcp_host,tcp_sum); - break; - // . - // remove gline - case '[': - handle_del_sqline(token,params,source,reply,tcp_host,tcp_sum); - break; - // # : - // add gline - case '}': - handle_add_szline(token,params,source,reply,tcp_host,tcp_sum); - break; - // . - // remove gline - case ']': - handle_del_szline(token,params,source,reply,tcp_host,tcp_sum); - break; - // | - // set opertype - case '|': - handle_pipe(token,params,source,reply,tcp_host,tcp_sum); - break; - // F - // end netburst - case 'F': - WriteOpers("Server %s has completed netburst. (%d secs)",tcp_host,TIME-nb_start); - handle_F(token,params,source,reply,tcp_host,tcp_sum); - nb_start = 0; - // tell all the other servers to use this authcookie to connect back again - // got '+ test3.chatspike.net 7010 -2016508415' from test.chatspike.net - snprintf(buffer,MAXBUF,"+ %s %s %d %lu",tcp_host,ipaddr,port,(unsigned long)authcookie); - NetSendToAllExcept_WithSum(tcp_host,buffer,tcp_sum); - break; - case '/': - WriteOpers("Server %s is IRCServices-based server (assumes-SVSMODE) - Nickname Services: %s",tcp_host,params); - strlcpy(source->nickserv,params,NICKMAX); - break; - // F - // end netburst with no mesh creation - case 'f': - WriteOpers("Server %s has completed netburst. (%d secs)",tcp_host,TIME-nb_start); - handle_F(token,params,source,reply,tcp_host,tcp_sum); - nb_start = 0; - // tell everyone else about the new server name so they just add it in the disconnected - // state - snprintf(buffer,MAXBUF,"u %s :%s",tcp_host,GetServerDescription(tcp_host).c_str()); - NetSendToAllExcept_WithSum(tcp_host,buffer,tcp_sum); - break; - // X - // Send netburst now - case 'X': - WriteOpers("Sending my netburst to %s",tcp_host); - DoSync(source,tcp_host); - WriteOpers("Send of netburst to %s completed",tcp_host); - NetSendMyRoutingTable(); - break; - // anything else - default: - MOD_RESULT = 0; - string_list s; - char* data = strtok(params," "); - while (data) - { - if (*data == ':') - { - // the last item is a special case - data++; - char datalast[MAXBUF]; - strlcpy(datalast,data,MAXBUF); - data = strtok(NULL," "); - while (data) - { - strlcpy(datalast," ",MAXBUF); - strlcpy(datalast,data,MAXBUF); - data = strtok(NULL," "); - } - s.push_back(data); - break; - } - s.push_back(data); - data = strtok(NULL," "); - } - FOREACH_RESULT(OnMeshToken(token,s,source,reply,tcp_host,ipaddr,port)); - if (!MOD_RESULT) - WriteOpers("WARNING! Unknown datagram type '%c'",token); - break; + WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent); + return true; } + return false; } - -void handle_link_packet(char* tcp_msg, char* tcp_host, serverrec *serv,char* tcp_sum) +bool nick_matches_everyone(std::string nick, userrec* user) { - if ((!strncmp(tcp_msg,"USER ",5)) || (!strncmp(tcp_msg,"NICK ",5)) || (!strncmp(tcp_msg,"PASS ",5)) || (!strncmp(tcp_msg,"SERVER ",7))) - { - // a user on a server port, just close their connection. - RemoveServer(tcp_host); - return; - } - - char response[10240]; - char token = tcp_msg[0]; - char* old = tcp_msg; - - if (!strncmp(tcp_msg,"PING",4)) - { - // some muppet of a server is sending PING. We don't know what PING is. drop it silently. - return; - } - - if ((token != ':') && (strlen(tcp_msg)>1) && (tcp_msg[1] != ' ')) - { - WriteOpers("*** Discarded %d chars illegal data from %s",strlen(tcp_msg),tcp_host); - } - - if (token == ':') // leading :servername or details - strip them off (services does this, sucky) + char insanemasks[MAXBUF]; + char itrigger[MAXBUF]; + Config->ConfValue("insane","nickmasks",0,insanemasks,&Config->config_f); + Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f); + if (*itrigger == 0) + strlcpy(itrigger,"95.5",MAXBUF); + if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1')) + return false; + long matches = 0; + for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { - char* src = tcp_msg+1; - while (tcp_msg[0] != ' ') - tcp_msg++; - tcp_msg[0] = 0; - tcp_msg++; - char* comd = tcp_msg; - while (tcp_msg[0] != ' ') - tcp_msg++; - tcp_msg[0] = 0; - tcp_msg++; - char data[MAXBUF]; - char source[MAXBUF]; - char command[MAXBUF]; - strlcpy(data,tcp_msg,512); - strlcpy(source,src,MAXBUF); - strlcpy(command,comd,MAXBUF); - tcp_msg = old; - - // unused numeric: - // :services-dev.chatspike.net 433 Craig Craig :Nickname is registered to someone else - if (!strcmp(command,"433")) - { - token = '*'; - } - if (!strcmp(command,"432")) - { - token = '*'; - } - if (!strcmp(command,"PING")) - { - token = '*'; - } - if (!strcmp(command,"NOTICE")) - { - snprintf(tcp_msg,MAXBUF,"V %s %s",source,data); - log(DEBUG,"Rewrote NOTICE from services to: '%s'",tcp_msg); - token = tcp_msg[0]; - } - if (!strcmp(command,"QUIT")) - { - if ((!tcp_msg) || (!strcmp(data,"")) || (strcmp(data,":"))) - { - strcpy(data,":No reason"); - } - if (!strcmp(data,":")) - { - strcpy(data,":No reason"); - } - snprintf(tcp_msg,MAXBUF,"Q %s %s",source,data); - log(DEBUG,"Rewrote QUIT from services to: '%s'",tcp_msg); - token = tcp_msg[0]; - } - if (!strcmp(command,"SQUIT")) - { - snprintf(tcp_msg,MAXBUF,"& %s",source); - log(DEBUG,"Rewrote SQUIT from services to: '%s'",tcp_msg); - token = tcp_msg[0]; - } - if (!strcmp(command,"SVSMODE")) - { - snprintf(tcp_msg,MAXBUF,"m %s %s",source,data); - log(DEBUG,"Rewrote SVSMODE from services to: '%s'",tcp_msg); - token = tcp_msg[0]; - } - if (!strcmp(command,"SVS2MODE")) - { - snprintf(tcp_msg,MAXBUF,"m %s %s",source,data); - log(DEBUG,"Rewrote SVS2MODE from services to: '%s'",tcp_msg); - token = tcp_msg[0]; - } - // todo: this wont work without u:lines - // in give_ops etc allow nick on a u:lined serv to do just about anything - if (!strcmp(command,"MODE")) - { - snprintf(tcp_msg,MAXBUF,"m %s %s",source,data); - log(DEBUG,"Rewrote MODE from services to: '%s'",tcp_msg); - token = tcp_msg[0]; - } - if (!strcmp(command,"KICK")) - { - snprintf(tcp_msg,MAXBUF,"k %s %s",source,data); - log(DEBUG,"Rewrote KICK from services to: '%s'",tcp_msg); - token = tcp_msg[0]; - } - if (!strcmp(command,"KILL")) - { - snprintf(tcp_msg,MAXBUF,"K %s %s",source,data); - log(DEBUG,"Rewrote KILL from services to: '%s'",tcp_msg); - token = tcp_msg[0]; - } - if (!strcmp(command,"SVSJOIN")) - { - snprintf(tcp_msg,MAXBUF,"J %s",data); - NetSendToOne(tcp_host,tcp_msg); - char* nick = strtok(data," "); - char* chan = strtok(NULL," "); - log(DEBUG,"Rewrote SVSJOIN from services to: '%s'",tcp_msg); - userrec* u = Find(nick); - if (u) - { - add_channel(u,chan,"",true); - } - token = tcp_msg[0]; - } - - } - - char* params = tcp_msg + 2; - char finalparam[1024]; - strcpy(finalparam," :xxxx"); - if (strstr(tcp_msg," :")) { - strlcpy(finalparam,strstr(tcp_msg," :"),1024); - } - - - if (token == '-') { - char* cookie = strtok(params," "); - char* servername = strtok(NULL," "); - char* serverdesc = finalparam+2; - - if ((!cookie) || (!servername) || (!serverdesc)) - return; - - - WriteOpers("AuthCookie CONNECT from %s (%s)",servername,tcp_host); - - for (int u = 0; u < auth_cookies.size(); u++) - { - if (auth_cookies[u] == atoi(cookie)) - { - WriteOpers("Allowed cookie from %s, is now part of the mesh",servername); - - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),tcp_host)) - { - me[j]->connectors[k].SetServerName(servername); - me[j]->connectors[k].SetDescription(serverdesc); - me[j]->connectors[k].SetState(STATE_CONNECTED); - NetSendMyRoutingTable(); - return; - } - } - } - WriteOpers("\2WARNING!\2 %s sent us an authentication packet but we are not authenticating with this server right now! Possible intrusion attempt!",tcp_host); - return; - } - - - return; - } - } - // bad cookie, bad bad! go sit in the corner! - WriteOpers("Bad cookie from %s!",servername); - return; - } - else - if (token == 'S') { - // S test.chatspike.net password portn :ChatSpike InspIRCd test server - char* servername = strtok(params," "); - char* password = strtok(NULL," "); - char* myport = strtok(NULL," "); - char* revision = strtok(NULL," "); - char* serverdesc = finalparam+2; - - if ((!servername) || (!password) || (!myport) || (!revision) || (!serverdesc)) - return; - - WriteOpers("CONNECT from %s (%s) (their port: %d)",servername,tcp_host,atoi(myport)); - - ircd_connector* cn = serv->FindHost(servername); - - if (cn) - { - WriteOpers("CONNECT aborted: Server %s already exists from %s",servername,ServerName); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"E :Server %s already exists!",servername); - serv->SendPacket(buffer,tcp_host); - serv->FlushWriteBuffers(); - RemoveServer(tcp_host); - return; - } - - if (std::string(revision) != GetRevision()) - { - WriteOpers("CONNECT aborted: Could not link to %s, is an incompatible version %s, our version is %s",servername,revision,GetRevision().c_str()); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"E :Version number mismatch"); - serv->SendPacket(buffer,tcp_host); - serv->FlushWriteBuffers(); - RemoveServer(tcp_host); - RemoveServer(servername); - return; - } - - for (int j = 0; j < serv->connectors.size(); j++) - { - if (!strcasecmp(serv->connectors[j].GetServerName().c_str(),tcp_host)) - { - serv->connectors[j].SetServerName(servername); - serv->connectors[j].SetDescription(serverdesc); - serv->connectors[j].SetServerPort(atoi(myport)); - } - } - - - char Link_ServerName[1024]; - char Link_IPAddr[1024]; - char Link_Port[1024]; - char Link_Pass[1024]; - char Link_SendPass[1024]; - int LinkPort = 0; - - // search for a corresponding block in the config files - for (int i = 0; i < ConfValueEnum("link",&config_f); i++) - { - ConfValue("link","name",i,Link_ServerName,&config_f); - ConfValue("link","ipaddr",i,Link_IPAddr,&config_f); - ConfValue("link","port",i,Link_Port,&config_f); - ConfValue("link","recvpass",i,Link_Pass,&config_f); - ConfValue("link","sendpass",i,Link_SendPass,&config_f); - log(DEBUG,"(%d) Comparing against name='%s', ipaddr='%s', port='%s', recvpass='%s'",i,Link_ServerName,Link_IPAddr,Link_Port,Link_Pass); - LinkPort = atoi(Link_Port); - if ((!strcasecmp(Link_ServerName,servername)) && (!strcmp(Link_Pass,password))) - { - // we have a matching link line - - // send a 'diminutive' server message back... - snprintf(response,10240,"%s s %s %s :%s",CreateSum().c_str(),ServerName,Link_SendPass,ServerDesc); - serv->SendPacket(response,servername); - - for (int t = 0; t < serv->connectors.size(); t++) - { - if (!strcasecmp(serv->connectors[t].GetServerName().c_str(),servername)) - { - serv->connectors[t].SetState(STATE_CONNECTED); - } - } - - return; - } - } - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"E :Access is denied (no matching link block)"); - serv->SendPacket(buffer,tcp_host); - serv->FlushWriteBuffers(); - WriteOpers("CONNECT from %s denied, no matching link block",servername); - RemoveServer(tcp_host); - RemoveServer(servername); - return; - } - else - if (token == 's') { - // S test.chatspike.net password :ChatSpike InspIRCd test server - char* servername = strtok(params," "); - char* password = strtok(NULL," "); - char* serverdesc = finalparam+2; - - if ((!servername) || (!password) || (!serverdesc)) - return; - - // TODO: we should do a check here to ensure that this server is one we recently initiated a - // link with, and didnt hear an 's' or 'E' back from yet (these are the only two valid responses - // to an 'S' command. If we didn't recently send an 'S' to this server, theyre trying to spoof - // a connect, so put out an oper alert! - - // for now, just accept all, we'll fix that later. - WriteOpers("%s accepted our link credentials ",servername); - - char Link_ServerName[1024]; - char Link_IPAddr[1024]; - char Link_Port[1024]; - char Link_Pass[1024]; - char Link_SendPass[1024]; - int LinkPort = 0; - - // search for a corresponding block in the config files - for (int i = 0; i < ConfValueEnum("link",&config_f); i++) - { - ConfValue("link","name",i,Link_ServerName,&config_f); - ConfValue("link","ipaddr",i,Link_IPAddr,&config_f); - ConfValue("link","port",i,Link_Port,&config_f); - ConfValue("link","recvpass",i,Link_Pass,&config_f); - ConfValue("link","sendpass",i,Link_SendPass,&config_f); - log(DEBUG,"(%d) Comparing against name='%s', ipaddr='%s', port='%s', recvpass='%s'",i,Link_ServerName,Link_IPAddr,Link_Port,Link_Pass); - LinkPort = atoi(Link_Port); - if (!strcasecmp(Link_ServerName,servername)) - { - // matching link at this end too, we're all done! - // at this point we must begin key exchange and insert this - // server into our 'active' table. - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),tcp_host)) - { - char buffer[MAXBUF]; - me[j]->connectors[k].SetDescription(serverdesc); - me[j]->connectors[k].SetState(STATE_CONNECTED); - snprintf(buffer,MAXBUF,"%s X 0",CreateSum().c_str()); - serv->SendPacket(buffer,tcp_host); - DoSync(me[j],tcp_host); - NetSendMyRoutingTable(); - return; - } - } - } - } - } - else { - log(DEBUG,"Server names '%s' and '%s' don't match",Link_ServerName,servername); - } - } - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"E :Access is denied (no matching link block)"); - serv->SendPacket(buffer,tcp_host); - serv->FlushWriteBuffers(); - WriteOpers("CONNECT from %s denied, no matching link block",servername); - RemoveServer(tcp_host); - RemoveServer(servername); - return; - } - else - if (token == 'U') { - // U services.chatspike.net password :ChatSpike Services - // - // non-meshed link, used by services. Everything coming from a non-meshed link is auto broadcasted. - char* servername = strtok(params," "); - char* password = strtok(NULL," "); - char* serverdesc = finalparam+2; - - if ((!password) || (!servername) || (!serverdesc)) - return; - - char Link_ServerName[1024]; - char Link_IPAddr[1024]; - char Link_Port[1024]; - char Link_Pass[1024]; - char Link_SendPass[1024]; - int LinkPort = 0; - - log(DEBUG,"U-token linked server detected.\n\nservername='%s' password='%s'\n\n",servername,password); - - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),servername)) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"E :Access is denied (Server exists in the mesh)"); - serv->SendPacket(buffer,tcp_host); - serv->FlushWriteBuffers(); - WriteOpers("CONNECT from %s denied, \"%s\" already exists!",tcp_host,servername); - RemoveServer(tcp_host); - return; - } - } - } - } - - // search for a corresponding block in the config files - for (int i = 0; i < ConfValueEnum("link",&config_f); i++) - { - ConfValue("link","name",i,Link_ServerName,&config_f); - ConfValue("link","ipaddr",i,Link_IPAddr,&config_f); - ConfValue("link","port",i,Link_Port,&config_f); - ConfValue("link","recvpass",i,Link_Pass,&config_f); - ConfValue("link","sendpass",i,Link_SendPass,&config_f); - log(DEBUG,"(%d) Comparing against name='%s', ipaddr='%s', port='%s', recvpass='%s'",i,Link_ServerName,Link_IPAddr,Link_Port,Link_Pass); - LinkPort = atoi(Link_Port); - if ((!strcasecmp(Link_ServerName,servername)) && (!strcmp(Link_Pass,password))) - { - // matching link at this end too, we're all done! - // at this point we must begin key exchange and insert this - // server into our 'active' table. - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),tcp_host)) - { - char buffer[MAXBUF]; - log(DEBUG,"Found matching link block"); - me[j]->connectors[k].SetDescription(serverdesc); - me[j]->connectors[k].SetServerName(servername); - me[j]->connectors[k].SetState(STATE_SERVICES); - snprintf(buffer,MAXBUF,"%s X 0",CreateSum().c_str()); - serv->SendPacket(buffer,servername); - snprintf(buffer,MAXBUF,"%s s %s %s %lu :%s",CreateSum().c_str(),ServerName,Link_SendPass,LinkPort,ServerDesc); - serv->SendPacket(buffer,servername); - DoSync(me[j],servername); - snprintf(buffer,MAXBUF,"H %s",servername); - NetSendToAllExcept(servername,buffer); - WriteOpers("Non-Mesh server %s has joined the network",servername); - log(DEBUG,"******** SENDING MY ROUTING TABLE! *******"); - NetSendMyRoutingTable(); - return; - } - } - } - } - } - else { - log(DEBUG,"Server names '%s' and '%s' don't match",Link_ServerName,servername); - } - } - log(DEBUG,"No matching link block found"); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"E :Access is denied (no matching link block)"); - serv->SendPacket(buffer,tcp_host); - serv->FlushWriteBuffers(); - WriteOpers("CONNECT from %s denied, no matching link block",servername); - RemoveServer(tcp_host); - RemoveServer(servername); - return; - } - else - if (token == 'E') { - char* error_message = finalparam+2; - - if (!error_message) - return; - - WriteOpers("ERROR from %s: %s",tcp_host,error_message); - return; - } - else { - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int x = 0; x < me[j]->connectors.size(); x++) - { - log(DEBUG,"Servers are: '%s' '%s'",tcp_host,me[j]->connectors[x].GetServerName().c_str()); - if (!strcasecmp(me[j]->connectors[x].GetServerName().c_str(),tcp_host)) - { - if ((me[j]->connectors[x].GetState() == STATE_CONNECTED) || (me[j]->connectors[x].GetState() == STATE_SERVICES)) - { - // found a valid ircd_connector. - if ((params) && (*params)) - process_restricted_commands(token,params,me[j],serv,tcp_host,me[j]->connectors[x].GetServerIP(),me[j]->connectors[x].GetServerPort(),tcp_sum); - return; - } - } - } - } - } - - log(DEBUG,"Unrecognised token or unauthenticated host in datagram from %s: %c",tcp_host,token); + if (match(u->second->nick,nick.c_str())) + matches++; } -} - -long duration(const char* str) -{ - char n_field[MAXBUF]; - long total = 0; - const char* str_end = str + strlen(str); - n_field[0] = 0; - - for (char* i = (char*)str; i < str_end; i++) + float percent = ((float)matches / (float)clientlist.size()) * 100; + if (percent > (float)atof(itrigger)) { - // if we have digits, build up a string for the value in n_field, - // up to 10 digits in size. - if ((*i >= '0') && (*i <= '9')) - { - strlcat(n_field,i,10); - } - else - { - // we dont have a digit, check for numeric tokens - switch (tolower(*i)) - { - case 's': - total += atoi(n_field); - break; - - case 'm': - total += (atoi(n_field)*duration_m); - break; - - case 'h': - total += (atoi(n_field)*duration_h); - break; - - case 'd': - total += (atoi(n_field)*duration_d); - break; - - case 'w': - total += (atoi(n_field)*duration_w); - break; - - case 'y': - total += (atoi(n_field)*duration_y); - break; - } - n_field[0] = 0; - } + WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent); + return true; } - // add trailing seconds - total += atoi(n_field); - - return total; + return false; } - void handle_kline(char **parameters, int pcnt, userrec *user) { if (pcnt >= 3) { + if (host_matches_everyone(parameters[0],user)) + return; add_kline(duration(parameters[1]),user->nick,parameters[2],parameters[0]); + FOREACH_MOD OnAddKLine(duration(parameters[1]), user, parameters[2], parameters[0]); if (!duration(parameters[1])) { WriteOpers("*** %s added permenant K-line for %s.",user->nick,parameters[0]); @@ -3650,11 +1903,13 @@ void handle_kline(char **parameters, int pcnt, userrec *user) { WriteOpers("*** %s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1])); } + apply_lines(APPLY_KLINES); } else { if (del_kline(parameters[0])) { + FOREACH_MOD OnDelKLine(user, parameters[0]); WriteOpers("*** %s Removed K-line on %s.",user->nick,parameters[0]); } else @@ -3662,14 +1917,16 @@ void handle_kline(char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,parameters[0]); } } - apply_lines(); } void handle_eline(char **parameters, int pcnt, userrec *user) { if (pcnt >= 3) { + if (host_matches_everyone(parameters[0],user)) + return; add_eline(duration(parameters[1]),user->nick,parameters[2],parameters[0]); + FOREACH_MOD OnAddELine(duration(parameters[1]), user, parameters[2], parameters[0]); if (!duration(parameters[1])) { WriteOpers("*** %s added permenant E-line for %s.",user->nick,parameters[0]); @@ -3683,6 +1940,7 @@ void handle_eline(char **parameters, int pcnt, userrec *user) { if (del_eline(parameters[0])) { + FOREACH_MOD OnDelELine(user, parameters[0]); WriteOpers("*** %s Removed E-line on %s.",user->nick,parameters[0]); } else @@ -3695,13 +1953,12 @@ void handle_eline(char **parameters, int pcnt, userrec *user) void handle_gline(char **parameters, int pcnt, userrec *user) { - char netdata[MAXBUF]; if (pcnt >= 3) { + if (host_matches_everyone(parameters[0],user)) + return; add_gline(duration(parameters[1]),user->nick,parameters[2],parameters[0]); - // # : - snprintf(netdata,MAXBUF,"# %s %s %lu %lu :%s",parameters[0],user->nick,(unsigned long)TIME,(unsigned long)duration(parameters[1]),parameters[2]); - NetSendToAll(netdata); + FOREACH_MOD OnAddGLine(duration(parameters[1]), user, parameters[2], parameters[0]); if (!duration(parameters[1])) { WriteOpers("*** %s added permenant G-line for %s.",user->nick,parameters[0]); @@ -3710,13 +1967,13 @@ void handle_gline(char **parameters, int pcnt, userrec *user) { WriteOpers("*** %s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1])); } + apply_lines(APPLY_GLINES); } else { if (del_gline(parameters[0])) { - // . - snprintf(netdata,MAXBUF,". %s %s",parameters[0],user->nick); + FOREACH_MOD OnDelGLine(user, parameters[0]); WriteOpers("*** %s Removed G-line on %s.",user->nick,parameters[0]); } else @@ -3724,14 +1981,21 @@ void handle_gline(char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"NOTICE %s :*** G-Line %s not found in list, try /stats g.",user->nick,parameters[0]); } } - apply_lines(); } void handle_zline(char **parameters, int pcnt, userrec *user) { if (pcnt >= 3) { + if (strchr(parameters[0],'@')) + { + WriteServ(user->fd,"NOTICE %s :*** You cannot include a username in a zline, a zline must ban only an IP mask",user->nick); + return; + } + if (ip_matches_everyone(parameters[0],user)) + return; add_zline(duration(parameters[1]),user->nick,parameters[2],parameters[0]); + FOREACH_MOD OnAddZLine(duration(parameters[1]), user, parameters[2], parameters[0]); if (!duration(parameters[1])) { WriteOpers("*** %s added permenant Z-line for %s.",user->nick,parameters[0]); @@ -3740,11 +2004,13 @@ void handle_zline(char **parameters, int pcnt, userrec *user) { WriteOpers("*** %s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1])); } + apply_lines(APPLY_ZLINES); } else { if (del_zline(parameters[0])) { + FOREACH_MOD OnDelZLine(user, parameters[0]); WriteOpers("*** %s Removed Z-line on %s.",user->nick,parameters[0]); } else @@ -3752,14 +2018,16 @@ void handle_zline(char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]); } } - apply_lines(); } void handle_qline(char **parameters, int pcnt, userrec *user) { if (pcnt >= 3) { + if (nick_matches_everyone(parameters[0],user)) + return; add_qline(duration(parameters[1]),user->nick,parameters[2],parameters[0]); + FOREACH_MOD OnAddQLine(duration(parameters[1]), user, parameters[2], parameters[0]); if (!duration(parameters[1])) { WriteOpers("*** %s added permenant Q-line for %s.",user->nick,parameters[0]); @@ -3768,19 +2036,20 @@ void handle_qline(char **parameters, int pcnt, userrec *user) { WriteOpers("*** %s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1])); } + apply_lines(APPLY_QLINES); } else { if (del_qline(parameters[0])) { + FOREACH_MOD OnDelQLine(user, parameters[0]); WriteOpers("*** %s Removed Q-line on %s.",user->nick,parameters[0]); } else { - WriteServ(user->fd,"NOTICE %s :*** Q-Line %s not found in list, try /stats k.",user->nick,parameters[0]); + WriteServ(user->fd,"NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick,parameters[0]); } } - apply_lines(); }