void OnConnected()
{
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "OnConnected()");
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnConnected()");
ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
char req[32];
break;
case EVENT_ERROR:
/* fd error event, ohshi- */
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "EVENT_ERROR");
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "EVENT_ERROR");
/* We *must* Close() here immediately or we get a
* huge storm of EVENT_ERROR events!
*/
*/
if (GetFd() > -1)
{
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Close ident socket %d", GetFd());
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Close ident socket %d", GetFd());
ServerInstance->SE->DelFd(this);
ServerInstance->SE->Close(GetFd());
this->SetFd(-1);
if (recvresult < 3)
return;
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "ReadResponse()");
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "ReadResponse()");
/* Truncate at the first null character, but first make sure
* there is at least one null char (at the end of the buffer).
* we're done.
*/
result += *i;
- if (!ServerInstance->IsIdent(result.c_str()))
+ if (!ServerInstance->IsIdent(result))
{
result.erase(result.end()-1);
break;
{
}
- void init() CXX11_OVERRIDE
- {
- ServerInstance->Modules->AddService(ext);
- OnRehash(NULL);
- Implementation eventlist[] = {
- I_OnRehash, I_OnUserInit, I_OnCheckReady,
- I_OnUserDisconnect, I_OnSetConnectClass
- };
- ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
- }
-
Version GetVersion() CXX11_OVERRIDE
{
return Version("Provides support for RFC1413 ident lookups", VF_VENDOR);
}
- void OnRehash(User *user) CXX11_OVERRIDE
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5);
if (!RequestTimeout)
}
catch (ModuleException &e)
{
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Ident exception: %s", e.GetReason());
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Ident exception: " + e.GetReason());
}
}
/* Does user have an ident socket attached at all? */
IdentRequestSocket *isock = ext.get(user);
if (!isock)
- {
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "No ident socket :(");
return MOD_RES_PASSTHRU;
- }
-
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Has ident_socket");
time_t compare = isock->age;
compare += RequestTimeout;
{
/* Ident timeout */
user->WriteNotice("*** Ident request timed out.");
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Timeout");
}
else if (!isock->HasResult())
{
// time still good, no result yet... hold the registration
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "No result yet");
return MOD_RES_DENY;
}
- ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Yay, result!");
-
/* wooo, got a result (it will be good, or bad) */
if (isock->result.empty())
{
- user->ident.insert(0, 1, '~');
+ user->ident.insert(user->ident.begin(), 1, '~');
user->WriteNotice("*** Could not find your ident, using " + user->ident + " instead.");
}
else