X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=f6e3ad6bd337303debe8a49b74a9dc52e3be53cb;hb=4e6997fddf8eba872584830e0d56c8de83b76aab;hp=acf822bf78085ee4bc29d94633e8da20c7564402;hpb=517a26252a091eaee0149458a86fc43731bce618;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index acf822bf7..f6e3ad6bd 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -28,6 +28,42 @@ /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */ +/* Create server sockets off a listener. */ +void ServerSocketListener::OnAcceptReady(const std::string &ipconnectedto, int newsock, const std::string &incomingip) +{ + bool found = false; + char *ip = (char *)incomingip.c_str(); // XXX ugly cast + + found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), ip) != Utils->ValidIPs.end()); + if (!found) + { + for (std::vector::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++) + { + if (*i == "*" || irc::sockets::MatchCIDR(ip, *i)) + { + found = true; + break; + } + } + + if (!found) + { + this->ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", ip); + ServerInstance->SE->Close(newsock); + return; + } + } + + if (this->GetIOHook()) + { + this->GetIOHook()->OnRawSocketAccept(newsock, incomingip.c_str(), this->bind_port); + } + + /* we don't need a pointer to this, creating it stores it in the necessary places */ + new TreeSocket(this->Utils, this->ServerInstance, newsock, ip, this->GetIOHook()); + return; +} + /** Yay for fast searches! * This is hundreds of times faster than recursion * or even scanning a linked list, especially when @@ -144,9 +180,9 @@ SpanningTreeUtilities::~SpanningTreeUtilities() { for (unsigned int i = 0; i < Bindings.size(); i++) { - ServerInstance->SE->DelFd(Bindings[i]); - Bindings[i]->Close(); + delete Bindings[i]; } + while (TreeRoot->ChildCount()) { TreeServer* child_server = TreeRoot->GetChild(0); @@ -417,8 +453,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) { for (unsigned int i = 0; i < Bindings.size(); i++) { - ServerInstance->SE->DelFd(Bindings[i]); - Bindings[i]->Close(); + delete Bindings[i]; } ServerInstance->BufferedSocketCull(); Bindings.clear(); @@ -445,17 +480,17 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) break; } - TreeSocket* listener = new TreeSocket(this, ServerInstance, IP.c_str(), portno, true, 10, transport.empty() ? NULL : hooks[transport.c_str()]); - if (listener->GetState() == I_LISTENING) - { - ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Binding server port %s:%d successful!", IP.c_str(), portno); - Bindings.push_back(listener); - } - else + ServerSocketListener *listener = new ServerSocketListener(ServerInstance, this, portno, (char *)IP.c_str()); + if (listener->GetFd() == -1) { - ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno)); - listener->Close(); + delete listener; + continue; } + + if (!transport.empty()) + listener->AddIOHook(hooks[transport.c_str()]); + + Bindings.push_back(listener); } } } @@ -501,96 +536,90 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) } - L.NextConnectTime = time(NULL) + L.AutoConnect; - /* Bugfix by brain, do not allow people to enter bad configurations */ - if (L.Name != ServerInstance->Config->ServerName) - { - if (L.Name.find('.') == std::string::npos) - throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character"); + // Fix: Only trip autoconnects if this wouldn't delay autoconnect.. + if (L.NextConnectTime > ((time_t)(ServerInstance->Time() + L.AutoConnect))) + L.NextConnectTime = ServerInstance->Time() + L.AutoConnect; - if (L.Name.length() > 64) - throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!"); + if (L.Name.find('.') == std::string::npos) + throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character"); - if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port)) - { - if (Allow.length()) - ValidIPs.push_back(Allow); + if (L.Name.length() > 64) + throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!"); - ValidIPs.push_back(L.IPAddr); + if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port)) + { + if (Allow.length()) + ValidIPs.push_back(Allow); - /* Needs resolving */ - bool ipvalid = true; - QueryType start_type = DNS_QUERY_A; + ValidIPs.push_back(L.IPAddr); + + /* Needs resolving */ + bool ipvalid = true; + QueryType start_type = DNS_QUERY_A; #ifdef IPV6 - start_type = DNS_QUERY_AAAA; - if (strchr(L.IPAddr.c_str(),':')) - { - in6_addr n; - if (inet_pton(AF_INET6, L.IPAddr.c_str(), &n) < 1) - ipvalid = false; - } - else - { - in_addr n; - if (inet_aton(L.IPAddr.c_str(),&n) < 1) - ipvalid = false; - } -#else + start_type = DNS_QUERY_AAAA; + if (strchr(L.IPAddr.c_str(),':')) + { + in6_addr n; + if (inet_pton(AF_INET6, L.IPAddr.c_str(), &n) < 1) + ipvalid = false; + } + else + { in_addr n; if (inet_aton(L.IPAddr.c_str(),&n) < 1) ipvalid = false; + } +#else + in_addr n; + if (inet_aton(L.IPAddr.c_str(),&n) < 1) + ipvalid = false; #endif - if (!ipvalid) - { - try - { - bool cached; - SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L.IPAddr, L, cached, start_type); - ServerInstance->AddResolver(sr, cached); - } - catch (...) - { - } - } - } - else + if (!ipvalid) { - if (L.IPAddr.empty()) + try { - L.IPAddr = "*"; - ValidIPs.push_back("*"); - ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L.Name) + " has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want."); + bool cached; + SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L.IPAddr, L, cached, start_type); + ServerInstance->AddResolver(sr, cached); } - - if (L.RecvPass.empty()) + catch (...) { - throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', recvpass not defined!"); - } - - if (L.SendPass.empty()) - { - throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', sendpass not defined!"); } + } + } + else + { + if (L.IPAddr.empty()) + { + L.IPAddr = "*"; + ValidIPs.push_back("*"); + ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(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.Name.empty()) - { - throw CoreException("Invalid configuration, link tag without a name! IP address: "+L.IPAddr); - } + if (L.RecvPass.empty()) + { + throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', recvpass not defined!"); + } - if (!L.Port) - { - ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L.Name) + " has no port defined, you will not be able to /connect it."); - } + if (L.SendPass.empty()) + { + throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', sendpass not defined!"); } + if (L.Name.empty()) + { + throw CoreException("Invalid configuration, link tag without a name! IP address: "+L.IPAddr); + } - LinkBlocks.push_back(L); - } - else - { - throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', link tag has the same server name as the local server!"); + if (!L.Port) + { + ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L.Name) + " has no port defined, you will not be able to /connect it."); + } } + + LinkBlocks.push_back(L); } delete Conf; } @@ -601,7 +630,7 @@ void SpanningTreeUtilities::DoFailOver(Link* x) { if (x->FailOver == x->Name) { - Creator->RemoteMessage(NULL,"FAILOVER: Some muppet configured the failover for server \002%s\002 to point at itself. Not following it!", x->Name.c_str()); + this->ServerInstance->SNO->WriteToSnoMask('l', "FAILOVER: Some muppet configured the failover for server \002%s\002 to point at itself. Not following it!", x->Name.c_str()); return; } Link* TryThisOne = this->FindLink(x->FailOver.c_str()); @@ -614,13 +643,13 @@ void SpanningTreeUtilities::DoFailOver(Link* x) } else { - Creator->RemoteMessage(NULL,"FAILOVER: Trying failover link for \002%s\002: \002%s\002...", x->Name.c_str(), TryThisOne->Name.c_str()); + this->ServerInstance->SNO->WriteToSnoMask('l', "FAILOVER: Trying failover link for \002%s\002: \002%s\002...", x->Name.c_str(), TryThisOne->Name.c_str()); Creator->ConnectServer(TryThisOne); } } else { - Creator->RemoteMessage(NULL,"FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str()); + this->ServerInstance->SNO->WriteToSnoMask('l', "FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str()); } } } @@ -629,7 +658,7 @@ Link* SpanningTreeUtilities::FindLink(const std::string& name) { for (std::vector::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++) { - if (ServerInstance->MatchText(x->Name.c_str(), name.c_str())) + if (InspIRCd::Match(x->Name.c_str(), name.c_str())) { return &(*x); }