mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-02-08 08:51:50 +00:00
FS-6006 --resolve
Conflicts: src/switch_core_session.c
This commit is contained in:
parent
76f30ae090
commit
97f70aeb70
@ -740,6 +740,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_receive_message(swit
|
||||
|
||||
switch_assert(session != NULL);
|
||||
|
||||
if (message->message_id == SWITCH_MESSAGE_INDICATE_SIGNAL_DATA) {
|
||||
if (session->endpoint_interface->io_routines->receive_message) {
|
||||
status = session->endpoint_interface->io_routines->receive_message(session, message);
|
||||
}
|
||||
|
||||
switch_core_session_free_message(&message);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
if ((status = switch_core_session_read_lock_hangup(session)) != SWITCH_STATUS_SUCCESS) {
|
||||
return status;
|
||||
}
|
||||
|
@ -811,6 +811,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_signal_data(switch_core_ses
|
||||
int i = 0;
|
||||
switch_channel_t *channel = switch_core_session_get_channel(session);
|
||||
|
||||
if (!switch_core_session_in_thread(session)) {
|
||||
return SWITCH_STATUS_FALSE;
|
||||
}
|
||||
|
||||
if (switch_channel_test_flag(channel, CF_SIGNAL_DATA)) {
|
||||
return SWITCH_STATUS_FALSE;
|
||||
|
Loading…
x
Reference in New Issue
Block a user