Delete empty bridges objects

This commit is contained in:
Florent Le Coz
2014-02-20 02:31:16 +01:00
parent 190c4ff176
commit 61ca40fa0e
3 changed files with 15 additions and 1 deletions
+5
View File
@@ -249,6 +249,11 @@ std::string Bridge::get_own_nick(const Iid& iid)
return ""; return "";
} }
size_t Bridge::connected_clients() const
{
return this->irc_clients.size();
}
void Bridge::kick_muc_user(Iid&& iid, const std::string& target, const std::string& reason, const std::string& author) void Bridge::kick_muc_user(Iid&& iid, const std::string& target, const std::string& reason, const std::string& author)
{ {
this->xmpp->kick_user(iid.chan + "%" + iid.server, target, reason, author, this->user_jid); this->xmpp->kick_user(iid.chan + "%" + iid.server, target, reason, author, this->user_jid);
+4
View File
@@ -104,6 +104,10 @@ public:
* Misc * Misc
*/ */
std::string get_own_nick(const Iid& iid); std::string get_own_nick(const Iid& iid);
/**
* Get the number of server to which this bridge is connected.
*/
size_t connected_clients() const;
private: private:
/** /**
+6 -1
View File
@@ -99,9 +99,14 @@ void XmppComponent::shutdown()
void XmppComponent::clean() void XmppComponent::clean()
{ {
for (auto it = this->bridges.begin(); it != this->bridges.end(); ++it) auto it = this->bridges.begin();
while (it != this->bridges.end())
{ {
it->second->clean(); it->second->clean();
if (it->second->connected_clients() == 0)
it = this->bridges.erase(it);
else
++it;
} }
} }