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

diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
index 4d3786c258c210b8646599f82000e9d8ae3f6a87,55a156c5624e61fe836166b7a762406b641235ba..a1229dcab9629177d0df81bd3ceff6e660f4f390
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
--- 2/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 */

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
Simple merge

diff --cc libs/freetdm/src/include/freetdm.h
Simple merge

diff --cc libs/freetdm/src/include/private/ftdm_core.h
Simple merge

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge