-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
*
* InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
+ * E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
*
}
else
{
- while (this->Route->GetParent() != TreeRoot)
+ while (this->Route->GetParent() != TreeRoot)
{
this->Route = Route->GetParent();
}
}
-class cmd_rconnect : public command_t
+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)
- {
+ 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 */
+ /* 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);
- }
- }
+ char* para[1];
+ para[0] = parameters[1];
+ Creator->OnPreCommand("CONNECT", para, 1, user, true);
+ }
+ }
};
-
+
/* Every SERVER connection inbound or outbound is represented by
* 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)
{
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;
}
{
std::string oldtopic = c->topic;
strlcpy(c->topic,params[3].c_str(),MAXTOPIC);
- strlcpy(c->setby,params[2].c_str(),NICKMAX);
+ 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
return true;
}
// NICK age nick host dhost ident +modes ip :gecos
- // 0 1 2 3 4 5 6 7
+ // 0 123 4 56 7
time_t age = atoi(params[0].c_str());
std::string modes = params[5];
while (*(modes.c_str()) == '+')
clientlist[tempnick] = new userrec();
clientlist[tempnick]->fd = FD_MAGIC_NUMBER;
- strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX);
+ 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());
// Increment the Source Servers User Count..
TreeServer* SourceServer = FindServer(source);
- if (SourceServer) {
+ if (SourceServer)
+ {
SourceServer->AddUserCount();
}
{
specific_voice.push_back(otheruser);
}
+
char* n = "";
if (x & UCMODE_OP)
{
{
n = "+";
}
+
strlcat(list,n,MAXBUF);
strlcat(list,otheruser->nick,MAXBUF);
if (strlen(list)>(480-NICKMAX))
* 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();
/* Check that the data read is a valid pointer and it has some content */
if (data && *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.
}
if (!this->ProcessLine(ret))
{
+ log(DEBUG,"ProcessLine says no!");
return false;
}
}
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)
{
DoOneToAllButSender(prefix,"SVSNICK",params,prefix);
{
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;
+
if (params.size() == 1)
{
TreeServer* ServerSource = FindServer(prefix);
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.
+ 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);
- }
- }
+ }
+ 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] == "*")
}
}
}
+
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]);
propogate = false;
break;
}
+
/* Send it on its way */
if (propogate)
{
{
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);
{
if (params.size() < 2)
return true;
+
userrec* u = Srv->FindNick(params[0]);
+
if (IS_LOCAL(u))
{
// push the raw to the user
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);
+ 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);
+ WriteServ(u->fd,"391 %s %s :%s",u->nick,prefix.c_str(),tms);
}
else
{
{
if (params.size() < 1)
return true;
+
if (params.size() == 1)
{
std::string stufftobounce = params[0];
{
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");
}
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();
}
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->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 == "")
}
for (unsigned int q = 0; q < Current->ChildCount(); q++)
{
- if ((HideULines) && (Srv->IsUlined(Current->GetName())))
+ if ((HideULines) && (Srv->IsUlined(Current->GetChild(q)->GetName())))
{
if (*user->oper)
{
ShowLinks(Current->GetChild(q),user,hops+1);
}
}
+ /* 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());
}
// 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++)
{
if (*user->oper)
{
- ShowMap(Current->GetChild(q),user,(FlatLinks && (!*user->oper)) ? depth : depth+2,matrix);
+ 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);
+ 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;
}
}
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");
+ 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;
+ }
+ }
}
}
}
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
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].HiddenFromStats ? "<hidden>" : LinkBlocks[i].IPAddr).c_str(),LinkBlocks[i].Name.c_str(),LinkBlocks[i].Port,(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-'),(LinkBlocks[i].AutoConnect ? 'a' : '-'),'s');
// 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) && (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)