Added YRTP in Windows, fixed compiling in VC++

git-svn-id: http://voip.null.ro/svn/yate@342 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2005-05-10 11:52:48 +00:00
parent c74e1dc266
commit aeb45faef7
10 changed files with 268 additions and 15 deletions

View File

@ -162,6 +162,7 @@ bool RTPReceiver::decodeEvent(bool marker, unsigned int timestamp, const void* d
bool RTPReceiver::decodeCisco(bool marker, unsigned int timestamp, const void* data, int len)
{
return false;
}
void RTPReceiver::finishEvent(unsigned int timestamp)

View File

@ -189,7 +189,7 @@ bool GenConnection::oneCall(String* target)
if (lifetime) {
int minlife = s_cfg.getIntValue("parameters","minlife");
if (minlife)
lifetime -= ((lifetime - minlife) * (int64_t)::random()) / RAND_MAX;
lifetime -= (int)(((lifetime - minlife) * (int64_t)::random()) / RAND_MAX);
}
GenConnection* conn = new GenConnection(lifetime,callto);
m.addParam("id",conn->id());
@ -289,7 +289,7 @@ void GenThread::run()
Debug("CallGen",DebugInfo,"GenThread::run() [%p]",this);
int tonext = 10000;
while (!Engine::exiting()) {
::usleep(tonext);
Thread::usleep(tonext);
tonext = 10000;
Lock lock(s_mutex);
int maxcalls = s_cfg.getIntValue("parameters","maxcalls",5);
@ -299,7 +299,7 @@ void GenThread::run()
tonext = s_cfg.getIntValue("parameters","avgdelay",1000);
lock.drop();
GenConnection::oneCall();
tonext = ((int64_t)::random() * tonext * 2000) / RAND_MAX;
tonext = (int)(((int64_t)::random() * tonext * 2000) / RAND_MAX);
}
}
@ -307,7 +307,7 @@ void CleanThread::run()
{
Debug("CallGen",DebugInfo,"CleanThread::run() [%p]",this);
while (!Engine::exiting()) {
::usleep(100000);
Thread::usleep(100000);
Lock lock(s_mutex);
Time t;
ObjList* l = &s_calls;

View File

@ -401,7 +401,7 @@ void WpData::run()
while (!m_span->m_chans[b])
b++;
m_chans[n] = static_cast<WpChan*>(m_span->m_chans[b++]);
DDebug(&__plugin,"wpdata_chans",DebugInfo,"ch[%d]=%d (%p)",n,m_chans[n]->chan(),m_chans[n]);
DDebug(&__plugin,DebugInfo,"wpdata ch[%d]=%d (%p)",n,m_chans[n]->chan(),m_chans[n]);
}
while (m_span && (m_fd >= 0)) {
Thread::check();

View File

@ -652,7 +652,7 @@ bool DTMFHandler::received(Message &msg)
if (wrap && wrap->rtp()) {
Debug(DebugInfo,"RTP DTMF '%s' targetid '%s'",text.c_str(),targetid.c_str());
for (unsigned int i=0;i<text.length();i++)
wrap->sendDTMF(text[i]);
wrap->sendDTMF(text.at(i));
return true;
}
return false;

View File

@ -814,7 +814,7 @@ SDPBody* YateSIPConnection::createSDP(const char* addr, const char* port, const
if (m_rtpSession)
++m_rtpVersion;
else
m_rtpVersion = m_rtpSession = Time::now() / 10000000000ULL;
m_rtpVersion = m_rtpSession = (int)(Time::now() / (u_int32_t)10000000000);
String owner;
owner << "yate " << m_rtpSession << " " << m_rtpVersion << " IN IP4 " << addr;
if (!port) {

View File

@ -75,9 +75,6 @@ Package=<4>
Project_Dep_Name _cdrfile
End Project Dependency
Begin Project Dependency
Project_Dep_Name _h323chan
End Project Dependency
Begin Project Dependency
Project_Dep_Name _iaxchan
End Project Dependency
Begin Project Dependency
@ -95,6 +92,9 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name _msgsniff
End Project Dependency
Begin Project Dependency
Project_Dep_Name _h323chan
End Project Dependency
}}}
###############################################################################
@ -324,6 +324,24 @@ Package=<4>
###############################################################################
Project: "_yrtpchan"=.\_yrtpchan.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name Libyate
End Project Dependency
Begin Project Dependency
Project_Dep_Name libyrtp
End Project Dependency
}}}
###############################################################################
Project: "_ysipchan"=.\_ysipchan.dsp - Package Owner=<4>
Package=<5>
@ -393,6 +411,21 @@ Package=<4>
###############################################################################
Project: "libyrtp"=.\libyrtp.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name Libyate
End Project Dependency
}}}
###############################################################################
Project: "libysip"=.\libysip.dsp - Package Owner=<4>
Package=<5>

