Fixes before merging sangoma repo with upstream

This commit is contained in:
Moises Silva 2012-05-07 16:26:48 -04:00
parent 1f08e2b0ec
commit 105ce9ff33
2 changed files with 1 additions and 6 deletions

View File

@ -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;
}

View File

@ -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");