Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

FS-5884 --resolve mod_rayo: detect unjoin mismatch

Browse Source
This commit is contained in:
Chris Rienzo 2013-10-17 09:42:52 -04:00
parent 4819ee18ab
commit 1c3704e78f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/event_handlers/mod_rayo/mod_rayo.c
View File

@ -1793,7 +1793,7 @@ static iks *exec_conference_api(switch_core_session_t *session, const char *conf
SWITCH_STANDARD_STREAM(stream);
switch_api_execute("conference", switch_core_session_sprintf(session, "%s %s %s", conf_name, command, conf_member_id), NULL, &stream);
if (!zstr(stream.data) && strncmp("OK", stream.data, 2)) {
response = iks_new_error_detailed_printf(node, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", stream.data);
response = iks_new_error_detailed_printf(node, STANZA_ERROR_SERVICE_UNAVAILABLE, "%s", stream.data);
}
switch_safe_free(stream.data);
return response;
@ -2047,7 +2047,13 @@ static iks *on_rayo_unjoin(struct rayo_actor *call, struct rayo_message *msg, vo
response = iks_new_error_detailed(msg->payload, STANZA_ERROR_UNEXPECTED_REQUEST, "(un)join request is pending");
} else if (!RAYO_CALL(call)->joined) {
/* not joined to anything */
response = iks_new_error(msg->payload, STANZA_ERROR_SERVICE_UNAVAILABLE);
response = iks_new_error_detailed(msg->payload, STANZA_ERROR_SERVICE_UNAVAILABLE, "not joined to anything");
} else if (RAYO_CALL(call)->joined == JOINED_MIXER && !zstr(call_uri)) {
/* joined to mixer, not call */
response = iks_new_error_detailed(msg->payload, STANZA_ERROR_SERVICE_UNAVAILABLE, "not joined to call");
} else if (RAYO_CALL(call)->joined == JOINED_CALL && !zstr(mixer_name)) {
/* joined to call, not mixer */
response = iks_new_error_detailed(msg->payload, STANZA_ERROR_SERVICE_UNAVAILABLE, "not joined to mixer");
} else if (!zstr(call_uri)) {
response = unjoin_call(RAYO_CALL(call), session, msg, call_uri);
} else if (!zstr(mixer_name)) {