-> working...

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c
index f0c1572e6ca26ad6f99d55864a595ae48969701d..a83a6b9881d614bd84948907524c6a7b394b9b02 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c
@@ -175,7 +175,7 @@ static void handle_entsi_alarm(sng_alrm_t alarm)
     case (LCM_EVENT_TIMEOUT):
         /* this event always has the circuit value embedded */
         SS7_WARN("[ISUP] Timer %d expired on CIC %d\n",
-                    (alarm.eventParm[1] > 0 ) ? alarm.eventParm[1] : alarm.eventParm[8],
+                    alarm.eventParm[8],
                     g_ftdm_sngss7_data.cfg.isupCircuit[alarm.eventParm[0]].cic);
         break;
     /**************************************************************************/

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c
index d720e70bc2e31414856d2e57ecc67d55ddfd7ecf..2ca7fff739cf3444ab7820cfdfa0a2902b586313 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c
@@ -172,7 +172,7 @@ void sngss7_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
         break;
     /**************************************************************************/
     case (FTDM_CHANNEL_STATE_DIALING):             /* glare */
-        SS7_ERROR("Got IAM in DIALING state...glare... queueing incoming call\n");
+        SS7_ERROR("Got IAM in DIALING state...glare...queueing incoming call\n");
         
         /* the flag the channel as having a collision */
         sngss7_set_flag(sngss7_info, FLAG_GLARE);
@@ -186,7 +186,10 @@ void sngss7_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
         break;
     /**************************************************************************/
     default:    /* should not have gotten an IAM while in this state */
-        SS7_ERROR("Got IAM in an invalid state!\n");
+        SS7_ERROR("Got IAM in an invalid state (%s) on span=%d, chan=%d!\n", 
+                    ftdm_channel_state2str(ftdmchan->state),
+                    ftdmchan->physical_span_id,
+                    ftdmchan->physical_chan_id);
 
         /* move the state of the channel to RESTART to force a reset */
         ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
@@ -824,29 +827,10 @@ static ftdm_status_t handle_reattempt(uint32_t suInstId, uint32_t spInstId, uint
         return FTDM_FAIL;
     };
 
+    /* glare, throw the flag, go to down state*/
+    sngss7_set_flag(sngss7_info, FLAG_GLARE);
 
-    switch (ftdmchan->state) {
-    /**************************************************************************/
-    case FTDM_CHANNEL_STATE_DIALING:
-        /* glare, go to down state*/
-
-        ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
-        
-        break;
-    /**************************************************************************/
-    default:
-        /* fuck...this shouldn't happen */
-        SS7_ERROR("Received reattempt indication on CIC %d in invalid state %s\n", 
-                    sngss7_info->circuit->cic,
-                    ftdm_channel_state2str(ftdmchan->state));
-
-        /* throw the channel into reset */
-        sngss7_set_flag(sngss7_info, FLAG_RESET_TX);
-        ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
-
-        break;
-    /**************************************************************************/
-    }
+    ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 
     /* unlock the channel again before we exit */
     ftdm_mutex_unlock(ftdmchan->mutex);

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
index 0311a1d216a0d07293205d0cd2e1c55af25433f9..dab1b83cd1987619338884c78be8c43a51a6dc7b 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
@@ -252,8 +252,8 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t *me, void *obj)
                     ftdm_sangoma_ss7_process_state_change(ftdmchan);
                 } else {
                     SS7_ERROR("ftdm_core reported state change, but state change flag not set on ft-span = %d, ft-chan = %d\n",
-                                ftdmchan->span_id,
-                                ftdmchan->chan_id);
+                                ftdmchan->physical_span_id,
+                                ftdmchan->physical_chan_id);
                 }
             } /* while ((ftdmchan = ftdm_queue_dequeue(span->pendingchans)))  */
 
@@ -318,7 +318,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_COLLECT:     /* IAM received but wating on digits */
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                            ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                            ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -385,7 +385,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_RING:                      /*incoming call request*/
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -406,7 +406,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_DIALING:                   /*outgoing call request*/
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -420,7 +420,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_PROGRESS:
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -443,7 +443,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -455,7 +455,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_UP: /*call is accpeted...both incoming and outgoing*/
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -476,14 +476,14 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_CANCEL:
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
             break;
         }
 
