/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2013-2016 Adam <Adam@anope.org>
+ * Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013, 2016 Adam <Adam@anope.org>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
* redistribute it and/or modify it under the terms of the GNU General Public
/** UUID we are looking up */
const std::string uuid;
+ /** Handles errors which happen during DNS resolution. */
+ static void HandleError(LocalUser* user, const std::string& message)
+ {
+ user->WriteNotice("*** " + message + "; using your IP address (" + user->GetIPString() + ") instead.");
+
+ bool display_is_real = user->GetDisplayedHost() == user->GetRealHost();
+ user->ChangeRealHost(user->GetIPString(), display_is_real);
+
+ dl->unset(user);
+ }
+
public:
/** Create a resolver.
* @param mgr DNS Manager
const DNS::ResourceRecord* ans_record = r->FindAnswerOfType(this->question.type);
if (ans_record == NULL)
{
- OnError(r);
+ HandleError(bound_user, "Could not resolve your hostname: No " + this->manager->GetTypeStr(this->question.type) + " records found");
return;
}
delete res_forward;
ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Error in resolver: " + e.GetReason());
- bound_user->WriteNotice("*** There was an internal error resolving your host, using your IP address (" + bound_user->GetIPString() + ") instead.");
- dl->set(bound_user, 0);
+ HandleError(bound_user, "There was an internal error resolving your host");
}
}
else if (this->question.type == DNS::QUERY_A || this->question.type == DNS::QUERY_AAAA)
}
}
- dl->set(bound_user, 0);
-
if (rev_match)
{
bound_user->WriteNotice("*** Found your hostname (" + this->question.name + (r->cached ? ") -- cached" : ")"));
- bound_user->ChangeRealHost(this->question.name, true);
+ bool display_is_real = bound_user->GetDisplayedHost() == bound_user->GetRealHost();
+ bound_user->ChangeRealHost(this->question.name, display_is_real);
+ dl->unset(bound_user);
}
else
{
- bool display_is_real = irc::equals(bound_user->GetDisplayedHost(), bound_user->GetRealHost());
- bound_user->WriteNotice("*** Your hostname does not match up with your IP address. Sorry, using your IP address (" + bound_user->GetIPString() + ") instead.");
- bound_user->ChangeRealHost(bound_user->GetIPString(), display_is_real);
+ HandleError(bound_user, "Your hostname does not match up with your IP address");
}
}
}
{
LocalUser* bound_user = IS_LOCAL(ServerInstance->FindUUID(uuid));
if (bound_user)
- {
- 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);
- }
+ HandleError(bound_user, "Could not resolve your hostname: " + this->manager->GetErrorStr(query->error));
}
};