/* $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 */
-
-int TreeSocket::WriteLine(std::string line)
+void TreeSocket::WriteLine(std::string line)
{
- Instance->Log(DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
+ Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
line.append("\r\n");
- return this->Write(line);
+ this->Write(line);
}
if (line.empty())
return true;
- Instance->Log(DEBUG, "S[%d] I %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);
}
else if (command == "BURST")
{
- if (params.size() && Utils->EnableTimeSync)
+ if (params.size())
{
- bool we_have_delta = (Instance->Time(false) != Instance->Time(true));
time_t them = atoi(params[0].c_str());
- time_t delta = them - Instance->Time(false);
+ time_t delta = them - Instance->Time();
if ((delta < -600) || (delta > 600))
{
Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta));
{
Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs(delta));
}
-
- if (!Utils->MasterTime && !we_have_delta)
- {
- this->Instance->SetTimeDelta(delta);
- // Send this new timestamp to any other servers
- Utils->DoOneToMany(Instance->Config->GetSID(), "TIMESET", params);
- }
}
this->LinkState = CONNECTED;
Link* lnk = Utils->FindLink(InboundServerName);
if ((!route_back_again) || (route_back_again->GetSocket() != this))
{
if (route_back_again)
- Instance->Log(DEBUG,"Protocol violation: Fake direction in command '%s' from connection '%s'",line.c_str(),this->GetName().c_str());
+ Instance->Logs->Log("m_spanningtree",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) + Utils->PingFreq);
+ route_back_again->SetNextPingTime(Instance->Time() + Utils->PingFreq);
route_back_again->SetPingFlag();
}
else
* 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->Log(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";
- }
/*
{
return this->ForceJoin(prefix,params);
}
+ else if ((command == "NOTICE" || command == "PRIVMSG") && (Utils->IsServer(prefix)))
+ {
+ return this->ServerMessage(assign(command), prefix, params, sourceserv);
+ }
else if (command == "STATS")
{
return this->Stats(prefix, params);
{
return this->Admin(prefix, params);
}
+ else if (command == "MAP")
+ {
+ User* user = Instance->FindNick(prefix);
+ if (user)
+ {
+ const char* ptrs[127];
+ for (size_t n = 0; (n < params.size()) && (n < 127); ++n)
+ ptrs[n] = params[n].c_str();
+ return Utils->Creator->HandleMap(ptrs, params.size(), user);
+ }
+ }
else if (command == "SERVER")
{
return this->RemoteServer(prefix,params);
{
return this->Push(prefix,params);
}
- else if (command == "TIMESET")
- {
- return this->HandleSetTime(prefix, params);
- }
else if (command == "TIME")
{
return this->Time(prefix,params);
else if (command == "OPERNOTICE")
{
if (params.size() >= 1)
- Instance->SNO->WriteToSnoMask('A', "From " + prefix + ": " + params[0]);
+ Instance->SNO->WriteToSnoMask('A', "From " + (ServerSource ? ServerSource->GetName().c_str() : 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);
}
// 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;
}
{
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")
+ {
+ 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();
+
+ /* We don't support this for channel mode changes any more! */
+ if (params.size() >= 1)
+ {
+ if (Instance->FindChan(params[0]))
+ {
+ 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);