kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-16 13:10:05 +00:00
Code Issues Projects Releases Wiki Activity

revert whoops

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7167 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-01-11 01:03:51 +00:00
parent 215c724cf3
commit 7cc7ce2936
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf/directory/default/1000.xml
View File

@ -1,17 +1,5 @@
<include> <include>
<user id="1000" mailbox="1000"> <user id="1000" mailbox="1000">
<mailboxes>
<mailbox id="1001"/>
<mailbox id="1002"/>
<mailbox id="1003"/>
<mailbox id="1004"/>
<mailbox id="1005"/>
<mailbox id="1006"/>
<mailbox id="1007"/>
<mailbox id="1008"/>
<mailbox id="1009"/>
<mailbox id="1010"/>
</mailboxes>
<params> <params>
<param name="password" value="1234"/> <param name="password" value="1234"/>
<param name="vm-password" value="1000"/> <param name="vm-password" value="1000"/>

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

@ -186,7 +186,7 @@ char *sofia_presence_translate_rpid(char *in, char *ext)
void sofia_presence_mwi_event_handler(switch_event_t *event) void sofia_presence_mwi_event_handler(switch_event_t *event)
{ {
char *account, *registered_account, *dup_account, *yn, *host, *user; char *account, *dup_account, *yn, *host, *user;
char *sql; char *sql;
sofia_profile_t *profile = NULL; sofia_profile_t *profile = NULL;
switch_stream_handle_t stream = { 0 }; switch_stream_handle_t stream = { 0 };
@ -195,9 +195,7 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
switch_assert(event != NULL); switch_assert(event != NULL);
registered_account = switch_event_get_header(event, "registered-message-account"); if (!(account = switch_event_get_header(event, "mwi-message-account"))) {
if(!(account = switch_event_get_header(event, "mwi-message-account"))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Message-Account'\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Message-Account'\n");
return; return;
} }
@ -206,11 +204,8 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Messages-Waiting'\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Messages-Waiting'\n");
return; return;
} }
if (!switch_strlen_zero(registered_account)) {
dup_account = strdup(registered_account); dup_account = strdup(account);
} else {
dup_account = strdup(account);
}
switch_assert(dup_account != NULL); switch_assert(dup_account != NULL);
sofia_glue_get_user_host(dup_account, &user, &host); sofia_glue_get_user_host(dup_account, &user, &host);
@ -225,13 +220,10 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
if (!strncasecmp(hp->name, "mwi-", 4)) { if (!strncasecmp(hp->name, "mwi-", 4)) {
char *tmp = NULL; char *tmp = NULL;
char *value = hp->value; char *value = hp->value;
if (!strcasecmp(hp->name, "mwi-message-account") && strncasecmp(hp->value, "sip:", 4)) { if (!strcasecmp(hp->name, "mwi-message-account") && strncasecmp(hp->value, "sip:", 4)) {
tmp = switch_mprintf("sip:%s", hp->value); tmp = switch_mprintf("sip:%s", hp->value);
value = tmp; value = tmp;
} }
stream.write_function(&stream, "%s: %s\r\n", hp->name + 4, value); stream.write_function(&stream, "%s: %s\r\n", hp->name + 4, value);
switch_safe_free(tmp); switch_safe_free(tmp);
} }