X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_flashpolicyd.cpp;h=d7f9a793b617d696006788a122fe07c9e6df5c85;hb=8ec9a73a91ad1c7009fd3055fbad7c980b5e1732;hp=6466a9fb2fe1bf0a4b6343303d0bbe2a022a72f7;hpb=f3d80041f68417cc10d8e7575659468b30009f22;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp
index 6466a9fb2..d7f9a793b 100644
--- a/src/modules/m_flashpolicyd.cpp
+++ b/src/modules/m_flashpolicyd.cpp
@@ -23,12 +23,12 @@ class FlashPDSocket;
 
 namespace
 {
-	std::set<FlashPDSocket*> sockets;
+	insp::intrusive_list<FlashPDSocket> sockets;
 	std::string policy_reply;
 	const std::string expected_request("<policy-file-request/>\0", 23);
 }
 
-class FlashPDSocket : public BufferedSocket, public Timer
+class FlashPDSocket : public BufferedSocket, public Timer, public insp::intrusive_list_node<FlashPDSocket>
 {
 	/** True if this object is in the cull list
 	 */
@@ -84,20 +84,20 @@ class ModuleFlashPD : public Module
  public:
 	ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
 	{
-		if (from->bind_tag->getString("type") != "flashpolicyd")
+		if (!stdalgo::string::equalsci(from->bind_tag->getString("type"), "flashpolicyd"))
 			return MOD_RES_PASSTHRU;
 
 		if (policy_reply.empty())
 			return MOD_RES_DENY;
 
-		sockets.insert(new FlashPDSocket(nfd, timeout));
+		sockets.push_front(new FlashPDSocket(nfd, timeout));
 		return MOD_RES_ALLOW;
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("flashpolicyd");
-		timeout = tag->getInt("timeout", 5, 1);
+		timeout = tag->getDuration("timeout", 5, 1);
 		std::string file = tag->getString("file");
 
 		if (!file.empty())
@@ -123,10 +123,10 @@ class ModuleFlashPD : public Module
 		for (std::vector<ListenSocket*>::const_iterator i = ServerInstance->ports.begin(); i != ServerInstance->ports.end(); ++i)
 		{
 				ListenSocket* ls = *i;
-				if (ls->bind_tag->getString("type", "clients") != "clients" || ls->bind_tag->getString("ssl", "plaintext") != "plaintext")
+				if (!stdalgo::string::equalsci(ls->bind_tag->getString("type", "clients"), "clients") || !ls->bind_tag->getString("ssl").empty())
 					continue;
 
-				to_ports.append(ConvToStr(ls->bind_port)).push_back(',');
+				to_ports.append(ConvToStr(ls->bind_sa.port())).push_back(',');
 		}
 
 		if (to_ports.empty())
@@ -146,9 +146,9 @@ class ModuleFlashPD : public Module
 </cross-domain-policy>";
 	}
 
-	CullResult cull()
+	CullResult cull() CXX11_OVERRIDE
 	{
-		for (std::set<FlashPDSocket*>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)
+		for (insp::intrusive_list<FlashPDSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)
 		{
 			FlashPDSocket* sock = *i;
 			sock->AddToCull();