diff options
| -rw-r--r-- | src/helperfuncs.cpp | 13 | ||||
| -rw-r--r-- | src/inspircd.cpp | 8 | ||||
| -rw-r--r-- | src/users.cpp | 8 |
3 files changed, 20 insertions, 9 deletions
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 223099c45..4338fb9da 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -268,17 +268,12 @@ userrec *InspIRCd::FindUUID(const std::string &uid) userrec *InspIRCd::FindUUID(const char *uid) { - for (user_hash::const_iterator a = this->clientlist->begin(); a != this->clientlist->end(); a++) - { - userrec *u = a->second; + user_hash::iterator finduuid = uuidlist->find(uid); - if (strcmp(u->uuid, uid) == 0) - { - return u; - } - } + if (finduuid == uuidlist->end()) + return NULL; - return NULL; + return finduuid->second; } /* find a channel record by channel name and return a pointer to it */ diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 995f62f1b..bfd7a9d45 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -165,9 +165,11 @@ void InspIRCd::ResetMaxBans() void InspIRCd::RehashUsersAndChans() { user_hash* old_users = this->clientlist; + user_hash* old_uuid = this->uuidlist; chan_hash* old_chans = this->chanlist; this->clientlist = new user_hash(); + this->uuidlist = new user_hash(); this->chanlist = new chan_hash(); for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++) @@ -175,6 +177,11 @@ void InspIRCd::RehashUsersAndChans() delete old_users; + for (user_hash::const_iterator n = old_uuid->begin(); n != old_uuid->end(); n++) + this->uuidlist->insert(*n); + + delete old_uuid; + for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++) this->chanlist->insert(*n); @@ -316,6 +323,7 @@ InspIRCd::InspIRCd(int argc, char** argv) this->unregistered_count = 0; this->clientlist = new user_hash(); + this->uuidlist = new user_hash(); this->chanlist = new chan_hash(); this->Config = new ServerConfig(this); diff --git a/src/users.cpp b/src/users.cpp index 476a4f1cd..72cf2103d 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -347,6 +347,12 @@ userrec::userrec(InspIRCd* Instance, const std::string &uid) : ServerInstance(In operquit = cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL; if (!uid.empty()) strlcpy(uuid, uid.c_str(), UUID_LENGTH); + + user_hash::iterator finduuid = Instance->uuidlist->find(uuid); + if (finduuid != Instance->uuidlist->end()) + (*Instance->uuidlist)[uuid] = this; + else + throw CoreException("Duplicate UUID "+uid+" in userrec constructor"); } void userrec::RemoveCloneCounts() @@ -393,6 +399,8 @@ userrec::~userrec() } #endif } + + ServerInstance->uuidlist->erase(uuid); } char* userrec::MakeHost() |