kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-26 12:37:26 +00:00
Code Issues Projects Releases Wiki Activity

FS-3766 --resolve

Browse Source
This commit is contained in:
Marc Olivier Chouinard 2011-12-16 07:35:05 -05:00
parent 4cd616cc1d
commit 442f4d2522
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/esl/src/esl.c
View File

@ -59,7 +59,12 @@
/* These warnings need to be ignored warning in sdk header */ /* These warnings need to be ignored warning in sdk header */
#include <Ws2tcpip.h> #include <Ws2tcpip.h>
#include <windows.h> #include <windows.h>
#ifndef errno
#define errno WSAGetLastError() #define errno WSAGetLastError()
#endif
#ifndef EINTR
#define EINTR WSAEINTR
#endif
#pragma warning (default:6386) #pragma warning (default:6386)
#endif #endif

6
libs/pcre/pcre_ucp_searchfuncs.c
View File

@ -155,12 +155,12 @@ for (;;)
if (top <= bot) return -1; if (top <= bot) return -1;
mid = (bot + top) >> 1; mid = (bot + top) >> 1;
if (c == (ucp_table[mid].f0 & f0_charmask)) break; if (c == (ucp_table[mid].f0 & f0_charmask)) break;
if (c < (ucp_table[mid].f0 & f0_charmask)) top = mid; if (c < (int)(ucp_table[mid].f0 & f0_charmask)) top = mid;
else else
{ {
if ((ucp_table[mid].f0 & f0_rangeflag) != 0 && if ((ucp_table[mid].f0 & f0_rangeflag) != 0 &&
c <= (ucp_table[mid].f0 & f0_charmask) + c <= (int)((ucp_table[mid].f0 & f0_charmask) +
(ucp_table[mid].f1 & f1_rangemask)) break; (ucp_table[mid].f1 & f1_rangemask))) break;
bot = mid + 1; bot = mid + 1;
} }
} }

4
src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj
View File

@ -321,10 +321,6 @@
RelativePath=".\sofia_reg.c" RelativePath=".\sofia_reg.c"
> >
</File> </File>
<File
RelativePath=".\sofia_sla.c"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

1
src/mod/endpoints/mod_sofia/mod_sofia.2010.vcxproj
View File

@ -143,7 +143,6 @@
<ClCompile Include="sofia_glue.c" /> <ClCompile Include="sofia_glue.c" />
<ClCompile Include="sofia_presence.c" /> <ClCompile Include="sofia_presence.c" />
<ClCompile Include="sofia_reg.c" /> <ClCompile Include="sofia_reg.c" />
<ClCompile Include="sofia_sla.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="mod_sofia.h" /> <ClInclude Include="mod_sofia.h" />

7
src/switch_rtp.c
View File

@ -3497,6 +3497,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
unsigned packet_length = (ntohs((uint16_t) rtp_session->rtcp_recv_msg.header.length) + 1) * 4 - sizeof(switch_rtcp_hdr_t); unsigned packet_length = (ntohs((uint16_t) rtp_session->rtcp_recv_msg.header.length) + 1) * 4 - sizeof(switch_rtcp_hdr_t);
unsigned int reportsOffset = sizeof(struct switch_rtcp_senderinfo); unsigned int reportsOffset = sizeof(struct switch_rtcp_senderinfo);
int i = 0; int i = 0;
unsigned int offset;
/* turn the flag off! */ /* turn the flag off! */
rtp_session->rtcp_fresh_frame = 0; rtp_session->rtcp_fresh_frame = 0;
@ -3509,10 +3510,10 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
frame->packet_count = ntohl(sr->pc); frame->packet_count = ntohl(sr->pc);
frame->octect_count = ntohl(sr->oc); frame->octect_count = ntohl(sr->oc);
for (int offset = reportsOffset; offset < packet_length; offset += sizeof(struct switch_rtcp_report_block)) { for (offset = reportsOffset; offset < packet_length; offset += sizeof(struct switch_rtcp_report_block)) {
struct switch_rtcp_report_block* report = (struct switch_rtcp_report_block*) (rtp_session->rtcp_recv_msg.body + offset); struct switch_rtcp_report_block* report = (struct switch_rtcp_report_block*) (rtp_session->rtcp_recv_msg.body + offset);
frame->reports[i].ssrc = ntohl(report->ssrc); frame->reports[i].ssrc = ntohl(report->ssrc);
frame->reports[i].fraction = ntohl(report->fraction); frame->reports[i].fraction = (uint8_t)ntohl(report->fraction);
frame->reports[i].lost = ntohl(report->lost); frame->reports[i].lost = ntohl(report->lost);
frame->reports[i].highest_sequence_number_received = ntohl(report->highest_sequence_number_received); frame->reports[i].highest_sequence_number_received = ntohl(report->highest_sequence_number_received);
frame->reports[i].jitter = ntohl(report->jitter); frame->reports[i].jitter = ntohl(report->jitter);
@ -3523,7 +3524,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
break; break;
} }
} }
frame->report_count = i; frame->report_count = (uint16_t)i;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }

2
src/switch_xml.c
View File

@ -102,7 +102,7 @@ void globfree(glob_t *);
#define SWITCH_XML_ERRL 128 /* maximum error string length */ #define SWITCH_XML_ERRL 128 /* maximum error string length */
/* Use UTF-8 as the general encoding */ /* Use UTF-8 as the general encoding */
#define USE_UTF_8_ENCODING SWITCH_TRUE static switch_bool_t USE_UTF_8_ENCODING = SWITCH_TRUE;
static int preprocess(const char *cwd, const char *file, int write_fd, int rlevel); static int preprocess(const char *cwd, const char *file, int write_fd, int rlevel);