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

Fixed refcounting in oss and message names in oss and qtclient. 

Searching one more directory for Qt-3.


git-svn-id: http://yate.null.ro/svn/yate/trunk@165 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2005-01-08 19:26:26 +00:00
parent e79f800a56
commit a82ce217e7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -442,7 +442,7 @@ if [[ "x$ac_cv_use_libqt" != "xno" ]]; then
if [[ "x$ac_cv_use_libqt" = "xyes" ]]; then
qtdir="$QTDIR"
if [[ "x$qtdir" = "x" ]]; then
qtdir=`ls -d -1 /opt/qt-3* /usr/lib/qt-3* 2>/dev/null | tail -1`
qtdir=`ls -d -1 /opt/qt-3* /usr/lib/qt-3* /usr/lib/qt3* 2>/dev/null | tail -1`
fi
fi
if [[ "x$qtdir" != "x" ]]; then

14
modules/osschan.cpp
View File

@ -402,7 +402,7 @@ bool OssHandler::received(Message &msg)
OssChan *chan = new OssChan(dest.matchString(1).c_str());
if (!chan->init())
{
delete chan;
chan->destruct();
return false;
}
DataEndpoint *dd = static_cast<DataEndpoint *>(msg.userData());
@ -418,8 +418,10 @@ bool OssHandler::received(Message &msg)
m.addParam("caller",dest);
m.addParam("callto",direct);
m.userData(chan);
if (Engine::dispatch(m))
if (Engine::dispatch(m)) {
chan->deref();
return true;
}
Debug(DebugFail,"OSS outgoing call not accepted!");
return false;
}
@ -435,17 +437,19 @@ bool OssHandler::received(Message &msg)
Engine::dispatch(m);
m = "call.route";
if (Engine::dispatch(m)) {
m = "call";
m = "call.execute";
m.addParam("callto",m.retValue());
m.retValue() = 0;
m.userData(chan);
if (Engine::dispatch(m))
if (Engine::dispatch(m)) {
chan->deref();
return true;
}
Debug(DebugFail,"OSS outgoing call not accepted!");
}
else
Debug(DebugWarn,"OSS outgoing call but no route!");
delete chan;
chan->destruct();
return false;
}