kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-6702 #resolve

This commit is contained in:
Anthony Minessale 2014-07-29 22:16:56 +05:00
parent af64da86f2
commit 502ddd312a
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
html5/verto/demo/verto.js
View File

@ -456,6 +456,7 @@ function init() {
$(document).ready(function() { $(document).ready(function() {
var hash = window.location.hash.substring(1); var hash = window.location.hash.substring(1);
var a = [];
if (hash && hash.indexOf("page-") == -1) { if (hash && hash.indexOf("page-") == -1) {
window.location.hash = ""; window.location.hash = "";
@ -463,6 +464,10 @@ $(document).ready(function() {
autocall = true; autocall = true;
} }
if (hash && (a = hash.split("&"))) {
window.location.hash = a[0];
}
init(); init();
}); });

13
src/mod/endpoints/mod_verto/mod_verto.c
View File

@ -1084,6 +1084,11 @@ static void detach_calls(jsock_t *jsock)
continue; continue;
} }
if (!switch_channel_test_flag(tech_pvt->channel, CF_ANSWERED)) {
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
continue;
}
tech_pvt->detach_time = switch_epoch_time_now(NULL); tech_pvt->detach_time = switch_epoch_time_now(NULL);
globals.detached++; globals.detached++;
attach_wake(); attach_wake();
@ -2478,6 +2483,14 @@ static switch_bool_t verto__attach_func(const char *method, cJSON *params, jsock
tech_pvt = switch_core_session_get_private_class(session, SWITCH_PVT_SECONDARY); tech_pvt = switch_core_session_get_private_class(session, SWITCH_PVT_SECONDARY);
tech_pvt->r_sdp = switch_core_session_strdup(session, sdp); tech_pvt->r_sdp = switch_core_session_strdup(session, sdp);
if (!switch_channel_test_flag(tech_pvt->channel, CF_ANSWERED)) {
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Cannot attach to a call that has not been answered."));
err = 1; goto cleanup;
}
switch_channel_set_variable(tech_pvt->channel, SWITCH_R_SDP_VARIABLE, tech_pvt->r_sdp); switch_channel_set_variable(tech_pvt->channel, SWITCH_R_SDP_VARIABLE, tech_pvt->r_sdp);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote SDP %s:\n%s\n", switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote SDP %s:\n%s\n",
switch_channel_get_name(tech_pvt->channel), tech_pvt->r_sdp); switch_channel_get_name(tech_pvt->channel), tech_pvt->r_sdp);

2
src/switch_core_media.c
View File

@ -2882,7 +2882,7 @@ static void check_ice(switch_media_handle_t *smh, switch_media_type_t type, sdp_
} }
} }
if (engine->ice_in.cands[engine->ice_in.chosen[1]][1].ready) { if (engine->rtp_session && engine->ice_in.cands[engine->ice_in.chosen[1]][1].ready) {
if (engine->rtcp_mux > 0 && !strcmp(engine->ice_in.cands[engine->ice_in.chosen[1]][1].con_addr, engine->ice_in.cands[engine->ice_in.chosen[0]][0].con_addr) if (engine->rtcp_mux > 0 && !strcmp(engine->ice_in.cands[engine->ice_in.chosen[1]][1].con_addr, engine->ice_in.cands[engine->ice_in.chosen[0]][0].con_addr)
&& engine->ice_in.cands[engine->ice_in.chosen[1]][1].con_port == engine->ice_in.cands[engine->ice_in.chosen[0]][0].con_port) { && engine->ice_in.cands[engine->ice_in.chosen[1]][1].con_port == engine->ice_in.cands[engine->ice_in.chosen[0]][0].con_port) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(smh->session), SWITCH_LOG_INFO, "Skipping %s RTCP ICE (Same as RTP)\n", type2str(type)); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(smh->session), SWITCH_LOG_INFO, "Skipping %s RTCP ICE (Same as RTP)\n", type2str(type));