kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-08 08:51:50 +00:00
Code Issues Projects Releases Wiki Activity

tweak

Browse Source
This commit is contained in:
Anthony Minessale 2012-07-11 15:50:38 -05:00
parent f384e247fc
commit abbe8d5a0d
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/mod/applications/mod_conference/mod_conference.c
View File

@ -8019,44 +8019,37 @@ static void conference_send_presence(conference_obj_t *conference)
static void call_setup_event_handler(switch_event_t *event) static void call_setup_event_handler(switch_event_t *event)
{ {
char *conf;
char *dial_str;
char *action;
conference_obj_t *conference = NULL; conference_obj_t *conference = NULL;
char *conf = switch_event_get_header(event, "Target-Component");
if (!switch_test_flag(conference, CFLAG_RFC4579)) { char *dial_str = switch_event_get_header(event, "Request-Target");
return; char *action = switch_event_get_header(event, "Request-Action");
}
conf = switch_event_get_header(event, "Target-Component");
dial_str = switch_event_get_header(event, "Request-Target");
action = switch_event_get_header(event, "Request-Action");
if (!zstr(conf) && !zstr(dial_str) && !zstr(action) && (conference = conference_find(conf))) { if (!zstr(conf) && !zstr(dial_str) && !zstr(action) && (conference = conference_find(conf))) {
switch_event_t *var_event; switch_event_t *var_event;
switch_event_header_t *hp; switch_event_header_t *hp;
if (switch_test_flag(conference, CFLAG_RFC4579)) {
if (!strcasecmp(action, "call")) {
if (!strcasecmp(action, "call")) { if (switch_event_create_plain(&var_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) {
abort();
if (switch_event_create_plain(&var_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) {
abort();
}
for(hp = event->headers; hp; hp = hp->next) {
if (!strncasecmp(hp->name, "var_", 4)) {
switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, hp->name + 4, hp->value);
} }
}
switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, "conference_dial_str", dial_str); for(hp = event->headers; hp; hp = hp->next) {
if (!strncasecmp(hp->name, "var_", 4)) {
switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, hp->name + 4, hp->value);
}
}
switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, "conference_dial_str", dial_str);
conference_outcall_bg(conference, NULL, NULL, dial_str, 60, NULL, NULL, NULL, NULL, NULL, NULL, &var_event); conference_outcall_bg(conference, NULL, NULL, dial_str, 60, NULL, NULL, NULL, NULL, NULL, NULL, &var_event);
} else if (!strcasecmp(action, "end")) { } else if (!strcasecmp(action, "end")) {
switch_core_session_hupall_matching_var("conference_dial_str", dial_str, SWITCH_CAUSE_NORMAL_CLEARING); switch_core_session_hupall_matching_var("conference_dial_str", dial_str, SWITCH_CAUSE_NORMAL_CLEARING);
}
} }
switch_thread_rwlock_unlock(conference->rwlock); switch_thread_rwlock_unlock(conference->rwlock);
} }