X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=9d4344629cc9653af567b9248440a360487af9b9;hb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;hp=49616287701ed35e6a7891c7cd22f06822c5eb37;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 496162877..9d4344629 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -23,16 +23,15 @@
 #include <arpa/inet.h>
 #include "users.h"
 #include "modules.h"
-
 #include "dns.h"
 #include "inspircd.h"
 
 /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
 
-
-
 enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST };
 
+/** Holds a CGI site's details
+ */
 class CGIhost : public classbase
 {
 public:
@@ -47,6 +46,8 @@ public:
 
 typedef std::vector<CGIhost> CGIHostlist;
 
+/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
+ */
 class CGIResolver : public Resolver
 {
 	std::string typ;
@@ -60,7 +61,7 @@ class CGIResolver : public Resolver
 	virtual void OnLookupComplete(const std::string &result)
 	{
 		/* Check the user still exists */
-		if ((them) && (them == ServerInstance->fd_ref_table[theirfd]))
+		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
 		{
 			if (notify)
 				ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str());
@@ -73,7 +74,7 @@ class CGIResolver : public Resolver
 
 	virtual void OnError(ResolverError e, const std::string &errormessage)
 	{
-		if ((them) && (them == ServerInstance->fd_ref_table[theirfd]))
+		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
 		{
 			if (notify)
 				ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str());
@@ -262,7 +263,7 @@ public:
 
 				try
 				{
-					CGIResolver* r = new CGIResolver(NotifyOpers, user->password, false, user, user->fd, "PASS");
+					CGIResolver* r = new CGIResolver(NotifyOpers, user->password, false, user, user->GetFd(), "PASS");
 					ServerInstance->AddResolver(r);
 				}
 				catch (ModuleException& e)
@@ -317,8 +318,8 @@ public:
 								
 		try
 		{
-			ServerInstance->Log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->fd, "IDENT");
-			CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->fd, "IDENT");
+			ServerInstance->Log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->GetFd(), "IDENT");
+			CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->GetFd(), "IDENT");
 			ServerInstance->AddResolver(r);
 		}
 		catch (ModuleException& e)