From: David Yat Sin <dyatsin@sangoma.com>
Date: Tue, 3 Apr 2012 22:08:49 +0000 (-0400)
Subject: Merge branch 'fsorig'
X-Git-Tag: v1.2-rc1~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27e4cdb4dd28c11126bf384f64e1f298bfe53de2;p=thirdparty%2Ffreeswitch.git

Merge branch 'fsorig'

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

27e4cdb4dd28c11126bf384f64e1f298bfe53de2
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
index 4d3786c258,55a156c562..a1229dcab9
--- 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
@@@ -973,16 -971,20 +973,26 @@@ ftdm_status_t sngisdn_stack_cfg_q931_lc
  
  	cfg.t.cfg.s.inLCe.sapId = signal_data->dchan_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;
 +	}
  
- 	cfg.t.cfg.s.inLCe.tCon.enb = TRUE;
- 	cfg.t.cfg.s.inLCe.tCon.val = 35;
+ 	if (FTDM_SPAN_IS_BRI(span)) {
+ 		/* tCon Timer causes unwanted hangup on BRI links
+ 			where the Q.921 link goes into disconnected
+ 			state when idle. */
+ 
+ 		cfg.t.cfg.s.inLCe.tCon.enb = FALSE;
+ 		cfg.t.cfg.s.inLCe.tCon.val = 0;
+ 	} else {
+ 		cfg.t.cfg.s.inLCe.tCon.enb = TRUE;
+ 		cfg.t.cfg.s.inLCe.tCon.val = 35;
+ 	}
+ 	
  	cfg.t.cfg.s.inLCe.tDisc.enb = TRUE;
  	cfg.t.cfg.s.inLCe.tDisc.val = 35;
  	cfg.t.cfg.s.inLCe.t314.enb = FALSE; /* if segmentation enabled, set to TRUE */