mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-13 21:17:06 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5465 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
4c98a5d5ea
commit
fdf9a8f052
10 files changed
+71
-20
No files matched your search
@@ -567,11 +567,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_private_event(switch
|
||||
channel = switch_core_session_get_channel(session);
|
||||
assert(channel != NULL);
|
||||
|
||||
if (switch_channel_test_flag(channel, CF_EVENT_PARSE)) {
|
||||
|
||||
if (switch_channel_test_flag(channel, CF_EVENT_LOCK)) {
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
if (session->private_event_queue) {
|
||||
if ((status = (switch_status_t) switch_queue_trypop(session->private_event_queue, &pop)) == SWITCH_STATUS_SUCCESS) {
|
||||
*event = (switch_event_t *) pop;
|
||||
@@ -913,6 +913,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
|
||||
const switch_application_interface_t *application_interface, char *arg) {
|
||||
switch_app_log_t *log, *lp;
|
||||
switch_event_t *event;
|
||||
switch_channel_t *channel;
|
||||
|
||||
log = switch_core_session_alloc(session, sizeof(*log));
|
||||
|
||||
@@ -932,10 +933,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
|
||||
if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) {
|
||||
switch_channel_event_set_data(session->channel, event);
|
||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application", "%s", application_interface->interface_name);
|
||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application-Data", "%s", arg);
|
||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application-Data", arg);
|
||||
switch_event_fire(&event);
|
||||
}
|
||||
|
||||
channel = switch_core_session_get_channel(session);
|
||||
switch_channel_clear_flag(channel, CF_BREAK);
|
||||
application_interface->application_function(session, arg);
|
||||
|
||||
if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE) == SWITCH_STATUS_SUCCESS) {
|
||||
|
||||
Reference in new issue
Block a user