kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix flags

This commit is contained in:
Moises Silva 2010-04-21 14:25:11 -04:00 committed by Moises Silva
parent c165771474
commit d4f93843a1
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/freetdm/src/ftdm_io.c
View File

@ -458,7 +458,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_get_alarms(ftdm_channel_t *ftdmchan, ftdm
ftdm_assert_return(alarmbits != NULL, FTDM_FAIL, "null argument\n");
alarmbits = FTDM_ALARM_NONE;
*alarmbits = FTDM_ALARM_NONE;
ftdm_channel_lock(ftdmchan);
@ -1990,7 +1990,6 @@ FT_DECLARE(ftdm_status_t) ftdm_span_get_sig_status(ftdm_span_t *span, ftdm_signa
if (span->get_span_sig_status) {
return span->get_span_sig_status(span, sigstatus);
} else {
ftdm_log(FTDM_LOG_ERROR, "get_span_sig_status method not implemented!\n");
return FTDM_FAIL;
}
}

8
libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
View File

@ -31,7 +31,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "freetdm.h"
#include "private/ftdm_core.h"
#include "ftmod_libpri.h"
/**
@ -843,6 +843,7 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
*/
static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *event)
{
ftdm_alarm_flag_t alarmbits;
ftdm_log(FTDM_LOG_DEBUG, "EVENT [%s][%d][%d:%d] STATE [%s]\n",
ftdm_oob_event2str(event->enum_id), event->enum_id, event->channel->span_id, event->channel->chan_id, ftdm_channel_state2str(event->channel->state));
@ -859,7 +860,7 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
ftdm_set_flag(event->channel, FTDM_CHANNEL_SUSPENDED);
ftdm_channel_get_alarms(event->channel);
ftdm_channel_get_alarms(event->channel, &alarmbits);
ftdm_log(FTDM_LOG_WARNING, "channel %d:%d (%d:%d) has alarms! [%s]\n",
event->channel->span_id, event->channel->chan_id,
event->channel->physical_span_id, event->channel->physical_chan_id,
@ -873,7 +874,7 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
event->channel->physical_span_id, event->channel->physical_chan_id);
ftdm_clear_flag(event->channel, FTDM_CHANNEL_SUSPENDED);
ftdm_channel_get_alarms(event->channel);
ftdm_channel_get_alarms(event->channel, &alarmbits);
}
break;
}
@ -1082,7 +1083,6 @@ static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
if (span->channels[i]->type == FTDM_CHAN_TYPE_DQ921) {
if (ftdm_channel_open(span->span_id, i, &isdn_data->dchan) == FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_DEBUG, "opening d-channel #%d %d:%d\n", x, isdn_data->dchan->span_id, isdn_data->dchan->chan_id);
isdn_data->dchan->state = FTDM_CHANNEL_STATE_UP;
got_d = 1;
x++;
break;

2
libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c
View File

@ -33,7 +33,7 @@
//#define IODEBUG
#include "freetdm.h"
#include "private/ftdm_core.h"
#include "lpwrap_pri.h"
#ifndef HAVE_GETTIMEOFDAY