X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=e859ff8445fc4436da93ec5e9e6ba2930d5cf9d8;hb=843710b75a87e9ee91e4e14f78e9bce9267af391;hp=ef8d6edc22a50d28c515be09f3efc4b86294f011;hpb=f6ba6afc19eab6ed36bbd977f53ffeb11b290f2a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index ef8d6edc2..e859ff844 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -124,6 +124,11 @@ bool DoOneToMany(std::string prefix, std::string command, std::deque ¶ms); void ReadConfiguration(bool rebind); +/* Flatten links and /MAP for non-opers */ +bool FlatLinks; +/* Hide U-Lined servers in /MAP and /LINKS */ +bool HideULines; + /* Imported from xline.cpp for use during netburst */ extern std::vector klines; extern std::vector glines; @@ -203,7 +208,7 @@ class TreeServer { VersionString = ""; UserCount = OperCount = 0; - this->SetNextPingTime(time(NULL) + 60); + this->SetNextPingTime(time(NULL) + 120); this->SetPingFlag(); /* find the 'route' for this server (e.g. the one directly connected @@ -452,6 +457,7 @@ class Link unsigned long AutoConnect; time_t NextConnectTime; std::string EncryptionKey; + bool HiddenFromStats; }; /* The usual stuff for inspircd modules, @@ -525,6 +531,33 @@ bool IsServer(std::string ServerName) return (FindServer(ServerName) != NULL); } + +class cmd_rconnect : public command_t +{ + Module* Creator; + public: + cmd_rconnect (Module* Callback) : command_t("RCONNECT", 'o', 2), Creator(Callback) + { + this->source = "m_spanningtree.so"; + } + + void Handle (char **parameters, int pcnt, userrec *user) + { + WriteServ(user->fd,"NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick,parameters[0],parameters[1]); + /* Is this aimed at our server? */ + if (Srv->MatchText(Srv->GetServerName(),parameters[0])) + { + /* Yes, initiate the given connect */ + WriteOpers("*** Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]); + char* para[1]; + para[0] = parameters[1]; + Creator->OnPreCommand("CONNECT", para, 1, user, true); + } + } +}; + + + /* Every SERVER connection inbound or outbound is represented by * an object of type TreeSocket. * TreeSockets, being inherited from InspSocket, can be tied into @@ -634,12 +667,12 @@ class TreeSocket : public InspSocket { if (this->LinkState == CONNECTING) { - Srv->SendOpers("*** Connection to "+myhost+"["+this->GetIP()+"] established."); /* we do not need to change state here. */ for (std::vector::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++) { if (x->Name == this->myhost) { + Srv->SendOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "" : this->GetIP())+"] established."); this->SendCapabilities(); if (x->EncryptionKey != "") { @@ -664,6 +697,7 @@ class TreeSocket : public InspSocket * If that happens the connection hangs here until it's closed. Unlikely * and rather harmless. */ + Srv->SendOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)"); return true; } @@ -849,33 +883,42 @@ class TreeSocket : public InspSocket { if (params.size() != 4) return true; - std::string channel = params[0]; time_t ts = atoi(params[1].c_str()); - std::string setby = params[2]; - std::string topic = params[3]; + std::string nsource = source; - chanrec* c = Srv->FindChannel(channel); + chanrec* c = Srv->FindChannel(params[0]); if (c) { if ((ts >= c->topicset) || (!*c->topic)) { std::string oldtopic = c->topic; - strlcpy(c->topic,topic.c_str(),MAXTOPIC); - strlcpy(c->setby,setby.c_str(),NICKMAX); + strlcpy(c->topic,params[3].c_str(),MAXTOPIC); + strlcpy(c->setby,params[2].c_str(),NICKMAX); c->topicset = ts; /* if the topic text is the same as the current topic, * dont bother to send the TOPIC command out, just silently * update the set time and set nick. */ - if (oldtopic != topic) - WriteChannelWithServ((char*)source.c_str(), c, "TOPIC %s :%s", c->name, c->topic); + if (oldtopic != params[3]) + { + userrec* user = Srv->FindNick(source); + if (!user) + { + WriteChannelWithServ((char*)source.c_str(), c, "TOPIC %s :%s", c->name, c->topic); + } + else + { + WriteChannel(c, user, "TOPIC %s :%s", c->name, c->topic); + nsource = user->server; + } + } } } /* all done, send it on its way */ params[3] = ":" + params[3]; - DoOneToAllButSender(source,"FTOPIC",params,source); + DoOneToAllButSender(source,"FTOPIC",params,nsource); return true; } @@ -927,56 +970,61 @@ class TreeSocket : public InspSocket { /* process one channel at a time, applying modes. */ char* usr = (char*)params[usernum].c_str(); - char permissions = *usr; - switch (permissions) - { - case '@': - usr++; - mode_users[modectr++] = usr; - strlcat(modestring,"o",MAXBUF); - break; - case '%': - usr++; - mode_users[modectr++] = usr; - strlcat(modestring,"h",MAXBUF); - break; - case '+': - usr++; - mode_users[modectr++] = usr; - strlcat(modestring,"v",MAXBUF); - break; - } - who = Srv->FindNick(usr); - if (who) - { - Srv->JoinUserToChannel(who,channel,key); - if (modectr >= (MAXMODES-1)) - { - /* theres a mode for this user. push them onto the mode queue, and flush it - * if there are more than MAXMODES to go. - */ - if ((ourTS >= TS) || (Srv->IsUlined(who->server))) + /* Safety check just to make sure someones not sent us an FJOIN full of spaces + * (is this even possible?) */ + if (usr && *usr) + { + char permissions = *usr; + switch (permissions) + { + case '@': + usr++; + mode_users[modectr++] = usr; + strlcat(modestring,"o",MAXBUF); + break; + case '%': + usr++; + mode_users[modectr++] = usr; + strlcat(modestring,"h",MAXBUF); + break; + case '+': + usr++; + mode_users[modectr++] = usr; + strlcat(modestring,"v",MAXBUF); + break; + } + who = Srv->FindNick(usr); + if (who) + { + Srv->JoinUserToChannel(who,channel,key); + if (modectr >= (MAXMODES-1)) { - /* We also always let u-lined clients win, no matter what the TS value */ - log(DEBUG,"Our our channel newer than theirs, accepting their modes"); - Srv->SendMode(mode_users,modectr,who); - } - else - { - log(DEBUG,"Their channel newer than ours, bouncing their modes"); - /* bouncy bouncy! */ - std::deque params; - /* modes are now being UNSET... */ - *mode_users[1] = '-'; - for (unsigned int x = 0; x < modectr; x++) + /* theres a mode for this user. push them onto the mode queue, and flush it + * if there are more than MAXMODES to go. + */ + if ((ourTS >= TS) || (Srv->IsUlined(who->server))) + { + /* We also always let u-lined clients win, no matter what the TS value */ + log(DEBUG,"Our our channel newer than theirs, accepting their modes"); + Srv->SendMode(mode_users,modectr,who); + } + else { - params.push_back(mode_users[x]); + log(DEBUG,"Their channel newer than ours, bouncing their modes"); + /* bouncy bouncy! */ + std::deque params; + /* modes are now being UNSET... */ + *mode_users[1] = '-'; + for (unsigned int x = 0; x < modectr; x++) + { + params.push_back(mode_users[x]); + } + // tell everyone to bounce the modes. bad modes, bad! + DoOneToMany(Srv->GetServerName(),"FMODE",params); } - // tell everyone to bounce the modes. bad modes, bad! - DoOneToMany(Srv->GetServerName(),"FMODE",params); + strcpy(mode_users[1],"+"); + modectr = 2; } - strcpy(mode_users[1],"+"); - modectr = 2; } } } @@ -1012,10 +1060,6 @@ class TreeSocket : public InspSocket return true; // NICK age nick host dhost ident +modes ip :gecos // 0 1 2 3 4 5 6 7 - std::string nick = params[1]; - std::string host = params[2]; - std::string dhost = params[3]; - std::string ident = params[4]; time_t age = atoi(params[0].c_str()); std::string modes = params[5]; while (*(modes.c_str()) == '+') @@ -1024,17 +1068,15 @@ class TreeSocket : public InspSocket m++; modes = m; } - std::string ip = params[6]; - std::string gecos = params[7]; - char* tempnick = (char*)nick.c_str(); - log(DEBUG,"Introduce client %s!%s@%s",tempnick,ident.c_str(),host.c_str()); + char* tempnick = (char*)params[1].c_str(); + log(DEBUG,"Introduce client %s!%s@%s",tempnick,params[4].c_str(),params[2].c_str()); user_hash::iterator iter; iter = clientlist.find(tempnick); if (iter != clientlist.end()) { // nick collision - log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,ident.c_str(),host.c_str(),(unsigned long)age,(unsigned long)iter->second->age); + log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,params[4].c_str(),params[2].c_str(),(unsigned long)age,(unsigned long)iter->second->age); this->WriteLine(":"+Srv->GetServerName()+" KILL "+tempnick+" :Nickname collision"); return true; } @@ -1042,15 +1084,15 @@ class TreeSocket : public InspSocket clientlist[tempnick] = new userrec(); clientlist[tempnick]->fd = FD_MAGIC_NUMBER; strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX); - strlcpy(clientlist[tempnick]->host, host.c_str(),160); - strlcpy(clientlist[tempnick]->dhost, dhost.c_str(),160); + strlcpy(clientlist[tempnick]->host, params[2].c_str(),160); + strlcpy(clientlist[tempnick]->dhost, params[3].c_str(),160); clientlist[tempnick]->server = (char*)FindServerNamePtr(source.c_str()); - strlcpy(clientlist[tempnick]->ident, ident.c_str(),IDENTMAX); - strlcpy(clientlist[tempnick]->fullname, gecos.c_str(),MAXGECOS); + strlcpy(clientlist[tempnick]->ident, params[4].c_str(),IDENTMAX); + strlcpy(clientlist[tempnick]->fullname, params[7].c_str(),MAXGECOS); clientlist[tempnick]->registered = 7; clientlist[tempnick]->signon = age; strlcpy(clientlist[tempnick]->modes, modes.c_str(),53); - strlcpy(clientlist[tempnick]->ip,ip.c_str(),16); + inet_aton(params[6].c_str(),&clientlist[tempnick]->ip4); ucrec a; a.channel = NULL; @@ -1060,7 +1102,7 @@ class TreeSocket : public InspSocket if (!this->bursting) { - WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host,clientlist[tempnick]->ip); + WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host,(char*)inet_ntoa(clientlist[tempnick]->ip4)); } params[7] = ":" + params[7]; DoOneToAllButSender(source,"NICK",params,source); @@ -1083,10 +1125,10 @@ class TreeSocket : public InspSocket log(DEBUG,"Sending FJOINs to other server for %s",c->name); char list[MAXBUF]; snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); - std::vector *ulist = c->GetUsers(); - for (unsigned int i = 0; i < ulist->size(); i++) + std::map *ulist = c->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[i]; + char* o = i->second; userrec* otheruser = (userrec*)o; strlcat(list," ",MAXBUF); strlcat(list,cmode(otheruser,c),MAXBUF); @@ -1109,45 +1151,46 @@ class TreeSocket : public InspSocket void SendXLines(TreeServer* Current) { char data[MAXBUF]; + const char* sn = Srv->GetServerName().c_str(); /* Yes, these arent too nice looking, but they get the job done */ for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { - snprintf(data,MAXBUF,":%s ADDLINE Z %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + snprintf(data,MAXBUF,":%s ADDLINE Z %s %s %lu %lu :%s",sn,i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { - snprintf(data,MAXBUF,":%s ADDLINE Q %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + snprintf(data,MAXBUF,":%s ADDLINE Q %s %s %lu %lu :%s",sn,i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { - snprintf(data,MAXBUF,":%s ADDLINE G %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + snprintf(data,MAXBUF,":%s ADDLINE G %s %s %lu %lu :%s",sn,i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { - snprintf(data,MAXBUF,":%s ADDLINE E %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + snprintf(data,MAXBUF,":%s ADDLINE E %s %s %lu %lu :%s",sn,i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) { - snprintf(data,MAXBUF,":%s ADDLINE Z %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + snprintf(data,MAXBUF,":%s ADDLINE Z %s %s %lu %lu :%s",sn,i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) { - snprintf(data,MAXBUF,":%s ADDLINE Q %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + snprintf(data,MAXBUF,":%s ADDLINE Q %s %s %lu %lu :%s",sn,i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) { - snprintf(data,MAXBUF,":%s ADDLINE G %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + snprintf(data,MAXBUF,":%s ADDLINE G %s %s %lu %lu :%s",sn,i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) { - snprintf(data,MAXBUF,":%s ADDLINE E %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + snprintf(data,MAXBUF,":%s ADDLINE E %s %s %lu %lu :%s",sn,i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } } @@ -1157,19 +1200,20 @@ class TreeSocket : public InspSocket { char data[MAXBUF]; std::deque list; + const char* sn = Srv->GetServerName().c_str(); for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++) { SendFJoins(Current, c->second); - snprintf(data,MAXBUF,":%s FMODE %s +%s",Srv->GetServerName().c_str(),c->second->name,chanmodes(c->second)); + snprintf(data,MAXBUF,":%s FMODE %s +%s",sn,c->second->name,chanmodes(c->second,true)); this->WriteLine(data); if (*c->second->topic) { - snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s",Srv->GetServerName().c_str(),c->second->name,(unsigned long)c->second->topicset,c->second->setby,c->second->topic); + snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s",sn,c->second->name,(unsigned long)c->second->topicset,c->second->setby,c->second->topic); this->WriteLine(data); } for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++) { - snprintf(data,MAXBUF,":%s FMODE %s +b %s",Srv->GetServerName().c_str(),c->second->name,b->data); + snprintf(data,MAXBUF,":%s FMODE %s +b %s",sn,c->second->name,b->data); this->WriteLine(data); } FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this)); @@ -1191,12 +1235,16 @@ class TreeSocket : public InspSocket { if (u->second->registered == 7) { - snprintf(data,MAXBUF,":%s NICK %lu %s %s %s %s +%s %s :%s",u->second->server,(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->ip,u->second->fullname); + snprintf(data,MAXBUF,":%s NICK %lu %s %s %s %s +%s %s :%s",u->second->server,(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,(char*)inet_ntoa(u->second->ip4),u->second->fullname); this->WriteLine(data); - if (strchr(u->second->modes,'o')) + if (*u->second->oper) { this->WriteLine(":"+std::string(u->second->nick)+" OPERTYPE "+std::string(u->second->oper)); } + if (*u->second->awaymsg) + { + this->WriteLine(":"+std::string(u->second->nick)+" AWAY :"+std::string(u->second->awaymsg)); + } FOREACH_MOD(I_OnSyncUser,OnSyncUser(u->second,(Module*)TreeProtocolModule,(void*)this)); list.clear(); u->second->GetExtList(list); @@ -1226,6 +1274,7 @@ class TreeSocket : public InspSocket /* Send everything else (channel modes, xlines etc) */ this->SendChannelModes(s); this->SendXLines(s); + FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this)); this->WriteLine("ENDBURST"); Srv->SendOpers("*** Finished bursting to \2"+s->GetName()+"\2."); } @@ -1241,25 +1290,19 @@ class TreeSocket : public InspSocket virtual bool OnDataReady() { char* data = this->Read(); - if (data) + /* Check that the data read is a valid pointer and it has some content */ + if (data && *data) { - this->in_buffer += data; + this->in_buffer.append(data); /* While there is at least one new line in the buffer, * do something useful (we hope!) with it. */ while (in_buffer.find("\n") != std::string::npos) { - char* line = (char*)in_buffer.c_str(); - std::string ret = ""; - while ((*line != '\n') && (strlen(line))) - { - if ((*line != '\r') && (*line != '\n')) - ret = ret + *line; - line++; - } - if ((*line == '\n') || (*line == '\r')) - line++; - in_buffer = line; + std::string ret = in_buffer.substr(0,in_buffer.find("\n")-1); + in_buffer = in_buffer.substr(in_buffer.find("\n")+1,in_buffer.length()-in_buffer.find("\n")); + if (ret.find("\r") != std::string::npos) + ret = in_buffer.substr(0,in_buffer.find("\r")-1); /* Process this one, abort if it * didnt return true. */ @@ -1290,6 +1333,9 @@ class TreeSocket : public InspSocket } } } + /* EAGAIN returns an empty but non-NULL string, so this + * evaluates to TRUE for EAGAIN but to FALSE for EOF. + */ return (data != NULL); } @@ -1450,7 +1496,11 @@ class TreeSocket : public InspSocket TreeServer* ServerSource = FindServer(prefix); if (ServerSource) { - if (*(params[0].c_str()) == '#') + if (params[0] == "*") + { + FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_OTHER,NULL,params[1],params[2])); + } + else if (*(params[0].c_str()) == '#') { chanrec* c = Srv->FindChannel(params[0]); if (c) @@ -1458,7 +1508,7 @@ class TreeSocket : public InspSocket FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2])); } } - else + else if (*(params[0].c_str()) != '#') { userrec* u = Srv->FindNick(params[0]); if (u) @@ -1503,42 +1553,42 @@ class TreeSocket : public InspSocket { if (params.size() < 6) return true; - std::string linetype = params[0]; /* Z, Q, E, G, K */ - std::string mask = params[1]; /* Line type dependent */ - std::string source = params[2]; /* may not be online or may be a server */ - std::string settime = params[3]; /* EPOCH time set */ - std::string duration = params[4]; /* Duration secs */ - std::string reason = params[5]; - switch (*(linetype.c_str())) + bool propogate = false; + + switch (*(params[0].c_str())) { case 'Z': - add_zline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); - zline_set_creation_time((char*)mask.c_str(), atoi(settime.c_str())); + propogate = add_zline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + zline_set_creation_time((char*)params[1].c_str(), atoi(params[3].c_str())); break; case 'Q': - add_qline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); - qline_set_creation_time((char*)mask.c_str(), atoi(settime.c_str())); + propogate = add_qline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + qline_set_creation_time((char*)params[1].c_str(), atoi(params[3].c_str())); break; case 'E': - add_eline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); - eline_set_creation_time((char*)mask.c_str(), atoi(settime.c_str())); + propogate = add_eline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + eline_set_creation_time((char*)params[1].c_str(), atoi(params[3].c_str())); break; case 'G': - add_gline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); - gline_set_creation_time((char*)mask.c_str(), atoi(settime.c_str())); + propogate = add_gline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); + gline_set_creation_time((char*)params[1].c_str(), atoi(params[3].c_str())); break; case 'K': - add_kline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); + propogate = add_kline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); break; default: /* Just in case... */ - Srv->SendOpers("*** \2WARNING\2: Invalid xline type '"+linetype+"' sent by server "+prefix+", ignored!"); + Srv->SendOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!"); + propogate = false; break; } /* Send it on its way */ - params[5] = ":" + params[5]; - DoOneToAllButSender(prefix,"ADDLINE",params,prefix); + if (propogate) + { + params[5] = ":" + params[5]; + DoOneToAllButSender(prefix,"ADDLINE",params,prefix); + } return true; } @@ -1735,7 +1785,7 @@ class TreeSocket : public InspSocket Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, remote server did not enable AES."); return false; } - Srv->SendOpers("*** Verified incoming server connection from \002"+servername+"\002["+this->GetIP()+"] ("+description+")"); + Srv->SendOpers("*** Verified incoming server connection from \002"+servername+"\002["+(x->HiddenFromStats ? "" : this->GetIP())+"] ("+description+")"); this->InboundServerName = servername; this->InboundDescription = description; // this is good. Send our details: Our server name and description and hopcount of 0, @@ -1810,6 +1860,7 @@ class TreeSocket : public InspSocket if (line == "") return true; Srv->Log(DEBUG,"IN: "+line); + std::deque params; this->Split(line,true,params); std::string command = ""; @@ -1878,6 +1929,11 @@ class TreeSocket : public InspSocket { return this->Capab(params); } + else if ((command == "U") || (command == "S")) + { + this->WriteLine("ERROR :Cannot use the old-style mesh linking protocol with m_spanningtree.so!"); + return false; + } else { this->WriteLine("ERROR :Invalid command in negotiation phase."); @@ -1893,6 +1949,11 @@ class TreeSocket : public InspSocket // silently ignore. return true; } + else if ((command == "U") || (command == "S")) + { + this->WriteLine("ERROR :Cannot use the old-style mesh linking protocol with m_spanningtree.so!"); + return false; + } else if (command == "BURST") { this->LinkState = CONNECTED; @@ -1956,6 +2017,13 @@ class TreeSocket : public InspSocket log(DEBUG,"Protocol violation: Fake direction in command '%s' from connection '%s'",line.c_str(),this->GetName().c_str()); return true; } + + /* Fix by brain: + * When there is activity on the socket, reset the ping counter so + * that we're not wasting bandwidth pinging an active server. + */ + route_back_again->SetNextPingTime(time(NULL) + 120); + route_back_again->SetPingFlag(); } if (command == "SVSMODE") @@ -2080,6 +2148,32 @@ class TreeSocket : public InspSocket } if (who) { + if ((command == "NICK") && (params.size() > 0)) + { + /* On nick messages, check that the nick doesnt + * already exist here. If it does, kill their copy, + * and our copy. + */ + userrec* x = Srv->FindNick(params[0]); + if (x) + { + std::deque p; + p.push_back(params[0]); + p.push_back("Nickname collision ("+prefix+" -> "+params[0]+")"); + DoOneToMany(Srv->GetServerName(),"KILL",p); + p.clear(); + p.push_back(prefix); + p.push_back("Nickname collision"); + DoOneToMany(Srv->GetServerName(),"KILL",p); + Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")"); + userrec* y = Srv->FindNick(prefix); + if (y) + { + Srv->QuitUser(y,"Nickname collision"); + } + return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); + } + } // its a user target = who->server; char* strparams[127]; @@ -2144,7 +2238,7 @@ class TreeSocket : public InspSocket { Squit(s,"Remote host closed the connection"); } - WriteOpers("Server '\2%s\2[%s]' closed the connection.",quitserver.c_str(),this->GetIP().c_str()); + WriteOpers("Server '\2%s\2' closed the connection.",quitserver.c_str()); } virtual int OnIncomingConnection(int newsock, char* ip) @@ -2170,11 +2264,10 @@ void AddThisServer(TreeServer* server, std::deque &list) // returns a list of DIRECT servernames for a specific channel void GetListOfServersForChannel(chanrec* c, std::deque &list) { - std::vector *ulist = c->GetUsers(); - unsigned int ucount = ulist->size(); - for (unsigned int i = 0; i < ucount; i++) + std::map *ulist = c->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[i]; + char* o = i->second; userrec* otheruser = (userrec*)o; if (otheruser->fd < 0) { @@ -2193,6 +2286,11 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref { if ((params.size() >= 2) && (*(params[0].c_str()) != '$')) { + /* Prefixes */ + if ((*(params[0].c_str()) == '@') || (*(params[0].c_str()) == '%') || (*(params[0].c_str()) == '+')) + { + params[0] = params[0].substr(1, params[0].length()-1); + } if (*(params[0].c_str()) != '#') { // special routing for private messages/notices @@ -2347,6 +2445,8 @@ void ReadConfiguration(bool rebind) } } } + FlatLinks = Conf->ReadFlag("options","flatlinks",0); + HideULines = Conf->ReadFlag("options","hideulines",0); LinkBlocks.clear(); for (int j =0; j < Conf->Enumerate("link"); j++) { @@ -2358,6 +2458,7 @@ void ReadConfiguration(bool rebind) L.RecvPass = Conf->ReadValue("link","recvpass",j); L.AutoConnect = Conf->ReadInteger("link","autoconnect",j,true); L.EncryptionKey = Conf->ReadValue("link","encryptionkey",j); + L.HiddenFromStats = Conf->ReadFlag("link","hidden",j); L.NextConnectTime = time(NULL) + L.AutoConnect; /* Bugfix by brain, do not allow people to enter bad configurations */ if ((L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port)) @@ -2394,11 +2495,14 @@ class ModuleSpanningTree : public Module std::vector Bindings; int line; int NumServers; + unsigned int max_local; + unsigned int max_global; + cmd_rconnect* command_rconnect; public: ModuleSpanningTree(Server* Me) - : Module::Module(Me) + : Module::Module(Me), max_local(0), max_global(0) { Srv = Me; Bindings.clear(); @@ -2407,6 +2511,9 @@ class ModuleSpanningTree : public Module TreeRoot = new TreeServer(Srv->GetServerName(),Srv->GetServerDescription()); ReadConfiguration(true); + + command_rconnect = new cmd_rconnect(this); + Srv->AddCommand(command_rconnect); } void ShowLinks(TreeServer* Current, userrec* user, int hops) @@ -2418,9 +2525,19 @@ class ModuleSpanningTree : public Module } for (unsigned int q = 0; q < Current->ChildCount(); q++) { - ShowLinks(Current->GetChild(q),user,hops+1); + if ((HideULines) && (Srv->IsUlined(Current->GetName()))) + { + if (*user->oper) + { + ShowLinks(Current->GetChild(q),user,hops+1); + } + } + else + { + ShowLinks(Current->GetChild(q),user,hops+1); + } } - WriteServ(user->fd,"364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),Parent.c_str(),hops,Current->GetDesc().c_str()); + WriteServ(user->fd,"364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),(FlatLinks && (!*user->oper)) ? Srv->GetServerName().c_str() : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str()); } int CountLocalServs() @@ -2442,11 +2559,19 @@ class ModuleSpanningTree : public Module void HandleLusers(char** parameters, int pcnt, userrec* user) { + /* Only update these when someone wants to see them, more efficient */ + if ((unsigned int)local_count() > max_local) + max_local = local_count(); + if (clientlist.size() > max_global) + max_global = clientlist.size(); + WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,usercnt()-usercount_invisible(),usercount_invisible(),this->CountServs()); 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(),this->CountLocalServs()); + WriteServ(user->fd,"265 %s :Current Local Users: %d Max: %d",user->nick,local_count(),max_local); + WriteServ(user->fd,"266 %s :Current Global Users: %d Max: %d",user->nick,clientlist.size(),max_global); return; } @@ -2489,7 +2614,17 @@ class ModuleSpanningTree : public Module line++; for (unsigned int q = 0; q < Current->ChildCount(); q++) { - ShowMap(Current->GetChild(q),user,depth+2,matrix); + if ((HideULines) && (Srv->IsUlined(Current->GetChild(q)->GetName()))) + { + if (*user->oper) + { + ShowMap(Current->GetChild(q),user,(FlatLinks && (!*user->oper)) ? depth : depth+2,matrix); + } + } + else + { + ShowMap(Current->GetChild(q),user,(FlatLinks && (!*user->oper)) ? depth : depth+2,matrix); + } } } } @@ -2571,7 +2706,7 @@ class ModuleSpanningTree : public Module log(DEBUG,"Splitting server %s",s->GetName().c_str()); WriteOpers("*** SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick); sock->Squit(s,"Server quit by "+std::string(user->nick)+"!"+std::string(user->ident)+"@"+std::string(user->host)); - sock->Close(); + Srv->RemoveSocket(sock); } else { @@ -2615,22 +2750,23 @@ class ModuleSpanningTree : public Module TreeSocket* sock = serv->GetSocket(); if (sock) { - if (curtime >= serv->NextPingTime()) - { - if (serv->AnsweredLastPing()) - { - sock->WriteLine(":"+Srv->GetServerName()+" PING "+serv->GetName()); - serv->SetNextPingTime(curtime + 60); - } - else - { - // they didnt answer, boot them - WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); - sock->Squit(serv,"Ping timeout"); - sock->Close(); - return; - } - } + if (curtime >= serv->NextPingTime()) + { + if (serv->AnsweredLastPing()) + { + sock->WriteLine(":"+Srv->GetServerName()+" PING "+serv->GetName()); + serv->SetNextPingTime(curtime + 120); + } + else + { + // they didnt answer, boot them + WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); + sock->Squit(serv,"Ping timeout"); + Srv->RemoveSocket(sock); + return; + } + } + } } } @@ -2649,7 +2785,15 @@ class ModuleSpanningTree : public Module // an autoconnected server is not connected. Check if its time to connect it WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect); TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name); - Srv->AddSocket(newsocket); + if (newsocket->GetState() != I_ERROR) + { + Srv->AddSocket(newsocket); + } + else + { + WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002.",x->Name.c_str()); + delete newsocket; + } } } } @@ -2699,9 +2843,17 @@ class ModuleSpanningTree : public Module TreeServer* CheckDupe = FindServer(x->Name); if (!CheckDupe) { - WriteServ(user->fd,"NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),x->IPAddr.c_str(),x->Port); + WriteServ(user->fd,"NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "" : x->IPAddr.c_str()),x->Port); TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name); - Srv->AddSocket(newsocket); + if (newsocket->GetState() != I_ERROR) + { + Srv->AddSocket(newsocket); + } + else + { + WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002.",user->nick,x->Name.c_str()); + delete newsocket; + } return 1; } else @@ -2721,7 +2873,7 @@ class ModuleSpanningTree : public Module { for (unsigned int i = 0; i < LinkBlocks.size(); i++) { - WriteServ(user->fd,"213 %s C *@%s * %s %d 0 %s",user->nick,LinkBlocks[i].IPAddr.c_str(),LinkBlocks[i].Name.c_str(),LinkBlocks[i].Port,(LinkBlocks[i].EncryptionKey != "" ? "es" : " s")); + WriteServ(user->fd,"213 %s C *@%s * %s %d 0 %c%c%c",user->nick,(LinkBlocks[i].HiddenFromStats ? "" : LinkBlocks[i].IPAddr).c_str(),LinkBlocks[i].Name.c_str(),LinkBlocks[i].Port,(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-'),(LinkBlocks[i].AutoConnect ? 'a' : '-'),'s'); WriteServ(user->fd,"244 %s H * * %s",user->nick,LinkBlocks[i].Name.c_str()); } WriteServ(user->fd,"219 %s %c :End of /STATS report",user->nick,statschar); @@ -2793,6 +2945,7 @@ class ModuleSpanningTree : public Module params.push_back(std::string(parameters[j])); } } + log(DEBUG,"Globally route '%s'",command.c_str()); DoOneToMany(user->nick,command,params); } return 0; @@ -2836,7 +2989,7 @@ class ModuleSpanningTree : public Module } } - virtual void OnUserNotice(userrec* user, void* dest, int target_type, std::string text) + virtual void OnUserNotice(userrec* user, void* dest, int target_type, std::string text, char status) { if (target_type == TYPE_USER) { @@ -2855,6 +3008,9 @@ class ModuleSpanningTree : public Module if (user->fd > -1) { chanrec *c = (chanrec*)dest; + std::string cname = c->name; + if (status) + cname = status + cname; std::deque list; GetListOfServersForChannel(c,list); unsigned int ucount = list.size(); @@ -2862,13 +3018,13 @@ class ModuleSpanningTree : public Module { TreeSocket* Sock = list[i]->GetSocket(); if (Sock) - Sock->WriteLine(":"+std::string(user->nick)+" NOTICE "+std::string(c->name)+" :"+text); + Sock->WriteLine(":"+std::string(user->nick)+" NOTICE "+cname+" :"+text); } } } } - virtual void OnUserMessage(userrec* user, void* dest, int target_type, std::string text) + virtual void OnUserMessage(userrec* user, void* dest, int target_type, std::string text, char status) { if (target_type == TYPE_USER) { @@ -2889,6 +3045,9 @@ class ModuleSpanningTree : public Module if (user->fd > -1) { chanrec *c = (chanrec*)dest; + std::string cname = c->name; + if (status) + cname = status + cname; std::deque list; GetListOfServersForChannel(c,list); unsigned int ucount = list.size(); @@ -2896,7 +3055,7 @@ class ModuleSpanningTree : public Module { TreeSocket* Sock = list[i]->GetSocket(); if (Sock) - Sock->WriteLine(":"+std::string(user->nick)+" PRIVMSG "+std::string(c->name)+" :"+text); + Sock->WriteLine(":"+std::string(user->nick)+" PRIVMSG "+cname+" :"+text); } } } @@ -2961,12 +3120,14 @@ class ModuleSpanningTree : public Module DoOneToMany(user->nick,"FNAME",params); } - virtual void OnUserPart(userrec* user, chanrec* channel) + virtual void OnUserPart(userrec* user, chanrec* channel, std::string partmessage) { if (user->fd > -1) { std::deque params; params.push_back(channel->name); + if (partmessage != "") + params.push_back(":"+partmessage); DoOneToMany(user->nick,"PART",params); } } @@ -2984,7 +3145,7 @@ class ModuleSpanningTree : public Module params.push_back(user->dhost); params.push_back(user->ident); params.push_back("+"+std::string(user->modes)); - params.push_back(user->ip); + params.push_back((char*)inet_ntoa(user->ip4)); params.push_back(":"+std::string(user->fullname)); DoOneToMany(Srv->GetServerName(),"NICK",params); @@ -3025,7 +3186,7 @@ class ModuleSpanningTree : public Module virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason) { - if (source->fd > -1) + if ((source) && (source->fd > -1)) { std::deque params; params.push_back(chan->name); @@ -3162,6 +3323,26 @@ class ModuleSpanningTree : public Module } } + virtual void OnSetAway(userrec* user) + { + if (IS_LOCAL(user)) + { + std::deque params; + params.push_back(":"+std::string(user->awaymsg)); + DoOneToMany(user->nick,"AWAY",params); + } + } + + virtual void OnCancelAway(userrec* user) + { + if (IS_LOCAL(user)) + { + std::deque params; + params.clear(); + DoOneToMany(user->nick,"AWAY",params); + } + } + virtual void ProtoSendMode(void* opaque, int target_type, void* target, std::string modeline) { TreeSocket* s = (TreeSocket*)opaque; @@ -3190,7 +3371,11 @@ class ModuleSpanningTree : public Module userrec* u = (userrec*)target; s->WriteLine(":"+Srv->GetServerName()+" METADATA "+u->nick+" "+extname+" :"+extdata); } - else + else if (target_type == TYPE_OTHER) + { + s->WriteLine(":"+Srv->GetServerName()+" METADATA * "+extname+" :"+extdata); + } + else if (target_type == TYPE_CHANNEL) { chanrec* c = (chanrec*)target; s->WriteLine(":"+Srv->GetServerName()+" METADATA "+c->name+" "+extname+" :"+extdata); @@ -3198,6 +3383,18 @@ class ModuleSpanningTree : public Module } } + virtual void OnEvent(Event* event) + { + if (event->GetEventID() == "send_metadata") + { + std::deque* params = (std::deque*)event->GetData(); + if (params->size() < 3) + return; + (*params)[2] = ":" + (*params)[2]; + DoOneToMany(Srv->GetServerName(),"METADATA",*params); + } + } + virtual ~ModuleSpanningTree() { } @@ -3215,7 +3412,19 @@ class ModuleSpanningTree : public Module List[I_OnUserQuit] = List[I_OnUserPostNick] = List[I_OnUserKick] = List[I_OnRemoteKill] = List[I_OnRehash] = 1; List[I_OnOper] = List[I_OnAddGLine] = List[I_OnAddZLine] = List[I_OnAddQLine] = List[I_OnAddELine] = 1; List[I_OnDelGLine] = List[I_OnDelZLine] = List[I_OnDelQLine] = List[I_OnDelELine] = List[I_ProtoSendMode] = List[I_OnMode] = 1; - List[I_OnStats] = List[I_ProtoSendMetaData] = 1; + List[I_OnStats] = List[I_ProtoSendMetaData] = List[I_OnEvent] = List[I_OnSetAway] = List[I_OnCancelAway] = 1; + } + + /* It is IMPORTANT that m_spanningtree is the last module in the chain + * so that any activity it sees is FINAL, e.g. we arent going to send out + * a NICK message before m_cloaking has finished putting the +x on the user, + * etc etc. + * Therefore, we return PRIORITY_LAST to make sure we end up at the END of + * the module call queue. + */ + Priority Prioritize() + { + return PRIORITY_LAST; } };