Merge remote-tracking branch 'fsorig/master'

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

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

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
index b121fee6cf2994cb8d5008cd6d969e2fd8f6cb30,2a225140198beae9fe29b9fa3bae031c88ccfd8f..4d3786c258c210b8646599f82000e9d8ae3f6a87
--- 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
@@@ -764,22 -762,55 +766,55 @@@ ftdm_status_t sngisdn_stack_cfg_q931_dl
                cfg.t.cfg.s.inDLSAP.tmr.t302.val = 0;
        }
  
+       if (signal_data->timer_t302 > 0) {
+               cfg.t.cfg.s.inDLSAP.tmr.t302.val = signal_data->timer_t302;
+       }
+ 
        cfg.t.cfg.s.inDLSAP.tmr.t303.enb = TRUE;
        cfg.t.cfg.s.inDLSAP.tmr.t303.val = 4;
+ 
+       if (signal_data->timer_t303 > 0) {
+               cfg.t.cfg.s.inDLSAP.tmr.t303.val = signal_data->timer_t303;
+       }
+       
        cfg.t.cfg.s.inDLSAP.tmr.t304.enb = TRUE;
        cfg.t.cfg.s.inDLSAP.tmr.t304.val = 30;
+ 
+       if (signal_data->timer_t304 > 0) {
+               cfg.t.cfg.s.inDLSAP.tmr.t304.val = signal_data->timer_t304;
+       }
+       
        cfg.t.cfg.s.inDLSAP.tmr.t305.enb = TRUE;
        cfg.t.cfg.s.inDLSAP.tmr.t305.val = 30;
+ 
+       if (signal_data->timer_t305 > 0) {
+               cfg.t.cfg.s.inDLSAP.tmr.t305.val = signal_data->timer_t305;
+       }
+       
        cfg.t.cfg.s.inDLSAP.tmr.t306.enb = FALSE;
        cfg.t.cfg.s.inDLSAP.tmr.t306.val = 35;
+ 
+       if (signal_data->timer_t306 > 0) {
+               cfg.t.cfg.s.inDLSAP.tmr.t306.val = signal_data->timer_t306;
+       }
+       
        cfg.t.cfg.s.inDLSAP.tmr.t307.enb = FALSE;
        cfg.t.cfg.s.inDLSAP.tmr.t307.val = 35;
+ 
+       if (signal_data->timer_t307 > 0) {
+               cfg.t.cfg.s.inDLSAP.tmr.t307.val = signal_data->timer_t307;
+       }
+       
        cfg.t.cfg.s.inDLSAP.tmr.t308.enb = TRUE;
        cfg.t.cfg.s.inDLSAP.tmr.t308.val = 4;
 +      cfg.t.cfg.s.inDLSAP.tmr.t310.enb = TRUE;
 +      cfg.t.cfg.s.inDLSAP.tmr.t310.val = 120;
  
+       if (signal_data->timer_t308 > 0) {
+               cfg.t.cfg.s.inDLSAP.tmr.t308.val = signal_data->timer_t308;
+       }
+ 
        if (signal_data->signalling == SNGISDN_SIGNALING_NET) {
 -              cfg.t.cfg.s.inDLSAP.tmr.t310.enb = TRUE;
 -              cfg.t.cfg.s.inDLSAP.tmr.t310.val = 10;
                cfg.t.cfg.s.inDLSAP.tmr.t312.enb = TRUE;
                cfg.t.cfg.s.inDLSAP.tmr.t312.val = cfg.t.cfg.s.inDLSAP.tmr.t303.val+2;
        } else {

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_ss7/ftmod_sangoma_ss7_xml.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