/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
-static std::map<std::string, std::string> warned; /* Server names that have had protocol violation warnings displayed for them */
-
void TreeSocket::WriteLine(std::string line)
{
Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] I %s", this->GetFd(), line.c_str());
this->Split(line.c_str(),params);
-
+
if (params.empty())
return true;
-
+
if ((params[0][0] == ':') && (params.size() > 1))
{
prefix = params[0].substr(1);
params.pop_front();
-
+
if (prefix.empty())
{
this->SendError("BUG (?) Empty prefix recieved.");
return false;
}
}
-
+
command = params[0].c_str();
params.pop_front();
* First up, check for any malformed commands (e.g. MODE without a timestamp)
* and rewrite commands where necessary (SVSMODE -> MODE for services). -- w
*/
+ if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
+ command = "MODE";
+
if (command == "MODE")
{
if (params.size() >= 2)
Channel* channel = Instance->FindChan(params[0]);
if (channel)
{
- User* x = Instance->FindNick(prefix);
- if (x)
- {
- if (warned.find(x->server) == warned.end())
- {
- Instance->Logs->Log("m_spanningtree",DEFAULT,"WARNING: I revceived modes '%s' from another server '%s'. This is not compliant with InspIRCd. Please check that server for bugs.", params[1].c_str(), x->server);
- Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending nonstandard modes: '%s MODE %s' where FMODE should be used, and may cause desyncs.", x->server, x->nick, params[1].c_str());
- warned[x->server] = x->nick;
- }
- }
+ this->SendError("MODE may no longer be used on channels. Please use FMODE, with correct timestamp rules.");
+ return false;
}
}
}
- else if (command == "SVSMODE")
- {
- command = "MODE";
- }
/*
* Now, check for (and parse) commands as appropriate. -- w
- */
-
+ */
+
/* Find the server that this command originated from, used in the handlers below */
TreeServer *ServerSource = Utils->FindServer(prefix);
{
return this->ForceJoin(prefix,params);
}
- else if (command == "NOTICE" || command == "PRIVMSG")
+ else if ((command == "NOTICE" || command == "PRIVMSG") && (Utils->IsServer(prefix)))
{
- if (Utils->IsServer(prefix))
- return this->ServerMessage(assign(command), prefix, params, sourceserv);
+ return this->ServerMessage(assign(command), prefix, params, sourceserv);
}
else if (command == "STATS")
{
{
return this->Admin(prefix, params);
}
+ else if (command == "MAP")
+ {
+ User* user = Instance->FindNick(prefix);
+ if (user)
+ {
+ std::vector<std::string> p(params.begin(), params.end());
+ return Utils->Creator->HandleMap(p, user);
+ }
+ }
else if (command == "SERVER")
{
return this->RemoteServer(prefix,params);
{
return this->ForceTopic(prefix,params);
}
- else if (command == "REHASH")
- {
- return this->RemoteRehash(prefix,params);
- }
else if (command == "METADATA")
{
return this->MetaData(prefix,params);
{
if (params.size() == 3)
{
+ TreeServer* pf = Utils->FindServer(prefix);
User* user = this->Instance->FindNick(params[1]);
Channel* chan = this->Instance->FindChan(params[0]);
- if (user && chan)
+ if (pf && user && chan)
{
- if (!chan->ServerKickUser(user, params[2].c_str(), false))
+ if (!chan->ServerKickUser(user, params[2].c_str(), false, pf->GetName().c_str()))
/* Yikes, the channels gone! */
delete chan;
}
}
return true;
}
- else if (command == "OPERNOTICE")
- {
- if (params.size() >= 1)
- Instance->SNO->WriteToSnoMask('A', "From " + prefix + ": " + params[0]);
- return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
- }
else if (command == "MODENOTICE")
{
if (params.size() >= 2)
{
- Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", prefix.c_str(), params[1].c_str());
+ if (ServerSource)
+ Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()), params[1].c_str());
}
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
{
if (params.size() >= 2)
{
- Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + prefix + ": "+ params[1]);
+ Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]);
+ return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
- return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
+
}
else if (command == "BURST")
{
// Set prefix server as bursting
if (!ServerSource)
{
- this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", prefix.c_str());
+ this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
return false;
}
-
+
ServerSource->bursting = true;
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
{
if (!ServerSource)
{
- this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", prefix.c_str());
+ this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
return false;
}
-
+
ServerSource->FinishBurst();
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
else if (command == "ENCAP")
{
- ServerSource->FinishBurst();
return this->Encap(prefix, params);
}
else if (command == "MODE")
{
// Server-prefix MODE.
- const char* modelist[MAXPARAMETERS];
- for (size_t i = 0; i < params.size(); i++)
- modelist[i] = params[i].c_str();
+ std::vector<std::string> modelist(params.begin(), params.end());
/* We don't support this for channel mode changes any more! */
if (params.size() >= 1)
{
- if (Instance->FindChan(params[1]))
+ if (Instance->FindChan(params[0]))
{
- this->SendError("Protocol violation by '"+prefix+"'! MODE for channel mode changes is not supported by the InspIRCd 1.2 protocol. You must use FMODE to preserve channel timestamps.");
+ this->SendError("Protocol violation by '"+(ServerSource ? ServerSource->GetName().c_str() : prefix)+"'! MODE for channel mode changes is not supported by the InspIRCd 1.2 protocol. You must use FMODE to preserve channel timestamps.");
return false;
}
}
-
+
// Insert into the parser
- this->Instance->SendMode(modelist, params.size(), this->Instance->FakeClient);
-
+ this->Instance->SendMode(modelist, this->Instance->FakeClient);
+
// Pass out to the network
return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
}
}
}
}
-
+
// its a user
- const char* strparams[127];
- for (unsigned int q = 0; q < params.size(); q++)
- {
- strparams[q] = params[q].c_str();
- }
+ std::vector<std::string> strparams(params.begin(), params.end());
- switch (this->Instance->CallCommandHandler(command.c_str(), strparams, params.size(), who))
+ switch (this->Instance->CallCommandHandler(command.c_str(), strparams, who))
{
case CMD_INVALID:
- // command is irc::string, hence ugliness
+ /*
+ * XXX: command is irc::string, hence ugliness
+ */
this->SendError("Unrecognised or malformed command '" + std::string(command.c_str()) + "' -- possibly loaded mismatched modules");
return false;
break;
- /*
- * CMD_LOCALONLY is aliased to CMD_FAILURE, so this won't go out onto the network.
- */
case CMD_FAILURE:
+ /*
+ * CMD_LOCALONLY is aliased to CMD_FAILURE, so this won't go out onto the network.
+ */
return true;
break;
default:
- /* CMD_SUCCESS and CMD_USER_DELETED fall through here */
+ /* CMD_SUCCESS falls through here */
break;
}
if (!quitserver.empty())
{
Utils->Creator->RemoteMessage(NULL,"Connection to '\2%s\2' failed.",quitserver.c_str());
- time_t server_uptime = Instance->Time() - this->age;
+ time_t server_uptime = Instance->Time() - this->age;
if (server_uptime)
Utils->Creator->RemoteMessage(NULL,"Connection to '\2%s\2' was established for %s", quitserver.c_str(), Utils->Creator->TimeToStr(server_uptime).c_str());
}
int TreeSocket::OnIncomingConnection(int newsock, char* ip)
{
- /* To prevent anyone from attempting to flood opers/DDoS by connecting to the server port,
- * or discovering if this port is the server port, we don't allow connections from any
- * IPs for which we don't have a link block.
- */
bool found = false;
found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), ip) != Utils->ValidIPs.end());
if (!found)
{
for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
- if (irc::sockets::MatchCIDR(ip, (*i).c_str()))
+ {
+ if (*i == "*" || irc::sockets::MatchCIDR(ip, *i))
+ {
found = true;
+ break;
+ }
+ }
if (!found)
{
projects / user / henk / code / inspircd.git / blobdiff