Added channel-restart-on-link-up option

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
index 2a65a829855ef9cb83be555d5fc07ef555a092fc..36b5662faf30b9207b8b39ff89e696419b5d29cf 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
@@ -183,6 +183,7 @@ typedef struct sngisdn_span_data {
        int8_t                  facility_timeout;
        uint8_t                 num_local_numbers;
        uint8_t                 timer_t3;
+       uint8_t                 restart_opt;
        char*                   local_numbers[SNGISDN_NUM_LOCAL_NUMBERS];
        ftdm_sched_t    *sched;
        ftdm_queue_t    *event_queue;

diff --git a/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
index 18ca9c38ddab98d97a446883efb224bfcc87ee95..a869bda48ddcc09d88151de5d1a77afde5f5142c 100644 (file)
--- a/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
@@ -182,6 +182,7 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
        signal_data->overlap_dial = SNGISDN_OPT_DEFAULT;
        signal_data->setup_arb = SNGISDN_OPT_DEFAULT;
        signal_data->timer_t3 = 8;
+       signal_data->restart_opt = SNGISDN_OPT_DEFAULT;
 
        signal_data->link_id = span->span_id;
        span->default_caller_data.bearer_capability = IN_ITC_SPEECH;
@@ -271,6 +272,15 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
                        ftdm_span_set_bearer_capability(val, &span->default_caller_data.bearer_capability);
                } else if (!strcasecmp(var, "outbound-bearer_layer1")) {
                        ftdm_span_set_bearer_layer1(val, &span->default_caller_data.bearer_layer1);
+               } else if (!strcasecmp(var, "channel-restart-on-link-up")) {
+                       if (!strcasecmp(val, "yes")) {
+                               signal_data->restart_opt = SNGISDN_OPT_TRUE;
+                       } else if (!strcasecmp(val, "no")) {
+                               signal_data->restart_opt = SNGISDN_OPT_FALSE;
+                       } else {
+                               ftdm_log(FTDM_LOG_ERROR, "Invalid value for parameter:%s:%s\n", var, val);
+                       }
+                       
                } else if (!strcasecmp(var, "local-number")) {                  
                        if (add_local_number(val, span) != FTDM_SUCCESS) {
                                return FTDM_FAIL;

diff --git 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
index bb46fb7fbaae48c7e9af39cf5b421151fc7bb742..94683d8a4b7ec8af048efd80cb06baae9b4f0613 100644 (file)
--- 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
@@ -701,7 +701,16 @@ ftdm_status_t sng_isdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
                cfg.t.cfg.s.inDLSAP.statEnqOpt = FALSE;
                cfg.t.cfg.s.inDLSAP.rstOpt = FALSE;
        }
-               
+
+       /* Override the restart options if user selected that option */
+       if (signal_data->restart_opt != SNGISDN_OPT_DEFAULT) {
+               if (signal_data->restart_opt == SNGISDN_OPT_TRUE) {
+                       cfg.t.cfg.s.inDLSAP.rstOpt = TRUE;
+               } else {
+                       cfg.t.cfg.s.inDLSAP.rstOpt = FALSE;
+               }
+       }
+       
        for (i = 0; i < IN_MAXBCHNL; i++)
        {
                cfg.t.cfg.s.inDLSAP.bProf[i].profNmb = 0;