X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=1ec9879ae98ab7ecdddec399fe2abb3e83e185ab;hb=db7a49b071134cf3deadf05ce84fa6c7c46d80bf;hp=0a52a6817203d40bafa94df29765158382995d36;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 0a52a6817..1ec9879ae 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -24,7 +24,7 @@
 /* $ModDesc: Provides handling of DNS blacklists */
 
 /* Class holding data for a single entry */
-class DNSBLConfEntry
+class DNSBLConfEntry : public classbase
 {
 	public:
 		enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE };
@@ -51,8 +51,8 @@ class DNSBLResolver : public Resolver
 
  public:
 
-	DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached)
-		: Resolver(ServerInstance, hostname, DNS_QUERY_A, cached, me)
+	DNSBLResolver(Module *me, InspIRCd *Instance, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached)
+		: Resolver(Instance, hostname, DNS_QUERY_A, cached, me)
 	{
 		theirfd = userfd;
 		them = u;
@@ -108,7 +108,7 @@ class DNSBLResolver : public Resolver
 					{
 						case DNSBLConfEntry::I_KILL:
 						{
-							User::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
+							ServerInstance->Users->QuitUser(them, std::string("Killed (") + reason + ")");
 							break;
 						}
 						case DNSBLConfEntry::I_KLINE:
@@ -143,7 +143,7 @@ class DNSBLResolver : public Resolver
 							{
 								ServerInstance->XLines->ApplyLines();
 							}
-							else 
+							else
 								delete zl;
 							break;
 						}
@@ -156,7 +156,7 @@ class DNSBLResolver : public Resolver
 
 					if (show)
 					{
-						ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask);
+						ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->name.c_str(), bitmask);
 					}
 				}
 				else
@@ -212,7 +212,7 @@ class ModuleDNSBL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 
 
@@ -220,7 +220,6 @@ class ModuleDNSBL : public Module
 	 */
 	void ClearEntries()
 	{
-		std::vector<DNSBLConfEntry *>::iterator i;
 		for (std::vector<DNSBLConfEntry *>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
 			delete *i;
 		DNSBLConfEntries.clear();
@@ -248,7 +247,7 @@ class ModuleDNSBL : public Module
 			}
 			else
 			{
-				memset(e->records, 0, 256);
+				memset(e->records, 0, sizeof(e->records));
 				e->type = DNSBLConfEntry::A_RECORD;
 				irc::portparser portrange(MyConf->ReadValue("dnsbl", "records", i), false);
 				long item = -1;
@@ -258,31 +257,31 @@ class ModuleDNSBL : public Module
 
 			e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i));
 			e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i));
-			
+
 			/* Use portparser for record replies */
 
 			/* yeah, logic here is a little messy */
 			if (e->bitmask <= 0)
 			{
-				ServerInstance->WriteOpers("*** DNSBL(#%d): invalid bitmask",i);
+				ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): invalid bitmask",i);
 			}
 			else if (e->name.empty())
 			{
-				ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i);
+				ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid name",i);
 			}
 			else if (e->domain.empty())
 			{
-				ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i);
+				ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid domain",i);
 			}
 			else if (e->banaction == DNSBLConfEntry::I_UNKNOWN)
 			{
-				ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i);
+				ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid banaction", i);
 			}
 			else
 			{
 				if (e->reason.empty())
 				{
-					ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i);
+					ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): empty reason, using defaults",i);
 					e->reason = "Your IP has been blacklisted.";
 				}
 
@@ -361,26 +360,26 @@ class ModuleDNSBL : public Module
 		/* don't do anything with this hot potato */
 		return 0;
 	}
-	
+
 	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		if (symbol != 'd')
 			return 0;
-		
+
 		unsigned long total_hits = 0, total_misses = 0;
 
 		for (std::vector<DNSBLConfEntry*>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
 		{
 			total_hits += (*i)->stats_hits;
 			total_misses += (*i)->stats_misses;
-			
+
 			results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
 					ConvToStr((*i)->stats_hits) + " hits and " + ConvToStr((*i)->stats_misses) + " misses");
 		}
-		
+
 		results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
 		results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
-		
+
 		return 0;
 	}
 };