kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

have we seen the last of the Michael Myers Bug(tm)?

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7715 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-02-21 02:27:27 +00:00
parent 35538e2cbe
commit a188af1c88
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -1789,11 +1789,6 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, sdp_session_t *
} }
} }
if (!match && greedy) {
skip++;
continue;
}
if (!match && near_match) { if (!match && near_match) {
const switch_codec_implementation_t *search[1]; const switch_codec_implementation_t *search[1];
char *prefs[1]; char *prefs[1];
@ -1816,6 +1811,11 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, sdp_session_t *
match = 1; match = 1;
} }
if (!match && greedy) {
skip++;
continue;
}
if (mimp) { if (mimp) {
char tmp[50]; char tmp[50];
tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *) map->rm_encoding); tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *) map->rm_encoding);

4
src/switch_ivr_originate.c
View File

@ -1161,6 +1161,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
done: done:
*cause = SWITCH_CAUSE_UNALLOCATED; *cause = SWITCH_CAUSE_UNALLOCATED;
if (caller_channel && !switch_channel_ready(caller_channel)) {
status = SWITCH_STATUS_FALSE;
}
if (status == SWITCH_STATUS_SUCCESS) { if (status == SWITCH_STATUS_SUCCESS) {
if (caller_channel) { if (caller_channel) {
switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted");