-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
*
- * Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- * E-mail:
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ * E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
*
bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string prefix, std::string command, std::deque<std::string> ¶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<KLine> klines;
extern std::vector<GLine> glines;
}
else
{
- while (this->Route->GetParent() != TreeRoot)
+ while (this->Route->GetParent() != TreeRoot)
{
this->Route = Route->GetParent();
}
unsigned long AutoConnect;
time_t NextConnectTime;
std::string EncryptionKey;
+ bool HiddenFromStats;
};
/* The usual stuff for inspircd modules,
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
* to server docs on the inspircd.org site, the other side
* will then send back its own server string.
*/
- virtual bool OnConnected()
+ virtual bool OnConnected()
{
if (this->LinkState == CONNECTING)
{
- Srv->SendOpers("*** Connection to "+myhost+"["+this->GetIP()+"] established.");
/* we do not need to change state here. */
for (std::vector<Link>::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++)
{
if (x->Name == this->myhost)
{
+ Srv->SendOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] established.");
this->SendCapabilities();
if (x->EncryptionKey != "")
{
* 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;
}
- virtual void OnError(InspSocketError e)
+ virtual void OnError(InspSocketError e)
{
/* We don't handle this method, because all our
* dirty work is done in OnClose() (see below)
*/
}
- virtual int OnDisconnect()
+ virtual int OnDisconnect()
{
/* For the same reason as above, we don't
* handle OnDisconnect()
std::vector<std::string> modlist;
std::string capabilities = "";
- for (int i = 0; i <= MODCOUNT; i++)
- {
+ for (int i = 0; i <= MODCOUNT; i++)
+ {
if ((modules[i]->GetVersion().Flags & VF_STATIC) || (modules[i]->GetVersion().Flags & VF_COMMON))
modlist.push_back(Config->module_names[i]);
- }
+ }
sort(modlist.begin(),modlist.end());
for (unsigned int i = 0; i < modlist.size(); i++)
{
this->WriteLine("ERROR :Invalid number of parameters for CAPAB");
return false;
}
+
if (params[0] != this->MyCapabilities())
{
- std::string quitserver = this->myhost;
- if (this->InboundServerName != "")
- {
- quitserver = this->InboundServerName;
- }
+ std::string quitserver = this->myhost;
+ if (this->InboundServerName != "")
+ {
+ quitserver = this->InboundServerName;
+ }
+
WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str());
WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str());
WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str());
this->WriteLine("ERROR :CAPAB mismatch; My capabilities: '"+this->MyCapabilities()+"'");
return false;
}
+
return true;
}
{
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-1);
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;
}
{
if (params.size() < 8)
return true;
+ if (params.size() > 8)
+ {
+ this->WriteLine(":"+Srv->GetServerName()+" KILL "+params[1]+" :Invalid client introduction ("+params[1]+"?)");
+ 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];
+ // 0 123 4 56 7
time_t age = atoi(params[0].c_str());
std::string modes = params[5];
while (*(modes.c_str()) == '+')
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;
}
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]->nick, tempnick,NICKMAX-1);
+ 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;
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);
// Increment the Source Servers User Count..
TreeServer* SourceServer = FindServer(source);
- if (SourceServer) {
+ if (SourceServer)
+ {
SourceServer->AddUserCount();
}
{
log(DEBUG,"Sending FJOINs to other server for %s",c->name);
char list[MAXBUF];
+ std::string individual_halfops = ":"+Srv->GetServerName()+" FMODE "+c->name;
snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age);
std::map<char*,char*> *ulist = c->GetUsers();
+ std::vector<userrec*> specific_halfop;
+ std::vector<userrec*> specific_voice;
for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
{
char* o = i->second;
userrec* otheruser = (userrec*)o;
strlcat(list," ",MAXBUF);
- strlcat(list,cmode(otheruser,c),MAXBUF);
+ int x = cflags(otheruser,c);
+ if ((x & UCMODE_HOP) && (x & UCMODE_OP))
+ {
+ specific_halfop.push_back(otheruser);
+ }
+ if (((x & UCMODE_HOP) || (x & UCMODE_OP)) && (x & UCMODE_VOICE))
+ {
+ specific_voice.push_back(otheruser);
+ }
+
+ char* n = "";
+ if (x & UCMODE_OP)
+ {
+ n = "@";
+ }
+ else if (x & UCMODE_HOP)
+ {
+ n = "%";
+ }
+ else if (x & UCMODE_VOICE)
+ {
+ n = "+";
+ }
+
+ strlcat(list,n,MAXBUF);
strlcat(list,otheruser->nick,MAXBUF);
if (strlen(list)>(480-NICKMAX))
{
log(DEBUG,"FJOIN line wrapped");
this->WriteLine(list);
snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age);
+ for (unsigned int y = 0; y < specific_voice.size(); y++)
+ {
+ this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick);
+ }
+ for (unsigned int y = 0; y < specific_halfop.size(); y++)
+ {
+ this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +h "+specific_halfop[y]->nick);
+ }
}
}
if (list[strlen(list)-1] != ':')
{
log(DEBUG,"Final FJOIN line");
this->WriteLine(list);
+ for (unsigned int y = 0; y < specific_voice.size(); y++)
+ {
+ this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick);
+ }
+ for (unsigned int y = 0; y < specific_halfop.size(); y++)
+ {
+ this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +h "+specific_halfop[y]->nick);
+ }
}
}
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<ZLine>::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<QLine>::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<GLine>::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<ELine>::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<ZLine>::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<QLine>::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<GLine>::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<ELine>::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);
}
}
{
char data[MAXBUF];
std::deque<std::string> 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));
{
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);
/* 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.");
}
* IF THIS FUNCTION RETURNS FALSE, THE CORE CLOSES AND DELETES
* THE SOCKET OBJECT FOR US.
*/
- virtual bool OnDataReady()
+ virtual bool OnDataReady()
{
+ log(DEBUG,"TreeSocket::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;
+ log(DEBUG,"got some 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.
*/
}
if (!this->ProcessLine(ret))
{
+ log(DEBUG,"ProcessLine says no!");
return false;
}
}
}
+ /* EAGAIN returns an empty but non-NULL string, so this
+ * evaluates to TRUE for EAGAIN but to FALSE for EOF.
+ */
return (data != NULL);
}
log(DEBUG,"OUT: %s",line.c_str());
if (this->ctx_out)
{
- log(DEBUG,"AES context");
char result[10240];
char result64[10240];
if (this->keylength)
{
- while (line.length() % this->keylength != 0)
+ // pad it to the key length
+ int n = this->keylength - (line.length() % this->keylength);
+ if (n)
{
- // pad it to be a multiple of the key length
- line = line + "\7";
+ log(DEBUG,"Append %d chars to line to make it %d long from %d, key length %d",n,n+line.length(),line.length(),this->keylength);
+ line.append(n,'\7');
}
}
unsigned int ll = line.length();
- log(DEBUG,"Plaintext line with padding = %d chars",ll);
ctx_out->Encrypt(line.c_str(), result, ll, 1);
- log(DEBUG,"Encrypted.");
to64frombits((unsigned char*)result64,(unsigned char*)result,ll);
line = result64;
- log(DEBUG,"Encrypted: %s",line.c_str());
//int from64tobits(char *out, const char *in, int maxlen);
}
return this->Write(line + "\r\n");
}
/* Handle ERROR command */
- bool Error(std::deque<std::string> params)
+ bool Error(std::deque<std::string> ¶ms)
{
if (params.size() < 1)
return false;
- std::string Errmsg = params[0];
- std::string SName = myhost;
- if (InboundServerName != "")
- {
- SName = InboundServerName;
- }
- Srv->SendOpers("*** ERROR from "+SName+": "+Errmsg);
- /* we will return false to cause the socket to close.
- */
+ WriteOpers("*** ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str());
+ /* we will return false to cause the socket to close. */
return false;
}
bool OperType(std::string prefix, std::deque<std::string> ¶ms)
{
if (params.size() != 1)
+ {
+ log(DEBUG,"Received invalid oper type from %s",prefix.c_str());
return true;
+ }
std::string opertype = params[0];
userrec* u = Srv->FindNick(prefix);
if (u)
{
- strlcpy(u->oper,opertype.c_str(),NICKMAX);
+ strlcpy(u->oper,opertype.c_str(),NICKMAX-1);
if (!strchr(u->modes,'o'))
{
strcat(u->modes,"o");
{
if (params.size() < 3)
return true;
+
userrec* u = Srv->FindNick(params[0]);
+
if (u)
{
- Srv->ChangeUserNick(u,params[1]);
- u->age = atoi(params[2].c_str());
DoOneToAllButSender(prefix,"SVSNICK",params,prefix);
+ if (IS_LOCAL(u))
+ {
+ std::deque<std::string> par;
+ par.push_back(params[1]);
+ DoOneToMany(u->nick,"NICK",par);
+ Srv->ChangeUserNick(u,params[1]);
+ u->age = atoi(params[2].c_str());
+ }
}
return true;
}
{
if (params.size() < 2)
return true;
+
userrec* u = Srv->FindNick(params[0]);
+
if (u)
{
Srv->JoinUserToChannel(u,params[1],"");
{
if (params.size() < 1)
return false;
+
std::string servermask = params[0];
+
if (Srv->MatchText(Srv->GetServerName(),servermask))
{
Srv->SendOpers("*** Remote rehash initiated from server \002"+prefix+"\002.");
{
if (params.size() != 2)
return true;
+
std::string nick = params[0];
userrec* u = Srv->FindNick(prefix);
userrec* who = Srv->FindNick(nick);
+
if (who)
{
/* Prepend kill source, if we don't have one */
{
if (params.size() < 1)
return true;
- TreeServer* ServerSource = FindServer(prefix);
- if (ServerSource)
+
+ if (params.size() == 1)
{
- ServerSource->SetPingFlag();
+ TreeServer* ServerSource = FindServer(prefix);
+ if (ServerSource)
+ {
+ ServerSource->SetPingFlag();
+ }
}
+ else
+ {
+ std::string forwardto = params[1];
+ if (forwardto == Srv->GetServerName())
+ {
+ /*
+ * this is a PONG for us
+ * if the prefix is a user, check theyre local, and if they are,
+ * dump the PONG reply back to their fd. If its a server, do nowt.
+ * Services might want to send these s->s, but we dont need to yet.
+ */
+ userrec* u = Srv->FindNick(prefix);
+
+ if (u)
+ {
+ WriteServ(u->fd,"PONG %s %s",params[0].c_str(),params[1].c_str());
+ }
+ }
+ else
+ {
+ // not for us, pass it on :)
+ DoOneToOne(prefix,"PONG",params,forwardto);
+ }
+ }
+
return true;
}
{
if (params.size() < 3)
return true;
+
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)
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)
}
}
}
+
params[2] = ":" + params[2];
DoOneToAllButSender(prefix,"METADATA",params,prefix);
return true;
{
if (params.size() < 1)
return true;
+
TreeServer* ServerSource = FindServer(prefix);
+
if (ServerSource)
{
ServerSource->SetVersion(params[0]);
{
if (params.size() < 1)
return true;
+
userrec* u = Srv->FindNick(prefix);
+
if (u)
{
Srv->ChangeHost(u,params[0]);
{
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);
+ }
+ if (!this->bursting)
+ {
+ apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
+ }
return true;
}
{
if (params.size() < 1)
return true;
+
userrec* u = Srv->FindNick(prefix);
+
if (u)
{
Srv->ChangeGECOS(u,params[0]);
{
if (params.size() < 1)
return true;
+
log(DEBUG,"In IDLE command");
userrec* u = Srv->FindNick(prefix);
+
if (u)
{
log(DEBUG,"USER EXISTS: %s",u->nick);
}
return true;
}
+
+ bool Push(std::string prefix, std::deque<std::string> ¶ms)
+ {
+ if (params.size() < 2)
+ return true;
+
+ userrec* u = Srv->FindNick(params[0]);
+
+ if (IS_LOCAL(u))
+ {
+ // push the raw to the user
+ if (Srv->IsUlined(prefix))
+ {
+ ::Write(u->fd,"%s",params[1].c_str());
+ }
+ else
+ {
+ log(DEBUG,"PUSH from non-ulined server dropped into the bit-bucket: :%s PUSH %s :%s",prefix.c_str(),params[0].c_str(),params[1].c_str());
+ }
+ }
+ else
+ {
+ // continue the raw onwards
+ params[1] = ":" + params[1];
+ DoOneToOne(prefix,"PUSH",params,u->server);
+ }
+ return true;
+ }
+
+ bool Time(std::string prefix, std::deque<std::string> ¶ms)
+ {
+ // :source.server TIME remote.server sendernick
+ // :remote.server TIME source.server sendernick TS
+ if (params.size() == 2)
+ {
+ // someone querying our time?
+ if (Srv->GetServerName() == params[0])
+ {
+ userrec* u = Srv->FindNick(params[1]);
+ if (u)
+ {
+ char curtime[256];
+ snprintf(curtime,256,"%lu",(unsigned long)time(NULL));
+ params.push_back(curtime);
+ params[0] = prefix;
+ DoOneToOne(Srv->GetServerName(),"TIME",params,params[0]);
+ }
+ }
+ else
+ {
+ // not us, pass it on
+ userrec* u = Srv->FindNick(params[1]);
+ if (u)
+ DoOneToOne(prefix,"TIME",params,params[0]);
+ }
+ }
+ else if (params.size() == 3)
+ {
+ // a response to a previous TIME
+ userrec* u = Srv->FindNick(params[1]);
+ if ((u) && (IS_LOCAL(u)))
+ {
+ time_t rawtime = atol(params[2].c_str());
+ struct tm * timeinfo;
+ timeinfo = localtime(&rawtime);
+ char tms[26];
+ snprintf(tms,26,"%s",asctime(timeinfo));
+ tms[24] = 0;
+ WriteServ(u->fd,"391 %s %s :%s",u->nick,prefix.c_str(),tms);
+ }
+ else
+ {
+ if (u)
+ DoOneToOne(prefix,"TIME",params,u->server);
+ }
+ }
+ return true;
+ }
bool LocalPing(std::string prefix, std::deque<std::string> ¶ms)
{
if (params.size() < 1)
return true;
- std::string stufftobounce = params[0];
- this->WriteLine(":"+Srv->GetServerName()+" PONG "+stufftobounce);
- return true;
+
+ if (params.size() == 1)
+ {
+ std::string stufftobounce = params[0];
+ this->WriteLine(":"+Srv->GetServerName()+" PONG "+stufftobounce);
+ return true;
+ }
+ else
+ {
+ std::string forwardto = params[1];
+ if (forwardto == Srv->GetServerName())
+ {
+ // this is a ping for us, send back PONG to the requesting server
+ params[1] = params[0];
+ params[0] = forwardto;
+ DoOneToOne(forwardto,"PONG",params,params[1]);
+ }
+ else
+ {
+ // not for us, pass it on :)
+ DoOneToOne(prefix,"PING",params,forwardto);
+ }
+ return true;
+ }
}
bool RemoteServer(std::string prefix, std::deque<std::string> ¶ms)
{
if (params.size() < 4)
return false;
+
std::string servername = params[0];
std::string password = params[1];
// hopcount is not used for a remote server, we calculate this ourselves
std::string description = params[3];
TreeServer* ParentOfThis = FindServer(prefix);
+
if (!ParentOfThis)
{
this->WriteLine("ERROR :Protocol error - Introduced remote server from unknown server "+prefix);
{
if (params.size() < 4)
return false;
+
std::string servername = params[0];
std::string password = params[1];
int hops = atoi(params[2].c_str());
+
if (hops)
{
this->WriteLine("ERROR :Server too far away for authentication");
{
if (params.size() < 4)
return false;
+
std::string servername = params[0];
std::string password = params[1];
int hops = atoi(params[2].c_str());
+
if (hops)
{
this->WriteLine("ERROR :Server too far away for authentication");
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 ? "<hidden>" : this->GetIP())+"] ("+description+")");
this->InboundServerName = servername;
this->InboundDescription = description;
// this is good. Send our details: Our server name and description and hopcount of 0,
}
std::stringstream s(line);
std::string param = "";
+
n.clear();
int item = 0;
while (!s.eof())
Srv->Log(DEBUG,"IN: "+line);
std::deque<std::string> params;
- this->Split(line,true,params);
+ this->Split(line,true,params);
std::string command = "";
std::string prefix = "";
if (((params[0].c_str())[0] == ':') && (params.size() > 1))
if ((!this->ctx_in) && (command == "AES"))
{
- std::string sserv = params[0];
- for (std::vector<Link>::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++)
- {
- if ((x->EncryptionKey != "") && (x->Name == sserv))
- {
- this->InitAES(x->EncryptionKey,sserv);
- }
- }
- return true;
+ std::string sserv = params[0];
+ for (std::vector<Link>::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++)
+ {
+ if ((x->EncryptionKey != "") && (x->Name == sserv))
+ {
+ this->InitAES(x->EncryptionKey,sserv);
+ }
+ }
+
+ return true;
}
else if ((this->ctx_in) && (command == "AES"))
{
{
this->LinkState = CONNECTED;
Node = new TreeServer(InboundServerName,InboundDescription,TreeRoot,this);
- TreeRoot->AddChild(Node);
+ TreeRoot->AddChild(Node);
params.clear();
params.push_back(InboundServerName);
params.push_back("*");
params.push_back(":"+InboundDescription);
DoOneToAllButSender(TreeRoot->GetName(),"SERVER",params,InboundServerName);
this->bursting = true;
- this->DoBurst(Node);
+ this->DoBurst(Node);
}
else if (command == "ERROR")
{
return true;
}
- /* Fix by brain:
+ /* 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();
+ */
+ route_back_again->SetNextPingTime(time(NULL) + 120);
+ route_back_again->SetPingFlag();
}
if (command == "SVSMODE")
}
else if (command == "PING")
{
+ /*
+ * We just got a ping from a server that's bursting.
+ * This can't be right, so set them to not bursting, and
+ * apply their lines.
+ */
+ if (this->bursting)
+ {
+ this->bursting = false;
+ apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
+ }
+ if (prefix == "")
+ {
+ prefix = this->GetName();
+ }
return this->LocalPing(prefix,params);
}
else if (command == "PONG")
{
+ /*
+ * We just got a pong from a server that's bursting.
+ * This can't be right, so set them to not bursting, and
+ * apply their lines.
+ */
+ if (this->bursting)
+ {
+ this->bursting = false;
+ apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
+ }
+ if (prefix == "")
+ {
+ prefix = this->GetName();
+ }
return this->LocalPong(prefix,params);
}
else if (command == "VERSION")
{
return this->Whois(prefix,params);
}
+ else if (command == "PUSH")
+ {
+ return this->Push(prefix,params);
+ }
+ else if (command == "TIME")
+ {
+ return this->Time(prefix,params);
+ }
+ else if ((command == "KICK") && (IsServer(prefix)))
+ {
+ std::string sourceserv = this->myhost;
+ if (params.size() == 3)
+ {
+ userrec* user = Srv->FindNick(params[1]);
+ chanrec* chan = Srv->FindChannel(params[0]);
+ if (user && chan)
+ {
+ server_kick_channel(user,chan,(char*)params[2].c_str(),false);
+ }
+ }
+ if (this->InboundServerName != "")
+ {
+ sourceserv = this->InboundServerName;
+ }
+ return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
+ }
else if (command == "SVSJOIN")
{
if (prefix == "")
else if (command == "ENDBURST")
{
this->bursting = false;
+ apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
return true;
}
else
}
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<std::string> 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];
{
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)
{
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
}
}
}
+ FlatLinks = Conf->ReadFlag("options","flatlinks",0);
+ HideULines = Conf->ReadFlag("options","hideulines",0);
LinkBlocks.clear();
for (int j =0; j < Conf->Enumerate("link"); j++)
{
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))
std::vector<TreeSocket*> 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();
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)
}
for (unsigned int q = 0; q < Current->ChildCount(); q++)
{
- ShowLinks(Current->GetChild(q),user,hops+1);
+ if ((HideULines) && (Srv->IsUlined(Current->GetChild(q)->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());
+ /* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */
+ if ((HideULines) && (Srv->IsUlined(Current->GetName())) && (!*user->oper))
+ return;
+ 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()
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;
}
// WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS.
- void ShowMap(TreeServer* Current, userrec* user, int depth, char matrix[128][80])
+ void ShowMap(TreeServer* Current, userrec* user, int depth, char matrix[128][80], float &totusers, float &totservers)
{
if (line < 128)
{
percent = ((float)Current->GetUserCount() / (float)clientlist.size()) * 100;
}
snprintf(text, 80, "%s %s%5d [%5.2f%%]", Current->GetName().c_str(), spacer, Current->GetUserCount(), percent);
+ totusers += Current->GetUserCount();
+ totservers++;
strlcpy(&matrix[line][depth],text,80);
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,totusers,totservers);
+ }
+ }
+ else
+ {
+ ShowMap(Current->GetChild(q),user,(FlatLinks && (!*user->oper)) ? depth : depth+2,matrix,totusers,totservers);
+ }
}
}
}
// This array represents a virtual screen which we will
// "scratch" draw to, as the console device of an irc
// client does not provide for a proper terminal.
+ float totusers = 0;
+ float totservers = 0;
char matrix[128][80];
for (unsigned int t = 0; t < 128; t++)
{
}
line = 0;
// The only recursive bit is called here.
- ShowMap(TreeRoot,user,0,matrix);
+ ShowMap(TreeRoot,user,0,matrix,totusers,totservers);
// Process each line one by one. The algorithm has a limit of
// 128 servers (which is far more than a spanning tree should have
// anyway, so we're ok). This limit can be raised simply by making
{
WriteServ(user->fd,"006 %s :%s",user->nick,&matrix[t][0]);
}
- WriteServ(user->fd,"007 %s :End of /MAP",user->nick);
+ float avg_users = totusers / totservers;
+ WriteServ(user->fd,"270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users);
+ WriteServ(user->fd,"007 %s :End of /MAP",user->nick);
return;
}
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
return 1;
}
+ int HandleTime(char** parameters, int pcnt, userrec* user)
+ {
+ if ((user->fd > -1) && (pcnt))
+ {
+ TreeServer* found = FindServerMask(parameters[0]);
+ if (found)
+ {
+ // we dont' override for local server
+ if (found == TreeRoot)
+ return 0;
+
+ std::deque<std::string> params;
+ params.push_back(found->GetName());
+ params.push_back(user->nick);
+ DoOneToOne(Srv->GetServerName(),"TIME",params,found->GetName());
+ }
+ else
+ {
+ WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]);
+ }
+ }
+ return 1;
+ }
+
int HandleRemoteWhois(char** parameters, int pcnt, userrec* user)
{
if ((user->fd > -1) && (pcnt > 1))
}
else if (!remote)
{
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
- WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[1]);
+ WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
+ WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[1]);
return 1;
}
}
TreeSocket* sock = serv->GetSocket();
if (sock)
{
- 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");
- sock->Close();
+ 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;
- }
- }
-
+ return;
+ }
+ }
}
}
}
// 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;
+ }
}
}
}
WriteServ(user->fd,"351 %s :%s",user->nick,Version.c_str());
if (found == TreeRoot)
{
- std::stringstream out(Config->data005);
- std::string token = "";
- std::string line5 = "";
- int token_counter = 0;
- while (!out.eof())
- {
- out >> token;
- line5 = line5 + token + " ";
- token_counter++;
- if ((token_counter >= 13) || (out.eof() == true))
- {
- WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str());
- line5 = "";
- token_counter = 0;
- }
- }
+ std::stringstream out(Config->data005);
+ std::string token = "";
+ std::string line5 = "";
+ int token_counter = 0;
+
+ while (!out.eof())
+ {
+ out >> token;
+ line5 = line5 + token + " ";
+ token_counter++;
+
+ if ((token_counter >= 13) || (out.eof() == true))
+ {
+ WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str());
+ line5 = "";
+ token_counter = 0;
+ }
+ }
}
}
else
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 ? "<hidden>" : 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
virtual int OnStats(char statschar, userrec* user)
{
if (statschar == 'c')
- {
+ {
for (unsigned int i = 0; i < LinkBlocks.size(); i++)
{
- WriteServ(user->fd,"213 %s C *@%s * %s %d 0 %c%c%c",user->nick,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,"213 %s C *@%s * %s %d 0 %c%c%c",user->nick,(LinkBlocks[i].HiddenFromStats ? "<hidden>" : 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);
this->HandleMap(parameters,pcnt,user);
return 1;
}
+ else if ((command == "TIME") && (pcnt > 0))
+ {
+ return this->HandleTime(parameters,pcnt,user);
+ }
else if (command == "LUSERS")
{
this->HandleLusers(parameters,pcnt,user);
params.push_back(std::string(parameters[j]));
}
}
+ log(DEBUG,"Globally route '%s'",command.c_str());
DoOneToMany(user->nick,command,params);
}
return 0;
}
}
- 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)
{
if (user->fd > -1)
{
chanrec *c = (chanrec*)dest;
+ std::string cname = c->name;
+ if (status)
+ cname = status + cname;
std::deque<TreeServer*> list;
GetListOfServersForChannel(c,list);
unsigned int ucount = list.size();
{
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)
{
if (user->fd > -1)
{
chanrec *c = (chanrec*)dest;
+ std::string cname = c->name;
+ if (status)
+ cname = status + cname;
std::deque<TreeServer*> list;
GetListOfServersForChannel(c,list);
unsigned int ucount = list.size();
{
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);
}
}
}
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<std::string> params;
params.push_back(channel->name);
+ if (partmessage != "")
+ params.push_back(":"+partmessage);
DoOneToMany(user->nick,"PART",params);
}
}
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);
// User is Local, change needs to be reflected!
TreeServer* SourceServer = FindServer(user->server);
- if (SourceServer) {
+ if (SourceServer)
+ {
SourceServer->AddUserCount();
}
}
// Regardless, We need to modify the user Counts..
TreeServer* SourceServer = FindServer(user->server);
- if (SourceServer) {
+ if (SourceServer)
+ {
SourceServer->DelUserCount();
}
virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
{
- if (source->fd > -1)
+ if ((source) && (source->fd > -1))
{
std::deque<std::string> params;
params.push_back(chan->name);
params.push_back(":"+reason);
DoOneToMany(source->nick,"KICK",params);
}
+ else if (!source)
+ {
+ std::deque<std::string> params;
+ params.push_back(chan->name);
+ params.push_back(user->nick);
+ params.push_back(":"+reason);
+ DoOneToMany(Srv->GetServerName(),"KICK",params);
+ }
}
virtual void OnRemoteKill(userrec* source, userrec* dest, std::string reason)
}
}
+ virtual void OnSetAway(userrec* user)
+ {
+ if (IS_LOCAL(user))
+ {
+ std::deque<std::string> params;
+ params.push_back(":"+std::string(user->awaymsg));
+ DoOneToMany(user->nick,"AWAY",params);
+ }
+ }
+
+ virtual void OnCancelAway(userrec* user)
+ {
+ if (IS_LOCAL(user))
+ {
+ std::deque<std::string> 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;
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);
}
}
+ virtual void OnEvent(Event* event)
+ {
+ if (event->GetEventID() == "send_metadata")
+ {
+ std::deque<std::string>* params = (std::deque<std::string>*)event->GetData();
+ if (params->size() < 3)
+ return;
+ (*params)[2] = ":" + (*params)[2];
+ DoOneToMany(Srv->GetServerName(),"METADATA",*params);
+ }
+ }
+
virtual ~ModuleSpanningTree()
{
}
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