for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
{
ModResult result;
- FIRST_MOD_RESULT_CUSTOM(Creator->GetEventProvider(), ServerEventListener, OnBroadcastMessage, result, (c, *i));
+ FIRST_MOD_RESULT_CUSTOM(Creator->GetBroadcastEventProvider(), ServerProtocol::BroadcastEventListener, OnBroadcastMessage, result, (c, *i));
if (result == MOD_RES_ALLOW)
list.insert((*i)->GetSocket());
}
ConfigTag* options = ServerInstance->Config->ConfValue("options");
FlatLinks = security->getBool("flatlinks");
HideULines = security->getBool("hideulines");
+ HideSplits = security->getBool("hidesplits");
AnnounceTSChange = options->getBool("announcets");
AllowOptCommon = options->getBool("allowmismatch");
quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts");
{
ConfigTag* tag = i->second;
reference<Link> L = new Link(tag);
- std::string linkname = tag->getString("name");
- L->Name = linkname.c_str();
irc::spacesepstream sep = tag->getString("allowmask");
for (std::string s; sep.GetToken(s);)
L->AllowMasks.push_back(s);
+ L->Name = tag->getString("name");
L->IPAddr = tag->getString("ipaddr");
L->Port = tag->getUInt("port", 0);
L->SendPass = tag->getString("sendpass", tag->getString("password"));
ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
}
- if (!L->Port)
+ if (!L->Port && L->IPAddr.find('/') == std::string::npos)
ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no port defined, you will not be able to /connect it.");
L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end());
return NULL;
}
-void SpanningTreeUtilities::SendChannelMessage(const std::string& prefix, Channel* target, const std::string& text, char status, const CUList& exempt_list, const char* message_type, TreeSocket* omit)
+void SpanningTreeUtilities::SendChannelMessage(User* source, Channel* target, const std::string& text, char status, const ClientProtocol::TagMap& tags, const CUList& exempt_list, const char* message_type, TreeSocket* omit)
{
- CmdBuilder msg(prefix, message_type);
+ CmdBuilder msg(source, message_type);
+ msg.push_tags(tags);
msg.push_raw(' ');
if (status != 0)
msg.push_raw(status);
- msg.push_raw(target->name).push_last(text);
+ msg.push_raw(target->name);
+ if (!text.empty())
+ msg.push_last(text);
TreeSocketSet list;
this->GetListOfServersForChannel(target, list, status, exempt_list);