clean up some typos

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9921 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index e786ecd77adbcc7649cf8252faa93abb79e7a814..49fdf8b8ba75d577b0a32b241ae7858b8bdd9659 100644 (file)
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -706,7 +706,7 @@ SWITCH_STANDARD_APP(set_function)
                        expanded = switch_channel_expand_variables(channel, val);
                }
 
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, expanded ? expanded : "UNDEF");
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SET [%s]=[%s]\n", switch_channel_get_name(channel), var, expanded ? expanded : "UNDEF");
                switch_channel_set_variable(channel, var, expanded);
 
                if (expanded && expanded != val) {

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index b8fe0f1b3f270b3219294f111e1bfa9a686a0f9c..d766743c32b396ec60f03be94a7fb2fe6a5e56b5 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -409,7 +409,7 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
                        }
                }
        } else {
-               if ((is_proxy && !b_sdp) || switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) {
+               if ((is_proxy && !b_sdp) || switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) || !tech_pvt->iananame) {
                        switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION);
 
                        if (is_proxy) {

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 1d63c074c8f0d34bce6a5bd56cd571d82bd38024..b5940b96861424d899033c178081590bbc24f2ed 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1459,7 +1459,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready(switch_ch
        switch_event_t *event;
 
        if (!switch_channel_test_flag(channel, CF_RING_READY)) {
-               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name);
+               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
                switch_channel_set_flag(channel, CF_RING_READY);
                if (channel->caller_profile && channel->caller_profile->times) {
                        switch_mutex_lock(channel->profile_mutex);
@@ -1493,7 +1493,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
 {
        switch_event_t *event;
 
-       switch_channel_mark_ring_ready(channel);
+       switch_channel_perform_mark_ring_ready(channel, file, func, line);
 
        if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
                const char *uuid;

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index c8421addc8d1e966f61b8dcf84f17257b9260d79..6d8efb2cd2ea7cdb8cc28d40a801991f7c0b313a 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -456,7 +456,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t
                                }
 
                                olen = mlen;
-                               if (ringback.fh->resampler) {
+                               if (ringback.fh->resampler && ringback.fh->resampler->rfactor > 1) {
                                        olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor);
                                }
                                switch_core_file_read(ringback.fh, write_frame.data, &olen);