From: Moises Silva <moy@sangoma.com>
Date: Tue, 31 Jan 2012 20:57:07 +0000 (-0500)
Subject: Merge remote-tracking branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~19^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ad0bc250c7ba42d70481f73b843df8bf5bebb2f;p=thirdparty%2Ffreeswitch.git

Merge remote-tracking branch 'fsorig/master'
---

1ad0bc250c7ba42d70481f73b843df8bf5bebb2f
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
index b121fee6cf,2a22514019..4d3786c258
--- 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
@@@ -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 {