FSCORE-274

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

diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index d50d42c8701b2722da6e544f3bdff85660ddd7ae..a821f9d15ee4de3e376403c2deb34c8731011748 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -1455,7 +1455,7 @@ static switch_status_t answer_call(char **argv, int argc, switch_stream_handle_t
                        } else {
                                switch_channel_t *channel = switch_core_session_get_channel(tp->session);
                                switch_set_flag_locked(tp, TFLAG_ANSWER);
-                               switch_channel_answer(channel);
+                               switch_channel_mark_answered(channel);
                                add_pvt(tp, PA_MASTER);
                        }
                } else {
@@ -1469,7 +1469,7 @@ static switch_status_t answer_call(char **argv, int argc, switch_stream_handle_t
                if (!switch_test_flag(tp, TFLAG_ANSWER)) {
                        switch_channel_t *channel = switch_core_session_get_channel(tp->session);
                        switch_set_flag_locked(tp, TFLAG_ANSWER);
-                       switch_channel_answer(channel);
+                       switch_channel_mark_answered(channel);
                        add_pvt(tp, PA_MASTER);
                        x++;
                        break;

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 053b6912488eed2f16e033d480b5b38bae0a5a4d..0a8a70cbf8d1b79e793ca49866ecccf8e44d1a99 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1633,7 +1633,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel, const char *file, const char *func, int line)
 {
        switch_core_session_message_t msg;
-       switch_status_t status;
+       switch_status_t status = SWITCH_STATUS_SUCCESS;
 
        switch_assert(channel != NULL);
 
@@ -1649,14 +1649,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel
                return SWITCH_STATUS_SUCCESS;
        }
 
-       if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
-               return SWITCH_STATUS_SUCCESS;
+       if (!switch_channel_test_flag(channel, CF_OUTBOUND)) {
+               msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS;
+               msg.from = channel->name;
+               status = switch_core_session_perform_receive_message(channel->session, &msg, file, func, line);
        }
 
-       msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS;
-       msg.from = channel->name;
-       status = switch_core_session_perform_receive_message(channel->session, &msg, file, func, line);
-       
        if (status == SWITCH_STATUS_SUCCESS) {
                switch_channel_perform_mark_pre_answered(channel, file, func, line);
        } else {
@@ -1669,7 +1667,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_ring_ready(switch_channel_t *channel, const char *file, const char *func, int line)
 {
        switch_core_session_message_t msg;
-       switch_status_t status;
+       switch_status_t status = SWITCH_STATUS_SUCCESS;
 
        switch_assert(channel != NULL);
 
@@ -1685,14 +1683,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_ring_ready(switch_channel
                return SWITCH_STATUS_SUCCESS;
        }
 
-       if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
-               return SWITCH_STATUS_SUCCESS;
+       if (!switch_channel_test_flag(channel, CF_OUTBOUND)) {
+               msg.message_id = SWITCH_MESSAGE_INDICATE_RINGING;
+               msg.from = channel->name;
+               status = switch_core_session_perform_receive_message(channel->session, &msg, file, func, line);
        }
-
-       msg.message_id = SWITCH_MESSAGE_INDICATE_RINGING;
-       msg.from = channel->name;
-       status = switch_core_session_perform_receive_message(channel->session, &msg, file, func, line);
-
+       
        if (status == SWITCH_STATUS_SUCCESS) {
                switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring Ready %s!\n", channel->name);
        } else {
@@ -1782,7 +1778,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_chan
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *channel, const char *file, const char *func, int line)
 {
        switch_core_session_message_t msg;
-       switch_status_t status;
+       switch_status_t status = SWITCH_STATUS_SUCCESS;
 
        switch_assert(channel != NULL);
 
@@ -1793,15 +1789,13 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *
        if (switch_channel_test_flag(channel, CF_ANSWERED)) {
                return SWITCH_STATUS_SUCCESS;
        }
-
-       if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
-               return SWITCH_STATUS_SUCCESS;
+       
+       if (!switch_channel_test_flag(channel, CF_OUTBOUND)) {
+               msg.message_id = SWITCH_MESSAGE_INDICATE_ANSWER;
+               msg.from = channel->name;
+               status = switch_core_session_perform_receive_message(channel->session, &msg, file, func, line);
        }
 
-       msg.message_id = SWITCH_MESSAGE_INDICATE_ANSWER;
-       msg.from = channel->name;
-       status = switch_core_session_perform_receive_message(channel->session, &msg, file, func, line);
-
        if (status == SWITCH_STATUS_SUCCESS) {
                switch_channel_perform_mark_answered(channel, file, func, line);
        } else {