kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-13 18:47:44 +00:00
Code Issues Projects Releases Wiki Activity

freetdm: minor changes to ftmod_r2

Browse Source
This commit is contained in:
Moises Silva 2010-11-09 12:22:53 -05:00
parent adc26e6316
commit 633599021a
1 changed files with 47 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
View File

@ -403,6 +403,7 @@ static void ftdm_r2_on_call_init(openr2_chan_t *r2chan)
if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) { if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Cannot start call when channel is in use (state = %s)\n", ftdm_channel_state2str(ftdmchan->state)); ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Cannot start call when channel is in use (state = %s)\n", ftdm_channel_state2str(ftdmchan->state));
ftdm_mutex_unlock(ftdmchan->mutex); ftdm_mutex_unlock(ftdmchan->mutex);
return;
} }
if (ftdmchan->state != FTDM_CHANNEL_STATE_DOWN) { if (ftdmchan->state != FTDM_CHANNEL_STATE_DOWN) {
@ -436,9 +437,6 @@ static void ftdm_r2_on_call_init(openr2_chan_t *r2chan)
ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_COLLECT); ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_COLLECT);
ftdm_mutex_unlock(ftdmchan->mutex); ftdm_mutex_unlock(ftdmchan->mutex);
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Span is not threaded, not launching thread for this call\n");
return;
} }
/* only called for incoming calls when the ANI, DNIS etc is complete and the user has to decide either to accept or reject the call */ /* only called for incoming calls when the ANI, DNIS etc is complete and the user has to decide either to accept or reject the call */
@ -447,9 +445,7 @@ static void ftdm_r2_on_call_offered(openr2_chan_t *r2chan, const char *ani, cons
ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan); ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Call offered with ANI = %s, DNIS = %s, Priority = (%d)\n", ani, dnis, category); ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Call offered with ANI = %s, DNIS = %s, Priority = (%d)\n", ani, dnis, category);
//ftdmchan->caller_data.priority = category;
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING); ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
} }
static void ftdm_r2_on_call_accepted(openr2_chan_t *r2chan, openr2_call_mode_t mode) static void ftdm_r2_on_call_accepted(openr2_chan_t *r2chan, openr2_call_mode_t mode)
@ -1369,13 +1365,11 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
#ifndef WIN32 #ifndef WIN32
/* figure out what event to poll each channel for. POLLPRI when the channel is down, /* figure out what event to poll each channel for. POLLPRI when the channel is down,
* POLLPRI|POLLIN|POLLOUT otherwise. * POLLPRI|POLLIN|POLLOUT otherwise */
*/
memset(poll_events, 0, sizeof(short)*span->chan_count); memset(poll_events, 0, sizeof(short)*span->chan_count);
for (i = 0; i < span->chan_count; i++) { for (i = 0; i < span->chan_count; i++) {
r2chan = R2CALL(span->channels[(i+1)])->r2chan; r2chan = R2CALL(span->channels[(i+1)])->r2chan;
ftdmchan = openr2_chan_get_client_data(r2chan); ftdmchan = openr2_chan_get_client_data(r2chan);
poll_events[i] = ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ? POLLPRI : (POLLPRI | POLLIN | POLLOUT); poll_events[i] = ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ? POLLPRI : (POLLPRI | POLLIN | POLLOUT);
} }
@ -1405,7 +1399,6 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
// we only expect CAS and other OOB events on this thread/loop, once a call is started // we only expect CAS and other OOB events on this thread/loop, once a call is started
// the MF events (in-band signaling) are handled in the call thread // the MF events (in-band signaling) are handled in the call thread
openr2_chan_process_cas_signaling(r2chan); openr2_chan_process_cas_signaling(r2chan);
} else { } else {
ftdm_log(FTDM_LOG_DEBUG, "Ignoring event %d on channel %d.\n", event->enum_id, openr2_chan_get_number(r2chan)); ftdm_log(FTDM_LOG_DEBUG, "Ignoring event %d on channel %d.\n", event->enum_id, openr2_chan_get_number(r2chan));
// XXX TODO: handle alarms here XXX // XXX TODO: handle alarms here XXX
@ -1414,9 +1407,8 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
/* XXX /* XXX
* when ftdm_span_poll_event() returns FTDM_SUCCESS, means there are events pending on the span. * when ftdm_span_poll_event() returns FTDM_SUCCESS, means there are events pending on the span.
* is it possible to know on which channels those events are pending, without trasvering the span? * is it possible to know on which channels those events are pending, without traversing the span?
* XXX * XXX */
*/
for (i = 1; i <= span->chan_count; i++) { for (i = 1; i <= span->chan_count; i++) {
r2chan = R2CALL(span->channels[i])->r2chan; r2chan = R2CALL(span->channels[i])->r2chan;
ftdmchan = openr2_chan_get_client_data(r2chan); ftdmchan = openr2_chan_get_client_data(r2chan);
@ -1435,8 +1427,9 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
openr2_chan_run_schedule(r2chan); openr2_chan_run_schedule(r2chan);
/* process mf tones, if any */ /* process mf tones, if any */
if (openr2_chan_get_read_enabled(r2chan)) if (openr2_chan_get_read_enabled(r2chan)) {
openr2_chan_process_mf_signaling(r2chan); openr2_chan_process_mf_signaling(r2chan);
}
if (ftdm_r2_state_advance(ftdmchan)) { if (ftdm_r2_state_advance(ftdmchan)) {
ftdm_clear_flag(r2call, FTDM_R2_PROCESSING); ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);