Purge code for Windows XP and MSVC pre-2015.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / main.cpp

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 81543b0da1693bbaf52bb004bae9e50132f3d075..321ed99b839552b50c1d392c899227bf0c081031 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -194,13 +194,12 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 {
        bool ipvalid = true;
 
-       if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name), rfc_case_insensitive_map))
+       if (InspIRCd::Match(ServerInstance->Config->ServerName, x->Name, ascii_case_insensitive_map))
        {
                ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
                return;
        }
 
-       DNS::QueryType start_type = DNS::QUERY_AAAA;
        if (strchr(x->IPAddr.c_str(),':'))
        {
                in6_addr n;
@@ -210,7 +209,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
        else
        {
                in_addr n;
-               if (inet_aton(x->IPAddr.c_str(),&n) < 1)
+               if (inet_pton(AF_INET, x->IPAddr.c_str(),&n) < 1)
                        ipvalid = false;
        }
 
@@ -236,6 +235,15 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
        }
        else
        {
+               // Guess start_type from bindip aftype
+               DNS::QueryType start_type = DNS::QUERY_AAAA;
+               irc::sockets::sockaddrs bind;
+               if ((!x->Bind.empty()) && (irc::sockets::aptosa(x->Bind, 0, bind)))
+               {
+                       if (bind.sa.sa_family == AF_INET)
+                               start_type = DNS::QUERY_A;
+               }
+
                ServernameResolver* snr = new ServernameResolver(*DNS, x->IPAddr, x, start_type, y);
                try
                {
@@ -318,15 +326,15 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& para
        for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
        {
                Link* x = *i;
-               if (InspIRCd::Match(x->Name.c_str(),parameters[0], rfc_case_insensitive_map))
+               if (InspIRCd::Match(x->Name, parameters[0], ascii_case_insensitive_map))
                {
-                       if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name), rfc_case_insensitive_map))
+                       if (InspIRCd::Match(ServerInstance->Config->ServerName, x->Name, ascii_case_insensitive_map))
                        {
                                user->WriteRemoteNotice(InspIRCd::Format("*** CONNECT: Server \002%s\002 is ME, not connecting.", x->Name.c_str()));
                                return MOD_RES_DENY;
                        }
 
-                       TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
+                       TreeServer* CheckDupe = Utils->FindServer(x->Name);
                        if (!CheckDupe)
                        {
                                user->WriteRemoteNotice(InspIRCd::Format("*** CONNECT: Connecting to server: \002%s\002 (%s:%d)", x->Name.c_str(), (x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()), x->Port));
@@ -357,6 +365,18 @@ void ModuleSpanningTree::OnUserInvite(User* source, User* dest, Channel* channel
        }
 }
 
+ModResult ModuleSpanningTree::OnPreTopicChange(User* user, Channel* chan, const std::string& topic)
+{
+       // XXX: Deny topic changes if the current topic set time is the current time or is in the future because
+       // other servers will drop our FTOPIC. This restriction will be removed when the protocol is updated.
+       if ((chan->topicset >= ServerInstance->Time()) && (Utils->serverlist.size() > 1))
+       {
+               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, chan->name, "Retry topic change later");
+               return MOD_RES_DENY;
+       }
+       return MOD_RES_PASSTHRU;
+}
+
 void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std::string &topic)
 {
        // Drop remote events on the floor.
@@ -754,6 +774,7 @@ Version ModuleSpanningTree::GetVersion()
 void ModuleSpanningTree::Prioritize()
 {
        ServerInstance->Modules->SetPriority(this, PRIORITY_LAST);
+       ServerInstance->Modules.SetPriority(this, I_OnPreTopicChange, PRIORITY_FIRST);
 }
 
 MODULE_INIT(ModuleSpanningTree)