diff options
| -rw-r--r-- | include/users.h | 13 | ||||
| -rw-r--r-- | src/user_resolver.cpp | 13 | ||||
| -rw-r--r-- | src/users.cpp | 2 |
3 files changed, 9 insertions, 19 deletions
diff --git a/include/users.h b/include/users.h index ac06f75f5..59cd6cc6f 100644 --- a/include/users.h +++ b/include/users.h @@ -472,19 +472,6 @@ class CoreExport User : public connection */ ConnectClass *MyClass; - /** Resolvers for looking up this users IP address - * This will occur if and when res_reverse completes. - * When this class completes its lookup, User::dns_done - * will be set from false to true. - */ - UserResolver* res_forward; - - /** Resolvers for looking up this users hostname - * This is instantiated by User::StartDNSLookup(), - * and on success, instantiates User::res_reverse. - */ - UserResolver* res_reverse; - /** User visibility state, see definition of VisData. */ VisData* Visibility; diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp index b5f03ca09..ec2f0cb87 100644 --- a/src/user_resolver.cpp +++ b/src/user_resolver.cpp @@ -14,7 +14,6 @@ /* $Core */ #include "inspircd.h" - UserResolver::UserResolver(InspIRCd* Instance, User* user, std::string to_resolve, QueryType qt, bool &cache) : Resolver(Instance, to_resolve, qt, cache), bound_user(user) { @@ -28,6 +27,8 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, if (resultnum) return; + UserResolver *res_forward; // for forward-resolution + if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)) { this->bound_user->stored_host = result; @@ -42,14 +43,16 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, { /* IPV6 forward lookup (with possibility of 4in6) */ const char* ip = this->bound_user->GetIPString(); - bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), lcached); + res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), lcached); } else /* IPV4 lookup (mixed protocol mode) */ #endif - /* IPV4 lookup (ipv4 only mode) */ - bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached); - this->ServerInstance->AddResolver(bound_user->res_forward, lcached); + { + /* IPV4 lookup (ipv4 only mode) */ + res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached); + } + this->ServerInstance->AddResolver(res_forward, lcached); } } catch (CoreException& e) diff --git a/src/users.cpp b/src/users.cpp index affd89815..b749b4788 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -99,6 +99,7 @@ void User::StartDNSLookup() { bool cached = false; const char* sip = this->GetIPString(false); + UserResolver *res_reverse; /* Special case for 4in6 (Have i mentioned i HATE 4in6?) */ if (!strncmp(sip, "0::ffff:", 8)) @@ -200,7 +201,6 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance fd = -1; recvq.clear(); sendq.clear(); - res_forward = res_reverse = NULL; Visibility = NULL; ip = NULL; MyClass = NULL; |