chlog: freetdm ISDN: Increased T200 timer to 3 sec.

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 d0a88fb858d7cd0256abaae8e5b775dffe9ccc76..9402cd34a8873411ce1a392a1b7424c4cba04ae5 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
@@ -422,7 +422,7 @@ ftdm_status_t sngisdn_stack_cfg_q921_dlsap(ftdm_span_t *span, uint8_t management
 
        cfg.t.cfg.s.bdDLSAP.n200                = 3;                    /* n200 */
        cfg.t.cfg.s.bdDLSAP.congTmr             = 300;                  /* congestion timer */
-       cfg.t.cfg.s.bdDLSAP.t200Tmr             = 1;                            /* t1 changed from 25 */
+       cfg.t.cfg.s.bdDLSAP.t200Tmr             = 3;                            /* t1 changed from 25 */
        cfg.t.cfg.s.bdDLSAP.t203Tmr             = 10;                           /* t3 changed from 50 */
        cfg.t.cfg.s.bdDLSAP.mod                 = 128;                  /* modulo */
        cfg.t.cfg.s.bdDLSAP.selector    = 0;                            /* Selector 0 */
@@ -798,8 +798,10 @@ ftdm_status_t sngisdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
        cfg.t.cfg.s.inDLSAP.tmr.t322.val = 4;
        cfg.t.cfg.s.inDLSAP.tmr.t332.enb = FALSE;
        cfg.t.cfg.s.inDLSAP.tmr.t332.val = 35;
+
        cfg.t.cfg.s.inDLSAP.tmr.tRst.enb = TRUE;
        cfg.t.cfg.s.inDLSAP.tmr.tRst.val = 8;
+
        cfg.t.cfg.s.inDLSAP.tmr.tAns.enb = FALSE;  /* non-standard timer */
        cfg.t.cfg.s.inDLSAP.tmr.t396.enb = FALSE;  /* non-standard timer */
        cfg.t.cfg.s.inDLSAP.tmr.t397.enb = TRUE;  /* non-standard timer */

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
index a424313fc1e260ba3445c247b68e9a2b8ba696a7..94c4f03e7e38cd2dfe0ff3372077e114d1892794 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
@@ -491,7 +491,18 @@ void sngisdn_snd_data(ftdm_channel_t *dchan, uint8_t *data, ftdm_size_t len)
                /* Should we trigger congestion here? */
                l1_frame.flags |= SNG_L1FRAME_QUEUE_FULL;
        }
+#if 0
+       if (1) {
+               int i;
+               char string [2000];
+               unsigned string_len = 0;
+               for (i = 0; i < l1_frame.len; i++) {
+                       string_len += sprintf(&string[string_len], "0x%02x ", l1_frame.data[i]);
+               }
 
+               ftdm_log_chan(dchan, FTDM_LOG_CRIT, "\nL1 RX [%s] flags:%x\n", string, l1_frame.flags);
+       }
+#endif
        sng_isdn_data_ind(signal_data->dchan_id, &l1_frame);
 }
 

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
index d2a01c6decd8da21c64ddddba6b3c371169ae623..df791ef3cb1939b3a6314baf5a398423d53834ca 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
@@ -911,7 +911,7 @@ int16_t sngisdn_rcv_l1_data_req(uint16_t spId, sng_l1_frame_t *l1_frame)
                                string_len += sprintf(&string[string_len], "0x%02x ", l1_frame->data[i]);
                        }
 
-                       ftdm_log_chan(signal_data->dchan, FTDM_LOG_CRIT, "\nTX [%s]\n", string);
+                       ftdm_log_chan(signal_data->dchan, FTDM_LOG_CRIT, "\nL1 TX [%s]\n", string);
 #endif
                        
                        status = signal_data->dchan->fio->write(signal_data->dchan, l1_frame->data, (ftdm_size_t*)&length);

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
index f44f1032a3db54a7241f05ce11cc672cd6cade19..523b2b9d979a65d2ad836d45c2d9365a88f82cc7 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
@@ -114,7 +114,7 @@ void sngisdn_trace_interpreted_q921(sngisdn_span_data_t *signal_data, ftdm_trace
 {
        char *data_str = ftdm_calloc(1,200); /* TODO Find a proper size */
        sngisdn_decode_q921(data_str, data, data_len);
-       ftdm_log(FTDM_LOG_INFO, "[SNGISDN Q921] %s FRAME %s:%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
+       ftdm_log(FTDM_LOG_INFO, "[SNGISDN Q921] %s FRAME %s:\n%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
        ftdm_safe_free(data_str);
 }
 
@@ -144,7 +144,7 @@ void sngisdn_trace_raw_q921(sngisdn_span_data_t *signal_data, ftdm_trace_dir_t d
 
 void sngisdn_decode_q921(char* str, uint8_t* data, uint32_t data_len)
 {
-       int str_len;
+       uint32_t str_len;
        uint32_t i;
        uint8_t sapi, cr, ea, tei, ns, nr, pf, p, cmd;
        uint8_t frame_format = 0;
@@ -211,6 +211,8 @@ void sngisdn_decode_q921(char* str, uint8_t* data, uint32_t data_len)
                                break;
                }
        }
+
+       print_hex_dump(str, &str_len, (uint8_t*) data, 0, data_len);
        return;
 }
 
@@ -219,7 +221,7 @@ void sngisdn_trace_interpreted_q931(sngisdn_span_data_t *signal_data, ftdm_trace
 {
        char *data_str = ftdm_calloc(1,MAX_DECODE_STR_LEN); /* TODO Find a proper size */
        sngisdn_decode_q931(data_str, data, data_len);
-       ftdm_log(FTDM_LOG_INFO, "[SNGISDN Q931] %s FRAME %s:%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
+       ftdm_log(FTDM_LOG_INFO, "[SNGISDN Q931] %s FRAME %s:\n%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
        ftdm_safe_free(data_str);
 }