freetdm: improve some isdn logging

         try to fool-proof the size of the read D channel buffer by not hard-coding it in 2 places

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
index 262cd9d03df22cb82dbe1d2bbe3d581bb9dc987b..e6740c2dddec7922c307db7c404a3540b75fb2cc 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
@@ -391,7 +391,7 @@ static void *ftdm_sangoma_isdn_io_run(ftdm_thread_t *me, void *obj)
                        case FTDM_SUCCESS:
                                /* Check if there are any channels that have data available */
                                for (citer = ftdm_span_get_chan_iterator(span, chaniter); citer; citer = ftdm_iterator_next(citer)) {
-                                       len = 1000;
+                                       len = sizeof(data);
                                        ftdmchan = ftdm_iterator_current(citer);
                                        if (FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
                                                if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_RX_DISABLED)) {

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 327f1a7220d7d0af8c4de39e497648547c9f101f..076cb54a6114577137be9d0410086d7ba91f0274 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
@@ -483,7 +483,8 @@ void sngisdn_snd_data(ftdm_channel_t *dchan, uint8_t *data, ftdm_size_t len)
        sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) dchan->span->signal_data;
 
        if (len > sizeof(l1_frame.data)) {
-               ftdm_assert(FTDM_FALSE, "Received frame exceeding max size\n");
+               ftdm_log_chan(dchan, FTDM_LOG_ERROR, "Received frame of %"FTDM_SIZE_FMT" bytes, exceeding max size of %"FTDM_SIZE_FMT" bytes\n", 
+                               len, sizeof(l1_frame.data));
                return;
        }