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

Protect the generic methods list with the global mutex.

Browse source 
git-svn-id: http://voip.null.ro/svn/yate@5106 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2012-06-12 08:45:39 +00:00
parent abc5fb151c
commit 17f591b08e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ysipchan.cpp
View file

@ -4422,9 +4422,12 @@ bool YateSIPEndPoint::generic(SIPEvent* e, SIPTransaction* t)
String meth(t->getMethod()); String meth(t->getMethod());
meth.toLower(); meth.toLower();
String user; String user;
Lock mylock(s_globalMutex);
const String* auth = s_cfg.getKey("methods",meth); const String* auth = s_cfg.getKey("methods",meth);
if (!auth) if (!auth)
return false; return false;
bool autoAuth = auth->toBoolean(true);
mylock.drop();
Message m("sip." + meth); Message m("sip." + meth);
const SIPMessage* message = e->getMessage(); const SIPMessage* message = e->getMessage();
@ -4440,7 +4443,7 @@ bool YateSIPEndPoint::generic(SIPEvent* e, SIPTransaction* t)
m.addParam("domain",line->domain()); m.addParam("domain",line->domain());
m.addParam("in_line",*line); m.addParam("in_line",*line);
} }
else if (auth->toBoolean(true)) { else if (autoAuth) {
int age = t->authUser(user,false,&m); int age = t->authUser(user,false,&m);
DDebug(&plugin,DebugAll,"User '%s' age %d",user.c_str(),age); DDebug(&plugin,DebugAll,"User '%s' age %d",user.c_str(),age);
if ((age < 0) || (age > 10)) { if ((age < 0) || (age > 10)) {
@ -7461,7 +7464,9 @@ void SIPDriver::initialize()
{ {
Output("Initializing module SIP Channel"); Output("Initializing module SIP Channel");
s_cfg = Engine::configFile("ysipchan"); s_cfg = Engine::configFile("ysipchan");
s_globalMutex.lock();
s_cfg.load(); s_cfg.load();
s_globalMutex.unlock();
s_maxForwards = s_cfg.getIntValue("general","maxforwards",20); s_maxForwards = s_cfg.getIntValue("general","maxforwards",20);
s_floodEvents = s_cfg.getIntValue("general","floodevents",20); s_floodEvents = s_cfg.getIntValue("general","floodevents",20);
s_privacy = s_cfg.getBoolValue("general","privacy"); s_privacy = s_cfg.getBoolValue("general","privacy");