X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=b361205da7aa1053fc0ca50288d4111c94f6fea7;hb=05b111d6a245725c81a314794fb95e8375fb6720;hp=cbc59a49c66a32a7676343475ab28ac529035462;hpb=0036e3a70cabea02e9ec2103ed1dfdf5c799289f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index cbc59a49c..b361205da 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -25,6 +25,8 @@ unsigned long uniq_id = 1; static unsigned long* already_sent = NULL; +LocalIntExt User::NICKForced("NICKForced", NULL); +LocalStringExt User::OperQuit("OperQuit", NULL); void InitializeAlreadySent(SocketEngine* SE) { @@ -32,7 +34,6 @@ void InitializeAlreadySent(SocketEngine* SE) memset(already_sent, 0, SE->GetMaxFds() * sizeof(unsigned long)); } - std::string User::ProcessNoticeMasks(const char *sm) { bool adding = true, oldadding = false; @@ -107,12 +108,10 @@ void User::StartDNSLookup() const char* sip = this->GetIPString(); UserResolver *res_reverse; - QueryType resolvtype = strchr(sip, ':') ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4; - // when GetProtocolFamily() works correctly with 4in6, this can be replaced by - // this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6; - res_reverse = new UserResolver(this->ServerInstance, this, sip, resolvtype, cached); + QueryType resolvtype = this->client_sa.sa.sa_family == AF_INET6 ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4; + res_reverse = new UserResolver(ServerInstance, this, sip, resolvtype, cached); - this->ServerInstance->AddResolver(res_reverse, cached); + ServerInstance->AddResolver(res_reverse, cached); } catch (CoreException& e) { @@ -206,19 +205,19 @@ void User::DecrementModes() } } -User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance) +User::User(InspIRCd* Instance, const std::string &uid) { - server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName); + server = Instance->FindServerNamePtr(Instance->Config->ServerName); age = ServerInstance->Time(); Penalty = 0; lastping = signon = idle_lastmsg = nping = registered = 0; bytes_in = bytes_out = cmds_in = cmds_out = 0; quietquit = quitting = exempt = haspassed = dns_done = false; fd = -1; + server_sa.sa.sa_family = AF_UNSPEC; + client_sa.sa.sa_family = AF_UNSPEC; recvq.clear(); sendq.clear(); - Visibility = NULL; - ip = NULL; MyClass = NULL; AllowedPrivs = AllowedOperCommands = NULL; chans.clear(); @@ -264,22 +263,9 @@ User::~User() this->InvalidateCache(); this->DecrementModes(); - if (ip) - { + if (client_sa.sa.sa_family != AF_UNSPEC) ServerInstance->Users->RemoveCloneCounts(this); - if (this->GetProtocolFamily() == AF_INET) - { - delete (sockaddr_in*)ip; - } -#ifdef SUPPORT_IP6LINKS - else - { - delete (sockaddr_in6*)ip; - } -#endif - } - ServerInstance->Users->uuidlist->erase(uuid); } @@ -520,7 +506,6 @@ bool User::HasPermission(const std::string &command) bool User::HasPrivPermission(const std::string &privstr, bool noisy) { - ServerInstance->Logs->Log("PRIVS", DEBUG, "Checking if I have " + privstr); if (!IS_LOCAL(this)) { ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)"); @@ -531,7 +516,6 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy) { if (noisy) this->WriteServ("NOTICE %s :You are not an oper", this->nick.c_str()); - ServerInstance->Logs->Log("PRIVS", DEBUG, "Not oper (no)"); return false; } @@ -539,7 +523,6 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy) { if (noisy) this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str()); - ServerInstance->Logs->Log("PRIVS", DEBUG, "No privs(?) (no)"); return false; } @@ -733,7 +716,7 @@ void User::FlushWriteBuf() this->bytes_out += n_sent; this->cmds_out++; if (n_sent != old_sendq_length) - this->ServerInstance->SE->WantWrite(this); + ServerInstance->SE->WantWrite(this); } } @@ -804,7 +787,7 @@ void User::Oper(const std::string &opertype, const std::string &opername) this->AllowedPrivs->insert(mypriv); } - for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c) + for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist.c_str(); *c; ++c) { if (*c == '*') { @@ -816,7 +799,7 @@ void User::Oper(const std::string &opertype, const std::string &opername) } } - for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c) + for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist.c_str(); *c; ++c) { if (*c == '*') { @@ -887,12 +870,12 @@ void User::UnOper() /* adds or updates an entry in the whowas list */ void User::AddToWhoWas() { - Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); - if (whowas_command) + Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so"); + if (whowas) { - std::deque params; - params.push_back(this); - whowas_command->HandleInternal(WHOWAS_ADD, params); + WhowasRequest req(NULL, whowas, WhowasRequest::WHOWAS_ADD); + req.user = this; + req.Send(); } } @@ -972,9 +955,9 @@ void User::FullConnect() this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network); this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network, this->nick.c_str(), this->ident.c_str(), this->host.c_str()); - this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-1.2",this->nick.c_str(),ServerInstance->Config->ServerName); + this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName); this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__); - this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-1.2 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str()); + this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-2.0 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str()); ServerInstance->Config->Send005(this); this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str()); @@ -987,10 +970,10 @@ void User::FullConnect() ServerInstance->Users->unregistered_count--; /* Trigger LUSERS output, give modules a chance too */ - int MOD_RESULT = 0; + ModResult MOD_RESULT; std::string command("LUSERS"); std::vector parameters; - FOREACH_RESULT(I_OnPreCommand, OnPreCommand(command, parameters, this, true, "LUSERS")); + FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS")); if (!MOD_RESULT) ServerInstance->CallCommandHandler(command, parameters, this); @@ -1002,11 +985,10 @@ void User::FullConnect() this->registered = REG_ALL; - ServerInstance->PI->Introduce(this); - FOREACH_MOD(I_OnPostConnect,OnPostConnect(this)); - ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str()); + ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", + this->GetServerPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str()); ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString()); ServerInstance->BanCache->AddHit(this->GetIPString(), "", ""); } @@ -1043,17 +1025,15 @@ void User::InvalidateCache() bool User::ForceNickChange(const char* newnick) { - int MOD_RESULT = 0; + ModResult MOD_RESULT; this->InvalidateCache(); - this->Extend("NICKForced", "Enabled"); - - FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick)); - - this->Shrink("NICKForced"); + NICKForced.set(this, 1); + FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (this, newnick)); + NICKForced.set(this, 0); - if (MOD_RESULT) + if (MOD_RESULT == MOD_RES_DENY) { ServerInstance->stats->statsCollisions++; return false; @@ -1064,12 +1044,10 @@ bool User::ForceNickChange(const char* newnick) if (nickhandler) // wtfbbq, when would this not be here { std::vector parameters; - nickhandler->HandleInternal(1, dummy); parameters.push_back(newnick); - this->Extend("NICKForced", "Enabled"); + NICKForced.set(this, 1); bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS); - this->Shrink("NICKForced"); - nickhandler->HandleInternal(0, dummy); + NICKForced.set(this, 0); return result; } @@ -1077,81 +1055,22 @@ bool User::ForceNickChange(const char* newnick) return false; } -void User::SetSockAddr(int protocol_family, const char* sip, int port) +int User::GetServerPort() { - this->cachedip = ""; - - switch (protocol_family) + switch (this->server_sa.sa.sa_family) { -#ifdef SUPPORT_IP6LINKS case AF_INET6: - { - sockaddr_in6* sin = new sockaddr_in6; - sin->sin6_family = AF_INET6; - sin->sin6_port = port; - inet_pton(AF_INET6, sip, &sin->sin6_addr); - this->ip = (sockaddr*)sin; - } - break; -#endif - case AF_INET: - { - sockaddr_in* sin = new sockaddr_in; - sin->sin_family = AF_INET; - sin->sin_port = port; - inet_pton(AF_INET, sip, &sin->sin_addr); - this->ip = (sockaddr*)sin; - } - break; - default: - ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick.c_str()); - break; - } -} - -int User::GetPort() -{ - if (this->ip == NULL) - return 0; - - switch (this->GetProtocolFamily()) - { -#ifdef SUPPORT_IP6LINKS - case AF_INET6: - { - sockaddr_in6* sin = (sockaddr_in6*)this->ip; - return sin->sin6_port; - } - break; -#endif + return htons(this->server_sa.in6.sin6_port); case AF_INET: - { - sockaddr_in* sin = (sockaddr_in*)this->ip; - return sin->sin_port; - } - break; - default: - break; + return htons(this->server_sa.in4.sin_port); } return 0; } -int User::GetProtocolFamily() -{ - if (this->ip == NULL) - return 0; - - sockaddr_in* sin = (sockaddr_in*)this->ip; - return sin->sin_family; -} - const char* User::GetCIDRMask(int range) { static char buf[44]; - if (this->ip == NULL) - return ""; - if (range < 0) throw "Negative range, sorry, no."; @@ -1159,23 +1078,18 @@ const char* User::GetCIDRMask(int range) * Original code written by Oliver Lupton (Om). * Integrated by me. Thanks. :) -- w00t */ - switch (this->GetProtocolFamily()) + switch (this->client_sa.sa.sa_family) { -#ifdef SUPPORT_IP6LINKS case AF_INET6: { /* unsigned char s6_addr[16]; */ struct in6_addr v6; - sockaddr_in6* sin; int i, bytestozero, extrabits; char buffer[40]; if(range > 128) throw "CIDR mask width greater than address width (IPv6, 128 bit)"; - /* Access the user's IP structure directly */ - sin = (sockaddr_in6*)this->ip; - /* To create the CIDR mask we want to set all the bits after 'range' bits of the address * to zero. This means the last (128 - range) bits of the address must be set to zero. * Hence this number divided by 8 is the number of whole bytes from the end of the address @@ -1194,7 +1108,7 @@ const char* User::GetCIDRMask(int range) */ for(i = 0; i < (16 - bytestozero); i++) { - v6.s6_addr[i] = sin->sin6_addr.s6_addr[i]; + v6.s6_addr[i] = client_sa.in6.sin6_addr.s6_addr[i]; } /* And zero all the remaining bytes in the IP. */ @@ -1210,19 +1124,16 @@ const char* User::GetCIDRMask(int range) return buf; } break; -#endif case AF_INET: { struct in_addr v4; - sockaddr_in* sin; char buffer[16]; if (range > 32) throw "CIDR mask width greater than address width (IPv4, 32 bit)"; /* Users already have a sockaddr* pointer (User::ip) which contains either a v4 or v6 structure */ - sin = (sockaddr_in*)this->ip; - v4.s_addr = sin->sin_addr.s_addr; + v4.s_addr = client_sa.in4.sin_addr.s_addr; /* To create the CIDR mask we want to set all the bits after 'range' bits of the address * to zero. This means the last (32 - range) bits of the address must be set to zero. @@ -1252,76 +1163,40 @@ const char* User::GetCIDRMask(int range) return ""; // unused, but oh well } -const char* User::GetIPString() +std::string User::GetServerIP() { - static char buf[40]; - - if (this->ip == NULL) - return ""; - - if (!this->cachedip.empty()) - return this->cachedip.c_str(); + int port; + std::string ip; + irc::sockets::satoap(&server_sa, ip, port); + return ip; +} - switch (this->GetProtocolFamily()) +const char* User::GetIPString() +{ + int port; + if (cachedip.empty()) { -#ifdef SUPPORT_IP6LINKS - case AF_INET6: - { - static char temp[1024]; - - sockaddr_in6* sin = (sockaddr_in6*)this->ip; - inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf)); - /* IP addresses starting with a : on irc are a Bad Thing (tm) */ - if (*buf == ':') - { - strlcpy(&temp[1], buf, sizeof(temp) - 1); - *temp = '0'; - this->cachedip = temp; - return temp; - } - - this->cachedip = buf; - return buf; - } - break; -#endif - case AF_INET: - { - sockaddr_in* sin = (sockaddr_in*)this->ip; - inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf)); - this->cachedip = buf; - return buf; - } - break; - default: - break; + irc::sockets::satoap(&client_sa, cachedip, port); + /* IP addresses starting with a : on irc are a Bad Thing (tm) */ + if (cachedip.c_str()[0] == ':') + cachedip.insert(0,1,'0'); } - // Unreachable, probably - return ""; + return cachedip.c_str(); } -/** NOTE: We cannot pass a const reference to this method. - * The string is changed by the workings of the method, - * so that if we pass const ref, we end up copying it to - * something we can change anyway. Makes sense to just let - * the compiler do that copy for us. - */ -void User::Write(std::string text) +bool User::SetClientIP(const char* sip) +{ + this->cachedip = ""; + return irc::sockets::aptosa(sip, 0, &client_sa); +} + +void User::Write(const std::string& text) { if (!ServerInstance->SE->BoundsCheckFd(this)) return; - try - { - ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str()); - text.append("\r\n"); - } - catch (...) - { - ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"Exception in User::Write() std::string::append"); - return; - } + ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str()); if (this->GetIOHook()) { @@ -1331,6 +1206,7 @@ void User::Write(std::string text) try { this->GetIOHook()->OnRawSocketWrite(this->fd, text.data(), text.length()); + this->GetIOHook()->OnRawSocketWrite(this->fd, "\r\n", 2); } catch (CoreException& modexcept) { @@ -1340,9 +1216,10 @@ void User::Write(std::string text) else { this->AddWriteBuf(text); + this->AddWriteBuf("\r\n"); } - ServerInstance->stats->statsSent += text.length(); - this->ServerInstance->SE->WantWrite(this); + ServerInstance->stats->statsSent += text.length() + 2; + ServerInstance->SE->WantWrite(this); } /** Write() @@ -1361,10 +1238,7 @@ void User::Write(const char *text, ...) void User::WriteServ(const std::string& text) { - char textbuffer[MAXBUF]; - - snprintf(textbuffer,MAXBUF,":%s %s",ServerInstance->Config->ServerName,text.c_str()); - this->Write(std::string(textbuffer)); + this->Write(":%s %s",ServerInstance->Config->ServerName,text.c_str()); } /** WriteServ() @@ -1398,11 +1272,11 @@ void User::WriteNumeric(unsigned int numeric, const char* text, ...) void User::WriteNumeric(unsigned int numeric, const std::string &text) { char textbuffer[MAXBUF]; - int MOD_RESULT = 0; + ModResult MOD_RESULT; - FOREACH_RESULT(I_OnNumeric, OnNumeric(this, numeric, text)); + FIRST_MOD_RESULT(ServerInstance, OnNumeric, MOD_RESULT, (this, numeric, text)); - if (MOD_RESULT) + if (MOD_RESULT == MOD_RES_DENY) return; snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName, numeric, text.c_str()); @@ -1488,8 +1362,8 @@ void User::WriteCommon(const std::string &text) for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++) { - CUList* ulist = v->first->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + const UserMembList* ulist = (*v)->GetUsers(); + for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) { if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id)) { @@ -1547,8 +1421,8 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++) { - CUList *ulist = v->first->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + const UserMembList* ulist = (*v)->GetUsers(); + for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) { if (this != i->first) { @@ -1580,8 +1454,8 @@ void User::WriteCommonExcept(const std::string &text) for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++) { - CUList *ulist = v->first->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + const UserMembList* ulist = (*v)->GetUsers(); + for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) { if (this != i->first) { @@ -1647,7 +1521,7 @@ bool User::SharesChannelWith(User *other) /* Eliminate the inner loop (which used to be ~equal in size to the outer loop) * by replacing it with a map::find which *should* be more efficient */ - if (i->first->HasUser(other)) + if ((*i)->HasUser(other)) return true; } return false; @@ -1660,9 +1534,9 @@ bool User::ChangeName(const char* gecos) if (IS_LOCAL(this)) { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(this,gecos)); - if (MOD_RESULT) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnChangeLocalUserGECOS, MOD_RESULT, (this,gecos)); + if (MOD_RESULT == MOD_RES_DENY) return false; FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos)); } @@ -1671,6 +1545,54 @@ bool User::ChangeName(const char* gecos) return true; } +void User::DoHostCycle(const std::string &quitline) +{ + char buffer[MAXBUF]; + + ModResult result = MOD_RES_PASSTHRU; + FIRST_MOD_RESULT(ServerInstance, OnHostCycle, result, (this)); + + if (result == MOD_RES_DENY) + return; + if (result == MOD_RES_PASSTHRU && !ServerInstance->Config->CycleHosts) + return; + + uniq_id++; + + if (!already_sent) + InitializeAlreadySent(ServerInstance->SE); + + for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++) + { + Channel* c = *v; + snprintf(buffer, MAXBUF, ":%s JOIN %s", GetFullHost().c_str(), c->name.c_str()); + std::string joinline(buffer); + std::string modeline = ServerInstance->Modes->ModeString(this, c); + if (modeline.length() > 0) + { + snprintf(buffer, MAXBUF, ":%s MODE %s +%s", GetFullHost().c_str(), c->name.c_str(), modeline.c_str()); + modeline = buffer; + } + + const UserMembList *ulist = c->GetUsers(); + for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) + { + User* u = i->first; + if (u == this || !IS_LOCAL(u)) + continue; + + if (already_sent[i->first->fd] != uniq_id) + { + u->Write(quitline); + already_sent[i->first->fd] = uniq_id; + } + u->Write(joinline); + if (modeline.length() > 0) + u->Write(modeline); + } + } +} + bool User::ChangeDisplayedHost(const char* shost) { if (dhost == shost) @@ -1678,35 +1600,22 @@ bool User::ChangeDisplayedHost(const char* shost) if (IS_LOCAL(this)) { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost)); - if (MOD_RESULT) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnChangeLocalUserHost, MOD_RESULT, (this,shost)); + if (MOD_RESULT == MOD_RES_DENY) return false; } FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,shost)); - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this)); - - if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) - this->WriteCommonExcept("QUIT :Changing hosts"); + std::string quitstr = ":" + GetFullHost() + " QUIT :Changing host"; /* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */ this->dhost.assign(shost, 0, 64); this->InvalidateCache(); - if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) - { - for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) - { - i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name.c_str()); - std::string n = this->ServerInstance->Modes->ModeString(this, i->first); - if (n.length() > 0) - i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str()); - } - } + this->DoHostCycle(quitstr); if (IS_LOCAL(this)) this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str()); @@ -1719,26 +1628,15 @@ bool User::ChangeIdent(const char* newident) if (this->ident == newident) return true; - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this)); + FOREACH_MOD(I_OnChangeIdent, OnChangeIdent(this,newident)); - if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) - this->WriteCommonExcept("%s","QUIT :Changing ident"); + std::string quitstr = ":" + GetFullHost() + " QUIT :Changing ident"; this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1); this->InvalidateCache(); - if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) - { - for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) - { - i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name.c_str()); - std::string n = this->ServerInstance->Modes->ModeString(this, i->first); - if (n.length() > 0) - i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str()); - } - } + this->DoHostCycle(quitstr); return true; } @@ -1769,13 +1667,14 @@ std::string User::ChannelList(User* source) for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) { + Channel* c = *i; /* If the target is the same as the sender, let them see all their channels. * If the channel is NOT private/secret OR the user shares a common channel * If the user is an oper, and the option is set. */ - if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!i->first->IsModeSet('p')) && (!i->first->IsModeSet('s'))) || (i->first->HasUser(source)))) + if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!c->IsModeSet('p')) && (!c->IsModeSet('s'))) || (c->HasUser(source)))) { - list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" "); + list.append(c->GetPrefixChar(this)).append(c->name).append(" "); } } @@ -1887,9 +1786,9 @@ ConnectClass* User::SetClass(const std::string &explicit_name) ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort()); /* and our port doesn't match, fail. */ - if (this->GetPort() != c->GetPort()) + if (this->GetServerPort() != c->GetPort()) { - ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetPort()); + ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetServerPort()); continue; } } @@ -1941,13 +1840,14 @@ void User::PurgeEmptyChannels() // firstly decrement the count on each channel for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++) { - f->first->RemoveAllPrefixes(this); - if (f->first->DelUser(this) == 0) + Channel* c = *f; + c->RemoveAllPrefixes(this); + if (c->DelUser(this) == 0) { /* No users left in here, mark it for deletion */ try { - to_delete.push_back(f->first); + to_delete.push_back(c); } catch (...) { @@ -1962,9 +1862,9 @@ void User::PurgeEmptyChannels() chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name); if (i2 != ServerInstance->chanlist->end()) { - int MOD_RESULT = 0; - FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(i2->second)); - if (MOD_RESULT == 1) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, MOD_RESULT, (i2->second)); + if (MOD_RESULT == MOD_RES_DENY) continue; // delete halted by module FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second)); delete i2->second; @@ -2026,16 +1926,6 @@ void User::HandleEvent(EventType et, int errornum) } } -void User::SetOperQuit(const std::string &oquit) -{ - operquitmsg = oquit; -} - -const std::string& User::GetOperQuit() -{ - return operquitmsg; -} - void User::IncreasePenalty(int increase) { this->Penalty += increase; @@ -2066,27 +1956,13 @@ const std::string FakeUser::GetFullRealHost() return nick; } -VisData::VisData() -{ -} - -VisData::~VisData() -{ -} - -bool VisData::VisibleTo(User* user) -{ - return true; -} - - ConnectClass::ConnectClass(char t, const std::string& mask) - : type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), limit(0), RefCount(1) + : type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0), RefCount(1) { } ConnectClass::ConnectClass(char t, const std::string& mask, const ConnectClass& parent) - : type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), limit(parent.limit), RefCount(1) + : type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), port(parent.port), limit(parent.limit), RefCount(1) { }