Fixes before merging sangoma repo with upstream

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index ede617c1533bfe5274774cd8b36dba5f66e81782..6238513be20cabd67cb0748c5a1d86c57fb4c2ae 100755 (executable)
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -2859,7 +2859,7 @@ static void parse_gsm_spans(switch_xml_t cfg, switch_xml_t spans)
                unsigned paramindex = 0;
 
                if (!name && !id) {
-                       CONFIG_ERROR("sangoma isdn span missing required attribute 'id' or 'name', skipping ...\n");
+                       CONFIG_ERROR("GSM span missing required attribute 'id' or 'name', skipping ...\n");
                        continue;
                }
 

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index c46cadfb27e47ca0176eac278819eb5bcb02cce6..ea2ba7ce4d0ffe3e318017a3e1fe57e88e78fa5c 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1415,7 +1415,6 @@ static switch_status_t sofia_send_dtmf(switch_core_session_t *session, const swi
        switch (dtmf_type) {
        case DTMF_2833:
                {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Enqueuing RFC2833 DTMF %c of length %d\n", dtmf->digit, dtmf->duration);
                        return switch_rtp_queue_rfc2833(tech_pvt->rtp_session, dtmf);
                }
        case DTMF_INFO:
@@ -1425,7 +1424,6 @@ static switch_status_t sofia_send_dtmf(switch_core_session_t *session, const swi
                        } else if (dtmf->digit == 'W') {
                                switch_yield(1000000);
                        } else {
-                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending INFO DTMF %c of length %d\n", dtmf->digit, dtmf->duration / 8);
                                snprintf(message, sizeof(message), "Signal=%c\r\nDuration=%d\r\n", dtmf->digit, dtmf->duration / 8);
                                switch_mutex_lock(tech_pvt->sofia_mutex);
                                nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("application/dtmf-relay"), SIPTAG_PAYLOAD_STR(message), TAG_END());
@@ -1434,9 +1432,6 @@ static switch_status_t sofia_send_dtmf(switch_core_session_t *session, const swi
                }
                break;
        case DTMF_NONE:
-               {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding DTMF %c of length %d, DTMF type is NONE\n", dtmf->digit, dtmf->duration);
-               }
                break;
        default:
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Unhandled DTMF type!\n");