freetdm: DTMF debugging

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index d2c142e7ffd5bbf104f021e4602e1e4465a5a76a..0c7a3447d6b7495b41cf3e9f866b426b3ddc103d 100644 (file)
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -685,7 +685,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
                for (p = dtmf; p && *p; p++) {
                        if (is_dtmf(*p)) {
                                _dtmf.digit = *p;
-                               ftdm_log(FTDM_LOG_DEBUG, "queue DTMF [%c]\n", *p);
+                               ftdm_log(FTDM_LOG_DEBUG, "Queuing DTMF [%c] in channel %s\n", *p, switch_channel_get_name(channel));
                                switch_channel_queue_dtmf(channel, &_dtmf);
                        }
                }

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index c0e26de3b3376a9a02b4324c2b032feb8b521d44..0f2d0355b7691bb04af01d7b0b4b28da54b72382 100644 (file)
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -2806,7 +2806,7 @@ static ftdm_status_t handle_dtmf(ftdm_channel_t *ftdmchan, ftdm_size_t datalen)
                }
 
                if (ftdm_buffer_read(ftdmchan->gen_dtmf_buffer, digits, dblen) && !ftdm_strlen_zero_buf(digits)) {
-                       ftdm_log(FTDM_LOG_DEBUG, "%d:%d GENERATE DTMF [%s]\n", ftdmchan->span_id, ftdmchan->chan_id, digits);   
+                       ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Generating DTMF [%s]\n", digits);      
                
                        cur = digits;
 

diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index 0fc71ae075935a1d12748cdaa08229e9583d0a41..9425f6f9b6fec7a40f8da70e6f26c26dbed7d274 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
@@ -1054,7 +1054,7 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
                                return FTDM_FAIL;
                        }
                        
-                       ftdm_log(FTDM_LOG_DEBUG, "read wanpipe event %d\n", tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_type);
+                       ftdm_log_chan(span->channels[i], FTDM_LOG_DEBUG, "read wanpipe event %d\n", tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_type);
                        switch(tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_type) {
 
                        case WP_TDMAPI_EVENT_LINK_STATUS:
@@ -1137,7 +1137,7 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
                                        if (tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_STOP) {
                                                ftdm_clear_flag_locked(ftdmchan, FTDM_CHANNEL_MUTE);
                                                if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
-                                                       ftdm_log(FTDM_LOG_DEBUG, "Queuing wanpipe DTMF: %c\n", tmp_dtmf[0]);
+                                                       ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Queuing wanpipe DTMF: %c\n", tmp_dtmf[0]);
                                                        ftdm_channel_queue_dtmf(ftdmchan, tmp_dtmf);
                                                }
                                        } 
@@ -1145,13 +1145,13 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
                                break;
                        case WP_TDMAPI_EVENT_ALARM:
                                {
-                                       ftdm_log(FTDM_LOG_DEBUG, "Got wanpipe alarms %d\n", tdm_api.wp_tdm_cmd.event.wp_api_event_alarm);
+                                       ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Got wanpipe alarms %d\n", tdm_api.wp_tdm_cmd.event.wp_api_event_alarm);
                                        event_id = FTDM_OOB_ALARM_TRAP;
                                }
                                break;
                        default:
                                {
-                                       ftdm_log(FTDM_LOG_WARNING, "Unhandled wanpipe event %d\n", tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_type);
+                                       ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Unhandled wanpipe event %d\n", tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_type);
                                        event_id = FTDM_OOB_INVALID;
                                }
                                break;