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

fix regression from FS-899, thanks acrobits for testing this

This commit is contained in:
Brian West 2011-02-28 09:27:05 -06:00
parent fd7bbc0b3c
commit a5779d5431
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co
char *user_via = NULL; char *user_via = NULL;
char *contact_str = NULL; char *contact_str = NULL;
char *dup_dest = NULL; char *dup_dest = NULL;
char *p = NULL;
char *remote_host = NULL; char *remote_host = NULL;
if (!to) { if (!to) {
@ -187,7 +188,12 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co
/* sofia_glue is running sofia_overcome_sip_uri_weakness we do not, not sure if it matters */ /* sofia_glue is running sofia_overcome_sip_uri_weakness we do not, not sure if it matters */
dup_dest = strdup(dst->contact); if (dst->route_uri) {
dup_dest = strdup(dst->route_uri);
} else {
dup_dest = strdup(dst->to);
}
if (dst->route_uri) { if (dst->route_uri) {
remote_host = strdup(dst->route_uri); remote_host = strdup(dst->route_uri);
@ -226,16 +232,11 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co
contact_str = profile->url; contact_str = profile->url;
} }
switch_safe_free(dup_dest);
switch_safe_free(remote_host);
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
/* if (dup_dest && (p = strstr(dup_dest, ";fs_"))) {
if ((p = strstr(contact, ";fs_"))) {
*p = '\0'; *p = '\0';
} }
*/
/* if this cries, add contact here too, change the 1 to 0 and omit the safe_free */ /* if this cries, add contact here too, change the 1 to 0 and omit the safe_free */
@ -244,7 +245,7 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co
TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)), TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
SIPTAG_FROM_STR(from), SIPTAG_FROM_STR(from),
TAG_IF(contact, NUTAG_URL(contact)), TAG_IF(contact, NUTAG_URL(contact)),
SIPTAG_TO_STR(dst->to), SIPTAG_TO_STR(dup_dest),
SIPTAG_CONTACT_STR(contact_str), SIPTAG_CONTACT_STR(contact_str),
TAG_END()); TAG_END());
@ -257,6 +258,8 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co
TAG_END()); TAG_END());
sofia_glue_free_destination(dst); sofia_glue_free_destination(dst);
switch_safe_free(dup_dest);
switch_safe_free(remote_host);
} }
switch_console_free_matches(&list); switch_console_free_matches(&list);