mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 14:58:34 +00:00
conflict
This commit is contained in:
commit
7269d4618c
5 files changed
+1196
-32
No files matched your search
@@ -69,6 +69,9 @@ static ftdm_status_t ftdm_sangoma_boost_list_sigmods(ftdm_stream_handle_t *strea
|
||||
#define BOOST_SPAN(ftdmchan) ((ftdm_sangoma_boost_data_t*)(ftdmchan)->span->signal_data)->sigmod ? ftdmchan->physical_span_id : ftdmchan->physical_span_id-1
|
||||
#define BOOST_CHAN(ftdmchan) ((ftdm_sangoma_boost_data_t*)(ftdmchan)->span->signal_data)->sigmod ? ftdmchan->physical_chan_id : ftdmchan->physical_chan_id-1
|
||||
|
||||
#define BOOST_EVENT_SPAN(sigmod, event) ((sigmod)? event->span:event->span+1)
|
||||
#define BOOST_EVENT_CHAN(sigmod, event) ((sigmod)? event->chan:event->chan+1)
|
||||
|
||||
/**
|
||||
* \brief SANGOMA boost notification flag
|
||||
*/
|
||||
@@ -137,7 +140,7 @@ static void __release_request_id_span_chan(int span, int chan, const char *func,
|
||||
|
||||
ftdm_mutex_lock(request_mutex);
|
||||
if ((id = SETUP_GRID[span][chan])) {
|
||||
ftdm_assert(id <= MAX_REQ_ID, "Invalid id");
|
||||
ftdm_assert(id <= MAX_REQ_ID, "Invalid request id\n");
|
||||
req_map[id] = 0;
|
||||
SETUP_GRID[span][chan] = 0;
|
||||
}
|
||||
@@ -153,7 +156,7 @@ static void __release_request_id_span_chan(int span, int chan, const char *func,
|
||||
*/
|
||||
static void __release_request_id(sangoma_boost_request_id_t r, const char *func, int line)
|
||||
{
|
||||
ftdm_assert(r <= MAX_REQ_ID, "Invalid id");
|
||||
ftdm_assert(r <= MAX_REQ_ID, "Invalid request id\n");
|
||||
ftdm_mutex_lock(request_mutex);
|
||||
req_map[r] = 0;
|
||||
ftdm_mutex_unlock(request_mutex);
|
||||
@@ -239,9 +242,10 @@ static ftdm_channel_t *find_ftdmchan(ftdm_span_t *span, sangomabc_short_event_t
|
||||
{
|
||||
uint32_t i;
|
||||
ftdm_channel_t *ftdmchan = NULL;
|
||||
ftdm_sangoma_boost_data_t *sangoma_boost_data;
|
||||
uint32_t targetspan = event->span+1;
|
||||
uint32_t targetchan = event->chan+1;
|
||||
|
||||
ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
|
||||
uint32_t targetspan = BOOST_EVENT_SPAN(sangoma_boost_data->sigmod, event);
|
||||
uint32_t targetchan = BOOST_EVENT_CHAN(sangoma_boost_data->sigmod, event);
|
||||
|
||||
/* NC: Sanity check in case the call setup id does not relate
|
||||
to span. This can happen if RESTART is received on a
|
||||
@@ -257,13 +261,6 @@ static ftdm_channel_t *find_ftdmchan(ftdm_span_t *span, sangomabc_short_event_t
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sangoma_boost_data = span->signal_data;
|
||||
|
||||
if (sangoma_boost_data->sigmod) {
|
||||
/* span is not strictly needed here since we're supposed to get only events for our span */
|
||||
targetspan = event->span;
|
||||
targetchan = event->chan;
|
||||
}
|
||||
|
||||
for(i = 1; i <= span->chan_count; i++) {
|
||||
if (span->channels[i]->physical_span_id == targetspan && span->channels[i]->physical_chan_id == targetchan) {
|
||||
@@ -608,8 +605,8 @@ static void handle_call_start_ack(sangomabc_connection_t *mcon, sangomabc_short_
|
||||
{
|
||||
|
||||
ftdm_channel_t *ftdmchan = NULL;
|
||||
uint32_t event_span = event->span+1;
|
||||
uint32_t event_chan = event->chan+1;
|
||||
uint32_t event_span = BOOST_EVENT_SPAN(mcon->sigmod, event);
|
||||
uint32_t event_chan = BOOST_EVENT_CHAN(mcon->sigmod, event);
|
||||
|
||||
|
||||
if (nack_map[event->call_setup_id]) {
|
||||
@@ -620,11 +617,6 @@ static void handle_call_start_ack(sangomabc_connection_t *mcon, sangomabc_short_
|
||||
return;
|
||||
}
|
||||
|
||||
if (mcon->sigmod) {
|
||||
event_span = event->span;
|
||||
event_chan = event->chan;
|
||||
}
|
||||
|
||||
if (mcon->sigmod) {
|
||||
ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
|
||||
} else {
|
||||
@@ -712,7 +704,7 @@ static void handle_call_start_ack(sangomabc_connection_t *mcon, sangomabc_short_
|
||||
|
||||
|
||||
if (!ftdmchan) {
|
||||
ftdm_log(FTDM_LOG_CRIT, "START ACK CANT FIND A CHAN %d:%d\n", event->span+1,event->chan+1);
|
||||
ftdm_log(FTDM_LOG_CRIT, "START ACK CANT FIND A CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
|
||||
} else {
|
||||
/* only reason to be here is failed to open channel when we we're in sigmod */
|
||||
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
|
||||
@@ -974,7 +966,7 @@ static void handle_call_answer(ftdm_span_t *span, sangomabc_connection_t *mcon,
|
||||
}
|
||||
ftdm_mutex_unlock(ftdmchan->mutex);
|
||||
} else {
|
||||
ftdm_log(FTDM_LOG_CRIT, "ANSWER CANT FIND A CHAN %d:%d\n", event->span+1,event->chan+1);
|
||||
ftdm_log(FTDM_LOG_CRIT, "ANSWER CANT FIND A CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon, event), BOOST_EVENT_CHAN(mcon, event));
|
||||
sangomabc_exec_command(mcon,
|
||||
event->span,
|
||||
event->chan,
|
||||
@@ -1020,12 +1012,12 @@ static void handle_call_start(ftdm_span_t *span, sangomabc_connection_t *mcon, s
|
||||
ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
|
||||
ftdmchan = NULL;
|
||||
}
|
||||
ftdm_log(FTDM_LOG_CRIT, "START CANT FIND CHAN %d:%d\n", event->span+1,event->chan+1);
|
||||
ftdm_log(FTDM_LOG_CRIT, "START CANT FIND CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
|
||||
ftdm_log(FTDM_LOG_CRIT, "START CANT OPEN CHAN %d:%d\n", event->span+1,event->chan+1);
|
||||
ftdm_log(FTDM_LOG_CRIT, "START CANT OPEN CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -1091,12 +1083,12 @@ static void handle_call_loop_start(ftdm_span_t *span, sangomabc_connection_t *mc
|
||||
ftdm_channel_t *ftdmchan;
|
||||
|
||||
if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 0))) {
|
||||
ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CHAN NOT AVAILABLE %d:%d\n", event->span+1,event->chan+1);
|
||||
ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CHAN NOT AVAILABLE %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
|
||||
return;
|
||||
}
|
||||
|
||||
if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
|
||||
ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CANT OPEN CHAN %d:%d\n", event->span+1,event->chan+1);
|
||||
ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CANT OPEN CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1114,7 +1106,7 @@ static void handle_call_loop_stop(ftdm_span_t *span, sangomabc_connection_t *mco
|
||||
ftdm_channel_t *ftdmchan;
|
||||
ftdm_status_t res = FTDM_FAIL;
|
||||
if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
|
||||
ftdm_log(FTDM_LOG_CRIT, "CANNOT STOP LOOP, INVALID CHAN REQUESTED %d:%d\n", event->span+1,event->chan+1);
|
||||
ftdm_log(FTDM_LOG_CRIT, "CANNOT STOP LOOP, INVALID CHAN REQUESTED %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
|
||||
return;
|
||||
}
|
||||
if (ftdmchan->state != FTDM_CHANNEL_STATE_IN_LOOP) {
|
||||
@@ -1192,14 +1184,14 @@ static void handle_incoming_digit(sangomabc_connection_t *mcon, ftdm_span_t *spa
|
||||
ftdm_log(FTDM_LOG_WARNING, "Error Incoming digit with len %s %d [w%dg%d]\n",
|
||||
event->called_number_digits,
|
||||
event->called_number_digits_count,
|
||||
event->span+1, event->chan+1);
|
||||
BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
|
||||
return;
|
||||
}
|
||||
|
||||
ftdm_log(FTDM_LOG_WARNING, "Incoming digit with len %s %d [w%dg%d]\n",
|
||||
event->called_number_digits,
|
||||
event->called_number_digits_count,
|
||||
event->span+1, event->chan+1);
|
||||
event->called_number_digits,
|
||||
event->called_number_digits_count,
|
||||
BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
|
||||
|
||||
memcpy(digits, event->called_number_digits, event->called_number_digits_count);
|
||||
ftdm_channel_queue_dtmf(ftdmchan, digits);
|
||||
@@ -1236,7 +1228,9 @@ static ftdm_channel_t* event_process_states(ftdm_span_t *span, sangomabc_short_e
|
||||
case SIGBOOST_EVENT_REMOVE_CHECK_LOOP:
|
||||
case SIGBOOST_EVENT_CALL_RELEASED:
|
||||
if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
|
||||
ftdm_log(FTDM_LOG_DEBUG, "PROCESS STATES CANT FIND CHAN %d:%d\n", event->span+1,event->chan+1);
|
||||
ftdm_log(FTDM_LOG_DEBUG, "PROCESS STATES CANT FIND CHAN %d:%d\n",
|
||||
BOOST_EVENT_SPAN(((ftdm_sangoma_boost_data_t*)(span->signal_data))->sigmod, event),
|
||||
BOOST_EVENT_CHAN(((ftdm_sangoma_boost_data_t*)(span->signal_data))->sigmod, event));
|
||||
return NULL;
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user