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

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

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

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

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
index eedb677f2b26f1ad61a6b7206d28072f47097c66,151fe847f502472ac0f9900fc53e1da2187ae9ef..47da32d865b3c82f3b61f5533a5b4644a3b0d0d0
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
--- 2/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 b96a8012432e6c44c7f71d37afc7f44a21aa56db,7c6322c3bce8c9b90569fa187d2dc8fe40ba9c82..52daf3ad7bcd19c47583a76630940d82d86f305a
--- 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
@@@ -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

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_out.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_sangoma_isdn/ftmod_sangoma_isdn_support.c
Simple merge