kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-31 02:43:32 +00:00
Code Issues Projects Releases Wiki Activity

FS-9629: add isfocus to replies, and add is_conference support to pre_answer

Browse Source
This commit is contained in:
Brian West 2016-10-31 10:45:29 -05:00 committed by Mike Jerris
parent 2cbe1989d1
commit 083fb35494
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -1341,6 +1341,14 @@ SWITCH_STANDARD_APP(presence_function)
SWITCH_STANDARD_APP(pre_answer_function) SWITCH_STANDARD_APP(pre_answer_function)
{ {
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
const char *arg = (char *) data;
if (!zstr(arg)) {
if (switch_stristr("is_conference", arg)) {
switch_channel_set_flag(channel, CF_CONFERENCE);
}
}
switch_channel_pre_answer(channel); switch_channel_pre_answer(channel);
} }

6
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -652,7 +652,7 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
char *sticky = NULL; char *sticky = NULL;
const char *call_info = switch_channel_get_variable(channel, "presence_call_info_full"); const char *call_info = switch_channel_get_variable(channel, "presence_call_info_full");
if (switch_channel_test_flag(channel, CF_CONFERENCE)) { if (switch_channel_test_flag(channel, CF_CONFERENCE) && !switch_stristr(";isfocus", tech_pvt->reply_contact)) {
tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;isfocus", tech_pvt->reply_contact); tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;isfocus", tech_pvt->reply_contact);
} }
@ -1173,6 +1173,10 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
goto end; goto end;
} }
if (switch_channel_test_flag(channel, CF_CONFERENCE) && !switch_stristr(";isfocus", tech_pvt->reply_contact)) {
tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;isfocus", tech_pvt->reply_contact);
}
/* ones that do not need to lock sofia mutex */ /* ones that do not need to lock sofia mutex */
switch (msg->message_id) { switch (msg->message_id) {
case SWITCH_MESSAGE_INDICATE_KEEPALIVE: case SWITCH_MESSAGE_INDICATE_KEEPALIVE: