X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_hostname_lookup.cpp;h=f6e0539c1f664465e934fc230309b77855f5dc20;hb=d1f028db2be42a272b142511bc006a42bb27af8d;hp=c26d3b3d32fc82e5e5f0d3f756f5436eb3d98642;hpb=c67d3103e9f7397f0ab9631bf07a5e5547deb2c3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp
index c26d3b3d3..f6e0539c1 100644
--- a/src/coremods/core_hostname_lookup.cpp
+++ b/src/coremods/core_hostname_lookup.cpp
@@ -61,13 +61,13 @@ class UserResolver : public DNS::Request
 		LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid);
 		if (!bound_user)
 		{
-			ServerInstance->Logs->Log("RESOLVER", LOG_DEBUG, "Resolution finished for user '%s' who is gone", uuid.c_str());
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Resolution finished for user '%s' who is gone", uuid.c_str());
 			return;
 		}
 
 		const DNS::ResourceRecord& ans_record = r->answers[0];
 
-		ServerInstance->Logs->Log("RESOLVER", LOG_DEBUG, "DNS result for %s: '%s' -> '%s'", uuid.c_str(), ans_record.name.c_str(), ans_record.rdata.c_str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "DNS result for %s: '%s' -> '%s'", uuid.c_str(), ans_record.name.c_str(), ans_record.rdata.c_str());
 
 		if (!fwd)
 		{
@@ -129,18 +129,18 @@ class UserResolver : public DNS::Request
 
 				if (hostname == NULL)
 				{
-					ServerInstance->Logs->Log("RESOLVER", LOG_DEFAULT, "ERROR: User has no hostname attached when doing a forward lookup");
+					ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: User has no hostname attached when doing a forward lookup");
 					bound_user->WriteNotice("*** There was an internal error resolving your host, using your IP address (" + bound_user->GetIPString() + ") instead.");
 					return;
 				}
-				else if (hostname->length() < 65)
+				else if (hostname->length() <= ServerInstance->Config->Limits.MaxHost)
 				{
 					/* Hostnames starting with : are not a good thing (tm) */
 					if ((*hostname)[0] == ':')
 						hostname->insert(0, "0");
 
 					bound_user->WriteNotice("*** Found your hostname (" + *hostname + (r->cached ? ") -- cached" : ")"));
-					bound_user->host.assign(*hostname, 0, 64);
+					bound_user->host.assign(*hostname, 0, ServerInstance->Config->Limits.MaxHost);
 					bound_user->dhost = bound_user->host;
 
 					/* Invalidate cache */
@@ -148,7 +148,7 @@ class UserResolver : public DNS::Request
 				}
 				else
 				{
-					bound_user->WriteNotice("*** Your hostname is longer than the maximum of 64 characters, using your IP address (" + bound_user->GetIPString() + ") instead.");
+					bound_user->WriteNotice("*** Your hostname is longer than the maximum of " + ConvToStr(ServerInstance->Config->Limits.MaxHost) + " characters, using your IP address (" + bound_user->GetIPString() + ") instead.");
 				}
 
 				ph->unset(bound_user);
@@ -170,7 +170,6 @@ class UserResolver : public DNS::Request
 		{
 			bound_user->WriteNotice("*** Could not resolve your hostname: " + this->manager->GetErrorStr(query->error) + "; using your IP address (" + bound_user->GetIPString() + ") instead.");
 			dl->set(bound_user, 0);
-			ServerInstance->stats->statsDnsBad++;
 		}
 	}
 };
@@ -183,8 +182,8 @@ class ModuleHostnameLookup : public Module
 
  public:
 	ModuleHostnameLookup()
-		: dnsLookup("dnsLookup", this)
-		, ptrHosts("ptrHosts", this)
+		: dnsLookup("dnsLookup", ExtensionItem::EXT_USER, this)
+		, ptrHosts("ptrHosts", ExtensionItem::EXT_USER, this)
 		, DNS(this, "DNS")
 	{
 		dl = &dnsLookup;
@@ -215,7 +214,6 @@ class ModuleHostnameLookup : public Module
 			this->dnsLookup.set(user, 0);
 			delete res_reverse;
 			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Error in resolver: " + e.GetReason());
-			ServerInstance->stats->statsDnsBad++;
 		}
 	}