retronetworking/yate
12
0
Fork 2
Code Issues Pull requests Projects Releases Wiki Activity

Don't drop on timeout a conference room still owned.

Browse source 
git-svn-id: http://voip.null.ro/svn/yate@4329 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2011-04-19 18:39:41 +00:00
parent 90cd2050ff
commit baee3eda16
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/conference.cpp
View file

@ -109,6 +109,7 @@ public:
void delChannel(ConfChan* chan);
void addOwner(const String& id);
void delOwner(const String& id);
bool isOwned() const;
void dropAll(const char* reason = 0);
void msgStatus(Message& msg);
bool setRecording(const NamedList& params);
@ -121,8 +122,6 @@ private:
void setLonelyTimeout(const String& value);
// Set the expire time
void setExpire();
// Check if owned
bool isOwned() const;
String m_name;
ObjList m_chans;
ObjList m_owners;
@ -1135,9 +1134,13 @@ bool ConferenceDriver::received(Message &msg, int id)
if (!room)
break;
if (room->timeout(t)) {
Debug(this,DebugAll,"Room (%p) '%s' timed out",
(ConfRoom*)room,room->toString().c_str());
room->dropAll("timeout");
Lock mylock(room,500000);
if (mylock.locked() && !room->isOwned()) {
Debug(this,DebugAll,"Room (%p) '%s' timed out",
(ConfRoom*)room,room->toString().c_str());
mylock.drop();
room->dropAll("timeout");
}
}
room = 0;
lock();