diff options
| author | 2021-03-17 06:07:41 +0000 | |
|---|---|---|
| committer | 2021-03-17 06:07:41 +0000 | |
| commit | e2f8e75ab86c484e095ea5723f68a96698abbde2 (patch) | |
| tree | 2a3e41f51536a8eabb1b6b3c2a5fb47bb1346fdb /src | |
| parent | Pascalize Get in extension item classes. (diff) | |
Pascalize Set in extension item classes.
Diffstat (limited to 'src')
35 files changed, 74 insertions, 74 deletions
diff --git a/src/coremods/core_channel/cmode_k.cpp b/src/coremods/core_channel/cmode_k.cpp index 754a943d8..e63c006e3 100644 --- a/src/coremods/core_channel/cmode_k.cpp +++ b/src/coremods/core_channel/cmode_k.cpp @@ -74,7 +74,7 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s if (parameter.empty()) return MODEACTION_DENY; - ext.set(channel, parameter); + ext.Set(channel, parameter); } else ext.unset(channel); diff --git a/src/coremods/core_channel/cmode_l.cpp b/src/coremods/core_channel/cmode_l.cpp index d80f5ddd4..f6ac2482f 100644 --- a/src/coremods/core_channel/cmode_l.cpp +++ b/src/coremods/core_channel/cmode_l.cpp @@ -43,7 +43,7 @@ ModeAction ModeChannelLimit::OnSet(User* user, Channel* chan, std::string& param if (limit < 1) return MODEACTION_DENY; - ext.set(chan, limit); + ext.Set(chan, limit); return MODEACTION_ALLOW; } diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp index 810e5efc6..c7f652ebe 100644 --- a/src/coremods/core_hostname_lookup.cpp +++ b/src/coremods/core_hostname_lookup.cpp @@ -193,7 +193,7 @@ class ModuleHostnameLookup : public Module /* If both the reverse and forward queries are cached, the user will be able to pass DNS completely * before Process() completes, which is why dnsLookup.set() is here, before Process() */ - this->dnsLookup.set(user, 1); + this->dnsLookup.Set(user, 1); this->DNS->Process(res_reverse); } catch (DNS::Exception& e) diff --git a/src/extensible.cpp b/src/extensible.cpp index a4006e717..f24836046 100644 --- a/src/extensible.cpp +++ b/src/extensible.cpp @@ -32,7 +32,7 @@ void IntExtItem::Delete(Extensible* container, void* item) void IntExtItem::FromInternal(Extensible* container, const std::string& value) { - set(container, ConvToNum<intptr_t>(value)); + Set(container, ConvToNum<intptr_t>(value)); } void IntExtItem::FromNetwork(Extensible* container, const std::string& value) @@ -46,7 +46,7 @@ intptr_t IntExtItem::Get(const Extensible* container) const return reinterpret_cast<intptr_t>(GetRaw(container)); } -void IntExtItem::set(Extensible* container, intptr_t value) +void IntExtItem::Set(Extensible* container, intptr_t value) { if (value) SetRaw(container, reinterpret_cast<void*>(value)); @@ -80,7 +80,7 @@ void StringExtItem::FromInternal(Extensible* container, const std::string& value if (value.empty()) unset(container); else - set(container, value); + Set(container, value); } void StringExtItem::FromNetwork(Extensible* container, const std::string& value) diff --git a/src/listmode.cpp b/src/listmode.cpp index 2f2e5c336..ae9728a12 100644 --- a/src/listmode.cpp +++ b/src/listmode.cpp @@ -166,7 +166,7 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std { // Make one cd = new ChanData; - extItem.set(channel, cd); + extItem.Set(channel, cd); } // Check if the item already exists in the list diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp index 8b99081ea..4532b0607 100644 --- a/src/modules/extra/m_geo_maxmind.cpp +++ b/src/modules/extra/m_geo_maxmind.cpp @@ -61,7 +61,7 @@ class GeolocationExtItem : public ExtensionItem return static_cast<Geolocation::Location*>(GetRaw(item)); } - void set(Extensible* item, Geolocation::Location* value) + void Set(Extensible* item, Geolocation::Location* value) { value->refcount_inc(); Delete(item, SetRaw(item, value)); @@ -101,7 +101,7 @@ class GeolocationAPIImpl : public Geolocation::APIBase return NULL; // We found the user. Cache their location for future use. - ext.set(user, location); + ext.Set(user, location); return location; } diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp index b0532e610..c13bfa8bf 100644 --- a/src/modules/m_anticaps.cpp +++ b/src/modules/m_anticaps.cpp @@ -119,7 +119,7 @@ class AntiCapsMode : public ParamMode<AntiCapsMode, SimpleExtItem<AntiCapsSettin return MODEACTION_DENY; } - ext.set(channel, new AntiCapsSettings(method, minlen, percent)); + ext.Set(channel, new AntiCapsSettings(method, minlen, percent)); return MODEACTION_ALLOW; } diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index b51d1c354..d8db08f6f 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -187,7 +187,7 @@ class BanRedirect : public ModeWatcher if (!redirects) { redirects = new BanRedirectList; - extItem.set(channel, redirects); + extItem.Set(channel, redirects); } else { diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 80118b569..2d929b15d 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -133,7 +133,7 @@ class ModuleBlockAmsg : public Module else { m = new BlockedMessage(parameters[1], parameters[0], ServerInstance->Time()); - blockamsg.set(user, m); + blockamsg.Set(user, m); } } return MOD_RES_PASSTHRU; diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index 0f8e1de1c..c62bf5639 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -228,7 +228,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener void Set302Protocol(LocalUser* user) { - capext.set(user, capext.Get(user) | CAP_302_BIT); + capext.Set(user, capext.Get(user) | CAP_302_BIT); } bool HandleReq(LocalUser* user, const std::string& reqlist) @@ -251,7 +251,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener usercaps = cap->AddToMask(usercaps); } - capext.set(user, usercaps); + capext.Set(user, usercaps); return true; } @@ -420,7 +420,7 @@ class CommandCap : public SplitCommand CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { if (user->registered != REG_ALL) - holdext.set(user, 1); + holdext.Set(user, 1); const std::string& subcommand = parameters[0]; if (irc::equals(subcommand, "REQ")) diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 566a44b28..ad4eb8d4d 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -247,9 +247,9 @@ class CommandWebIRC : public SplitCommand } // The user matched a WebIRC block! - gateway.set(user, parameters[1]); - realhost.set(user, user->GetRealHost()); - realip.set(user, user->GetIPString()); + gateway.Set(user, parameters[1]); + realhost.Set(user, user->GetRealHost()); + realip.Set(user, user->GetIPString()); WriteLog("Connecting user %s is using the %s WebIRC gateway; changing their IP from %s to %s.", user->uuid.c_str(), parameters[1].c_str(), @@ -438,8 +438,8 @@ class ModuleCgiIRC return MOD_RES_PASSTHRU; // Store the hostname and IP of the gateway for later use. - cmdwebirc.realhost.set(user, user->GetRealHost()); - cmdwebirc.realip.set(user, user->GetIPString()); + cmdwebirc.realhost.Set(user, user->GetRealHost()); + cmdwebirc.realip.Set(user, user->GetIPString()); const std::string& newident = iter->GetIdent(); cmdwebirc.WriteLog("Connecting user %s is using an ident gateway; changing their IP from %s to %s and their ident from %s to %s.", diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index ac9e27e61..2c32c9567 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -111,7 +111,7 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> > } else { - ext.set(channel, new HistoryList(len, time)); + ext.Set(channel, new HistoryList(len, time)); } return MODEACTION_ALLOW; } diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index c9247b2d0..afb21a46c 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -530,7 +530,7 @@ class ModuleCloaking : public Module CloakList cloaklist; for (std::vector<CloakInfo>::const_iterator iter = cloaks.begin(); iter != cloaks.end(); ++iter) cloaklist.push_back(GenCloak(*iter, dest->client_sa, dest->GetIPString(), dest->GetRealHost())); - cu.ext.set(dest, cloaklist); + cu.ext.Set(dest, cloaklist); } }; diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp index b12576ff7..544a38a38 100644 --- a/src/modules/m_conn_join.cpp +++ b/src/modules/m_conn_join.cpp @@ -110,7 +110,7 @@ class ModuleConnJoin : public Module if (!chandelay) JoinChannels(localuser, chanlist); else - ext.set(localuser, new JoinTimer(localuser, ext, chanlist, chandelay)); + ext.Set(localuser, new JoinTimer(localuser, ext, chanlist, chandelay)); } }; diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index b8d2f22e3..6ae26c4b1 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -57,7 +57,7 @@ class ModuleWaitPong : public Module if(sendsnotice) user->WriteNotice("*** If you are having problems connecting due to registration timeouts type /quote PONG " + pingrpl + " or /raw PONG " + pingrpl + " now."); - ext.set(user, pingrpl); + ext.Set(user, pingrpl); return MOD_RES_PASSTHRU; } diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 11f245d2b..0f7f2fdf0 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -88,7 +88,7 @@ class CommandTitle : public Command { if (config.MatchUser(user) && config.CheckPass(user, parameters[1])) { - ctitle.set(user, config.title); + ctitle.Set(user, config.title); ServerInstance->PI->SendMetaData(user, "ctitle", config.title); diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index d7a2c67b2..566f7889e 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -155,7 +155,7 @@ class DCCAllowExt : public SimpleExtItem<dccallowlist> } // The value was well formed. - set(user, list); + Set(user, list); } std::string ToInternal(const Extensible* container, void* item) const override @@ -263,7 +263,7 @@ class CommandDccallow : public Command if (!dl) { dl = new dccallowlist; - ext.set(user, dl); + ext.Set(user, dl); // add this user to the userlist ul.push_back(user); } diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 116cf1720..90414271b 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -156,7 +156,7 @@ static void populate(CUList& except, Membership* memb) void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) { if (memb->chan->IsModeSet(djm)) - unjoined.set(memb, 1); + unjoined.Set(memb, 1); } void ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUList& except) diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp index 21dd85f9d..a2811df12 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -79,7 +79,7 @@ ModeAction DelayMsgMode::OnSet(User* source, Channel* chan, std::string& paramet if (limit <= 0) limit = 1; - ext.set(chan, limit); + ext.Set(chan, limit); return MODEACTION_ALLOW; } @@ -90,14 +90,14 @@ void DelayMsgMode::OnUnset(User* source, Channel* chan) */ const Channel::MemberMap& users = chan->GetUsers(); for (Channel::MemberMap::const_iterator n = users.begin(); n != users.end(); ++n) - jointime.set(n->second, 0); + jointime.Set(n->second, 0); } void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&) { if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet(djm))) { - djm.jointime.set(memb, ServerInstance->Time()); + djm.jointime.Set(memb, ServerInstance->Time()); } } diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index f5697c199..737b625ce 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -91,7 +91,7 @@ class DNSBLResolver : public DNS::Request int i = countExt.Get(them); if (i) - countExt.set(them, i - 1); + countExt.Set(them, i - 1); // The DNSBL reply must contain an A result. const DNS::ResourceRecord* const ans_record = r->FindAnswerOfType(DNS::QUERY_A); @@ -174,7 +174,7 @@ class DNSBLResolver : public DNS::Request them->ChangeDisplayedHost(ConfEntry->host); } - nameExt.set(them, ConfEntry->name); + nameExt.Set(them, ConfEntry->name); break; } case DNSBLConfEntry::I_KLINE: @@ -265,7 +265,7 @@ class DNSBLResolver : public DNS::Request int i = countExt.Get(them); if (i) - countExt.set(them, i - 1); + countExt.Set(them, i - 1); if (is_miss) return; @@ -423,7 +423,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Reversed IP %s -> %s", user->GetIPString().c_str(), reversedip.c_str()); - countExt.set(user, DNSBLConfEntries.size()); + countExt.Set(user, DNSBLConfEntries.size()); // For each DNSBL, we will run through this lookup for (unsigned i = 0; i < DNSBLConfEntries.size(); ++i) diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index e98ad935b..5ec6601ce 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -333,7 +333,7 @@ class ModuleIdent : public Module std::shared_ptr<ConfigTag> tag = user->GetClass()->config; if (!tag->getBool("useident", true)) { - state.set(user, IDENT_SKIPPED); + state.Set(user, IDENT_SKIPPED); return; } @@ -342,7 +342,7 @@ class ModuleIdent : public Module try { isock = new IdentRequestSocket(user); - socket.set(user, isock); + socket.Set(user, isock); } catch (ModuleException &e) { @@ -363,7 +363,7 @@ class ModuleIdent : public Module if (prefixunqueried && state.Get(user) == IDENT_SKIPPED) { PrefixIdent(user); - state.set(user, IDENT_PREFIXED); + state.Set(user, IDENT_PREFIXED); } return MOD_RES_PASSTHRU; } @@ -374,7 +374,7 @@ class ModuleIdent : public Module if (ServerInstance->Time() >= compare) { /* Ident timeout */ - state.set(user, IDENT_MISSING); + state.Set(user, IDENT_MISSING); PrefixIdent(user); user->WriteNotice("*** Ident lookup timed out, using " + user->ident + " instead."); } @@ -387,13 +387,13 @@ class ModuleIdent : public Module /* wooo, got a result (it will be good, or bad) */ else if (isock->result.empty()) { - state.set(user, IDENT_MISSING); + state.Set(user, IDENT_MISSING); PrefixIdent(user); user->WriteNotice("*** Could not find your ident, using " + user->ident + " instead."); } else { - state.set(user, IDENT_FOUND); + state.Set(user, IDENT_FOUND); user->ChangeIdent(isock->result); user->WriteNotice("*** Found your ident, '" + user->ident + "'"); } diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp index 2677b24ad..4f5d8aa86 100644 --- a/src/modules/m_ircv3_batch.cpp +++ b/src/modules/m_ircv3_batch.cpp @@ -80,7 +80,7 @@ class IRCv3::Batch::ManagerImpl : public Manager // Send the start batch command ("BATCH +reftag TYPE"), remember the user so we can send them a // "BATCH -reftag" message later when the batch ends and set the flag we just checked so this is // only done once per user per batch. - batchbits.set(user, (bits | batch.GetBit())); + batchbits.Set(user, (bits | batch.GetBit())); batch.batchinfo->users.push_back(user); user->Send(batch.batchinfo->startevent); } @@ -173,7 +173,7 @@ class IRCv3::Batch::ManagerImpl : public Manager { LocalUser* const user = *i; user->Send(batchinfo.endevent); - batchbits.set(user, batchbits.Get(user) & ~batch.GetBit()); + batchbits.Set(user, batchbits.Get(user) & ~batch.GetBit()); } // erase() not swaperase because the reftag generation logic depends on the order of the elements diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index cd2ed834a..aeaab0502 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -122,7 +122,7 @@ class JoinFlood : public ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> > return MODEACTION_DENY; } - ext.set(channel, new joinfloodsettings(nsecs, njoins)); + ext.Set(channel, new joinfloodsettings(nsecs, njoins)); return MODEACTION_ALLOW; } diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 49b59bee0..f2e73d507 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -114,7 +114,7 @@ class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> > if (IS_LOCAL(source) && v > max) v = max; - ext.set(channel, new KickRejoinData(v)); + ext.Set(channel, new KickRejoinData(v)); return MODEACTION_ALLOW; } diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index 17bf2e72b..d965aff1f 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -94,7 +94,7 @@ class BindInterface : public LDAPInterface } // change host according to config key - vhosts->set(user, SafeReplace(vhost, dnParts)); + vhosts->Set(user, SafeReplace(vhost, dnParts)); } } @@ -126,7 +126,7 @@ class BindInterface : public LDAPInterface // We're done, there are no attributes to check SetVHost(user, DN); - authed->set(user, 1); + authed->Set(user, 1); delete this; return; @@ -144,7 +144,7 @@ class BindInterface : public LDAPInterface ServerInstance->SNO.WriteToSnoMask('c', "Successful connection from %s (dn=%s)", user->GetFullRealHost().c_str(), DN.c_str()); SetVHost(user, DN); - authed->set(user, 1); + authed->Set(user, 1); } // Delete this if this is the last ref @@ -379,7 +379,7 @@ public: { if (InspIRCd::Match(user->nick, *i)) { - ldapAuthed.set(user,1); + ldapAuthed.Set(user,1); return MOD_RES_PASSTHRU; } } @@ -388,7 +388,7 @@ public: { if (InspIRCd::MatchCIDR(user->GetIPString(), *i, ascii_case_insensitive_map)) { - ldapAuthed.set(user,1); + ldapAuthed.Set(user,1); return MOD_RES_PASSTHRU; } } diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 99911b8ee..0cc32b65d 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -96,7 +96,7 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> > return MODEACTION_DENY; } - ext.set(channel, new floodsettings(ban, nsecs, nlines)); + ext.Set(channel, new floodsettings(ban, nsecs, nlines)); return MODEACTION_ALLOW; } diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp index c892a21fe..9c7613242 100644 --- a/src/modules/m_nickflood.cpp +++ b/src/modules/m_nickflood.cpp @@ -111,7 +111,7 @@ class NickFlood : public ParamMode<NickFlood, SimpleExtItem<nickfloodsettings> > return MODEACTION_DENY; } - ext.set(channel, new nickfloodsettings(nsecs, nnicks)); + ext.Set(channel, new nickfloodsettings(nsecs, nnicks)); return MODEACTION_ALLOW; } diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 4cc37229c..692c23ee8 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -73,7 +73,7 @@ class CommandNicklock : public Command /* If we made it this far, extend the user */ if (IS_LOCAL(target)) { - locked.set(target, 1); + locked.Set(target, 1); std::string oldnick = target->nick; if (target->ChangeNick(parameters[1])) diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index b4b825a04..a7a10c279 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -69,7 +69,7 @@ class Redirect : public ParamMode<Redirect, StringExtItem> * We used to do some checking for circular +L here, but there is no real need for this any more especially as we * now catch +L looping in PreJoin. Remove it, since O(n) logic makes me sad, and we catch it anyway. :) -- w00t */ - ext.set(channel, parameter); + ext.Set(channel, parameter); return MODEACTION_ALLOW; } diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index 7f99a851c..add31f148 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -163,7 +163,7 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> > if ((localsource) && (!ValidateSettings(localsource, channel, parameter, settings))) return MODEACTION_DENY; - ext.set(channel, settings); + ext.Set(channel, settings); return MODEACTION_ALLOW; } @@ -179,7 +179,7 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> > if (!rp) { rp = new MemberInfo; - MemberInfoExt.set(memb, rp); + MemberInfoExt.Set(memb, rp); } unsigned int matches = 0; diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index f1a32f5a0..ddd821aba 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -352,7 +352,7 @@ class CommandAuthenticate : public SplitCommand SaslAuthenticator *sasl = authExt.Get(user); if (!sasl) - authExt.set(user, new SaslAuthenticator(user, parameters[0], sslapi)); + authExt.Set(user, new SaslAuthenticator(user, parameters[0], sslapi)); else if (sasl->SendClientMessage(parameters) == false) // IAL abort extension --nenolod { sasl->AnnounceState(); diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 6a5b67146..4b1a3bd4f 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -242,7 +242,7 @@ class SilenceExtItem : public SimpleExtItem<SilenceList> } // The value was well formed. - set(user, list); + Set(user, list); } std::string ToInternal(const Extensible* container, void* item) const override @@ -290,7 +290,7 @@ class CommandSilence : public SplitCommand { // There is no list; create it. list = new SilenceList(); - ext.set(user, list); + ext.Set(user, list); } if (!list->insert(SilenceEntry(flags, mask)).second) diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index 6f41913a7..d15258fe7 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -69,7 +69,7 @@ class AuthQuery : public SQL::Query { if (verbose) ServerInstance->SNO.WriteGlobalSno('a', "Forbidden connection from %s (a provider for %s was not loaded)", user->GetFullRealHost().c_str(), kdf.c_str()); - pendingExt.set(user, AUTH_STATE_FAIL); + pendingExt.Set(user, AUTH_STATE_FAIL); return; } @@ -78,7 +78,7 @@ class AuthQuery : public SQL::Query { if (verbose) ServerInstance->SNO.WriteGlobalSno('a', "Forbidden connection from %s (the column specified (%s) was not returned)", user->GetFullRealHost().c_str(), pwcolumn.c_str()); - pendingExt.set(user, AUTH_STATE_FAIL); + pendingExt.Set(user, AUTH_STATE_FAIL); return; } @@ -87,24 +87,24 @@ class AuthQuery : public SQL::Query { if (hashprov->Compare(user->password, row[colindex])) { - pendingExt.set(user, AUTH_STATE_NONE); + pendingExt.Set(user, AUTH_STATE_NONE); return; } } if (verbose) ServerInstance->SNO.WriteGlobalSno('a', "Forbidden connection from %s (password from the SQL query did not match the user provided password)", user->GetFullRealHost().c_str()); - pendingExt.set(user, AUTH_STATE_FAIL); + pendingExt.Set(user, AUTH_STATE_FAIL); return; } - pendingExt.set(user, AUTH_STATE_NONE); + pendingExt.Set(user, AUTH_STATE_NONE); } else { if (verbose) ServerInstance->SNO.WriteGlobalSno('a', "Forbidden connection from %s (SQL query returned no matches)", user->GetFullRealHost().c_str()); - pendingExt.set(user, AUTH_STATE_FAIL); + pendingExt.Set(user, AUTH_STATE_FAIL); } } @@ -113,7 +113,7 @@ class AuthQuery : public SQL::Query User* user = ServerInstance->Users.Find(uid); if (!user) return; - pendingExt.set(user, AUTH_STATE_FAIL); + pendingExt.Set(user, AUTH_STATE_FAIL); if (verbose) ServerInstance->SNO.WriteGlobalSno('a', "Forbidden connection from %s (SQL query failed: %s)", user->GetFullRealHost().c_str(), error.ToString()); } @@ -184,7 +184,7 @@ class ModuleSQLAuth : public Module return MOD_RES_PASSTHRU; } - pendingExt.set(user, AUTH_STATE_BUSY); + pendingExt.Set(user, AUTH_STATE_BUSY); SQL::ParamMap userinfo; SQL::PopulateUserInfo(user, userinfo); diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 3baa6720b..5c5375471 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -53,7 +53,7 @@ class SSLCertExt : public ExtensionItem return static_cast<ssl_cert*>(GetRaw(item)); } - void set(Extensible* item, ssl_cert* value) + void Set(Extensible* item, ssl_cert* value) { value->refcount_inc(); ssl_cert* old = static_cast<ssl_cert*>(SetRaw(item, value)); @@ -74,7 +74,7 @@ class SSLCertExt : public ExtensionItem void FromNetwork(Extensible* container, const std::string& value) override { ssl_cert* cert = new ssl_cert; - set(container, cert); + Set(container, cert); std::stringstream s(value); std::string v; @@ -139,7 +139,7 @@ class UserCertificateAPIImpl : public UserCertificateAPIBase { ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Setting TLS (SSL) client certificate for %s: %s", user->GetFullHost().c_str(), cert->GetMetaLine().c_str()); - sslext.set(user, cert); + sslext.Set(user, cert); } }; @@ -413,7 +413,7 @@ class ModuleSSLInfo { // If this is not set then the connection between the client and // the gateway is not secure. - cmd.sslapi.nosslext.set(user, 1); + cmd.sslapi.nosslext.Set(user, 1); cmd.sslapi.sslext.unset(user); return; } diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 3f441c07d..41e2f2885 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -78,7 +78,7 @@ class CommandSwhois : public Command if (parameters[1].empty()) swhois.unset(dest); else - swhois.set(dest, parameters[1]); + swhois.Set(dest, parameters[1]); /* Bug #376 - feature request - * To cut down on the amount of commands services etc have to recognise, this only sends METADATA across the network now @@ -136,8 +136,8 @@ class ModuleSWhois if (!swhois.length()) return; - cmd.operblock.set(user, 1); - cmd.swhois.set(user, swhois); + cmd.operblock.Set(user, 1); + cmd.swhois.Set(user, swhois); ServerInstance->PI->SendMetaData(user, "swhois", swhois); } |
