mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-14 05:18:31 +00:00
Merge remote branch 'fsorig/master'
This commit is contained in:
commit
19c0026581
41 files changed
+1282
-173
No files matched your search
@@ -3455,7 +3455,7 @@ static FIO_READ_FUNCTION(ftdm_raw_read)
|
||||
ftdm_status_t status = ftdmchan->fio->read(ftdmchan, data, datalen);
|
||||
if (status == FTDM_SUCCESS && ftdmchan->fds[FTDM_READ_TRACE_INDEX] > -1) {
|
||||
ftdm_size_t dlen = *datalen;
|
||||
if ((ftdm_size_t)write(ftdmchan->fds[FTDM_READ_TRACE_INDEX], data, dlen) != dlen) {
|
||||
if ((ftdm_size_t)write(ftdmchan->fds[FTDM_READ_TRACE_INDEX], data, (int)dlen) != dlen) {
|
||||
ftdm_log(FTDM_LOG_WARNING, "Raw input trace failed to write all of the %zd bytes\n", dlen);
|
||||
}
|
||||
}
|
||||
@@ -3468,7 +3468,7 @@ static FIO_READ_FUNCTION(ftdm_raw_read)
|
||||
ftdm_size_t dlen = *datalen;
|
||||
ftdm_size_t rc = 0;
|
||||
|
||||
write_chan_io_dump(&ftdmchan->rxdump, data, dlen);
|
||||
write_chan_io_dump(&ftdmchan->rxdump, data, (int)dlen);
|
||||
|
||||
/* if dtmf debug is enabled and initialized, write there too */
|
||||
if (ftdmchan->dtmfdbg.file) {
|
||||
|
||||
@@ -1000,6 +1000,10 @@ static int ftdm_r2_io_get_oob_event(openr2_chan_t *r2chan, openr2_oob_event_t *e
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (fevent->e_type != FTDM_EVENT_OOB) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch (fevent->enum_id) {
|
||||
case FTDM_OOB_CAS_BITS_CHANGE:
|
||||
{
|
||||
|
||||
@@ -51,7 +51,9 @@
|
||||
#if defined(__linux__) && !defined(__USE_BSD)
|
||||
#define __USE_BSD
|
||||
#endif
|
||||
#ifndef WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include "freetdm.h"
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user