Skip to content

F
freeswitch
提交 d5945f81 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

add libresample to core libs in msvc build, rework GetLibs.vbs to be more… 

add libresample to core libs in msvc build, rework GetLibs.vbs to be more sensible in it's structure, change jrtp4c build in msvc to build as part of mod_exosip instead of as a separate lib for build simplicity, squash numerous warnings in libiax2 and jrtp4c, delete FreeswitchPlusLibs.sln because we were not using it and not maintaining it.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@250 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 3613ec26
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 210 行增加 和 425 行删除
libs/iax/src/iax.c
浏览文件 @ d5945f81
......@@ -32,6 +32,7 @@
#if defined(_MSC_VER)
#define close _close
#define inline __inline
#define strdup _strdup
#endif
void gettimeofday(struct timeval *tv, void /*struct timezone*/ *tz);
......@@ -567,7 +568,7 @@ int iax_get_netstats(struct iax_session *session, int *rtt, struct iax_netstat *
static int calc_timestamp(struct iax_session *session, unsigned int ts, struct ast_frame *f)
{
int ms;
unsigned int ms;
time_in_ms_t time_in_ms;
int voice = 0;
int genuine = 0;
......@@ -926,7 +927,7 @@ int iax_init(int preferredportno)
DEBU(G "Already initialized.");
return 0;
}
netfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
netfd = (int)socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
if (netfd < 0) {
DEBU(G "Unable to allocate UDP socket\n");
IAXERROR "Unable to allocate UDP socket\n");
......@@ -976,7 +977,7 @@ int iax_init(int preferredportno)
#endif
portno = ntohs(sin.sin_port);
}
srand(time(NULL));
srand((unsigned int)time(NULL));
callnums = rand() % 32767 + 1;
transfer_id = rand() % 32767 + 1;
DEBU(G "Started on port %d\n", portno);
......@@ -1609,7 +1610,7 @@ int iax_hangup(struct iax_session *session, char *byemsg)
int iax_sendurl(struct iax_session *session, char *url)
{
return send_command(session, AST_FRAME_HTML, AST_HTML_URL, 0, (unsigned char *) url, strlen(url), -1);
return send_command(session, AST_FRAME_HTML, AST_HTML_URL, 0, (unsigned char *) url, (int)strlen(url), -1);
}
int iax_ring_announce(struct iax_session *session)
......@@ -1653,12 +1654,12 @@ int iax_load_complete(struct iax_session *session)
int iax_send_url(struct iax_session *session, char *url, int link)
{
return send_command(session, AST_FRAME_HTML, link ? AST_HTML_LINKURL : AST_HTML_URL, 0, (unsigned char *) url, strlen(url), -1);
return send_command(session, AST_FRAME_HTML, link ? AST_HTML_LINKURL : AST_HTML_URL, 0, (unsigned char *) url, (int)strlen(url), -1);
}
int iax_send_text(struct iax_session *session, char *text)
{
return send_command(session, AST_FRAME_TEXT, 0, 0, (unsigned char *) text, strlen(text) + 1, -1);
return send_command(session, AST_FRAME_TEXT, 0, 0, (unsigned char *) text, (int)strlen(text) + 1, -1);
}
int iax_send_unlink(struct iax_session *session)
......@@ -1687,7 +1688,7 @@ static int iax_send_pong(struct iax_session *session, unsigned int ts)
iax_ie_append_int(&ied,IAX_IE_RR_LOSS,
((0xff & (stats.losspct/1000)) << 24 | (stats.frames_lost & 0x00ffffff)));
iax_ie_append_int(&ied,IAX_IE_RR_PKTS, stats.frames_in);
iax_ie_append_short(&ied,IAX_IE_RR_DELAY, stats.current - stats.min);
iax_ie_append_short(&ied,IAX_IE_RR_DELAY, (unsigned short)(stats.current - stats.min));
iax_ie_append_int(&ied,IAX_IE_RR_DROPPED, stats.frames_dropped);
iax_ie_append_int(&ied,IAX_IE_RR_OOO, stats.frames_ooo);
}
......@@ -1767,8 +1768,8 @@ int iax_auth_reply(struct iax_session *session, char *password, char *challenge,
memset(&ied, 0, sizeof(ied));
if ((methods & IAX_AUTH_MD5) && challenge) {
MD5Init(&md5);
MD5Update(&md5, (const unsigned char *) challenge, strlen(challenge));
MD5Update(&md5, (const unsigned char *) password, strlen(password));
MD5Update(&md5, (const unsigned char *) challenge, (unsigned int)strlen(challenge));
MD5Update(&md5, (const unsigned char *) password, (unsigned int)strlen(password));
MD5Final((unsigned char *) reply, &md5);
memset(realreply, 0, sizeof(realreply));
convert_reply(realreply, (unsigned char *) reply);
......@@ -1790,8 +1791,8 @@ static int iax_regauth_reply(struct iax_session *session, char *password, char *
iax_ie_append_short(&ied, IAX_IE_REFRESH, session->refresh);
if ((methods & IAX_AUTHMETHOD_MD5) && challenge) {
MD5Init(&md5);
MD5Update(&md5, (const unsigned char *) challenge, strlen(challenge));
MD5Update(&md5, (const unsigned char *) password, strlen(password));
MD5Update(&md5, (const unsigned char *) challenge, (unsigned int)strlen(challenge));
MD5Update(&md5, (const unsigned char *) password, (unsigned int)strlen(password));
MD5Final((unsigned char *) reply, &md5);
memset(realreply, 0, sizeof(realreply));
convert_reply(realreply, (unsigned char *) reply);
......@@ -1852,7 +1853,7 @@ char iax_pref_codec_add(struct iax_session *session, unsigned int format)
void iax_pref_codec_del(struct iax_session *session, unsigned int format)
{
int diff = (int) 'A';
int x;
size_t x;
char old[32];
char remove = which_bit(format) + diff;
......@@ -2539,7 +2540,7 @@ static struct iax_event *iax_header_to_event(struct iax_session *session,
session->capability = e->ies.capability;
if (e->ies.codec_prefs) {
strncpy(session->codec_order, e->ies.codec_prefs, sizeof(session->codec_order));
session->codec_order_len = strlen(session->codec_order);
session->codec_order_len = (int)strlen(session->codec_order);
}
e->etype = IAX_EVENT_CONNECT;
e = schedule_delivery(e, ts, updatehistory);
......
libs/iax/src/iax2-parser.c
浏览文件 @ d5945f81
......@@ -239,21 +239,21 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l
if (len < 2)
return;
strcpy(output, "\n");
maxlen -= strlen(output); output += strlen(output);
maxlen -= (int)strlen(output); output += strlen(output);
while(len > 2) {
ie = iedata[0];
ielen = iedata[1];
if (ielen + 2> len) {
snprintf(tmp, (int)sizeof(tmp), "Total Prov IE length of %d bytes exceeds remaining prov frame length of %d bytes\n", ielen + 2, len);
strncpy(output, tmp, maxlen - 1);
maxlen -= strlen(output); output += strlen(output);
maxlen -= (int)strlen(output); output += strlen(output);
return;
}
found = 0;
if (!found) {
snprintf(tmp, (int)sizeof(tmp), " Unknown Prov IE %03d : Present\n", ie);
strncpy(output, tmp, maxlen - 1);
maxlen -= strlen(output); output += strlen(output);
maxlen -= (int)strlen(output); output += strlen(output);
}
iedata += (2 + ielen);
len -= (2 + ielen);
......@@ -467,7 +467,7 @@ int iax_ie_append_short(struct iax_ie_data *ied, unsigned char ie, unsigned shor
int iax_ie_append_str(struct iax_ie_data *ied, unsigned char ie, unsigned char *str)
{
return iax_ie_append_raw(ied, ie, str, strlen((char *) str));
return iax_ie_append_raw(ied, ie, str, (int)strlen((char *) str));
}
int iax_ie_append_byte(struct iax_ie_data *ied, unsigned char ie, unsigned char dat)
......
libs/jrtp4c/src/jrtp4c.cpp
浏览文件 @ d5945f81
......@@ -130,7 +130,7 @@ extern "C" {
if ((pack = jrtp4c->session->GetNextPacket())) {
slen = pack->GetPayloadLength();
slen = (int)pack->GetPayloadLength();
if (slen > datalen) {
slen = datalen;
......
libs/jrtp4c/src/jrtp4c.h
浏览文件 @ d5945f81
......@@ -6,6 +6,14 @@
#ifndef CCRTP4C_H
#define CCRTP4C_H
#ifdef WIN32
#include <winsock2.h>
#pragma warning(disable: 4267)
#else
#include <netinet/in.h>
#include <arpa/inet.h>
#endif // WIN32
#ifdef __cplusplus
#include <rtpsession.h>
#include <rtppacket.h>
......@@ -13,18 +21,6 @@
#include <rtpipv4address.h>
#include <rtpsessionparams.h>
#include <rtperrors.h>
#ifndef WIN32
#include <netinet/in.h>
#include <arpa/inet.h>
#else
#include <winsock2.h>
#endif // WIN32
#if 0
#include <stdlib.h>
#include <stdio.h>
#include <iostream>
#include <string>
#endif
extern "C" {
#endif
......
src/mod/mod_exosip/mod_exosip.vcproj
浏览文件 @ d5945f81
......@@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
Optimization="0"
AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2"
AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2;..\..\..\libs\jrtplib\src;&quot;..\..\..\libs\jthread-1.1.2\src&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
......@@ -66,7 +66,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBCMT"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtp4c.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"
ShowProgress="0"
OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
LinkIncremental="2"
......@@ -130,7 +130,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2"
AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2;..\..\..\libs\jrtplib\src;&quot;..\..\..\libs\jthread-1.1.2\src&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
......@@ -149,7 +149,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtp4c.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"
OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\libs\jrtp4c\w32\Release&quot;;&quot;$(InputDir)..\..\..\libs\jrtplib\Release&quot;;&quot;$(InputDir)..\..\..\libs\jthread-1.1.2\Release&quot;;&quot;$(InputDir)..\..\..\libs\libeXosip2\platform\vsnet\Release&quot;;&quot;$(InputDir)..\..\..\libs\osip\platform\vsnet\Release&quot;"
......@@ -194,6 +194,10 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\..\libs\jrtp4c\src\jrtp4c.cpp"
>
</File>
<File
RelativePath=".\mod_exosip.c"
>
......
w32/vsnet/FreeSwitchCore.vcproj
浏览文件 @ d5945f81
......@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\src\include;..\..\libs\apr\include;&quot;..\..\libs\apr-util\include&quot;;..\..\libs\sqlite"
AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;APR_DECLARE_EXPORT;APU_DECLARE_EXPORT;API_DECLARE_EXPORT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -63,10 +63,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresampled.lib"
OutputFile="$(OutDir)/FreeSwitch.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\apr\LibD&quot;;&quot;$(InputDir)..\..\libs\sqlite\Debug&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibD&quot;"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\apr\LibD&quot;;&quot;$(InputDir)..\..\libs\sqlite\Debug&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibD&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
AddModuleNamesToAssembly=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb"
......@@ -128,7 +128,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\src\include;..\..\libs\apr\include;&quot;..\..\libs\apr-util\include&quot;;..\..\libs\sqlite"
AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;APR_DECLARE_EXPORT;APU_DECLARE_EXPORT;API_DECLARE_EXPORT"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -147,10 +147,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresample.lib"
OutputFile="$(OutDir)/FreeSwitch.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\sqlite\Release&quot;;&quot;$(InputDir)..\..\libs\apr\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR&quot;"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\sqlite\Release&quot;;&quot;$(InputDir)..\..\libs\apr\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
......
w32/vsnet/FreeswitchPlusLibs.sln deleted 100644 → 0
浏览文件 @ 3613ec26
差异被折叠。
w32/vsnet/GetLibs.vbs
浏览文件 @ d5945f81
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论