From 07d0d8f52f361c64b3c16d7e432f475cd2131a28 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sun, 24 Nov 2013 15:05:12 +0000 Subject: Remove some pointless code: - Remove the CHARSET entry from ISUPPORT. CHARSET was removed in draft-brocklesby-irc-isupport-03 and we always used the default value anyway. This has also been removed in the latest version of Charybdis. - Remove irc::sockets::satouser. This helper method was longer than the code it replaced. --- src/listensocket.cpp | 2 +- src/modules/m_check.cpp | 4 ++-- src/modules/m_httpd_stats.cpp | 2 +- src/server.cpp | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/listensocket.cpp b/src/listensocket.cpp index ca518c59e..108466ae3 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -30,7 +30,7 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t : bind_tag(tag) { irc::sockets::satoap(bind_to, bind_addr, bind_port); - bind_desc = irc::sockets::satouser(bind_to); + bind_desc = bind_to.str(); fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0); diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 5e154feea..84e147f7b 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -180,8 +180,8 @@ class CommandCheck : public Command if (loctarg) { - user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(loctarg->client_sa)); - user->SendText(checkstr + " serveraddr " + irc::sockets::satouser(loctarg->server_sa)); + user->SendText(checkstr + " clientaddr " + loctarg->client_sa.str()); + user->SendText(checkstr + " serveraddr " + loctarg->server_sa.str()); std::string classname = loctarg->GetClass()->name; if (!classname.empty()) diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 5114b26d5..346fe41f5 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -197,7 +197,7 @@ class ModuleHttpStats : public Module LocalUser* lu = IS_LOCAL(u); if (lu) data << "" << lu->GetServerPort() << "" - << irc::sockets::satouser(lu->server_sa) << ""; + << lu->server_sa.str() << ""; data << "" << u->GetIPString() << ""; DumpMeta(data, u); diff --git a/src/server.cpp b/src/server.cpp index 4974b8501..1d1f52641 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -172,7 +172,6 @@ void ISupportManager::Build() tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MASK_CHANNEL); tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax); tokens["CHANTYPES"] = "#"; - tokens["CHARSET"] = "ascii"; tokens["ELIST"] = "MU"; tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick); tokens["MAXBANS"] = "64"; // TODO: make this a config setting. -- cgit v1.2.3