From 5ca31e9fbf712e721481718d57b11484b189e731 Mon Sep 17 00:00:00 2001
From: yannick <yannick@sangoma.com>
Date: Tue, 27 Sep 2011 15:44:20 -0400
Subject: [PATCH 001/102] freetdm: resolve mtp2 on relay always down problem

---
 .../ftmod_sangoma_ss7_relay.c                 | 49 +++++++------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
index bfb6971297..c99a14a7e7 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
@@ -49,7 +49,7 @@ ftdm_status_t handle_relay_disconnect(RyMngmt *sta);
 static ftdm_status_t reconfig_all_ckts_for_relay(void);
 static ftdm_status_t disable_all_ckts_for_relay(void);
 static ftdm_status_t block_all_ckts_for_relay(uint32_t procId);
-static ftdm_status_t unblock_all_ckts_for_relay(uint32_t procId);
+/* static ftdm_status_t unblock_all_ckts_for_relay(uint32_t procId); */
 static ftdm_status_t disable_all_sigs_for_relay(uint32_t procId);
 static ftdm_status_t disble_all_mtp2_sigs_for_relay(void);
 /******************************************************************************/
@@ -59,43 +59,26 @@ ftdm_status_t handle_relay_connect(RyMngmt *sta)
 {
 	sng_relay_t	*sng_relay = &g_ftdm_sngss7_data.cfg.relay[sta->t.usta.s.ryUpUsta.id];
 
-
-	/* test if this is the first time the channel comes up */
 	if (!sngss7_test_flag(sng_relay, SNGSS7_RELAY_INIT)) {
-		SS7_INFO("Relay Channel %d initial connection UP\n", sng_relay->id);
-
-		/* mark the channel as being up */
+		/* SS7_INFO("Relay Channel %d initial connection UP\n", sng_relay->id); */
 		sngss7_set_flag(sng_relay, SNGSS7_RELAY_INIT);
-	} else {
-		SS7_INFO("Relay Channel %d connection UP\n", sng_relay->id);
-
-		/* react based on type of channel */
-		switch (sng_relay->type) {
-		/******************************************************************/
-		case (LRY_CT_TCP_CLIENT):
-			/* reconfigure all ISUP ckts, since the main system would have lost all configs */
+	}
+	
+	SS7_INFO("Relay Channel %d connection UP\n", sng_relay->id);
+	if (sng_relay->type == LRY_CT_TCP_CLIENT) {
+		if (!sngss7_test_flag(sng_relay, SNGSS7_RELAY_INIT)) {
 			if (reconfig_all_ckts_for_relay()) {
 				SS7_ERROR("Failed to reconfigure ISUP Ckts!\n");
 				/* we're done....this is very bad! */
 			}
-			break;
-		/******************************************************************/
-		case (LRY_CT_TCP_SERVER):
-			/* bring the sig links on the client system back up */
-			ftmod_ss7_enable_grp_mtp3Link(sta->t.usta.s.ryUpUsta.id);
-			
-			/* unbloock the ckts on the client system */
-			unblock_all_ckts_for_relay(sta->t.usta.s.ryUpUsta.id);
-			
-			break;
-		/******************************************************************/
-		default:
-			break;
-		/******************************************************************/
-		} /* switch (g_ftdm_sngss7_data.cfg.relay[sta->t.usta.s.ryUpUsta.id].type) */
-	} /* intial up? */
-
-	return FTDM_SUCCESS;
+		}
+		return FTDM_SUCCESS;
+	} else if (sng_relay->type == LRY_CT_TCP_SERVER) {
+		ftmod_ss7_enable_grp_mtp3Link(sta->t.usta.s.ryUpUsta.id);
+		/* unbloock the ckts on the client system */
+		return FTDM_SUCCESS;
+	}
+	return FTDM_FAIL;
 }
 
 /******************************************************************************/
@@ -310,6 +293,7 @@ ftdm_status_t disble_all_mtp2_sigs_for_relay(void)
 
 }
 
+#if 0
 /******************************************************************************/
 static ftdm_status_t unblock_all_ckts_for_relay(uint32_t procId)
 {
@@ -345,6 +329,7 @@ static ftdm_status_t unblock_all_ckts_for_relay(uint32_t procId)
 
 	return FTDM_SUCCESS;
 }
+#endif
 
 /******************************************************************************/
 /* For Emacs:

From d9fe71f02485efcdd1147096023d17d7cd4ba431 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Tue, 27 Sep 2011 15:46:40 -0400
Subject: [PATCH 002/102] freetdm: changing git user to be James Zhang - last
 commit of mtp2 relay fixing was mine

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
index c99a14a7e7..1d85dfffbb 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
@@ -331,6 +331,7 @@ static ftdm_status_t unblock_all_ckts_for_relay(uint32_t procId)
 }
 #endif
 
+
 /******************************************************************************/
 /* For Emacs:
  * Local Variables:

From b7199839338d812a3c5c9335885932bdcc57daac Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Wed, 28 Sep 2011 11:56:19 -0400
Subject: [PATCH 003/102] mod_sofia: Resolved issue #1547 - SIP INFO not
 working            The dtmf_type member was incorrectly being set to NONE if
 the SDP            does not advertise RFC2833 support (which has nothing to
 do with SIP INFO)

---
 src/mod/endpoints/mod_sofia/mod_sofia.c  |  5 +++++
 src/mod/endpoints/mod_sofia/sofia_glue.c | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index d77f298588..0fc8c3acfb 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1359,10 +1359,12 @@ static switch_status_t sofia_send_dtmf(switch_core_session_t *session, const swi
 	switch (dtmf_type) {
 	case DTMF_2833:
 		{
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Enqueuing RFC2833 DTMF %c of length %d\n", dtmf->digit, dtmf->duration);
 			return switch_rtp_queue_rfc2833(tech_pvt->rtp_session, dtmf);
 		}
 	case DTMF_INFO:
 		{
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending INFO DTMF %c of length %d\n", dtmf->digit, dtmf->duration);
 			snprintf(message, sizeof(message), "Signal=%c\r\nDuration=%d\r\n", dtmf->digit, dtmf->duration / 8);
 			switch_mutex_lock(tech_pvt->sofia_mutex);
 			nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("application/dtmf-relay"), SIPTAG_PAYLOAD_STR(message), TAG_END());
@@ -1370,6 +1372,9 @@ static switch_status_t sofia_send_dtmf(switch_core_session_t *session, const swi
 		}
 		break;
 	case DTMF_NONE:
+		{
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding DTMF %c of length %d, DTMF type is NONE\n", dtmf->digit, dtmf->duration);
+		}
 		break;
 	default:
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Unhandled DTMF type!\n");
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 062da61a98..ae10ccc0aa 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -4847,10 +4847,12 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 					}
 				}
 			} else {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Disable 2833 dtmf\n");
-				switch_channel_set_variable(tech_pvt->channel, "dtmf_type", "none");
-				tech_pvt->dtmf_type = DTMF_NONE;
-				te = tech_pvt->recv_te = 0;
+				if (tech_pvt->dtmf_type == DTMF_2833) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Disable 2833 dtmf\n");
+					switch_channel_set_variable(tech_pvt->channel, "dtmf_type", "none");
+					tech_pvt->dtmf_type = DTMF_NONE;
+					te = tech_pvt->recv_te = 0;
+				}
 			}
 
 			

From 1ba6d277fa03694d1b626bb325ff894a7ed7d5ad Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Wed, 28 Sep 2011 13:23:30 -0400
Subject: [PATCH 004/102] freetdm: Fix SS7 T35 timer

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c | 7 ++++---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c    | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
index ff66cc6b41..10afc65bc9 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
@@ -56,21 +56,22 @@ void handle_isup_t35(void *userdata)
     ftdm_channel_t      *ftdmchan = sngss7_info->ftdmchan;
 
     /* now that we have the right channel...put a lock on it so no-one else can use it */
-    ftdm_mutex_lock(ftdmchan->mutex);
+    ftdm_channel_lock(ftdmchan);
 
+    /* Q.764 2.2.5 Address incomplete (T35 expiry action is hangup with cause 28 according to Table A.1/Q.764) */
     SS7_ERROR("[Call-Control] Timer 35 expired on CIC = %d\n", sngss7_info->circuit->cic);
 
     /* set the flag to indicate this hangup is started from the local side */
     sngss7_set_ckt_flag(sngss7_info, FLAG_LOCAL_REL);
 
     /* hang up on timer expiry */
-    ftdmchan->caller_data.hangup_cause = 28;
+    ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_INVALID_NUMBER_FORMAT;
 
     /* end the call */
     ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);
 
     /*unlock*/
-    ftdm_mutex_unlock(ftdmchan->mutex);
+    ftdm_channel_unlock(ftdmchan);
 
     SS7_FUNC_TRACE_EXIT(__FUNCTION__);
     return;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index 2794eb497c..d7fc553e2f 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -2966,9 +2966,10 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 			g_ftdm_sngss7_data.cfg.isupCkt[x].t17		= ccSpan->t17;
 		}
 		if (ccSpan->t35 == 0) {
-			g_ftdm_sngss7_data.cfg.isupCkt[x].t17		= 170;
+			/* Q.764 2.2.5 Address incomplete (T35 is 15-20 seconds according to Table A.1/Q.764) */
+			g_ftdm_sngss7_data.cfg.isupCkt[x].t35		= 170;
 		} else {
-			g_ftdm_sngss7_data.cfg.isupCkt[x].t17		= ccSpan->t35;
+			g_ftdm_sngss7_data.cfg.isupCkt[x].t35		= ccSpan->t35;
 		}
 		if (ccSpan->tval == 0) {
 			g_ftdm_sngss7_data.cfg.isupCkt[x].tval		= 10;

From 1aad77a0d332b05b11557c6620def53deb6353c5 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Wed, 28 Sep 2011 13:40:55 -0400
Subject: [PATCH 005/102] Fix issue #1545 - Wrong branding

Conflicts:

	src/switch_console.c
---
 src/mod/applications/mod_commands/mod_commands.c | 2 +-
 src/switch_console.c                             | 2 +-
 src/switch_core.c                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 785861457e..4e114ad5d7 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -283,7 +283,7 @@ SWITCH_STANDARD_API(shutdown_function)
 
 SWITCH_STANDARD_API(version_function)
 {
-	stream->write_function(stream, "Sangoma Media Gateway Version %s\n", SWITCH_VERSION_FULL);
+	stream->write_function(stream, "NSG Version %s\n", SWITCH_VERSION_FULL);
 	return SWITCH_STATUS_SUCCESS;
 }
 
diff --git a/src/switch_console.c b/src/switch_console.c
index 8f7238d257..876e9386a4 100644
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -1004,7 +1004,7 @@ static unsigned char console_f12key(EditLine * el, int ch)
 char *prompt(EditLine * e)
 {
 	if (*prompt_str == '\0') {
-		switch_snprintf(prompt_str, sizeof(prompt_str), "sangoma-media-gateway@%s> ", switch_core_get_switchname());
+		switch_snprintf(prompt_str, sizeof(prompt_str), "nsg@%s> ", switch_core_get_switchname());
 	}
 
 	return prompt_str;
diff --git a/src/switch_core.c b/src/switch_core.c
index 2aa40f9188..bc4974b995 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1859,7 +1859,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t
 
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,
-					  "\nSangoma Media Gateway Version %s Started.\nMax Sessions[%u]\nSession Rate[%d]\nSQL [%s]\n", SWITCH_VERSION_FULL,
+					  "\nNSG Version %s Started.\nMax Sessions[%u]\nSession Rate[%d]\nSQL [%s]\n", SWITCH_VERSION_FULL,
 					  switch_core_session_limit(0),
 					  switch_core_sessions_per_second(0), switch_test_flag((&runtime), SCF_USE_SQL) ? "Enabled" : "Disabled");
 

From b8284420523f88820ca0eedc2463ed1903c88bc6 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Wed, 28 Sep 2011 19:15:35 -0400
Subject: [PATCH 006/102] freetdm: Fix SS7 ISUP T10 (Overlap digit timeout) -
 issue #1445

---
 .../ftmod_sangoma_ss7_handle.c                |  2 ++
 .../ftmod_sangoma_ss7_main.c                  | 35 ++++++++++++++++---
 .../ftmod_sangoma_ss7_main.h                  |  4 ++-
 .../ftmod_sangoma_ss7_timers.c                | 35 ++++++++++++++++++-
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 30 +++++++++-------
 5 files changed, 87 insertions(+), 19 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 26356220ec..213c4c8d4d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -405,6 +405,8 @@ ftdm_status_t handle_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 				append_tknStr_from_sngss7(siCnStEvnt->subNum.addrSig, 
 											ftdmchan->caller_data.dnis.digits, 
 											siCnStEvnt->subNum.oddEven);
+				SS7_DEBUG_CHAN(ftdmchan,"[CIC:%d]Rx SAM (digits = %s)\n", sngss7_info->circuit->cic,
+						ftdmchan->caller_data.dnis.digits);
 			} else {
 				SS7_INFO_CHAN(ftdmchan,"No Called party (DNIS) information in SAM!%s\n", " ");
 			}
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 9f2cbbac25..5341983e46 100644
--- 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
@@ -592,6 +592,11 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			i++;
 		}
 
+		/* kill t10 if active */
+		if (sngss7_info->t10.hb_timer_id) {
+			ftdm_sched_cancel_timer (sngss7_info->t10.sched, sngss7_info->t10.hb_timer_id);
+		}
+
 		/* check if the end of pulsing (ST) character has arrived or the right number of digits */
 		if (ftdmchan->caller_data.dnis.digits[i-1] == 'F') {
 			SS7_DEBUG_CHAN(ftdmchan, "Received the end of pulsing character %s\n", "");
@@ -613,7 +618,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		} else {
 			/* if we are coming from idle state then we have already been here once before */
 			if (ftdmchan->last_state != FTDM_CHANNEL_STATE_IDLE) {
-				SS7_INFO_CHAN(ftdmchan,"Received %d out of %d so far: %s...starting T35\n",
+				SS7_INFO_CHAN(ftdmchan, "Received %d out of %d so far: %s...starting T35\n",
 										i,
 										sngss7_info->circuit->min_digits,
 										ftdmchan->caller_data.dnis.digits);
@@ -628,7 +633,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		
 					SS7_ERROR ("Unable to schedule timer, hanging up call!\n");
 		
-					ftdmchan->caller_data.hangup_cause = 41;
+					ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_NORMAL_TEMPORARY_FAILURE;
 		
 					/* set the flag to indicate this hangup is started from the local side */
 					sngss7_set_ckt_flag (sngss7_info, FLAG_LOCAL_REL);
@@ -636,9 +641,29 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 					/* end the call */
 					state_flag = 0;
 					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);
-				} /* if (ftdm_sched_timer(sngss7_info->t35.sched, */
-			} /* if (ftdmchan->last_state != FTDM_CHANNEL_STATE_IDLE) */
-		} /* checking ST/#digits */
+				}
+			}
+
+			/* start ISUP t10 */
+			if (ftdm_sched_timer (sngss7_info->t10.sched,
+									"t10",
+									sngss7_info->t10.beat,
+									sngss7_info->t10.callback,
+									&sngss7_info->t10,
+									&sngss7_info->t10.hb_timer_id)) {
+	
+				SS7_ERROR ("Unable to schedule timer, hanging up call!\n");
+	
+				ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_NORMAL_TEMPORARY_FAILURE;
+	
+				/* set the flag to indicate this hangup is started from the local side */
+				sngss7_set_ckt_flag (sngss7_info, FLAG_LOCAL_REL);
+	
+				/* end the call */
+				state_flag = 0;
+				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);
+			}
+		}
 
 	  break;
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 7a116ecbb4..d58d2a5331 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -288,7 +288,6 @@ typedef struct sng_isup_intf {
 	uint32_t		ssf;
 	uint32_t		isap;
 	uint16_t		t4;
-	uint32_t		t10;
 	uint32_t		t11;
 	uint32_t		t18;
 	uint32_t		t19;
@@ -344,6 +343,7 @@ typedef struct sng_isup_ckt {
 	uint8_t			transparent_iam;
 	void			*obj;
 	uint16_t		t3;
+	uint32_t		t10;
 	uint16_t		t12;
 	uint16_t		t13;
 	uint16_t		t14;
@@ -471,6 +471,7 @@ typedef struct sngss7_chan_data {
 	void					*raw_data;		/* send on next sigevent */
 	sngss7_glare_data_t		glare;
 	sngss7_timer_data_t		t35;
+	sngss7_timer_data_t		t10;
 	sngss7_group_data_t		rx_grs;
 	sngss7_group_data_t		rx_gra;
 	sngss7_group_data_t		tx_grs;
@@ -887,6 +888,7 @@ ftdm_status_t sngss7_add_raw_data(sngss7_chan_data_t *sngss7_info, uint8_t* data
 
 /* in ftmod_sangoma_ss7_timers.c */
 void handle_isup_t35(void *userdata);
+void handle_isup_t10(void *userdata);
 
 /******************************************************************************/
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
index 10afc65bc9..6138ea34b0 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2009, Konrad Hammel <konrad@sangoma.com>
+ * Copyright (c) 2009, Sangoma Technologies
+ * Konrad Hammel <konrad@sangoma.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +30,11 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors: 
+ *
+ * Moises Silva <moy@sangoma.com>
+ *
  */
 
 /* INCLUDE ********************************************************************/
@@ -70,12 +76,39 @@ void handle_isup_t35(void *userdata)
     /* end the call */
     ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);
 
+    /* kill t10 if active */
+    if (sngss7_info->t10.hb_timer_id) {
+        ftdm_sched_cancel_timer (sngss7_info->t10.sched, sngss7_info->t10.hb_timer_id);
+    }
+
     /*unlock*/
     ftdm_channel_unlock(ftdmchan);
 
     SS7_FUNC_TRACE_EXIT(__FUNCTION__);
     return;
 }
+
+
+void handle_isup_t10(void *userdata)
+{
+	SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+
+	sngss7_timer_data_t *timer = userdata;
+	sngss7_chan_data_t  *sngss7_info = timer->sngss7_info;
+	ftdm_channel_t      *ftdmchan = sngss7_info->ftdmchan;
+
+	ftdm_channel_lock(ftdmchan);
+
+	SS7_DEBUG("[Call-Control] Timer 10 expired on CIC = %d\n", sngss7_info->circuit->cic);
+
+	/* send the call to the user */
+	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RING);
+
+	ftdm_channel_unlock(ftdmchan);
+
+	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+}
+ 
 /******************************************************************************/
 /* For Emacs:
  * Local Variables:
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index d7fc553e2f..acb29ba385 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -127,6 +127,7 @@ typedef struct sng_ccSpan
 	uint8_t			itx_auto_reply;
 	uint8_t			transparent_iam;
 	uint32_t		t3;
+	uint32_t		t10;
 	uint32_t		t12;
 	uint32_t		t13;
 	uint32_t		t14;
@@ -1570,11 +1571,6 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 			sng_isap.t9 = atoi(parm->val);
 			SS7_DEBUG("Found isup t9 = %d\n",sng_isap.t9);
 		/**********************************************************************/
-		} else if (!strcasecmp(parm->var, "isup.t10")) {
-		/**********************************************************************/
-			sng_isup.t10 = atoi(parm->val);
-			SS7_DEBUG("Found isup t10 = %d\n",sng_isup.t10);
-		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "isup.t11")) {
 		/**********************************************************************/
 			sng_isup.t11 = atoi(parm->val);
@@ -1965,6 +1961,10 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 		/**********************************************************************/
 			sng_ccSpan.t3 = atoi(parm->val);
 			SS7_DEBUG("Found isup t3 = %d\n", sng_ccSpan.t3);
+		} else if (!strcasecmp(parm->var, "isup.t10")) {
+		/**********************************************************************/
+			sng_ccSpan.t10 = atoi(parm->val);
+			SS7_DEBUG("Found isup t10 = %d\n", sng_ccSpan.t10);
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "isup.t12")) {
 		/**********************************************************************/
@@ -2584,11 +2584,6 @@ static int ftmod_ss7_fill_in_isup_interface(sng_isup_inf_t *sng_isup)
 	} else {
 		g_ftdm_sngss7_data.cfg.isupIntf[i].t4		= 3000;
 	}
-	if (sng_isup->t10 != 0) {
-		g_ftdm_sngss7_data.cfg.isupIntf[i].t10		= sng_isup->t10;
-	} else {
-		g_ftdm_sngss7_data.cfg.isupIntf[i].t10		= 50;
-	}
 	if (sng_isup->t11 != 0) {
 		g_ftdm_sngss7_data.cfg.isupIntf[i].t11		= sng_isup->t11;
 	} else {
@@ -2935,6 +2930,11 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 		} else {
 			g_ftdm_sngss7_data.cfg.isupCkt[x].t3			= ccSpan->t3;
 		}
+		if (ccSpan->t10 == 0) {
+			g_ftdm_sngss7_data.cfg.isupCkt[x].t10		= 50;
+		} else {
+			g_ftdm_sngss7_data.cfg.isupCkt[x].t10		= ccSpan->t10;
+		}
 		if (ccSpan->t12 == 0) {
 			g_ftdm_sngss7_data.cfg.isupCkt[x].t12		= 300;
 		} else {
@@ -3063,12 +3063,18 @@ static int ftmod_ss7_fill_in_circuits(sng_span_t *sngSpan)
 		ftdmchan->call_data = ss7_info;
 
 		/* prepare the timer structures */
-		ss7_info->t35.sched			= ((sngss7_span_data_t *)(ftdmspan->signal_data))->sched;
+		ss7_info->t35.sched		= ((sngss7_span_data_t *)(ftdmspan->signal_data))->sched;
 		ss7_info->t35.counter		= 1;
-		ss7_info->t35.beat			= (isupCkt->t35) * 100; /* beat is in ms, t35 is in 100ms */
+		ss7_info->t35.beat		= (isupCkt->t35) * 100; /* beat is in ms, t35 is in 100ms */
 		ss7_info->t35.callback		= handle_isup_t35;
 		ss7_info->t35.sngss7_info	= ss7_info;
 
+		ss7_info->t10.sched		= ((sngss7_span_data_t *)(ftdmspan->signal_data))->sched;
+		ss7_info->t10.counter		= 1;
+		ss7_info->t10.beat		= (isupCkt->t10) * 100; /* beat is in ms, t10 is in 100ms */
+		ss7_info->t10.callback		= handle_isup_t10;
+		ss7_info->t10.sngss7_info	= ss7_info;
+
 
 	/**************************************************************************/
 	} /* for (i == 1; i < ftdmspan->chan_count; i++) */

From f43eecbab3cd171bd81b41e403d304c6ae65a76e Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Fri, 30 Sep 2011 10:25:21 -0400
Subject: [PATCH 007/102] ftdm_ss7: Adding OPC and Call Reference Number to SIP
 x-headers

---
 libs/freetdm/mod_freetdm/mod_freetdm.c            | 15 +++++++++++++++
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c  |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index caee4dcec9..8501bb1ce2 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1760,6 +1760,21 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Screen", "%d", channel_caller_data->screen);
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Presentation", "%d", channel_caller_data->pres);
+		
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_opc");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-OPC", "%s", var_value);
+		}
+		
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_lac");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LAC", "%s", var_value);
+		}
+		
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_crn");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CRN", "%s", var_value);
+		}
 	}
 
 	/* Add any call variable to the dial plan */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 213c4c8d4d..41e0129919 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -219,6 +219,14 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sprintf(var, "%d", sngss7_info->circuit->cic);
 			sngss7_add_var(sngss7_info, "ss7_cic", var);
 
+			sprintf(var, "%d", g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId].spc );
+			sngss7_add_var(sngss7_info, "ss7_opc", var);
+			
+			if (siConEvnt->callRef.callId.pres) {
+				sprintf(var, "%u", (unsigned int)siConEvnt->callRef.callId.val);
+				sngss7_add_var(sngss7_info, "ss7_crn", var);
+			}
+			
 			if (sngss7_info->circuit->transparent_iam) {
 				sngss7_save_iam(ftdmchan, siConEvnt);
 			}

From dbd6bb9a83d9858ec09a6075de2c68ec1b07859e Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Fri, 30 Sep 2011 11:52:33 -0400
Subject: [PATCH 008/102] fixing bug 1625 - relay status not reported properly
 in the cli

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
index 9ff19bac02..00a563962c 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
@@ -1304,7 +1304,9 @@ static ftdm_status_t handle_show_status(ftdm_stream_handle_t *stream, int span,
 							stream->write_function(stream, "r_hw=N|");
 						}
 	
-						if (sngss7_test_ckt_blk_flag(ss7_info, FLAG_RELAY_DOWN)) {
+
+						if (g_ftdm_sngss7_data.cfg.procId != 1) {
+						/* if (sngss7_test_ckt_blk_flag(ss7_info, FLAG_RELAY_DOWN)) { */
 							stream->write_function(stream, "relay=Y|");
 						}else {
 							stream->write_function(stream, "relay=N");

From 595454126b3aa04643e52c661d2948b3caa5e15e Mon Sep 17 00:00:00 2001
From: root <james>
Date: Fri, 30 Sep 2011 13:09:13 -0400
Subject: [PATCH 009/102] freetdm: changing call reference to generic header;
 removing location area code

---
 libs/freetdm/mod_freetdm/mod_freetdm.c              | 13 ++-----------
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c    |  5 +++--
 libs/freetdm/src/include/freetdm.h                  |  1 +
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 8501bb1ce2..5a28076fb1 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1760,21 +1760,12 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Screen", "%d", channel_caller_data->screen);
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Presentation", "%d", channel_caller_data->pres);
-		
+		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CallReference", "%d", channel_caller_data->call_reference);
+
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_opc");
 		if (!ftdm_strlen_zero(var_value)) {
 			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-OPC", "%s", var_value);
 		}
-		
-		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_lac");
-		if (!ftdm_strlen_zero(var_value)) {
-			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LAC", "%s", var_value);
-		}
-		
-		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_crn");
-		if (!ftdm_strlen_zero(var_value)) {
-			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CRN", "%s", var_value);
-		}
 	}
 
 	/* Add any call variable to the dial plan */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 41e0129919..75c5357a8c 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -223,8 +223,9 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sngss7_add_var(sngss7_info, "ss7_opc", var);
 			
 			if (siConEvnt->callRef.callId.pres) {
-				sprintf(var, "%u", (unsigned int)siConEvnt->callRef.callId.val);
-				sngss7_add_var(sngss7_info, "ss7_crn", var);
+				ftdmchan->caller_data.call_reference = (unsigned int)siConEvnt->callRef.callId.val;
+			} else {
+				ftdmchan->caller_data.call_reference = 0;
 			}
 			
 			if (sngss7_info->circuit->transparent_iam) {
diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h
index 0948f16e29..c9c1b2e687 100755
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@@ -362,6 +362,7 @@ typedef struct ftdm_caller_data {
 	/* user information layer 1 protocol */
 	ftdm_user_layer1_prot_t bearer_layer1;
 	ftdm_calling_party_category_t cpc; /*!< Calling party category */
+	uint32_t call_reference;
 
 	ftdm_channel_t *fchan; /*!< FreeTDM channel associated (can be NULL) */
 

From ccc81f320713e8b2e4248735f1eaf7e4340787c9 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Fri, 30 Sep 2011 16:03:08 -0400
Subject: [PATCH 010/102] ftdm: change max_path length from 255 to 4096

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index d58d2a5331..caef19af12 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -51,7 +51,7 @@
 
 /* DEFINES ********************************************************************/
 #define MAX_NAME_LEN			25
-#define MAX_PATH				255
+#define MAX_PATH				4096
 
 #define MAX_CIC_LENGTH			5
 #define MAX_CIC_MAP_LENGTH		1000 

From b89a072a4691988da077720d0cfb3f11c0a4ae01 Mon Sep 17 00:00:00 2001
From: wadam <wadam@sangoma.com>
Date: Wed, 13 Jul 2011 10:57:09 -0400
Subject: [PATCH 011/102] Fix pid file name - Still hardcoded but to nsg.

---
 src/switch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/switch.c b/src/switch.c
index c0f4b5c2d3..038dd2c759 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -48,7 +48,7 @@
 #include "private/switch_core_pvt.h"
 
 /* pid filename: Stores the process id of the freeswitch process */
-#define PIDFILE "netborder-ss7.pid"
+#define PIDFILE "nsg.pid"
 static char *pfile = PIDFILE;
 static int system_ready = 0;
 

From c82f1ecabdcc3428a8bbd74d27e62e2ce7842709 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 6 Oct 2011 12:45:00 -0400
Subject: [PATCH 012/102] freetdm: Added SS7 variables for location number
 (pending SIP-X header integration)

---
 .../ftmod_sangoma_ss7_handle.c                | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 75c5357a8c..dab2035450 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -93,7 +93,7 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t *sngss7_info = NULL;
 	ftdm_channel_t *ftdmchan = NULL;
-	char var[10];
+	char var[FTDM_DIGITS_LIMIT];
 
 	memset(var, '\0', sizeof(var));
 
@@ -216,6 +216,34 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sprintf(var, "%d", siConEvnt->cdPtyNum.natAddrInd.val);
 			sngss7_add_var(sngss7_info, "ss7_cld_nadi", var);
 
+			/* Retrieve the Location Number if present (see ITU Q.763, 3.30) */
+			if (siConEvnt->cgPtyNum1.eh.pres) {
+				if (siConEvnt->cgPtyNum1.addrSig.pres) {
+					/* fill in the ss7 location address number */
+					copy_tknStr_from_sngss7(siConEvnt->cgPtyNum1.addrSig, var, siConEvnt->cgPtyNum1.oddEven);
+					sngss7_add_var(sngss7_info, "ss7_loc_digits", var);
+				}
+
+				if (siConEvnt->cgPtyNum1.scrnInd.pres) {
+					/* fill in the screening indication value */
+					sprintf(var, "%d", siConEvnt->cgPtyNum1.scrnInd.val);
+					sngss7_add_var(sngss7_info, "ss7_loc_screen_ind", var);
+				}
+
+				if (siConEvnt->cgPtyNum1.presRest.pres) {
+					/* fill in the presentation value */
+					sprintf(var, "%d", siConEvnt->cgPtyNum1.presRest.val);
+					sngss7_add_var(sngss7_info, "ss7_loc_pres_ind", var);
+				}
+
+				if (siConEvnt->cgPtyNum1.natAddrInd.pres) {
+					sprintf(var, "%d", siConEvnt->cgPtyNum1.natAddrInd.val);
+					sngss7_add_var(sngss7_info, "ss7_loc_nadi", var);
+				}
+			} else {
+				SS7_DEBUG_CHAN(ftdmchan, "No Location Number information in IAM%s\n", " ");
+			}
+
 			sprintf(var, "%d", sngss7_info->circuit->cic);
 			sngss7_add_var(sngss7_info, "ss7_cic", var);
 

From f1257ab8b510295a30ff2083cc6d4a11bef2a794 Mon Sep 17 00:00:00 2001
From: yannick <yannick@sangoma.com>
Date: Thu, 6 Oct 2011 17:36:50 -0400
Subject: [PATCH 013/102] ftdm: fixing reset on in-use channel causing infinite
 state loop.

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c |  8 +++++--
 .../ftmod_sangoma_ss7_main.c                  | 24 ++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
index 00a563962c..9eb737a7f3 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
@@ -29,6 +29,10 @@
  * LIABILITY|WHETHER IN CONTRACT|STRICT LIABILITY|OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE|EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors:
+ * James Zhang <jzhang@sangoma.com>
+ *
  */
 
 #if 0 
@@ -1198,7 +1202,7 @@ static ftdm_status_t handle_show_blocks(ftdm_stream_handle_t *stream, int span,
 				} 
 
 #ifdef SMG_RELAY_DBG
-				stream->write_function(stream, " blk_flag= %x     ckt_flag = %d", ss7_info->blk_flags, ss7_info->ckt_flags );
+				stream->write_function(stream," blk_flag=%x | ckt_flag=%x | chan_flag=%x", ss7_info->blk_flags, ss7_info->ckt_flags, ftdmchan->flags);
 #endif
 				stream->write_function(stream, "\n");				
 			} /* if ( span and chan) */
@@ -1314,7 +1318,7 @@ static ftdm_status_t handle_show_status(ftdm_stream_handle_t *stream, int span,
 					}
 		
 #ifdef SMG_RELAY_DBG
-					stream->write_function(stream," blk_flag= %x     ckt_flag = %d", ss7_info->blk_flags, ss7_info->ckt_flags );
+					stream->write_function(stream," blk_flag=%x | ckt_flag=%x | chan_flag=%x", ss7_info->blk_flags, ss7_info->ckt_flags, ftdmchan->flags);
 #endif
 					stream->write_function(stream, "\n");
 				} /* if ( hole, sig, voice) */
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 5341983e46..44870a69a9 100644
--- 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
@@ -842,9 +842,18 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		if (sngss7_test_ckt_flag (sngss7_info, FLAG_REMOTE_REL)) {
 			/* check if this hangup is from a tx RSC */
 			if (sngss7_test_ckt_flag (sngss7_info, FLAG_RESET_TX)) {
-				/* go to RESTART State until RSCa is received */
-				state_flag = 0;
-				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+				if (!sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_SENT)) {
+					ft_to_sngss7_rsc (ftdmchan);
+					sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_SENT);
+					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+				} else if (sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_TX_RSP)) {
+					state_flag = 0;
+					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+				} else {
+					/* go to RESTART State until RSCa is received */
+					state_flag = 0;
+					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+				}	
 			} else {
 				/* if the hangup is from a rx RSC, rx GRS, or glare don't sent RLC */
 				if (!(sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_RX)) &&
@@ -1040,9 +1049,12 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		if ((sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_TX)) &&
 			!(sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_SENT))) {
 
-			/* send a reset request */
-			ft_to_sngss7_rsc (ftdmchan);
-			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_SENT);
+			/* don't send out reset before finished hanging up if I'm in-use. */
+			if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
+				/* send a reset request */
+				ft_to_sngss7_rsc (ftdmchan);
+				sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_SENT);
+			}
 
 		} /* if (sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_TX)) */
 

From 4ece7e6ffde58e140ce3b562f54d170a243ef6ca Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 6 Oct 2011 17:54:46 -0400
Subject: [PATCH 014/102] freetdm: ftmod_wanpipe - remove debug idle messages
 for good, not worth the noise

---
 libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index 0f6f7db939..a2eed92b4e 100644
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
@@ -857,12 +857,6 @@ static void wanpipe_write_stats(ftdm_channel_t *ftdmchan, wp_tdm_api_tx_hdr_t *t
 	}
 
 	if (ftdmchan->iostats.tx.idle_packets < tx_stats->wp_api_tx_hdr_tx_idle_packets) {
-		/* HDLC channels do not always transmit, so its ok for drivers to fill with idle
-		 * also do not report idle warning when we just started transmitting */
-		if (ftdmchan->iostats.tx.packets && FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
-			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Tx idle changed from %d to %d\n", 
-					ftdmchan->iostats.tx.idle_packets, tx_stats->wp_api_tx_hdr_tx_idle_packets);
-		}
 		ftdmchan->iostats.tx.idle_packets = tx_stats->wp_api_tx_hdr_tx_idle_packets;
 	}
 

From 8ccd5f0e1304cd8dadd4bb0663b4cb8848e96b99 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 6 Oct 2011 18:53:38 -0400
Subject: [PATCH 015/102] freetdm: ss7 - fixing reset on in-use channel causing
 signaling down in the receiving side

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 44870a69a9..049aa1546d 100644
--- 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
@@ -944,7 +944,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 		/* check if we came from reset (aka we just processed a reset) */
 		if ((ftdmchan->last_state == FTDM_CHANNEL_STATE_RESTART) || 
-			(ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED)) {
+			(ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) || 
+			(ftdmchan->last_state == FTDM_CHANNEL_STATE_HANGUP_COMPLETE)) {
+				
 
 			/* check if reset flags are up indicating there is more processing to do yet */
 			if (!(sngss7_test_ckt_flag (sngss7_info, FLAG_RESET_TX)) &&

From 4aa0285a226d10b83ec310fd5e0dadb3aad6109e Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Wed, 12 Oct 2011 17:44:52 -0400
Subject: [PATCH 016/102] freetdm: CDR - location number implementation (for
 incoming and outgoing calls)

---
 libs/freetdm/mod_freetdm/mod_freetdm.c        | 26 +++++++++
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c | 13 ++++-
 .../ftmod_sangoma_ss7_handle.c                |  3 -
 .../ftmod_sangoma_ss7_main.h                  |  3 +
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c |  9 ++-
 .../ftmod_sangoma_ss7_support.c               | 56 +++++++++++++++++++
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 26 +++++++--
 libs/freetdm/src/include/freetdm.h            |  1 +
 8 files changed, 125 insertions(+), 12 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 5a28076fb1..f7b64a02a3 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1337,6 +1337,11 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 			ftdm_set_string(caller_data.dnis.digits, sipvar);
 		}
 
+		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-LOC");
+		if (sipvar) {
+			ftdm_set_string(caller_data.loc.digits, sipvar);
+		}
+
 		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-DNIS-TON");
 		if (sipvar) {
 			caller_data.dnis.type = (uint8_t)atoi(sipvar);
@@ -1703,6 +1708,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-Plan", "%d", channel_caller_data->rdnis.plan);
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CPC", "%s", ftdm_calling_party_category2str(channel_caller_data->cpc));
 		
+
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdnis_screen_ind");
 		if (!ftdm_strlen_zero(var_value)) {
 			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-Screen", "%d", var_value);
@@ -1766,6 +1772,26 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		if (!ftdm_strlen_zero(var_value)) {
 			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-OPC", "%s", var_value);
 		}
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_loc_digits");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LOC", "%s", var_value);
+		}
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_loc_screen_ind");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LOC-Screen", "%s", var_value);
+		}
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_loc_pres_ind");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LOC-Presentation", "%s", var_value);
+		}
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_loc_pres_nadi");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LOC-NADI", "%s", var_value);
+		}
 	}
 
 	/* Add any call variable to the dial plan */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
index dd1058f420..a9b4136665 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
@@ -78,6 +78,8 @@ int  ft_to_sngss7_cfg_all(void)
 
 	/* check if we have done gen_config already */
 	if (!(g_ftdm_sngss7_data.gen_config)) {
+		/* update the global gen_config so we don't do it again */
+		g_ftdm_sngss7_data.gen_config = 1;
 
 		/* start of by checking if the license and sig file are valid */
 		if (sng_validate_license(g_ftdm_sngss7_data.cfg.license,
@@ -207,10 +209,17 @@ int  ft_to_sngss7_cfg_all(void)
 			}
 		} /* if (sngss7_test_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_MTP2)) */
 
-		/* update the global gen_config so we don't do it again */
-		g_ftdm_sngss7_data.gen_config = 1;
+		g_ftdm_sngss7_data.gen_config = 2;
+
 	} /* if (!(g_ftdm_sngss7_data.gen_config)) */
 
+
+	/* FIXME: Please change number 2 to an ENUM that is more explanatory */
+	if (g_ftdm_sngss7_data.gen_config != 2) {
+			SS7_CRITICAL("General configuration FAILED!\n");
+			return 1;
+	}
+
 	/* go through all the relays channels and configure it */
 	x = 1;
 	while (x < (MAX_RELAY_CHANNELS)) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index dab2035450..59a226d738 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -213,9 +213,6 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sprintf(var, "%d", siConEvnt->cgPtyNum.natAddrInd.val);
 			sngss7_add_var(sngss7_info, "ss7_clg_nadi", var);
 
-			sprintf(var, "%d", siConEvnt->cdPtyNum.natAddrInd.val);
-			sngss7_add_var(sngss7_info, "ss7_cld_nadi", var);
-
 			/* Retrieve the Location Number if present (see ITU Q.763, 3.30) */
 			if (siConEvnt->cgPtyNum1.eh.pres) {
 				if (siConEvnt->cgPtyNum1.addrSig.pres) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index caef19af12..9bf24aada3 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -328,6 +328,7 @@ typedef struct sng_isup_ckt {
 	uint32_t		clg_nadi;
 	uint32_t		cld_nadi;
 	uint8_t			rdnis_nadi;
+	uint32_t		loc_nadi;
 
 	/* Generic Number defaults */
 	uint8_t			gn_nmbqual;			/* Number Qualifier */
@@ -835,6 +836,8 @@ ftdm_status_t copy_cdPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cd
 ftdm_status_t copy_cdPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cdPtyNum);
 ftdm_status_t copy_redirgNum_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirNum *redirgNum);
 ftdm_status_t copy_redirgNum_from_sngss7(ftdm_channel_t *ftdmchan, SiRedirNum *redirgNum);
+ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *locPtyNum);
+ftdm_status_t copy_locPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *locPtyNum);
 ftdm_status_t copy_genNmb_to_sngss7(ftdm_channel_t *ftdmchan, SiGenNum *genNmb);
 ftdm_status_t copy_genNmb_from_sngss7(ftdm_channel_t *ftdmchan, SiGenNum *genNmb);
 ftdm_status_t copy_cgPtyCat_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyCat *cgPtyCat);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index b729552092..5aed5f49a4 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -79,6 +79,9 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 		/* Calling Number information */
 		copy_cgPtyNum_to_sngss7(ftdmchan, &iam.cgPtyNum);
 
+		/* Location Number information */
+		copy_locPtyNum_to_sngss7(ftdmchan, &iam.cgPtyNum1);
+
 		/* Generic Number information */
 		copy_genNmb_to_sngss7(ftdmchan, &iam.genNmb);
 
@@ -91,12 +94,14 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 		/* Access Transport */
 		copy_accTrnspt_to_sngss7(ftdmchan, &iam.accTrnspt);
 
-		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM clg = \"%s\" (NADI=%d), cld = \"%s\" (NADI=%d)\n",
+		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM clg = \"%s\" (NADI=%d), cld = \"%s\" (NADI=%d), loc = %s (NADI=%d)\n",
 									sngss7_info->circuit->cic,
 									ftdmchan->caller_data.cid_num.digits,
 									iam.cgPtyNum.natAddrInd.val,
 									ftdmchan->caller_data.dnis.digits,
-									iam.cdPtyNum.natAddrInd.val);
+									iam.cdPtyNum.natAddrInd.val,
+									ftdmchan->caller_data.loc.digits,
+									iam.cgPtyNum1.natAddrInd.val);
 	}
 
 	sng_cc_con_request (sngss7_info->spId,
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 613ad6d95e..167de57bb8 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -225,6 +225,62 @@ ftdm_status_t copy_cdPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cdPt
 	return copy_tknStr_to_sngss7(caller_data->dnis.digits, &cdPtyNum->addrSig, &cdPtyNum->oddEven);
 }
 
+ftdm_status_t copy_locPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *locPtyNum)
+{
+	return FTDM_SUCCESS;
+}
+
+ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *locPtyNum)
+{
+        const char *val = NULL;
+        const char *loc_nadi = NULL;
+
+        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
+        ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+
+        locPtyNum->eh.pres = PRSNT_NODEF;
+        locPtyNum->natAddrInd.pres = PRSNT_NODEF;
+        locPtyNum->natAddrInd.val = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].loc_nadi;
+
+        locPtyNum->scrnInd.pres = PRSNT_NODEF;
+        val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_loc_screen_ind");
+        if (!ftdm_strlen_zero(val)) {
+                locPtyNum->scrnInd.val = atoi(val);
+        } else {
+                locPtyNum->scrnInd.val = caller_data->screen;
+        }
+        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Location Reference Code Screening Ind %d\n", locPtyNum->scrnInd.val);
+
+        locPtyNum->presRest.pres = PRSNT_NODEF;
+        val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_pres_ind");
+        if (!ftdm_strlen_zero(val)) {
+                locPtyNum->presRest.val = atoi(val);
+        } else {
+                locPtyNum->presRest.val = caller_data->pres;
+        }
+        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Calling Party Number Presentation Ind %d\n", locPtyNum->presRest.val);
+
+        locPtyNum->numPlan.pres	= PRSNT_NODEF;
+        locPtyNum->numPlan.val = 0x01;
+
+        locPtyNum->niInd.pres = PRSNT_NODEF;
+        locPtyNum->niInd.val = 0x00;
+
+		/* check if the user would like a custom NADI value for the Location Reference */
+        loc_nadi = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_loc_nadi");
+        if (!ftdm_strlen_zero(loc_nadi)) {
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Location Reference NADI value \"%s\"\n", loc_nadi);
+			locPtyNum->natAddrInd.val = atoi(loc_nadi);
+        } else {
+			locPtyNum->natAddrInd.val = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].loc_nadi;
+			locPtyNum->natAddrInd.val = 0x03;
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "No user supplied NADI value found for LOC, using \"%d\"\n", locPtyNum->natAddrInd.val);
+		}
+        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Location Reference Presentation Ind %d\n", locPtyNum->presRest.val);
+
+        return copy_tknStr_to_sngss7(caller_data->loc.digits, &locPtyNum->addrSig, &locPtyNum->oddEven);
+}
+
 ftdm_status_t copy_genNmb_to_sngss7(ftdm_channel_t *ftdmchan, SiGenNum *genNmb)
 {	
 	const char *val = NULL;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index acb29ba385..30d215a14d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -123,6 +123,7 @@ typedef struct sng_ccSpan
 	uint32_t		clg_nadi;
 	uint32_t		cld_nadi;
 	uint32_t		rdnis_nadi;
+	uint32_t		loc_nadi;
 	uint32_t		min_digits;
 	uint8_t			itx_auto_reply;
 	uint8_t			transparent_iam;
@@ -1844,6 +1845,7 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 	int						flag_clg_nadi = 0;
 	int						flag_cld_nadi = 0;
 	int						flag_rdnis_nadi = 0;
+	int						flag_loc_nadi = 0;
 	int						i;
 	int						ret;
 
@@ -1945,6 +1947,14 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 				SS7_DEBUG("Invalid parm->value for obci_bita option\n");
 			}
 		/**********************************************************************/
+		} else if (!strcasecmp(parm->var, "loc_nadi")) {
+			/* add location reference number */
+			flag_loc_nadi = 1;
+			sng_ccSpan.loc_nadi = atoi(parm->val);
+			SS7_DEBUG("Found default LOC_NADI parm->value = %d\n", sng_ccSpan.loc_nadi);
+			printf( " --- jz: we got loc nadi from XML, val = %d \n" , sng_ccSpan.loc_nadi);
+		
+		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "lpa_on_cot")) {
 		/**********************************************************************/
 			if (*parm->val == '1') {
@@ -2034,6 +2044,11 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 		sng_ccSpan.rdnis_nadi = 0x03;
 	}
 
+	if (!flag_loc_nadi) {
+		/* default the nadi value to national */
+		sng_ccSpan.loc_nadi = 0x03;
+	}
+
 	/* pull up the SSF and Switchtype from the isup interface */
 	sng_ccSpan.ssf = g_ftdm_sngss7_data.cfg.isupIntf[sng_ccSpan.isupInf].ssf;
 	sng_ccSpan.switchType = g_ftdm_sngss7_data.cfg.isupIntf[sng_ccSpan.isupInf].switchType;
@@ -2918,12 +2933,13 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 		g_ftdm_sngss7_data.cfg.isupCkt[x].ssf						= ccSpan->ssf;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].cld_nadi					= ccSpan->cld_nadi;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].clg_nadi					= ccSpan->clg_nadi;
-		g_ftdm_sngss7_data.cfg.isupCkt[x].rdnis_nadi				= ccSpan->rdnis_nadi;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].rdnis_nadi					= ccSpan->rdnis_nadi;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].loc_nadi					= ccSpan->loc_nadi;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].options					= ccSpan->options;
-		g_ftdm_sngss7_data.cfg.isupCkt[x].switchType				= ccSpan->switchType;
-		g_ftdm_sngss7_data.cfg.isupCkt[x].min_digits				= ccSpan->min_digits;
-		g_ftdm_sngss7_data.cfg.isupCkt[x].itx_auto_reply			= ccSpan->itx_auto_reply;
-		g_ftdm_sngss7_data.cfg.isupCkt[x].transparent_iam			= ccSpan->transparent_iam;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].switchType					= ccSpan->switchType;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].min_digits					= ccSpan->min_digits;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].itx_auto_reply				= ccSpan->itx_auto_reply;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].transparent_iam				= ccSpan->transparent_iam;
 
 		if (ccSpan->t3 == 0) {
 			g_ftdm_sngss7_data.cfg.isupCkt[x].t3			= 1200;
diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h
index c9c1b2e687..966e875842 100755
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@@ -351,6 +351,7 @@ typedef struct ftdm_caller_data {
 	ftdm_number_t ani; /*!< ANI (Automatic Number Identification) */
 	ftdm_number_t dnis; /*!< DNIS (Dialed Number Identification Service) */
 	ftdm_number_t rdnis; /*!< RDNIS (Redirected Dialed Number Identification Service) */
+	ftdm_number_t loc; /*!< LOC (Location Reference Code) */
 	char aniII[FTDM_DIGITS_LIMIT]; /*! ANI II */
 	uint8_t screen; /*!< Screening */
 	uint8_t pres; /*!< Presentation*/

From d79f95f2d62503d122d65706e7c47f192627b47b Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Mon, 24 Oct 2011 12:43:54 -0400
Subject: [PATCH 017/102] freetdm: * Avoid acquiring the span mutex if the
 pendingchans queue is available for use *          * FreeTDM modules using
 the old FTDM_SPAN_STATE_CHANGE flag should be updated   *          * until
 then, they are still vulnerable to deadlock situations                  *    
      * Modules pending update: (ftmod_analog, ftmod_libpri, ftmod_isdn)      
        *          * Fixes Sangoma redmine ticket #1791 0 FTDM span stop
 deadlock                  *

---
 libs/freetdm/src/ftdm_state.c                 | 13 ++++++++++---
 libs/freetdm/src/include/private/ftdm_types.h |  6 ++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libs/freetdm/src/ftdm_state.c b/libs/freetdm/src/ftdm_state.c
index 54ecde530d..d3f99f6074 100644
--- a/libs/freetdm/src/ftdm_state.c
+++ b/libs/freetdm/src/ftdm_state.c
@@ -370,12 +370,19 @@ end:
 	}
 	ftdm_set_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE);
 
-	ftdm_mutex_lock(ftdmchan->span->mutex);
-	ftdm_set_flag(ftdmchan->span, FTDM_SPAN_STATE_CHANGE);
 	if (ftdmchan->span->pendingchans) {
 		ftdm_queue_enqueue(ftdmchan->span->pendingchans, ftdmchan);
+	} else {
+		/* there is a potential deadlock here, if a signaling module is processing
+		 * state changes while the ftdm_span_stop() function is called, the signaling
+		 * thread will block until it can acquire the span lock, but the thread calling
+		 * ftdm_span_stop() which holds the span lock is waiting on the signaling thread
+		 * to finish ... The only reason to acquire the span lock is this flag, new
+		 * signaling modules should use the pendingchans queue instead of this flag,
+		 * as of today a few modules need still to be updated before we can get rid of
+		 * this flag (ie, ftmod_libpri, ftmod_isdn, ftmod_analog) */
+		ftdm_set_flag_locked(ftdmchan->span, FTDM_SPAN_STATE_CHANGE);
 	}
-	ftdm_mutex_unlock(ftdmchan->span->mutex);
 
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NONBLOCK)) {
 		/* the channel should not block waiting for state processing */
diff --git a/libs/freetdm/src/include/private/ftdm_types.h b/libs/freetdm/src/include/private/ftdm_types.h
index 2ed9fd04c5..6df25fe4d2 100755
--- a/libs/freetdm/src/include/private/ftdm_types.h
+++ b/libs/freetdm/src/include/private/ftdm_types.h
@@ -173,6 +173,12 @@ typedef enum {
 	FTDM_SPAN_SUSPENDED = (1 << 3),
 	FTDM_SPAN_IN_THREAD = (1 << 4),
 	FTDM_SPAN_STOP_THREAD = (1 << 5),
+	/*! Signaling modules set this flag to use fchan->pendingchans queue instead
+	 *  of the FTDM_SPAN_STATE_CHANGE flag to detect when there is channels with
+	 *  a state change pending in the span. If you set this member you can't rely
+	 *  on FTDM_SPAN_STATE_CHANGE anymore and must use the queue only instead. This
+	 *  is the new way of detecting state changes, new modules should always set this
+	 *  flag, the old modules still relying on FTDM_SPAN_STATE_CHANGE should be updated */
 	FTDM_SPAN_USE_CHAN_QUEUE = (1 << 6),
 	FTDM_SPAN_SUGGEST_CHAN_ID = (1 << 7),
 	FTDM_SPAN_USE_AV_RATE = (1 << 8),

From 563460ce15d333d5a9e1878ee0bf0d95458075b9 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Mon, 24 Oct 2011 13:21:15 -0400
Subject: [PATCH 018/102] freetdm: mod_freetdm - add SIP x header for
 FreeTDM-NADI value

---
 libs/freetdm/mod_freetdm/mod_freetdm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index f7b64a02a3..ae167ccef2 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1708,6 +1708,10 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-Plan", "%d", channel_caller_data->rdnis.plan);
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CPC", "%s", ftdm_calling_party_category2str(channel_caller_data->cpc));
 		
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_clg_nadi");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-NADI", "%d", var_value);
+		}
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdnis_screen_ind");
 		if (!ftdm_strlen_zero(var_value)) {

From fc997aaea4b2555b12afef00867c14c125767672 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Mon, 24 Oct 2011 19:40:45 -0400
Subject: [PATCH 019/102] freetdm: logging fixes, ss7 events sanity checks

---
 .../ftmod_sangoma_ss7_logger.c                 |  2 +-
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c | 16 +++++++++++++---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h |  2 +-
 .../ftmod_sangoma_ss7_support.c                | 18 ++++++++++++------
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c  |  4 ++--
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
index bddcd39eca..790b893a8d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
@@ -791,7 +791,7 @@ void handle_sng_relay_alarm(Pst *pst, RyMngmt *sta)
 		break;
 	/**************************************************************************/
 	case (LRY_USTA_UP): /* channel up */
-		ftdm_log(FTDM_LOG_ERROR,"[RELAY] Channel UP: tx procId %d: channel %d\n",
+		ftdm_log(FTDM_LOG_INFO,"[RELAY] Channel UP: tx procId %d: channel %d\n",
 												sta->t.usta.s.ryUpUsta.sendPid,
 												sta->t.usta.s.ryUpUsta.id);
 
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 049aa1546d..759fd2871f 100644
--- 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
@@ -1651,6 +1651,7 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 static ftdm_status_t ftdm_sangoma_ss7_stop(ftdm_span_t * span)
 {
 	/*this function is called by the FT-Core to stop this span */
+	int timeout=0;
 
 	ftdm_log (FTDM_LOG_INFO, "Stopping span %s:%u.\n", span->name,span->span_id);
 
@@ -1659,10 +1660,17 @@ static ftdm_status_t ftdm_sangoma_ss7_stop(ftdm_span_t * span)
 
 	/* wait for the thread to stop */
 	while (ftdm_test_flag (span, FTDM_SPAN_IN_THREAD)) {
-		ftdm_log (FTDM_LOG_DEBUG,"Waiting for monitor thread to end for %s:%u.\n",
+		ftdm_set_flag (span, FTDM_SPAN_STOP_THREAD);
+		ftdm_log (FTDM_LOG_DEBUG,"Waiting for monitor thread to end for %s:%u. [flags=0x%08X]\n",
 									span->name,
-									span->span_id);
-		ftdm_sleep (1);
+									span->span_id,
+									span->flags);
+		/* Wait 50ms */
+		ftdm_sleep (50);
+		timeout++;
+
+		/* timeout after 5 sec, better to crash than hang */
+		ftdm_assert_return(timeout < 100, FTDM_FALSE, "SS7 Span stop timeout!\n");
 	}
 
 	/* KONRAD FIX ME - deconfigure any circuits, links, attached to this span */
@@ -1725,12 +1733,14 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
 	/* parse the configuration and apply to the global config structure */
 	if (ftmod_ss7_parse_xml(ftdm_parameters, span)) {
 		ftdm_log (FTDM_LOG_CRIT, "Failed to parse configuration!\n");
+		ftdm_sleep (1000);
 		return FTDM_FAIL;
 	}
 
 	/* configure libsngss7 */
 	if (ft_to_sngss7_cfg_all()) {
 		ftdm_log (FTDM_LOG_CRIT, "Failed to configure LibSngSS7!\n");
+		ftdm_sleep (1000);
 		return FTDM_FAIL;
 	}
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 9bf24aada3..3fd5c6e468 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -915,7 +915,7 @@ if (ftdmchan->state == new_state) { \
 #define SS7_ERROR_CHAN(fchan, msg, args...)	ftdm_log_chan(fchan, FTDM_LOG_ERROR, msg , ##args)
 #define SS7_CTRIT_CHAN(fchan, msg, args...)	ftdm_log_chan(fchan, FTDM_LOG_CRIT, msg , ##args)
 
-#ifdef KONRAD_DEVEL
+#ifdef SS7_CODE_DEVEL
 #define SS7_DEVEL_DEBUG(a,...)   ftdm_log(FTDM_LOG_DEBUG,a,##__VA_ARGS__ );
 #else
 #define SS7_DEVEL_DEBUG(a,...)
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 167de57bb8..3c1124b3d8 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -922,11 +922,6 @@ int check_for_state_change(ftdm_channel_t *ftdmchan)
 /******************************************************************************/
 ftdm_status_t extract_chan_data(uint32_t circuit, sngss7_chan_data_t **sngss7_info, ftdm_channel_t **ftdmchan)
 {
-	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].obj == NULL) {
-		SS7_ERROR("sngss7_info is Null for circuit #%d\n", circuit);
-		return FTDM_FAIL;
-	}
-
 	if (!g_ftdm_sngss7_data.cfg.isupCkt[circuit].obj) {
 		SS7_ERROR("No ss7 info for circuit #%d\n", circuit);
 		return FTDM_FAIL;
@@ -935,10 +930,21 @@ ftdm_status_t extract_chan_data(uint32_t circuit, sngss7_chan_data_t **sngss7_in
 	*sngss7_info = g_ftdm_sngss7_data.cfg.isupCkt[circuit].obj;
 
 	if (!(*sngss7_info)->ftdmchan) {
-		SS7_ERROR("No channel for circuit #%d\n", circuit);
+		SS7_ERROR("No ftdmchan for circuit #%d\n", circuit);
 		return FTDM_FAIL;
 	}
 
+	if (!(*sngss7_info)->ftdmchan->span) {
+		SS7_CRITICAL("ftdmchan->span = NULL for circuit #%d\n",circuit);
+		return FTDM_FAIL;
+		
+	}
+	if (!(*sngss7_info)->ftdmchan->span->signal_data) {
+		SS7_CRITICAL("ftdmchan->span->signal_data = NULL for circuit #%d\n",circuit);
+		return FTDM_FAIL;
+		
+	}
+
 	*ftdmchan = (*sngss7_info)->ftdmchan;
 	return FTDM_SUCCESS;
 }
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index 30d215a14d..8edea31399 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -2877,7 +2877,7 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 					(g_ftdm_sngss7_data.cfg.isupCkt[x].chan == count)) {
 
 					/* we are processing a circuit that already exists */
-					SS7_DEBUG("Found an existing circuit %d, ccSpanId=%d, chan%d\n",
+					SS7_DEVEL_DEBUG("Found an existing circuit %d, ccSpanId=%d, chan%d\n",
 								x, 
 								ccSpan->id, 
 								count);
@@ -2886,7 +2886,7 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 					flag = 1;
 
 					/* not supporting reconfig at this time */
-					SS7_DEBUG("Not supporting ckt reconfig at this time!\n");
+					SS7_DEVEL_DEBUG("Not supporting ckt reconfig at this time!\n");
 					goto move_along;
 				} else {
 					/* this is not the droid you are looking for */

From 13e6e7bb04ac16209f0ea2ccfeac1ea63c125525 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Tue, 25 Oct 2011 17:13:07 -0400
Subject: [PATCH 020/102] freetdm: added debug ftdm_print_stack macro

---
 libs/freetdm/src/include/private/ftdm_core.h | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/libs/freetdm/src/include/private/ftdm_core.h b/libs/freetdm/src/include/private/ftdm_core.h
index 9c5c9ad468..65ffad677c 100644
--- a/libs/freetdm/src/include/private/ftdm_core.h
+++ b/libs/freetdm/src/include/private/ftdm_core.h
@@ -104,6 +104,10 @@
 #include <sys/time.h>
 #endif
 
+#ifdef __linux__
+#include <execinfo.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -220,6 +224,27 @@ extern "C" {
 
 #define ftdm_is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119)
 
+#ifdef __linux__
+#define ftdm_print_stack(level) \
+	do { \
+		void *__stacktrace[100] = { 0 }; \
+		char **__symbols = NULL; \
+		int __size = 0; \
+		int __i = 0; \
+		__size = backtrace(__stacktrace, ftdm_array_len(__stacktrace)); \
+		__symbols = backtrace_symbols(__stacktrace, __size); \
+		if (__symbols) { \
+			for (__i = 0; __i < __size; __i++) { \
+				ftdm_log(__level, "%s\n", __symbols[i]); \
+			} \
+		free(__symbols); \
+		} \
+	} while (0);
+#else
+#define ftdm_print_stack(level) ftdm_log(level, "FTDM_PRINT_STACK is not implemented in this operating system!\n");
+#endif
+
+
 #define FTDM_SPAN_IS_BRI(x)	((x)->trunk_type == FTDM_TRUNK_BRI || (x)->trunk_type == FTDM_TRUNK_BRI_PTMP)
 /*!
   \brief Copy flags from one arbitrary object to another

From 1d3d1658223474eb12d8086e1006e19c0b9112fa Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Tue, 25 Oct 2011 18:05:41 -0400
Subject: [PATCH 021/102] freetdm: ftdm_running checks on handle, implemented
 no wait block

---
 .../ftmod_sangoma_ss7_cntrl.c                 | 36 ++--------
 .../ftmod_sangoma_ss7_handle.c                | 65 +++++++++++++++++++
 .../ftmod_sangoma_ss7_main.h                  |  4 +-
 .../ftmod_sangoma_ss7_relay.c                 |  2 +-
 4 files changed, 75 insertions(+), 32 deletions(-)

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 b0a2163fdd..d57526b267 100644
--- 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
@@ -48,35 +48,7 @@ static int ftmod_ss7_enable_isap(int suId);
 static int ftmod_ss7_enable_nsap(int suId);
 static int ftmod_ss7_enable_mtpLinkSet(int lnkSetId);
 
-int ftmod_ss7_inhibit_mtp3link(uint32_t id);
-int ftmod_ss7_uninhibit_mtp3link(uint32_t id);
 
-int ftmod_ss7_bind_mtp3link(uint32_t id);
-int ftmod_ss7_unbind_mtp3link(uint32_t id);
-int ftmod_ss7_activate_mtp3link(uint32_t id);
-int ftmod_ss7_deactivate_mtp3link(uint32_t id);
-int ftmod_ss7_deactivate2_mtp3link(uint32_t id);
-
-int ftmod_ss7_activate_mtplinkSet(uint32_t id);
-int ftmod_ss7_deactivate_mtplinkSet(uint32_t id);
-int ftmod_ss7_deactivate2_mtplinkSet(uint32_t id);
-
-int ftmod_ss7_lpo_mtp3link(uint32_t id);
-int ftmod_ss7_lpr_mtp3link(uint32_t id);
-
-int ftmod_ss7_shutdown_isup(void);
-int ftmod_ss7_shutdown_mtp3(void);
-int ftmod_ss7_shutdown_mtp2(void);
-int ftmod_ss7_shutdown_relay(void);
-int ftmod_ss7_disable_relay_channel(uint32_t chanId);
-
-int ftmod_ss7_disable_grp_mtp3Link(uint32_t procId);
-int ftmod_ss7_enable_grp_mtp3Link(uint32_t procId);
-
-int ftmod_ss7_disable_grp_mtp2Link(uint32_t procId);
-
-int ftmod_ss7_block_isup_ckt(uint32_t cktId);
-int ftmod_ss7_unblock_isup_ckt(uint32_t cktId);
 /******************************************************************************/
 
 /* FUNCTIONS ******************************************************************/
@@ -848,7 +820,7 @@ int ftmod_ss7_disable_grp_mtp2Link(uint32_t procId)
 }
 
 /******************************************************************************/
-int ftmod_ss7_block_isup_ckt(uint32_t cktId)
+int __ftmod_ss7_block_isup_ckt(uint32_t cktId, ftdm_bool_t wait)
 {
 	SiMngmt cntrl;
 	Pst pst;
@@ -876,7 +848,11 @@ int ftmod_ss7_block_isup_ckt(uint32_t cktId)
 	cntrl.t.cntrl.action					= ADISIMM;		/* block via BLO */
 	cntrl.t.cntrl.subAction					= SAELMNT;		/* specificed element */
 
-	return (sng_cntrl_isup(&pst, &cntrl));
+	if (wait == FTDM_TRUE) {
+		return (sng_cntrl_isup(&pst, &cntrl));
+	} else {
+		return (sng_cntrl_isup_nowait(&pst, &cntrl));
+	}
 }
 
 /******************************************************************************/
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 59a226d738..8d01a6d97e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -87,6 +87,8 @@ ftdm_status_t handle_olm_msg(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 /* FUNCTIONS ******************************************************************/
 
+#define ftdm_running_return(var) if (!ftdm_running()) { SS7_ERROR("Error: ftdm_running is not set! Ignoring\n"); return var; } 
+
 ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiConEvnt *siConEvnt)
 {
 	SS7_FUNC_TRACE_ENTER(__FUNCTION__);
@@ -97,6 +99,8 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	memset(var, '\0', sizeof(var));
 
+	ftdm_running_return(FTDM_FAIL);
+
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
 		SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
@@ -341,6 +345,8 @@ ftdm_status_t handle_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -596,6 +602,8 @@ ftdm_status_t handle_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -671,6 +679,8 @@ ftdm_status_t handle_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -793,6 +803,8 @@ ftdm_status_t handle_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -844,6 +856,8 @@ ftdm_status_t handle_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -871,6 +885,8 @@ ftdm_status_t handle_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -898,6 +914,8 @@ ftdm_status_t handle_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -925,6 +943,8 @@ ftdm_status_t handle_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
 	
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -952,6 +972,8 @@ ftdm_status_t handle_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
 	
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -979,6 +1001,8 @@ ftdm_status_t handle_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
 	
 	sngss7_chan_data_t  *sngss7_info ;
 	ftdm_channel_t	  *ftdmchan;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
@@ -1003,6 +1027,8 @@ ftdm_status_t handle_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
 ftdm_status_t handle_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
 	SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is active on our side otherwise move to the next circuit */
 	if (!sngss7_test_flag(&g_ftdm_sngss7_data.cfg.isupCkt[circuit], SNGSS7_ACTIVE)) {
@@ -1203,6 +1229,8 @@ ftdm_status_t handle_reattempt(uint32_t suInstId, uint32_t spInstId, uint32_t ci
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1266,6 +1294,8 @@ ftdm_status_t handle_pause(uint32_t suInstId, uint32_t spInstId, uint32_t circui
 	int				 infId;
 	int				 i;
 	
+	ftdm_running_return(FTDM_FAIL);
+	
 	/* extract the affected infId from the circuit structure */
 	infId = g_ftdm_sngss7_data.cfg.isupCkt[circuit].infId;
 
@@ -1330,6 +1360,8 @@ ftdm_status_t handle_resume(uint32_t suInstId, uint32_t spInstId, uint32_t circu
 	ftdm_channel_t	  *ftdmchan = NULL;
 	int				 infId;
 	int				 i;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* extract the affect infId from the circuit structure */
 	infId = g_ftdm_sngss7_data.cfg.isupCkt[circuit].infId;
@@ -1394,6 +1426,8 @@ ftdm_status_t handle_cot_start(uint32_t suInstId, uint32_t spInstId, uint32_t ci
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1449,6 +1483,8 @@ ftdm_status_t handle_cot_stop(uint32_t suInstId, uint32_t spInstId, uint32_t cir
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1494,6 +1530,8 @@ ftdm_status_t handle_cot(uint32_t suInstId, uint32_t spInstId, uint32_t circuit,
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1562,6 +1600,8 @@ ftdm_status_t handle_blo_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1612,6 +1652,8 @@ ftdm_status_t handle_blo_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1653,6 +1695,8 @@ ftdm_status_t handle_ubl_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1741,6 +1785,8 @@ ftdm_status_t handle_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1800,6 +1846,8 @@ ftdm_status_t handle_local_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1858,6 +1906,8 @@ ftdm_status_t handle_rsc_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -1948,6 +1998,8 @@ ftdm_status_t handle_grs_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	ftdm_channel_t *ftdmchan = NULL;
 	sngss7_span_data_t *sngss7_span = NULL;
 	int range = 0;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -2005,6 +2057,8 @@ ftdm_status_t handle_grs_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	ftdm_channel_t *ftdmchan = NULL;
 	sngss7_span_data_t *sngss7_span = NULL; 
 	int range = 0;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -2069,6 +2123,8 @@ ftdm_status_t handle_local_blk(uint32_t suInstId, uint32_t spInstId, uint32_t ci
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -2119,6 +2175,8 @@ ftdm_status_t handle_local_ubl(uint32_t suInstId, uint32_t spInstId, uint32_t ci
 
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	ftdm_channel_t	  *ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -2174,6 +2232,7 @@ ftdm_status_t handle_ucic(uint32_t suInstId, uint32_t spInstId, uint32_t circuit
 	sngss7_span_data_t *sngss7_span = NULL;
 	ftdm_channel_t *ftdmchan = NULL;
 
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
@@ -2255,6 +2314,8 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	int					bit = 0;
 	int 				x;
 
+	ftdm_running_return(FTDM_FAIL);
+
 	memset(&status[0], '\0', sizeof(status));
 
 	/* confirm that the circuit is voice channel */
@@ -2401,6 +2462,8 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	int					bit = 0;
 	int 				x;
 	ftdm_sigmsg_t 		sigev;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	memset(&sigev, 0, sizeof (sigev));
 	memset(&status[0], '\0', sizeof(status));
@@ -2538,6 +2601,8 @@ ftdm_status_t handle_olm_msg(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	sngss7_chan_data_t	*sngss7_info = NULL;
 	ftdm_channel_t		*ftdmchan = NULL;
+	
+	ftdm_running_return(FTDM_FAIL);
 
 	/* confirm that the circuit is voice channel */
 	if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 3fd5c6e468..cdef894232 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -732,7 +732,9 @@ int ftmod_ss7_enable_grp_mtp3Link(uint32_t procId);
 
 int ftmod_ss7_disable_grp_mtp2Link(uint32_t procId);
 
-int ftmod_ss7_block_isup_ckt(uint32_t cktId);
+#define ftmod_ss7_block_isup_ckt(x) 		__ftmod_ss7_block_isup_ckt(x,FTDM_TRUE)
+#define ftmod_ss7_block_isup_ckt_nowait(x) 	__ftmod_ss7_block_isup_ckt(x,FTDM_FALSE)
+int __ftmod_ss7_block_isup_ckt(uint32_t cktId, ftdm_bool_t wait);
 int ftmod_ss7_unblock_isup_ckt(uint32_t cktId);
 
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
index 1d85dfffbb..f58aad4ca7 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
@@ -248,7 +248,7 @@ ftdm_status_t block_all_ckts_for_relay(uint32_t procId)
 		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type == SNG_CKT_VOICE) {
 
 			/* send a block request via stack manager */
-			ret = ftmod_ss7_block_isup_ckt(g_ftdm_sngss7_data.cfg.isupCkt[x].id);
+			ret = ftmod_ss7_block_isup_ckt_nowait(g_ftdm_sngss7_data.cfg.isupCkt[x].id);
 			if (ret) {
 				SS7_INFO("Successfully BLOcked CIC:%d(ckt:%d) due to Relay failure\n", 
 							g_ftdm_sngss7_data.cfg.isupCkt[x].cic,

From 7f746b4298a5b70e461ac64ce4064d463982aba0 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Tue, 25 Oct 2011 18:36:37 -0400
Subject: [PATCH 022/102] freetdm: added nowait mtp3 commands if proc ids dont
 match

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 d57526b267..1fcf1fcfbe 100644
--- 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
@@ -751,7 +751,14 @@ int ftmod_ss7_disable_grp_mtp3Link(uint32_t procId)
 	cntrl.t.cntrl.action		= AUBND_DIS;		/* disable and unbind */
 	cntrl.t.cntrl.subAction		= SAGR_DSTPROCID;			/* specificed element */
 
-	return (sng_cntrl_mtp3(&pst, &cntrl));
+	if (g_ftdm_sngss7_data.cfg.procId == procId) {
+		SS7_DEBUG("Executing MTP3 cntrl command local pid =%i\n",procId);
+		return (sng_cntrl_mtp3(&pst, &cntrl));
+	} else {
+		SS7_WARN("Executing MTP3 cntrl command different local=%i target=%i\n",
+				g_ftdm_sngss7_data.cfg.procId,procId);
+		return (sng_cntrl_mtp3_nowait(&pst, &cntrl));
+	}
 
 }
 

From f8ae7e7464254d03742595c7828aab14e07ffc16 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Tue, 25 Oct 2011 18:44:28 -0400
Subject: [PATCH 023/102] freetdm: ftmod_ss7_enable_grp_mtp3Link - wait no wait
 based on proc

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 1fcf1fcfbe..c5aca9aa73 100644
--- 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
@@ -790,7 +790,14 @@ int ftmod_ss7_enable_grp_mtp3Link(uint32_t procId)
 	cntrl.t.cntrl.action		= ABND_ENA;			/* bind and enable */
 	cntrl.t.cntrl.subAction		= SAGR_DSTPROCID;			/* specificed element */
 
-	return (sng_cntrl_mtp3(&pst, &cntrl));
+	if (g_ftdm_sngss7_data.cfg.procId == procId) {
+		SS7_DEBUG("Executing MTP3 cntrl command local pid =%i\n",procId);
+		return (sng_cntrl_mtp3(&pst, &cntrl));
+	} else {
+		SS7_WARN("Executing MTP3 cntrl command different local=%i target=%i\n",
+				g_ftdm_sngss7_data.cfg.procId,procId);
+		return (sng_cntrl_mtp3_nowait(&pst, &cntrl));
+	}
 
 }
 

From 982bcf41460ac39150485288ab750ba5f28cf56d Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Tue, 25 Oct 2011 19:04:50 -0400
Subject: [PATCH 024/102] freetdm: added debugging - changed order of
 block/unblock

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
index f58aad4ca7..a96dae5cdd 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
@@ -42,8 +42,6 @@
 /******************************************************************************/
 
 /* PROTOTYPES *****************************************************************/
-ftdm_status_t handle_relay_connect(RyMngmt *sta);
-ftdm_status_t handle_relay_disconnect(RyMngmt *sta);
 
 /*static ftdm_status_t enable_all_ckts_for_relay(void);*/
 static ftdm_status_t reconfig_all_ckts_for_relay(void);
@@ -84,23 +82,24 @@ ftdm_status_t handle_relay_connect(RyMngmt *sta)
 /******************************************************************************/
 ftdm_status_t handle_relay_disconnect_on_error(RyMngmt *sta)
 {
+	SS7_DEBUG("SS7 relay disconnect on error\n");
 
 	/* check which procId is in error, if it is 1, disable the ckts */
 	if (sta->t.usta.s.ryErrUsta.errPid == 1 ) {
-		/* we've lost the server, bring down the mtp2 links */
-		disble_all_mtp2_sigs_for_relay();
-
 		/* we've lost the server, bring the sig status down on all ckts */
 		disable_all_ckts_for_relay();
+		
+		/* we've lost the server, bring down the mtp2 links */
+		disble_all_mtp2_sigs_for_relay();
 	}
 
 	/* check if the channel is a server, means we just lost a MGW */
 	if (g_ftdm_sngss7_data.cfg.relay[sta->t.usta.s.ryErrUsta.errPid].type == LRY_CT_TCP_SERVER) {
-		/* we've lost the client, bring down all mtp3 links for this procId */
-		disable_all_sigs_for_relay(sta->t.usta.s.ryErrUsta.errPid);
-
 		/* we've lost the client, bring down all the ckts for this procId */
 		block_all_ckts_for_relay(sta->t.usta.s.ryErrUsta.errPid);
+		
+		/* we've lost the client, bring down all mtp3 links for this procId */
+		disable_all_sigs_for_relay(sta->t.usta.s.ryErrUsta.errPid);
 	}
 
 	return FTDM_SUCCESS;
@@ -110,6 +109,8 @@ ftdm_status_t handle_relay_disconnect_on_error(RyMngmt *sta)
 ftdm_status_t handle_relay_disconnect_on_down(RyMngmt *sta)
 {
 
+	SS7_DEBUG("SS7 relay disconnect on down\n");
+
 	/* check if the channel is a server, means we just lost a MGW */
 	if (g_ftdm_sngss7_data.cfg.relay[sta->t.usta.s.ryUpUsta.id].type == LRY_CT_TCP_SERVER) {
 		block_all_ckts_for_relay(sta->t.usta.s.ryUpUsta.id);

From 79c1ed7dc15154fc1c32087ade26766bec82d825 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Tue, 25 Oct 2011 20:29:22 -0400
Subject: [PATCH 025/102] freetdm: fixed reset tx after unequiped cic; reset
 sent flag was not being cleared

---
 .../freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c | 1 +
 1 file changed, 1 insertion(+)

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 759fd2871f..4f0d021228 100644
--- 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
@@ -1410,6 +1410,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_UNBLK);
 
 			/* throw the channel into reset to sync states */
+			clear_tx_rsc_flags(sngss7_info);
 			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
 			/* bring the channel into restart again */

From 859d3b0ed5fec36c667d8bddfa3571fe74d6b3df Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 26 Oct 2011 13:05:12 -0400
Subject: [PATCH 026/102] Added GRS on startup by default

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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 4f0d021228..ed076925b8 100644
--- 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
@@ -1568,6 +1568,7 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 	sngss7_span_data_t 	*sngss7_span = NULL;
 	sng_isup_inf_t		*sngss7_intf = NULL;
 	int 				x;
+	int					first_channel=0;
 
 
 	SS7_INFO ("Starting span %s:%u.\n", span->name, span->span_id);
@@ -1612,13 +1613,15 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 			sngss7_set_ckt_flag(sngss7_info, FLAG_INFID_RESUME);
 		}
-#if 0
+#if 1
 		/* throw the grp reset flag */
 		sngss7_set_ckt_flag(sngss7_info, FLAG_GRP_RESET_TX);
-		if (x == 1) {
-			sngss7_set_flag(sngss7_info, FLAG_GRP_RESET_BASE);
-			sngss7_span->tx_grs.circuit = sngss7_info->circuit->id;
-			sngss7_span->tx_grs.range = span->chan_count -1;
+		if (first_channel == 0) {
+			sngss7_chan_data_t *cinfo = ftdmchan->call_data;
+			sngss7_set_ckt_flag(sngss7_info, FLAG_GRP_RESET_BASE);
+			cinfo->tx_grs.circuit = sngss7_info->circuit->id;
+			cinfo->tx_grs.range = span->chan_count -1;
+			first_channel=1;
 		}
 #else
 		/* throw the channel into reset */

From fd6d18d56c7a3b026eb670d307fe6020f392a8ae Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 26 Oct 2011 14:33:28 -0400
Subject: [PATCH 027/102] freetdm: Fixed GRA - added group reset by default on
 startup

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c |  3 +++
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c   | 16 +++++++++++++++-
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c    |  2 --
 .../ftmod_sangoma_ss7_support.c                  |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 8d01a6d97e..3733a619a7 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -2271,6 +2271,8 @@ ftdm_status_t handle_ucic(uint32_t suInstId, uint32_t spInstId, uint32_t circuit
 			cinfo->ucic.range = cinfo->tx_grs.range;
 			ftdm_set_flag(sngss7_span, SNGSS7_UCIC_PENDING);
 
+			SS7_WARN("Set span SNGSS7_UCIC_PENDING for ISUP circuit = %d!\n", circuit);
+
 			ftdm_channel_unlock(fchan);
 
 			goto done;
@@ -2283,6 +2285,7 @@ ftdm_status_t handle_ucic(uint32_t suInstId, uint32_t spInstId, uint32_t circuit
 	ftdm_mutex_lock(ftdmchan->mutex);
 
 	/* throw the ckt block flag */
+	SS7_DEBUG("Set FLAG_CKT_UCIC_BLOCK for ISUP circuit = %d!\n", circuit);
 	sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK);
 
 	/* set the channel to suspended state */
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 ed076925b8..2cb59ca36e 100644
--- 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
@@ -1024,6 +1024,10 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		break;
 	/**************************************************************************/
 	case FTDM_CHANNEL_STATE_RESTART:	/* CICs needs a Reset */
+		  
+		SS7_DEBUG_CHAN(ftdmchan,"RESTART: Current flags: ckt=0x%X, blk=0x%X\n", 
+									sngss7_info->ckt_flags,
+									sngss7_info->blk_flags);
 
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK)) {
 			if ((sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_RX)) ||
@@ -1139,7 +1143,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 	/**************************************************************************/
 	case FTDM_CHANNEL_STATE_SUSPENDED:	/* circuit has been blocked */
 
-		  SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X\n", 
+		  SS7_DEBUG_CHAN(ftdmchan,"SUSPEND: Current flags: ckt=0x%X, blk=0x%X\n", 
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
 
@@ -1256,6 +1260,8 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
    								   | FLAG_CKT_MN_BLOCK_RX_DN
    								   | FLAG_GRP_MN_BLOCK_RX
    								   | FLAG_GRP_MN_BLOCK_RX_DN
+								   | FLAG_CKT_UCIC_BLOCK
+								   | FLAG_CKT_UCIC_BLOCK_DN
    								   )
    						      )
 			) {
@@ -1410,6 +1416,14 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_UNBLK);
 
 			/* throw the channel into reset to sync states */
+			
+			clear_rx_grs_flags(sngss7_info);
+			clear_rx_grs_data(sngss7_info);
+			clear_tx_grs_flags(sngss7_info);
+			clear_tx_grs_data(sngss7_info);
+			clear_rx_rsc_flags(sngss7_info);
+			clear_tx_rsc_flags(sngss7_info);
+
 			clear_tx_rsc_flags(sngss7_info);
 			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 5aed5f49a4..4c7bbf084c 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -523,8 +523,6 @@ void ft_to_sngss7_grs (ftdm_channel_t *fchan)
 		cinfo->circuit->cic,
 		(cinfo->circuit->cic + cinfo->tx_grs.range));
 
-	memset(&cinfo->tx_grs, 0, sizeof(cinfo->tx_grs));
-
 	sngss7_set_ckt_flag(cinfo, FLAG_GRP_RESET_SENT);
 
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 3c1124b3d8..7b53a18eba 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -1428,7 +1428,7 @@ ftdm_status_t process_span_ucic(ftdm_span_t *ftdmspan)
 			/* lock the channel */
 			ftdm_channel_lock(ftdmchan);
 
-			SS7_INFO_CHAN(ftdmchan, "[CIC:%d]Rx UCIC\n", sngss7_info->circuit->cic);
+			SS7_INFO_CHAN(ftdmchan, "[CIC:%d]Rx Span UCIC\n", sngss7_info->circuit->cic);
 
 			/* clear up any pending state changes */
 			while (ftdm_test_flag (ftdmchan, FTDM_CHANNEL_STATE_CHANGE)) {

From de2836e76a0f9f925bda95db3782a49e010cff1c Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 26 Oct 2011 14:57:27 -0400
Subject: [PATCH 028/102] freetdm: Its possible to get HW ALARM clear even
 though we never got the initial  alarm.          Only send out an unblock if
 block was sent from hw alarm and there are no          maintenance blocks
 pending.

---
 .../ftmod_sangoma_ss7_main.c                  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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 2cb59ca36e..177af00733 100644
--- 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
@@ -1247,6 +1247,25 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_TX)) {
 			SS7_DEBUG_CHAN(ftdmchan, "Processing FLAG_GRP_HW_UNBLK_TX flag %s\n", "");
 
+			if (sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX) &&
+			     sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX_DN)) {
+				
+				/* Block was sent out we must send an unblock */
+				/* Do not send an unblock if we also have Management block
+				   enabled */
+   			
+				if (!sngss7_test_ckt_blk_flag(sngss7_info, ( FLAG_CKT_MN_BLOCK_TX
+   								   | FLAG_CKT_MN_BLOCK_TX
+   								   | FLAG_GRP_MN_BLOCK_TX
+   								   | FLAG_GRP_MN_BLOCK_TX_DN
+   								   )
+   						      )
+				) {
+					ft_to_sngss7_ubl(ftdmchan);
+				}	
+				
+			}
+
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX);
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX_DN);
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_TX);

From 0e2b85ddf4582f0d702035cd89fcbe0d64e20a18 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 26 Oct 2011 16:09:32 -0400
Subject: [PATCH 029/102] freetdm: Add debugging

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c     | 5 +++++
 1 file changed, 5 insertions(+)

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 177af00733..dc8ed7dbc2 100644
--- 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
@@ -289,6 +289,8 @@ static void handle_hw_alarm(ftdm_event_t *e)
 	int x = 0;
 
 	ftdm_assert(e != NULL, "Null event!\n");
+					
+	SS7_DEBUG("handle_hw_alarm event\n");
 
 	for (x = (g_ftdm_sngss7_data.cfg.procId * MAX_CIC_MAP_LENGTH) + 1; g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0; x++) {
 		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type == SNG_CKT_VOICE) {
@@ -298,11 +300,13 @@ static void handle_hw_alarm(ftdm_event_t *e)
 			if (e->channel->span_id == ftdmchan->physical_span_id && 
 			    e->channel->chan_id == ftdmchan->physical_chan_id) {
 				if (e->enum_id == FTDM_OOB_ALARM_TRAP) {
+					SS7_DEBUG("handle_hw_alarm: Set \n");
 					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
 					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 					}
 				} else {
+					SS7_DEBUG("handle_hw_alarm: Clear\n");
 					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
 					sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
 					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
@@ -363,6 +367,7 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 						sngss7_clear_ckt_blk_flag( ss7_info, FLAG_GRP_HW_BLOCK_TX );
 						sngss7_clear_ckt_blk_flag( ss7_info, FLAG_GRP_HW_BLOCK_TX_DN );
 						sngss7_set_ckt_blk_flag (ss7_info, FLAG_GRP_HW_UNBLK_TX);
+						SS7_DEBUG("b_alarm_test FLAG_GRP_HW_UNBLK_TX\n");
 					}
 				}
 				usleep(50);

From d0188836f8717da029d7c0b4072cadbba66e4786 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 26 Oct 2011 16:17:11 -0400
Subject: [PATCH 030/102] freetdm: Do not set hw block clear flag on startup if
 port is already up

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 dc8ed7dbc2..fbe5889615 100644
--- 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
@@ -307,10 +307,12 @@ static void handle_hw_alarm(ftdm_event_t *e)
 					}
 				} else {
 					SS7_DEBUG("handle_hw_alarm: Clear\n");
-					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
-					sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
-					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
-						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+					if (sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX)) {
+						sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
+						sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
+						if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
+							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+						}
 					}
 				}
 			}

From 44895d738d23a8b46550a10a1b83abf50b8b0713 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 26 Oct 2011 16:34:56 -0400
Subject: [PATCH 031/102] freetdm: On alarm off event make sure that we had
 alarm on before issuing HW UNBLOCK

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 fbe5889615..37be742793 100644
--- 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
@@ -366,10 +366,12 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 					if (ftdmchan->alarm_flags != 0) { /* we'll send out block */
 						sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX );
 					}  else { /* we'll send out reset */
-						sngss7_clear_ckt_blk_flag( ss7_info, FLAG_GRP_HW_BLOCK_TX );
-						sngss7_clear_ckt_blk_flag( ss7_info, FLAG_GRP_HW_BLOCK_TX_DN );
-						sngss7_set_ckt_blk_flag (ss7_info, FLAG_GRP_HW_UNBLK_TX);
-						SS7_DEBUG("b_alarm_test FLAG_GRP_HW_UNBLK_TX\n");
+						if (sngss7_test_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX )) {
+							sngss7_clear_ckt_blk_flag( ss7_info, FLAG_GRP_HW_BLOCK_TX );
+							sngss7_clear_ckt_blk_flag( ss7_info, FLAG_GRP_HW_BLOCK_TX_DN );
+							sngss7_set_ckt_blk_flag (ss7_info, FLAG_GRP_HW_UNBLK_TX);
+							SS7_DEBUG("b_alarm_test FLAG_GRP_HW_UNBLK_TX\n");
+						}
 					}
 				}
 				usleep(50);

From d442c188eb97524ec027c21ee7112ce599dd3c7a Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 26 Oct 2011 16:37:44 -0400
Subject: [PATCH 032/102] freetdm: More debugging

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 37be742793..da37f485c3 100644
--- 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
@@ -300,7 +300,7 @@ static void handle_hw_alarm(ftdm_event_t *e)
 			if (e->channel->span_id == ftdmchan->physical_span_id && 
 			    e->channel->chan_id == ftdmchan->physical_chan_id) {
 				if (e->enum_id == FTDM_OOB_ALARM_TRAP) {
-					SS7_DEBUG("handle_hw_alarm: Set \n");
+					SS7_DEBUG("handle_hw_alarm: Set FLAG_GRP_HW_BLOCK_TX\n");
 					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
 					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
@@ -310,6 +310,7 @@ static void handle_hw_alarm(ftdm_event_t *e)
 					if (sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX)) {
 						sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
 						sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
+						SS7_DEBUG("handle_hw_alarm: Setting FLAG_GRP_HW_BLOCK_TX\n");
 						if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 						}

From 08768608e66e28ea0398204f5b58a8006e8e8737 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 26 Oct 2011 16:56:47 -0400
Subject: [PATCH 033/102] freetdm: on handle alarm must check TRAP or CLEAR
 cannot use default case

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 da37f485c3..9a7f36792f 100644
--- 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
@@ -305,12 +305,12 @@ static void handle_hw_alarm(ftdm_event_t *e)
 					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 					}
-				} else {
+				} else if (e->enum_id == FTDM_OOB_ALARM_CLEAR) {
 					SS7_DEBUG("handle_hw_alarm: Clear\n");
 					if (sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX)) {
 						sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
 						sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
-						SS7_DEBUG("handle_hw_alarm: Setting FLAG_GRP_HW_BLOCK_TX\n");
+						SS7_DEBUG("handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX\n");
 						if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 						}

From acfdddabbb32935da98c5acebad778eba408ed06 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 28 Oct 2011 09:35:49 -0400
Subject: [PATCH 034/102] freetdm: ss7 - add china switchtype to the
 configuration options

---
 libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index 30d215a14d..3807595183 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -62,6 +62,7 @@ sng_switch_type_t sng_switch_type_map[] =
 	{ 1, "india"  , LSI_SW_INDIA   , LSI_SW_INDIA   },
 	{ 1, "uk"     , LSI_SW_UK      , LSI_SW_UK      },
 	{ 1, "russia" , LSI_SW_RUSSIA  , LSI_SW_RUSSIA  },
+	{ 1, "china"  , LSI_SW_CHINA   , LSI_SW_CHINA   },
 	{ 0, "", 0, 0 },
 };
 

From c98d8b49d93eb9a8a203417d8574d13ccf059ab8 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Mon, 31 Oct 2011 23:56:39 -0400
Subject: [PATCH 035/102] freetdm: Default to individual reset not GRS

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9a7f36792f..2cc723d618 100644
--- 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
@@ -1656,7 +1656,7 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 			sngss7_set_ckt_flag(sngss7_info, FLAG_INFID_RESUME);
 		}
-#if 1
+#if 0
 		/* throw the grp reset flag */
 		sngss7_set_ckt_flag(sngss7_info, FLAG_GRP_RESET_TX);
 		if (first_channel == 0) {

From 429b2944e53f5853b1ca411a093261d215cd149a Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Mon, 31 Oct 2011 23:57:45 -0400
Subject: [PATCH 036/102] freetdm: reset to reset not GRS - take2

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 2cc723d618..bb909488d4 100644
--- 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
@@ -1610,8 +1610,10 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 	sngss7_chan_data_t	*sngss7_info = NULL;
 	sngss7_span_data_t 	*sngss7_span = NULL;
 	sng_isup_inf_t		*sngss7_intf = NULL;
-	int 				x;
-	int					first_channel=0;
+	int 			x;
+	int			first_channel;
+
+	first_channel=0;
 
 
 	SS7_INFO ("Starting span %s:%u.\n", span->name, span->span_id);

From 953cd77f956415e8905c067a3cc1e0a81cf32c99 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 2 Nov 2011 20:53:14 -0400
Subject: [PATCH 037/102] freetdm: Fixed blocks/unblocks resets. Performed
 conformance tests          Fixed hw alarm handling: physical ids were not
 used which caused alarms          read wrong.          Tested sip hold       
   Group blocks/unblock          Group reset          Link down-> block ->
 unblock          FS start with link down then link up          FS start with
 link up, take link down and up -> make incoming call

---
 .../ftmod_sangoma_ss7_main.c                  | 132 +++++++++---------
 .../ftmod_sangoma_ss7_main.h                  |  16 +++
 2 files changed, 84 insertions(+), 64 deletions(-)

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 bb909488d4..1453581214 100644
--- 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
@@ -290,15 +290,16 @@ static void handle_hw_alarm(ftdm_event_t *e)
 
 	ftdm_assert(e != NULL, "Null event!\n");
 					
-	SS7_DEBUG("handle_hw_alarm event\n");
+	SS7_DEBUG("handle_hw_alarm event [%d/%d]\n",e->channel->physical_span_id,e->channel->physical_chan_id);
 
 	for (x = (g_ftdm_sngss7_data.cfg.procId * MAX_CIC_MAP_LENGTH) + 1; g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0; x++) {
 		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type == SNG_CKT_VOICE) {
 			ss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
 			ftdmchan = ss7_info->ftdmchan;
 			
-			if (e->channel->span_id == ftdmchan->physical_span_id && 
-			    e->channel->chan_id == ftdmchan->physical_chan_id) {
+			if (e->channel->physical_span_id == ftdmchan->physical_span_id && 
+			    e->channel->physical_chan_id == ftdmchan->physical_chan_id) {
+				SS7_DEBUG("handle_hw_alarm: span=%i chan=%i ckt=%i x=%i\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id,g_ftdm_sngss7_data.cfg.isupCkt[x].id,x);
 				if (e->enum_id == FTDM_OOB_ALARM_TRAP) {
 					SS7_DEBUG("handle_hw_alarm: Set FLAG_GRP_HW_BLOCK_TX\n");
 					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
@@ -307,13 +308,10 @@ static void handle_hw_alarm(ftdm_event_t *e)
 					}
 				} else if (e->enum_id == FTDM_OOB_ALARM_CLEAR) {
 					SS7_DEBUG("handle_hw_alarm: Clear\n");
-					if (sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX)) {
-						sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
-						sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
-						SS7_DEBUG("handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX\n");
-						if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
-							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
-						}
+					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
+					SS7_DEBUG("handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX\n");
+					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
+						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 					}
 				}
 			}
@@ -963,16 +961,12 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				!(sngss7_test_ckt_flag (sngss7_info, FLAG_RESET_RX)) &&
 				!(sngss7_test_ckt_flag (sngss7_info, FLAG_GRP_RESET_TX)) &&
 				!(sngss7_test_ckt_flag (sngss7_info, FLAG_GRP_RESET_RX))) {
+		  
+				SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X\n", 
+									sngss7_info->ckt_flags,
+									sngss7_info->blk_flags);
 
-				/* now check if there is an active block */
-				if (!(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX)) &&
-					!(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX)) &&
-					!(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX)) &&
-					!(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_RX)) &&
-					!(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX)) &&
-					!(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX)) &&
-					!(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_MN_BLOCK_TX))) {
-				
+				if (sngss7_channel_status_clear(sngss7_info)) {
 					/* check if the sig status is down, and bring it up if it isn't */
 					if (!ftdm_test_flag (ftdmchan, FTDM_CHANNEL_SIG_UP)) {
 						SS7_DEBUG_CHAN(ftdmchan,"All reset flags cleared %s\n", "");
@@ -1038,6 +1032,13 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		SS7_DEBUG_CHAN(ftdmchan,"RESTART: Current flags: ckt=0x%X, blk=0x%X\n", 
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
+	
+#if 0	
+		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_TX) && sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_RESUME)) {
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+			break;
+		}
+#endif
 
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK)) {
 			if ((sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_RX)) ||
@@ -1169,13 +1170,15 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 
 			/* if there are any resets present */
-			if ((sngss7_test_ckt_flag (sngss7_info, FLAG_RESET_TX)) ||
-				(sngss7_test_ckt_flag (sngss7_info, FLAG_RESET_RX)) ||
-				(sngss7_test_ckt_flag (sngss7_info, FLAG_GRP_RESET_TX)) ||
-				(sngss7_test_ckt_flag (sngss7_info, FLAG_GRP_RESET_RX))) {
-
+			if (!sngss7_channel_status_clear(sngss7_info)) {
 				/* don't bring up the sig status but also move to reset */
-				goto suspend_goto_restart;
+				if (!sngss7_reset_status_clear(sngss7_info)) {
+					goto suspend_goto_restart;
+				} else if (!sngss7_block_status_clear(sngss7_info)) {
+					/* Do nothing just go and handle blocks */
+				} else {
+					goto suspend_goto_restart;
+				}
 			} else {
 				/* bring the sig status back up */
 				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
@@ -1190,6 +1193,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				/* bring the sig status down */
 				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_DOWN);
 			}
+
+			/* Wait for RESUME */
+			goto suspend_goto_last;
 		} /* if (sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED)) { */
 
 		/**********************************************************************/
@@ -1221,14 +1227,17 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* clear the unblock flag */
 			sngss7_clear_ckt_blk_flag (sngss7_info, FLAG_CKT_MN_UNBLK_RX);
 
+		    SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X\n", 
+									sngss7_info->ckt_flags,
+									sngss7_info->blk_flags);
 			/* not bring the cic up if there is a hardware block */
-			if( !sngss7_test_ckt_blk_flag(sngss7_info, (FLAG_GRP_HW_BLOCK_TX | FLAG_GRP_HW_BLOCK_TX_DN) ) ) {
+			if (sngss7_channel_status_clear(sngss7_info)) {
 				/* bring the sig status up */
 				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
 
-				/* send a uba */
-				ft_to_sngss7_uba (ftdmchan);
 			}
+			/* send a uba */
+			ft_to_sngss7_uba (ftdmchan);
 
 			/* check the last state and return to it to allow the call to finish */
 			goto suspend_goto_last;
@@ -1255,46 +1264,27 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		}
 
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_TX)) {
+			int skip_unblock=0;
 			SS7_DEBUG_CHAN(ftdmchan, "Processing FLAG_GRP_HW_UNBLK_TX flag %s\n", "");
 
-			if (sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX) &&
-			     sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX_DN)) {
-				
-				/* Block was sent out we must send an unblock */
-				/* Do not send an unblock if we also have Management block
-				   enabled */
-   			
-				if (!sngss7_test_ckt_blk_flag(sngss7_info, ( FLAG_CKT_MN_BLOCK_TX
-   								   | FLAG_CKT_MN_BLOCK_TX
-   								   | FLAG_GRP_MN_BLOCK_TX
-   								   | FLAG_GRP_MN_BLOCK_TX_DN
-   								   )
-   						      )
-				) {
-					ft_to_sngss7_ubl(ftdmchan);
-				}	
-				
+			if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX) || 
+			    sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX_DN)) {
+				/* Real unblock */
+			} else {
+				SS7_ERROR_CHAN(ftdmchan, "FLAG_GRP_HW_UNBLK_TX set while FLAG_GRP_HW_BLOCK_TX is not %s\n", "");
+				skip_unblock=1;
 			}
-
+				
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX);
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX_DN);
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_TX);
+			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_TX_DN);
 
-			/* do not set the channel up if it's blocked by blo/cgb command OR blocked by receiving blo/cgb */
-   			if (!sngss7_test_ckt_blk_flag(sngss7_info, ( FLAG_CKT_MN_BLOCK_TX
-   								   | FLAG_CKT_MN_BLOCK_TX
-   								   | FLAG_GRP_MN_BLOCK_TX
-   								   | FLAG_GRP_MN_BLOCK_TX_DN
-   								   | FLAG_CKT_MN_BLOCK_RX
-   								   | FLAG_CKT_MN_BLOCK_RX_DN
-   								   | FLAG_GRP_MN_BLOCK_RX
-   								   | FLAG_GRP_MN_BLOCK_RX_DN
-								   | FLAG_CKT_UCIC_BLOCK
-								   | FLAG_CKT_UCIC_BLOCK_DN
-   								   )
-   						      )
-			) {
+			if (sngss7_channel_status_clear(sngss7_info)) {
 				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
+			}
+
+			if (sngss7_tx_block_status_clear(sngss7_info) && !skip_unblock) {
 				ft_to_sngss7_ubl(ftdmchan);
 			}
 
@@ -1302,6 +1292,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		}
 #if 0
 //jz: there is no such thing of "remote hw block". for receiver, there are only block and unblock
+//nc: yes there is: its part of the CGB - however its handled in ss7_handle.c
 
 		/**********************************************************************/
 		// jz: hardware block/unblock rx
@@ -1323,9 +1314,14 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_RX);
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_RX_DN);
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_RX);
-			sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
 
-			ft_to_sngss7_uba(ftdmchan);
+			if (sngss7_channel_status_clear(sngs7_info)) {
+				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
+			}
+
+			if (sngss7_tx_block_status_clear(sngss7_info)) {
+				ft_to_sngss7_uba(ftdmchan);
+			}
 
 			goto suspend_goto_last;
 		}
@@ -1363,11 +1359,12 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* clear the unblock flag */
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX);
 
-			/* not bring the cic up if there is a hardware block */
-			if (!sngss7_test_ckt_blk_flag(sngss7_info, (FLAG_GRP_HW_BLOCK_TX | FLAG_GRP_HW_BLOCK_TX_DN))) {
+			if (sngss7_channel_status_clear(sngss7_info)) {
 				/* bring the sig status up */
 				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
+			}
 
+			if (sngss7_tx_block_status_clear(sngss7_info)) {
 				/* send a ubl */
 				ft_to_sngss7_ubl(ftdmchan);
 			}
@@ -1388,6 +1385,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* throw the done flag */
 			sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX_DN);
 
+			/* bring the sig status down */
+			sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_DOWN);
+
 			/* check the last state and return to it to allow the call to finish */
 			goto suspend_goto_last;
 		}
@@ -1405,6 +1405,10 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 			/* send a uba */
 			/*ft_to_sngss7_uba(ftdmchan);*/
+			
+			if (sngss7_channel_status_clear(sngss7_info)) {
+				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
+			}
 
 
 			/* check the last state and return to it to allow the call to finish */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index cdef894232..4a0f6026c7 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -1044,6 +1044,22 @@ if (ftdmchan->state == new_state) { \
 #define sngss7_clear_options(obj, option) ((obj)->options &= ~(option))
 #define sngss7_set_options(obj, option)   ((obj)->options |= (option))
 
+#define sngss7_tx_block_status_clear(obj) (!sngss7_test_ckt_blk_flag(obj, (FLAG_CKT_MN_BLOCK_TX | \
+													  		       FLAG_CKT_MN_BLOCK_TX_DN | \
+														  	       FLAG_GRP_MN_BLOCK_TX | \
+														  	       FLAG_GRP_MN_BLOCK_TX_DN | \
+															       FLAG_GRP_HW_BLOCK_TX | \
+															       FLAG_GRP_HW_BLOCK_TX_DN ))) 
+
+#define sngss7_block_status_clear(obj) (obj->blk_flags == 0)
+
+#define sngss7_reset_status_clear(obj) (!sngss7_test_ckt_flag(obj, (FLAG_RESET_TX | \
+														    FLAG_RESET_RX | \
+														  	FLAG_GRP_RESET_TX | \
+														  	FLAG_GRP_RESET_RX )))
+
+#define sngss7_channel_status_clear(obj) ((sngss7_block_status_clear(obj)) && (sngss7_reset_status_clear(obj)))
+
 
 #ifdef SMG_RELAY_DBG
 #define SS7_RELAY_DBG(a,...)	printf(a"\n", ##__VA_ARGS__)

From 69f6f20fd22a7bda09c1ea21932fafeba4ab6e88 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Thu, 3 Nov 2011 14:29:47 -0400
Subject: [PATCH 038/102] freetdm: on hander do not go up unless all channel
 blocks/restes are cleared          Added more documentation in main

---
 .../ftmod_sangoma_ss7_handle.c                |  4 ++-
 .../ftmod_sangoma_ss7_main.c                  | 32 +++++++------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 3733a619a7..0f3515097b 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -2571,7 +2571,9 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 		sigev.channel = ftdmchan;
 
 		/* bring the sig status down */
-		sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
+		if (sngss7_channel_status_clear(sngss7_info)) {
+			sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
+		}
 	
 		/* 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 1453581214..c4854f860c 100644
--- 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
@@ -1032,13 +1032,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		SS7_DEBUG_CHAN(ftdmchan,"RESTART: Current flags: ckt=0x%X, blk=0x%X\n", 
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
-	
-#if 0	
-		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_TX) && sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_RESUME)) {
-			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
-			break;
-		}
-#endif
 
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK)) {
 			if ((sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_RX)) ||
@@ -1175,8 +1168,11 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				if (!sngss7_reset_status_clear(sngss7_info)) {
 					goto suspend_goto_restart;
 				} else if (!sngss7_block_status_clear(sngss7_info)) {
-					/* Do nothing just go and handle blocks */
+					/* Do nothing just go through and handle blocks below */
 				} else {
+					/* This should not happen as above function tests
+					 * for reset and blocks */
+					SS7_ERROR_CHAN(ftdmchan, "Invalid code path: sngss7_channel_status_clear reset and block are both cleared%s\n", "");
 					goto suspend_goto_restart;
 				}
 			} else {
@@ -1195,6 +1191,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			}
 
 			/* Wait for RESUME */
+			/* FIXME: Check if this is a correct action to wait for RESUME */
 			goto suspend_goto_last;
 		} /* if (sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED)) { */
 
@@ -1290,19 +1287,20 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 			goto suspend_goto_last;
 		}
-#if 0
-//jz: there is no such thing of "remote hw block". for receiver, there are only block and unblock
-//nc: yes there is: its part of the CGB - however its handled in ss7_handle.c
 
 		/**********************************************************************/
-		// jz: hardware block/unblock rx
+#if 0
+		/* This logic is handled in the handle_cgu_req and handle_cgb_req */
+
 		if (sngss7_test_ckt_blk_flag (sngss7_info, FLAG_GRP_HW_BLOCK_RX ) &&
 			!sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_RX_DN )) {
 
 			SS7_DEBUG_CHAN(ftdmchan, "Processing FLAG_GRP_HW_BLOCK_RX flag %s\n", "");
 
 			sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_DOWN);
-			ft_to_sngss7_bla(ftdmchan);
+			
+			/* FIXME: Transmit CRG Ack */
+
 			sngss7_set_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_RX_DN);
 
 			goto suspend_goto_last;
@@ -1319,16 +1317,13 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
 			}
 
-			if (sngss7_tx_block_status_clear(sngss7_info)) {
-				ft_to_sngss7_uba(ftdmchan);
-			}
+			/* Transmit CRU Ack */
 
 			goto suspend_goto_last;
 		}
 #endif
 
 
-
 		/**********************************************************************/
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX) &&
 			!sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX_DN)) {
@@ -1861,9 +1856,6 @@ static FIO_SIG_LOAD_FUNCTION(ftdm_sangoma_ss7_init)
 	sng_isup_version(&major, &minor, &build);
 	SS7_INFO("Loaded LibSng-SS7 %d.%d.%d\n", major, minor, build);
 
-	/* crash on assert fail */
-	ftdm_global_set_crash_policy (FTDM_CRASH_ON_ASSERT);
-
 	return FTDM_SUCCESS;
 }
 

From 4b25044ac6043b4a411a62d0d28ceb4b50cc95b2 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Thu, 3 Nov 2011 20:04:26 -0400
Subject: [PATCH 039/102] freetdm: Made CPG optional on configuration file     
     Fixes in hw alarm - no need to set hw unblock if hw block did not execute
 yet.          Minor bug fixes

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c |  2 +-
 .../ftmod_sangoma_ss7_main.c                  | 47 ++++++++++++++++---
 .../ftmod_sangoma_ss7_main.h                  | 12 ++++-
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 12 +++++
 4 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
index a9b4136665..e51428acaa 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
@@ -94,7 +94,7 @@ int  ft_to_sngss7_cfg_all(void)
 			/* set the desired procID value */
 			sng_set_procId((uint16_t)g_ftdm_sngss7_data.cfg.procId);
 		}
-
+			
 		/* start up the stack manager */
 		if (sng_isup_init_sm()) {
 			SS7_CRITICAL("Failed to start Stack Manager\n");
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 c4854f860c..cd7f3ad58e 100644
--- 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
@@ -308,10 +308,14 @@ static void handle_hw_alarm(ftdm_event_t *e)
 					}
 				} else if (e->enum_id == FTDM_OOB_ALARM_CLEAR) {
 					SS7_DEBUG("handle_hw_alarm: Clear\n");
-					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
-					SS7_DEBUG("handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX\n");
-					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
-						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+					sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
+					sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
+					if (sngss7_test_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX_DN)) {
+						sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
+						SS7_DEBUG("handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX\n");
+						if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
+							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+						}
 					}
 				}
 			}
@@ -737,6 +741,12 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				sngss7_set_ckt_flag(sngss7_info, FLAG_SENT_ACM);
 				ft_to_sngss7_acm(ftdmchan);
 			}
+			if (g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].cpg_on_progress == FTDM_TRUE) {
+				if (!sngss7_test_ckt_flag(sngss7_info, FLAG_SENT_CPG)) {
+					sngss7_set_ckt_flag(sngss7_info, FLAG_SENT_CPG);
+					ft_to_sngss7_cpg(ftdmchan);
+				}
+			}
 		}
 
 		break;
@@ -756,7 +766,12 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				sngss7_set_ckt_flag(sngss7_info, FLAG_SENT_ACM);
 				ft_to_sngss7_acm(ftdmchan);
 			}
-			ft_to_sngss7_cpg(ftdmchan);
+			if (g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].cpg_on_progress_media == FTDM_TRUE) {
+				if (!sngss7_test_ckt_flag(sngss7_info, FLAG_SENT_CPG)) {
+					sngss7_set_ckt_flag(sngss7_info, FLAG_SENT_CPG);
+					ft_to_sngss7_cpg(ftdmchan);
+				}
+			}
 		}
 
 		break;
@@ -973,7 +988,10 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 						/* all flags are down so we can bring up the sig status */
 						sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
 					} /* if (!ftdm_test_flag (ftdmchan, FTDM_CHANNEL_SIG_UP)) */
-				} /* if !blocked */
+				} else {
+					state_flag = 0;
+					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+				}	/* if !blocked */
 			} else {
 				SS7_DEBUG_CHAN(ftdmchan,"Reset flags present (0x%X)\n", sngss7_info->ckt_flags);
 			
@@ -998,6 +1016,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		sngss7_clear_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
 		sngss7_clear_ckt_flag (sngss7_info, FLAG_LOCAL_REL);
 		sngss7_clear_ckt_flag (sngss7_info, FLAG_SENT_ACM);
+		sngss7_clear_ckt_flag (sngss7_info, FLAG_SENT_CPG);
 
 
 		if (ftdm_test_flag (ftdmchan, FTDM_CHANNEL_OPEN)) {
@@ -1162,6 +1181,22 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* clear the PAUSE flag */
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 
+			/* We have transmitted Reset/GRS but have not gotten a
+			 * Response. In mean time we got a RESUME. We cannot be sure
+			 * that our reset has been trasmitted, thus restart reset procedure. */ 
+			if (sngss7_tx_reset_status_pending(sngss7_info)) {
+				SS7_DEBUG_CHAN(ftdmchan, "Channel transmitted RSC/GRS before RESUME, restart Reset procedure%s\n", "");
+				clear_rx_grs_flags(sngss7_info);
+				clear_rx_grs_data(sngss7_info);
+				clear_tx_grs_flags(sngss7_info);
+				clear_tx_grs_data(sngss7_info);
+				clear_rx_rsc_flags(sngss7_info);
+				clear_tx_rsc_flags(sngss7_info);
+
+				clear_tx_rsc_flags(sngss7_info);
+				sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
+			}
+
 			/* if there are any resets present */
 			if (!sngss7_channel_status_clear(sngss7_info)) {
 				/* don't bring up the sig status but also move to reset */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 4a0f6026c7..4a0a331594 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -342,6 +342,8 @@ typedef struct sng_isup_ckt {
 	uint32_t		min_digits;
 	uint8_t			itx_auto_reply;
 	uint8_t			transparent_iam;
+	uint8_t			cpg_on_progress_media;
+	uint8_t			cpg_on_progress;
 	void			*obj;
 	uint16_t		t3;
 	uint32_t		t10;
@@ -534,6 +536,7 @@ typedef enum {
 	FLAG_INFID_RESUME		= (1 << 14),
 	FLAG_INFID_PAUSED		= (1 << 15),
 	FLAG_SENT_ACM			= (1 << 16),
+	FLAG_SENT_CPG			= (1 << 17),
 	FLAG_RELAY_DOWN			= (1 << 30),
 	FLAG_CKT_RECONFIG		= (1 << 31)
 } sng_ckt_flag_t;
@@ -542,14 +545,14 @@ typedef enum {
 	"RX_RSC", \
 	"TX_RSC", \
 	"TX_RSC_REQ_SENT", \
-	"TX_RSC_RSP_RECIEVED", \
+	"TX_RSC_RSP_RECEIVED", \
 	"RX_GRS", \
 	"RX_GRS_DONE", \
 	"RX_GRS_CMPLT", \
 	"GRS_BASE", \
 	"TX_GRS", \
 	"TX_GRS_REQ_SENT", \
-	"TX_GRS_RSP_RECIEVED", \
+	"TX_GRS_RSP_RECEIVED", \
 	"REMOTE_REL", \
 	"LOCAL_REL", \
 	"GLARE", \
@@ -1058,6 +1061,11 @@ if (ftdmchan->state == new_state) { \
 														  	FLAG_GRP_RESET_TX | \
 														  	FLAG_GRP_RESET_RX )))
 
+#define sngss7_tx_reset_status_pending(obj) ((sngss7_test_ckt_flag(obj, (FLAG_RESET_TX)) && \
+											  sngss7_test_ckt_flag(obj, (FLAG_RESET_SENT))) || \
+											 (sngss7_test_ckt_flag(obj, (FLAG_GRP_RESET_TX)) && \
+											  sngss7_test_ckt_flag(obj, (FLAG_GRP_RESET_SENT))))
+	
 #define sngss7_channel_status_clear(obj) ((sngss7_block_status_clear(obj)) && (sngss7_reset_status_clear(obj)))
 
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index 8f29c55efe..045c1835ef 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -128,6 +128,8 @@ typedef struct sng_ccSpan
 	uint32_t		min_digits;
 	uint8_t			itx_auto_reply;
 	uint8_t			transparent_iam;
+	uint8_t         cpg_on_progress_media;
+	uint8_t         cpg_on_progress;
 	uint32_t		t3;
 	uint32_t		t10;
 	uint32_t		t12;
@@ -1906,6 +1908,14 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 			sng_ccSpan.transparent_iam = ftdm_true(parm->val);
 			SS7_DEBUG("Found transparent_iam %d\n", sng_ccSpan.transparent_iam);
 #endif
+		} else if (!strcasecmp(parm->var, "cpg_on_progress_media")) {
+			sng_ccSpan.cpg_on_progress_media = ftdm_true(parm->val);
+			SS7_DEBUG("Found cpg_on_progress_media %d\n", sng_ccSpan.cpg_on_progress_media);
+
+		} else if (!strcasecmp(parm->var, "cpg_on_progress")) {
+			sng_ccSpan.cpg_on_progress = ftdm_true(parm->val);
+			SS7_DEBUG("Found cpg_on_progress_media %d\n", sng_ccSpan.cpg_on_progress);
+
 		} else if (!strcasecmp(parm->var, "cicbase")) {
 		/**********************************************************************/
 			sng_ccSpan.cicbase = atoi(parm->val);
@@ -2941,6 +2951,8 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 		g_ftdm_sngss7_data.cfg.isupCkt[x].min_digits					= ccSpan->min_digits;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].itx_auto_reply				= ccSpan->itx_auto_reply;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].transparent_iam				= ccSpan->transparent_iam;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].cpg_on_progress_media			= ccSpan->cpg_on_progress_media;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].cpg_on_progress	 		    = ccSpan->cpg_on_progress;
 
 		if (ccSpan->t3 == 0) {
 			g_ftdm_sngss7_data.cfg.isupCkt[x].t3			= 1200;

From 5dd076c81f8b4506006c38ac6d6a228a5508cec3 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Mon, 7 Nov 2011 00:08:38 -0500
Subject: [PATCH 040/102] freetdm: Allow for backward compatibility.         
 cpg_on_progress_media is default to TRUE if not xml option exists.         
 transparent_iam_max_size added to ccspan.  Gloal value is used          if
 transparent_iam_max_size is not in ccSpan.

---
 .../ftmod_sangoma_ss7_main.h                  |  3 ++-
 .../ftmod_sangoma_ss7_support.c               |  5 ++--
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 25 ++++++++++++++++---
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 4a0a331594..b25b21f0ef 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -340,10 +340,11 @@ typedef struct sng_isup_ckt {
 	/* END - Generic Number defaults */
 			
 	uint32_t		min_digits;
-	uint8_t			itx_auto_reply;
+	uint32_t		transparent_iam_max_size;
 	uint8_t			transparent_iam;
 	uint8_t			cpg_on_progress_media;
 	uint8_t			cpg_on_progress;
+	uint8_t			itx_auto_reply;
 	void			*obj;
 	uint16_t		t3;
 	uint32_t		t10;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 7b53a18eba..4d81e6b1f4 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -2532,8 +2532,9 @@ ftdm_status_t sngss7_save_iam(ftdm_channel_t *ftdmchan, SiConEvnt *siConEvnt)
 
 	ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "IAM variable length:%d\n", strlen(url_encoded_iam));
 
-	if (strlen(url_encoded_iam) > g_ftdm_sngss7_data.cfg.transparent_iam_max_size) {
-		ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "IAM variable length exceeds max size (len:%d max:%d) \n", strlen(url_encoded_iam), g_ftdm_sngss7_data.cfg.transparent_iam_max_size);
+	if (strlen(url_encoded_iam) > sngss7_info->circuit->transparent_iam_max_size) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "IAM variable length exceeds max size (len:%d max:%d) \n", 
+			strlen(url_encoded_iam), sngss7_info->circuit->transparent_iam_max_size);
 		ret_val = FTDM_FAIL;
 		goto done;
 	}
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index 045c1835ef..2fbd2e5631 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -126,10 +126,11 @@ typedef struct sng_ccSpan
 	uint32_t		rdnis_nadi;
 	uint32_t		loc_nadi;
 	uint32_t		min_digits;
-	uint8_t			itx_auto_reply;
+	uint32_t		transparent_iam_max_size;
 	uint8_t			transparent_iam;
 	uint8_t         cpg_on_progress_media;
 	uint8_t         cpg_on_progress;
+	uint8_t			itx_auto_reply;
 	uint32_t		t3;
 	uint32_t		t10;
 	uint32_t		t12;
@@ -194,6 +195,7 @@ static int ftmod_ss7_next_timeslot(char *ch_map, sng_timeslot_t *timeslot);
 /******************************************************************************/
 
 /* FUNCTIONS ******************************************************************/
+
 int ftmod_ss7_parse_xml(ftdm_conf_parameter_t *ftdm_parameters, ftdm_span_t *span)
 {
 	int					i = 0;
@@ -203,6 +205,7 @@ int ftmod_ss7_parse_xml(ftdm_conf_parameter_t *ftdm_parameters, ftdm_span_t *spa
 	sng_route_t			self_route;
 	sng_span_t			sngSpan;
 
+
 	/* clean out the isup ckt */
 	memset(&sngSpan, 0x0, sizeof(sngSpan));
 
@@ -455,6 +458,9 @@ static int ftmod_ss7_parse_sng_gen(ftdm_conf_node_t *sng_gen)
 	int						num_parms = sng_gen->n_parameters;
 	int						i = 0;
 
+	/* Set the transparent_iam_max_size to default value */
+	g_ftdm_sngss7_data.cfg.transparent_iam_max_size=800;
+
 	/* extract all the information from the parameters */
 	for (i = 0; i < num_parms; i++) {
 	/**************************************************************************/
@@ -1855,6 +1861,7 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 	/* initalize the ccSpan structure */
 	memset(&sng_ccSpan, 0x0, sizeof(sng_ccSpan));
 
+
 	/* confirm that we are looking at an mtp_link */
 	if (strcasecmp(cc_span->name, "cc_span")) {
 		SS7_ERROR("We're looking at \"%s\"...but we're supposed to be looking at \"cc_span\"!\n",cc_span->name);
@@ -1863,6 +1870,14 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 		SS7_DEBUG("Parsing \"cc_span\"...\n");
 	}
 
+	/* Backward compatible. 
+     * If cpg_on_progress_media is not in the config file
+     * default the cpg on progress_media to TRUE */
+	sng_ccSpan.cpg_on_progress_media=FTDM_TRUE;
+	/* If transparent_iam_max_size is not set in cc spans
+     * use the global value */
+ 	sng_ccSpan.transparent_iam_max_size=g_ftdm_sngss7_data.cfg.transparent_iam_max_size;
+
 
 	for (i = 0; i < num_parms; i++) {
 	/**************************************************************************/
@@ -1908,14 +1923,15 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 			sng_ccSpan.transparent_iam = ftdm_true(parm->val);
 			SS7_DEBUG("Found transparent_iam %d\n", sng_ccSpan.transparent_iam);
 #endif
+		} else if (!strcasecmp(parm->var, "transparent_iam_max_size")) {
+			sng_ccSpan.transparent_iam_max_size = ftdm_true(parm->val);
+			SS7_DEBUG("Found transparent_iam_max_size %d\n", sng_ccSpan.transparent_iam_max_size);
 		} else if (!strcasecmp(parm->var, "cpg_on_progress_media")) {
 			sng_ccSpan.cpg_on_progress_media = ftdm_true(parm->val);
 			SS7_DEBUG("Found cpg_on_progress_media %d\n", sng_ccSpan.cpg_on_progress_media);
-
 		} else if (!strcasecmp(parm->var, "cpg_on_progress")) {
 			sng_ccSpan.cpg_on_progress = ftdm_true(parm->val);
-			SS7_DEBUG("Found cpg_on_progress_media %d\n", sng_ccSpan.cpg_on_progress);
-
+			SS7_DEBUG("Found cpg_on_progress %d\n", sng_ccSpan.cpg_on_progress);
 		} else if (!strcasecmp(parm->var, "cicbase")) {
 		/**********************************************************************/
 			sng_ccSpan.cicbase = atoi(parm->val);
@@ -2951,6 +2967,7 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 		g_ftdm_sngss7_data.cfg.isupCkt[x].min_digits					= ccSpan->min_digits;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].itx_auto_reply				= ccSpan->itx_auto_reply;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].transparent_iam				= ccSpan->transparent_iam;
+		g_ftdm_sngss7_data.cfg.isupCkt[x].transparent_iam_max_size		= ccSpan->transparent_iam_max_size;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].cpg_on_progress_media			= ccSpan->cpg_on_progress_media;
 		g_ftdm_sngss7_data.cfg.isupCkt[x].cpg_on_progress	 		    = ccSpan->cpg_on_progress;
 

From 3552e329ca7b7477e862bb4c09b4edfe59c26373 Mon Sep 17 00:00:00 2001
From: root <james>
Date: Mon, 7 Nov 2011 12:53:32 -0500
Subject: [PATCH 041/102] freetdm: fix sip header wrong value of NADI         
 error was caused by printing string value to integer

---
 libs/freetdm/mod_freetdm/mod_freetdm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index ae167ccef2..ba0389a1cc 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1710,7 +1710,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_clg_nadi");
 		if (!ftdm_strlen_zero(var_value)) {
-			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-NADI", "%d", var_value);
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-NADI", "%s", var_value);
 		}
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdnis_screen_ind");

From f0631fc87e9261819449195b309888485e93bd9d Mon Sep 17 00:00:00 2001
From: root <james>
Date: Mon, 7 Nov 2011 16:37:11 -0500
Subject: [PATCH 042/102] freetdm: change call reference number to HEX string
 format

---
 libs/freetdm/mod_freetdm/mod_freetdm.c                     | 6 +++++-
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index ba0389a1cc..866fb74bec 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1770,7 +1770,11 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Screen", "%d", channel_caller_data->screen);
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Presentation", "%d", channel_caller_data->pres);
-		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CallReference", "%d", channel_caller_data->call_reference);
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_callref");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CallReference", "%s", var_value);
+		}
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_opc");
 		if (!ftdm_strlen_zero(var_value)) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 0f3515097b..f351d8ab8d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -252,10 +252,9 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sngss7_add_var(sngss7_info, "ss7_opc", var);
 			
 			if (siConEvnt->callRef.callId.pres) {
-				ftdmchan->caller_data.call_reference = (unsigned int)siConEvnt->callRef.callId.val;
-			} else {
-				ftdmchan->caller_data.call_reference = 0;
-			}
+				sprintf(var, "%x", siConEvnt->callRef.callId.val);
+				sngss7_add_var(sngss7_info, "ss7_callref", var);
+			} 
 			
 			if (sngss7_info->circuit->transparent_iam) {
 				sngss7_save_iam(ftdmchan, siConEvnt);

From 08e01bb5a202082295e19f98333a42e1456797cf Mon Sep 17 00:00:00 2001
From: root <james>
Date: Mon, 7 Nov 2011 17:32:02 -0500
Subject: [PATCH 043/102] freetdm: fix generic number

---
 libs/freetdm/mod_freetdm/mod_freetdm.c             | 14 +++++++-------
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 866fb74bec..be55d2b7ff 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1725,36 +1725,36 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_digits");
 		if (!ftdm_strlen_zero(var_value)) {
-			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN", "%d", var_value);
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN", "%s", var_value);
 
 			var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_numqual");
 			if (!ftdm_strlen_zero(var_value)) {
-				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-NumQual", "%d", var_value);
+				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-NumQual", "%s", var_value);
 			}
 
 			var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_nadi");
 			if (!ftdm_strlen_zero(var_value)) {
-				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-NADI", "%d", var_value);
+				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-NADI", "%s", var_value);
 			}
 
 			var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_screen_ind");
 			if (!ftdm_strlen_zero(var_value)) {
-				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-Screen", "%d", var_value);
+				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-Screen", "%s", var_value);
 			}
 
 			var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_pres_ind");
 			if (!ftdm_strlen_zero(var_value)) {
-				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-Presentation", "%d", var_value);
+				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-Presentation", "%s", var_value);
 			}
 
 			var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_npi");
 			if (!ftdm_strlen_zero(var_value)) {
-				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-Plan", "%d", var_value);
+				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-Plan", "%s", var_value);
 			}
 
 			var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_num_inc_ind");
 			if (!ftdm_strlen_zero(var_value)) {
-				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-NumInComp", "%d", var_value);
+				switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-GN-NumInComp", "%s", var_value);
 			}
 		} /* End - var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_digits"); */
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 4d81e6b1f4..aa50ce2264 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -375,7 +375,7 @@ ftdm_status_t copy_genNmb_from_sngss7(ftdm_channel_t *ftdmchan, SiGenNum *genNmb
 
 	if (genNmb->nmbQual.pres == PRSNT_NODEF) {
 		snprintf(val, sizeof(val), "%d", genNmb->nmbQual.val);
-		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Generic Number \"number qualifier\" \n", val);
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Generic Number \"number qualifier\" \"%s\" \n", val);
 		sngss7_add_var(sngss7_info, "ss7_gn_numqual", val);
 	}
 

From 5c4a3f81a2e5c2077eb5949dfbc54101a17d3bdc Mon Sep 17 00:00:00 2001
From: wadam <wadam@sangoma.com>
Date: Mon, 7 Nov 2011 22:26:02 -0500
Subject: [PATCH 044/102] Fix error in call reference conversion to string.  
 src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c   cc1: warnings being
 treated as errors   src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c:
 In function   'handle_con_ind':  
 src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c:255: warning: format
 '%x'   expects type 'unsigned int', but argument 3 has type 'U32'   make[6]:
 *** [ftmod_sangoma_ss7_la-ftmod_sangoma_ss7_handle.lo] Error 1

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index f351d8ab8d..25967e5977 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -252,7 +252,9 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sngss7_add_var(sngss7_info, "ss7_opc", var);
 			
 			if (siConEvnt->callRef.callId.pres) {
-				sprintf(var, "%x", siConEvnt->callRef.callId.val);
+        /* %x expect an unsigned int so as callId is a U32, casting to uint32_t
+         * is safe */
+				sprintf(var, "%x", (uint32_t)siConEvnt->callRef.callId.val);
 				sngss7_add_var(sngss7_info, "ss7_callref", var);
 			} 
 			

From dcdb5f18eb017d52dc556a62b956d1d397482591 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Mon, 14 Nov 2011 16:42:23 -0500
Subject: [PATCH 045/102] freetdm: fixing RDNIS-Screen value mis-displaying
 string in decimal format

---
 libs/freetdm/mod_freetdm/mod_freetdm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index be55d2b7ff..b2df0e40ac 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1715,7 +1715,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdnis_screen_ind");
 		if (!ftdm_strlen_zero(var_value)) {
-			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-Screen", "%d", var_value);
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-Screen", "%s", var_value);
 		}
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdnis_pres_ind");

From 552405024afbc40ecf57c97052f13aa37c759f39 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Tue, 15 Nov 2011 14:46:57 -0500
Subject: [PATCH 046/102] freetdm: fixing relay must start after master.       
   relay - configuring circuits only when resume is recieved. 	 master -
 configuring relay after all the others are configured.

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c | 322 +++++++++---------
 .../ftmod_sangoma_ss7_logger.c                |   5 +
 .../ftmod_sangoma_ss7_main.c                  |  22 +-
 .../ftmod_sangoma_ss7_support.c               |   1 +
 4 files changed, 189 insertions(+), 161 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
index e51428acaa..25510e8c7a 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
@@ -220,27 +220,6 @@ int  ft_to_sngss7_cfg_all(void)
 			return 1;
 	}
 
-	/* go through all the relays channels and configure it */
-	x = 1;
-	while (x < (MAX_RELAY_CHANNELS)) {
-		/* check if this relay channel has been configured already */
-		if ((g_ftdm_sngss7_data.cfg.relay[x].id != 0) &&
-			(!(g_ftdm_sngss7_data.cfg.relay[x].flags & SNGSS7_CONFIGURED))) {
-
-			/* send the specific configuration */
-			if (ftmod_ss7_relay_chan_config(x)) {
-				SS7_CRITICAL("Relay Channel %d configuration FAILED!\n", x);
-				return 1;
-			} else {
-				SS7_INFO("Relay Channel %d configuration DONE!\n", x);
-			}
-
-			/* set the SNGSS7_CONFIGURED flag */
-			g_ftdm_sngss7_data.cfg.relay[x].flags |= SNGSS7_CONFIGURED;
-		} /* if !SNGSS7_CONFIGURED */
-		x++;
-	} /* while (x < (MAX_RELAY_CHANNELS)) */
-
 	x = 1;
 	while (x < (MAX_MTP_LINKS)) {
 		/* check if this link has been configured already */
@@ -281,160 +260,189 @@ int  ft_to_sngss7_cfg_all(void)
 		x++;
 	} /* while (x < (MAX_MTP_LINKS+1)) */
 
-	x = 1;
-	while (x < (MAX_MTP_LINKS)) {
-		/* check if this link has been configured already */
-		if ((g_ftdm_sngss7_data.cfg.mtp3Link[x].id != 0) &&
-			(!(g_ftdm_sngss7_data.cfg.mtp3Link[x].flags & SNGSS7_CONFIGURED))) {
-
-			/* configure mtp3 */
-			if (ftmod_ss7_mtp3_dlsap_config(x)) {
-				SS7_CRITICAL("MTP3 DLSAP %d configuration FAILED!\n", x);
-				return 1;;
-			} else {
-				SS7_INFO("MTP3 DLSAP %d configuration DONE!\n", x);
-			}
-
-			/* set the SNGSS7_CONFIGURED flag */
-			g_ftdm_sngss7_data.cfg.mtp3Link[x].flags |= SNGSS7_CONFIGURED;
-		}
-		
-		x++;
-	} /* while (x < (MAX_MTP_LINKS+1)) */
-
-	x = 1;
-	while (x < (MAX_NSAPS)) {
-		/* check if this link has been configured already */
-		if ((g_ftdm_sngss7_data.cfg.nsap[x].id != 0) &&
-			(!(g_ftdm_sngss7_data.cfg.nsap[x].flags & SNGSS7_CONFIGURED))) {
-
-			ret = ftmod_ss7_mtp3_nsap_config(x);
-			if (ret) {
-				SS7_CRITICAL("MTP3 NSAP %d configuration FAILED!(%s)\n", x, DECODE_LCM_REASON(ret));
-				return 1;
-			} else {
-				SS7_INFO("MTP3 NSAP %d configuration DONE!\n", x);
-			}
-
-			ret = ftmod_ss7_isup_nsap_config(x);
-			if (ret) {
-				SS7_CRITICAL("ISUP NSAP %d configuration FAILED!(%s)\n", x, DECODE_LCM_REASON(ret));
-				return 1;
-			} else {
-				SS7_INFO("ISUP NSAP %d configuration DONE!\n", x);
-			}
-
-			/* set the SNGSS7_CONFIGURED flag */
-			g_ftdm_sngss7_data.cfg.nsap[x].flags |= SNGSS7_CONFIGURED;
-		} /* if !SNGSS7_CONFIGURED */
-		
-		x++;
-	} /* while (x < (MAX_NSAPS)) */
-
-	x = 1;
-	while (x < (MAX_MTP_LINKSETS+1)) {
-		/* check if this link has been configured already */
-		if ((g_ftdm_sngss7_data.cfg.mtpLinkSet[x].id != 0) &&
-			(!(g_ftdm_sngss7_data.cfg.mtpLinkSet[x].flags & SNGSS7_CONFIGURED))) {
-
-			if (ftmod_ss7_mtp3_linkset_config(x)) {
-				SS7_CRITICAL("MTP3 LINKSET %d configuration FAILED!\n", x);
-				return 1;
-			} else {
-				SS7_INFO("MTP3 LINKSET %d configuration DONE!\n", x);
-			}
-
-			/* set the SNGSS7_CONFIGURED flag */
-			g_ftdm_sngss7_data.cfg.mtpLinkSet[x].flags |= SNGSS7_CONFIGURED;
-		} /* if !SNGSS7_CONFIGURED */
-		
-		x++;
-	} /* while (x < (MAX_MTP_LINKSETS+1)) */
-
-	x = 1;
-	while (x < (MAX_MTP_ROUTES+1)) {
-		/* check if this link has been configured already */
-		if ((g_ftdm_sngss7_data.cfg.mtpRoute[x].id != 0) &&
-			(!(g_ftdm_sngss7_data.cfg.mtpRoute[x].flags & SNGSS7_CONFIGURED))) {
-
-			if (ftmod_ss7_mtp3_route_config(x)) {
-				SS7_CRITICAL("MTP3 ROUTE %d configuration FAILED!\n", x);
-				return 1;
-			} else {
-				SS7_INFO("MTP3 ROUTE %d configuration DONE!\n",x);
-			}
-
-			/* set the SNGSS7_CONFIGURED flag */
-			g_ftdm_sngss7_data.cfg.mtpRoute[x].flags |= SNGSS7_CONFIGURED;
-		} /* if !SNGSS7_CONFIGURED */
-		
-		x++;
-	} /* while (x < (MAX_MTP_ROUTES+1)) */
-
-	x = 1;
-	while (x < (MAX_ISAPS)) {
-		/* check if this link has been configured already */
-		if ((g_ftdm_sngss7_data.cfg.isap[x].id != 0) &&
-			(!(g_ftdm_sngss7_data.cfg.isap[x].flags & SNGSS7_CONFIGURED))) {
-			
-			if (ftmod_ss7_isup_isap_config(x)) {
-				SS7_CRITICAL("ISUP ISAP %d configuration FAILED!\n", x);
-				return 1;
-			} else {
-				SS7_INFO("ISUP ISAP %d configuration DONE!\n", x);
-			}
-
-			/* set the SNGSS7_CONFIGURED flag */
-			g_ftdm_sngss7_data.cfg.isap[x].flags |= SNGSS7_CONFIGURED;
-		} /* if !SNGSS7_CONFIGURED */
-		
-		x++;
-	} /* while (x < (MAX_ISAPS)) */
-
-	if (sngss7_test_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_ISUP_STARTED)) {
+	/* no configs above mtp2 for relay */
+	if (g_ftdm_sngss7_data.cfg.procId == 1) {
 		x = 1;
-		while (x < (MAX_ISUP_INFS)) {
+		while (x < (MAX_MTP_LINKS)) {
 			/* check if this link has been configured already */
-			if ((g_ftdm_sngss7_data.cfg.isupIntf[x].id != 0) &&
-				(!(g_ftdm_sngss7_data.cfg.isupIntf[x].flags & SNGSS7_CONFIGURED))) {
-	
-				if (ftmod_ss7_isup_intf_config(x)) {
-					SS7_CRITICAL("ISUP INTF %d configuration FAILED!\n", x);
+			if ((g_ftdm_sngss7_data.cfg.mtp3Link[x].id != 0) &&
+				(!(g_ftdm_sngss7_data.cfg.mtp3Link[x].flags & SNGSS7_CONFIGURED))) {
+
+				/* configure mtp3 */
+				if (ftmod_ss7_mtp3_dlsap_config(x)) {
+					SS7_CRITICAL("MTP3 DLSAP %d configuration FAILED!\n", x);
+					return 1;;
+				} else {
+					SS7_INFO("MTP3 DLSAP %d configuration DONE!\n", x);
+				}
+
+				/* set the SNGSS7_CONFIGURED flag */
+				g_ftdm_sngss7_data.cfg.mtp3Link[x].flags |= SNGSS7_CONFIGURED;
+			}
+			
+			x++;
+		} /* while (x < (MAX_MTP_LINKS+1)) */
+
+		x = 1;
+		while (x < (MAX_NSAPS)) {
+			/* check if this link has been configured already */
+			if ((g_ftdm_sngss7_data.cfg.nsap[x].id != 0) &&
+				(!(g_ftdm_sngss7_data.cfg.nsap[x].flags & SNGSS7_CONFIGURED))) {
+
+				ret = ftmod_ss7_mtp3_nsap_config(x);
+				if (ret) {
+					SS7_CRITICAL("MTP3 NSAP %d configuration FAILED!(%s)\n", x, DECODE_LCM_REASON(ret));
 					return 1;
 				} else {
-					SS7_INFO("ISUP INTF %d configuration DONE!\n", x);
-					/* set the interface to paused */
-					sngss7_set_flag(&g_ftdm_sngss7_data.cfg.isupIntf[x], SNGSS7_PAUSED);
+					SS7_INFO("MTP3 NSAP %d configuration DONE!\n", x);
 				}
-	
+
+				ret = ftmod_ss7_isup_nsap_config(x);
+				if (ret) {
+					SS7_CRITICAL("ISUP NSAP %d configuration FAILED!(%s)\n", x, DECODE_LCM_REASON(ret));
+					return 1;
+				} else {
+					SS7_INFO("ISUP NSAP %d configuration DONE!\n", x);
+				}
+
 				/* set the SNGSS7_CONFIGURED flag */
-				g_ftdm_sngss7_data.cfg.isupIntf[x].flags |= SNGSS7_CONFIGURED;
+				g_ftdm_sngss7_data.cfg.nsap[x].flags |= SNGSS7_CONFIGURED;
 			} /* if !SNGSS7_CONFIGURED */
 			
 			x++;
-		} /* while (x < (MAX_ISUP_INFS)) */
-	} /* if (sngss7_test_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_ISUP)) */
+		} /* while (x < (MAX_NSAPS)) */
 
-	x = (g_ftdm_sngss7_data.cfg.procId * 1000) + 1;
-	while (g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0) {
-		/* check if this link has been configured already */
-		if ((g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0) &&
-			(!(g_ftdm_sngss7_data.cfg.isupCkt[x].flags & SNGSS7_CONFIGURED))) {
+		x = 1;
+		while (x < (MAX_MTP_LINKSETS+1)) {
+			/* check if this link has been configured already */
+			if ((g_ftdm_sngss7_data.cfg.mtpLinkSet[x].id != 0) &&
+				(!(g_ftdm_sngss7_data.cfg.mtpLinkSet[x].flags & SNGSS7_CONFIGURED))) {
 
-			if (ftmod_ss7_isup_ckt_config(x)) {
-				SS7_CRITICAL("ISUP CKT %d configuration FAILED!\n", x);
+				if (ftmod_ss7_mtp3_linkset_config(x)) {
+					SS7_CRITICAL("MTP3 LINKSET %d configuration FAILED!\n", x);
+					return 1;
+				} else {
+					SS7_INFO("MTP3 LINKSET %d configuration DONE!\n", x);
+				}
+
+				/* set the SNGSS7_CONFIGURED flag */
+				g_ftdm_sngss7_data.cfg.mtpLinkSet[x].flags |= SNGSS7_CONFIGURED;
+			} /* if !SNGSS7_CONFIGURED */
+			
+			x++;
+		} /* while (x < (MAX_MTP_LINKSETS+1)) */
+
+		x = 1;
+		while (x < (MAX_MTP_ROUTES+1)) {
+			/* check if this link has been configured already */
+			if ((g_ftdm_sngss7_data.cfg.mtpRoute[x].id != 0) &&
+				(!(g_ftdm_sngss7_data.cfg.mtpRoute[x].flags & SNGSS7_CONFIGURED))) {
+
+				if (ftmod_ss7_mtp3_route_config(x)) {
+					SS7_CRITICAL("MTP3 ROUTE %d configuration FAILED!\n", x);
+					return 1;
+				} else {
+					SS7_INFO("MTP3 ROUTE %d configuration DONE!\n",x);
+				}
+
+				/* set the SNGSS7_CONFIGURED flag */
+				g_ftdm_sngss7_data.cfg.mtpRoute[x].flags |= SNGSS7_CONFIGURED;
+			} /* if !SNGSS7_CONFIGURED */
+			
+			x++;
+		} /* while (x < (MAX_MTP_ROUTES+1)) */
+
+		x = 1;
+		while (x < (MAX_ISAPS)) {
+			/* check if this link has been configured already */
+			if ((g_ftdm_sngss7_data.cfg.isap[x].id != 0) &&
+				(!(g_ftdm_sngss7_data.cfg.isap[x].flags & SNGSS7_CONFIGURED))) {
+				
+				if (ftmod_ss7_isup_isap_config(x)) {
+					SS7_CRITICAL("ISUP ISAP %d configuration FAILED!\n", x);
+					return 1;
+				} else {
+					SS7_INFO("ISUP ISAP %d configuration DONE!\n", x);
+				}
+
+				/* set the SNGSS7_CONFIGURED flag */
+				g_ftdm_sngss7_data.cfg.isap[x].flags |= SNGSS7_CONFIGURED;
+			} /* if !SNGSS7_CONFIGURED */
+			
+			x++;
+		} /* while (x < (MAX_ISAPS)) */
+
+		if (sngss7_test_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_ISUP_STARTED)) {
+			x = 1;
+			while (x < (MAX_ISUP_INFS)) {
+				/* check if this link has been configured already */
+				if ((g_ftdm_sngss7_data.cfg.isupIntf[x].id != 0) &&
+					(!(g_ftdm_sngss7_data.cfg.isupIntf[x].flags & SNGSS7_CONFIGURED))) {
+		
+					if (ftmod_ss7_isup_intf_config(x)) {
+						SS7_CRITICAL("ISUP INTF %d configuration FAILED!\n", x);
+						return 1;
+					} else {
+						SS7_INFO("ISUP INTF %d configuration DONE!\n", x);
+						/* set the interface to paused */
+						sngss7_set_flag(&g_ftdm_sngss7_data.cfg.isupIntf[x], SNGSS7_PAUSED);
+					}
+		
+					/* set the SNGSS7_CONFIGURED flag */
+					g_ftdm_sngss7_data.cfg.isupIntf[x].flags |= SNGSS7_CONFIGURED;
+				} /* if !SNGSS7_CONFIGURED */
+				
+				x++;
+			} /* while (x < (MAX_ISUP_INFS)) */
+		} /* if (sngss7_test_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_ISUP)) */
+
+		x = (g_ftdm_sngss7_data.cfg.procId * 1000) + 1;
+		while (g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0) {
+
+			if (g_ftdm_sngss7_data.cfg.procId > 1) {
+				break;
+			}
+
+			/* check if this link has been configured already */
+			if ((g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0) &&
+				(!(g_ftdm_sngss7_data.cfg.isupCkt[x].flags & SNGSS7_CONFIGURED))) {
+
+				if (ftmod_ss7_isup_ckt_config(x)) {
+					SS7_CRITICAL("ISUP CKT %d configuration FAILED!\n", x);
+					return 1;
+				} else {
+					SS7_INFO("ISUP CKT %d configuration DONE!\n", x);
+				}
+
+				/* set the SNGSS7_CONFIGURED flag */
+				g_ftdm_sngss7_data.cfg.isupCkt[x].flags |= SNGSS7_CONFIGURED;
+			} /* if !SNGSS7_CONFIGURED */
+			
+			x++;
+		} /* while (g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0) */
+	}
+
+	/* go through all the relays channels and configure it */
+	x = 1;
+	while (x < (MAX_RELAY_CHANNELS)) {
+		/* check if this relay channel has been configured already */
+		if ((g_ftdm_sngss7_data.cfg.relay[x].id != 0) &&
+			(!(g_ftdm_sngss7_data.cfg.relay[x].flags & SNGSS7_CONFIGURED))) {
+
+			/* send the specific configuration */
+			if (ftmod_ss7_relay_chan_config(x)) {
+				SS7_CRITICAL("Relay Channel %d configuration FAILED!\n", x);
 				return 1;
 			} else {
-				SS7_INFO("ISUP CKT %d configuration DONE!\n", x);
+				SS7_INFO("Relay Channel %d configuration DONE!\n", x);
 			}
 
 			/* set the SNGSS7_CONFIGURED flag */
-			g_ftdm_sngss7_data.cfg.isupCkt[x].flags |= SNGSS7_CONFIGURED;
+			g_ftdm_sngss7_data.cfg.relay[x].flags |= SNGSS7_CONFIGURED;
 		} /* if !SNGSS7_CONFIGURED */
-		
 		x++;
-	} /* while (g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0) */
-
+	} /* while (x < (MAX_RELAY_CHANNELS)) */
+	
 	return 0;
 }
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
index 790b893a8d..176de9e627 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
@@ -810,6 +810,11 @@ void handle_sng_relay_alarm(Pst *pst, RyMngmt *sta)
 
 		break;
 	/**************************************************************************/
+	case (LRY_USTA_TCP_CONN_FAILED):
+		ftdm_log(FTDM_LOG_ERROR,"[RELAY] TCP connection failed \n" );
+
+		break;
+	/**************************************************************************/
 	default:
 		ftdm_log(FTDM_LOG_ERROR,"Unknown Relay Alram\n");
 		break;
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 cd7f3ad58e..93d76fc8e7 100644
--- 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
@@ -1166,10 +1166,24 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 	/**************************************************************************/
 	case FTDM_CHANNEL_STATE_SUSPENDED:	/* circuit has been blocked */
 
-		  SS7_DEBUG_CHAN(ftdmchan,"SUSPEND: Current flags: ckt=0x%X, blk=0x%X\n", 
-									sngss7_info->ckt_flags,
-									sngss7_info->blk_flags);
-
+		SS7_DEBUG_CHAN(ftdmchan,"SUSPEND: Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n", 
+					sngss7_info->ckt_flags, sngss7_info->blk_flags,
+					sngss7_info->circuit->flags );
+		
+		if (!(sngss7_info->circuit->flags & SNGSS7_CONFIGURED)) {
+			if (  !sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED) 
+			    ||(sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_RESUME))) {
+				if (ftmod_ss7_isup_ckt_config(sngss7_info->circuit->id)) {
+					SS7_CRITICAL("ISUP CKT %d configuration FAILED!\n", sngss7_info->circuit->id);
+					*(int*)0=0;
+					return 1;
+				} else {
+					SS7_INFO("ISUP CKT %d configuration DONE!\n", sngss7_info->circuit->id);
+				}
+				sngss7_info->circuit->flags |= SNGSS7_CONFIGURED;
+			}
+		}
+		 
 		/**********************************************************************/
 		if (sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_RESUME)) {
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index aa50ce2264..4f18459018 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -1943,6 +1943,7 @@ ftdm_status_t check_status_of_all_isup_intf(void)
 
 		if (ftmod_ss7_isup_intf_sta(sngss7_intf->id, &status)) {
 			SS7_ERROR("Failed to get status of ISUP intf %d\n", sngss7_intf->id);
+			sngss7_set_flag(sngss7_intf, SNGSS7_PAUSED);
 			continue;
 		}
 

From e293c1253583a97a5e6b3358213bfb62f88eadf2 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Tue, 15 Nov 2011 18:26:13 -0500
Subject: [PATCH 047/102] freetdm: fix loc_nadi value

---
 libs/freetdm/mod_freetdm/mod_freetdm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index b2df0e40ac..2d946f3c59 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1796,7 +1796,8 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LOC-Presentation", "%s", var_value);
 		}
 
-		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_loc_pres_nadi");
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_loc_nadi");
+		printf ( "ss7_loc_nadi = %s \n " , var_value );
 		if (!ftdm_strlen_zero(var_value)) {
 			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LOC-NADI", "%s", var_value);
 		}

From cb1d5be5e6ce84a89c00026b97c64bbadee9362f Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 17 Nov 2011 15:43:40 -0500
Subject: [PATCH 048/102] freetdm: fix redirection presentation number in
 X-header

---
 libs/freetdm/mod_freetdm/mod_freetdm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 2d946f3c59..c9daadac12 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1720,7 +1720,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdnis_pres_ind");
 		if (!ftdm_strlen_zero(var_value)) {
-			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-Presentation", "%d", channel_caller_data->rdnis.plan);
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-Presentation", "%s", var_value);
 		}
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_digits");

From 69c62f7b388ceaae3d16ff2d26b5f0d94e119a06 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Thu, 24 Nov 2011 19:19:58 -0500
Subject: [PATCH 049/102] Fixed the out of sequence frame condition Redmine
 Bug#1966 IAM -> <-REL <-ACM <-ANM

ACM sets the reset flag
ANM sets the group reset flag
when both reset flags are set we got into infinite loop
---
 .../ftmod_sangoma_ss7_handle.c                | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 25967e5977..cacbf15170 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -322,12 +322,14 @@ handle_glare:
 	default:	/* should not have gotten an IAM while in this state */
 		SS7_ERROR_CHAN(ftdmchan, "Got IAM on channel in invalid state(%s)...reset!\n", ftdm_channel_state2str (ftdmchan->state));
 
-		/* reset the cic */
-		sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
-
-		/* move the state of the channel to RESTART to force a reset */
-		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+		/* throw the TX reset flag */
+		if (!sngss7_tx_reset_status_pending(sngss7_info)) {
+			sngss7_info->ckt_flags=0;
+			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
+			/* go to RESTART */
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+		}
 		break;
 	/**************************************************************************/
 	} /* switch (ftdmchan->state) */
@@ -393,11 +395,14 @@ ftdm_status_t handle_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			SS7_ERROR_CHAN(ftdmchan, "RX ACM in invalid state :%s...resetting CIC\n", 
 									ftdm_channel_state2str (ftdmchan->state));
 
-			/* reset the cic */
-			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
+			/* throw the TX reset flag */
+			if (!sngss7_tx_reset_status_pending(sngss7_info)) {
+				sngss7_info->ckt_flags=0;
+				sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
-			/* go to RESTART */
-			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+				/* go to RESTART */
+				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+			}
 			break;
 		/**********************************************************************/
 		} /* switch (ftdmchan->state) */
@@ -657,10 +662,13 @@ ftdm_status_t handle_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Rx ANM/CON\n", sngss7_info->circuit->cic);
 
 		/* throw the TX reset flag */
-		sngss7_set_ckt_flag(sngss7_info, FLAG_GRP_RESET_TX);
+		if (!sngss7_tx_reset_status_pending(sngss7_info)) {
+			sngss7_info->ckt_flags=0;
+			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
-		/* go to RESTART */
-		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+			/* go to RESTART */
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+		}
 
 		break;
 	/**************************************************************************/

From 5b8af78a897ea2716da18e5be913eca71e72f7f1 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Fri, 25 Nov 2011 21:05:39 -0500
Subject: [PATCH 050/102] Fixed 5 relay conditions M UP  -> S UP M Down -> S UP
 -> M UP M UP -> S UP -> relay down -> relay up M UP -> S UP -> Kill M -> M UP
 M Up -> S UP -> relay down -> M link down -> relay up -> M link up

---
 .../ftmod_sangoma_ss7_main.c                  | 15 ++++++++------
 .../ftmod_sangoma_ss7_relay.c                 |  8 +++-----
 .../ftmod_sangoma_ss7_support.c               | 20 ++++++++++++++++---
 3 files changed, 29 insertions(+), 14 deletions(-)

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 93d76fc8e7..468c8b0a83 100644
--- 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
@@ -1171,16 +1171,19 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 					sngss7_info->circuit->flags );
 		
 		if (!(sngss7_info->circuit->flags & SNGSS7_CONFIGURED)) {
-			if (  !sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED) 
-			    ||(sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_RESUME))) {
+			/* Configure the circuit if RESUME and PAUSED are not set.
+			   And also in a case when RESUME is set */
+			if (!sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED) ||
+			     sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_RESUME)) {
 				if (ftmod_ss7_isup_ckt_config(sngss7_info->circuit->id)) {
 					SS7_CRITICAL("ISUP CKT %d configuration FAILED!\n", sngss7_info->circuit->id);
-					*(int*)0=0;
-					return 1;
+					sngss7_set_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
+					sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_RESUME);
 				} else {
 					SS7_INFO("ISUP CKT %d configuration DONE!\n", sngss7_info->circuit->id);
+					sngss7_info->circuit->flags |= SNGSS7_CONFIGURED;
+					sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 				}
-				sngss7_info->circuit->flags |= SNGSS7_CONFIGURED;
 			}
 		}
 		 
@@ -1391,7 +1394,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* check the last state and return to it to allow the call to finish */
 			goto suspend_goto_last;
 		}
-
+		
 		if (sngss7_test_ckt_blk_flag (sngss7_info, FLAG_CKT_MN_UNBLK_TX)) {
 
 			SS7_DEBUG_CHAN(ftdmchan, "Processing CKT_MN_UNBLK_TX flag %s\n", "");
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
index a96dae5cdd..0fb496843f 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
@@ -64,11 +64,9 @@ ftdm_status_t handle_relay_connect(RyMngmt *sta)
 	
 	SS7_INFO("Relay Channel %d connection UP\n", sng_relay->id);
 	if (sng_relay->type == LRY_CT_TCP_CLIENT) {
-		if (!sngss7_test_flag(sng_relay, SNGSS7_RELAY_INIT)) {
-			if (reconfig_all_ckts_for_relay()) {
-				SS7_ERROR("Failed to reconfigure ISUP Ckts!\n");
-				/* we're done....this is very bad! */
-			}
+		if (reconfig_all_ckts_for_relay()) {
+			SS7_ERROR("Failed to reconfigure ISUP Ckts!\n");
+			/* we're done....this is very bad! */
 		}
 		return FTDM_SUCCESS;
 	} else if (sng_relay->type == LRY_CT_TCP_SERVER) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 4f18459018..6d5880073d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -2110,6 +2110,7 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 	uint8_t				bits_ef = 0;
 	int 				x;
 	int					ret;
+	ret=0;
 
 	for (x = 1; x < (ftdmspan->chan_count + 1); x++) {
 	/**************************************************************************/
@@ -2147,6 +2148,10 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 
 			/* query for the status of the ckt */
 			if (ftmod_ss7_isup_ckt_sta(sngss7_info->circuit->id, &state)) {
+				/* NC: Circuit statistic failed: does not exist. Must re-configure circuit
+				       Reset the circuit CONFIGURED flag so that RESUME will reconfigure
+				       this circuit. */
+				sngss7_info->circuit->flags &= ~SNGSS7_CONFIGURED;
 				SS7_ERROR("Failed to read isup ckt = %d status\n", sngss7_info->circuit->id);
 				continue;
 			}
@@ -2159,6 +2164,14 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 			if (bits_cd == 0x0) {
 				/* check if circuit is UCIC or transient */
 				if (bits_ab == 0x3) {
+					SS7_INFO("ISUP CKT %d re-configuration pending!\n", x);
+					sngss7_info->circuit->flags &= ~SNGSS7_CONFIGURED;
+					SS7_STATE_CHANGE(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+
+					/* NC: The code below should be deleted. Its here for hitorical
+					       reason. The RESUME code will reconfigure the channel since
+					       the CONFIGURED flag has been reset */
+#if 0
 					/* bit a and bit b are set, unequipped */
 					ret = ftmod_ss7_isup_ckt_config(sngss7_info->circuit->id);
 					if (ret) {
@@ -2181,6 +2194,7 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 			
 					/* unlock the channel */
 					ftdm_mutex_unlock(ftdmchan->mutex);
+#endif
 
 				} /* if (bits_ab == 0x3) */
 			} else {
@@ -2192,8 +2206,8 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 					break;
 				/**************************************************************************/
 				case (1):
-					/* locally blocked */
-					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX);
+					/* locally blocked: Therefore we need to state machine to send an unblock */
+					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX);
 
 					/* set the channel to suspended state */
 					SS7_STATE_CHANGE(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
@@ -2209,7 +2223,7 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 				/**************************************************************************/
 				case (3):
 					/* both locally and remotely blocked */
-					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX);
+					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX);
 					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX);
 
 					/* set the channel to suspended state */

From 96068d901de9a0250762e39faa53e2908950c103 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Tue, 29 Nov 2011 13:11:38 -0500
Subject: [PATCH 051/102] Fixed case

S UP - Place Call - relay down - Hangup - relay up -
Confirm Call hangsup up properly and unblock is set.

Fixed unexpeced reset condidtions.
---
 .../ftmod_sangoma_ss7_handle.c                | 16 ++++++--
 .../ftmod_sangoma_ss7_main.c                  |  9 ++++-
 .../ftmod_sangoma_ss7_support.c               | 39 ++++++++++++++-----
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index cacbf15170..e61dc9426e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -325,6 +325,7 @@ handle_glare:
 		/* throw the TX reset flag */
 		if (!sngss7_tx_reset_status_pending(sngss7_info)) {
 			sngss7_info->ckt_flags=0;
+			sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
 			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
 			/* go to RESTART */
@@ -398,6 +399,7 @@ ftdm_status_t handle_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			/* throw the TX reset flag */
 			if (!sngss7_tx_reset_status_pending(sngss7_info)) {
 				sngss7_info->ckt_flags=0;
+				sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
 				sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
 				/* go to RESTART */
@@ -664,6 +666,7 @@ ftdm_status_t handle_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 		/* throw the TX reset flag */
 		if (!sngss7_tx_reset_status_pending(sngss7_info)) {
 			sngss7_info->ckt_flags=0;
+			sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
 			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
 			/* go to RESTART */
@@ -788,11 +791,15 @@ ftdm_status_t handle_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	/**************************************************************************/
 	default:
 
-		/* throw the reset flag */
-		sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_RX);
+		/* throw the TX reset flag */
+		if (!sngss7_tx_reset_status_pending(sngss7_info)) {
+		    sngss7_info->ckt_flags=0;
+				sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
+		    sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
-		/* set the state to RESTART */
-		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+		    /* go to RESTART */
+		    ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+		}
 		break;
 	/**************************************************************************/
 	} /* switch (ftdmchan->state) */
@@ -1836,6 +1843,7 @@ ftdm_status_t handle_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	default:
 
 		/* set the state of the channel to restart...the rest is done by the chan monitor */
+		sngss7_set_ckt_flag(sngss7_info, FLAG_REMOTE_REL);
 		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
 		break;
 	/**************************************************************************/
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 468c8b0a83..7350a478ef 100644
--- 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
@@ -588,7 +588,11 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 	int state_flag = 1; 
 	int i = 0;
 
-	SS7_DEBUG_CHAN(ftdmchan, "ftmod_sangoma_ss7 processing state %s\n", ftdm_channel_state2str (ftdmchan->state));
+	SS7_DEBUG_CHAN(ftdmchan, "ftmod_sangoma_ss7 processing state %s: ckt=0x%X, blk=0x%X\n", 
+						ftdm_channel_state2str (ftdmchan->state),
+									sngss7_info->ckt_flags,
+									sngss7_info->blk_flags);
+
 
 	/*check what state we are supposed to be in */
 	switch (ftdmchan->state) {
@@ -863,6 +867,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		}
 
 		if (sngss7_test_ckt_flag (sngss7_info, FLAG_REMOTE_REL)) {
+		
+			sngss7_clear_ckt_flag (sngss7_info, FLAG_LOCAL_REL);
+
 			/* check if this hangup is from a tx RSC */
 			if (sngss7_test_ckt_flag (sngss7_info, FLAG_RESET_TX)) {
 				if (!sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_SENT)) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 6d5880073d..47fdd47728 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -2135,12 +2135,12 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 
 			/* check if the interface is paused or resumed */
 			if (sngss7_test_flag(sngss7_intf, SNGSS7_PAUSED)) {
-				ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "ISUP intf %d is PAUSED\n", sngss7_intf->id);
+				ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Circuit set to PAUSED %s\n"," ");
 				/* throw the pause flag */
 				sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_RESUME);
 				sngss7_set_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 			} else {
-				ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "ISUP intf %d is RESUMED\n", sngss7_intf->id);
+				ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Circuit set to RESUMED %s\n"," ");
 				/* throw the resume flag */
 				sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 				sngss7_set_ckt_flag(sngss7_info, FLAG_INFID_RESUME);
@@ -2152,7 +2152,7 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 				       Reset the circuit CONFIGURED flag so that RESUME will reconfigure
 				       this circuit. */
 				sngss7_info->circuit->flags &= ~SNGSS7_CONFIGURED;
-				SS7_ERROR("Failed to read isup ckt = %d status\n", sngss7_info->circuit->id);
+				ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR,"Failed to read isup ckt = %d status\n", sngss7_info->circuit->id);
 				continue;
 			}
 
@@ -2160,6 +2160,8 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 			bits_ab = (state & (SNG_BIT_A + SNG_BIT_B)) >> 0;
 			bits_cd = (state & (SNG_BIT_C + SNG_BIT_D)) >> 2;
 			bits_ef = (state & (SNG_BIT_E + SNG_BIT_F)) >> 4;
+					
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Circuit state=0x%X ab=0x%X cd=0x%X ef=0x%X\n",state,bits_ab,bits_cd,bits_ef);
 
 			if (bits_cd == 0x0) {
 				/* check if circuit is UCIC or transient */
@@ -2196,7 +2198,20 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 					ftdm_mutex_unlock(ftdmchan->mutex);
 #endif
 
-				} /* if (bits_ab == 0x3) */
+				} else { /* if (bits_ab == 0x3) */
+					/* The stack status is not blocked.  However this is possible if
+					   the circuit state was UP. So even though Master sent out the BLO
+					   the status command is not showing it.  
+					   
+					   As a kudge. We will try to send out an UBL even though the status
+					   indicates that there is no BLO.  */
+					if (!sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX)) {
+						sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX);
+
+						/* set the channel to suspended state */
+						SS7_STATE_CHANGE(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+					}
+				}
 			} else {
 				/* check the maintenance block status in bits A and B */
 				switch (bits_ab) {
@@ -2206,11 +2221,17 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 					break;
 				/**************************************************************************/
 				case (1):
-					/* locally blocked: Therefore we need to state machine to send an unblock */
-					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX);
+					/* The stack status is Blocked.  Check if the block was sent
+					   by user via console.  If the block was not sent by user then, it 
+					   was sent out by Master due to relay down.  
+					   Therefore send out the unblock to clear it */
+					if (!sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX)) {
+						sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX);
+
+						/* set the channel to suspended state */
+						SS7_STATE_CHANGE(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+					}
 
-					/* set the channel to suspended state */
-					SS7_STATE_CHANGE(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 					break;
 				/**************************************************************************/
 				case (2):
@@ -2276,7 +2297,7 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 			/* clear the re-config flag ... no matter what */
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_CKT_RECONFIG);
 
-		} /* if ((sngss7_test_ckt_flag(sngss7_info, FLAG_CKT_RECONFIG)) */
+		} 
 	} /* for (x = 1; x < (span->chan_count + 1); x++) */
 
 	return FTDM_SUCCESS;

From fa64d3954d0eac9667c63d992fac6b4364e8c912 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Wed, 30 Nov 2011 19:11:33 -0500
Subject: [PATCH 052/102] Sigificant changes to the core state machine :)
 Visually status of channels will only be DOWN once all resets/blocks are
 cleared. Therefore if any reset/block is active on a channel, the channel
 state will be in RESTART not DOWN.

Logic Change

SUSPENDED
   -> Originally used as intermediate state. Purpose is to handle a condition
      from any state and go back to the previous state.
      Conditions: such as  block/ucic.
   -> Updated logic is that SUSPEND will be smart enough not to
      go back to just any state.  SUSPEND will only go back to
      UP - if call is still up
      RESTART - if for any reason singaling is not up due to
                blocks/resets/etc...
      DOWN - if signaling is UP - no resets/blocks
      In this case we avoid infinite loops due to state jumping
      from STATE->SUSPEND->STATE->SUSPEND
HANGUP_COMPLETE
   -> If call is in use and a RESET comes on a call
      the RESTART state will first try the HANGUP_COMPLETE state.
      HANGUP_COMPLETE will Tx RSC and wait for it.
      Reset Response handle was updated if current state HANGUP/HANGUP_COMPLETE
      go back to RESTART state.  Which will call HANGUP COMPLETE due to
      channel in usage and HANDLE_COMPLETE will clear RESET condition and go back to DOWN
TERMINATING
   -> This state is used to hangup a call. Sends a signal to FS.
   -> Usually TERMINATING state stays in TERMINATING until FS comes back.
   -> I added a condition in case of RESET on the line though TERMINATING
      will go back to RESTART.
      This allows us to process RESET commands even though we are
      in the middle of hanging up.
Block Handler
   If BLO is received on circuit is already blocked,
   we failed to trasmit BLA.  We should always ack the BLO
   even though it was alrady in blocked state.

Fixed & Tested

S UP --> place call --> relay down --> hangup --> relay up-->
   Confirm that call is hungup properly.
   In this condition, on relay up the circuit  is put into RESET.
   Since circuit is still in use, it will HANGUP first, then RESET
   then clear pending BLOCK.

S UP --> place call -> Tx RSC on call.
   Used to cause infitie loop
   Confirm call is cleard properly

Re-Tested

S UP --> place call -> Rx RSC on call
   Confirm call is cleard properly

S UP --> place call -> Rx BLO -> hangup -> place call
   Confirm call cannot be placed
   Tx UBL
   Confirm call can be placed

S UP --> place call -> Rx BLO -> Tx BLO -> hangup -> place call
   Confirm call cannot be placed
   Tx UBL
   Confirm call cannot be placed
   Rx UBL
   Confirm call can be placed

S UP --> place call -> relay down --> Rx BLO on channel from telco
     --> relay up
   Confirm that relay detects the BLO channels even though relay was down

Tx AIS -> S Start -> Confirm HW block -> Tx AIS off
   -> Confirm hw block clear and UP

S UP -> Tx AIS -> Confirm HW block -> Tx AIS off
   -> confirm hw block clear and UP

S UP -> relay down -> Tx AIS -> relay up -> Tx AIS off
   -> confirm all back up
   -> In this condition BLO will not go out due to PAUSE

S UP -> Tx AIS -> relay down -> Tx AIS off -> relay up
   -> confirm all back up
   -> In this condition UBL will not go out due to PAUSE
---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c |  2 +
 .../ftmod_sangoma_ss7_handle.c                |  4 +-
 .../ftmod_sangoma_ss7_main.c                  | 75 ++++++++++++-------
 .../ftmod_sangoma_ss7_main.h                  | 16 ++--
 .../ftmod_sangoma_ss7_support.c               |  3 +
 5 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
index 9eb737a7f3..1b24b9f8da 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
@@ -1632,6 +1632,8 @@ static ftdm_status_t handle_tx_rsc(ftdm_stream_handle_t *stream, int span, int c
 				ftdm_mutex_lock(ftdmchan->mutex);
 
 				/* throw the reset flag */
+				sngss7_set_ckt_flag (sngss7_info, FLAG_LOCAL_REL);
+				sngss7_clear_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
 				sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
 				switch (ftdmchan->state) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index e61dc9426e..64c4c9252d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -1646,10 +1646,12 @@ ftdm_status_t handle_blo_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	/* check if the circuit is already blocked or not */
 	if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX)) {
 		SS7_WARN("Received BLO on circuit that is already blocked!\n");
+		sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX_DN);
 	}
 
 	/* throw the ckt block flag */
 	sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX);
+	sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX_DN);
 
 	/* set the channel to suspended state */
 	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
@@ -1981,7 +1983,7 @@ ftdm_status_t handle_rsc_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 		sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX_RSP);
 
 		/* go to DOWN */
-		/*ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);*/
+		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
 
 		break;
 	/**********************************************************************/
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 7350a478ef..1b7af43bc8 100644
--- 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
@@ -453,7 +453,7 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 
 		/* check each channel on the span to see if it needs to be reconfigured */
 		check_for_reconfig_flag(ftdmspan);
-
+		
 		/* Poll for events, e.g HW DTMF */
 		switch (ftdm_span_poll_event(ftdmspan, 0, NULL)) {
 		/**********************************************************************/
@@ -825,6 +825,14 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 		/*this state is set when the line is hanging up */
 		sngss7_send_signal(sngss7_info, FTDM_SIGEVENT_STOP);
+			
+		/* If the RESET flag is set, do not say in TERMINATING state.
+		   Go back to RESTART state and wait for RESET Confirmation */ 
+		if (sngss7_tx_reset_status_pending(sngss7_info)) {
+			SS7_DEBUG_CHAN(ftdmchan,"Reset pending in Terminating state!%s\n", "");
+			state_flag = 0;
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+		}
 
 		break;
 	/**************************************************************************/
@@ -880,9 +888,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 					state_flag = 0;
 					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 				} else {
-					/* go to RESTART State until RSCa is received */
-					state_flag = 0;
-					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+					/* Stay in hangup complete until RSC is received */
+					/* Channel is in use if we go to RESTART we will 
+					   restart will just come back to HANGUP_COMPLETE */
 				}	
 			} else {
 				/* if the hangup is from a rx RSC, rx GRS, or glare don't sent RLC */
@@ -901,6 +909,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 			SS7_DEBUG_CHAN(ftdmchan,"Completing remotely requested hangup!%s\n", "");
 		} else if (sngss7_test_ckt_flag (sngss7_info, FLAG_LOCAL_REL)) {
+			
 
 			/* if this hang up is do to a rx RESET we need to sit here till the RSP arrives */
 			if (sngss7_test_ckt_flag (sngss7_info, FLAG_RESET_TX_RSP)) {
@@ -923,10 +932,12 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 	/**************************************************************************/
 	case FTDM_CHANNEL_STATE_DOWN:	/*the call is finished and removed */
-
-		if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
-			SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
-			break;
+					
+		if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) { 
+			if (!ftdm_test_flag (ftdmchan, FTDM_CHANNEL_OPEN)) {
+				SS7_DEBUG_CHAN(ftdmchan,"Down came from SUSPEND - break %s\n", "");
+				break;
+			}
 		}
 
 		/* check if there is a reset response that needs to be sent */
@@ -997,7 +1008,10 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 					} /* if (!ftdm_test_flag (ftdmchan, FTDM_CHANNEL_SIG_UP)) */
 				} else {
 					state_flag = 0;
+					SS7_DEBUG_CHAN(ftdmchan,"Down detected blocked flags go to SUSPEND %s\n", " ");
 					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+					break;
+			
 				}	/* if !blocked */
 			} else {
 				SS7_DEBUG_CHAN(ftdmchan,"Reset flags present (0x%X)\n", sngss7_info->ckt_flags);
@@ -1029,6 +1043,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		if (ftdm_test_flag (ftdmchan, FTDM_CHANNEL_OPEN)) {
 			ftdm_channel_t *close_chan = ftdmchan;
 			/* close the channel */
+			SS7_DEBUG_CHAN(ftdmchan,"FTDM Channel Close %s\n", "");
 			ftdm_channel_close (&close_chan);
 		}
 
@@ -1205,6 +1220,14 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* clear the PAUSE flag */
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 
+			if (sngss7_test_ckt_flag (sngss7_info, FLAG_LOCAL_REL)) {
+				SS7_DEBUG_CHAN(ftdmchan, "Channel local release on RESUME, restart Reset procedure%s\n", "");
+				/* By setting RESET_TX flag the check below sngss7_tx_reset_status_pending() will
+				   be true, and will restart the RESET TX procedure */
+				sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
+				sngss7_set_ckt_flag (sngss7_info, FLAG_RESET_TX);
+			}	
+
 			/* We have transmitted Reset/GRS but have not gotten a
 			 * Response. In mean time we got a RESUME. We cannot be sure
 			 * that our reset has been trasmitted, thus restart reset procedure. */ 
@@ -1250,7 +1273,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			}
 
 			/* Wait for RESUME */
-			/* FIXME: Check if this is a correct action to wait for RESUME */
 			goto suspend_goto_last;
 		} /* if (sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED)) { */
 
@@ -1269,8 +1291,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* throw the done flag */
 			sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX_DN);
 
-			/* check the last state and return to it to allow the call to finish */
-			goto suspend_goto_last;
 		}
 
 		if (sngss7_test_ckt_blk_flag (sngss7_info, FLAG_CKT_MN_UNBLK_RX)){
@@ -1283,7 +1303,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* clear the unblock flag */
 			sngss7_clear_ckt_blk_flag (sngss7_info, FLAG_CKT_MN_UNBLK_RX);
 
-		    SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X\n", 
+		    	SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X\n", 
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
 			/* not bring the cic up if there is a hardware block */
@@ -1295,8 +1315,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* send a uba */
 			ft_to_sngss7_uba (ftdmchan);
 
-			/* check the last state and return to it to allow the call to finish */
-			goto suspend_goto_last;
 		}
 
 
@@ -1316,7 +1334,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			}
 			sngss7_set_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_TX_DN);
 
-			goto suspend_goto_last;
 		}
 
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_UNBLK_TX)) {
@@ -1344,7 +1361,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				ft_to_sngss7_ubl(ftdmchan);
 			}
 
-			goto suspend_goto_last;
 		}
 
 		/**********************************************************************/
@@ -1398,8 +1414,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* throw the done flag */
 			sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX_DN);
 
-			/* check the last state and return to it to allow the call to finish */
-			goto suspend_goto_last;
 		}
 		
 		if (sngss7_test_ckt_blk_flag (sngss7_info, FLAG_CKT_MN_UNBLK_TX)) {
@@ -1423,8 +1437,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				ft_to_sngss7_ubl(ftdmchan);
 			}
 
-			/* check the last state and return to it to allow the call to finish */
-			goto suspend_goto_last;
 		}
 
 		/**********************************************************************/
@@ -1442,8 +1454,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* bring the sig status down */
 			sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_DOWN);
 
-			/* check the last state and return to it to allow the call to finish */
-			goto suspend_goto_last;
 		}
 
 		if (sngss7_test_ckt_blk_flag (sngss7_info, FLAG_CKT_LC_UNBLK_RX)) {
@@ -1465,8 +1475,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			}
 
 
-			/* check the last state and return to it to allow the call to finish */
-			goto suspend_goto_last;
 		}
 		/**********************************************************************/
 		if (sngss7_test_ckt_blk_flag (sngss7_info, FLAG_CKT_UCIC_BLOCK) &&
@@ -1488,8 +1496,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* throw the done flag */
 			sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK_DN);
 			
-			/* bring the channel down */
-			goto suspend_goto_last;
 		}
 
 		if (sngss7_test_ckt_blk_flag (sngss7_info, FLAG_CKT_UCIC_UNBLK)) {
@@ -1521,6 +1527,23 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		SS7_DEBUG_CHAN(ftdmchan,"No block flag processed!%s\n", "");
 
 suspend_goto_last:
+		if (ftdmchan->last_state == FTDM_CHANNEL_STATE_UP) {
+			/* proceed to UP */
+		} else if (!sngss7_channel_status_clear(sngss7_info)) {
+			SS7_DEBUG_CHAN(ftdmchan,"Channel opted to stay in RESTART due to blocks!%s\n", "");
+			SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n",
+			                                         sngss7_info->ckt_flags, sngss7_info->blk_flags,
+			                                         sngss7_info->circuit->flags );
+
+			goto suspend_goto_restart;
+		} else { 	
+			SS7_DEBUG_CHAN(ftdmchan,"Channel signaling is up proceed to DOWN! [Last State=%i]\n", ftdmchan->last_state);
+			SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n",
+			                                         sngss7_info->ckt_flags, sngss7_info->blk_flags,
+			                                         sngss7_info->circuit->flags );
+			ftdmchan->last_state = FTDM_CHANNEL_STATE_DOWN;				
+		}
+
 		state_flag = 0;
 		ftdm_set_state(ftdmchan, ftdmchan->last_state);
 		break;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index b25b21f0ef..697da825cb 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -1049,11 +1049,13 @@ if (ftdmchan->state == new_state) { \
 #define sngss7_set_options(obj, option)   ((obj)->options |= (option))
 
 #define sngss7_tx_block_status_clear(obj) (!sngss7_test_ckt_blk_flag(obj, (FLAG_CKT_MN_BLOCK_TX | \
-													  		       FLAG_CKT_MN_BLOCK_TX_DN | \
-														  	       FLAG_GRP_MN_BLOCK_TX | \
-														  	       FLAG_GRP_MN_BLOCK_TX_DN | \
-															       FLAG_GRP_HW_BLOCK_TX | \
-															       FLAG_GRP_HW_BLOCK_TX_DN ))) 
+								           FLAG_CKT_MN_BLOCK_TX_DN | \
+									   FLAG_GRP_MN_BLOCK_TX | \
+									   FLAG_GRP_MN_BLOCK_TX_DN | \
+									   FLAG_GRP_HW_BLOCK_TX | \
+									   FLAG_GRP_HW_BLOCK_TX_DN | \
+			       						   FLAG_GRP_HW_UNBLK_TX | \
+									   FLAG_CKT_MN_UNBLK_TX	))) 
 
 #define sngss7_block_status_clear(obj) (obj->blk_flags == 0)
 
@@ -1062,10 +1064,12 @@ if (ftdmchan->state == new_state) { \
 														  	FLAG_GRP_RESET_TX | \
 														  	FLAG_GRP_RESET_RX )))
 
-#define sngss7_tx_reset_status_pending(obj) ((sngss7_test_ckt_flag(obj, (FLAG_RESET_TX)) && \
+#define sngss7_tx_reset_sent(obj) ((sngss7_test_ckt_flag(obj, (FLAG_RESET_TX)) && \
 											  sngss7_test_ckt_flag(obj, (FLAG_RESET_SENT))) || \
 											 (sngss7_test_ckt_flag(obj, (FLAG_GRP_RESET_TX)) && \
 											  sngss7_test_ckt_flag(obj, (FLAG_GRP_RESET_SENT))))
+
+#define sngss7_tx_reset_status_pending(obj) (sngss7_test_ckt_flag(obj, (FLAG_RESET_TX)) || sngss7_test_ckt_flag(obj, (FLAG_GRP_RESET_TX))) 
 	
 #define sngss7_channel_status_clear(obj) ((sngss7_block_status_clear(obj)) && (sngss7_reset_status_clear(obj)))
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 47fdd47728..7a68fe318f 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -2232,6 +2232,9 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 						SS7_STATE_CHANGE(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 					}
 
+					/* Only locally blocked, thus remove a remote block */
+					sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX);
+
 					break;
 				/**************************************************************************/
 				case (2):

From 997c127a9405af27f041c07a87395d10bcef63c4 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Wed, 30 Nov 2011 20:02:25 -0500
Subject: [PATCH 053/102] Fixed following two secnarios From previous commit,
 failed to clear the done flag _DN which cause SUSPEND to think that there was
 a block pending, causing state to remain in RESTART

S UP -> relay down -> Tx AIS -> relay up -> Tx AIS off
  -> confirm all back up
  -> In this condition BLO will not go out due to PAUSE

S UP -> Tx AIS -> relay down -> Tx AIS off -> relay up
  -> confirm all back up
  -> In this condition UBL will not go out due to PAUSE
---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c | 4 +++-
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c    | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 64c4c9252d..e7cc9db573 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -122,8 +122,11 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 		/* as per Q.764, 2.8.2.3 xiv ... remove the block from this channel */
 		sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX);
+		sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX_DN);
 		sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_RX);
+		sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_HW_BLOCK_RX_DN);
 		sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX);
+		sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX_DN);
 
 		/* KONRAD FIX ME : check in case there is a ckt and grp block */
 	}
@@ -1646,7 +1649,6 @@ ftdm_status_t handle_blo_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	/* check if the circuit is already blocked or not */
 	if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX)) {
 		SS7_WARN("Received BLO on circuit that is already blocked!\n");
-		sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX_DN);
 	}
 
 	/* throw the ckt block flag */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 7a68fe318f..eb1eb12961 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -2234,12 +2234,14 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 
 					/* Only locally blocked, thus remove a remote block */
 					sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX);
+					sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX_DN);
 
 					break;
 				/**************************************************************************/
 				case (2):
 					/* remotely blocked */
 					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX);
+					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX_DN);
 
 					/* set the channel to suspended state */
 					SS7_STATE_CHANGE(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
@@ -2247,8 +2249,11 @@ ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 				/**************************************************************************/
 				case (3):
 					/* both locally and remotely blocked */
-					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX);
+					if (!sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX)) {
+						sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_UNBLK_TX);
+					}
 					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX);
+					sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX_DN);
 
 					/* set the channel to suspended state */
 					SS7_STATE_CHANGE(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);

From 7b83dd4c968f9769c58b8ef89a83eb55a8218df3 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 1 Dec 2011 03:16:59 -0500
Subject: [PATCH 054/102] Fixed the exception condition - trigger reset 	used
 to clear ckt_flags, this was wrong. 	if ctk_flags are blindly cleard a
 PAUSE might be cleared. 	changed the code to clear only TX RESET and
 try to reset again.

Release Collision
	If we get out of sync with other side we must
	reset the circuit.
    This condition occoured at 1+3 test box

Local Management Block
    Its possible for stack to send us a BLO indicating to us
    that we are local blocked.  This case never worked and
    we would get stuck there forever.
    If we never manaully sent a LOCAL block, the BLO from
    the stack will be acked and then unblocked.
    This condition occoured at 1+3 test box
---
 libs/freetdm/src/ftdm_state.c                 |  1 +
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c |  2 +-
 .../ftmod_sangoma_ss7_handle.c                | 19 +++----
 .../ftmod_sangoma_ss7_main.c                  | 24 ++++++---
 .../ftmod_sangoma_ss7_main.h                  | 11 ++++-
 .../ftmod_sangoma_ss7_support.c               | 49 +++++++++++++++++++
 libs/freetdm/src/include/private/ftdm_core.h  |  1 +
 7 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/libs/freetdm/src/ftdm_state.c b/libs/freetdm/src/ftdm_state.c
index d3f99f6074..6572ab75a4 100644
--- a/libs/freetdm/src/ftdm_state.c
+++ b/libs/freetdm/src/ftdm_state.c
@@ -87,6 +87,7 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_complete_state(const char *file, const c
 	ftdm_assert(!fchan->history[hindex].end_time, "End time should be zero!\n");
 
 	fchan->history[hindex].end_time = ftdm_current_time_in_ms();
+	fchan->last_state_change_time = ftdm_current_time_in_ms();
 
 	fchan->state_status = FTDM_STATE_STATUS_COMPLETED;
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
index 1b24b9f8da..2c8f5172b9 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
@@ -1634,7 +1634,7 @@ static ftdm_status_t handle_tx_rsc(ftdm_stream_handle_t *stream, int span, int c
 				/* throw the reset flag */
 				sngss7_set_ckt_flag (sngss7_info, FLAG_LOCAL_REL);
 				sngss7_clear_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
-				sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
+				sngss7_tx_reset_restart(sngss7_info);
 
 				switch (ftdmchan->state) {
 				/**************************************************************************/
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index e7cc9db573..295d127064 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -327,9 +327,8 @@ handle_glare:
 
 		/* throw the TX reset flag */
 		if (!sngss7_tx_reset_status_pending(sngss7_info)) {
-			sngss7_info->ckt_flags=0;
+			sngss7_tx_reset_restart(sngss7_info);
 			sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
-			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
 			/* go to RESTART */
 			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
@@ -401,9 +400,8 @@ ftdm_status_t handle_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 			/* throw the TX reset flag */
 			if (!sngss7_tx_reset_status_pending(sngss7_info)) {
-				sngss7_info->ckt_flags=0;
+				sngss7_tx_reset_restart(sngss7_info);
 				sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
-				sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
 				/* go to RESTART */
 				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
@@ -668,9 +666,8 @@ ftdm_status_t handle_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 		/* throw the TX reset flag */
 		if (!sngss7_tx_reset_status_pending(sngss7_info)) {
-			sngss7_info->ckt_flags=0;
+			sngss7_tx_reset_restart(sngss7_info);
 			sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
-			sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
 
 			/* go to RESTART */
 			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
@@ -772,6 +769,10 @@ ftdm_status_t handle_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 			/* send out the release complete */
 			ft_to_sngss7_rlc (ftdmchan);
+		} else {
+			SS7_DEBUG_CHAN(ftdmchan, "Collision of REL messages - resetting state.\n", " ");
+			ft_to_sngss7_rlc (ftdmchan);
+			goto rel_ind_reset;
 		}
 		break;
 	/**************************************************************************/
@@ -794,11 +795,11 @@ ftdm_status_t handle_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	/**************************************************************************/
 	default:
 
+rel_ind_reset:
 		/* throw the TX reset flag */
 		if (!sngss7_tx_reset_status_pending(sngss7_info)) {
-		    sngss7_info->ckt_flags=0;
-				sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
-		    sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_TX);
+			sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);
+			sngss7_tx_reset_restart(sngss7_info);
 
 		    /* go to RESTART */
 		    ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
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 1b7af43bc8..4c6992e61f 100644
--- 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
@@ -1358,6 +1358,8 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			}
 
 			if (sngss7_tx_block_status_clear(sngss7_info) && !skip_unblock) {
+				sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX_DN);
+				sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX);
 				ft_to_sngss7_ubl(ftdmchan);
 			}
 
@@ -1434,6 +1436,8 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 			if (sngss7_tx_block_status_clear(sngss7_info)) {
 				/* send a ubl */
+				sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX_DN);
+				sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX);
 				ft_to_sngss7_ubl(ftdmchan);
 			}
 
@@ -1446,13 +1450,19 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			SS7_DEBUG_CHAN(ftdmchan, "Processing CKT_LC_BLOCK_RX flag %s\n", "");
 
 			/* send a BLA */
-			/*ft_to_sngss7_bla(ftdmchan);*/
+			ft_to_sngss7_bla(ftdmchan);
 
 			/* throw the done flag */
 			sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX_DN);
-
-			/* bring the sig status down */
-			sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_DOWN);
+			
+			if (sngss7_tx_block_status_clear(sngss7_info)) {
+				sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX_DN);
+				sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_BLOCK_RX);
+				ft_to_sngss7_ubl(ftdmchan);
+			} else {
+				/* bring the sig status down */
+				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_DOWN);
+			}
 
 		}
 
@@ -1468,7 +1478,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			sngss7_clear_ckt_blk_flag(sngss7_info, FLAG_CKT_LC_UNBLK_RX);
 
 			/* send a uba */
-			/*ft_to_sngss7_uba(ftdmchan);*/
+			ft_to_sngss7_uba(ftdmchan);
 			
 			if (sngss7_channel_status_clear(sngss7_info)) {
 				sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
@@ -1530,14 +1540,14 @@ suspend_goto_last:
 		if (ftdmchan->last_state == FTDM_CHANNEL_STATE_UP) {
 			/* proceed to UP */
 		} else if (!sngss7_channel_status_clear(sngss7_info)) {
-			SS7_DEBUG_CHAN(ftdmchan,"Channel opted to stay in RESTART due to blocks!%s\n", "");
+			SS7_DEBUG_CHAN(ftdmchan,"Channel opted to stay in RESTART due to reset/blocks!%s\n", "");
 			SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n",
 			                                         sngss7_info->ckt_flags, sngss7_info->blk_flags,
 			                                         sngss7_info->circuit->flags );
 
 			goto suspend_goto_restart;
 		} else { 	
-			SS7_DEBUG_CHAN(ftdmchan,"Channel signaling is up proceed to DOWN! [Last State=%i]\n", ftdmchan->last_state);
+			SS7_DEBUG_CHAN(ftdmchan,"Channel signaling is up proceed to DOWN! [Last State=%s]\n", ftdm_channel_state2str(ftdmchan->last_state));
 			SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n",
 			                                         sngss7_info->ckt_flags, sngss7_info->blk_flags,
 			                                         sngss7_info->circuit->flags );
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 697da825cb..631dadf007 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -1071,7 +1071,16 @@ if (ftdmchan->state == new_state) { \
 
 #define sngss7_tx_reset_status_pending(obj) (sngss7_test_ckt_flag(obj, (FLAG_RESET_TX)) || sngss7_test_ckt_flag(obj, (FLAG_GRP_RESET_TX))) 
 	
-#define sngss7_channel_status_clear(obj) ((sngss7_block_status_clear(obj)) && (sngss7_reset_status_clear(obj)))
+#define sngss7_channel_status_clear(obj) ((sngss7_block_status_clear(obj)) && \
+					  					  (sngss7_reset_status_clear(obj)) && \
+										  (!sngss7_test_ckt_flag((obj),FLAG_INFID_PAUSED)))
+
+#define sngss7_tx_reset_restart(obj) do { clear_tx_grs_flags((obj)); \
+										  clear_tx_grs_data((obj)); \
+            							  clear_tx_rsc_flags((obj)); \
+										  sngss7_set_ckt_flag((obj), (FLAG_RESET_TX)); \
+								     } while (0);
+ 
 
 
 #ifdef SMG_RELAY_DBG
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index eb1eb12961..7696974807 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -2098,6 +2098,55 @@ void sngss7_set_sig_status(sngss7_chan_data_t *sngss7_info, ftdm_signaling_statu
 	return;
 }
 
+#if 0
+ftdm_status_t check_for_invalid_states(ftdm_channel_t *ftmchan)
+{
+	sngss7_chan_data_t  *sngss7_info = ftdmchan->call_data;
+
+	if (!sngss7_info) {
+			SS7_WARN_CHAN(ftdmchan, "Found ftdmchan with no sig module data!%s\n", " ");
+			return FTDM_FAIL;
+	}	
+		
+	if (sngss7_test_flag(sngss7_intf, SNGSS7_PAUSED)) {
+		return FTDM_SUCCESS;
+	}
+
+	switch (ftdmchan->state) {
+	case UP:
+	case DOWN:	
+		return FTDM_SUCCESS;
+
+	default:
+		if ((ftdm_current_time_in_ms() - ftdmchan->last_state_change_time) > 30000) {
+			SS7_WARN_CHAN(ftdmchan, "Circuite in state=%s too long - resetting!%s\n", 
+								ftdm_channel_state2str(ftdmchan->state));
+
+			ftdm_channel_lock(ftdmchan);
+				
+			if (sngss7_channel_status_clear(sngss7_info)) {
+				sngss7_tx_reset_restart(sngss7_info);
+
+				if (ftdmchan->state == FTDM_CHANNEL_STATE_RESTART) { 
+					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+				} else {
+					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+				}
+			} else {
+
+			}	
+
+
+			
+			ftdm_channel_unlock(ftdmchan);
+		}	
+	}	
+
+	return FTDM_SUCCESS;
+}
+#endif
+	
+
 /******************************************************************************/
 ftdm_status_t check_for_reconfig_flag(ftdm_span_t *ftdmspan)
 {
diff --git a/libs/freetdm/src/include/private/ftdm_core.h b/libs/freetdm/src/include/private/ftdm_core.h
index 65ffad677c..f27be789e2 100644
--- a/libs/freetdm/src/include/private/ftdm_core.h
+++ b/libs/freetdm/src/include/private/ftdm_core.h
@@ -469,6 +469,7 @@ struct ftdm_channel {
 	int32_t txdrops;
 	int32_t rxdrops;
 	ftdm_usrmsg_t *usrmsg;
+	ftdm_time_t last_state_change_time;
 };
 
 struct ftdm_span {

From 6dabe5409bf7fb88f17b4580d7bcf0d3151f67fc Mon Sep 17 00:00:00 2001
From: wadam <wadam@sangoma.com>
Date: Thu, 1 Dec 2011 11:40:18 -0500
Subject: [PATCH 055/102] Fixed Bug#2018 - The threshold of cpu warning message
 should be increased

---
 libs/freetdm/src/ftdm_io.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 0205ab36b1..8ec6a3344f 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -5594,15 +5594,15 @@ static void *ftdm_cpu_monitor_run(ftdm_thread_t *me, void *obj)
 
 		if (monitor->alarm) {
 			if ((int)time >= (100 - monitor->set_alarm_threshold)) {
-				ftdm_log(FTDM_LOG_DEBUG, "CPU alarm OFF (idle:%d)\n", (int) time);
+				ftdm_log(FTDM_LOG_DEBUG, "CPU alarm is OFF (cpu usage:%d)\n", (int) (100-time));
 				monitor->alarm = 0;
 			}
-			if (monitor->alarm_action_flags & FTDM_CPU_ALARM_ACTION_WARN) {
+			if (monitor->alarm && (monitor->alarm_action_flags & FTDM_CPU_ALARM_ACTION_WARN)) {
 			ftdm_log(FTDM_LOG_WARNING, "CPU alarm is ON (cpu usage:%d)\n", (int) (100-time));
 			}
 		} else {
 			if ((int)time <= (100-monitor->reset_alarm_threshold)) {
-				ftdm_log(FTDM_LOG_DEBUG, "CPU alarm ON (idle:%d)\n", (int) time);
+				ftdm_log(FTDM_LOG_DEBUG, "CPU alarm is ON (cpu usage:%d)\n", (int) (100-time));
 				monitor->alarm = 1;
 			}
 		}

From 3432dccfc2b01b095e561d5467c76d20a094bc69 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 1 Dec 2011 12:13:12 -0500
Subject: [PATCH 056/102] freetdm: fix cpu monitor inconsistent messages,
 variable names etc          changed parameter name from
 cpu_reset_alarm_threshold to cpu_clear_alarm_threshold          (old
 parameter name still valid for backwards compatibility in configuration
 files)

---
 libs/freetdm/conf/freetdm.conf |  2 +-
 libs/freetdm/src/ftdm_io.c     | 51 ++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/libs/freetdm/conf/freetdm.conf b/libs/freetdm/conf/freetdm.conf
index eb506bef8d..0d53992979 100644
--- a/libs/freetdm/conf/freetdm.conf
+++ b/libs/freetdm/conf/freetdm.conf
@@ -13,7 +13,7 @@ cpu_monitoring_interval => 1000
 cpu_set_alarm_threshold => 80
 
 ; At what CPU percentage stop the CPU alarm
-cpu_reset_alarm_threshold => 70
+cpu_clear_alarm_threshold => 70
 
 ; Which action to take when the CPU alarm is raised
 ; it can be warn and/or reject calls
diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 8ec6a3344f..bb866610a2 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -223,7 +223,7 @@ typedef struct {
 	uint32_t        interval;
 	uint8_t         alarm_action_flags;
 	uint8_t         set_alarm_threshold;
-	uint8_t         reset_alarm_threshold;
+	uint8_t         clear_alarm_threshold;
 	ftdm_interrupt_t *interrupt;
 } cpu_monitor_t;
 
@@ -4834,14 +4834,15 @@ static ftdm_status_t load_config(void)
 				} else {
 					ftdm_log(FTDM_LOG_ERROR, "Invalid cpu alarm set threshold %s\n", val);
 				}
-			} else if (!strncasecmp(var, "cpu_reset_alarm_threshold", sizeof("cpu_reset_alarm_threshold")-1)) {
+			} else if (!strncasecmp(var, "cpu_reset_alarm_threshold", sizeof("cpu_reset_alarm_threshold")-1) ||
+			           !strncasecmp(var, "cpu_clear_alarm_threshold", sizeof("cpu_clear_alarm_threshold")-1)) {
 				intparam = atoi(val);
 				if (intparam > 0 && intparam < 100) {
-					globals.cpu_monitor.reset_alarm_threshold = (uint8_t)intparam;
-					if (globals.cpu_monitor.reset_alarm_threshold > globals.cpu_monitor.set_alarm_threshold) {
-						globals.cpu_monitor.reset_alarm_threshold = globals.cpu_monitor.set_alarm_threshold - 10;
-						ftdm_log(FTDM_LOG_ERROR, "Cpu alarm reset threshold must be lower than set threshold"
-								", setting threshold to %d\n", globals.cpu_monitor.reset_alarm_threshold);
+					globals.cpu_monitor.clear_alarm_threshold = (uint8_t)intparam;
+					if (globals.cpu_monitor.clear_alarm_threshold > globals.cpu_monitor.set_alarm_threshold) {
+						globals.cpu_monitor.clear_alarm_threshold = globals.cpu_monitor.set_alarm_threshold - 10;
+						ftdm_log(FTDM_LOG_ERROR, "Cpu alarm clear threshold must be lower than set threshold, "
+								"setting clear threshold to %d\n", globals.cpu_monitor.clear_alarm_threshold);
 					}
 				} else {
 					ftdm_log(FTDM_LOG_ERROR, "Invalid cpu alarm reset threshold %s\n", val);
@@ -5581,28 +5582,32 @@ static void *ftdm_cpu_monitor_run(ftdm_thread_t *me, void *obj)
 {
 	cpu_monitor_t *monitor = (cpu_monitor_t *)obj;
 	struct ftdm_cpu_monitor_stats *cpu_stats = ftdm_new_cpu_monitor();
+
+	ftdm_log(FTDM_LOG_DEBUG, "CPU monitor thread is now running\n");
 	if (!cpu_stats) {
-		return NULL;
+		goto done;
 	}
 	monitor->running = 1;
 
-	while(ftdm_running()) {
-		double time;
-		if (ftdm_cpu_get_system_idle_time(cpu_stats, &time)) {
+	while (ftdm_running()) {
+		double idle_time = 0.0;
+		int cpu_usage = 0;
+
+		if (ftdm_cpu_get_system_idle_time(cpu_stats, &idle_time)) {
 			break;
 		}
 
+		cpu_usage = (int)(100 - idle_time);
 		if (monitor->alarm) {
-			if ((int)time >= (100 - monitor->set_alarm_threshold)) {
-				ftdm_log(FTDM_LOG_DEBUG, "CPU alarm is OFF (cpu usage:%d)\n", (int) (100-time));
+			if (cpu_usage <= monitor->clear_alarm_threshold) {
+				ftdm_log(FTDM_LOG_DEBUG, "CPU alarm is now OFF (cpu usage: %d)\n", cpu_usage);
 				monitor->alarm = 0;
-			}
-			if (monitor->alarm && (monitor->alarm_action_flags & FTDM_CPU_ALARM_ACTION_WARN)) {
-			ftdm_log(FTDM_LOG_WARNING, "CPU alarm is ON (cpu usage:%d)\n", (int) (100-time));
+			} else if (monitor->alarm_action_flags & FTDM_CPU_ALARM_ACTION_WARN) {
+				ftdm_log(FTDM_LOG_WARNING, "CPU alarm is still ON (cpu usage: %d)\n", cpu_usage);
 			}
 		} else {
-			if ((int)time <= (100-monitor->reset_alarm_threshold)) {
-				ftdm_log(FTDM_LOG_DEBUG, "CPU alarm is ON (cpu usage:%d)\n", (int) (100-time));
+			if (cpu_usage >= monitor->set_alarm_threshold) {
+				ftdm_log(FTDM_LOG_WARNING, "CPU alarm is now ON (cpu usage: %d)\n", cpu_usage);
 				monitor->alarm = 1;
 			}
 		}
@@ -5611,7 +5616,11 @@ static void *ftdm_cpu_monitor_run(ftdm_thread_t *me, void *obj)
 
 	ftdm_delete_cpu_monitor(cpu_stats);
 	monitor->running = 0;
+
+done:
+	ftdm_log(FTDM_LOG_DEBUG, "CPU monitor thread is now terminating\n");
 	return NULL;
+
 #ifdef __WINDOWS__
 	UNREFERENCED_PARAMETER(me);
 #endif
@@ -5714,7 +5723,7 @@ FT_DECLARE(ftdm_status_t) ftdm_global_configuration(void)
 	globals.cpu_monitor.interval = 1000;
 	globals.cpu_monitor.alarm_action_flags = 0;
 	globals.cpu_monitor.set_alarm_threshold = 80;
-	globals.cpu_monitor.reset_alarm_threshold = 70;
+	globals.cpu_monitor.clear_alarm_threshold = 70;
 
 	if (load_config() != FTDM_SUCCESS) {
 		globals.running = 0;
@@ -5723,10 +5732,10 @@ FT_DECLARE(ftdm_status_t) ftdm_global_configuration(void)
 	}
 
 	if (globals.cpu_monitor.enabled) {
-		ftdm_log(FTDM_LOG_INFO, "CPU Monitor is running interval:%d lo-thres:%d hi-thres:%d\n", 
+		ftdm_log(FTDM_LOG_INFO, "CPU Monitor is running interval:%d set-thres:%d clear-thres:%d\n", 
 					globals.cpu_monitor.interval, 
 					globals.cpu_monitor.set_alarm_threshold, 
-					globals.cpu_monitor.reset_alarm_threshold);
+					globals.cpu_monitor.clear_alarm_threshold);
 
 		if (ftdm_cpu_monitor_start() != FTDM_SUCCESS) {
 			return FTDM_FAIL;

From 35df4f468c2ba3d5e6e184e2882c2b2f72a0279e Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 1 Dec 2011 19:18:54 -0500
Subject: [PATCH 057/102] Update to the SUSPEND state machine updated 2 commits
 ago. SUSPEND will not only change the return state in few cases.

I have retested all test cases from previous 2 commits.

What is missing is timer for each Tx Event.  RSC,BLO,UBL.
Its possible to loose a message from Slave via relay to Master.
If that ever occours we will not know what state we are in.
Thus we need a timer that will re-transmit a packet if
it does not get acknowledged.
---
 .../ftmod_sangoma_ss7_main.c                  | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

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 4c6992e61f..280cc1a428 100644
--- 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
@@ -883,7 +883,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				if (!sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_SENT)) {
 					ft_to_sngss7_rsc (ftdmchan);
 					sngss7_set_ckt_flag(sngss7_info, FLAG_RESET_SENT);
-					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+
+					/* Wait for Reset in HANGUP Complete nothing to do until we
+					   get reset response back */
 				} else if (sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_TX_RSP)) {
 					state_flag = 0;
 					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
@@ -910,7 +912,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			SS7_DEBUG_CHAN(ftdmchan,"Completing remotely requested hangup!%s\n", "");
 		} else if (sngss7_test_ckt_flag (sngss7_info, FLAG_LOCAL_REL)) {
 			
-
 			/* if this hang up is do to a rx RESET we need to sit here till the RSP arrives */
 			if (sngss7_test_ckt_flag (sngss7_info, FLAG_RESET_TX_RSP)) {
 				/* go to the down state as we have already received RSC-RLC */
@@ -926,6 +927,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 		} else {
 			SS7_DEBUG_CHAN(ftdmchan,"Completing requested hangup for unknown reason!%s\n", "");
+			if (sngss7_channel_status_clear(sngss7_info)) {
+				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+			} 
 		}
 
 		break;
@@ -1180,6 +1184,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 				state_flag = 0;
 				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 			} else {
+					
 				SS7_DEBUG_CHAN(ftdmchan, "Waiting on Reset Rsp/Grp Reset to move to DOWN (0x%X)\n", sngss7_info->ckt_flags);
 			}
 		}
@@ -1539,19 +1544,49 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 suspend_goto_last:
 		if (ftdmchan->last_state == FTDM_CHANNEL_STATE_UP) {
 			/* proceed to UP */
-		} else if (!sngss7_channel_status_clear(sngss7_info)) {
-			SS7_DEBUG_CHAN(ftdmchan,"Channel opted to stay in RESTART due to reset/blocks!%s\n", "");
+		} else if (!sngss7_reset_status_clear(sngss7_info) || 
+				   sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED)) {
+
+			/* At this point the circuit is in reset, if the call is 
+			   in use make sure that at least REMOTE REL flag is set
+			   in order to drop the call on the sip side */
+			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
+				if (!sngss7_test_ckt_flag (sngss7_info, FLAG_LOCAL_REL) &&
+                    !sngss7_test_ckt_flag (sngss7_info, FLAG_REMOTE_REL)) {
+					sngss7_set_ckt_flag (sngss7_info, FLAG_REMOTE_REL);	
+				}
+			}
+			SS7_DEBUG_CHAN(ftdmchan,"Channel opted to stay in RESTART due to reset!%s\n", "");
 			SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n",
 			                                         sngss7_info->ckt_flags, sngss7_info->blk_flags,
 			                                         sngss7_info->circuit->flags );
 
 			goto suspend_goto_restart;
-		} else { 	
-			SS7_DEBUG_CHAN(ftdmchan,"Channel signaling is up proceed to DOWN! [Last State=%s]\n", ftdm_channel_state2str(ftdmchan->last_state));
+
+		} else if (sngss7_channel_status_clear(sngss7_info)) {
+			   
+			/* In this case all resets and blocks are clear sig state is up, thus go to DOWN */
+			if (ftdmchan->last_state == FTDM_CHANNEL_STATE_RESTART ||
+				ftdmchan->last_state == FTDM_CHANNEL_STATE_TERMINATING) {
+				ftdmchan->last_state = FTDM_CHANNEL_STATE_DOWN;
+			}
+
+			SS7_DEBUG_CHAN(ftdmchan,"Channel signallig is UP: proceed to State %s!\n", 
+							ftdm_channel_state2str(ftdmchan->last_state));
 			SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n",
 			                                         sngss7_info->ckt_flags, sngss7_info->blk_flags,
 			                                         sngss7_info->circuit->flags );
-			ftdmchan->last_state = FTDM_CHANNEL_STATE_DOWN;				
+
+		} else { 	
+
+			if (ftdmchan->last_state == FTDM_CHANNEL_STATE_DOWN) {
+				ftdmchan->last_state = FTDM_CHANNEL_STATE_RESTART;
+			}
+			SS7_DEBUG_CHAN(ftdmchan,"Channel signaling is in block state: proceed to State=%s]\n", 
+							ftdm_channel_state2str(ftdmchan->last_state));
+			SS7_DEBUG_CHAN(ftdmchan,"Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n",
+			                                         sngss7_info->ckt_flags, sngss7_info->blk_flags,
+			                                         sngss7_info->circuit->flags);
 		}
 
 		state_flag = 0;

From b3297c7f3b1f5cb0bab720df1ce970aa664ec064 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 2 Dec 2011 11:24:34 -0500
Subject: [PATCH 058/102] freetdm: fix license path to use sngss7 path limits  
        do not use strcpy, use ftdm_set_string which is safer          do not
 use strcpy when snprintf is safer and cleaner

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h     | 5 ++---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c      | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 631dadf007..e39c57802f 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -51,7 +51,6 @@
 
 /* DEFINES ********************************************************************/
 #define MAX_NAME_LEN			25
-#define MAX_PATH				4096
 
 #define MAX_CIC_LENGTH			5
 #define MAX_CIC_MAP_LENGTH		1000 
@@ -411,8 +410,8 @@ typedef struct sng_relay {
 typedef struct sng_ss7_cfg {
 	uint32_t			spc;
 	uint32_t			procId;
-	char				license[MAX_PATH];
-	char				signature[MAX_PATH];
+	char				license[MAX_SNGSS7_PATH];
+	char				signature[MAX_SNGSS7_PATH];
 	uint32_t			transparent_iam_max_size;
 	uint32_t			flags;
 	sng_relay_t			relay[MAX_RELAY_CHANNELS+1];
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index 2fbd2e5631..f1c6625b85 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -472,9 +472,8 @@ static int ftmod_ss7_parse_sng_gen(ftdm_conf_node_t *sng_gen)
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "license")) {
 		/**********************************************************************/
-			strcpy(g_ftdm_sngss7_data.cfg.license, parm->val);
-			strcpy(g_ftdm_sngss7_data.cfg.signature, parm->val);
-			strcat(g_ftdm_sngss7_data.cfg.signature, ".sig");
+			ftdm_set_string(g_ftdm_sngss7_data.cfg.license, parm->val);
+			snprintf(g_ftdm_sngss7_data.cfg.signature, sizeof(g_ftdm_sngss7_data.cfg.signature), "%s.sig", parm->val);
 			SS7_DEBUG("Found license file = %s\n", g_ftdm_sngss7_data.cfg.license);
 			SS7_DEBUG("Found signature file = %s\n", g_ftdm_sngss7_data.cfg.signature);	
 		/**********************************************************************/

From e582586876ca7b81774355982dbb7976a873755b Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Mon, 5 Dec 2011 16:58:26 -0500
Subject: [PATCH 059/102] Freetdm: adding X-FreeTDM-ANI-NADI and
 X-FreeTDM-DNIS-NADI  support

---
 libs/freetdm/mod_freetdm/mod_freetdm.c                 |  8 +++++++-
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c |  2 +-
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c      | 10 +++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index c9daadac12..a0d2279ba3 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1355,7 +1355,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		/* Used by ftmod_sangoma_ss7 only */
 		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-DNIS-NADI");
 		if (sipvar) {
-			ftdm_usrmsg_add_var(&usrmsg, "ss7_clg_nadi", sipvar);
+			ftdm_usrmsg_add_var(&usrmsg, "ss7_cld_nadi", sipvar);
 		}
 		
 		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-RDNIS");
@@ -1711,6 +1711,12 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_clg_nadi");
 		if (!ftdm_strlen_zero(var_value)) {
 			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-NADI", "%s", var_value);
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-ANI-NADI", "%s", var_value);
+		}
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_cld_nadi");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-DNIS-NADI", "%s", var_value);
 		}
 
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdnis_screen_ind");
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 295d127064..7c9b3061f0 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -201,10 +201,10 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			}
 
 			copy_redirgNum_from_sngss7(ftdmchan, &siConEvnt->redirgNum);
-
 			copy_genNmb_from_sngss7(ftdmchan, &siConEvnt->genNmb);
 
 			copy_cgPtyCat_from_sngss7(ftdmchan, &siConEvnt->cgPtyCat);
+			copy_cdPtyNum_from_sngss7(ftdmchan, &siConEvnt->cdPtyNum);
 
 			/* fill in the TMR/bearer capability */
 			if (siConEvnt->txMedReq.eh.pres) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 7696974807..3203e52e7d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -193,7 +193,15 @@ ftdm_status_t copy_cgPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *cgPt
 
 ftdm_status_t copy_cdPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cdPtyNum)
 {
-	/* TODO: Implement me */
+	char var[FTDM_DIGITS_LIMIT];
+	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
+
+	if (cdPtyNum->eh.pres == PRSNT_NODEF &&
+	    cdPtyNum->natAddrInd.pres 	== PRSNT_NODEF) {
+		sprintf(var, "%d", cdPtyNum->natAddrInd.val);
+		sngss7_add_var(sngss7_info, "ss7_cld_nadi", var);
+	}
+		
 	return FTDM_SUCCESS;
 }
 

From 1cbeb33b2dd88727fb5ecbf7c8937780be05f8d3 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Tue, 6 Dec 2011 15:38:05 -0500
Subject: [PATCH 060/102] freetdm: adding support of x-headers for Redirection
 Information          X-FreeTDM-RDINF-Indicator         
 X-FreeTDM-RDINF-OrigReason          X-FreeTDM-RDINF-Count         
 X-FreeTDM-RDINF-Reason

---
 libs/freetdm/mod_freetdm/mod_freetdm.c        | 40 ++++++++-
 .../ftmod_sangoma_ss7_handle.c                |  1 +
 .../ftmod_sangoma_ss7_main.h                  |  3 +
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c |  4 +
 .../ftmod_sangoma_ss7_support.c               | 85 +++++++++++++++++++
 5 files changed, 132 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index a0d2279ba3..ecd9189b39 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1438,6 +1438,24 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		if (sipvar) {
 			ftdm_usrmsg_add_var(&usrmsg, "ss7_iam", sipvar);
 		}
+
+		/* redirection information */
+		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-RDINF-Indicator");
+		if (sipvar) {
+			ftdm_usrmsg_add_var(&usrmsg, "ss7_rdinfo_indicator", sipvar);
+		}
+		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-RDINF-OrigReason");
+		if (sipvar) {
+			ftdm_usrmsg_add_var(&usrmsg, "ss7_rdinfo_orig", sipvar);
+		}
+		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-RDINF-Count");
+		if (sipvar) {
+			ftdm_usrmsg_add_var(&usrmsg, "ss7_rdinfo_count", sipvar);
+		}
+		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-RDINF-Reason");
+		if (sipvar) {
+			ftdm_usrmsg_add_var(&usrmsg, "ss7_rdinfo_reason", sipvar);
+		}
 	}
 
 	if (switch_test_flag(outbound_profile, SWITCH_CPF_SCREEN)) {
@@ -1707,7 +1725,27 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-NADI", "%d", channel_caller_data->rdnis.type);
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDNIS-Plan", "%d", channel_caller_data->rdnis.plan);
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CPC", "%s", ftdm_calling_party_category2str(channel_caller_data->cpc));
-		
+	
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdinfo_indicator");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDINF-Indicator", "%s", var_value);
+		}
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdinfo_orig");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDINF-OrigReason", "%s", var_value);
+		}
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdinfo_count");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDINF-Count", "%s", var_value);
+		}
+
+		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_rdinfo_reason");
+		if (!ftdm_strlen_zero(var_value)) {
+			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-RDINF-Reason", "%s", var_value);
+		}
+			
 		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_clg_nadi");
 		if (!ftdm_strlen_zero(var_value)) {
 			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-NADI", "%s", var_value);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 7c9b3061f0..0497955059 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -201,6 +201,7 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			}
 
 			copy_redirgNum_from_sngss7(ftdmchan, &siConEvnt->redirgNum);
+			copy_redirgInfo_from_sngss7(ftdmchan, &siConEvnt->redirInfo);
 			copy_genNmb_from_sngss7(ftdmchan, &siConEvnt->genNmb);
 
 			copy_cgPtyCat_from_sngss7(ftdmchan, &siConEvnt->cgPtyCat);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index e39c57802f..bb02d7e3ed 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -841,6 +841,9 @@ ftdm_status_t copy_cdPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cd
 ftdm_status_t copy_cdPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cdPtyNum);
 ftdm_status_t copy_redirgNum_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirNum *redirgNum);
 ftdm_status_t copy_redirgNum_from_sngss7(ftdm_channel_t *ftdmchan, SiRedirNum *redirgNum);
+ftdm_status_t copy_redirgInfo_from_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *redirInfo);
+ftdm_status_t copy_redirgInfo_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *redirInfo);
+
 ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *locPtyNum);
 ftdm_status_t copy_locPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *locPtyNum);
 ftdm_status_t copy_genNmb_to_sngss7(ftdm_channel_t *ftdmchan, SiGenNum *genNmb);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 4c7bbf084c..fbfab15d1e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -91,6 +91,10 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 		/* Redirecting Number */
 		copy_redirgNum_to_sngss7(ftdmchan, &iam.redirgNum);
 
+		/* Redirecting Information */
+		copy_redirgInfo_to_sngss7(ftdmchan, &iam.redirInfo);
+
+
 		/* Access Transport */
 		copy_accTrnspt_to_sngss7(ftdmchan, &iam.accTrnspt);
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 3203e52e7d..3230292675 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -198,6 +198,7 @@ ftdm_status_t copy_cdPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cd
 
 	if (cdPtyNum->eh.pres == PRSNT_NODEF &&
 	    cdPtyNum->natAddrInd.pres 	== PRSNT_NODEF) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Called Party Number NADI %d\n", cdPtyNum->natAddrInd.val);
 		sprintf(var, "%d", cdPtyNum->natAddrInd.val);
 		sngss7_add_var(sngss7_info, "ss7_cld_nadi", var);
 	}
@@ -538,6 +539,90 @@ ftdm_status_t copy_redirgNum_from_sngss7(ftdm_channel_t *ftdmchan, SiRedirNum *r
 	return FTDM_SUCCESS;
 }
 
+ftdm_status_t copy_redirgInfo_from_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *redirInfo)
+{
+	char val[20];
+	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
+
+	if (redirInfo->eh.pres != PRSNT_NODEF ) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No Redirecting Information available\n");
+		return FTDM_SUCCESS;
+	}
+
+	
+	if (redirInfo->redirInd.pres == PRSNT_NODEF) {
+		snprintf(val, sizeof(val), "%d", redirInfo->redirInd.val);
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Redirection Information - redirection indicator:%s\n", val);
+		sngss7_add_var(sngss7_info, "ss7_rdinfo_indicator", val);
+	}
+
+	if (redirInfo->origRedirReas.pres == PRSNT_NODEF) {
+		snprintf(val, sizeof(val), "%d", redirInfo->origRedirReas.val);
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Redirection Information - original redirection reason:%s\n", val);
+		sngss7_add_var(sngss7_info, "ss7_rdinfo_orig", val);
+	}
+
+	if (redirInfo->redirCnt.pres == PRSNT_NODEF) {
+		snprintf(val, sizeof(val), "%d", redirInfo->redirCnt.val);
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Redirection Information - redirection count:%s\n", val);
+		sngss7_add_var(sngss7_info, "ss7_rdinfo_count", val);
+	}
+
+	if (redirInfo->redirReas.pres == PRSNT_NODEF) {
+		snprintf(val, sizeof(val), "%d", redirInfo->redirReas.val);
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Redirection Information - redirection reason:%s\n", val);
+		sngss7_add_var(sngss7_info, "ss7_rdinfo_reason", val);
+	}
+		
+	return FTDM_SUCCESS;
+}
+
+ftdm_status_t copy_redirgInfo_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *redirInfo)
+{
+	const char* val = NULL;
+	int bProceed = 0;
+
+	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdinfo_indicator");
+	if (!ftdm_strlen_zero(val)) {
+		redirInfo->redirInd.val = atoi(val);
+		bProceed = 1;
+	} else {		
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Information on Redirection Indicator\n");
+	}
+	
+	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdinfo_orig");
+	if (!ftdm_strlen_zero(val)) {
+		redirInfo->origRedirReas.val = atoi(val);
+		bProceed = 1;
+	} else {		
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Information on Original Reasons\n");
+	}
+	
+	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdinfo_count");
+	if (!ftdm_strlen_zero(val)) {
+		redirInfo->redirCnt.val = atoi(val);
+		bProceed = 1;
+	} else {		
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Information on Redirection Count\n");
+	}
+	
+	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdinfo_reason");
+	if (!ftdm_strlen_zero(val)) {
+		redirInfo->redirReas.val = atoi(val);
+		bProceed = 1;
+	} else {		
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Information on Redirection Reasons\n");
+	}
+
+	if( bProceed == 1 ) {
+		redirInfo->eh.pres = PRSNT_NODEF;
+	} else {
+		redirInfo->eh.pres = NOTPRSNT;
+	}
+
+	return FTDM_SUCCESS;
+}
+
 ftdm_status_t copy_cgPtyCat_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyCat *cgPtyCat)
 {
 	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;

From 9db322f2e0a035c898509f915134cee0e47ce398 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 14 Dec 2011 19:56:25 -0500
Subject: [PATCH 061/102] Fixed hw alarm crash. When we get hw alarm in the
 middle of configuration. It can happen with large number of circuits.

On RESTART if we are PAUSED do not try to send RESET and stay in RESTART state
---
 .../ftmod_sangoma_ss7_main.c                  | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

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 280cc1a428..aef7a6edef 100644
--- 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
@@ -295,24 +295,35 @@ static void handle_hw_alarm(ftdm_event_t *e)
 	for (x = (g_ftdm_sngss7_data.cfg.procId * MAX_CIC_MAP_LENGTH) + 1; g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0; x++) {
 		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type == SNG_CKT_VOICE) {
 			ss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
+
+			/* NC. Its possible for alarms to come in the middle of configuration
+			   especially on large systems */
+			if (!ss7_info || !ss7_info->ftdmchan) {
+				SS7_DEBUG("handle_hw_alarm: span=%i chan=%i ckt=%i x=%i - ss7_info=%p ftdmchan=%p\n",
+						ftdmchan->physical_span_id,ftdmchan->physical_chan_id,
+						g_ftdm_sngss7_data.cfg.isupCkt[x].id,x,
+						ss7_info,ss7_info?ss7_info->ftdmchan:NULL);
+				continue;
+			}
+
 			ftdmchan = ss7_info->ftdmchan;
 			
 			if (e->channel->physical_span_id == ftdmchan->physical_span_id && 
 			    e->channel->physical_chan_id == ftdmchan->physical_chan_id) {
-				SS7_DEBUG("handle_hw_alarm: span=%i chan=%i ckt=%i x=%i\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id,g_ftdm_sngss7_data.cfg.isupCkt[x].id,x);
+				SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: span=%i chan=%i ckt=%i x=%i\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id,g_ftdm_sngss7_data.cfg.isupCkt[x].id,x);
 				if (e->enum_id == FTDM_OOB_ALARM_TRAP) {
-					SS7_DEBUG("handle_hw_alarm: Set FLAG_GRP_HW_BLOCK_TX\n");
+					SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Set FLAG_GRP_HW_BLOCK_TX\n");
 					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
 					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 					}
 				} else if (e->enum_id == FTDM_OOB_ALARM_CLEAR) {
-					SS7_DEBUG("handle_hw_alarm: Clear\n");
+					SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Clear\n");
 					sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
 					sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
 					if (sngss7_test_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX_DN)) {
 						sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
-						SS7_DEBUG("handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX\n");
+						SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX\n");
 						if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 						}
@@ -1077,6 +1088,11 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		SS7_DEBUG_CHAN(ftdmchan,"RESTART: Current flags: ckt=0x%X, blk=0x%X\n", 
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
+		
+		if (sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED)) {
+			SS7_DEBUG_CHAN(ftdmchan,"Circuit PAUSED stay in RESTART%s\n", "");
+			break;
+		}
 
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK)) {
 			if ((sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_RX)) ||
@@ -1225,6 +1241,8 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* clear the PAUSE flag */
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 
+			/* We tried to hangup the call while in PAUSED state.
+			   We must send a RESET to clear this circuit */
 			if (sngss7_test_ckt_flag (sngss7_info, FLAG_LOCAL_REL)) {
 				SS7_DEBUG_CHAN(ftdmchan, "Channel local release on RESUME, restart Reset procedure%s\n", "");
 				/* By setting RESET_TX flag the check below sngss7_tx_reset_status_pending() will

From ce9ce53b2d9496052a741739100a8ec2a71e75d2 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Wed, 14 Dec 2011 20:06:57 -0500
Subject: [PATCH 062/102] Fixed the previous commit

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 aef7a6edef..5edf7d4851 100644
--- 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
@@ -310,20 +310,21 @@ static void handle_hw_alarm(ftdm_event_t *e)
 			
 			if (e->channel->physical_span_id == ftdmchan->physical_span_id && 
 			    e->channel->physical_chan_id == ftdmchan->physical_chan_id) {
-				SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: span=%i chan=%i ckt=%i x=%i\n",ftdmchan->physical_span_id,ftdmchan->physical_chan_id,g_ftdm_sngss7_data.cfg.isupCkt[x].id,x);
+				SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: span=%i chan=%i ckt=%i x=%i\n",
+						ftdmchan->physical_span_id,ftdmchan->physical_chan_id,g_ftdm_sngss7_data.cfg.isupCkt[x].id,x);
 				if (e->enum_id == FTDM_OOB_ALARM_TRAP) {
-					SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Set FLAG_GRP_HW_BLOCK_TX\n");
+					SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Set FLAG_GRP_HW_BLOCK_TX %s\n", " ");
 					sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
 					if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 					}
 				} else if (e->enum_id == FTDM_OOB_ALARM_CLEAR) {
-					SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Clear\n");
+					SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Clear %s \n", " ");
 					sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX);
 					sngss7_clear_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
 					if (sngss7_test_ckt_blk_flag(ss7_info, FLAG_GRP_HW_BLOCK_TX_DN)) {
 						sngss7_set_ckt_blk_flag(ss7_info, FLAG_GRP_HW_UNBLK_TX);
-						SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX\n");
+						SS7_DEBUG_CHAN(ftdmchan,"handle_hw_alarm: Setting FLAG_GRP_HW_UNBLK_TX %s\n"," ");
 						if (ftdmchan->state != FTDM_CHANNEL_STATE_SUSPENDED) {
 							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 						}

From 09dd96455e20996cb4be31c310b13357fb149142 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 15 Dec 2011 12:34:56 -0500
Subject: [PATCH 063/102] switch-core: changed the exit status when modules
 fail to load to 65 (EX_DATAERR), init scripts must              be updated to
 handle 65 instead of 1 to detect module loading errors

---
 src/switch.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/switch.c b/src/switch.c
index 038dd2c759..d33f8170c2 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -898,7 +898,9 @@ int main(int argc, char *argv[])
 
 	if (switch_core_init_and_modload(flags, nc ? SWITCH_FALSE : SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
 		fprintf(stderr, "Failed to initialize modules: %s\n", err);
-		return 1;
+		/* 65 is EX_DATAERR (see sysexits.h), meaning some input from the user failed, some init scripts use
+		 * this to tell when fs fails to start due to configuration error */
+		return 65;
 	}
 
 	if (switch_file_open(&fd, pid_path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, pool) == SWITCH_STATUS_SUCCESS) {

From b057d873cfd1c168bc598b3740cbb9c09b71e3c4 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Thu, 15 Dec 2011 15:47:41 -0500
Subject: [PATCH 064/102] Added a retry on configuraiton. Its possible to
 timeout on ISUP ckt config in scenarios of huge load.

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c   | 7 +++++++
 1 file changed, 7 insertions(+)

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 5edf7d4851..a98f2ee209 100644
--- 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
@@ -1878,6 +1878,7 @@ static ftdm_status_t ftdm_sangoma_ss7_stop(ftdm_span_t * span)
 static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
 {
 	sngss7_span_data_t	*ss7_span_info;
+	int sngss7_retry_cnt=5;
 
 	ftdm_log (FTDM_LOG_INFO, "Configuring ftmod_sangoma_ss7 span = %s(%d)...\n",
 								span->name,
@@ -1932,7 +1933,13 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
 	}
 
 	/* configure libsngss7 */
+try_cfg_again:
 	if (ft_to_sngss7_cfg_all()) {
+		if (sngss7_retry_cnt--) {
+			ftdm_sleep (500);
+			ftdm_log (FTDM_LOG_DEBUG, "Failed to configure LibSngSS7 - retrying!\n");
+			goto try_cfg_again;
+		}
 		ftdm_log (FTDM_LOG_CRIT, "Failed to configure LibSngSS7!\n");
 		ftdm_sleep (1000);
 		return FTDM_FAIL;

From 494947bf591d2d284bb52592e2609b6facdbd36f Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Thu, 15 Dec 2011 15:50:58 -0500
Subject: [PATCH 065/102] Reverted the previous commit of doing nothing on
 RESTART while in PAUSE

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c     | 5 -----
 1 file changed, 5 deletions(-)

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 a98f2ee209..f6c61162b1 100644
--- 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
@@ -1090,11 +1090,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
 		
-		if (sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED)) {
-			SS7_DEBUG_CHAN(ftdmchan,"Circuit PAUSED stay in RESTART%s\n", "");
-			break;
-		}
-
 		if (sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK)) {
 			if ((sngss7_test_ckt_flag(sngss7_info, FLAG_RESET_RX)) ||
 				(sngss7_test_ckt_flag(sngss7_info, FLAG_GRP_RESET_RX))) {

From 732a0ed2de6773409146debaef4a008685bb6717 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Thu, 15 Dec 2011 20:39:38 -0500
Subject: [PATCH 066/102] Fix for 3000ms timeout on hangup. Where FS does not
 hangup the channel with in 3sec. Without this fix, it was possible that 2 FS
 sessions use the single span/chan freetdm session. Merged the feature from
 git master of freetdm

---
 libs/freetdm/mod_freetdm/mod_freetdm.c | 41 +++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index ecd9189b39..003be91b17 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -496,6 +496,14 @@ static switch_status_t channel_on_hangup(switch_core_session_t *session)
 	private_t *tech_pvt = NULL;
 	ftdm_chan_type_t chantype;
 	uint32_t tokencnt;
+	char *uuid = NULL;
+	uint8_t uuid_found = 0;
+	uint32_t t = 0;
+	const char *token = NULL;
+	int span_id = 0;
+	int chan_id = 0;
+	const char *name = NULL;
+
 
 	channel = switch_core_session_get_channel(session);
 	assert(channel != NULL);
@@ -503,10 +511,42 @@ static switch_status_t channel_on_hangup(switch_core_session_t *session)
 	tech_pvt = switch_core_session_get_private(session);
 	assert(tech_pvt != NULL);
 
+	 /* ignore any further I/O requests, we're hanging up already! */
+    switch_clear_flag_locked(tech_pvt, TFLAG_IO);
+
+
 	if (!tech_pvt->ftdmchan) {
 		goto end;
 	} 
 
+	name = switch_channel_get_name(channel);
+
+	span_id = tech_pvt->ftdmchan ? ftdm_channel_get_span_id(tech_pvt->ftdmchan) : 0;
+	chan_id = tech_pvt->ftdmchan ? ftdm_channel_get_id(tech_pvt->ftdmchan) : 0;
+
+
+    /* Now verify the device is still attached to this call :-)
+     * Sometimes the FS core takes too long (more than 3 seconds) in calling
+     * channel_on_hangup() and the FreeTDM core decides to take the brute
+     * force approach and hangup and detach themselves from the call. Later
+     * when FS finally comes around, we might end up hanging up the device
+     * attached to another call, this verification avoids that. */
+    uuid = switch_core_session_get_uuid(session);
+    tokencnt = ftdm_channel_get_token_count(tech_pvt->ftdmchan);
+    for (t = 0; t < tokencnt; t++) {
+        token = ftdm_channel_get_token(tech_pvt->ftdmchan, t);
+        if (!zstr(token) && !strcasecmp(uuid, token)) {
+            uuid_found = 1;
+            break;
+        }
+    }
+
+    if (!uuid_found) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Device [%d:%d] is no longer attached to %s. Nothing to do.\n", span_id, chan_id, name);
+        goto end;
+    }
+	
+
 	ftdm_channel_clear_token(tech_pvt->ftdmchan, switch_core_session_get_uuid(session));
 
 	chantype = ftdm_channel_get_type(tech_pvt->ftdmchan);	
@@ -2459,7 +2499,6 @@ static FIO_SIGNAL_CB_FUNCTION(on_clear_channel_signal)
 				switch_set_flag_locked(tech_pvt, TFLAG_DEAD);
 				channel = switch_core_session_get_channel(session);
 				switch_channel_hangup(channel, caller_data->hangup_cause);
-				ftdm_channel_clear_token(sigmsg->channel, switch_core_session_get_uuid(session));
 				switch_core_session_rwunlock(session);
 			}
 		}

From 485746305a420a0993da0cb539e0a58789bdd993 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Fri, 16 Dec 2011 10:06:57 -0500
Subject: [PATCH 067/102] Set the cpu thresholds to 92 and 82 Set the 3000ms
 warning to NOTICE not CRIT

---
 libs/freetdm/src/ftdm_io.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index bb866610a2..731b9f88ef 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -5455,7 +5455,7 @@ static void execute_safety_hangup(void *data)
 	ftdm_channel_lock(fchan);
 	fchan->hangup_timer = 0;
 	if (fchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
-		ftdm_log_chan(fchan, FTDM_LOG_CRIT, "Forcing hangup since the user did not confirmed our hangup after %dms\n", FORCE_HANGUP_TIMER);
+		ftdm_log_chan(fchan, FTDM_LOG_NOTICE, "Forcing hangup since the user did not confirmed our hangup after %dms\n", FORCE_HANGUP_TIMER);
 		_ftdm_channel_call_hangup_nl(__FILE__, __FUNCTION__, __LINE__, fchan, NULL);
 	} else {
 		ftdm_log_chan(fchan, FTDM_LOG_CRIT, "Not performing safety hangup, channel state is %s\n", ftdm_channel_state2str(fchan->state));
@@ -5722,8 +5722,8 @@ FT_DECLARE(ftdm_status_t) ftdm_global_configuration(void)
 	globals.cpu_monitor.enabled = 0;
 	globals.cpu_monitor.interval = 1000;
 	globals.cpu_monitor.alarm_action_flags = 0;
-	globals.cpu_monitor.set_alarm_threshold = 80;
-	globals.cpu_monitor.clear_alarm_threshold = 70;
+	globals.cpu_monitor.set_alarm_threshold = 92;
+	globals.cpu_monitor.clear_alarm_threshold = 82;
 
 	if (load_config() != FTDM_SUCCESS) {
 		globals.running = 0;

From 83b5929e482a30c7ff265904fe25270db9686148 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Sat, 17 Dec 2011 19:36:47 -0500
Subject: [PATCH 068/102] freetdm: remove duplicated ss7 code for location
 number (previous git merge duplicated it)

---
 .../ftmod_sangoma_ss7_handle.c                | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index b8154f96e8..6a061312a8 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -249,34 +249,6 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 				SS7_DEBUG_CHAN(ftdmchan, "No Location Number information in IAM%s\n", " ");
 			}
 
-			/* Retrieve the Location Number if present (see ITU Q.763, 3.30) */
-			if (siConEvnt->cgPtyNum1.eh.pres) {
-				if (siConEvnt->cgPtyNum1.addrSig.pres) {
-					/* fill in the ss7 location address number */
-					copy_tknStr_from_sngss7(siConEvnt->cgPtyNum1.addrSig, var, siConEvnt->cgPtyNum1.oddEven);
-					sngss7_add_var(sngss7_info, "ss7_loc_digits", var);
-				}
-
-				if (siConEvnt->cgPtyNum1.scrnInd.pres) {
-					/* fill in the screening indication value */
-					sprintf(var, "%d", siConEvnt->cgPtyNum1.scrnInd.val);
-					sngss7_add_var(sngss7_info, "ss7_loc_screen_ind", var);
-				}
-
-				if (siConEvnt->cgPtyNum1.presRest.pres) {
-					/* fill in the presentation value */
-					sprintf(var, "%d", siConEvnt->cgPtyNum1.presRest.val);
-					sngss7_add_var(sngss7_info, "ss7_loc_pres_ind", var);
-				}
-
-				if (siConEvnt->cgPtyNum1.natAddrInd.pres) {
-					sprintf(var, "%d", siConEvnt->cgPtyNum1.natAddrInd.val);
-					sngss7_add_var(sngss7_info, "ss7_loc_nadi", var);
-				}
-			} else {
-				SS7_DEBUG_CHAN(ftdmchan, "No Location Number information in IAM%s\n", " ");
-			}
-
 			sprintf(var, "%d", sngss7_info->circuit->cic);
 			sngss7_add_var(sngss7_info, "ss7_cic", var);
 

From 7e2ef3a55cdd77148941772f8170b72dc3b6c651 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Sun, 18 Dec 2011 23:02:59 -0500
Subject: [PATCH 069/102] freetdm: The remote hangup logic that waits for 3sec
 for FS to hanup up          before hanging up the freetdm channel by force   
       seems to have a memory leak.  I have increased the timeout          to
 30sec and made the print statement WARNING level.

---
 libs/freetdm/src/ftdm_io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 731b9f88ef..8b179ccf05 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -52,7 +52,7 @@
 struct tm *localtime_r(const time_t *clock, struct tm *result);
 #endif
 
-#define FORCE_HANGUP_TIMER 3000
+#define FORCE_HANGUP_TIMER 30000
 #define SPAN_PENDING_CHANS_QUEUE_SIZE 1000
 #define SPAN_PENDING_SIGNALS_QUEUE_SIZE 1000
 #define FTDM_READ_TRACE_INDEX 0
@@ -5455,7 +5455,7 @@ static void execute_safety_hangup(void *data)
 	ftdm_channel_lock(fchan);
 	fchan->hangup_timer = 0;
 	if (fchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
-		ftdm_log_chan(fchan, FTDM_LOG_NOTICE, "Forcing hangup since the user did not confirmed our hangup after %dms\n", FORCE_HANGUP_TIMER);
+		ftdm_log_chan(fchan, FTDM_LOG_WARNING, "Forcing hangup since the user did not confirmed our hangup after %dms\n", FORCE_HANGUP_TIMER);
 		_ftdm_channel_call_hangup_nl(__FILE__, __FUNCTION__, __LINE__, fchan, NULL);
 	} else {
 		ftdm_log_chan(fchan, FTDM_LOG_CRIT, "Not performing safety hangup, channel state is %s\n", ftdm_channel_state2str(fchan->state));

From b6ca6c5b1da2d577d6ae95cbf0ce445ed59f2043 Mon Sep 17 00:00:00 2001
From: Nenad Corbic <ncorbic@sangoma.com>
Date: Mon, 19 Dec 2011 02:27:38 -0500
Subject: [PATCH 070/102] freetdm: Added sng_cc_resource_check()          On
 SIG Down we must not fail a call instead try hunting for another.         
 The only time we can fail the call and not bother hunting is          if
 sng_cc_resource_check fails.          Took out configuration retry as the
 config code is now          fixed in sng_ss7 library. Transaction id fix.

Unit Tested:

NSG UP -- start full load
kill NSG
NSG UP again on full load
make sure it comes up fine.
---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c |  9 +++----
 .../ftmod_sangoma_ss7_main.c                  | 25 +++++++++++--------
 .../ftmod_sangoma_ss7_main.h                  |  6 +++++
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
index 25510e8c7a..327ca40f05 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
@@ -77,9 +77,9 @@ int  ft_to_sngss7_cfg_all(void)
 	int ret = 0;
 
 	/* check if we have done gen_config already */
-	if (!(g_ftdm_sngss7_data.gen_config)) {
+	if (g_ftdm_sngss7_data.gen_config == SNG_GEN_CFG_STATUS_INIT) {
 		/* update the global gen_config so we don't do it again */
-		g_ftdm_sngss7_data.gen_config = 1;
+		g_ftdm_sngss7_data.gen_config = SNG_GEN_CFG_STATUS_PENDING;
 
 		/* start of by checking if the license and sig file are valid */
 		if (sng_validate_license(g_ftdm_sngss7_data.cfg.license,
@@ -209,13 +209,12 @@ int  ft_to_sngss7_cfg_all(void)
 			}
 		} /* if (sngss7_test_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_MTP2)) */
 
-		g_ftdm_sngss7_data.gen_config = 2;
+		g_ftdm_sngss7_data.gen_config = SNG_GEN_CFG_STATUS_DONE;
 
 	} /* if (!(g_ftdm_sngss7_data.gen_config)) */
 
 
-	/* FIXME: Please change number 2 to an ENUM that is more explanatory */
-	if (g_ftdm_sngss7_data.gen_config != 2) {
+	if (g_ftdm_sngss7_data.gen_config != SNG_GEN_CFG_STATUS_DONE) {
 			SS7_CRITICAL("General configuration FAILED!\n");
 			return 1;
 	}
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 f6c61162b1..c963ea7cb7 100644
--- 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
@@ -1653,8 +1653,10 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
 
 	/* check if the channel sig state is UP */
 	if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_SIG_UP)) {
-		SS7_ERROR_CHAN(ftdmchan, "Requested channel sig state is down, cancelling call!%s\n", " ");
-		goto outgoing_fail;
+		SS7_ERROR_CHAN(ftdmchan, "Requested channel sig state is down, skipping channell!%s\n", " ");
+		/* Sig state will be down due to a block.  
+		   Right action is to hunt for another call */
+		goto outgoing_break;
 	}
 
 	/* check if there is a remote block */
@@ -1679,6 +1681,14 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_ss7_outgoing_call)
 		goto outgoing_break;
 	}
 
+
+    /* This is a gracefull stack resource check.
+       Removing this function will cause unpredictable
+	   ungracefule errors. */
+	if (sng_cc_resource_check()) {
+		goto outgoing_fail;
+	}
+
 	/* check the state of the channel */
 	switch (ftdmchan->state){
 	/**************************************************************************/
@@ -1873,7 +1883,6 @@ static ftdm_status_t ftdm_sangoma_ss7_stop(ftdm_span_t * span)
 static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
 {
 	sngss7_span_data_t	*ss7_span_info;
-	int sngss7_retry_cnt=5;
 
 	ftdm_log (FTDM_LOG_INFO, "Configuring ftmod_sangoma_ss7 span = %s(%d)...\n",
 								span->name,
@@ -1923,20 +1932,14 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
 	/* parse the configuration and apply to the global config structure */
 	if (ftmod_ss7_parse_xml(ftdm_parameters, span)) {
 		ftdm_log (FTDM_LOG_CRIT, "Failed to parse configuration!\n");
-		ftdm_sleep (1000);
+		ftdm_sleep (100);
 		return FTDM_FAIL;
 	}
 
 	/* configure libsngss7 */
-try_cfg_again:
 	if (ft_to_sngss7_cfg_all()) {
-		if (sngss7_retry_cnt--) {
-			ftdm_sleep (500);
-			ftdm_log (FTDM_LOG_DEBUG, "Failed to configure LibSngSS7 - retrying!\n");
-			goto try_cfg_again;
-		}
 		ftdm_log (FTDM_LOG_CRIT, "Failed to configure LibSngSS7!\n");
-		ftdm_sleep (1000);
+		ftdm_sleep (100);
 		return FTDM_FAIL;
 	}
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index bb02d7e3ed..78210d50fb 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -116,6 +116,12 @@ typedef enum {
 	SNG_CALLING			= 2
 } sng_addr_type_t;
 
+typedef enum {
+	SNG_GEN_CFG_STATUS_INIT    = 0,
+	SNG_GEN_CFG_STATUS_PENDING = 1,
+	SNG_GEN_CFG_STATUS_DONE    = 2
+} nsg_gen_cfg_type_t;
+
 typedef struct sng_mtp2_error_type {
 	int	init;
 	char sng_type[MAX_NAME_LEN];

From 8eeb37a81b57226053caf9c2d151de721e4f6308 Mon Sep 17 00:00:00 2001
From: William Adam <wadam@sangoma.com>
Date: Wed, 21 Dec 2011 14:56:03 -0500
Subject: [PATCH 071/102] Fixed bug#2215 - SPIROU transparent IAM max size
 error

---
 .../freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index f1c6625b85..f7d0171f93 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -1923,7 +1923,7 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
 			SS7_DEBUG("Found transparent_iam %d\n", sng_ccSpan.transparent_iam);
 #endif
 		} else if (!strcasecmp(parm->var, "transparent_iam_max_size")) {
-			sng_ccSpan.transparent_iam_max_size = ftdm_true(parm->val);
+			sng_ccSpan.transparent_iam_max_size = atoi(parm->val);
 			SS7_DEBUG("Found transparent_iam_max_size %d\n", sng_ccSpan.transparent_iam_max_size);
 		} else if (!strcasecmp(parm->var, "cpg_on_progress_media")) {
 			sng_ccSpan.cpg_on_progress_media = ftdm_true(parm->val);

From 5ac80d39399a366ee72aa80cbd2e12aa100016c1 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 19 Jan 2012 16:31:52 -0500
Subject: [PATCH 072/102] FreeTDM: fixing redirect information outgoing call
 bug

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c      | 11 +++++++++++
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c     |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 0497955059..0bed14c2e6 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -252,8 +252,19 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sprintf(var, "%d", sngss7_info->circuit->cic);
 			sngss7_add_var(sngss7_info, "ss7_cic", var);
 
+
+            if (siConEvnt->orgPteCde.eh.pres) {
+                sprintf(var, "%d",(uint32_t)siConEvnt->orgPteCde.sigPointCode.val);
+                sngss7_add_var(sngss7_info, "ss7_opc", var);
+				SS7_DEBUG_CHAN(ftdmchan, " OPC = d%\n", (uint32_t)siConEvnt->orgPteCde.sigPointCode.val);
+			} else {
+				SS7_DEBUG_CHAN(ftdmchan, "No OPC information in IAM%s\n", " ");
+            }
+
+			/*  original code, should be removed after review.
 			sprintf(var, "%d", g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId].spc );
 			sngss7_add_var(sngss7_info, "ss7_opc", var);
+			*/
 			
 			if (siConEvnt->callRef.callId.pres) {
         /* %x expect an unsigned int so as callId is a U32, casting to uint32_t
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 3230292675..59777b048b 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -585,6 +585,7 @@ ftdm_status_t copy_redirgInfo_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *r
 	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdinfo_indicator");
 	if (!ftdm_strlen_zero(val)) {
 		redirInfo->redirInd.val = atoi(val);
+		redirInfo->redirInd.pres = 1;
 		bProceed = 1;
 	} else {		
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Information on Redirection Indicator\n");
@@ -593,6 +594,7 @@ ftdm_status_t copy_redirgInfo_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *r
 	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdinfo_orig");
 	if (!ftdm_strlen_zero(val)) {
 		redirInfo->origRedirReas.val = atoi(val);
+		redirInfo->origRedirReas.pres = 1;
 		bProceed = 1;
 	} else {		
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Information on Original Reasons\n");
@@ -601,6 +603,7 @@ ftdm_status_t copy_redirgInfo_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *r
 	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdinfo_count");
 	if (!ftdm_strlen_zero(val)) {
 		redirInfo->redirCnt.val = atoi(val);
+		redirInfo->redirCnt.pres= 1;
 		bProceed = 1;
 	} else {		
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Information on Redirection Count\n");
@@ -609,6 +612,7 @@ ftdm_status_t copy_redirgInfo_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *r
 	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdinfo_reason");
 	if (!ftdm_strlen_zero(val)) {
 		redirInfo->redirReas.val = atoi(val);
+		redirInfo->redirReas.pres = 1;
 		bProceed = 1;
 	} else {		
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Information on Redirection Reasons\n");

From 63ecf4e9091c1a9f2fd18d5ce324375275162739 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 19 Jan 2012 16:55:15 -0500
Subject: [PATCH 073/102]   FreeTDM: remove the portion of opc fix

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 0bed14c2e6..a4d16b7dd2 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -253,18 +253,8 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sngss7_add_var(sngss7_info, "ss7_cic", var);
 
 
-            if (siConEvnt->orgPteCde.eh.pres) {
-                sprintf(var, "%d",(uint32_t)siConEvnt->orgPteCde.sigPointCode.val);
-                sngss7_add_var(sngss7_info, "ss7_opc", var);
-				SS7_DEBUG_CHAN(ftdmchan, " OPC = d%\n", (uint32_t)siConEvnt->orgPteCde.sigPointCode.val);
-			} else {
-				SS7_DEBUG_CHAN(ftdmchan, "No OPC information in IAM%s\n", " ");
-            }
-
-			/*  original code, should be removed after review.
 			sprintf(var, "%d", g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId].spc );
 			sngss7_add_var(sngss7_info, "ss7_opc", var);
-			*/
 			
 			if (siConEvnt->callRef.callId.pres) {
         /* %x expect an unsigned int so as callId is a U32, casting to uint32_t

From 8d1d930085d9a594bff424d01ca5f9f8c33fbd72 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 19 Jan 2012 18:04:03 -0500
Subject: [PATCH 074/102]   FreeTDM: fixing OPC bug using local SPC           
 - take the DPC of the link and set it as OPC in x-header            - this is
 what the user want's to have

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index a4d16b7dd2..9c3bd65426 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -253,7 +253,7 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			sngss7_add_var(sngss7_info, "ss7_cic", var);
 
 
-			sprintf(var, "%d", g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId].spc );
+			sprintf(var, "%d", g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId].dpc );
 			sngss7_add_var(sngss7_info, "ss7_opc", var);
 			
 			if (siConEvnt->callRef.callId.pres) {

From 34c8e58ae1a500d0fd1855b88c4ce86f317fc03f Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Wed, 25 Jan 2012 16:00:20 -0500
Subject: [PATCH 075/102]   FreeTDM: location value in REL message set to 0x04 
           - only available to SPIROU

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index fbfab15d1e..4b5f82f52d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -259,7 +259,11 @@ void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
 	
 	rel.causeDgn.eh.pres = PRSNT_NODEF;
 	rel.causeDgn.location.pres = PRSNT_NODEF;
+#ifdef SANGOMA_SPIROU
+	rel.causeDgn.location.val = 0x04;
+#else
 	rel.causeDgn.location.val = 0x01;
+#endif
 	rel.causeDgn.cdeStand.pres = PRSNT_NODEF;
 	rel.causeDgn.cdeStand.val = 0x00;
 	rel.causeDgn.recommend.pres = NOTPRSNT;

From 28e27248e5d86ef553973dc39827bd099d2db853 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Wed, 25 Jan 2012 18:00:41 -0500
Subject: [PATCH 076/102]   FreeTDM: remove the previous commit            -
 hardcode does not work in this matter

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 4b5f82f52d..fbfab15d1e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -259,11 +259,7 @@ void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
 	
 	rel.causeDgn.eh.pres = PRSNT_NODEF;
 	rel.causeDgn.location.pres = PRSNT_NODEF;
-#ifdef SANGOMA_SPIROU
-	rel.causeDgn.location.val = 0x04;
-#else
 	rel.causeDgn.location.val = 0x01;
-#endif
 	rel.causeDgn.cdeStand.pres = PRSNT_NODEF;
 	rel.causeDgn.cdeStand.val = 0x00;
 	rel.causeDgn.recommend.pres = NOTPRSNT;

From 90f538c0a0e08197f9add62131f1a5ee9a3522c0 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 26 Jan 2012 11:19:41 -0500
Subject: [PATCH 077/102]   FreeTDM: Fixing issues of SPIROU            -
 redirect number in Transparent IAM 		   - redirect information in
 Transparent IAM 		   - called party number in Transparent IAM   
         - adding incoming uuid to x-header to check loop calls

---
 libs/freetdm/mod_freetdm/mod_freetdm.c        | 23 ++++++++++++++++++-
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c |  9 ++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 003be91b17..e694a0f8fa 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -115,6 +115,8 @@ struct private_object {
 	ftdm_channel_t *ftdmchan;
 	uint32_t write_error;
 	uint32_t read_error;
+	char network_peer_uuid[SWITCH_UUID_FORMATTED_LENGTH + 1];
+	
 };
 
 /* private data attached to FTDM channels (only FXS for now) */
@@ -1246,6 +1248,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 	int argc = 0;
 	const char *var;
 	const char *dest_num = NULL, *callerid_num = NULL;
+	const char *network_peer_uuid = NULL;
 	ftdm_hunting_scheme_t hunting;
 	ftdm_usrmsg_t usrmsg;
 
@@ -1336,6 +1339,9 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 	if (session && globals.sip_headers) {
 		switch_channel_t *channel = switch_core_session_get_channel(session);
 		const char *sipvar;
+
+		network_peer_uuid = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-TransUUID");
+
 		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-CallerName");
 		if (sipvar) {
 			ftdm_set_string(caller_data.cid_name, sipvar);
@@ -1592,6 +1598,20 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 			goto fail;
 		}
 
+		if (network_peer_uuid) {
+			switch_core_session_t *network_peer = switch_core_session_locate(network_peer_uuid);
+			if (network_peer) {
+					const char *my_uuid = switch_core_session_get_uuid(*new_session);
+					private_t *peer_private = switch_core_session_get_private(network_peer);
+					switch_set_string(tech_pvt->network_peer_uuid, network_peer_uuid);
+					switch_set_string(peer_private->network_peer_uuid, my_uuid);
+
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Session %s is network-bridged with %s\n", my_uuid, network_peer_uuid);
+
+					switch_core_session_rwunlock(network_peer);
+			}
+		}
+
 		caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
 		caller_profile->destination_number = switch_core_strdup(caller_profile->pool, switch_str_nil(dest_num));
 		caller_profile->caller_id_number = switch_core_strdup(caller_profile->pool, switch_str_nil(callerid_num));
@@ -1617,7 +1637,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 			} else {
 				cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
 			}
-            		goto fail;
+            goto fail;
 		}
 
 		return SWITCH_CAUSE_SUCCESS;
@@ -1746,6 +1766,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 	
 	if (globals.sip_headers) {
 		switch_channel_set_variable(channel, "sip_h_X-FreeTDM-SpanName", ftdm_channel_get_span_name(sigmsg->channel));
+		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-TransUUID", "%s",switch_core_session_get_uuid(session));	
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-SpanNumber", "%d", spanid);	
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-ChanNumber", "%d", chanid);
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index fbfab15d1e..0c8cf3832a 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -58,6 +58,15 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 	if (sngss7_info->circuit->transparent_iam &&
 		sngss7_retrieve_iam(ftdmchan, &iam) == FTDM_SUCCESS) {
 		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Transparent)\n", sngss7_info->circuit->cic);
+
+		/* Called Number information */
+		copy_cdPtyNum_to_sngss7(ftdmchan, &iam.cdPtyNum);
+
+		/* Redirecting Number */
+		copy_redirgNum_to_sngss7(ftdmchan, &iam.redirgNum);
+
+		/* Redirecting Information */
+		copy_redirgInfo_to_sngss7(ftdmchan, &iam.redirInfo);
 	} else {
 		/* Nature of Connection Indicators */
 		copy_natConInd_to_sngss7(ftdmchan, &iam.natConInd);

From 1b964054de8aa60299c9ffc29647ccbcd457d44f Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 26 Jan 2012 15:21:51 -0500
Subject: [PATCH 078/102] freetdm: Add new queue for ss7 clone messages, all
 incoming messages are queued now

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c | 18 ++++++++++++++++++
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h |  1 +
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c  |  3 +++
 3 files changed, 22 insertions(+)

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 c963ea7cb7..ebee2c382d 100644
--- 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
@@ -511,6 +511,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 {
 	sngss7_chan_data_t *sngss7_info = NULL;
 	ftdm_channel_t *ftdmchan = NULL;
+	sngss7_event_data_t *event_clone = NULL;
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(sngss7_event->circuit, &sngss7_info, &ftdmchan)) {
@@ -521,6 +522,22 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 	/* now that we have the right channel ... put a lock on it so no-one else can use it */
 	ftdm_channel_lock(ftdmchan);
 
+	if (sngss7_info->event_queue) {
+		if (sngss7_event->event_id == SNGSS7_CON_IND_EVENT) {
+			/* this is the first event in a call, flush the event queue */
+			while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
+				SS7_WARN("Discarding clone event from past call for circuit = %d!\n", sngss7_event->circuit);
+				ftdm_safe_free(event_clone);
+			}
+		}
+		/* clone the event and save it for later usage */
+		event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
+		if (event_clone) {
+			memcpy(clone, sngss7_event, sizeof(*sngss7_event));
+			ftdm_queue_enqueue(sngss7_info->event_queue, clone);
+		}
+	}
+
 	/* while there's a state change present on this channel process it */
 	ftdm_channel_advance_states(ftdmchan);
 
@@ -576,6 +593,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 		break;
 	/**************************************************************************/
 	case (SNGSS7_SSP_STA_CFM_EVENT):
+		SS7_ERROR("dazed and confused ... hu?!\n");
 		break;
 	/**************************************************************************/
 	default:
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 78210d50fb..2a1ca1749e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -485,6 +485,7 @@ typedef struct sngss7_chan_data {
 	sngss7_group_data_t		rx_gra;
 	sngss7_group_data_t		tx_grs;
 	sngss7_group_data_t		ucic;
+	ftdm_queue_t 			*event_queue;
 } sngss7_chan_data_t;
 
 #define SNGSS7_RX_GRS_PENDING (1 << 0)
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index f7d0171f93..d7732cce6c 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -2925,6 +2925,9 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 		/* prepare the global info sturcture */
 		ss7_info = ftdm_calloc(1, sizeof(sngss7_chan_data_t));
 		ss7_info->ftdmchan = NULL;
+		if (ftdm_queue_create(&ss7_info->event_queue, SNGSS7_EVENT_QUEUE_SIZE) != FTDM_SUCCESS) {
+			SS7_CRITICAL("Failed to create ss7 cic event queue\n");
+		}
 		ss7_info->circuit = &g_ftdm_sngss7_data.cfg.isupCkt[x];
 
 		g_ftdm_sngss7_data.cfg.isupCkt[x].obj			= ss7_info;

From 98d566b29c5ebc43834c27c8859d042b69ef94ba Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 26 Jan 2012 16:39:43 -0500
Subject: [PATCH 079/102]   FreeTDM: adding variable ss7_rel_loc for REL
 location indicator (to support SPIROU)

---
 libs/freetdm/mod_freetdm/mod_freetdm.c                | 11 +++++++++++
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c   | 11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index e694a0f8fa..1ecf1fe7ef 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -506,6 +506,9 @@ static switch_status_t channel_on_hangup(switch_core_session_t *session)
 	int chan_id = 0;
 	const char *name = NULL;
 
+	ftdm_usrmsg_t usrmsg;
+	memset(&usrmsg, 0, sizeof(ftdm_usrmsg_t));
+
 
 	channel = switch_core_session_get_channel(session);
 	assert(channel != NULL);
@@ -574,11 +577,19 @@ static switch_status_t channel_on_hangup(switch_core_session_t *session)
 	case FTDM_CHAN_TYPE_CAS:
 	case FTDM_CHAN_TYPE_B:
 		{
+			const char *sipvar;
 			ftdm_call_cause_t hcause = switch_channel_get_cause_q850(channel);
 			if (hcause  < 1 || hcause > 127) {
 				hcause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
 			}
+			sipvar = switch_channel_get_variable(channel, "ss7_rel_loc");
+			if (sipvar) {
+				ftdm_usrmsg_add_var(&usrmsg, "ss7_rel_loc", sipvar);
+			}
+			/*
 			ftdm_channel_call_hangup_with_cause(tech_pvt->ftdmchan, hcause);
+			*/
+			ftdm_channel_call_hangup_with_cause_ex(tech_pvt->ftdmchan, hcause, &usrmsg);
 		}
 		break;
 	default: 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 0c8cf3832a..f73fd871b4 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -259,6 +259,7 @@ void ft_to_sngss7_anm (ftdm_channel_t * ftdmchan)
 /******************************************************************************/
 void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
 {
+	const char *loc_ind = NULL;
 	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
 	
 	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
@@ -268,7 +269,15 @@ void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
 	
 	rel.causeDgn.eh.pres = PRSNT_NODEF;
 	rel.causeDgn.location.pres = PRSNT_NODEF;
-	rel.causeDgn.location.val = 0x01;
+
+	loc_ind = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rel_loc");
+	if (!ftdm_strlen_zero(loc_ind)) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied location indicator in REL, value \"%s\"\n", loc_ind);
+		rel.causeDgn.location.val = atoi(loc_ind);
+	} else {
+		rel.causeDgn.location.val = 0x01;
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "No user supplied location indicator in REL, using 0x01\"%s\"\n", "");
+	}
 	rel.causeDgn.cdeStand.pres = PRSNT_NODEF;
 	rel.causeDgn.cdeStand.val = 0x00;
 	rel.causeDgn.recommend.pres = NOTPRSNT;

From a1a1af579b9b6cbf7349c5e39b8d51a260eb443f Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 26 Jan 2012 16:50:38 -0500
Subject: [PATCH 080/102] freetdm: Implement SS7 transparent IAM functionality
 using the event clones queue

---
 libs/freetdm/mod_freetdm/mod_freetdm.c        | 17 ++++++
 .../ftmod_sangoma_ss7_main.c                  | 15 ++++-
 .../ftmod_sangoma_ss7_main.h                  |  1 +
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c | 55 ++++++++++++++++++-
 4 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 003be91b17..204e5a894f 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1603,6 +1603,23 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		hunt_data.tech_pvt = tech_pvt;
 		caller_data.priv = &hunt_data;
 
+		if (session
+		 && (var = channel_get_variable(session, var_event, FREETDM_VAR_PREFIX "native_sigbridge")) 
+		 && switch_true(var)
+		 && switch_core_session_compare(*new_session, session)) {
+			char sigbridge_peer[255];
+			private_t *peer_pvt = switch_core_session_get_private(session);
+			switch_channel_t *peer_chan = switch_core_session_get_channel(session);
+			switch_channel_t *our_chan = switch_core_session_get_channel(*new_session);
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, 
+					"Bridging native signaling of channel %s to channel %s\n", 
+					switch_channel_get_name(peer_chan), switch_channel_get_name(our_chan));
+			snprintf(sigbridge_peer, sizeof(sigbridge_peer), "%u:%u", 
+					ftdm_channel_get_span_id(peer_pvt->ftdmchan), ftdm_channel_get_id(peer_pvt->ftdmchan));
+			ftdm_usrmsg_add_var(&usrmsg, "sigbridge_peer", sigbridge_peer);
+		}
+
+
 		if ((status = ftdm_call_place_ex(&caller_data, &hunting, &usrmsg)) != FTDM_SUCCESS) {
 			if (tech_pvt->read_codec.implementation) {
 				switch_core_codec_destroy(&tech_pvt->read_codec);
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 ebee2c382d..bcb518ff9d 100644
--- 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
@@ -526,7 +526,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 		if (sngss7_event->event_id == SNGSS7_CON_IND_EVENT) {
 			/* this is the first event in a call, flush the event queue */
 			while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
-				SS7_WARN("Discarding clone event from past call for circuit = %d!\n", sngss7_event->circuit);
+				SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
 				ftdm_safe_free(event_clone);
 			}
 		}
@@ -1076,6 +1076,19 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 		if (ftdm_test_flag (ftdmchan, FTDM_CHANNEL_OPEN)) {
 			ftdm_channel_t *close_chan = ftdmchan;
+
+			/* detach native bridging if needed (only the outbound leg is responsible for that)
+			   Inbound leg was responsible of flushing its queue of events, but peer attach/detach
+			   is left as an outbound leg responsibility
+			 */
+			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
+				sngss7_chan_data_t *peer_info = sngss7_info->peer_data;
+				sngss7_info->peer_data = NULL;
+				if (peer_info) {
+					peer_info->peer_data = NULL;
+				}
+			}
+
 			/* close the channel */
 			SS7_DEBUG_CHAN(ftdmchan,"FTDM Channel Close %s\n", "");
 			ftdm_channel_close (&close_chan);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 2a1ca1749e..2fc6f740c7 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -486,6 +486,7 @@ typedef struct sngss7_chan_data {
 	sngss7_group_data_t		tx_grs;
 	sngss7_group_data_t		ucic;
 	ftdm_queue_t 			*event_queue;
+	struct sngss7_chan_data *peer_data;
 } sngss7_chan_data_t;
 
 #define SNGSS7_RX_GRS_PENDING (1 << 0)
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index fbfab15d1e..eda03715f3 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -44,6 +44,7 @@
 /* FUNCTIONS ******************************************************************/
 void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 {	
+	const char *var = NULL;
 	SiConEvnt 			iam;
 	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;;
 	
@@ -55,7 +56,59 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 	
 	memset (&iam, 0x0, sizeof (iam));
 
-	if (sngss7_info->circuit->transparent_iam &&
+	var = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "sigbridge_peer");
+	if (!ftdm_strlen_zero(var)) {
+		ftdm_status_t status = FTDM_SUCCESS;
+		int rc = 0;
+		ftdm_span_t *peer_span = NULL;
+		ftdm_channel_t *peer_chan = NULL;
+		sngss7_chan_data_t *peer_info = NULL;
+		unsigned peer_span_id = 0;
+		unsigned peer_chan_id = 0;
+		rc = sscanf(var, "%u:%u", &peer_span_id, &peer_chan_id);
+		if (rc != 2) {
+			SS7_ERROR_CHAN(ftdmchan, "Failed to parse sigbridge_peer string '%s'\n", var);
+		} else {
+			status = ftdm_span_find(peer_span_id, &peer_span);
+			if (status != FTDM_SUCCESS || !peer_span) {
+				SS7_ERROR_CHAN(ftdmchan, "Failed to find peer span for channel id '%u:%u'\n", peer_span_id, peer_chan_id);
+			} else if (peer_span->signal_type != FTDM_SIGTYPE_SS7) {
+				SS7_ERROR_CHAN(ftdmchan, "Peer channel %d:%d has different signaling type %d'\n", 
+						peer_span_id, peer_chan_id, peer_span->signal_type);
+			} else {
+				if (peer_chan_id > (FTDM_MAX_CHANNELS_SPAN+1) || !(peer_chan = peer_span->channels[peer_chan_id])) {
+					SS7_ERROR_CHAN(ftdmchan, "Invalid peer channel id '%u:%u'\n", peer_span_id, peer_chan_id);
+				} else {
+					sngss7_event_data_t *event_clone = NULL;
+					peer_info = peer_chan->call_data;
+					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Starting native bridge with peer CIC %d\n", 
+							sngss7_info->circuit->cic, peer_info->circuit->cic);
+					/* make each one of us aware of the native bridge */
+					peer_info->peer_data = sngss7_info;
+					sngss7_info->peer_data = peer_info;
+					/* flush our own queue */
+					while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
+						SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
+						ftdm_safe_free(event_clone);
+					}
+				}
+			}
+		}
+	}
+
+	if (sngss7_info->peer_data) {
+		sngss7_event_data_t *event_clone = ftdm_queue_dequeue(sngss7_info->peer_data->event_queue);
+		/* Retrieve IAM from our peer */
+		if (!event_clone) {
+			SS7_ERROR_CHAN(ftdmchan, "No event clone in peer queue!%s\n", "");
+		} else if (event_clone->event_id != SNGSS7_CON_IND_EVENT) {
+			/* first message in the queue should ALWAYS be an IAM */
+			SS7_ERROR_CHAN(ftdmchan, "Invalid initial peer message type '%d'\n", event_clone->event_id);
+		} else {
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged)\n", sngss7_info->circuit->cic);
+			memcpy(&iam, &event_clone->event.siConEvnt, sizeof(iam));
+		}
+	} else if (sngss7_info->circuit->transparent_iam &&
 		sngss7_retrieve_iam(ftdmchan, &iam) == FTDM_SUCCESS) {
 		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Transparent)\n", sngss7_info->circuit->cic);
 	} else {

From b4e8d5b6086ddf861760db21686ad4344f470356 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 26 Jan 2012 17:22:45 -0500
Subject: [PATCH 081/102] freetdm: Fix incorrect variable name leading to
 segfault

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 bcb518ff9d..96b662bdbb 100644
--- 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
@@ -533,8 +533,8 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 		/* clone the event and save it for later usage */
 		event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
 		if (event_clone) {
-			memcpy(clone, sngss7_event, sizeof(*sngss7_event));
-			ftdm_queue_enqueue(sngss7_info->event_queue, clone);
+			memcpy(event_clone, sngss7_event, sizeof(*sngss7_event));
+			ftdm_queue_enqueue(sngss7_info->event_queue, event_clone);
 		}
 	}
 

From 95baef882153eef83885022024ef5c07251b3a79 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 26 Jan 2012 17:37:35 -0500
Subject: [PATCH 082/102]   FreeTDM: patch SPIROU requests            - adding
 freetdm_iam_loc_pres variable to disable LOC in transparent IAM  	
    - confirming freetdm_bearer_capability is working properly

---
 libs/freetdm/mod_freetdm/mod_freetdm.c        |  4 ++++
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c |  3 +++
 .../ftmod_sangoma_ss7_support.c               | 22 ++++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 1ecf1fe7ef..c2712621da 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1523,9 +1523,13 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		caller_data.pres = FTDM_PRES_RESTRICTED;
 	}
 
+	if ((var = channel_get_variable(session, var_event, "freetdm_iam_loc_pres"))) {
+		ftdm_usrmsg_add_var(&usrmsg, "iam_loc_pres", var);
+	}
 	if ((var = channel_get_variable(session, var_event, "freetdm_bearer_capability"))) {
 		caller_data.bearer_capability = (uint8_t)atoi(var);
 	}
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "freetdm_bearer_capability is set to %s \n", var );
 	
 	if ((var = channel_get_variable(session, var_event, "freetdm_bearer_layer1"))) {
 		caller_data.bearer_layer1 = (uint8_t)atoi(var);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index f73fd871b4..a5311e9afc 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -67,6 +67,9 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 
 		/* Redirecting Information */
 		copy_redirgInfo_to_sngss7(ftdmchan, &iam.redirInfo);
+
+		/* Location Number information */
+		copy_locPtyNum_to_sngss7(ftdmchan, &iam.cgPtyNum1);
 	} else {
 		/* Nature of Connection Indicators */
 		copy_natConInd_to_sngss7(ftdmchan, &iam.natConInd);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 59777b048b..957649fa21 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -243,15 +243,25 @@ ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *loc
 {
         const char *val = NULL;
         const char *loc_nadi = NULL;
+		int pres_val = PRSNT_NODEF;
 
         sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
         ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
 
-        locPtyNum->eh.pres = PRSNT_NODEF;
-        locPtyNum->natAddrInd.pres = PRSNT_NODEF;
+
+        val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "iam_loc_pres");
+        if (!ftdm_strlen_zero(val)) {
+			if (!strcasecmp(val, "false")) {
+				pres_val = NOTPRSNT;
+			}
+		}
+
+
+        locPtyNum->eh.pres = pres_val;
+        locPtyNum->natAddrInd.pres = pres_val;
         locPtyNum->natAddrInd.val = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].loc_nadi;
 
-        locPtyNum->scrnInd.pres = PRSNT_NODEF;
+        locPtyNum->scrnInd.pres = pres_val;
         val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_loc_screen_ind");
         if (!ftdm_strlen_zero(val)) {
                 locPtyNum->scrnInd.val = atoi(val);
@@ -260,7 +270,7 @@ ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *loc
         }
         ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Location Reference Code Screening Ind %d\n", locPtyNum->scrnInd.val);
 
-        locPtyNum->presRest.pres = PRSNT_NODEF;
+        locPtyNum->presRest.pres = pres_val;
         val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_pres_ind");
         if (!ftdm_strlen_zero(val)) {
                 locPtyNum->presRest.val = atoi(val);
@@ -269,10 +279,10 @@ ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *loc
         }
         ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Calling Party Number Presentation Ind %d\n", locPtyNum->presRest.val);
 
-        locPtyNum->numPlan.pres	= PRSNT_NODEF;
+        locPtyNum->numPlan.pres	= pres_val;
         locPtyNum->numPlan.val = 0x01;
 
-        locPtyNum->niInd.pres = PRSNT_NODEF;
+        locPtyNum->niInd.pres = pres_val;
         locPtyNum->niInd.val = 0x00;
 
 		/* check if the user would like a custom NADI value for the Location Reference */

From 3235fa079a26142e8c499441b08660254dfee55c Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 26 Jan 2012 18:00:34 -0500
Subject: [PATCH 083/102]   FreeTDM: fix for SPIROU            - adding
 freetdm_iam_fwd_ind_isdn_access_ind (value must be 0 or 1)              to
 modify forward call indicator's ISDN access indicator value in             
 transparent IAM

---
 libs/freetdm/mod_freetdm/mod_freetdm.c                 |  5 ++++-
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c    |  3 +++
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c      | 10 +++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index c2712621da..cdcb8ca1e0 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1523,13 +1523,16 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		caller_data.pres = FTDM_PRES_RESTRICTED;
 	}
 
+	if ((var = channel_get_variable(session, var_event, "freetdm_iam_fwd_ind_isdn_access_ind"))) {
+		ftdm_usrmsg_add_var(&usrmsg, "iam_fwd_ind_isdn_access_ind", var);
+	}
+
 	if ((var = channel_get_variable(session, var_event, "freetdm_iam_loc_pres"))) {
 		ftdm_usrmsg_add_var(&usrmsg, "iam_loc_pres", var);
 	}
 	if ((var = channel_get_variable(session, var_event, "freetdm_bearer_capability"))) {
 		caller_data.bearer_capability = (uint8_t)atoi(var);
 	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "freetdm_bearer_capability is set to %s \n", var );
 	
 	if ((var = channel_get_variable(session, var_event, "freetdm_bearer_layer1"))) {
 		caller_data.bearer_layer1 = (uint8_t)atoi(var);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index a5311e9afc..d25b3342f0 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -70,6 +70,9 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 
 		/* Location Number information */
 		copy_locPtyNum_to_sngss7(ftdmchan, &iam.cgPtyNum1);
+
+		/* Forward Call Indicators */
+		copy_fwdCallInd_to_sngss7(ftdmchan, &iam.fwdCallInd);
 	} else {
 		/* Nature of Connection Indicators */
 		copy_natConInd_to_sngss7(ftdmchan, &iam.natConInd);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index 957649fa21..c25597cd40 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -763,6 +763,8 @@ ftdm_status_t copy_natConInd_to_sngss7(ftdm_channel_t *ftdmchan, SiNatConInd *na
 
 ftdm_status_t copy_fwdCallInd_to_sngss7(ftdm_channel_t *ftdmchan, SiFwdCallInd *fwdCallInd)
 {
+	const char *val = NULL;
+	int acc_val = ISDNACC_ISDN;
 	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;
 	
 	fwdCallInd->eh.pres 				= PRSNT_NODEF;
@@ -779,7 +781,13 @@ ftdm_status_t copy_fwdCallInd_to_sngss7(ftdm_channel_t *ftdmchan, SiFwdCallInd *
 	fwdCallInd->isdnUsrPrtPrfInd.pres 	= PRSNT_NODEF;
 	fwdCallInd->isdnUsrPrtPrfInd.val 	= PREF_PREFAW;
 	fwdCallInd->isdnAccInd.pres 		= PRSNT_NODEF;
-	fwdCallInd->isdnAccInd.val 			= ISDNACC_ISDN;
+
+	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "iam_fwd_ind_isdn_access_ind");
+	if (!ftdm_strlen_zero(val)) {
+		acc_val = (int)atoi(val);
+	}
+
+	fwdCallInd->isdnAccInd.val 			= acc_val;
 	fwdCallInd->sccpMethInd.pres 		= PRSNT_NODEF;
 	fwdCallInd->sccpMethInd.val 		= SCCPMTH_NOIND;
 

From 977b546f9a420a7cc4699cabb12223744ffc93b4 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 26 Jan 2012 18:52:27 -0500
Subject: [PATCH 084/102]   FreeTDM: reuse sip_h_X-FreeTDM-LOC = NULL to
 indicate disable LOC

---
 libs/freetdm/mod_freetdm/mod_freetdm.c                   | 3 ---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c  | 9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index cdcb8ca1e0..9d15ad8eec 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1527,9 +1527,6 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		ftdm_usrmsg_add_var(&usrmsg, "iam_fwd_ind_isdn_access_ind", var);
 	}
 
-	if ((var = channel_get_variable(session, var_event, "freetdm_iam_loc_pres"))) {
-		ftdm_usrmsg_add_var(&usrmsg, "iam_loc_pres", var);
-	}
 	if ((var = channel_get_variable(session, var_event, "freetdm_bearer_capability"))) {
 		caller_data.bearer_capability = (uint8_t)atoi(var);
 	}
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index c25597cd40..fde1278b15 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -248,15 +248,10 @@ ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *loc
         sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
         ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
 
-
-        val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "iam_loc_pres");
-        if (!ftdm_strlen_zero(val)) {
-			if (!strcasecmp(val, "false")) {
-				pres_val = NOTPRSNT;
-			}
+		if (!strcasecmp(caller_data->loc.digits, "NULL")) {
+			pres_val = NOTPRSNT;
 		}
 
-
         locPtyNum->eh.pres = pres_val;
         locPtyNum->natAddrInd.pres = pres_val;
         locPtyNum->natAddrInd.val = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].loc_nadi;

From 71c3cf365aa724eed3429ffc736674bf1c77cd4a Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Thu, 26 Jan 2012 19:25:04 -0500
Subject: [PATCH 085/102]   FreeTDM: adding sip_h_X-FreeTDM-RDNIS-Presentation
 in redirecting number            to give the ability to change RDNIS
 Presentation value for            Transparent IAM

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index fde1278b15..2088f240b6 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -444,6 +444,13 @@ ftdm_status_t copy_redirgNum_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirNum *red
 			return FTDM_FAIL;
 		}
 	} else {
+
+		val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdnis_pres_ind");
+		if (!ftdm_strlen_zero(val)) {
+			redirgNum->presRest.val = atoi(val);
+		} 
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Redirecting Number Address Presentation Restricted Ind:%d\n", redirgNum->presRest.val);
+
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Redirection Number\n");
 		return FTDM_SUCCESS;
 	}

From 23a328389b6bbfa905501ca907de6e2cf91a700e Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 26 Jan 2012 22:44:19 -0500
Subject: [PATCH 086/102] freetdm: Initial attempt to bridge natively SS7
 signaling between 2 channels

---
 libs/freetdm/src/ftdm_io.c                    |  71 +++-
 .../ftmod_sangoma_ss7_main.c                  | 397 +++++++++++++++++-
 .../ftmod_sangoma_ss7_main.h                  |   7 +-
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c |  61 ++-
 libs/freetdm/src/include/private/ftdm_core.h  |   6 +
 libs/freetdm/src/include/private/ftdm_types.h |   2 +
 6 files changed, 491 insertions(+), 53 deletions(-)

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 8b179ccf05..6ebe5fc161 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -53,8 +53,6 @@ struct tm *localtime_r(const time_t *clock, struct tm *result);
 #endif
 
 #define FORCE_HANGUP_TIMER 30000
-#define SPAN_PENDING_CHANS_QUEUE_SIZE 1000
-#define SPAN_PENDING_SIGNALS_QUEUE_SIZE 1000
 #define FTDM_READ_TRACE_INDEX 0
 #define FTDM_WRITE_TRACE_INDEX 1
 #define MAX_CALLIDS 6000
@@ -2201,6 +2199,12 @@ static ftdm_status_t _ftdm_channel_call_hangup_nl(const char *file, const char *
 {
 	ftdm_status_t status = FTDM_SUCCESS;
 
+	if (ftdm_test_flag(chan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
+		ftdm_log_chan_ex(chan, file, func, line, FTDM_LOG_LEVEL_DEBUG, 
+				"Ignoring hangup in channel in state %s (native bridge enabled)\n", ftdm_channel_state2str(chan->state));
+		goto done;
+	}
+
 	if (chan->state != FTDM_CHANNEL_STATE_DOWN) {
 		if (chan->state == FTDM_CHANNEL_STATE_HANGUP) {
 			/* make user's life easier, and just ignore double hangup requests */
@@ -2227,6 +2231,8 @@ static ftdm_status_t _ftdm_channel_call_hangup_nl(const char *file, const char *
 			ftdm_channel_close(&chan);
 		}
 	}
+
+done:
 	return status;
 }
 
@@ -2322,6 +2328,15 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_indicate(const char *file, const ch
 
 	ftdm_channel_lock(ftdmchan);
 
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
+		ftdm_log_chan_ex(ftdmchan, file, func, line, FTDM_LOG_LEVEL_DEBUG, 
+				"Ignoring indication %s in channel in state %s (native bridge enabled)\n",
+				ftdm_channel_indication2str(indication), 
+				ftdm_channel_state2str(ftdmchan->state));
+		status = FTDM_SUCCESS;
+		goto done;
+	}
+
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_IND_ACK_PENDING)) {
 		ftdm_log_chan_ex(ftdmchan, file, func, line, FTDM_LOG_LEVEL_WARNING, "Cannot indicate %s in channel with indication %s still pending in state %s\n",
 				ftdm_channel_indication2str(indication), 
@@ -2422,10 +2437,50 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_reset(const char *file, const char *func
 	return FTDM_SUCCESS;
 }
 
+FT_DECLARE(ftdm_status_t) ftdm_get_channel_from_string(const char *string_id, ftdm_span_t **out_span, ftdm_channel_t **out_channel)
+{
+	ftdm_status_t status = FTDM_SUCCESS;
+	int rc = 0;
+	ftdm_span_t *span = NULL;
+	ftdm_channel_t *ftdmchan = NULL;
+	unsigned span_id = 0;
+	unsigned chan_id = 0;
+
+	*out_span = NULL;
+	*out_channel = NULL;
+
+	rc = sscanf(string_id, "%u:%u", &span_id, &chan_id);
+	if (rc != 2) {
+		ftdm_log(FTDM_LOG_ERROR, "Failed to parse channel id string '%s'\n", string_id);
+		status = FTDM_EINVAL;
+		goto done;
+	} 
+
+	status = ftdm_span_find(span_id, &span);
+	if (status != FTDM_SUCCESS || !span) {
+		ftdm_log(FTDM_LOG_ERROR, "Failed to find span for channel id string '%s'\n", string_id);
+		status = FTDM_EINVAL;
+		goto done;
+	} 
+
+	if (chan_id > (FTDM_MAX_CHANNELS_SPAN+1) || !(ftdmchan = span->channels[chan_id])) {
+		ftdm_log(FTDM_LOG_ERROR, "Invalid channel id string '%s'\n", string_id);
+		status = FTDM_EINVAL;
+		goto done;
+	}
+
+	status = FTDM_SUCCESS;
+	*out_span = span;
+	*out_channel = ftdmchan;
+done:
+	return status;
+}
+
 /* this function MUST be called with the channel lock held with lock recursivity of 1 exactly, 
  * and the caller must be aware we might unlock the channel for a brief period of time and then lock it again */
 static ftdm_status_t _ftdm_channel_call_place_nl(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_usrmsg_t *usrmsg)
 {
+	const char *var = NULL;
 	ftdm_status_t status = FTDM_FAIL;
 	
 	ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "null channel");
@@ -2461,6 +2516,17 @@ static ftdm_status_t _ftdm_channel_call_place_nl(const char *file, const char *f
 
 	ftdm_set_flag(ftdmchan, FTDM_CHANNEL_CALL_STARTED);
 	ftdm_call_set_call_id(ftdmchan, &ftdmchan->caller_data);
+	var = ftdm_usrmsg_get_var(usrmsg, "sigbridge_peer");
+	if (var) {
+		ftdm_span_t *peer_span = NULL;
+		ftdm_channel_t *peer_chan = NULL;
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "enabling native signaling bridge!\n");
+		ftdm_set_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE);
+		ftdm_get_channel_from_string(var, &peer_span, &peer_chan);
+		if (peer_chan) {
+			ftdm_set_flag(peer_chan, FTDM_CHANNEL_NATIVE_SIGBRIDGE);
+		}
+	}
 
 	/* if the signaling stack left the channel in state down on success, is expecting us to move to DIALING */
 	if (ftdmchan->state == FTDM_CHANNEL_STATE_DOWN) {
@@ -2662,6 +2728,7 @@ static ftdm_status_t ftdm_channel_done(ftdm_channel_t *ftdmchan)
 	ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_ANSWERED);
 	ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_USER_HANGUP);
 	ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_DIGITAL_MEDIA);
+	ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE);
 	ftdm_mutex_lock(ftdmchan->pre_buffer_mutex);
 	ftdm_buffer_destroy(&ftdmchan->pre_buffer);
 	ftdmchan->pre_buffer_size = 0;
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 96b662bdbb..dddb0b2bef 100644
--- 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
@@ -55,6 +55,7 @@ ftdm_sngss7_data_t g_ftdm_sngss7_data;
 /* PROTOTYPES *****************************************************************/
 static void *ftdm_sangoma_ss7_run (ftdm_thread_t * me, void *obj);
 static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_event);
+static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan, sngss7_event_data_t *sngss7_event);
 
 static ftdm_status_t ftdm_sangoma_ss7_stop (ftdm_span_t * span);
 static ftdm_status_t ftdm_sangoma_ss7_start (ftdm_span_t * span);
@@ -338,9 +339,10 @@ static void handle_hw_alarm(ftdm_event_t *e)
 /* MONITIOR THREADS ***********************************************************/
 static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 {
-	ftdm_interrupt_t	*ftdm_sangoma_ss7_int[2];
+	ftdm_interrupt_t	*ftdm_sangoma_ss7_int[3];
 	ftdm_span_t 		*ftdmspan = (ftdm_span_t *) obj;
 	ftdm_channel_t 		*ftdmchan = NULL;
+	ftdm_channel_t 		*peerchan = NULL;
 	ftdm_event_t 		*event = NULL;
 	sngss7_event_data_t	*sngss7_event = NULL;
 	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->signal_data;
@@ -365,6 +367,12 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 		goto ftdm_sangoma_ss7_run_exit;
 	}
 
+	/* get an interrupt queue for this span for peer channel events */
+	if (ftdm_queue_get_interrupt (sngss7_span->peer_chans, &ftdm_sangoma_ss7_int[2]) != FTDM_SUCCESS) {
+		SS7_CRITICAL ("Failed to get a ftdm_interrupt for span = %d for peer channel events queue!\n", ftdmspan->span_id);
+		goto ftdm_sangoma_ss7_run_exit;
+	}
+
 	while (ftdm_running () && !(ftdm_test_flag (ftdmspan, FTDM_SPAN_STOP_THREAD))) {
 		int x = 0;
 		if (b_alarm_test) {
@@ -395,7 +403,7 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 		}
 
 		/* check the channel state queue for an event*/	
-		switch ((ftdm_interrupt_multiple_wait(ftdm_sangoma_ss7_int, 2, 100))) {
+		switch ((ftdm_interrupt_multiple_wait(ftdm_sangoma_ss7_int, ftdm_array_len(ftdm_sangoma_ss7_int), 100))) {
 		/**********************************************************************/
 		case FTDM_SUCCESS:	/* process all pending state changes */
 
@@ -412,6 +420,31 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 				ftdm_mutex_unlock (ftdmchan->mutex);				
 			}
 
+			/* clean out all peer pending channel events */
+			while ((peerchan = ftdm_queue_dequeue (sngss7_span->peer_chans))) {
+				/* note that the channels being dequeued here may not belong to this span
+				   they may belong to just about any other span that one of our channels
+				   happens to be bridged to */
+				sngss7_chan_data_t *peer_info = peerchan->call_data;
+				sngss7_chan_data_t *chan_info = peer_info->peer_data;
+				ftdmchan = chan_info->ftdmchan;
+
+				/* 
+				   if there is any state changes at all, those will be done in the opposite channel
+				   to peerchan (where the original event was received), therefore we must lock ftdmchan, 
+				   but do not need to lock peerchan as we only read its event queue, which is already 
+				   locked when dequeueing */
+				ftdm_channel_lock(ftdmchan);
+
+				/* clean out all pending stack events in the peer channel */
+				while ((sngss7_event = ftdm_queue_dequeue(peer_info->event_queue))) {
+					ftdm_sangoma_ss7_process_peer_stack_event(ftdmchan, sngss7_event);
+					ftdm_safe_free(sngss7_event);
+				}
+ 
+				ftdm_channel_lock(ftdmchan);				
+			}
+
 			/* clean out all pending stack events */
 			while ((sngss7_event = ftdm_queue_dequeue(sngss7_span->event_queue))) {
 				ftdm_sangoma_ss7_process_stack_event(sngss7_event);
@@ -522,24 +555,60 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 	/* now that we have the right channel ... put a lock on it so no-one else can use it */
 	ftdm_channel_lock(ftdmchan);
 
-	if (sngss7_info->event_queue) {
-		if (sngss7_event->event_id == SNGSS7_CON_IND_EVENT) {
-			/* this is the first event in a call, flush the event queue */
-			while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
-				SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
-				ftdm_safe_free(event_clone);
-			}
-		}
-		/* clone the event and save it for later usage */
-		event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
-		if (event_clone) {
-			memcpy(event_clone, sngss7_event, sizeof(*sngss7_event));
-			ftdm_queue_enqueue(sngss7_info->event_queue, event_clone);
+	/* while there's a state change present on this channel process it */
+	ftdm_channel_advance_states(ftdmchan);
+
+	if (sngss7_event->event_id == SNGSS7_CON_IND_EVENT) {
+		/* this is the first event in a call, flush the event queue */
+		while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
+			SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
+			ftdm_safe_free(event_clone);
 		}
 	}
 
-	/* while there's a state change present on this channel process it */
-	ftdm_channel_advance_states(ftdmchan);
+	/* clone the event and save it for later usage */
+	event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
+	if (event_clone) {
+		memcpy(event_clone, sngss7_event, sizeof(*sngss7_event));
+		ftdm_queue_enqueue(sngss7_info->event_queue, event_clone);
+		if (sngss7_info->peer_data) {
+			sngss7_span_data_t *sngss7_peer_span = (sngss7_span_data_t *)sngss7_info->peer_data->ftdmchan->span->signal_data;
+			/* we already have a peer attached, wake him up */
+			ftdm_queue_enqueue(sngss7_peer_span->peer_chans, sngss7_info->ftdmchan);
+		}
+	}
+	
+	/* we could test for sngss7_info->peer_data too, bit this flag is set earlier, the earlier we know the better */
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
+		/* most messages are simply relayed in sig bridge mode, except for hangup which requires state changing */
+		switch (sngss7_event->event_id) {
+		case SNGSS7_REL_IND_EVENT:
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
+			break;
+		case SNGSS7_REL_CFM_EVENT:
+			{
+				ftdm_channel_t *peer_chan = sngss7_info->peer_data->ftdmchan;
+				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+				if (peer_chan) {
+					/* we need to unlock our chan or we risk deadlock */
+					ftdm_channel_advance_states(ftdmchan);
+					ftdm_channel_unlock(ftdmchan);
+
+					ftdm_channel_lock(peer_chan);
+					if (peer_chan->state != FTDM_CHANNEL_STATE_DOWN) {
+						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+					}
+					ftdm_channel_unlock(peer_chan);
+
+					ftdm_channel_lock(ftdmchan);
+				}
+			}
+			break;
+		default:
+			break;
+		}
+		goto done;
+	}
 
 	/* figure out the type of event and send it to the right handler */
 	switch (sngss7_event->event_id) {
@@ -602,6 +671,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 	/**************************************************************************/
 	}
 
+done:
 	/* while there's a state change present on this channel process it */
 	ftdm_channel_advance_states(ftdmchan);
 
@@ -610,8 +680,290 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 
 }
 
+FTDM_ENUM_NAMES(SNG_EVENT_TYPE_NAMES, SNG_EVENT_TYPE_STRINGS)
+FTDM_STR2ENUM(ftdm_str2sngss7_event, ftdm_sngss7_event2str, sng_event_type_t, SNG_EVENT_TYPE_NAMES, SNGSS7_INVALID_EVENT)
+static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan, sngss7_event_data_t *sngss7_event)
+{
+	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
+
+	if (ftdmchan->state < FTDM_CHANNEL_STATE_UP) {
+		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_UP);
+		ftdm_channel_advance_states(ftdmchan);
+	}
+
+	SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]Relaying message %s from bridged peer\n", 
+			sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id));
+
+	switch (sngss7_event->event_id) {
+
+	case (SNGSS7_CON_IND_EVENT):
+		SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]Rx IAM (bridged)??\n", sngss7_info->circuit->cic);
+		break;
+
+	case (SNGSS7_CON_CFM_EVENT):
+		/* send the ANM request to LibSngSS7 */
+		sng_cc_con_response(1,
+							sngss7_info->suInstId,
+							sngss7_info->spInstId,
+							sngss7_info->circuit->id, 
+							&sngss7_event->event.siConEvnt, 
+							5); 
+
+		SS7_INFO_CHAN(ftdmchan, "[CIC:%d]Tx peer ANM\n", sngss7_info->circuit->cic);
+		break;
+
+	case (SNGSS7_CON_STA_EVENT):
+		switch (sngss7_event->evntType) {
+		/**************************************************************************/
+		case (ADDRCMPLT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer ACM\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (MODIFY):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer MODIFY\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (MODCMPLT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer MODIFY-COMPLETE\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (MODREJ):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer MODIFY-REJECT\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (PROGRESS):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer CPG\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (FRWDTRSFR):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer FOT\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (INFORMATION):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer INF\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (INFORMATREQ):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer INR\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (SUBSADDR):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer SAM\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (EXIT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer EXIT\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (NETRESMGT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer NRM\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (IDENTREQ):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer IDR\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (IDENTRSP):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer IRS\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (MALCLLPRNT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer MALICIOUS CALL\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (CHARGE):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer CRG\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (TRFFCHGE):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer CRG-TARIFF\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (CHARGEACK):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer CRG-ACK\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (CALLOFFMSG):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer CALL-OFFER\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (LOOPPRVNT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer LOP\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (TECT_TIMEOUT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer ECT-Timeout\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (RINGSEND):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer RINGING-SEND\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (CALLCLEAR):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer CALL-LINE Clear\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (PRERELEASE):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer PRI\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (APPTRANSPORT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer APM\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (OPERATOR):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer OPERATOR\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (METPULSE):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer METERING-PULSE\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (CLGPTCLR):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer CALLING_PARTY_CLEAR\n", sngss7_info->circuit->cic);
+			break;
+		/**************************************************************************/
+		case (SUBDIRNUM):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer SUB-DIR\n", sngss7_info->circuit->cic);
+			break;
+#ifdef SANGOMA_SPIROU
+		case (CHARGE_ACK):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer TXA\n", sngss7_info->circuit->cic);		
+			break;
+		case (CHARGE_UNIT):
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer ITX\n", sngss7_info->circuit->cic);
+			break;
+#endif
+		/**************************************************************************/
+		default:
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer Unknown Msg %d\n", sngss7_info->circuit->cic, sngss7_event->evntType);
+			break;
+		/**************************************************************************/
+		}
+		sng_cc_con_status  (1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id,
+					&sngss7_event->event.siCnStEvnt, 
+					sngss7_event->evntType);
+
+		break;
+	/**************************************************************************/
+	case (SNGSS7_REL_IND_EVENT):
+	        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer REL cause=%d\n", sngss7_info->circuit->cic, sngss7_event->event.siRelEvnt.causeDgn.causeVal.val);
+
+		//handle_rel_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit,  &sngss7_event->event.siRelEvnt);
+		sng_cc_rel_request (1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id,
+					&sngss7_event->event.siRelEvnt);
+		break;
+
+	/**************************************************************************/
+	case (SNGSS7_REL_CFM_EVENT):
+		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer RLC\n", sngss7_info->circuit->cic);
+		sng_cc_rel_response (1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id,
+					&sngss7_event->event.siRelEvnt);
+		//handle_rel_cfm(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit,  &sngss7_event->event.siRelEvnt);
+		break;
+
+	/**************************************************************************/
+	case (SNGSS7_DAT_IND_EVENT):
+		//handle_dat_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit,  &sngss7_event->event.siInfoEvnt);
+		break;
+	/**************************************************************************/
+	case (SNGSS7_FAC_IND_EVENT):
+		//handle_fac_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit, sngss7_event->evntType,  &sngss7_event->event.siFacEvnt);
+		break;
+	/**************************************************************************/
+	case (SNGSS7_FAC_CFM_EVENT):
+		//handle_fac_cfm(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit, sngss7_event->evntType,  &sngss7_event->event.siFacEvnt);
+		break;
+	/**************************************************************************/
+	case (SNGSS7_UMSG_IND_EVENT):
+		//handle_umsg_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit);
+		break;
+	/**************************************************************************/
+	case (SNGSS7_STA_IND_EVENT):
+		//handle_sta_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit, sngss7_event->globalFlg, sngss7_event->evntType,  &sngss7_event->event.siStaEvnt);
+		break;
+	/**************************************************************************/
+	case (SNGSS7_SUSP_IND_EVENT):
+		//handle_susp_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit,  &sngss7_event->event.siSuspEvnt);
+		break;
+	/**************************************************************************/
+	case (SNGSS7_RESM_IND_EVENT):
+		//handle_resm_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit,  &sngss7_event->event.siResmEvnt);
+		break;
+	/**************************************************************************/
+	case (SNGSS7_SSP_STA_CFM_EVENT):
+		SS7_ERROR("dazed and confused ... hu?!\n");
+		break;
+	/**************************************************************************/
+	default:
+		SS7_ERROR("Unknown Event Id!\n");
+		break;
+	/**************************************************************************/
+	}
+
+}
+
+static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t *ftdmchan);
+static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t *ftdmchan)
+{
+	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
+
+	ftdm_channel_complete_state(ftdmchan);
+
+	switch (ftdmchan->state) {
+
+	case FTDM_CHANNEL_STATE_DOWN:
+		{
+			/* both peers come here after the channel processing the RLC moves the pair to DOWN */
+			ftdm_channel_t *close_chan = ftdmchan;
+
+			/* detach native bridging if needed (only the outbound leg is responsible for that to avoid races or messy locks) */
+			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
+				sngss7_chan_data_t *peer_info = sngss7_info->peer_data;
+				sngss7_info->peer_data = NULL;
+				if (peer_info) {
+					peer_info->peer_data = NULL;
+				}
+			}
+
+			/* close the channel */
+			ftdm_channel_close (&close_chan);
+		}
+		break;
+
+	case FTDM_CHANNEL_STATE_UP:
+		{
+			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
+				sngss7_send_signal(sngss7_info, FTDM_SIGEVENT_UP);
+			}
+		}
+		break;
+
+	case FTDM_CHANNEL_STATE_TERMINATING:
+		{
+			/* when receiving REL we move to TERMINATING and notify the user that the bridge is ending */
+			sngss7_send_signal(sngss7_info, FTDM_SIGEVENT_STOP);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	return FTDM_SUCCESS;
+}
+
 /******************************************************************************/
-ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
+ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t *ftdmchan)
 {
 	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
 	sng_isup_inf_t *isup_intf = NULL;
@@ -623,6 +975,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
 
+	if (sngss7_info->peer_data) {
+		return ftdm_sangoma_ss7_native_bridge_state_change(ftdmchan);
+	}
 
 	/*check what state we are supposed to be in */
 	switch (ftdmchan->state) {
@@ -1940,6 +2295,12 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
 		return FTDM_FAIL;
 	}
 
+	/* create an peer channel queue for this span */
+	if ((ftdm_queue_create(&(ss7_span_info)->peer_chans, SPAN_PENDING_CHANS_QUEUE_SIZE)) != FTDM_SUCCESS) {
+		SS7_CRITICAL("Unable to create peer chans queue!\n");
+		return FTDM_FAIL;
+	}
+
 	/*setup the span structure with the info so far */
 	g_ftdm_sngss7_data.sig_cb 		= sig_cb;
 	span->start 					= ftdm_sangoma_ss7_start;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 2fc6f740c7..7404a8e55d 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -81,8 +81,12 @@ typedef enum {
 	SNGSS7_STA_IND_EVENT,
 	SNGSS7_SUSP_IND_EVENT,
 	SNGSS7_RESM_IND_EVENT,
-	SNGSS7_SSP_STA_CFM_EVENT
+	SNGSS7_SSP_STA_CFM_EVENT,
+	SNGSS7_INVALID_EVENT,
 } sng_event_type_t;
+#define SNG_EVENT_TYPE_STRINGS "CON_IND", "CON_CFM", "CON_STA", "REL_IND", "REL_CFM", "DAT_IND", "FAC_IND", \
+	                       "FAC_CFM", "UMSG_IND", "STA_IND", "SUSP_IND", "RESM_IND", "SSP_STA_CFM", "INVALID"
+FTDM_STR2ENUM_P(ftdm_str2sngss7_event, ftdm_sngss7_event2str, sng_event_type_t)
 
 typedef enum {
 	SNG_BIT_A	= (1 << 0),
@@ -500,6 +504,7 @@ typedef struct sngss7_span_data {
 	sngss7_group_data_t		rx_cgu;
 	sngss7_group_data_t		tx_cgu;
 	ftdm_queue_t 			*event_queue;
+	ftdm_queue_t                    *peer_chans;
 } sngss7_span_data_t;
 
 typedef struct sngss7_event_data
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index eda03715f3..96ec5afae9 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -58,45 +58,39 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 
 	var = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "sigbridge_peer");
 	if (!ftdm_strlen_zero(var)) {
-		ftdm_status_t status = FTDM_SUCCESS;
-		int rc = 0;
 		ftdm_span_t *peer_span = NULL;
 		ftdm_channel_t *peer_chan = NULL;
 		sngss7_chan_data_t *peer_info = NULL;
-		unsigned peer_span_id = 0;
-		unsigned peer_chan_id = 0;
-		rc = sscanf(var, "%u:%u", &peer_span_id, &peer_chan_id);
-		if (rc != 2) {
-			SS7_ERROR_CHAN(ftdmchan, "Failed to parse sigbridge_peer string '%s'\n", var);
+
+		ftdm_get_channel_from_string(var, &peer_span, &peer_chan);
+		if (!peer_chan) {
+			SS7_ERROR_CHAN(ftdmchan, "Failed to find sigbridge peer from string '%s'\n", var);
 		} else {
-			status = ftdm_span_find(peer_span_id, &peer_span);
-			if (status != FTDM_SUCCESS || !peer_span) {
-				SS7_ERROR_CHAN(ftdmchan, "Failed to find peer span for channel id '%u:%u'\n", peer_span_id, peer_chan_id);
-			} else if (peer_span->signal_type != FTDM_SIGTYPE_SS7) {
-				SS7_ERROR_CHAN(ftdmchan, "Peer channel %d:%d has different signaling type %d'\n", 
-						peer_span_id, peer_chan_id, peer_span->signal_type);
+			if (peer_span->signal_type != FTDM_SIGTYPE_SS7) {
+				SS7_ERROR_CHAN(ftdmchan, "Peer channel '%s' has different signaling type %d'\n", 
+						var, peer_span->signal_type);
 			} else {
-				if (peer_chan_id > (FTDM_MAX_CHANNELS_SPAN+1) || !(peer_chan = peer_span->channels[peer_chan_id])) {
-					SS7_ERROR_CHAN(ftdmchan, "Invalid peer channel id '%u:%u'\n", peer_span_id, peer_chan_id);
-				} else {
-					sngss7_event_data_t *event_clone = NULL;
-					peer_info = peer_chan->call_data;
-					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Starting native bridge with peer CIC %d\n", 
-							sngss7_info->circuit->cic, peer_info->circuit->cic);
-					/* make each one of us aware of the native bridge */
-					peer_info->peer_data = sngss7_info;
-					sngss7_info->peer_data = peer_info;
-					/* flush our own queue */
-					while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
-						SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
-						ftdm_safe_free(event_clone);
-					}
+				sngss7_event_data_t *event_clone = NULL;
+				peer_info = peer_chan->call_data;
+				SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Starting native bridge with peer CIC %d\n", 
+						sngss7_info->circuit->cic, peer_info->circuit->cic);
+				/* make each one of us aware of the native bridge */
+				peer_info->peer_data = sngss7_info;
+				sngss7_info->peer_data = peer_info;
+				/* flush our own queue */
+				while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
+					SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
+					ftdm_safe_free(event_clone);
 				}
+				/* go up until release comes, note that state processing is done different and much simpler when there is a peer  */
+				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_UP);
+				ftdm_channel_advance_states(ftdmchan);
 			}
 		}
 	}
 
 	if (sngss7_info->peer_data) {
+		sngss7_span_data_t *span_data = ftdmchan->span->signal_data;
 		sngss7_event_data_t *event_clone = ftdm_queue_dequeue(sngss7_info->peer_data->event_queue);
 		/* Retrieve IAM from our peer */
 		if (!event_clone) {
@@ -108,6 +102,9 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged)\n", sngss7_info->circuit->cic);
 			memcpy(&iam, &event_clone->event.siConEvnt, sizeof(iam));
 		}
+		/* since this is the first time we dequeue an event from the peer, make sure our main thread process any other events,
+		   this will trigger the interrupt in our span peer_chans queue which will wake up our main thread if it is sleeping */
+		ftdm_queue_enqueue(span_data->peer_chans, sngss7_info->peer_data->ftdmchan);
 	} else if (sngss7_info->circuit->transparent_iam &&
 		sngss7_retrieve_iam(ftdmchan, &iam) == FTDM_SUCCESS) {
 		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Transparent)\n", sngss7_info->circuit->cic);
@@ -322,10 +319,10 @@ void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
 	
 	/* send the REL request to LibSngSS7 */
 	sng_cc_rel_request (1,
-						sngss7_info->suInstId,
-						sngss7_info->spInstId, 
-						sngss7_info->circuit->id, 
-						&rel);
+			sngss7_info->suInstId,
+			sngss7_info->spInstId, 
+			sngss7_info->circuit->id, 
+			&rel);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx REL cause=%d \n",
 							sngss7_info->circuit->cic,
diff --git a/libs/freetdm/src/include/private/ftdm_core.h b/libs/freetdm/src/include/private/ftdm_core.h
index f27be789e2..4150480297 100644
--- a/libs/freetdm/src/include/private/ftdm_core.h
+++ b/libs/freetdm/src/include/private/ftdm_core.h
@@ -130,6 +130,9 @@
 extern "C" {
 #endif
 
+#define SPAN_PENDING_CHANS_QUEUE_SIZE 1000
+#define SPAN_PENDING_SIGNALS_QUEUE_SIZE 1000
+
 #define GOTO_STATUS(label,st) status = st; goto label ;
 
 #define ftdm_copy_string(x,y,z) strncpy(x, y, z - 1) 
@@ -686,6 +689,9 @@ FT_DECLARE(ftdm_status_t) ftdm_sigmsg_remove_var(ftdm_sigmsg_t *sigmsg, const ch
  */
 FT_DECLARE(ftdm_status_t) ftdm_sigmsg_set_raw_data(ftdm_sigmsg_t *sigmsg, void *data, ftdm_size_t datalen);
 
+/*! \brief Retrieve a span and channel data structure from a string in the format 'span_id:chan_id'*/
+FT_DECLARE(ftdm_status_t) ftdm_get_channel_from_string(const char *string_id, ftdm_span_t **out_span, ftdm_channel_t **out_channel);
+
 /*!
   \brief Assert condition
 */
diff --git a/libs/freetdm/src/include/private/ftdm_types.h b/libs/freetdm/src/include/private/ftdm_types.h
index 6df25fe4d2..17e273c425 100755
--- a/libs/freetdm/src/include/private/ftdm_types.h
+++ b/libs/freetdm/src/include/private/ftdm_types.h
@@ -265,6 +265,8 @@ typedef enum {
 #define FTDM_CHANNEL_BLOCKING        (1ULL << 35)
 /*!< Media is digital */
 #define FTDM_CHANNEL_DIGITAL_MEDIA   (1ULL << 36)
+/*!< Native signaling bridge is enabled */
+#define FTDM_CHANNEL_NATIVE_SIGBRIDGE (1ULL << 37)
 
 #include "ftdm_state.h"
 

From f2cdb8c6c75039f431ea51964f0542a73f56fde3 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 26 Jan 2012 23:31:29 -0500
Subject: [PATCH 087/102] freetdm: Fixes for native signaling bridge (now
 tested, and works for basic call flows)          - Fix typo when unlocking
 channel that resulted in deadlock          - Defer clearing of the peer data
 until it is completely safe (next call)

---
 libs/freetdm/src/ftdm_state.c                 |  5 ++++
 .../ftmod_sangoma_ss7_main.c                  | 24 +++++++------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/libs/freetdm/src/ftdm_state.c b/libs/freetdm/src/ftdm_state.c
index 6572ab75a4..30ef3ce478 100644
--- a/libs/freetdm/src/ftdm_state.c
+++ b/libs/freetdm/src/ftdm_state.c
@@ -263,6 +263,9 @@ static ftdm_status_t ftdm_core_set_state(const char *file, const char *func, int
 		}
 	}
 
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
+		goto perform_state_change;
+	}
 
 	if (ftdmchan->span->state_map) {
 		ok = ftdm_parse_state_map(ftdmchan, state, ftdmchan->span->state_map);
@@ -354,6 +357,8 @@ end:
 		goto done;
 	}
 
+perform_state_change:
+
 	ftdm_log_chan_ex(ftdmchan, file, func, line, FTDM_LOG_LEVEL_DEBUG, "Changed state from %s to %s\n", ftdm_channel_state2str(ftdmchan->state), ftdm_channel_state2str(state));
 	ftdmchan->last_state = ftdmchan->state; 
 	ftdmchan->state = state;
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 dddb0b2bef..968e557acc 100644
--- 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
@@ -441,8 +441,8 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 					ftdm_sangoma_ss7_process_peer_stack_event(ftdmchan, sngss7_event);
 					ftdm_safe_free(sngss7_event);
 				}
- 
-				ftdm_channel_lock(ftdmchan);				
+
+				ftdm_channel_unlock(ftdmchan);				
 			}
 
 			/* clean out all pending stack events */
@@ -564,6 +564,8 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 			SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
 			ftdm_safe_free(event_clone);
 		}
+		/* clear the peer if any */
+		sngss7_info->peer_data = NULL;
 	}
 
 	/* clone the event and save it for later usage */
@@ -596,7 +598,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 
 					ftdm_channel_lock(peer_chan);
 					if (peer_chan->state != FTDM_CHANNEL_STATE_DOWN) {
-						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+						ftdm_set_state(peer_chan, FTDM_CHANNEL_STATE_DOWN);
 					}
 					ftdm_channel_unlock(peer_chan);
 
@@ -923,19 +925,7 @@ static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t
 
 	case FTDM_CHANNEL_STATE_DOWN:
 		{
-			/* both peers come here after the channel processing the RLC moves the pair to DOWN */
 			ftdm_channel_t *close_chan = ftdmchan;
-
-			/* detach native bridging if needed (only the outbound leg is responsible for that to avoid races or messy locks) */
-			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
-				sngss7_chan_data_t *peer_info = sngss7_info->peer_data;
-				sngss7_info->peer_data = NULL;
-				if (peer_info) {
-					peer_info->peer_data = NULL;
-				}
-			}
-
-			/* close the channel */
 			ftdm_channel_close (&close_chan);
 		}
 		break;
@@ -975,6 +965,10 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t *ftdmchan)
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
 
+	if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
+		sngss7_info->peer_data = NULL;
+	}
+
 	if (sngss7_info->peer_data) {
 		return ftdm_sangoma_ss7_native_bridge_state_change(ftdmchan);
 	}

From 1aa4f87b6acd16a3a75f84f611af189725a696eb Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 26 Jan 2012 23:51:21 -0500
Subject: [PATCH 088/102] freetdm: Tweaks to SS7 native bridge feature         
 - Enable native bridge also when receiving the UUID via SIP header          -
 Remove some debug CRIT messages and set a more proper log level

---
 libs/freetdm/mod_freetdm/mod_freetdm.c        | 38 ++++++++++++-------
 libs/freetdm/src/ftdm_io.c                    |  1 -
 .../ftmod_sangoma_ss7_main.c                  |  2 +-
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c |  1 -
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index a007fef081..2bbcdf97e4 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1260,6 +1260,9 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 	const char *var;
 	const char *dest_num = NULL, *callerid_num = NULL;
 	const char *network_peer_uuid = NULL;
+	char sigbridge_peer[255];
+	switch_channel_t *peer_chan = NULL;
+	switch_channel_t *our_chan = NULL;
 	ftdm_hunting_scheme_t hunting;
 	ftdm_usrmsg_t usrmsg;
 
@@ -1613,17 +1616,22 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 			goto fail;
 		}
 
+		our_chan = switch_core_session_get_channel(*new_session);
+
 		if (network_peer_uuid) {
 			switch_core_session_t *network_peer = switch_core_session_locate(network_peer_uuid);
 			if (network_peer) {
-					const char *my_uuid = switch_core_session_get_uuid(*new_session);
-					private_t *peer_private = switch_core_session_get_private(network_peer);
-					switch_set_string(tech_pvt->network_peer_uuid, network_peer_uuid);
-					switch_set_string(peer_private->network_peer_uuid, my_uuid);
+				const char *my_uuid = switch_core_session_get_uuid(*new_session);
+				private_t *peer_private = switch_core_session_get_private(network_peer);
+				switch_set_string(tech_pvt->network_peer_uuid, network_peer_uuid);
+				switch_set_string(peer_private->network_peer_uuid, my_uuid);
 
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Session %s is network-bridged with %s\n", my_uuid, network_peer_uuid);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %s is network-bridged with %s\n", 
+						my_uuid, network_peer_uuid);
 
-					switch_core_session_rwunlock(network_peer);
+				snprintf(sigbridge_peer, sizeof(sigbridge_peer), "%u:%u", 
+				ftdm_channel_get_span_id(peer_private->ftdmchan), ftdm_channel_get_id(peer_private->ftdmchan));
+				switch_core_session_rwunlock(network_peer);
 			}
 		}
 
@@ -1642,15 +1650,13 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		 && (var = channel_get_variable(session, var_event, FREETDM_VAR_PREFIX "native_sigbridge")) 
 		 && switch_true(var)
 		 && switch_core_session_compare(*new_session, session)) {
-			char sigbridge_peer[255];
 			private_t *peer_pvt = switch_core_session_get_private(session);
-			switch_channel_t *peer_chan = switch_core_session_get_channel(session);
-			switch_channel_t *our_chan = switch_core_session_get_channel(*new_session);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, 
-					"Bridging native signaling of channel %s to channel %s\n", 
-					switch_channel_get_name(peer_chan), switch_channel_get_name(our_chan));
 			snprintf(sigbridge_peer, sizeof(sigbridge_peer), "%u:%u", 
 					ftdm_channel_get_span_id(peer_pvt->ftdmchan), ftdm_channel_get_id(peer_pvt->ftdmchan));
+		}
+
+		if (!zstr(sigbridge_peer)) {
+			peer_chan = switch_core_session_get_channel(session);
 			ftdm_usrmsg_add_var(&usrmsg, "sigbridge_peer", sigbridge_peer);
 		}
 
@@ -1669,7 +1675,13 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 			} else {
 				cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
 			}
-            goto fail;
+            		goto fail;
+		}
+
+		if (our_chan && peer_chan) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, 
+					"Bridging native signaling of channel %s to channel %s\n", 
+					switch_channel_get_name(peer_chan), switch_channel_get_name(our_chan));
 		}
 
 		return SWITCH_CAUSE_SUCCESS;
diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 6ebe5fc161..3b11611d49 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -2520,7 +2520,6 @@ static ftdm_status_t _ftdm_channel_call_place_nl(const char *file, const char *f
 	if (var) {
 		ftdm_span_t *peer_span = NULL;
 		ftdm_channel_t *peer_chan = NULL;
-		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "enabling native signaling bridge!\n");
 		ftdm_set_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE);
 		ftdm_get_channel_from_string(var, &peer_span, &peer_chan);
 		if (peer_chan) {
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 968e557acc..24f612545f 100644
--- 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
@@ -693,7 +693,7 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 		ftdm_channel_advance_states(ftdmchan);
 	}
 
-	SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]Relaying message %s from bridged peer\n", 
+	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Relaying message %s from bridged peer\n", 
 			sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id));
 
 	switch (sngss7_event->event_id) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 59cb6a4f53..cc66365593 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -79,7 +79,6 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 				sngss7_info->peer_data = peer_info;
 				/* flush our own queue */
 				while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
-					SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
 					ftdm_safe_free(event_clone);
 				}
 				/* go up until release comes, note that state processing is done different and much simpler when there is a peer  */

From a83f04ab6a7e2f8276f6e280c8b1eeb578897a5a Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 27 Jan 2012 00:13:59 -0500
Subject: [PATCH 089/102] freetdm: Relay the rest of SS7 messages supported by
 libsng_ss7 when in native bridge mode

---
 .../ftmod_sangoma_ss7_main.c                  | 55 ++++++++++++++++---
 1 file changed, 48 insertions(+), 7 deletions(-)

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 24f612545f..06ddd7e8d1 100644
--- 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
@@ -561,7 +561,6 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 	if (sngss7_event->event_id == SNGSS7_CON_IND_EVENT) {
 		/* this is the first event in a call, flush the event queue */
 		while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
-			SS7_WARN("[CIC:%d]Discarding clone event from past call!\n", sngss7_info->circuit->cic);
 			ftdm_safe_free(event_clone);
 		}
 		/* clear the peer if any */
@@ -693,13 +692,13 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 		ftdm_channel_advance_states(ftdmchan);
 	}
 
-	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Relaying message %s from bridged peer\n", 
+	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Receiving message %s from bridged peer\n", 
 			sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id));
 
 	switch (sngss7_event->event_id) {
 
 	case (SNGSS7_CON_IND_EVENT):
-		SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]Rx IAM (bridged)??\n", sngss7_info->circuit->cic);
+		SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]Rx IAM while bridged??\n", sngss7_info->circuit->cic);
 		break;
 
 	case (SNGSS7_CON_CFM_EVENT):
@@ -876,18 +875,48 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 	/**************************************************************************/
 	case (SNGSS7_DAT_IND_EVENT):
 		//handle_dat_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit,  &sngss7_event->event.siInfoEvnt);
+		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer %s\n", sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id));
+		sng_cc_dat_request(1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id,
+					&sngss7_event->event.siInfoEvnt);
 		break;
 	/**************************************************************************/
 	case (SNGSS7_FAC_IND_EVENT):
-		//handle_fac_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit, sngss7_event->evntType,  &sngss7_event->event.siFacEvnt);
+		//handle_fac_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit, sngss7_event->evntType,  
+		//&sngss7_event->event.siFacEvnt);
+		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer %s -> %d\n", sngss7_info->circuit->cic, 
+				ftdm_sngss7_event2str(sngss7_event->event_id), sngss7_event->evntType);
+		sng_cc_fac_request(1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id,
+					sngss7_event->evntType,
+					&sngss7_event->event.siFacEvnt);
+
 		break;
 	/**************************************************************************/
 	case (SNGSS7_FAC_CFM_EVENT):
-		//handle_fac_cfm(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit, sngss7_event->evntType,  &sngss7_event->event.siFacEvnt);
+		//handle_fac_cfm(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit, 
+		//sngss7_event->evntType,  &sngss7_event->event.siFacEvnt);
+		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer %s -> %d\n", sngss7_info->circuit->cic, 
+				ftdm_sngss7_event2str(sngss7_event->event_id), sngss7_event->evntType);
+		sng_cc_fac_response(1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id,
+					sngss7_event->evntType,
+					&sngss7_event->event.siFacEvnt);
 		break;
 	/**************************************************************************/
 	case (SNGSS7_UMSG_IND_EVENT):
 		//handle_umsg_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit);
+		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer %s\n", sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id));
+		sng_cc_umsg_request (1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id);
 		break;
 	/**************************************************************************/
 	case (SNGSS7_STA_IND_EVENT):
@@ -896,18 +925,30 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 	/**************************************************************************/
 	case (SNGSS7_SUSP_IND_EVENT):
 		//handle_susp_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit,  &sngss7_event->event.siSuspEvnt);
+		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer %s\n", sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id));
+		sng_cc_susp_request (1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id,
+					&sngss7_event->event.siSuspEvnt);
 		break;
 	/**************************************************************************/
 	case (SNGSS7_RESM_IND_EVENT):
 		//handle_resm_ind(sngss7_event->suInstId, sngss7_event->spInstId, sngss7_event->circuit,  &sngss7_event->event.siResmEvnt);
+		SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx peer %s\n", sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id));
+		sng_cc_resm_request(1,
+					sngss7_info->suInstId,
+					sngss7_info->spInstId,
+					sngss7_info->circuit->id,
+					&sngss7_event->event.siResmEvnt);
 		break;
 	/**************************************************************************/
 	case (SNGSS7_SSP_STA_CFM_EVENT):
-		SS7_ERROR("dazed and confused ... hu?!\n");
+		SS7_CRITICAL("dazed and confused ... hu?!\n");
 		break;
 	/**************************************************************************/
 	default:
-		SS7_ERROR("Unknown Event Id!\n");
+		SS7_ERROR("Failed to relay unknown event id %d!\n", sngss7_event->event_id);
 		break;
 	/**************************************************************************/
 	}

From 2db41c5c793fd18acd25b0cd22499d7b1406b88e Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 27 Jan 2012 06:34:36 -0500
Subject: [PATCH 090/102] freetdm: Fix uninitialized var leading to segfault

---
 libs/freetdm/mod_freetdm/mod_freetdm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 2bbcdf97e4..a180f03fef 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1267,6 +1267,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 	ftdm_usrmsg_t usrmsg;
 
 	memset(&usrmsg, 0, sizeof(ftdm_usrmsg_t));
+	memset(sigbridge_peer, 0, sizeof(sigbridge_peer));
 
 	if (!outbound_profile) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing caller profile\n");
@@ -1655,7 +1656,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 					ftdm_channel_get_span_id(peer_pvt->ftdmchan), ftdm_channel_get_id(peer_pvt->ftdmchan));
 		}
 
-		if (!zstr(sigbridge_peer)) {
+		if (session && !zstr(sigbridge_peer)) {
 			peer_chan = switch_core_session_get_channel(session);
 			ftdm_usrmsg_add_var(&usrmsg, "sigbridge_peer", sigbridge_peer);
 		}

From 0ff8a087c616177f0162d4acab6bf7be2e60aa4a Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 27 Jan 2012 06:44:11 -0500
Subject: [PATCH 091/102] freetdm: Fix incorrect state transition from DOWN to
 UP when processing an SS7 clone event

---
 .../src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 06ddd7e8d1..bcc21df7be 100644
--- 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
@@ -687,13 +687,13 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 {
 	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
 
-	if (ftdmchan->state < FTDM_CHANNEL_STATE_UP) {
+	if (ftdmchan->state < FTDM_CHANNEL_STATE_UP && ftdmchan->state != FTDM_CHANNEL_STATE_DOWN) {
 		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_UP);
 		ftdm_channel_advance_states(ftdmchan);
 	}
 
-	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Receiving message %s from bridged peer\n", 
-			sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id));
+	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Receiving message %s from bridged peer (our state = %s)\n", 
+			sngss7_info->circuit->cic, ftdm_sngss7_event2str(sngss7_event->event_id), ftdm_channel_state2str(ftdmchan->state));
 
 	switch (sngss7_event->event_id) {
 

From de56f3c465d98bddb916a106092db94a8459d853 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 27 Jan 2012 14:42:33 +0100
Subject: [PATCH 092/102] freetdm: spirou transparent IAM fix for called number

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index cc66365593..b9914337a5 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -98,8 +98,18 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 			/* first message in the queue should ALWAYS be an IAM */
 			SS7_ERROR_CHAN(ftdmchan, "Invalid initial peer message type '%d'\n", event_clone->event_id);
 		} else {
-			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged)\n", sngss7_info->circuit->cic);
+			ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+
+			SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged, dialing %s)\n", sngss7_info->circuit->cic, caller_data->dnis.digits);
+
+			/* copy original incoming IAM */
 			memcpy(&iam, &event_clone->event.siConEvnt, sizeof(iam));
+
+			/* Change DNIS to whatever was specified, do not change NADI or anything else! */
+			copy_tknStr_to_sngss7(caller_data->dnis.digits, &iam.cdPtyNum.addrSig, &iam.cdPtyNum.oddEven);
+
+			/* SPIROU certification hack 
+			   If the IAM contains */
 		}
 		/* since this is the first time we dequeue an event from the peer, make sure our main thread process any other events,
 		   this will trigger the interrupt in our span peer_chans queue which will wake up our main thread if it is sleeping */

From 572154693e3e972f50d4385ad3456f73e8235a69 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 27 Jan 2012 16:21:53 +0100
Subject: [PATCH 093/102] freetdm: spirou certification specific changes about
 RDNIS/RDINF usage

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index b9914337a5..c1eef81d92 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -109,7 +109,31 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 			copy_tknStr_to_sngss7(caller_data->dnis.digits, &iam.cdPtyNum.addrSig, &iam.cdPtyNum.oddEven);
 
 			/* SPIROU certification hack 
-			   If the IAM contains */
+			   If the IAM already contain RDINF, just increment the count and set the RDNIS digits
+			   otherwise, honor RDNIS and RDINF stuff coming from the user */
+			if (iam.redirInfo.eh.pres == PRSNT_NODEF) {
+				const char *val = NULL;
+				SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect info present\n", sngss7_info->circuit->cic);
+				if (iam.redirInfo.redirCnt.pres) {
+					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect count present = %d\n", sngss7_info->circuit->cic, iam.redirInfo.redirCnt.val);
+					iam.redirInfo.redirCnt.val++;
+					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect count incremented = %d\n", sngss7_info->circuit->cic, iam.redirInfo.redirCnt.val);
+				}
+				val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdnis_digits");
+				if (!ftdm_strlen_zero(val)) {
+					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), found user supplied RDNIS digits = %s\n", sngss7_info->circuit->cic, val);
+					copy_tknStr_to_sngss7((char*)val, &iam.redirgNum.addrSig, &iam.redirgNum.oddEven);
+				} else {
+					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), not found user supplied RDNIS digits\n", sngss7_info->circuit->cic);
+				}
+			} else {
+				SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect info not present, attempting to copy user supplied values\n", sngss7_info->circuit->cic);
+				/* Redirecting Number */
+				copy_redirgNum_to_sngss7(ftdmchan, &iam.redirgNum);
+
+				/* Redirecting Information */
+				copy_redirgInfo_to_sngss7(ftdmchan, &iam.redirInfo);
+			}
 		}
 		/* since this is the first time we dequeue an event from the peer, make sure our main thread process any other events,
 		   this will trigger the interrupt in our span peer_chans queue which will wake up our main thread if it is sleeping */

From 3199513c96b0fef5cca09b283361da449ffedcad Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 27 Jan 2012 16:22:45 +0100
Subject: [PATCH 094/102] freetdm: More spirou certification changes          -
 Send RLC immediately even when in native bridge mode          - Do not
 enqueue RLC coming from the network

---
 .../ftmod_sangoma_ss7_main.c                  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

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 bcc21df7be..993ea68e5a 100644
--- 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
@@ -567,18 +567,20 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 		sngss7_info->peer_data = NULL;
 	}
 
-	/* clone the event and save it for later usage */
-	event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
-	if (event_clone) {
-		memcpy(event_clone, sngss7_event, sizeof(*sngss7_event));
-		ftdm_queue_enqueue(sngss7_info->event_queue, event_clone);
-		if (sngss7_info->peer_data) {
-			sngss7_span_data_t *sngss7_peer_span = (sngss7_span_data_t *)sngss7_info->peer_data->ftdmchan->span->signal_data;
-			/* we already have a peer attached, wake him up */
-			ftdm_queue_enqueue(sngss7_peer_span->peer_chans, sngss7_info->ftdmchan);
+	/* clone the event and save it for later usage, we do not clone RLC messages */
+	if (sngss7_event->event_id != SNGSS7_REL_CFM_EVENT) {
+		event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
+		if (event_clone) {
+			memcpy(event_clone, sngss7_event, sizeof(*sngss7_event));
+			ftdm_queue_enqueue(sngss7_info->event_queue, event_clone);
+			if (sngss7_info->peer_data) {
+				sngss7_span_data_t *sngss7_peer_span = (sngss7_span_data_t *)sngss7_info->peer_data->ftdmchan->span->signal_data;
+				/* we already have a peer attached, wake him up */
+				ftdm_queue_enqueue(sngss7_peer_span->peer_chans, sngss7_info->ftdmchan);
+			}
 		}
 	}
-	
+
 	/* we could test for sngss7_info->peer_data too, bit this flag is set earlier, the earlier we know the better */
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
 		/* most messages are simply relayed in sig bridge mode, except for hangup which requires state changing */
@@ -981,6 +983,7 @@ static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t
 
 	case FTDM_CHANNEL_STATE_TERMINATING:
 		{
+			ft_to_sngss7_rlc(ftdmchan);
 			/* when receiving REL we move to TERMINATING and notify the user that the bridge is ending */
 			sngss7_send_signal(sngss7_info, FTDM_SIGEVENT_STOP);
 		}

From 8476d664656b9ffdb0cbb775d33d4ac4be53c039 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Fri, 27 Jan 2012 18:54:06 +0100
Subject: [PATCH 095/102] freetdm: Cancel ISUP T6 timer when using native
 bridge (Spirou certification fix)

---
 .../ftmod_sangoma_ss7_main.c                  | 59 +++++++++++++++++++
 .../ftmod_sangoma_ss7_main.h                  |  2 +
 2 files changed, 61 insertions(+)

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 993ea68e5a..4c47ee0578 100644
--- 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
@@ -40,6 +40,13 @@
 
 /* INCLUDE ********************************************************************/
 #include "ftmod_sangoma_ss7_main.h"
+#include <sng_ss7/ci_db.h>
+#include <sng_ss7/cm_hash.h>
+#include <sng_ss7/cm_hash.x>
+#include <sng_ss7/si.h>
+#include <sng_ss7/si_mf.h>
+#include <sng_ss7/si_mf.x>
+#include <sng_ss7/si.x>
 /******************************************************************************/
 
 /* DEFINES ********************************************************************/
@@ -567,6 +574,33 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 		sngss7_info->peer_data = NULL;
 	}
 
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
+
+		if (sngss7_event->event_id == SNGSS7_SUSP_IND_EVENT) {
+			sngss7_set_ckt_flag(sngss7_info, FLAG_SUS_RECVD);
+			sngss7_clear_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
+		}
+
+		if (sngss7_test_ckt_flag(sngss7_info, FLAG_SUS_RECVD) && 
+		   !sngss7_test_ckt_flag(sngss7_info, FLAG_T6_CANCELED)) {
+			/* SPIROU cert, disable ISUP T6 when bridged natively */
+			int trc = 0;
+			SiCon *siCon = NULL;
+			if (siFindSuInstId(sngss7_info->suInstId, &siCon) != RFAILED) {
+				if (siCon) {
+					trc = siStopConTmr(siCon, TMR_T6I);
+					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Stopped T6 timer (%d)\n", sngss7_info->circuit->cic, trc);
+					sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
+				} else {
+					SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]siCon is null!\n", sngss7_info->circuit->cic);
+				}
+			} else {
+				SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not find siCon\n", sngss7_info->circuit->cic);
+			}
+		}
+
+	}
+
 	/* clone the event and save it for later usage, we do not clone RLC messages */
 	if (sngss7_event->event_id != SNGSS7_REL_CFM_EVENT) {
 		event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
@@ -955,6 +989,29 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 	/**************************************************************************/
 	}
 
+	if ((sngss7_event->event_id == SNGSS7_SUSP_IND_EVENT)) {
+		sngss7_set_ckt_flag(sngss7_info, FLAG_SUS_RECVD);
+	}
+
+	if (sngss7_test_ckt_flag(sngss7_info, FLAG_SUS_RECVD) && 
+	   !sngss7_test_ckt_flag(sngss7_info, FLAG_T6_CANCELED)) {
+		/* SPIROU cert, disable ISUP T6 when bridged natively */
+		int trc = 0;
+		SiCon *siCon = NULL;
+		if (siFindSuInstId(sngss7_info->suInstId, &siCon) != RFAILED) {
+			if (siCon) {
+				trc = siStopConTmr(siCon, TMR_T6I);
+				SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Stopped T6 timer (%d)\n", sngss7_info->circuit->cic, trc);
+				sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
+			} else {
+				SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]siCon is null!\n", sngss7_info->circuit->cic);
+			}
+		} else {
+			SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not find siCon\n", sngss7_info->circuit->cic);
+		}
+	}
+
+
 }
 
 static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t *ftdmchan);
@@ -969,6 +1026,8 @@ static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t
 	case FTDM_CHANNEL_STATE_DOWN:
 		{
 			ftdm_channel_t *close_chan = ftdmchan;
+			sngss7_clear_ckt_flag(sngss7_info, FLAG_SUS_RECVD);
+			sngss7_clear_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
 			ftdm_channel_close (&close_chan);
 		}
 		break;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 7404a8e55d..b5494bc174 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -550,6 +550,8 @@ typedef enum {
 	FLAG_INFID_PAUSED		= (1 << 15),
 	FLAG_SENT_ACM			= (1 << 16),
 	FLAG_SENT_CPG			= (1 << 17),
+	FLAG_SUS_RECVD		        = (1 << 18),
+	FLAG_T6_CANCELED 		= (1 << 19),
 	FLAG_RELAY_DOWN			= (1 << 30),
 	FLAG_CKT_RECONFIG		= (1 << 31)
 } sng_ckt_flag_t;

From 777f946e2f0f02f058171c7c0e13a973d6bed837 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Mon, 30 Jan 2012 10:28:08 -0500
Subject: [PATCH 096/102]   freetdm: adding susp/resm/rels but not finished.   
         disable t6 finished.

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c | 125 +++++++++++++++++-
 .../ftmod_sangoma_ss7_main.c                  |  27 ++--
 2 files changed, 142 insertions(+), 10 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
index 2c8f5172b9..d738edb959 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
@@ -71,6 +71,10 @@ static ftdm_status_t handle_show_status(ftdm_stream_handle_t *stream, int span,
 static ftdm_status_t handle_tx_rsc(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
 static ftdm_status_t handle_tx_grs(ftdm_stream_handle_t *stream, int span, int chan, int range, int verbose);
 
+static ftdm_status_t handle_tx_susp(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
+static ftdm_status_t handle_tx_resm(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
+static ftdm_status_t handle_tx_rels(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
+
 static ftdm_status_t handle_tx_blo(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
 static ftdm_status_t handle_tx_ubl(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
 
@@ -458,9 +462,49 @@ ftdm_status_t ftdm_sngss7_handle_cli_cmd(ftdm_stream_handle_t *stream, const cha
 			goto handle_cli_error;
 		/**********************************************************************/
 		} 
+
+	/**************************************************************************/
+	/* sending resume for a ckt's call */
+	} else if (!strcasecmp(argv[c], "resm") == FTDM_FAIL) {
+		if (check_arg_count(argc, 5) == FTDM_FAIL)  {
+			goto handle_cli_error_argc;
+		}
+		
+		if (extract_span_chan(argv, 2, &span, &chan) == FTDM_SUCCESS) {
+			handle_tx_resm(stream, span, chan, verbose);
+		} else {
+			stream->write_function(stream, "Bad command format. \n");
+			goto handle_cli_error_argc;
+		}
+	/**************************************************************************/
+	/* sending resume for a ckt's call */
+	} else if (!strcasecmp(argv[c], "rels")) {
+		if (check_arg_count(argc, 5) == FTDM_FAIL)  {
+			goto handle_cli_error_argc;
+		}
+		
+		if (extract_span_chan(argv, 2, &span, &chan) == FTDM_SUCCESS) {
+			handle_tx_rels(stream, span, chan, verbose);
+		} else {
+			stream->write_function(stream, "Bad command format.\n");
+			goto handle_cli_error_argc;
+		}
+
+	/**************************************************************************/
+	/* sending suspend for a ckt's call */
+	} else if (!strcasecmp(argv[c], "susp")) {
+		if (check_arg_count(argc, 5) == FTDM_FAIL)  {
+			goto handle_cli_error_argc;
+		}
+		
+		if (extract_span_chan(argv, 2, &span, &chan) == FTDM_SUCCESS) {
+			handle_tx_susp(stream, span, chan, verbose);
+		} else {
+			stream->write_function(stream, "Bad command format. \n");
+			goto handle_cli_error_argc;
+		}
 	/**************************************************************************/
 	} else if (!strcasecmp(argv[c], "blo")) {
-	/**************************************************************************/
 		if (check_arg_count(argc, 2)) goto handle_cli_error_argc;
 		c++;
 
@@ -1330,6 +1374,85 @@ static ftdm_status_t handle_show_status(ftdm_stream_handle_t *stream, int span,
 	return FTDM_SUCCESS;
 }
 
+static ftdm_status_t handle_tx_resm(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
+{
+	SS7_ERROR("JZ error alert.  handle_tx_resm \n");
+	return FTDM_FAIL;
+}
+static ftdm_status_t handle_tx_rels(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
+{	
+	SS7_ERROR("JZ error alert. handle_tx_rels \n");
+	return FTDM_FAIL;
+}
+
+/******************************************************************************/
+static ftdm_status_t handle_tx_susp(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
+{
+	int				 x;
+	sngss7_chan_data_t  *ss7_info;
+	ftdm_channel_t	  *ftdmchan;
+	int				 lspan;
+	int				 lchan;
+
+	SS7_ERROR("JZ error alert. handle_tx_susp \n");
+	return FTDM_FAIL;
+
+	x = (g_ftdm_sngss7_data.cfg.procId * 1000) + 1;
+	while (g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0) {
+		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type == SNG_CKT_VOICE) {
+			ss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
+			ftdmchan = ss7_info->ftdmchan;
+
+			/* if span == 0 then all spans should be printed */
+			if (span == 0) {
+				lspan = ftdmchan->physical_span_id;
+			} else {
+				lspan = span;
+			}
+
+			/* if chan == 0 then all chans should be printed */
+			if (chan == 0) {
+				lchan = ftdmchan->physical_chan_id;
+			} else {
+				lchan = chan;
+			}
+
+			if ((ftdmchan->physical_span_id == lspan) && (ftdmchan->physical_chan_id == lchan)) {
+				/* now that we have the right channel...put a lock on it so no-one else can use it */
+				ftdm_mutex_lock(ftdmchan->mutex);
+
+				/* check if there is a pending state change|give it a bit to clear */
+				if (check_for_state_change(ftdmchan)) {
+					SS7_ERROR("Failed to wait for pending state change on CIC = %d\n", ss7_info->circuit->cic);
+					/* check if we need to die */
+					ftdm_assert(0, "State change not completed\n");
+					/* unlock the channel again before we exit */
+					ftdm_mutex_unlock(ftdmchan->mutex);
+					/* move to the next channel */
+					continue;
+				} else {
+					/* throw the ckt block flag */
+					sngss7_set_ckt_blk_flag(ss7_info, FLAG_CKT_MN_BLOCK_TX);
+
+					/* set the channel to suspended state */
+					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+				}
+
+				/* unlock the channel again before we exit */
+				ftdm_mutex_unlock(ftdmchan->mutex);
+
+			} /* if ( span and chan) */
+
+		} /* if ( cic != 0) */
+
+		/* go the next circuit */
+		x++;
+	} /* while (g_ftdm_sngss7_data.cfg.isupCkt[x]id != 0) */
+
+	handle_show_blocks(stream, span, chan, verbose);
+
+	return FTDM_SUCCESS;
+}
 /******************************************************************************/
 static ftdm_status_t handle_tx_blo(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
 {
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 4c47ee0578..3f87ccf713 100644
--- 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
@@ -40,13 +40,6 @@
 
 /* INCLUDE ********************************************************************/
 #include "ftmod_sangoma_ss7_main.h"
-#include <sng_ss7/ci_db.h>
-#include <sng_ss7/cm_hash.h>
-#include <sng_ss7/cm_hash.x>
-#include <sng_ss7/si.h>
-#include <sng_ss7/si_mf.h>
-#include <sng_ss7/si_mf.x>
-#include <sng_ss7/si.x>
 /******************************************************************************/
 
 /* DEFINES ********************************************************************/
@@ -583,6 +576,14 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 
 		if (sngss7_test_ckt_flag(sngss7_info, FLAG_SUS_RECVD) && 
 		   !sngss7_test_ckt_flag(sngss7_info, FLAG_T6_CANCELED)) {
+			if (sng_cancel_isup_tmr(sngss7_info->suInstId, ISUP_T6i) == RFAILED ) {
+				SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not stop timer T6 \n", sngss7_info->circuit->cic);
+			} else {
+				sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
+				SS7_ERROR_CHAN(ftdmchan,"[CIC:%d] isup timer T6 has been cancelled. \n", sngss7_info->circuit->cic);
+			}
+
+#if 0
 			/* SPIROU cert, disable ISUP T6 when bridged natively */
 			int trc = 0;
 			SiCon *siCon = NULL;
@@ -597,6 +598,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 			} else {
 				SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not find siCon\n", sngss7_info->circuit->cic);
 			}
+#endif
 		}
 
 	}
@@ -995,6 +997,14 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 
 	if (sngss7_test_ckt_flag(sngss7_info, FLAG_SUS_RECVD) && 
 	   !sngss7_test_ckt_flag(sngss7_info, FLAG_T6_CANCELED)) {
+		if (sng_cancel_isup_tmr(sngss7_info->suInstId, ISUP_T6i) == RFAILED ) {
+			SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not stop timer T6 \n", sngss7_info->circuit->cic);
+		} else {
+			sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
+			SS7_ERROR_CHAN(ftdmchan,"[CIC:%d] isup timer T6 has been cancelled. \n", sngss7_info->circuit->cic);
+		}
+
+#if 0
 		/* SPIROU cert, disable ISUP T6 when bridged natively */
 		int trc = 0;
 		SiCon *siCon = NULL;
@@ -1009,9 +1019,8 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 		} else {
 			SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not find siCon\n", sngss7_info->circuit->cic);
 		}
+#endif
 	}
-
-
 }
 
 static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t *ftdmchan);

From 14d8b42e58355597cdfb49a30626313afa8e695a Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Mon, 30 Jan 2012 13:19:36 -0500
Subject: [PATCH 097/102]   freetdm: testing code of sending suspend message

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c | 85 +++++++++----------
 .../ftmod_sangoma_ss7_main.h                  |  2 +-
 2 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
index d738edb959..6e97a3db4e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
@@ -1389,67 +1389,64 @@ static ftdm_status_t handle_tx_rels(ftdm_stream_handle_t *stream, int span, int
 static ftdm_status_t handle_tx_susp(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
 {
 	int				 x;
+	ftdm_channel_t	*ftdmchan;
+	int				lspan;
+	int				lchan;
+	SiSuspEvnt		suspEvnt;
 	sngss7_chan_data_t  *ss7_info;
-	ftdm_channel_t	  *ftdmchan;
-	int				 lspan;
-	int				 lchan;
 
+	/*
 	SS7_ERROR("JZ error alert. handle_tx_susp \n");
 	return FTDM_FAIL;
+	*/
 
+	/* JZ implementation */
+
+	if (span <= 0 || chan <= 0 || chan >= 32 ) {
+		SS7_ERROR ("Wrong span number or chan number.\n");
+		return FTDM_FAIL;
+	}
+
+	
 	x = (g_ftdm_sngss7_data.cfg.procId * 1000) + 1;
-	while (g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0) {
+	for ( ; g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0; x++) {
 		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type == SNG_CKT_VOICE) {
+			
 			ss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
 			ftdmchan = ss7_info->ftdmchan;
 
-			/* if span == 0 then all spans should be printed */
-			if (span == 0) {
-				lspan = ftdmchan->physical_span_id;
-			} else {
-				lspan = span;
+			lspan = span;
+			lchan = chan;
+			
+			if ((ftdmchan->physical_span_id != lspan) && (ftdmchan->physical_chan_id != lchan)) {
+				continue;
 			}
 
-			/* if chan == 0 then all chans should be printed */
-			if (chan == 0) {
-				lchan = ftdmchan->physical_chan_id;
-			} else {
-				lchan = chan;
-			}
+			ftdm_mutex_lock(ftdmchan->mutex);
 
-			if ((ftdmchan->physical_span_id == lspan) && (ftdmchan->physical_chan_id == lchan)) {
-				/* now that we have the right channel...put a lock on it so no-one else can use it */
-				ftdm_mutex_lock(ftdmchan->mutex);
-
-				/* check if there is a pending state change|give it a bit to clear */
-				if (check_for_state_change(ftdmchan)) {
-					SS7_ERROR("Failed to wait for pending state change on CIC = %d\n", ss7_info->circuit->cic);
-					/* check if we need to die */
-					ftdm_assert(0, "State change not completed\n");
-					/* unlock the channel again before we exit */
-					ftdm_mutex_unlock(ftdmchan->mutex);
-					/* move to the next channel */
-					continue;
-				} else {
-					/* throw the ckt block flag */
-					sngss7_set_ckt_blk_flag(ss7_info, FLAG_CKT_MN_BLOCK_TX);
-
-					/* set the channel to suspended state */
-					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
-				}
-
-				/* unlock the channel again before we exit */
+			if (check_for_state_change(ftdmchan)) {
+				SS7_ERROR("Failed to wait for pending state change on CIC = %d\n", ss7_info->circuit->cic);
+				ftdm_assert(0, "State change not completed\n");
 				ftdm_mutex_unlock(ftdmchan->mutex);
+				continue;
+			}
 
-			} /* if ( span and chan) */
-
-		} /* if ( cic != 0) */
-
-		/* go the next circuit */
-		x++;
-	} /* while (g_ftdm_sngss7_data.cfg.isupCkt[x]id != 0) */
+			/*
+			sngss7_set_ckt_blk_flag(ss7_info, FLAG_CKT_MN_BLOCK_TX);
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+			*/
+			suspEvnt.susResInd.eh.pres = PRSNT_NODEF;
+			suspEvnt.susResInd.susResInd.pres = PRSNT_NODEF;
+			suspEvnt.susResInd.susResInd.val = EVTSITSUSPREQ;
+			
+			sng_cc_susp_request(lspan, ss7_info->suInstId, ss7_info->spInstId, ss7_info->circuit->id, &suspEvnt);
+			
+			ftdm_mutex_unlock(ftdmchan->mutex);
+		}
+	}
 
 	handle_show_blocks(stream, span, chan, verbose);
+	/* end of JZ implementation */
 
 	return FTDM_SUCCESS;
 }
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index b5494bc174..f9aed03083 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -607,7 +607,7 @@ typedef enum {
 	FLAG_GRP_HW_UNBLK_TX	= (1 << 24),
 	FLAG_GRP_HW_UNBLK_TX_DN	= (1 << 25),
 	FLAG_GRP_MN_UNBLK_TX	= (1 << 26),
-	FLAG_GRP_MN_UNBLK_TX_DN	= (1 << 27)
+	FLAG_GRP_MN_UNBLK_TX_DN	= (1 << 27),
 } sng_ckt_block_flag_t;
 
 #define BLK_FLAGS_STRING \

From c1ad5677429d3c8be6ebfcc756e3328c0f82e073 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Mon, 30 Jan 2012 17:37:57 -0500
Subject: [PATCH 098/102]   freetdm: removing sus|res|rel commands

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c | 121 ------------------
 .../ftmod_sangoma_ss7_main.c                  |  35 -----
 2 files changed, 156 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
index 6e97a3db4e..cb5584760f 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
@@ -71,10 +71,6 @@ static ftdm_status_t handle_show_status(ftdm_stream_handle_t *stream, int span,
 static ftdm_status_t handle_tx_rsc(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
 static ftdm_status_t handle_tx_grs(ftdm_stream_handle_t *stream, int span, int chan, int range, int verbose);
 
-static ftdm_status_t handle_tx_susp(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
-static ftdm_status_t handle_tx_resm(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
-static ftdm_status_t handle_tx_rels(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
-
 static ftdm_status_t handle_tx_blo(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
 static ftdm_status_t handle_tx_ubl(ftdm_stream_handle_t *stream, int span, int chan, int verbose);
 
@@ -462,47 +458,6 @@ ftdm_status_t ftdm_sngss7_handle_cli_cmd(ftdm_stream_handle_t *stream, const cha
 			goto handle_cli_error;
 		/**********************************************************************/
 		} 
-
-	/**************************************************************************/
-	/* sending resume for a ckt's call */
-	} else if (!strcasecmp(argv[c], "resm") == FTDM_FAIL) {
-		if (check_arg_count(argc, 5) == FTDM_FAIL)  {
-			goto handle_cli_error_argc;
-		}
-		
-		if (extract_span_chan(argv, 2, &span, &chan) == FTDM_SUCCESS) {
-			handle_tx_resm(stream, span, chan, verbose);
-		} else {
-			stream->write_function(stream, "Bad command format. \n");
-			goto handle_cli_error_argc;
-		}
-	/**************************************************************************/
-	/* sending resume for a ckt's call */
-	} else if (!strcasecmp(argv[c], "rels")) {
-		if (check_arg_count(argc, 5) == FTDM_FAIL)  {
-			goto handle_cli_error_argc;
-		}
-		
-		if (extract_span_chan(argv, 2, &span, &chan) == FTDM_SUCCESS) {
-			handle_tx_rels(stream, span, chan, verbose);
-		} else {
-			stream->write_function(stream, "Bad command format.\n");
-			goto handle_cli_error_argc;
-		}
-
-	/**************************************************************************/
-	/* sending suspend for a ckt's call */
-	} else if (!strcasecmp(argv[c], "susp")) {
-		if (check_arg_count(argc, 5) == FTDM_FAIL)  {
-			goto handle_cli_error_argc;
-		}
-		
-		if (extract_span_chan(argv, 2, &span, &chan) == FTDM_SUCCESS) {
-			handle_tx_susp(stream, span, chan, verbose);
-		} else {
-			stream->write_function(stream, "Bad command format. \n");
-			goto handle_cli_error_argc;
-		}
 	/**************************************************************************/
 	} else if (!strcasecmp(argv[c], "blo")) {
 		if (check_arg_count(argc, 2)) goto handle_cli_error_argc;
@@ -1374,82 +1329,6 @@ static ftdm_status_t handle_show_status(ftdm_stream_handle_t *stream, int span,
 	return FTDM_SUCCESS;
 }
 
-static ftdm_status_t handle_tx_resm(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
-{
-	SS7_ERROR("JZ error alert.  handle_tx_resm \n");
-	return FTDM_FAIL;
-}
-static ftdm_status_t handle_tx_rels(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
-{	
-	SS7_ERROR("JZ error alert. handle_tx_rels \n");
-	return FTDM_FAIL;
-}
-
-/******************************************************************************/
-static ftdm_status_t handle_tx_susp(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
-{
-	int				 x;
-	ftdm_channel_t	*ftdmchan;
-	int				lspan;
-	int				lchan;
-	SiSuspEvnt		suspEvnt;
-	sngss7_chan_data_t  *ss7_info;
-
-	/*
-	SS7_ERROR("JZ error alert. handle_tx_susp \n");
-	return FTDM_FAIL;
-	*/
-
-	/* JZ implementation */
-
-	if (span <= 0 || chan <= 0 || chan >= 32 ) {
-		SS7_ERROR ("Wrong span number or chan number.\n");
-		return FTDM_FAIL;
-	}
-
-	
-	x = (g_ftdm_sngss7_data.cfg.procId * 1000) + 1;
-	for ( ; g_ftdm_sngss7_data.cfg.isupCkt[x].id != 0; x++) {
-		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type == SNG_CKT_VOICE) {
-			
-			ss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
-			ftdmchan = ss7_info->ftdmchan;
-
-			lspan = span;
-			lchan = chan;
-			
-			if ((ftdmchan->physical_span_id != lspan) && (ftdmchan->physical_chan_id != lchan)) {
-				continue;
-			}
-
-			ftdm_mutex_lock(ftdmchan->mutex);
-
-			if (check_for_state_change(ftdmchan)) {
-				SS7_ERROR("Failed to wait for pending state change on CIC = %d\n", ss7_info->circuit->cic);
-				ftdm_assert(0, "State change not completed\n");
-				ftdm_mutex_unlock(ftdmchan->mutex);
-				continue;
-			}
-
-			/*
-			sngss7_set_ckt_blk_flag(ss7_info, FLAG_CKT_MN_BLOCK_TX);
-			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
-			*/
-			suspEvnt.susResInd.eh.pres = PRSNT_NODEF;
-			suspEvnt.susResInd.susResInd.pres = PRSNT_NODEF;
-			suspEvnt.susResInd.susResInd.val = EVTSITSUSPREQ;
-			
-			sng_cc_susp_request(lspan, ss7_info->suInstId, ss7_info->spInstId, ss7_info->circuit->id, &suspEvnt);
-			
-			ftdm_mutex_unlock(ftdmchan->mutex);
-		}
-	}
-
-	handle_show_blocks(stream, span, chan, verbose);
-	/* end of JZ implementation */
-
-	return FTDM_SUCCESS;
-}
 /******************************************************************************/
 static ftdm_status_t handle_tx_blo(ftdm_stream_handle_t *stream, int span, int chan, int verbose)
 {
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 3f87ccf713..950a28500e 100644
--- 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
@@ -582,25 +582,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 				sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
 				SS7_ERROR_CHAN(ftdmchan,"[CIC:%d] isup timer T6 has been cancelled. \n", sngss7_info->circuit->cic);
 			}
-
-#if 0
-			/* SPIROU cert, disable ISUP T6 when bridged natively */
-			int trc = 0;
-			SiCon *siCon = NULL;
-			if (siFindSuInstId(sngss7_info->suInstId, &siCon) != RFAILED) {
-				if (siCon) {
-					trc = siStopConTmr(siCon, TMR_T6I);
-					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Stopped T6 timer (%d)\n", sngss7_info->circuit->cic, trc);
-					sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
-				} else {
-					SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]siCon is null!\n", sngss7_info->circuit->cic);
-				}
-			} else {
-				SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not find siCon\n", sngss7_info->circuit->cic);
-			}
-#endif
 		}
-
 	}
 
 	/* clone the event and save it for later usage, we do not clone RLC messages */
@@ -1003,23 +985,6 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
 			sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
 			SS7_ERROR_CHAN(ftdmchan,"[CIC:%d] isup timer T6 has been cancelled. \n", sngss7_info->circuit->cic);
 		}
-
-#if 0
-		/* SPIROU cert, disable ISUP T6 when bridged natively */
-		int trc = 0;
-		SiCon *siCon = NULL;
-		if (siFindSuInstId(sngss7_info->suInstId, &siCon) != RFAILED) {
-			if (siCon) {
-				trc = siStopConTmr(siCon, TMR_T6I);
-				SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Stopped T6 timer (%d)\n", sngss7_info->circuit->cic, trc);
-				sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
-			} else {
-				SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]siCon is null!\n", sngss7_info->circuit->cic);
-			}
-		} else {
-			SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not find siCon\n", sngss7_info->circuit->cic);
-		}
-#endif
 	}
 }
 

From d1a772bfe9620f1305eeb7d97681a9c798d0108b Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Mon, 30 Jan 2012 18:02:26 -0500
Subject: [PATCH 099/102] freetdm: Only hangup with user message when release
 location information is set

---
 libs/freetdm/mod_freetdm/mod_freetdm.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index a180f03fef..b78cc078d4 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -506,10 +506,6 @@ static switch_status_t channel_on_hangup(switch_core_session_t *session)
 	int chan_id = 0;
 	const char *name = NULL;
 
-	ftdm_usrmsg_t usrmsg;
-	memset(&usrmsg, 0, sizeof(ftdm_usrmsg_t));
-
-
 	channel = switch_core_session_get_channel(session);
 	assert(channel != NULL);
 
@@ -577,19 +573,20 @@ static switch_status_t channel_on_hangup(switch_core_session_t *session)
 	case FTDM_CHAN_TYPE_CAS:
 	case FTDM_CHAN_TYPE_B:
 		{
-			const char *sipvar;
+			const char *var = NULL;
 			ftdm_call_cause_t hcause = switch_channel_get_cause_q850(channel);
 			if (hcause  < 1 || hcause > 127) {
 				hcause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
 			}
-			sipvar = switch_channel_get_variable(channel, "ss7_rel_loc");
-			if (sipvar) {
-				ftdm_usrmsg_add_var(&usrmsg, "ss7_rel_loc", sipvar);
+			var = switch_channel_get_variable(channel, "ss7_rel_loc");
+			if (var) {
+				ftdm_usrmsg_t usrmsg;
+				memset(&usrmsg, 0, sizeof(ftdm_usrmsg_t));
+				ftdm_usrmsg_add_var(&usrmsg, "ss7_rel_loc", var);
+				ftdm_channel_call_hangup_with_cause_ex(tech_pvt->ftdmchan, hcause, &usrmsg);
+			} else {
+				ftdm_channel_call_hangup_with_cause(tech_pvt->ftdmchan, hcause);
 			}
-			/*
-			ftdm_channel_call_hangup_with_cause(tech_pvt->ftdmchan, hcause);
-			*/
-			ftdm_channel_call_hangup_with_cause_ex(tech_pvt->ftdmchan, hcause, &usrmsg);
 		}
 		break;
 	default: 

From b6c02364a790e81c2d67b33b1cd432ee9af9750d Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Mon, 30 Jan 2012 18:26:08 -0500
Subject: [PATCH 100/102] freetdm: Reduce the size of the span peer channels
 and ss7 info per channel clone event queues

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c   |  2 +-
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h   |  2 ++
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c    | 10 ++++------
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c    |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

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 950a28500e..5f2beee65b 100644
--- 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
@@ -2367,7 +2367,7 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
 	}
 
 	/* create an peer channel queue for this span */
-	if ((ftdm_queue_create(&(ss7_span_info)->peer_chans, SPAN_PENDING_CHANS_QUEUE_SIZE)) != FTDM_SUCCESS) {
+	if ((ftdm_queue_create(&(ss7_span_info)->peer_chans, SNGSS7_PEER_CHANS_QUEUE_SIZE)) != FTDM_SUCCESS) {
 		SS7_CRITICAL("Unable to create peer chans queue!\n");
 		return FTDM_FAIL;
 	}
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index f9aed03083..c77599d3d9 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -56,6 +56,8 @@
 #define MAX_CIC_MAP_LENGTH		1000 
 
 #define SNGSS7_EVENT_QUEUE_SIZE	100
+#define SNGSS7_PEER_CHANS_QUEUE_SIZE 100
+#define SNGSS7_CHAN_EVENT_QUEUE_SIZE 5
 
 #define MAX_SIZEOF_SUBADDR_IE	24	/* as per Q931 4.5.9 */
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index c1eef81d92..20e661d73e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -113,21 +113,19 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 			   otherwise, honor RDNIS and RDINF stuff coming from the user */
 			if (iam.redirInfo.eh.pres == PRSNT_NODEF) {
 				const char *val = NULL;
-				SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect info present\n", sngss7_info->circuit->cic);
 				if (iam.redirInfo.redirCnt.pres) {
-					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect count present = %d\n", sngss7_info->circuit->cic, iam.redirInfo.redirCnt.val);
 					iam.redirInfo.redirCnt.val++;
-					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect count incremented = %d\n", sngss7_info->circuit->cic, iam.redirInfo.redirCnt.val);
+					SS7_DEBUG_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect count incremented = %d\n", sngss7_info->circuit->cic, iam.redirInfo.redirCnt.val);
 				}
 				val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_rdnis_digits");
 				if (!ftdm_strlen_zero(val)) {
-					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), found user supplied RDNIS digits = %s\n", sngss7_info->circuit->cic, val);
+					SS7_DEBUG_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), found user supplied RDNIS digits = %s\n", sngss7_info->circuit->cic, val);
 					copy_tknStr_to_sngss7((char*)val, &iam.redirgNum.addrSig, &iam.redirgNum.oddEven);
 				} else {
-					SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), not found user supplied RDNIS digits\n", sngss7_info->circuit->cic);
+					SS7_DEBUG_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), not found user supplied RDNIS digits\n", sngss7_info->circuit->cic);
 				}
 			} else {
-				SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect info not present, attempting to copy user supplied values\n", sngss7_info->circuit->cic);
+				SS7_DEBUG_CHAN(ftdmchan,"[CIC:%d]Tx IAM (Bridged), redirect info not present, attempting to copy user supplied values\n", sngss7_info->circuit->cic);
 				/* Redirecting Number */
 				copy_redirgNum_to_sngss7(ftdmchan, &iam.redirgNum);
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index d7732cce6c..e76397580e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -2925,7 +2925,7 @@ static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
 		/* prepare the global info sturcture */
 		ss7_info = ftdm_calloc(1, sizeof(sngss7_chan_data_t));
 		ss7_info->ftdmchan = NULL;
-		if (ftdm_queue_create(&ss7_info->event_queue, SNGSS7_EVENT_QUEUE_SIZE) != FTDM_SUCCESS) {
+		if (ftdm_queue_create(&ss7_info->event_queue, SNGSS7_CHAN_EVENT_QUEUE_SIZE) != FTDM_SUCCESS) {
 			SS7_CRITICAL("Failed to create ss7 cic event queue\n");
 		}
 		ss7_info->circuit = &g_ftdm_sngss7_data.cfg.isupCkt[x];

From c9c68a7759ab2ea60e9115d6046850311aa6b1b8 Mon Sep 17 00:00:00 2001
From: James Zhang <jzhang@sangoma.com>
Date: Mon, 30 Jan 2012 19:15:02 -0500
Subject: [PATCH 101/102] freetdm: Some more clean up for ss7 event cloning    
      - The queue size has been bumped again, long calls could potentially
 require more elements (multiple resume/suspend)          - The queue is only
 used when there is a call active

---
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c   | 16 ++++++++++++----
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h   | 12 ++++++++++--
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c    |  8 ++++----
 3 files changed, 26 insertions(+), 10 deletions(-)

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 5f2beee65b..20b2199f21 100644
--- 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
@@ -545,6 +545,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 	sngss7_chan_data_t *sngss7_info = NULL;
 	ftdm_channel_t *ftdmchan = NULL;
 	sngss7_event_data_t *event_clone = NULL;
+	int clone_event = 0;
 
 	/* get the ftdmchan and ss7_chan_data from the circuit */
 	if (extract_chan_data(sngss7_event->circuit, &sngss7_info, &ftdmchan)) {
@@ -560,11 +561,16 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 
 	if (sngss7_event->event_id == SNGSS7_CON_IND_EVENT) {
 		/* this is the first event in a call, flush the event queue */
-		while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
-			ftdm_safe_free(event_clone);
-		}
+		sngss7_flush_queue(sngss7_info->event_queue);
 		/* clear the peer if any */
 		sngss7_info->peer_data = NULL;
+		clone_event++;
+	}
+
+	/* if the call has already started and the event is not a release confirmation, clone the event */
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_CALL_STARTED) && 
+        sngss7_event->event_id != SNGSS7_REL_CFM_EVENT) {
+		clone_event++;
 	}
 
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
@@ -586,7 +592,7 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
 	}
 
 	/* clone the event and save it for later usage, we do not clone RLC messages */
-	if (sngss7_event->event_id != SNGSS7_REL_CFM_EVENT) {
+	if (clone_event) {
 		event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
 		if (event_clone) {
 			memcpy(event_clone, sngss7_event, sizeof(*sngss7_event));
@@ -1002,6 +1008,7 @@ static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t
 			ftdm_channel_t *close_chan = ftdmchan;
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_SUS_RECVD);
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
+			sngss7_flush_queue(sngss7_info->event_queue);
 			ftdm_channel_close (&close_chan);
 		}
 		break;
@@ -1517,6 +1524,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t *ftdmchan)
 
 			/* close the channel */
 			SS7_DEBUG_CHAN(ftdmchan,"FTDM Channel Close %s\n", "");
+			sngss7_flush_queue(sngss7_info->event_queue);
 			ftdm_channel_close (&close_chan);
 		}
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index c77599d3d9..fb60183bf8 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -57,7 +57,7 @@
 
 #define SNGSS7_EVENT_QUEUE_SIZE	100
 #define SNGSS7_PEER_CHANS_QUEUE_SIZE 100
-#define SNGSS7_CHAN_EVENT_QUEUE_SIZE 5
+#define SNGSS7_CHAN_EVENT_QUEUE_SIZE 100
 
 #define MAX_SIZEOF_SUBADDR_IE	24	/* as per Q931 4.5.9 */
 
@@ -65,6 +65,14 @@
 											(switchtype == LSI_SW_ANS92) || \
 											(switchtype == LSI_SW_ANS95)
 
+#define sngss7_flush_queue(queue) \
+			do { \
+					void *__queue_data = NULL; \
+					while ((__queue_data = ftdm_queue_dequeue(queue))) { \
+						ftdm_safe_free(__queue_data); \
+					} \
+			} while (0)
+
 typedef struct ftdm2trillium {
 	uint8_t ftdm_val;
 	uint8_t trillium_val;
@@ -552,7 +560,7 @@ typedef enum {
 	FLAG_INFID_PAUSED		= (1 << 15),
 	FLAG_SENT_ACM			= (1 << 16),
 	FLAG_SENT_CPG			= (1 << 17),
-	FLAG_SUS_RECVD		        = (1 << 18),
+	FLAG_SUS_RECVD		    = (1 << 18),
 	FLAG_T6_CANCELED 		= (1 << 19),
 	FLAG_RELAY_DOWN			= (1 << 30),
 	FLAG_CKT_RECONFIG		= (1 << 31)
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 20e661d73e..00d06905dd 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -70,17 +70,17 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 				SS7_ERROR_CHAN(ftdmchan, "Peer channel '%s' has different signaling type %d'\n", 
 						var, peer_span->signal_type);
 			} else {
-				sngss7_event_data_t *event_clone = NULL;
 				peer_info = peer_chan->call_data;
 				SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Starting native bridge with peer CIC %d\n", 
 						sngss7_info->circuit->cic, peer_info->circuit->cic);
+
 				/* make each one of us aware of the native bridge */
 				peer_info->peer_data = sngss7_info;
 				sngss7_info->peer_data = peer_info;
+
 				/* flush our own queue */
-				while ((event_clone = ftdm_queue_dequeue(sngss7_info->event_queue))) {
-					ftdm_safe_free(event_clone);
-				}
+				sngss7_flush_queue(sngss7_info->event_queue);
+
 				/* go up until release comes, note that state processing is done different and much simpler when there is a peer  */
 				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_UP);
 				ftdm_channel_advance_states(ftdmchan);

From cca407d09a1dbddfa876497ac9f3c172e2eac92b Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Tue, 31 Jan 2012 15:18:53 -0500
Subject: [PATCH 102/102] freetdm: Fix bug in SS7 state processing introduced
 during the changes          for native bridging that caused infinite SUSPEND
 state executions          due to peer member not being cleared at the end of
 the call

---
 .../ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 20b2199f21..fa36c7280a 100644
--- 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
@@ -1049,14 +1049,14 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t *ftdmchan)
 									sngss7_info->ckt_flags,
 									sngss7_info->blk_flags);
 
-	if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
+		/* DIALING is the only state we process normally when doing an outgoing call that is natively bridged */
+		if (ftdmchan->state != FTDM_CHANNEL_STATE_DIALING) {
+			return ftdm_sangoma_ss7_native_bridge_state_change(ftdmchan);
+		}
 		sngss7_info->peer_data = NULL;
 	}
 
-	if (sngss7_info->peer_data) {
-		return ftdm_sangoma_ss7_native_bridge_state_change(ftdmchan);
-	}
-
 	/*check what state we are supposed to be in */
 	switch (ftdmchan->state) {
 	/**************************************************************************/