From: David Yat Sin <dyatsin@sangoma.com>
Date: Tue, 4 Sep 2012 02:34:13 +0000 (-0400)
Subject: Merge remote branch 'fsorig/master' into nfas
X-Git-Tag: v1.2.3^2~103^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a57b0bed612038f6e3b54e0002548245cefeefd;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master' into nfas

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
---

3a57b0bed612038f6e3b54e0002548245cefeefd
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
index eedb677f2b,151fe847f5..47da32d865
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
@@@ -131,12 -130,11 +131,12 @@@ static ftdm_status_t parse_switchtype(c
  			 /* can be > 1 for some BRI variants */
  			break;
  		default:
- 			ftdm_log(FTDM_LOG_ERROR, "%s:Unsupported trunktype:%s\n", span->name, switch_name, ftdm_trunk_type2str(span->trunk_type));
+ 			ftdm_log(FTDM_LOG_ERROR, "%s:Unsupported trunktype:%s\n", span->name, ftdm_trunk_type2str(span->trunk_type));
  			return FTDM_FAIL;
  	}
 +
  	/* see if we have profile with this switch_type already */
 -	for (i=1; i <= g_sngisdn_data.num_cc; i++) {
 +	for (i = 1; i <= g_sngisdn_data.num_cc; i++) {
  		if (g_sngisdn_data.ccs[i].switchtype == signal_data->switchtype &&
  			g_sngisdn_data.ccs[i].trunktype == span->trunk_type) {
  			break;
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
index b96a801243,7c6322c3bc..52daf3ad7b
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
@@@ -1021,9 -971,15 +1023,15 @@@ ftdm_status_t sngisdn_stack_cfg_q931_lc
  
  	cfg.hdr.response.selector=0;
  
 -	cfg.t.cfg.s.inLCe.sapId = signal_data->dchan_id;
 +	cfg.t.cfg.s.inLCe.sapId = signal_data->link_id;
  
- 	cfg.t.cfg.s.inLCe.lnkUpDwnInd = TRUE;
+ 	if (span->trunk_type == FTDM_TRUNK_BRI_PTMP) {
+ 		/* Stack will send Restart CFM's each time link is established (TEI negotiated),
+                    and we do not want thi s event */
+ 		cfg.t.cfg.s.inLCe.lnkUpDwnInd = FALSE;
+ 	} else {
+ 		cfg.t.cfg.s.inLCe.lnkUpDwnInd = TRUE;
+ 	}
  
  	if (FTDM_SPAN_IS_BRI(span)) {
  		/* tCon Timer causes unwanted hangup on BRI links