FS-5659 --resolve Add logging for spandsp dtmf detector when dtmf_verbose channel...

diff --git a/src/mod/applications/mod_spandsp/mod_spandsp.h b/src/mod/applications/mod_spandsp/mod_spandsp.h
index fafccae6939adb02909b7b1ec08e86331d2519c5..323ff07a45e533e596208079700e9cff2cfa8d83 100644 (file)
--- a/src/mod/applications/mod_spandsp/mod_spandsp.h
+++ b/src/mod/applications/mod_spandsp/mod_spandsp.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
  * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
  *
@@ -141,7 +141,7 @@ switch_status_t spandsp_fax_detect_session(switch_core_session_t *session,
                                                                                                                   int hits, const char *app, const char *data, switch_tone_detect_callback_t callback);
 
 switch_status_t spandsp_fax_stop_detect_session(switch_core_session_t *session);
-void spanfax_log_message(void *user_data, int level, const char *msg);
+void mod_spandsp_log_message(void *session, int level, const char *msg);
 switch_status_t load_configuration(switch_bool_t reload);
 void mod_spandsp_indicate_data(switch_core_session_t *session, switch_bool_t self, switch_bool_t on);
 

diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c b/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
index 03d7297eddfecfa89f029630eb56497e76505b79..42e31d1ef5d571796be22745abfeff99a7dbab08 100644 (file)
--- a/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
+++ b/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
@@ -349,6 +349,7 @@ switch_status_t spandsp_tdd_decode_session(switch_core_session_t *session)
 typedef struct {
        switch_core_session_t *session;
        dtmf_rx_state_t *dtmf_detect;
+       int verbose;
        char last_digit;
        uint32_t samples;
        uint32_t last_digit_end;
@@ -394,6 +395,10 @@ static switch_bool_t inband_dtmf_callback(switch_media_bug_t *bug, void *user_da
        switch (type) {
        case SWITCH_ABC_TYPE_INIT: {
                pvt->dtmf_detect = dtmf_rx_init(NULL, NULL, NULL);
+               span_log_set_message_handler(dtmf_rx_get_logging_state(pvt->dtmf_detect), mod_spandsp_log_message, pvt->session);
+               if (pvt->verbose) {
+                       span_log_set_level(dtmf_rx_get_logging_state(pvt->dtmf_detect), SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
+               }
                dtmf_rx_parms(pvt->dtmf_detect, pvt->filter_dialtone, pvt->twist, pvt->reverse_twist, pvt->threshold);
                dtmf_rx_set_realtime_callback(pvt->dtmf_detect, spandsp_dtmf_rx_realtime_callback, pvt);
                break;
@@ -500,6 +505,10 @@ switch_status_t spandsp_inband_dtmf_session(switch_core_session_t *session)
                pvt->filter_dialtone = 0;
        }
 
+       if ((value = switch_channel_get_variable(channel, "dtmf_verbose"))) {
+               pvt->verbose = switch_true(value);
+       }
+
        if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) {
                return SWITCH_STATUS_FALSE;
        }
@@ -554,7 +563,7 @@ static switch_bool_t callprogress_detector_process_buffer(switch_media_bug_t *bu
  * Allocate the tone descriptor
  *
  * @param descriptor the descriptor to create
- * @param name the descriptor name 
+ * @param name the descriptor name
  * @param memory_pool the pool to use
  * @return SWITCH_STATUS_SUCCESS if successful
  */
@@ -632,7 +641,7 @@ static void tone_report_callback(void *user_data, int code, int level, int delay
 
 /**
  * Process tone segment report from spandsp (for debugging)
- * 
+ *
  * @param user_data the tone_detector
  * @param f1 the first frequency of the segment
  * @param f2 the second frequency of the segment
@@ -705,7 +714,7 @@ static switch_bool_t tone_detector_process_buffer(tone_detector_t *detector, voi
  * Destroy the tone detector
  * @param detector the detector to destroy
  */
-static void tone_detector_destroy(tone_detector_t *detector) 
+static void tone_detector_destroy(tone_detector_t *detector)
 {
        if (detector) {
                if (detector->spandsp_detector) {
@@ -720,7 +729,7 @@ static void tone_detector_destroy(tone_detector_t *detector)
  * Start call progress detection
  *
  * @param session the session to detect
- * @param name of the descriptor to use 
+ * @param name of the descriptor to use
  * @return SWITCH_STATUS_SUCCESS if successful
  */
 switch_status_t callprogress_detector_start(switch_core_session_t *session, const char *name)
@@ -759,7 +768,7 @@ switch_status_t callprogress_detector_start(switch_core_session_t *session, cons
 /**
  * Process a buffer of audio data for call progress tones
  *
- * @param bug the session's media bug 
+ * @param bug the session's media bug
  * @param user_data the detector
  * @param type the type of data available from the bug
  * @return SWITCH_TRUE
@@ -817,7 +826,7 @@ static switch_bool_t callprogress_detector_process_buffer(switch_media_bug_t *bu
 
 /**
  * Stop call progress detection
- * @param session the session to stop 
+ * @param session the session to stop
  * @return SWITCH_STATUS_SUCCESS if successful
  */
 switch_status_t callprogress_detector_stop(switch_core_session_t *session)

diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_fax.c b/src/mod/applications/mod_spandsp/mod_spandsp_fax.c
index 02623fd20ea254394fd7775f27916d2cb7812ad4..21a9cc51dc37909d32f352637e9a16e4469b7a95 100644 (file)
--- a/src/mod/applications/mod_spandsp/mod_spandsp_fax.c
+++ b/src/mod/applications/mod_spandsp/mod_spandsp_fax.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
  * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
  *
@@ -167,7 +167,7 @@ static int del_pvt(pvt_t *del_pvt)
                        r = 1;
                        break;
                }
-       
+
                l = p;
        }
 
@@ -259,15 +259,11 @@ static void counter_increment(void)
        switch_mutex_unlock(spandsp_globals.mutex);
 }
 
-void spanfax_log_message(void *user_data, int level, const char *msg)
+void mod_spandsp_log_message(void *user_data, int level, const char *msg)
 {
        int fs_log_level;
-    switch_core_session_t *session;
-    pvt_t *pvt;
-    
-       pvt = (pvt_t *) user_data;
-       session = pvt->session;
-    
+       switch_core_session_t *session = (switch_core_session_t *)user_data;
+
        switch (level) {
        case SPAN_LOG_NONE:
                return;
@@ -329,7 +325,7 @@ static int phase_b_handler(t30_state_t *s, void *user_data, int result)
        switch_channel_set_variable(channel, "fax_remote_model", switch_str_nil(t30_get_rx_model(s)));
 
 
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "=== Negotiation Result =======================================================\n"); 
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "=== Negotiation Result =======================================================\n");
        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident);
        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Local station id:  %s\n", local_ident);
        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Transfer Rate:     %i\n", t30_stats.bit_rate);
@@ -339,7 +335,7 @@ static int phase_b_handler(t30_state_t *s, void *user_data, int result)
        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "remote vendor:    %s\n", switch_str_nil(t30_get_rx_vendor(s)));
        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "remote model:     %s\n", switch_str_nil(t30_get_rx_model(s)));
 
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "==============================================================================\n"); 
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "==============================================================================\n");
 
        switch_channel_execute_on(channel, "execute_on_fax_phase_b");
 
@@ -673,9 +669,9 @@ static int t38_tx_packet_handler(t38_core_state_t *s, void *user_data, const uin
 
        if (r < 0) {
                t30_state_t *t30;
-       
+
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "TERMINATING T30 STATE\n");
-       
+
                if (pvt->t38_state && (t30 = t38_terminal_get_t30_state(pvt->t38_state))) {
                        t30_terminate(t30);
                }
@@ -733,8 +729,8 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
 
                fax_set_transmit_on_idle(fax, TRUE);
 
-               span_log_set_message_handler(fax_get_logging_state(fax), spanfax_log_message, pvt);
-               span_log_set_message_handler(t30_get_logging_state(t30), spanfax_log_message, pvt);
+               span_log_set_message_handler(fax_get_logging_state(fax), mod_spandsp_log_message, pvt->session);
+               span_log_set_message_handler(t30_get_logging_state(t30), mod_spandsp_log_message, pvt->session);
 
                if (pvt->verbose) {
                        span_log_set_level(fax_get_logging_state(fax), SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
@@ -772,7 +768,7 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
 
                        pvt->t38_core = t38_terminal_get_t38_core_state(pvt->t38_state);
 
-                       if (udptl_init(pvt->udptl_state, UDPTL_ERROR_CORRECTION_REDUNDANCY, fec_span, fec_entries, 
+                       if (udptl_init(pvt->udptl_state, UDPTL_ERROR_CORRECTION_REDUNDANCY, fec_span, fec_entries,
                                        (udptl_rx_packet_handler_t *) t38_core_rx_ifp_packet, (void *) pvt->t38_core) == NULL) {
                                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot initialize my UDPTL structs\n");
                                return SWITCH_STATUS_FALSE;
@@ -789,8 +785,8 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
                                }
                        }
 
-                       span_log_set_message_handler(t38_terminal_get_logging_state(t38), spanfax_log_message, pvt);
-                       span_log_set_message_handler(t30_get_logging_state(t30), spanfax_log_message, pvt);
+                       span_log_set_message_handler(t38_terminal_get_logging_state(t38), mod_spandsp_log_message, pvt->session);
+                       span_log_set_message_handler(t30_get_logging_state(t30), mod_spandsp_log_message, pvt->session);
 
                        if (pvt->verbose) {
                                span_log_set_level(t38_terminal_get_logging_state(t38), SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
@@ -811,13 +807,13 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot initialize my T.38 structs\n");
                        t38_gateway_free(pvt->t38_gateway_state);
                        pvt->t38_gateway_state = NULL;
-                       
+
                        return SWITCH_STATUS_FALSE;
                }
 
                pvt->t38_core = t38_gateway_get_t38_core_state(pvt->t38_gateway_state);
 
-               if (udptl_init(pvt->udptl_state, UDPTL_ERROR_CORRECTION_REDUNDANCY, fec_span, fec_entries, 
+               if (udptl_init(pvt->udptl_state, UDPTL_ERROR_CORRECTION_REDUNDANCY, fec_span, fec_entries,
                                                (udptl_rx_packet_handler_t *) t38_core_rx_ifp_packet, (void *) pvt->t38_core) == NULL) {
                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot initialize my UDPTL structs\n");
                        t38_gateway_free(pvt->t38_gateway_state);
@@ -843,8 +839,8 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
                        t38_gateway_set_ecm_capability(pvt->t38_gateway_state, TRUE);
                }
 
-               span_log_set_message_handler(t38_gateway_get_logging_state(pvt->t38_gateway_state), spanfax_log_message, pvt);
-               span_log_set_message_handler(t38_core_get_logging_state(pvt->t38_core), spanfax_log_message, pvt);
+               span_log_set_message_handler(t38_gateway_get_logging_state(pvt->t38_gateway_state), mod_spandsp_log_message, pvt->session);
+               span_log_set_message_handler(t38_core_get_logging_state(pvt->t38_core), mod_spandsp_log_message, pvt->session);
 
                if (pvt->verbose) {
                        span_log_set_level(t38_gateway_get_logging_state(pvt->t38_gateway_state), SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
@@ -988,7 +984,7 @@ static t38_mode_t configure_t38(pvt_t *pvt)
        t38_set_jbig_transcoding(pvt->t38_core, t38_options->T38FaxTranscodingJBIG);
        t38_set_max_datagram_size(pvt->t38_core, t38_options->T38FaxMaxDatagram);
 
-       if (t38_options->T38FaxRateManagement) { 
+       if (t38_options->T38FaxRateManagement) {
                if (!strcasecmp(t38_options->T38FaxRateManagement, "transferredTCF")) {
                        method = 2;
                } else {
@@ -1043,7 +1039,7 @@ static t38_mode_t negotiate_t38(pvt_t *pvt)
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38FaxMaxDatagram = %d\n", t38_options->T38FaxMaxDatagram);
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38FaxUdpEC = '%s'\n", t38_options->T38FaxUdpEC);
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38VendorInfo = '%s'\n", switch_str_nil(t38_options->T38VendorInfo));
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "ip = '%s'\n", 
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "ip = '%s'\n",
                                t38_options->remote_ip ? t38_options->remote_ip : "Not specified");
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "port = %d\n", t38_options->remote_port);
 
@@ -1128,7 +1124,7 @@ static t38_mode_t request_t38(pvt_t *pvt)
        }
 
        if ((t38_options = switch_channel_get_private(channel, "t38_options"))) {
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, 
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
                                "%s already has T.38 data\n", switch_channel_get_name(channel));
                enabled = 0;
        }
@@ -1427,11 +1423,11 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat
                int tx = 0;
                switch_status_t status;
 
-               /* 
+               /*
                   if we are in T.38 mode, we should: 1- initialize the ptv->t38_state stuff, if not done
                   and then set some callbacks when reading frames.
                   The only thing we need, then, in this loop, is:
-                  - read a frame without blocking 
+                  - read a frame without blocking
                   - eventually feed that frame in spandsp,
                   - call t38_terminal_send_timeout(), sleep for a while
 
@@ -1458,7 +1454,7 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat
                                        switch_channel_set_app_flag_key("T38", channel, CF_APP_T38_NEGOTIATED);
                                        spanfax_init(pvt, T38_MODE);
                                        configure_t38(pvt);
-       
+
                                        /* This will change the rtp stack to udptl mode */
                                        msg.from = __FILE__;
                                        msg.message_id = SWITCH_MESSAGE_INDICATE_UDPTL_MODE;
@@ -1475,7 +1471,7 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat
                                                request_t38(pvt);
                                        }
                                }
-       
+
                                if (switch_channel_test_app_flag_key("T38", channel, CF_APP_T38)) {
                                        if (negotiate_t38(pvt) == T38_MODE_NEGOTIATED) {
                                                /* is is safe to call this again, it was already called above in AUDIO_MODE */
@@ -1493,11 +1489,11 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat
                                        /* dunno what to do, most likely you will not get too many of these since we turn off the timer in udptl mode */
                                        continue;
                                }
-       
+
                                if (switch_test_flag(read_frame, SFF_UDPTL_PACKET) && read_frame->packet && read_frame->packetlen) {
                                        /* now we know we can cast frame->packet to a udptl structure */
                                        //switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "READ %d udptl bytes\n", read_frame->packetlen);
-       
+
                                        udptl_rx_packet(pvt->udptl_state, read_frame->packet, read_frame->packetlen);
                                }
                        }
@@ -1602,7 +1598,7 @@ static switch_status_t t38_gateway_on_soft_execute(switch_core_session_t *sessio
 
        if (!(other_session = switch_core_session_locate(peer_uuid))) {
                switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s Cannot locate channel with uuid %s", 
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s Cannot locate channel with uuid %s",
                                switch_channel_get_name(channel), peer_uuid);
                goto end;
        }
@@ -1829,13 +1825,13 @@ static switch_status_t t38_gateway_on_consume_media(switch_core_session_t *sessi
        switch_ivr_sleep(session, 0, SWITCH_TRUE, NULL);
 
        if (switch_true(t38_trace)) {
-               trace_read = switch_core_session_sprintf(session, "%s%s%s_read.raw", SWITCH_GLOBAL_dirs.temp_dir, 
+               trace_read = switch_core_session_sprintf(session, "%s%s%s_read.raw", SWITCH_GLOBAL_dirs.temp_dir,
                                                        SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session));
 
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Tracing inbound audio to %s\n", trace_read);
                switch_channel_set_variable(channel, "t38_trace_read", trace_read);
 
-               trace_write = switch_core_session_sprintf(session, "%s%s%s_write.raw", SWITCH_GLOBAL_dirs.temp_dir, 
+               trace_write = switch_core_session_sprintf(session, "%s%s%s_write.raw", SWITCH_GLOBAL_dirs.temp_dir,
                                                        SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session));
 
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Tracing outbound audio to %s\n", trace_write);
@@ -1865,7 +1861,7 @@ static switch_status_t t38_gateway_on_consume_media(switch_core_session_t *sessi
                } else {
                        if (read_fd != FAX_INVALID_SOCKET) {
                                switch_ssize_t rv;
-                               do { rv = write(read_fd, read_frame->data, read_frame->datalen); } while (rv == -1 && errno == EINTR); 
+                               do { rv = write(read_fd, read_frame->data, read_frame->datalen); } while (rv == -1 && errno == EINTR);
                }
                if (t38_gateway_rx(pvt->t38_gateway_state, (int16_t *) read_frame->data, read_frame->samples)) {
                                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "fax_rx reported an error\n");
@@ -1994,7 +1990,7 @@ switch_bool_t t38_gateway_start(switch_core_session_t *session, const char *app,
                switch_channel_set_variable(peer ? channel : other_channel, "t38_gateway_format", "audio");
 
 
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s starting gateway mode to %s\n", 
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s starting gateway mode to %s\n",
                                switch_channel_get_name(peer ? channel : other_channel),
                                switch_channel_get_name(peer ? other_channel : channel));
 
@@ -2033,20 +2029,20 @@ typedef struct {
        int expires;
        int default_sleep;
        int default_expires;
-       switch_tone_detect_callback_t callback; 
+       switch_tone_detect_callback_t callback;
        modem_connect_tones_rx_state_t rx_tones;
 
        switch_media_bug_t *bug;
        switch_core_session_t *session;
        int bug_running;
-       
+
 } spandsp_fax_tone_container_t;
 
 static switch_status_t tone_on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf, switch_dtmf_direction_t direction)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
        spandsp_fax_tone_container_t *cont = switch_channel_get_private(channel, "_fax_tone_detect_");
-       
+
 
        if (!cont || dtmf->digit != 'f') {
                return SWITCH_STATUS_SUCCESS;
@@ -2060,7 +2056,7 @@ static switch_status_t tone_on_dtmf(switch_core_session_t *session, const switch
                        switch_core_session_execute_application_async(cont->session, cont->app, cont->data);
                }
        }
-               
+
        return SWITCH_STATUS_SUCCESS;
 
 }
@@ -2085,13 +2081,13 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
        case SWITCH_ABC_TYPE_WRITE_REPLACE:
                {
                        int skip = 0;
-                       
+
                        if (type == SWITCH_ABC_TYPE_READ_REPLACE) {
                                frame = switch_core_media_bug_get_read_replace_frame(bug);
                        } else {
                                frame = switch_core_media_bug_get_write_replace_frame(bug);
                        }
-                       
+
                        if (cont->sleep) {
                                cont->sleep--;
                                if (cont->sleep) {
@@ -2122,7 +2118,7 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
 
                        if (cont->hits) {
                                switch_event_t *event;
-                               
+
                                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG,
                                                                  "Fax Tone Detected. [%s][%s]\n", cont->app, switch_str_nil(cont->data));
 
@@ -2134,7 +2130,7 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
                                                switch_core_session_execute_application_async(cont->session, cont->app, cont->data);
                                        }
                                }
-                               
+
 
                                if (switch_event_create(&event, SWITCH_EVENT_DETECTED_TONE) == SWITCH_STATUS_SUCCESS) {
                                        switch_event_t *dup;
@@ -2148,7 +2144,7 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
                                            channel = switch_core_session_get_channel(session);
                                            if (channel) switch_channel_event_set_data(channel, event);
                                        }
-                               
+
                                        if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) {
                                                switch_event_fire(&dup);
                                        }
@@ -2163,7 +2159,7 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
 
                                rval = SWITCH_FALSE;
                        }
-                       
+
                }
                break;
        case SWITCH_ABC_TYPE_WRITE:

diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_modem.c b/src/mod/applications/mod_spandsp/mod_spandsp_modem.c
index b1a794a38718f12b5fb69331626efebd25c8a935..dec93970a04b2fc32bcb71009b97838b7f5d64da 100644 (file)
--- a/src/mod/applications/mod_spandsp/mod_spandsp_modem.c
+++ b/src/mod/applications/mod_spandsp/mod_spandsp_modem.c
@@ -346,23 +346,23 @@ switch_status_t modem_init(modem_t *modem, modem_control_handler_t control_handl
 
        if (spandsp_globals.modem_verbose) {
                logging = t31_get_logging_state(modem->t31_state);
-               span_log_set_message_handler(logging, spanfax_log_message, NULL);
+               span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
                span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
 
                logging = v17_rx_get_logging_state(&modem->t31_state->audio.modems.fast_modems.v17_rx);
-               span_log_set_message_handler(logging, spanfax_log_message, NULL);
+               span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
                span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
 
                logging = v29_rx_get_logging_state(&modem->t31_state->audio.modems.fast_modems.v29_rx);
-               span_log_set_message_handler(logging, spanfax_log_message, NULL);
+               span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
                span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
 
                logging = v27ter_rx_get_logging_state(&modem->t31_state->audio.modems.fast_modems.v27ter_rx);
-               span_log_set_message_handler(logging, spanfax_log_message, NULL);
+               span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
                span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
 
                logging = t38_core_get_logging_state(modem->t38_core);
-               span_log_set_message_handler(logging, spanfax_log_message, NULL);
+               span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
                span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
        }