From 44589f1fb41624bcf5dfeefc94a0033b47cca01b Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 10 Apr 2012 15:34:50 -0500
Subject: [PATCH] FS-4014 --resolve
---
src/mod/endpoints/mod_sofia/sofia_glue.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 5786ec8f14..80dfff8835 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -7042,14 +7042,17 @@ char *sofia_glue_gen_contact_str(sofia_profile_t *profile, sip_t const *sip, nua
if (contact->m_url->url_params) {
- contact_str = switch_mprintf("%s <sip:%s@%s%s%s%s;%s>%s",
+ contact_str = switch_mprintf("%s <sip:%s%s%s%s%s%s;%s>%s",
display, contact->m_url->url_user,
+ contact->m_url->url_user ? "@" : "",
ipv6 ? "[" : "",
contact_host, ipv6 ? "]" : "", new_port, contact->m_url->url_params, np->is_nat ? ";fs_nat=yes" : "");
} else {
- contact_str = switch_mprintf("%s <sip:%s@%s%s%s%s>%s",
+ contact_str = switch_mprintf("%s <sip:%s%s%s%s%s%s>%s",
display,
- contact->m_url->url_user, ipv6 ? "[" : "", contact_host, ipv6 ? "]" : "", new_port, np->is_nat ? ";fs_nat=yes" : "");
+ contact->m_url->url_user,
+ contact->m_url->url_user ? "@" : "",
+ ipv6 ? "[" : "", contact_host, ipv6 ? "]" : "", new_port, np->is_nat ? ";fs_nat=yes" : "");
}
}