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

fixes 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6792 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-12-14 17:39:45 +00:00
parent 40f1d8141e
commit c5ab852849
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_voicemail/mod_voicemail.c
View File

@ -693,7 +693,7 @@ static switch_status_t control_playback(switch_core_session_t *session, void *in
return SWITCH_STATUS_BREAK;
}
if (!fh) {
if (!(fh && fh->file_interface && switch_test_flag(fh, SWITCH_FILE_OPEN))) {
return SWITCH_STATUS_SUCCESS;
}

13
src/mod/endpoints/mod_sofia/sofia_presence.c
View File

@ -240,7 +240,7 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
if (!count) {
sql = switch_mprintf("select *,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'",
sql = switch_mprintf("select sip_user,sip_host,contact,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'",
stream.data, user, host);
@ -682,14 +682,15 @@ static int sofia_presence_mwi_callback(void *pArg, int argc, char **argv, char *
static int sofia_presence_mwi_callback2(void *pArg, int argc, char **argv, char **columnNames)
{
char *sub_to_user = argv[1];
char *sub_to_host = argv[2];
char *sub_to_user = argv[0];
char *sub_to_host = argv[1];
char *event = "message-summary";
char *body = argv[7];
char *contact = argv[2];
char *body = argv[3];
sofia_profile_t *profile = NULL;
char *id = NULL;
nua_handle_t *nh;
char *contact;
if (!(profile = sofia_glue_find_profile(sub_to_host))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host);
@ -698,7 +699,7 @@ static int sofia_presence_mwi_callback2(void *pArg, int argc, char **argv, char
id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host);
contact = sofia_glue_get_url_from_contact(argv[3], 0);
contact = sofia_glue_get_url_from_contact(contact, 0);
nh = nua_handle(profile->nua, NULL,
NUTAG_URL(contact),