113
windows/_yrtpchan.dsp Normal file
View File

@ -0,0 +1,113 @@
# Microsoft Developer Studio Project File - Name="_yrtpchan" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=_yrtpchan - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "_yrtpchan.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "_yrtpchan.mak" CFG="_yrtpchan - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "_yrtpchan - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "_yrtpchan - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "_yrtpchan - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "_yrtpchan___Win32_Release"
# PROP BASE Intermediate_Dir "_yrtpchan___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release\modules"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_YRTPCHAN_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "..\contrib\yrtp" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBYRTP_STATIC" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib Release/libyrtp.lib /nologo /dll /machine:I386 /out:"Release/yrtpchan.yate"
!ELSEIF "$(CFG)" == "_yrtpchan - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "_yrtpchan___Win32_Debug"
# PROP BASE Intermediate_Dir "_yrtpchan___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug\modules"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_YRTPCHAN_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I ".." /I "..\contrib\yrtp" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBYRTP_STATIC" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib Debug/libyrtp.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"Debug/yrtpchan.yate" /pdbtype:sept
!ENDIF
# Begin Target
# Name "_yrtpchan - Win32 Release"
# Name "_yrtpchan - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\modules\yrtpchan.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
SOURCE=.\version.rc
# End Source File
# End Group
# End Target
# End Project

View File

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_YSIPCHAN_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /O2 /I "." /I ".." /I "..\contrib\ysip" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
# ADD CPP /nologo /MD /W3 /O2 /I "." /I ".." /I "..\contrib\ysip" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBYSIP_STATIC" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_YSIPCHAN_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "." /I ".." /I "..\contrib\ysip" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "." /I ".." /I "..\contrib\ysip" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBYSIP_STATIC" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

106
windows/libyrtp.dsp Normal file
View File

@ -0,0 +1,106 @@
# Microsoft Developer Studio Project File - Name="libyrtp" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libyrtp - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libyrtp.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libyrtp.mak" CFG="libyrtp - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libyrtp - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libyrtp - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "libyrtp - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "libyrtp___Win32_Release"
# PROP BASE Intermediate_Dir "libyrtp___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release\yrtp"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "..\contrib\yrtp" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "LIBYRTP_STATIC" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "libyrtp - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "libyrtp___Win32_Debug"
# PROP BASE Intermediate_Dir "libyrtp___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug\yrtp"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I ".." /I "..\contrib\yrtp" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "LIBYRTP_STATIC" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "libyrtp - Win32 Release"
# Name "libyrtp - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\contrib\yrtp\session.cpp
# End Source File
# Begin Source File
SOURCE=..\contrib\yrtp\transport.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\contrib\yrtp\yatertp.h
# End Source File
# End Group
# End Target
# End Project

View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release\ysip"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W3 /O2 /I "." /I ".." /I "..\contrib\ysip" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# ADD CPP /nologo /MD /W3 /O2 /I "." /I ".." /I "..\contrib\ysip" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "LIBYSIP_STATIC" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@ -65,7 +65,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug\ysip"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "." /I ".." /I "..\contrib\ysip" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "." /I ".." /I "..\contrib\ysip" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "LIBYSIP_STATIC" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@ -115,7 +115,7 @@ SOURCE=..\contrib\ysip\util.h
# End Source File
# Begin Source File
SOURCE=..\contrib\ysip\ysip.h
SOURCE=..\contrib\ysip\yatesip.h
# End Source File
# End Group
# End Target