-        SS7_ERROR("Hanging up call before informing user on span = %d, chan = %d!\n", ftdmchan->span_id,ftdmchan->chan_id);
+        SS7_ERROR("Hanging up call before informing user on span = %d, chan = %d!\n", ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         /*now go to the HANGUP complete state*/
         ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
@@ -492,7 +492,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_TERMINATING:            /*call is hung up remotely*/
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -510,7 +510,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_HANGUP:                  /*call is hung up locally*/
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -536,7 +536,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_HANGUP_COMPLETE:
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -568,7 +568,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_DOWN:           /*the call is finished and removed*/
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
             SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
@@ -598,8 +598,8 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
 
         /* check if the circuit has the glare flag up */
         if (sngss7_test_flag(sngss7_info, FLAG_GLARE)) {
-            SS7_DEBUG("Glare flag is up....spoofing incoming call on span=%, chan=%d\n",
-                        ftdmchan->span_id,ftdmchan->chan_id);
+            SS7_DEBUG("Glare flag is up....spoofing incoming call on span=%d, chan=%d\n",
+                        ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
             /* clear all the call specific data */
             sngss7_info->suInstId = 0;
             sngss7_info->spInstId = 0;
@@ -639,7 +639,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_RESTART:                    /* CICs needs a Reset */
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
             /* bring the call down first...then process the rest of the reset */
@@ -694,11 +694,11 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_SUSPENDED:            /* circuit has been blocked */
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         /**********************************************************************/
         if (sngss7_test_flag(sngss7_info, FLAG_INFID_PAUSED)) {
-            SS7_DEBUG("processing pause for span = %, chan = %d\n",ftdmchan->span_id,ftdmchan->chan_id);
+            SS7_DEBUG("processing pause for span = %, chan = %d\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
             /* bring the channel signaling status to down */
             status = FTDM_SIG_STATE_DOWN;
             sigev.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
@@ -709,7 +709,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
             ftdm_set_state_locked(ftdmchan, ftdmchan->last_state);
         }
         if (sngss7_test_flag(sngss7_info, FLAG_INFID_RESUME)) {
-            SS7_DEBUG("processing resume for span = %, chan = %d\n",ftdmchan->span_id,ftdmchan->chan_id);
+            SS7_DEBUG("processing resume for span = %, chan = %d\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
             /* we just resumed...throw the channel into reset */
             sngss7_set_flag(sngss7_info, FLAG_RESET_TX);
 
@@ -721,7 +721,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
         }
         /**********************************************************************/
         if (sngss7_test_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX)) {
-            SS7_DEBUG("processing rx Mn ckt block for span = %, chan = %d\n",ftdmchan->span_id,ftdmchan->chan_id);
+            SS7_DEBUG("processing rx Mn ckt block for span = %, chan = %d\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
             /* bring the channel signaling status to down */
             status = FTDM_SIG_STATE_DOWN;
             sigev.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
@@ -735,7 +735,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
             ftdm_set_state_locked(ftdmchan, ftdmchan->last_state);
         }
         if (sngss7_test_flag(sngss7_info, FLAG_CKT_MN_UNBLK_RX)) {
-            SS7_DEBUG("processing rx Mn ckt unblock for span = %, chan = %d\n",ftdmchan->span_id,ftdmchan->chan_id);
+            SS7_DEBUG("processing rx Mn ckt unblock for span = %, chan = %d\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
             /* bring the channel signaling status to up */
             status = FTDM_SIG_STATE_UP;
             sigev.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
@@ -753,7 +753,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
         }
         /**********************************************************************/
         if (sngss7_test_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX)) {
-            SS7_DEBUG("processing tx Mn ckt block for span = %, chan = %d\n",ftdmchan->span_id,ftdmchan->chan_id);
+            SS7_DEBUG("processing tx Mn ckt block for span = %, chan = %d\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
             /* bring the channel signaling status to down */
             status = FTDM_SIG_STATE_DOWN;
             sigev.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
@@ -767,7 +767,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
             ftdm_set_state_locked(ftdmchan, ftdmchan->last_state);
         }
         if (sngss7_test_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX)) {
-            SS7_DEBUG("processing tx Mn ckt unblock for span = %, chan = %d\n",ftdmchan->span_id,ftdmchan->chan_id);
+            SS7_DEBUG("processing tx Mn ckt unblock for span = %, chan = %d\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
             /* bring the channel signaling status to up */
             status = FTDM_SIG_STATE_UP;
             sigev.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
@@ -789,7 +789,7 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     /**************************************************************************/
     case FTDM_CHANNEL_STATE_IN_LOOP:                              /* COT test */
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 processing state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         /* send the lpa */
         ft_to_sngss7_lpa(ftdmchan);
@@ -806,13 +806,13 @@ static void ftdm_sangoma_ss7_process_state_change(ftdm_channel_t *ftdmchan)
     case FTDM_CHANNEL_STATE_IDLE:
     case FTDM_CHANNEL_STATE_INVALID:
         ftdm_log(FTDM_LOG_DEBUG, "ftmod_sangoma_ss7 does not support state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
         break;
     /**************************************************************************/
     default:
         /*this is bad...we're in an unknown state...should we kill this channel???*/
         ftdm_log(FTDM_LOG_ERROR, "ftmod_sangoma_ss7 in unknown state %s on span=%u,chan=%u\n",
-                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->span_id,ftdmchan->chan_id);
+                                    ftdm_channel_state2str(ftdmchan->state),ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
         break;
     } /*switch (ftdmchan->state)*/
 
@@ -845,7 +845,7 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
          * glare or for the network to acknowledge the call
          */
         c = 0;
-        while (c < 20) {
+        while (c < 100) {
 
             /* lock the channel while we check whether it is availble */
             ftdm_mutex_lock(ftdmchan->mutex);
@@ -854,11 +854,9 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
             sngss7_info = (sngss7_chan_data_t  *)ftdmchan->call_data;
 
             if (sngss7_test_flag(sngss7_info, FLAG_GLARE)) {
-                SS7_ERROR("Glare flag on span=%d, chan=%d\n",
-                            ftdmchan->span_id,ftdmchan->chan_id);
-
-                /* move the channel to DOWN to clear the existing channel allocations */
-                ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+                SS7_ERROR("Glare flag on span=%d,chan=%d\n",
+                            ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
+ 
                 goto outgoing_glare;
             }
 
@@ -870,17 +868,15 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
             case FTDM_CHANNEL_STATE_PROGRESS:
             case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
             case FTDM_CHANNEL_STATE_UP:
-                SS7_DEBUG("Outgoing call request successful on span=%d, chan=%d\n",
-                            ftdmchan->span_id,ftdmchan->chan_id);
                 goto outgoing_successful;
                 break;
             /******************************************************************/
             default:
-                SS7_ERROR("Channel in invalid state (%s) on span=%d, chan=%d...should not happen\n",
+                SS7_ERROR("Channel in invalid state (%s) on span=%d,chan=%d...glare\n",
                         ftdm_channel_state2str(ftdmchan->state),
-                        ftdmchan->span_id,
-                        ftdmchan->chan_id);
-                goto outgoing_fail;
+                        ftdmchan->physical_span_id,
+                        ftdmchan->physical_chan_id);
+                goto outgoing_glare;
                 break;
             /******************************************************************/
             }
@@ -889,7 +885,7 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
             ftdm_mutex_unlock(ftdmchan->mutex);
 
             /* sleep for a bit to let the state change */
-            ftdm_sleep(50);
+            ftdm_sleep(10);
 
             /* increment the timeout counter */
             c++;
@@ -897,8 +893,8 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
         } /* while (c < 4) */
 
         /* if we got here we have timed-out waiting for acknowledgment, kill the call */
-        SS7_DEBUG("Timeout waiting for outgoing call to be accepted by network, ok'ing outgoing call on span=%d, chan=%d\n",
-                        ftdmchan->span_id,ftdmchan->chan_id);
+        SS7_DEBUG("Timeout waiting for outgoing call to be accepted by network, ok'ing outgoing call on span=%d,chan=%d\n",
+                        ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
 
         /* consider the call good .... for now */
         goto outgoing_successful;
@@ -907,8 +903,8 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
     /**************************************************************************/
     default:
         /* the channel is already used...this can't be, end the request */
-        SS7_ERROR("Outgoing call requested channel in already in use...indicating glare on span=%d, chan=%d\n",
-                            ftdmchan->span_id,ftdmchan->chan_id);
+        SS7_ERROR("Outgoing call requested channel in already in use...indicating glare on span=%d,chan=%d\n",
+                            ftdmchan->physical_span_id,ftdmchan->physical_chan_id);
         goto outgoing_glare;
         break;        
     /**************************************************************************/
@@ -917,17 +913,20 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
     /* we should not get to this here...all exit points above use goto */
     SS7_ERROR("WE SHOULD NOT HERE HERE!!!!\n");
 
-outgoing_fail:
+    SS7_DEBUG("Call Request on span=%d, chan=%d failed\n");
     /* unlock the channel */
-    ftdm_mutex_unlock(ftdmchan->mutex);
+    ftdm_mutex_unlock(ftdmchan->mutex);  
+
     return FTDM_FAIL;
 
 outgoing_glare:
+    SS7_DEBUG("Indicating glare on span=%d, chan=%d\n");
     /* unlock the channel */
     ftdm_mutex_unlock(ftdmchan->mutex);  
     return FTDM_BREAK;
 
 outgoing_successful:
+    SS7_DEBUG("Call Request on span=%d, chan=%d successful\n");
     /* unlock the channel */
     ftdm_mutex_unlock(ftdmchan->mutex);
     return FTDM_SUCCESS;