Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17307 => 17308)
--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-15 23:50:24 UTC (rev 17307)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-15 15:48:09 UTC (rev 17308)
@@ -69,15 +69,19 @@
#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
+ * \brief Strange flag
*/
typedef enum {
- SFLAG_SENT_FINAL_MSG = (1 << 0),
- SFLAG_SENT_ACK = (1 << 1),
- SFLAG_RECVD_ACK = (1 << 2),
- SFLAG_HANGUP = (1 << 3),
- SFLAG_TERMINATING = (1 << 4)
+ SFLAG_FREE_REQ_ID = (1 << 0),
+ SFLAG_SENT_FINAL_MSG = (1 << 1),
+ SFLAG_SENT_ACK = (1 << 2),
+ SFLAG_RECVD_ACK = (1 << 3),
+ SFLAG_HANGUP = (1 << 4),
+ SFLAG_TERMINATING = (1 << 5)
} sflag_t;
typedef uint16_t sangoma_boost_request_id_t;
@@ -88,6 +92,7 @@
typedef enum {
BST_FREE,
BST_WAITING,
+ BST_ACK,
BST_READY,
BST_FAIL
} sangoma_boost_request_status_t;
@@ -104,13 +109,6 @@
int flags;
} sangoma_boost_request_t;
-typedef struct {
- int call_setup_id;
- int last_event_id;
-} sangoma_boost_call_t;
-
-#define CALL_DATA(ftdmchan) ((sangoma_boost_call_t*)((ftdmchan)->call_data))
-
//#define MAX_REQ_ID FTDM_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN * FTDM_MAX_CHANNELS_PHYSICAL_SPAN
#define MAX_REQ_ID 6000
@@ -137,7 +135,7 @@
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 +151,7 @@
*/
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);
@@ -181,7 +179,7 @@
r = ++last_req;
if (r >= MAX_REQ_ID) {
- r = last_req = 1;
+ r = i = last_req = 1;
}
if (req_map[r]) {
@@ -206,28 +204,6 @@
}
#define next_request_id() __next_request_id(__FUNCTION__, __LINE__)
-
-static void print_request_ids(void)
-{
- sangoma_boost_request_id_t i = 0;
- int cnt=0;
-
- ftdm_mutex_lock(request_mutex);
-
- for (i=1; i<= MAX_REQ_ID; i++){
- if (req_map[i]) {
- ftdm_log(FTDM_LOG_CRIT, "Used Request ID=%i\n",i);
- cnt++;
- }
- }
-
- ftdm_mutex_unlock(request_mutex);
- ftdm_log(FTDM_LOG_CRIT, "Total Request IDs=%i\n",cnt);
-
- return;
-}
-
-
/**
* \brief Finds the channel that triggered an event
* \param span Span where to search the channel
@@ -239,32 +215,10 @@
{
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
- full load. Where stray ACK messages can arrive after
- a RESTART has taken place.
- */
- if (!span) {
- ftdm_log(FTDM_LOG_CRIT, "No Span for Event=%s s%dc%d cid=%d\n",
- BOOST_DECODE_EVENT_ID(event->event_id),
- event->span,
- event->chan,
- event->call_setup_id);
- 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) {
ftdmchan = span->channels[i];
@@ -322,20 +276,12 @@
* and PRI stack will retransmit a second SETUP after the first timeout, so
* we should allow for at least 8 seconds.
*/
-
int boost_request_timeout = 10000;
sangoma_boost_request_status_t st;
char dnis[128] = "";
char *gr = NULL;
uint32_t count = 0;
int tg=0;
-
- /* NC: On large number of calls 10 seconds is not enough.
- Resetting to 30 seconds. Especially on ss7 when
- links are reset during large call volume */
- if (!sangoma_boost_data->sigmod) {
- boost_request_timeout = 30000;
- }
if (sangoma_boost_data->sigmod) {
ftdm_log(FTDM_LOG_CRIT, "This function should not be called when sigmod was configured in boost\n");
@@ -344,35 +290,21 @@
}
if (ftdm_test_flag(span, FTDM_SPAN_SUSPENDED)) {
- ftdm_log(FTDM_LOG_CRIT, "SPAN is Suspended.\n");
+ ftdm_log(FTDM_LOG_CRIT, "SPAN is not online.\n");
*ftdmchan = NULL;
return FTDM_FAIL;
}
+
+ ftdm_set_string(dnis, caller_data->dnis.digits);
- if (check_congestion(tg)) {
- ftdm_log(FTDM_LOG_CRIT, "All circuits are busy. Trunk Group=%i (CONGESTION)\n",tg+1);
- *ftdmchan = NULL;
- return FTDM_FAIL;
- }
-
- if (count >= span->chan_count) {
- ftdm_log(FTDM_LOG_CRIT, "All circuits are busy.\n");
- *ftdmchan = NULL;
- return FTDM_FAIL;
- }
-
r = next_request_id();
if (r == 0) {
ftdm_log(FTDM_LOG_CRIT, "All tanks ids are busy.\n");
*ftdmchan = NULL;
return FTDM_FAIL;
}
+ sangomabc_call_init(&event, caller_data->cid_num.digits, dnis, r);
- /* After this point we must release request id before we leave the function
- in case of an error. */
-
- ftdm_set_string(dnis, caller_data->dnis.digits);
-
if ((gr = strchr(dnis, '@'))) {
*gr++ = '\0';
}
@@ -383,14 +315,22 @@
tg--;
}
}
-
- sangomabc_call_init(&event, caller_data->cid_num.digits, dnis, r);
-
event.trunk_group = tg;
+ if (check_congestion(tg)) {
+ ftdm_log(FTDM_LOG_CRIT, "All circuits are busy. Trunk Group=%i (BOOST REQUESTED BACK OFF)\n",tg+1);
+ *ftdmchan = NULL;
+ return FTDM_FAIL;
+ }
ftdm_span_channel_use_count(span, &count);
+ if (count >= span->chan_count) {
+ ftdm_log(FTDM_LOG_CRIT, "All circuits are busy.\n");
+ *ftdmchan = NULL;
+ return FTDM_FAIL;
+ }
+
if (gr && *(gr+1)) {
switch(*gr) {
case 'g':
@@ -433,7 +373,7 @@
if (sangomabc_connection_write(&sangoma_boost_data->mcon, &event) <= 0) {
ftdm_log(FTDM_LOG_CRIT, "Failed to tx boost event [%s]\n", strerror(errno));
- status = OUTBOUND_REQUESTS[r].status = FTDM_FAIL;
+ status = FTDM_FAIL;
if (!sangoma_boost_data->sigmod) {
*ftdmchan = NULL;
}
@@ -447,7 +387,7 @@
if (!sangoma_boost_data->sigmod) {
*ftdmchan = NULL;
}
- ftdm_log(FTDM_LOG_CRIT, "Csid:%d Timed out waiting for boost channel request response, current status: BST_WAITING\n", r);
+ ftdm_log(FTDM_LOG_CRIT, "s%dc%d: Csid:%d Timed out waiting for boost channel request response, current status: BST_WAITING\n", (*ftdmchan)->physical_span_id, (*ftdmchan)->physical_chan_id, r);
goto done;
}
}
@@ -554,7 +494,6 @@
ftdm_log(FTDM_LOG_DEBUG, "Dialing number %s over boost channel with request id %d\n", event.called_number_digits, r);
if (sangomabc_connection_write(&sangoma_boost_data->mcon, &event) <= 0) {
- release_request_id(r);
ftdm_log(FTDM_LOG_CRIT, "Failed to tx boost event [%s]\n", strerror(errno));
return FTDM_FAIL;
}
@@ -608,22 +547,15 @@
{
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]) {
- /* In this scenario outgoing call was alrady stopped
- via NACK and now we are expecting an NACK_ACK.
- If we receive an ACK its a race condition thus
- ignor it */
return;
}
- if (mcon->sigmod) {
- event_span = event->span;
- event_chan = event->chan;
- }
+ OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
+ SETUP_GRID[event->span][event->chan] = event->call_setup_id;
if (mcon->sigmod) {
ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
@@ -637,12 +569,6 @@
if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_ERROR, "Failed to open FTDM channel [%s]\n", ftdmchan->last_error);
} else {
-
- /* Only bind the setup id to GRID when we are sure that channel is ready
- otherwise we could overwite the original call */
- OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
- SETUP_GRID[event->span][event->chan] = event->call_setup_id;
-
ftdm_set_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND);
ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_INUSE);
ftdmchan->sflags = SFLAG_RECVD_ACK;
@@ -681,44 +607,15 @@
OUTBOUND_REQUESTS[event->call_setup_id].status = BST_READY;
return;
}
+ }
- } else {
-
- ftdm_assert(!mcon->sigmod, "CALL STOP ACK: Invalid Sigmod Path");
-
- if ((ftdmchan = find_ftdmchan(OUTBOUND_REQUESTS[event->call_setup_id].span, (sangomabc_short_event_t*)event, 1))) {
- int r;
- /* NC: If we get CALL START ACK and channel is in active state
- then we are completely out of sync with the other end.
- Treat CALL START ACK as CALL STOP and hangup the current call.
- */
-
- if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
- ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
- ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
- ftdm_log(FTDM_LOG_CRIT, "ZCHAN CALL ACK STATE UP -> Changed to TERMINATING %d:%d\n", event->span+1,event->chan+1);
- ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
- } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP || ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
- ftdm_log(FTDM_LOG_CRIT, "ZCHAN CALL ACK STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", event->span+1,event->chan+1);
- ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
- } else {
- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID State %s on IN CALL ACK %d:%d\n",
- ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
- }
- ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
- ftdmchan=NULL;
- }
- }
-
-
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);
- ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
}
-
+ ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
sangomabc_exec_command(mcon,
event->span,
event->chan,
@@ -739,7 +636,7 @@
{
ftdm_channel_t *ftdmchan;
int r = 0;
-
+
if ((ftdmchan = find_ftdmchan(span, event, 1))) {
ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
ftdm_mutex_lock(ftdmchan->mutex);
@@ -761,6 +658,7 @@
ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
if (r) {
+ ftdm_set_sflag(ftdmchan, SFLAG_FREE_REQ_ID);
ftdm_mutex_unlock(ftdmchan->mutex);
return;
}
@@ -779,7 +677,6 @@
}
}
-
/**
* \brief Handler for call start nack event
* \param span Span where event was fired
@@ -821,7 +718,7 @@
if (event->call_setup_id) {
if (sangoma_boost_data->sigmod) {
ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
- CALL_DATA(ftdmchan)->last_event_id = event->event_id;
+ ftdmchan->call_data = (void*)(intptr_t)event->event_id;
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
} else {
sangomabc_exec_command(mcon,
@@ -843,7 +740,7 @@
/* if there is no call setup id this should not be an outbound channel for sure */
ftdm_assert(!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND), "Yay, outbound flag should not be set here!\n");
- CALL_DATA(ftdmchan)->last_event_id = event->event_id;
+ ftdmchan->call_data = (void*)(intptr_t)event->event_id;
ftdm_mutex_lock(ftdmchan->mutex);
ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
if (r == FTDM_STATE_CHANGE_SUCCESS) {
@@ -896,16 +793,7 @@
ftdm_mutex_lock(ftdmchan->mutex);
- if (ftdm_test_sflag(ftdmchan, SFLAG_HANGUP) ||
- ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ||
- ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
-
- /* NC: Checking for state DOWN because ss7box can
- send CALL_STOP twice in a row. If we do not check for
- STATE_DOWN we will set the state back to termnating
- and block the channel forever
- */
-
+ if (ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
/* racing condition where both sides initiated a hangup
* Do not change current state as channel is already clearing
* itself through local initiated hangup */
@@ -933,6 +821,10 @@
ftdmchan->caller_data.hangup_cause = event->release_cause;
}
+ if (r) {
+ ftdm_set_sflag(ftdmchan, SFLAG_FREE_REQ_ID);
+ }
+
ftdm_mutex_unlock(ftdmchan->mutex);
if (r) {
@@ -956,25 +848,15 @@
if ((ftdmchan = find_ftdmchan(span, event, 1))) {
ftdm_mutex_lock(ftdmchan->mutex);
-
- if (ftdm_test_sflag(ftdmchan, SFLAG_HANGUP) ||
- ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ||
- ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
-
- /* NC: Do nothing here because we are in process
- of stopping the call. So ignore the ANSWER. */
- ftdm_log(FTDM_LOG_CRIT, "ANSWER BUT CALL IS HANGUP %d:%d\n", event->span+1,event->chan+1);
-
- } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HOLD) {
+ if (ftdmchan->state == FTDM_CHANNEL_STATE_HOLD) {
ftdmchan->init_state = FTDM_CHANNEL_STATE_UP;
-
} else {
int r = 0;
ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_UP, 0, r);
}
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,
@@ -999,33 +881,23 @@
if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 0))) {
if ((ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
int r;
-
- /* NC: If we get CALL START and channel is in active state
- then we are completely out of sync with the other end.
- Treat CALL START as CALL STOP and hangup the current call.
- The incoming call will also be NACKed.
- */
-
- if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
- ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
- ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE UP -> Changed to TERMINATING %d:%d\n", event->span+1,event->chan+1);
+ if (ftdmchan->state == FTDM_CHANNEL_STATE_UP) {
+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE UP -> Changed to TERMINATING %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
- } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP || ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", event->span+1,event->chan+1);
- ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
+ } else if (ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event)); ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
} else {
- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID %s on IN CALL %d:%d\n", ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
+ ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID %s on IN CALL %d:%d\n", ftdm_channel_state2str(ftdmchan->state),BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
}
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 +963,12 @@
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 +986,7 @@
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 +1064,14 @@
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 +1108,9 @@
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;
@@ -1305,12 +1179,8 @@
handle_call_done(span, mcon, event);
break;
case SIGBOOST_EVENT_CALL_START_NACK_ACK:
- /* On NACK ack span chan are always invalid
- All there is to do is to clear the id */
- if (event->call_setup_id) {
- nack_map[event->call_setup_id] = 0;
- release_request_id(event->call_setup_id);
- }
+ handle_call_done(span, mcon, event);
+ nack_map[event->call_setup_id] = 0;
break;
case SIGBOOST_EVENT_INSERT_CHECK_LOOP:
handle_call_loop_start(span, mcon, event);
@@ -1369,12 +1239,14 @@
int call_stopped_ack_sent = 0;
ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
- release_request_id_span_chan(ftdmchan->physical_span_id-1, ftdmchan->physical_chan_id-1);
+ if (ftdm_test_sflag(ftdmchan, SFLAG_FREE_REQ_ID)) {
+ release_request_id_span_chan(ftdmchan->physical_span_id-1, ftdmchan->physical_chan_id-1);
+ }
if (!ftdm_test_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG)) {
ftdm_set_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
- if (ftdmchan->call_data && CALL_DATA(ftdmchan)->last_event_id == SIGBOOST_EVENT_CALL_START_NACK) {
+ if (ftdmchan->call_data && ((uint32_t)(intptr_t)ftdmchan->call_data == SIGBOOST_EVENT_CALL_START_NACK)) {
sangomabc_exec_command(mcon,
BOOST_SPAN(ftdmchan),
BOOST_CHAN(ftdmchan),
@@ -1394,8 +1266,7 @@
}
}
ftdmchan->sflags = 0;
- memset(ftdmchan->call_data,0,sizeof(sangoma_boost_call_t));
-
+ ftdmchan->call_data = NULL;
if (sangoma_boost_data->sigmod && call_stopped_ack_sent) {
/* we dont want to call ftdm_channel_done just yet until call released is received */
ftdm_log(FTDM_LOG_DEBUG, "Waiting for call release confirmation before declaring chan %d:%d as available \n",
@@ -1586,17 +1457,13 @@
uint32_t j;
ftdm_clear_flag_locked(span, FTDM_SPAN_STATE_CHANGE);
if (susp) {
- for(j = 1; j <= span->chan_count; j++) {
- if (ftdm_test_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE) || susp) {
- ftdm_mutex_lock(span->channels[j]->mutex);
- ftdm_clear_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE);
- if (susp && span->channels[j]->state != FTDM_CHANNEL_STATE_DOWN) {
- ftdm_channel_set_state(span->channels[j], FTDM_CHANNEL_STATE_RESTART, 0);
- }
- state_advance(span->channels[j]);
- ftdm_channel_complete_state(span->channels[j]);
- ftdm_mutex_unlock(span->channels[j]->mutex);
- }
+ for (j = 0; j <= span->chan_count; j++) {
+ ftdm_mutex_lock(span->channels[j]->mutex);
+ ftdm_clear_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE);
+ ftdm_channel_set_state(span->channels[j], FTDM_CHANNEL_STATE_RESTART, 0);
+ state_advance(span->channels[j]);
+ ftdm_channel_complete_state(span->channels[j]);
+ ftdm_mutex_unlock(span->channels[j]->mutex);
}
} else {
while ((ftdmchan = ftdm_queue_dequeue(span->pendingchans))) {
@@ -1775,8 +1642,8 @@
sangoma_boost_data->iteration = 0;
}
#endif
- res = ftdm_interrupt_multiple_wait(ints, numints, 100);
- if (FTDM_SUCCESS != res && FTDM_TIMEOUT != res) {
+ res = ftdm_interrupt_multiple_wait(ints, numints, -1);
+ if (FTDM_SUCCESS != res) {
ftdm_log(FTDM_LOG_CRIT, "Unexpected return value from interrupt waiting: %d\n", res);
return -1;
}
@@ -1863,6 +1730,7 @@
if (ftdm_boost_wait_event(span) < 0) {
ftdm_log(FTDM_LOG_ERROR, "ftdm_boost_wait_event failed\n");
+ goto error;
}
while ((event = ftdm_boost_read_event(span))) {
@@ -1875,6 +1743,7 @@
goto end;
+error:
ftdm_log(FTDM_LOG_CRIT, "Boost event processing Error!\n");
end:
@@ -1889,53 +1758,7 @@
return NULL;
}
-#if 0
-static int sigmod_ss7box_isup_exec_cmd(ftdm_stream_handle_t *stream, char *cmd)
-{
- FILE *fp;
- int status=0;
- char path[1024];
-
- fp = popen(cmd, "r");
- if (fp == NULL) {
- stream->write_function(stream, "%s: -ERR failed to execute cmd: %s\n",
- __FILE__,cmd);
- return -1;
- }
-
- while (fgets(path, sizeof(path)-1, fp) != NULL) {
- path[sizeof(path)-1]='\0';
- stream->write_function(stream,"%s", path);
- }
-
-
- status = pclose(fp);
- if (status == -1) {
- /* Error reported by pclose() */
- } else {
- /* Use macros described under wait() to inspect `status' in order
- to determine success/failure of command executed by popen() */
- }
- return status;
-}
-#endif
-
-static void ftdm_cli_span_state_cmd(ftdm_span_t *span, char *state)
-{
- int j;
- int cnt=0;
- for(j = 1; j <= span->chan_count; j++) {
- if (span->channels[j]->state != FTDM_CHANNEL_STATE_DOWN) {
- ftdm_channel_t *ftdmchan = span->channels[j];
- ftdm_log(FTDM_LOG_CRIT, "Channel %i s%dc%d State=%s\n",
- j,ftdmchan->physical_span_id-1,ftdmchan->physical_chan_id-1,ftdm_channel_state2str(ftdmchan->state));
- cnt++;
- }
- }
- ftdm_log(FTDM_LOG_CRIT, "Total Channel Cnt %i\n",cnt);
-}
-
#define FTDM_BOOST_SYNTAX "list sigmods | <sigmod_name> <command>"
/**
* \brief API function to kill or debug a sangoma_boost span
@@ -1957,85 +1780,18 @@
if (!strcasecmp(argv[0], "list")) {
if (!strcasecmp(argv[1], "sigmods")) {
if (ftdm_sangoma_boost_list_sigmods(stream) != FTDM_SUCCESS) {
- stream->write_function(stream, "-ERR failed to list sigmods\n");
+ stream->write_function(stream, "%s: -ERR failed to execute cmd\n", __FILE__);
goto done;
}
goto done;
}
-
- if (!strcasecmp(argv[1], "ids")) {
- print_request_ids();
- goto done;
- }
-
-#ifndef __WINDOWS__
-#if 0
-/* NC: This code crashes the kernel due to fork on heavy fs load */
- } else if (!strcasecmp(argv[0], "ss7box_isupd_ckt")) {
-
- if (!strcasecmp(argv[1], "used")) {
- stream->write_function(stream, "ss7box_isupd: in use\n", FTDM_BOOST_SYNTAX);
- sigmod_ss7box_isup_exec_cmd(stream, (char*) "ckt_report.sh inuse");
- } else if (!strcasecmp(argv[1], "reset")) {
- stream->write_function(stream, "ss7box_isupd: in reset\n", FTDM_BOOST_SYNTAX);
- sigmod_ss7box_isup_exec_cmd(stream, (char*) "ckt_report.sh reset");
- } else if (!strcasecmp(argv[1], "ready")) {
- stream->write_function(stream, "ss7box_isupd: ready \n", FTDM_BOOST_SYNTAX);
- sigmod_ss7box_isup_exec_cmd(stream, (char*) "ckt_report.sh free");
- } else {
- stream->write_function(stream, "ss7box_isupd: list\n", FTDM_BOOST_SYNTAX);
- sigmod_ss7box_isup_exec_cmd(stream, (char*) "ckt_report.sh");
- }
-
- goto done;
-#endif
-#endif
-
- } else if (!strcasecmp(argv[0], "span")) {
- sangomabc_connection_t *pcon;
- ftdm_sangoma_boost_data_t *sangoma_boost_data;
- ftdm_span_t *span;
-
- if (argc <= 2) {
- stream->write_function(stream, "-ERR invalid span usage: span <name> <cmd>\n");
- goto done;
- }
-
- int err = ftdm_span_find_by_name(argv[1], &span);
- if (FTDM_SUCCESS != err) {
- stream->write_function(stream, "-ERR failed to find span by name %s\n",argv[1]);
- goto done;
- }
-
- if (!strcasecmp(argv[2], "restart")) {
- sangoma_boost_data = span->signal_data;
- pcon = &sangoma_boost_data->pcon;
-
- /* No need to set any span flags because
- our RESTART will generate a RESTART from the sig daemon */
- sangomabc_exec_commandp(pcon,
- 0,
- 0,
- -1,
- SIGBOOST_EVENT_SYSTEM_RESTART,
- 0);
- } else if (!strcasecmp(argv[2], "state")) {
- if (argc <= 3) {
- stream->write_function(stream, "-ERR invalid span state: span <name> state <state name>\n");
- goto done;
- }
- ftdm_cli_span_state_cmd(span,argv[3]);
- }
-
- goto done;
-
} else {
boost_sigmod_interface_t *sigmod_iface = NULL;
sigmod_iface = hashtable_search(g_boost_modules_hash, argv[0]);
if (sigmod_iface) {
char *p = strchr(data, ' ');
if (++p) {
- char* mydup = strdup(p);
+ char* mydup = ftdm_strdup(p);
if(sigmod_iface->exec_api == NULL) {
stream->write_function(stream, "%s does not support api functions\n", sigmod_iface->name);
goto done;
@@ -2044,7 +1800,7 @@
if (sigmod_iface->exec_api(stream, mydup) != FTDM_SUCCESS) {
stream->write_function(stream, "-ERR:failed to execute command:%s\n", mydup);
}
- free(mydup);
+ ftdm_safe_free(mydup);
}
goto done;
@@ -2066,7 +1822,7 @@
*/
static FIO_IO_LOAD_FUNCTION(ftdm_sangoma_boost_io_init)
{
- ftdm_assert(fio != NULL, "fio is NULL");
+ assert(fio != NULL);
memset(&ftdm_sangoma_boost_interface, 0, sizeof(ftdm_sangoma_boost_interface));
ftdm_sangoma_boost_interface.name = "boost";
@@ -2449,7 +2205,6 @@
ftdm_dso_lib_t lib = NULL;
char path[255] = "";
char *err = NULL;
- int j = 0;
unsigned paramindex = 0;
ftdm_status_t rc = FTDM_SUCCESS;
@@ -2544,14 +2299,6 @@
ftdm_set_string(sangoma_boost_data->mcon.cfg.remote_ip, remote_ip);
sangoma_boost_data->mcon.cfg.remote_port = remote_port;
}
-
- for (j = 1; j <= span->chan_count; j++) {
- span->channels[j]->call_data = ftdm_calloc(1,sizeof(sangoma_boost_call_t));
- if (!span->channels[j]->call_data) {
- FAIL_CONFIG_RETURN(FTDM_FAIL);
- }
- }
-
span->signal_cb = sig_cb;
span->start = ftdm_sangoma_boost_start;
span->stop = ftdm_sangoma_boost_stop;