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

Improved detection of Qt-3 headers. Fixed (disabled for now) reinvites in SIP. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@178 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2005-01-09 20:10:44 +00:00
parent 345a643072
commit bd2bc53a00
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.in
View File

@ -439,6 +439,7 @@ AC_SUBST(GTK_LIB)
HAVE_QT=no
QT_DIR=""
QT_INC=""
AC_ARG_WITH(libqt,AC_HELP_STRING([--with-libqt],[use Qt for graphical clients (default)]),[ac_cv_use_libqt=$withval],[ac_cv_use_libqt=yes])
if [[ "x$ac_cv_use_libqt" != "xno" ]]; then
qtdir="$ac_cv_use_libqt"
@ -450,15 +451,24 @@ if [[ "x$ac_cv_use_libqt" != "xno" ]]; then
fi
if [[ "x$qtdir" != "x" ]]; then
AC_MSG_CHECKING([for multithreaded Qt3 in $qtdir])
if [[ -x "$qtdir/bin/moc" -a -f "$qtdir/lib/libqt-mt.so" -a -f "$qtdir/include/qkeysequence.h" ]]; then
HAVE_QT=yes
QT_DIR="$qtdir"
if [[ -x "$qtdir/bin/moc" -a -f "$qtdir/lib/libqt-mt.so" ]]; then
for i in "$qtdir/include" "$qtdir/include/qt3" "/usr/include/qt3"; do
if [[ -f "$i/qkeysequence.h" ]]; then
QT_INC="$i"
break;
fi
done
if [[ "x$QT_INC" != "x" ]]; then
HAVE_QT=yes
QT_DIR="$qtdir"
fi
fi
AC_MSG_RESULT([$HAVE_QT])
fi
fi
AC_SUBST(HAVE_QT)
AC_SUBST(QT_DIR)
AC_SUBST(QT_INC)
RTTI_OPT=""
AC_ARG_ENABLE(rtti,AC_HELP_STRING([--enable-rtti],[Enable RTTI support (default: like pwlib)]),want_rtti=$enableval,want_rtti=auto)

2
modules/Makefile.in
View File

@ -147,7 +147,7 @@ gsmcodec.yate: LOCALLIBS = -lgsm
gtkclient.yate: LOCALFLAGS = @GTK_INC@ @GTK_LIB@
qtclient.yate: ../contrib/qt/libqtclientform.a
qtclient.yate: LOCALFLAGS = -I@QT_DIR@/include
qtclient.yate: LOCALFLAGS = -I@QT_INC@
qtclient.yate: LOCALLIBS = ../contrib/qt/libqtclientform.a -L@QT_DIR@/lib -lqt-mt
ysipchan.yate: ../contrib/ysip/libysip.a

9
modules/ysipchan.cpp
View File

@ -531,6 +531,13 @@ void YateSIPEndPoint::invite(SIPEvent* e, SIPTransaction* t)
e->getTransaction()->setResponse(500, "Server Shutting Down");
return;
}
if (e->getMessage()->getParam("To","tag")) {
Debug(DebugWarn,"Dropping re-INVITE, we don't support it yet");
e->getTransaction()->setResponse(501, "Re-INVITE not supported yet");
return;
}
int cnt = SipMsgThread::count();
if (cnt > s_maxqueue) {
Debug(DebugWarn,"Dropping call, there are already %d waiting",cnt);
@ -547,7 +554,7 @@ void YateSIPEndPoint::invite(SIPEvent* e, SIPTransaction* t)
m->addParam("id","sip/" + callid);
m->addParam("caller",from.getUser());
m->addParam("called",uri.getUser());
m->addParam("sip.callid",callid);
m->addParam("sip_callid",callid);
if (e->getMessage()->body && e->getMessage()->body->isSDP()) {
String addr,port,formats;
parseSDP(static_cast<SDPBody*>(e->getMessage()->body),addr,port,formats);